diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java index 9d302ce..d0e1d2c 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java @@ -9,19 +9,19 @@ import org.gcube.portlets.user.td.columnwidget.client.mapping.ColumnMappingDialo import org.gcube.portlets.user.td.columnwidget.client.mapping.ColumnMappingListProperties; import org.gcube.portlets.user.td.columnwidget.client.mapping.ColumnMappingListener; import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnDataPropertiesCombo; -import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnDataTypeProperties; -import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnTypeCodeProperties; -import org.gcube.portlets.user.td.columnwidget.client.properties.LocaleTypeProperties; import org.gcube.portlets.user.td.columnwidget.client.properties.PeriodDataTypeProperties; -import org.gcube.portlets.user.td.columnwidget.client.properties.TabResourceProperties; import org.gcube.portlets.user.td.columnwidget.client.properties.ValueDataFormatProperties; import org.gcube.portlets.user.td.columnwidget.client.resources.ResourceBundle; -import org.gcube.portlets.user.td.columnwidget.client.store.ColumnDataTypeElement; -import org.gcube.portlets.user.td.columnwidget.client.store.ColumnDataTypeStore; -import org.gcube.portlets.user.td.columnwidget.client.store.ColumnTypeCodeElement; -import org.gcube.portlets.user.td.columnwidget.client.store.ColumnTypeCodeStore; -import org.gcube.portlets.user.td.columnwidget.client.store.LocaleTypeElement; import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3; +import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnDataTypeProperties; +import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnTypeCodeProperties; +import org.gcube.portlets.user.td.expressionwidget.client.properties.LocaleTypeProperties; +import org.gcube.portlets.user.td.expressionwidget.client.properties.TabResourceProperties; +import org.gcube.portlets.user.td.expressionwidget.client.store.ColumnDataTypeElement; +import org.gcube.portlets.user.td.expressionwidget.client.store.ColumnDataTypeStore; +import org.gcube.portlets.user.td.expressionwidget.client.store.ColumnTypeCodeElement; +import org.gcube.portlets.user.td.expressionwidget.client.store.ColumnTypeCodeStore; +import org.gcube.portlets.user.td.expressionwidget.client.store.LocaleTypeElement; import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsFinalException; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsLockedException; diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnPanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnPanel.java index a82c2ec..2927c5b 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnPanel.java @@ -5,23 +5,23 @@ import java.util.ArrayList; import org.gcube.portlets.user.td.columnwidget.client.dimension.CodelistSelectionDialog; import org.gcube.portlets.user.td.columnwidget.client.dimension.CodelistSelectionListener; import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnDataPropertiesCombo; -import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnDataTypeProperties; -import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnTypeCodeProperties; -import org.gcube.portlets.user.td.columnwidget.client.properties.LocaleTypeProperties; import org.gcube.portlets.user.td.columnwidget.client.properties.PeriodDataTypeProperties; -import org.gcube.portlets.user.td.columnwidget.client.properties.TabResourceProperties; import org.gcube.portlets.user.td.columnwidget.client.resources.ResourceBundle; -import org.gcube.portlets.user.td.columnwidget.client.store.ColumnDataTypeElement; -import org.gcube.portlets.user.td.columnwidget.client.store.ColumnDataTypeStore; -import org.gcube.portlets.user.td.columnwidget.client.store.ColumnTypeCodeElement; -import org.gcube.portlets.user.td.columnwidget.client.store.ColumnTypeCodeStore; -import org.gcube.portlets.user.td.columnwidget.client.store.LocaleTypeElement; import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3; import org.gcube.portlets.user.td.expressionwidget.client.expression.ExpressionWrapperNotification; import org.gcube.portlets.user.td.expressionwidget.client.expression.ExpressionWrapperNotification.ExpressionWrapperNotificationListener; import org.gcube.portlets.user.td.expressionwidget.client.expression.ReplaceExpressionDialog; +import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnDataTypeProperties; +import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnTypeCodeProperties; +import org.gcube.portlets.user.td.expressionwidget.client.properties.LocaleTypeProperties; +import org.gcube.portlets.user.td.expressionwidget.client.properties.TabResourceProperties; import org.gcube.portlets.user.td.expressionwidget.client.resources.ExpressionResources; import org.gcube.portlets.user.td.expressionwidget.client.rpc.ExpressionServiceAsync; +import org.gcube.portlets.user.td.expressionwidget.client.store.ColumnDataTypeElement; +import org.gcube.portlets.user.td.expressionwidget.client.store.ColumnDataTypeStore; +import org.gcube.portlets.user.td.expressionwidget.client.store.ColumnTypeCodeElement; +import org.gcube.portlets.user.td.expressionwidget.client.store.ColumnTypeCodeStore; +import org.gcube.portlets.user.td.expressionwidget.client.store.LocaleTypeElement; import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsFinalException; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsLockedException; @@ -1128,7 +1128,7 @@ public class AddColumnPanel extends FramedPanel implements UtilsGXT3.alert("Attention", "Select a column type!"); } } else { - UtilsGXT3.alert("Attntion", "Insert a valid label!"); + UtilsGXT3.alert("Attention", "Insert a valid label!"); } return columnMockUp; diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnPanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnPanel.java index c695396..8d63b2c 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnPanel.java @@ -2,13 +2,13 @@ package org.gcube.portlets.user.td.columnwidget.client.create; import java.util.ArrayList; -import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnTypeCodeProperties; -import org.gcube.portlets.user.td.columnwidget.client.properties.LocaleTypeProperties; import org.gcube.portlets.user.td.columnwidget.client.resources.ResourceBundle; -import org.gcube.portlets.user.td.columnwidget.client.store.ColumnTypeCodeElement; -import org.gcube.portlets.user.td.columnwidget.client.store.ColumnTypeCodeStore; -import org.gcube.portlets.user.td.columnwidget.client.store.LocaleTypeElement; import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3; +import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnTypeCodeProperties; +import org.gcube.portlets.user.td.expressionwidget.client.properties.LocaleTypeProperties; +import org.gcube.portlets.user.td.expressionwidget.client.store.ColumnTypeCodeElement; +import org.gcube.portlets.user.td.expressionwidget.client.store.ColumnTypeCodeStore; +import org.gcube.portlets.user.td.expressionwidget.client.store.LocaleTypeElement; import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsFinalException; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsLockedException; diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/dimension/ConnectCodelistDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/dimension/ConnectCodelistDialog.java index b70237a..65b7469 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/dimension/ConnectCodelistDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/dimension/ConnectCodelistDialog.java @@ -3,9 +3,9 @@ package org.gcube.portlets.user.td.columnwidget.client.dimension; import java.util.ArrayList; import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnDataPropertiesCombo; -import org.gcube.portlets.user.td.columnwidget.client.properties.TabResourceProperties; import org.gcube.portlets.user.td.columnwidget.client.resources.ResourceBundle; import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3; +import org.gcube.portlets.user.td.expressionwidget.client.properties.TabResourceProperties; import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsFinalException; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsLockedException; diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataTypeProperties.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataTypeProperties.java deleted file mode 100644 index 6e29cab..0000000 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataTypeProperties.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.gcube.portlets.user.td.columnwidget.client.properties; - -import org.gcube.portlets.user.td.columnwidget.client.store.ColumnDataTypeElement; - -import com.google.gwt.editor.client.Editor.Path; -import com.sencha.gxt.data.shared.LabelProvider; -import com.sencha.gxt.data.shared.ModelKeyProvider; -import com.sencha.gxt.data.shared.PropertyAccess; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public interface ColumnDataTypeProperties extends - PropertyAccess { - - @Path("id") - ModelKeyProvider id(); - - LabelProvider label(); - -} diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnTypeCodeProperties.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnTypeCodeProperties.java deleted file mode 100644 index 8d59b25..0000000 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnTypeCodeProperties.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.gcube.portlets.user.td.columnwidget.client.properties; - -import org.gcube.portlets.user.td.columnwidget.client.store.ColumnTypeCodeElement; - -import com.google.gwt.editor.client.Editor.Path; -import com.sencha.gxt.data.shared.LabelProvider; -import com.sencha.gxt.data.shared.ModelKeyProvider; -import com.sencha.gxt.data.shared.PropertyAccess; - -/** - * - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public interface ColumnTypeCodeProperties extends - PropertyAccess { - - @Path("id") - ModelKeyProvider id(); - - LabelProvider label(); - -} diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/LocaleTypeProperties.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/LocaleTypeProperties.java deleted file mode 100644 index fdfe3a4..0000000 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/LocaleTypeProperties.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.gcube.portlets.user.td.columnwidget.client.properties; - -import org.gcube.portlets.user.td.columnwidget.client.store.LocaleTypeElement; - -import com.google.gwt.editor.client.Editor.Path; -import com.sencha.gxt.data.shared.LabelProvider; -import com.sencha.gxt.data.shared.ModelKeyProvider; -import com.sencha.gxt.data.shared.PropertyAccess; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public interface LocaleTypeProperties extends - PropertyAccess { - - @Path("id") - ModelKeyProvider id(); - - LabelProvider label(); - - -} diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/TabResourceProperties.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/TabResourceProperties.java deleted file mode 100644 index 9943c37..0000000 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/TabResourceProperties.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.gcube.portlets.user.td.columnwidget.client.properties; - -import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; - -import com.google.gwt.editor.client.Editor.Path; -import com.sencha.gxt.data.shared.LabelProvider; -import com.sencha.gxt.data.shared.ModelKeyProvider; -import com.sencha.gxt.data.shared.PropertyAccess; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public interface TabResourceProperties extends - PropertyAccess { - - @Path("id") - ModelKeyProvider id(); - - @Path("name") - LabelProvider label(); - -} diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/store/ColumnDataTypeElement.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/store/ColumnDataTypeElement.java deleted file mode 100644 index 8f435c8..0000000 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/store/ColumnDataTypeElement.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.gcube.portlets.user.td.columnwidget.client.store; - -import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class ColumnDataTypeElement { - - protected int id; // For insert in table only - protected ColumnDataType type; - - - public ColumnDataTypeElement(int id,ColumnDataType type){ - this.id=id; - this.type=type; - } - - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public ColumnDataType getType() { - return type; - } - public void setCode(ColumnDataType type) { - this.type = type; - } - - public String getLabel() { - return type.toString(); - } - - - @Override - public String toString() { - return "ColumnDataTypeElement [id=" + id + ", type=" + type + "]"; - } - - - - -} diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/store/ColumnDataTypeStore.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/store/ColumnDataTypeStore.java deleted file mode 100644 index fad29f1..0000000 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/store/ColumnDataTypeStore.java +++ /dev/null @@ -1,180 +0,0 @@ -package org.gcube.portlets.user.td.columnwidget.client.store; - -import java.io.Serializable; -import java.util.ArrayList; - -import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType; - - - - -/** - * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * - */ -public class ColumnDataTypeStore implements Serializable { - - private static final long serialVersionUID = -1908324094430432681L; - - protected static ArrayList store; - - protected static ColumnDataTypeElement integerElement=new ColumnDataTypeElement(1,ColumnDataType.Integer); - protected static ColumnDataTypeElement numericElement=new ColumnDataTypeElement(2,ColumnDataType.Numeric); - protected static ColumnDataTypeElement booleanElement=new ColumnDataTypeElement(3,ColumnDataType.Boolean); - protected static ColumnDataTypeElement textElement=new ColumnDataTypeElement(4,ColumnDataType.Text); - protected static ColumnDataTypeElement dateElement=new ColumnDataTypeElement(5,ColumnDataType.Date); - protected static ColumnDataTypeElement geometryElement=new ColumnDataTypeElement(6,ColumnDataType.Geometry); - - - public static ArrayList getMeasureType(){ - store=new ArrayList(); - store.add(integerElement); - store.add(numericElement); - return store; - } - - public static int selectedMeasurePosition(String selected){ - int position=0; - if(selected.compareTo(ColumnDataType.Integer.toString())==0){ - position=1; - } else { - if(selected.compareTo(ColumnDataType.Numeric.toString())==0){ - position=2; - } else { - } - } - return position; - } - - - public static ColumnDataType selectedMeasure(String selected){ - if(selected.compareTo(ColumnDataType.Integer.toString())==0){ - return ColumnDataType.Integer; - } else { - if(selected.compareTo(ColumnDataType.Numeric.toString())==0){ - return ColumnDataType.Numeric; - } else { - return null; - } - } - } - - public static ColumnDataTypeElement selectedMeasureElement(String selected){ - if(selected.compareTo(ColumnDataType.Integer.toString())==0){ - return integerElement; - } else { - if(selected.compareTo(ColumnDataType.Numeric.toString())==0){ - return numericElement; - } else { - return null; - } - } - } - - - - - public static ArrayList getAttributeType(){ - store=new ArrayList(); - store.add(integerElement); - store.add(numericElement); - store.add(booleanElement); - store.add(textElement); - store.add(dateElement); - store.add(geometryElement); - return store; - } - - public static int selectedAttributePosition(String selected){ - int position=0; - if(selected.compareTo(ColumnDataType.Integer.toString())==0){ - position=1; - } else { - if(selected.compareTo(ColumnDataType.Numeric.toString())==0){ - position=2; - } else { - if(selected.compareTo(ColumnDataType.Boolean.toString())==0){ - position=3; - } else { - if(selected.compareTo(ColumnDataType.Text.toString())==0){ - position=4; - } else { - if(selected.compareTo(ColumnDataType.Date.toString())==0){ - position=5; - } else { - if(selected.compareTo(ColumnDataType.Geometry.toString())==0){ - position=6; - } else { - - } - } - } - - } - } - } - return position; - } - - public static ColumnDataType selectedAttribute(String selected){ - if(selected.compareTo(ColumnDataType.Integer.toString())==0){ - return ColumnDataType.Integer; - } else { - if(selected.compareTo(ColumnDataType.Numeric.toString())==0){ - return ColumnDataType.Numeric; - } else { - if(selected.compareTo(ColumnDataType.Boolean.toString())==0){ - return ColumnDataType.Boolean; - } else { - if(selected.compareTo(ColumnDataType.Text.toString())==0){ - return ColumnDataType.Text; - } else { - if(selected.compareTo(ColumnDataType.Date.toString())==0){ - return ColumnDataType.Date; - } else { - if(selected.compareTo(ColumnDataType.Geometry.toString())==0){ - return ColumnDataType.Geometry; - } else { - return null; - } - } - } - - } - } - } - } - - public static ColumnDataTypeElement selectedAttributeElement(String selected){ - if(selected.compareTo(ColumnDataType.Integer.toString())==0){ - return integerElement; - } else { - if(selected.compareTo(ColumnDataType.Numeric.toString())==0){ - return numericElement; - } else { - if(selected.compareTo(ColumnDataType.Boolean.toString())==0){ - return booleanElement; - } else { - if(selected.compareTo(ColumnDataType.Text.toString())==0){ - return textElement; - } else { - if(selected.compareTo(ColumnDataType.Date.toString())==0){ - return dateElement; - } else { - if(selected.compareTo(ColumnDataType.Geometry.toString())==0){ - return geometryElement; - } else { - return null; - } - } - - } - - } - } - } - } - -} diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/store/ColumnTypeCodeElement.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/store/ColumnTypeCodeElement.java deleted file mode 100644 index 6adffa9..0000000 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/store/ColumnTypeCodeElement.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.gcube.portlets.user.td.columnwidget.client.store; - -import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class ColumnTypeCodeElement { - - protected int id; // For insert in table only - protected ColumnTypeCode code; - - - public ColumnTypeCodeElement(int id,ColumnTypeCode code){ - this.id=id; - this.code=code; - } - - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public ColumnTypeCode getCode() { - return code; - } - public void setCode(ColumnTypeCode code) { - this.code = code; - } - - public String getLabel() { - return code.getColumnTypeCodeLabel(); - } - - - @Override - public String toString() { - return "ColumnTypeCodeElement [id=" + id + ", code=" + code + "]"; - } - - - -} diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/store/ColumnTypeCodeStore.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/store/ColumnTypeCodeStore.java deleted file mode 100644 index 1cebddc..0000000 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/store/ColumnTypeCodeStore.java +++ /dev/null @@ -1,313 +0,0 @@ -package org.gcube.portlets.user.td.columnwidget.client.store; - -import java.io.Serializable; -import java.util.ArrayList; - -import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; -import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode; - -import com.allen_sauer.gwt.log.client.Log; - - -/** - * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * - */ -public class ColumnTypeCodeStore implements Serializable { - - private static final long serialVersionUID = -1908324094430432681L; - - protected static ColumnTypeCodeElement annotation = new ColumnTypeCodeElement( - 1, ColumnTypeCode.ANNOTATION); - protected static ColumnTypeCodeElement attribute = new ColumnTypeCodeElement( - 2, ColumnTypeCode.ATTRIBUTE); - protected static ColumnTypeCodeElement measure = new ColumnTypeCodeElement( - 3, ColumnTypeCode.MEASURE); - protected static ColumnTypeCodeElement code = new ColumnTypeCodeElement(4, - ColumnTypeCode.CODE); - protected static ColumnTypeCodeElement codeName = new ColumnTypeCodeElement( - 5, ColumnTypeCode.CODENAME); - protected static ColumnTypeCodeElement codeDescription = new ColumnTypeCodeElement( - 6, ColumnTypeCode.CODEDESCRIPTION); - protected static ColumnTypeCodeElement dimension = new ColumnTypeCodeElement( - 7, ColumnTypeCode.DIMENSION); - protected static ColumnTypeCodeElement timeDimension = new ColumnTypeCodeElement( - 8, ColumnTypeCode.TIMEDIMENSION); - - protected static ArrayList store; - - public static ArrayList getColumnTypeCodes(TRId trId) { - store = new ArrayList(); - if(trId==null|| trId.getTableTypeName()==null){ - Log.debug("Attention no valid table type, trId:"+trId); - store.add(annotation); - return store; - } - - if (trId.getTableTypeName().compareTo("Generic") == 0) { - store.add(annotation); - store.add(attribute); - store.add(measure); - store.add(code); - store.add(codeName); - store.add(codeDescription); - store.add(dimension); - store.add(timeDimension); - } else { - if (trId.getTableTypeName().compareTo("Codelist") == 0) { - store.add(annotation); - store.add(code); - store.add(codeName); - store.add(codeDescription); - } else { - if (trId.getTableTypeName().compareTo("Dataset") == 0) { - store.add(attribute); - store.add(measure); - store.add(dimension); - store.add(timeDimension); - } else { - store.add(annotation); - } - - } - - } - - return store; - } - - - public static ArrayList getColumnTypeCodesForAddColumn(TRId trId) { - store = new ArrayList(); - if(trId==null|| trId.getTableTypeName()==null){ - Log.debug("Attention no valid table type, trId:"+trId); - store.add(annotation); - return store; - } - - if (trId.getTableTypeName().compareTo("Generic") == 0) { - store.add(annotation); - store.add(attribute); - store.add(measure); - store.add(code); - store.add(codeName); - store.add(codeDescription); - } else { - if (trId.getTableTypeName().compareTo("Codelist") == 0) { - store.add(annotation); - store.add(code); - store.add(codeName); - store.add(codeDescription); - } else { - if (trId.getTableTypeName().compareTo("Dataset") == 0) { - store.add(attribute); - store.add(measure); - } else { - store.add(annotation); - } - - } - - } - - return store; - } - - - /** - * - * @return - */ - public static ArrayList getColumnTypeCodesForGeneric() { - store = new ArrayList(); - store.add(annotation); - store.add(attribute); - store.add(measure); - store.add(code); - store.add(codeName); - store.add(codeDescription); - store.add(dimension); - store.add(timeDimension); - - return store; - } - - - public static ArrayList getColumnTypeCodesForCodelist() { - store = new ArrayList(); - store.add(annotation); - store.add(code); - store.add(codeName); - store.add(codeDescription); - - return store; - } - - public static ArrayList getColumnTypeCodesForDataset() { - store = new ArrayList(); - store.add(attribute); - store.add(measure); - store.add(dimension); - store.add(timeDimension); - - return store; - } - - - - - - - public static int selectedPosition(String selected) { - int position = 0; - if (selected.compareTo(ColumnTypeCode.ANNOTATION.toString()) == 0) { - position = 1; - } else { - if (selected.compareTo(ColumnTypeCode.ATTRIBUTE.toString()) == 0) { - position = 2; - } else { - if (selected.compareTo(ColumnTypeCode.MEASURE.toString()) == 0) { - position = 3; - } else { - if (selected.compareTo(ColumnTypeCode.CODE.toString()) == 0) { - position = 4; - } else { - if (selected.compareTo(ColumnTypeCode.CODENAME - .toString()) == 0) { - position = 5; - } else { - if (selected - .compareTo(ColumnTypeCode.CODEDESCRIPTION - .toString()) == 0) { - position = 6; - } else { - if (selected.compareTo(ColumnTypeCode.DIMENSION - .toString()) == 0) { - position = 7; - } else { - if (selected - .compareTo(ColumnTypeCode.TIMEDIMENSION - .toString()) == 0) { - position = 8; - } else { - - } - - } - - } - - } - - } - - } - - } - - } - return position; - } - - public static ColumnTypeCode selected(String selected) { - Log.debug("ColumnTypeCodeStore Selected:"+selected); - if (selected.compareTo(ColumnTypeCode.ANNOTATION.toString()) == 0) { - return ColumnTypeCode.ANNOTATION; - } else { - if (selected.compareTo(ColumnTypeCode.ATTRIBUTE.toString()) == 0) { - return ColumnTypeCode.ATTRIBUTE; - } else { - if (selected.compareTo(ColumnTypeCode.MEASURE.toString()) == 0) { - return ColumnTypeCode.MEASURE; - } else { - if (selected.compareTo(ColumnTypeCode.CODE.toString()) == 0) { - return ColumnTypeCode.CODE; - } else { - if (selected.compareTo(ColumnTypeCode.CODENAME - .toString()) == 0) { - return ColumnTypeCode.CODENAME; - } else { - if (selected - .compareTo(ColumnTypeCode.CODEDESCRIPTION - .toString()) == 0) { - return ColumnTypeCode.CODEDESCRIPTION; - } else { - if (selected.compareTo(ColumnTypeCode.DIMENSION - .toString()) == 0) { - return ColumnTypeCode.DIMENSION; - } else { - if (selected - .compareTo(ColumnTypeCode.TIMEDIMENSION - .toString()) == 0) { - return ColumnTypeCode.TIMEDIMENSION; - } else { - return null; - } - - } - - } - - } - - } - - } - - } - - } - } - - public static ColumnTypeCodeElement selectedElement(String selected) { - if (selected.compareTo(ColumnTypeCode.ANNOTATION.toString()) == 0) { - return annotation; - } else { - if (selected.compareTo(ColumnTypeCode.ATTRIBUTE.toString()) == 0) { - return attribute; - } else { - if (selected.compareTo(ColumnTypeCode.MEASURE.toString()) == 0) { - return measure; - } else { - if (selected.compareTo(ColumnTypeCode.CODE.toString()) == 0) { - return code; - } else { - if (selected.compareTo(ColumnTypeCode.CODENAME - .toString()) == 0) { - return codeName; - } else { - if (selected - .compareTo(ColumnTypeCode.CODEDESCRIPTION - .toString()) == 0) { - return codeDescription; - } else { - if (selected.compareTo(ColumnTypeCode.DIMENSION - .toString()) == 0) { - return dimension; - } else { - if (selected - .compareTo(ColumnTypeCode.TIMEDIMENSION - .toString()) == 0) { - return timeDimension; - } else { - return null; - } - - } - - } - - } - - } - - } - - } - - } - } - -} diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/store/LocaleTypeElement.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/store/LocaleTypeElement.java deleted file mode 100644 index e7c715b..0000000 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/store/LocaleTypeElement.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.gcube.portlets.user.td.columnwidget.client.store; - -import java.io.Serializable; - -/** - * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * - */ -public class LocaleTypeElement implements Serializable { - - private static final long serialVersionUID = 1L; - protected String localeName; - - public LocaleTypeElement() { - } - - public LocaleTypeElement(String localeName){ - this.localeName=localeName; - } - - - public String getLocaleName() { - return localeName; - } - - public void setLocaleName(String localeName) { - this.localeName = localeName; - } - - public String id(){ - return localeName; - } - - public String label(){ - return localeName; - } - - - - @Override - public String toString() { - return "LocaleTypeElement [localeName=" + localeName + "]"; - } - - - -}