diff --git a/src/main/java/org/gcube/portlets/user/td/informationwidget/client/TabularResourceProperties.java b/src/main/java/org/gcube/portlets/user/td/informationwidget/client/TabularResourceProperties.java index ede35e6..22cdea9 100644 --- a/src/main/java/org/gcube/portlets/user/td/informationwidget/client/TabularResourceProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/informationwidget/client/TabularResourceProperties.java @@ -93,6 +93,7 @@ public class TabularResourceProperties extends FramedPanel { protected ListStore storeCombo; protected TextField typeField; + protected TextField tableTypeNameField; protected IconButton btnShare; protected FieldLabel shareLabel; @@ -100,7 +101,7 @@ public class TabularResourceProperties extends FramedPanel { protected TRMetadataAccordionPanel trMetadataPanel; protected VerticalLayoutContainer layoutTabularResource; - protected TextField tableTypeNameField; + protected TextField tableTypeDefField; protected TableMetadataAccordionPanel tableMetadataPanel; protected VerticalLayoutContainer layoutTable; protected TextButton saveButton; @@ -143,23 +144,30 @@ public class TabularResourceProperties extends FramedPanel { descriptionField.setValue(""); layoutTabularResource.add(new FieldLabel(descriptionField, "Description"), new VerticalLayoutData(1, -1)); + + typeField = new TextField(); + typeField.setReadOnly(true); + typeField.setValue(""); + layoutTabularResource.add(new FieldLabel(typeField, "Type"), + new VerticalLayoutData(1, -1)); + agencyField = new TextField(); // agencyField.setReadOnly(true); agencyField.setValue(""); layoutTabularResource.add(new FieldLabel(agencyField, "Agency"), new VerticalLayoutData(1, -1)); - + dateField = new TextField(); dateField.setReadOnly(true); dateField.setValue(""); layoutTabularResource.add(new FieldLabel(dateField, "Date"), new VerticalLayoutData(1, -1)); - typeField = new TextField(); - typeField.setReadOnly(true); - typeField.setValue(""); - layoutTabularResource.add(new FieldLabel(typeField, "Type"), + tableTypeNameField = new TextField(); + tableTypeNameField.setReadOnly(true); + tableTypeNameField.setValue(""); + layoutTabularResource.add(new FieldLabel(tableTypeNameField, "Table Type"), new VerticalLayoutData(1, -1)); rightField = new TextArea(); @@ -329,9 +337,10 @@ public class TabularResourceProperties extends FramedPanel { Log.debug(tabResource.toString()); nameField.setValue(tabResource.getName()); descriptionField.setValue(tabResource.getDescription()); + typeField.setValue(tabResource.getTrId().getTabResourceType().toString()); agencyField.setValue(tabResource.getAgency()); dateField.setValue(tabResource.getDate()); - typeField.setValue(tabResource.getTrId().getTabularResourceType()); + tableTypeNameField.setValue(tabResource.getTableTypeName()); rightField.setValue(tabResource.getRight()); validFromField.clear(); @@ -418,6 +427,7 @@ public class TabularResourceProperties extends FramedPanel { } }*/ + /* public void addTable() { tableFieldSet = new FieldSet(); tableFieldSet.setHeadingText("Table"); @@ -428,14 +438,14 @@ public class TabularResourceProperties extends FramedPanel { tableFieldSet.add(layoutTable); - tableTypeNameField = new TextField(); - tableTypeNameField.setReadOnly(true); - tableTypeNameField.setValue(""); - layoutTable.add(new FieldLabel(tableTypeNameField, "Type"), + tableTypeDefField = new TextField(); + tableTypeDefField.setReadOnly(true); + tableTypeDefField.setValue(""); + layoutTable.add(new FieldLabel(tableTypeDefField, "Type"), new VerticalLayoutData(1, -1)); vl.add(tableFieldSet); - } + }*/ protected void openValidations() { Log.debug("Request Validations Tab");