diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistTargetColumn.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistTargetColumn.java index 8928f7e..197960d 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistTargetColumn.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistTargetColumn.java @@ -3,6 +3,7 @@ package org.gcube.portlets.user.td.gwtservice.shared.extract; import java.io.Serializable; 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; /** @@ -18,7 +19,7 @@ public class ExtractCodelistTargetColumn implements Serializable { protected ColumnData sourceColumn; protected ColumnData targetColumn; protected TRId codelist; - protected ExtractCodelistDefColumn defColumn; + protected DefNewColumn defColumn; public ExtractCodelistTargetColumn() { @@ -32,7 +33,7 @@ public class ExtractCodelistTargetColumn implements Serializable { this.codelist = codelist; } - public ExtractCodelistTargetColumn(ColumnData sourceColumn, ExtractCodelistDefColumn defColumn) { + public ExtractCodelistTargetColumn(ColumnData sourceColumn, DefNewColumn defColumn) { this.newColumn = true; this.sourceColumn = sourceColumn; this.defColumn=defColumn; @@ -70,11 +71,11 @@ public class ExtractCodelistTargetColumn implements Serializable { this.codelist = codelist; } - public ExtractCodelistDefColumn getDefColumn() { + public DefNewColumn getDefColumn() { return defColumn; } - public void setDefColumn(ExtractCodelistDefColumn defColumn) { + public void setDefColumn(DefNewColumn defColumn) { this.defColumn = defColumn; } diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistDefColumn.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/DefNewColumn.java similarity index 62% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistDefColumn.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/DefNewColumn.java index 2ec569d..1df9a9b 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistDefColumn.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/DefNewColumn.java @@ -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; @@ -9,7 +9,7 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeC * @author "Giancarlo Panichi" * */ -public class ExtractCodelistDefColumn implements Serializable { +public class DefNewColumn implements Serializable { private static final long serialVersionUID = 7467523779864189492L; @@ -17,16 +17,18 @@ public class ExtractCodelistDefColumn implements Serializable { protected ColumnTypeCode columnType; protected String defaultValue; protected String label; + protected String localeName; - public ExtractCodelistDefColumn() { + public DefNewColumn() { } - public ExtractCodelistDefColumn(int id, ColumnTypeCode columnType, - String defaultValue, String label) { + public DefNewColumn(int id, ColumnTypeCode columnType, + String defaultValue, String label,String localeName) { this.columnType=columnType; this.defaultValue=defaultValue; this.label=label; + this.localeName=localeName; } public String getLabel() { @@ -60,14 +62,26 @@ public class ExtractCodelistDefColumn implements Serializable { public void setId(int id) { this.id = id; } + + + public String getLocaleName() { + return localeName; + } + + public void setLocaleName(String localeName) { + this.localeName = localeName; + } @Override public String toString() { - return "ExtractCodelistDefColumn [id=" + id + ", columnType=" - + columnType + ", defaultValue=" + defaultValue + ", label=" - + label + "]"; + return "DefNewColumn [id=" + id + ", columnType=" + columnType + + ", defaultValue=" + defaultValue + ", label=" + label + + ", localeName=" + localeName + "]"; } + + + }