gCubeSystem
/
tabular-data-gwt-service
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor Update 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@96170 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-05-28 10:45:24 +00:00
parent f11e984481
commit 60f4a8989e
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistTargetColumn.java
View File

@ -3,6 +3,7 @@ package org.gcube.portlets.user.td.gwtservice.shared.extract;
import java.io.Serializable; import java.io.Serializable;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.DefNewColumn;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
/** /**
@ -18,7 +19,7 @@ public class ExtractCodelistTargetColumn implements Serializable {
protected ColumnData sourceColumn; protected ColumnData sourceColumn;
protected ColumnData targetColumn; protected ColumnData targetColumn;
protected TRId codelist; protected TRId codelist;
protected ExtractCodelistDefColumn defColumn; protected DefNewColumn defColumn;
public ExtractCodelistTargetColumn() { public ExtractCodelistTargetColumn() {
@ -32,7 +33,7 @@ public class ExtractCodelistTargetColumn implements Serializable {
this.codelist = codelist; this.codelist = codelist;
} }
public ExtractCodelistTargetColumn(ColumnData sourceColumn, ExtractCodelistDefColumn defColumn) { public ExtractCodelistTargetColumn(ColumnData sourceColumn, DefNewColumn defColumn) {
this.newColumn = true; this.newColumn = true;
this.sourceColumn = sourceColumn; this.sourceColumn = sourceColumn;
this.defColumn=defColumn; this.defColumn=defColumn;
@ -70,11 +71,11 @@ public class ExtractCodelistTargetColumn implements Serializable {
this.codelist = codelist; this.codelist = codelist;
} }
public ExtractCodelistDefColumn getDefColumn() { public DefNewColumn getDefColumn() {
return defColumn; return defColumn;
} }
public void setDefColumn(ExtractCodelistDefColumn defColumn) { public void setDefColumn(DefNewColumn defColumn) {
this.defColumn = defColumn; this.defColumn = defColumn;
} }

30
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistDefColumn.java → src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/DefNewColumn.java
View File

@ -1,4 +1,4 @@
package org.gcube.portlets.user.td.gwtservice.shared.extract; package org.gcube.portlets.user.td.gwtservice.shared.tr;
import java.io.Serializable; import java.io.Serializable;
@ -9,7 +9,7 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeC
* @author "Giancarlo Panichi" * @author "Giancarlo Panichi"
* *
*/ */
public class ExtractCodelistDefColumn implements Serializable { public class DefNewColumn implements Serializable {
private static final long serialVersionUID = 7467523779864189492L; private static final long serialVersionUID = 7467523779864189492L;
@ -17,16 +17,18 @@ public class ExtractCodelistDefColumn implements Serializable {
protected ColumnTypeCode columnType; protected ColumnTypeCode columnType;
protected String defaultValue; protected String defaultValue;
protected String label; protected String label;
protected String localeName;
public ExtractCodelistDefColumn() { public DefNewColumn() {
} }
public ExtractCodelistDefColumn(int id, ColumnTypeCode columnType, public DefNewColumn(int id, ColumnTypeCode columnType,
String defaultValue, String label) { String defaultValue, String label,String localeName) {
this.columnType=columnType; this.columnType=columnType;
this.defaultValue=defaultValue; this.defaultValue=defaultValue;
this.label=label; this.label=label;
this.localeName=localeName;
} }
public String getLabel() { public String getLabel() {
@ -60,14 +62,26 @@ public class ExtractCodelistDefColumn implements Serializable {
public void setId(int id) { public void setId(int id) {
this.id = id; this.id = id;
} }
public String getLocaleName() {
return localeName;
}
public void setLocaleName(String localeName) {
this.localeName = localeName;
}
@Override @Override
public String toString() { public String toString() {
return "ExtractCodelistDefColumn [id=" + id + ", columnType=" return "DefNewColumn [id=" + id + ", columnType=" + columnType
+ columnType + ", defaultValue=" + defaultValue + ", label=" + ", defaultValue=" + defaultValue + ", label=" + label
+ label + "]"; + ", localeName=" + localeName + "]";
} }
} }