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 edacedd..cda9f41 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
@@ -57,19 +57,19 @@ import com.sencha.gxt.widget.core.client.form.TextField;
/**
*
- * @author giancarlo
- * email: g.panichi@isti.cnr.it
+ * @author giancarlo email: g.panichi@isti.cnr.it
*
*/
public class TabularResourceProperties extends FramedPanel {
private static final String DESCRIPTION_FIELD_HEIGHT = "70px";
-
- private DateTimeFormat sdf = DateTimeFormat.getFormat("yyyy-MM-dd");
+ private static final DateTimeFormat sdf = DateTimeFormat
+ .getFormat("yyyy-MM-dd HH:mm");
+
private TabularResourcePropertiesMessages msgs;
private EventBus eventBus;
private TRId trId;
-
private TabResource tabResource;
private TextField nameField;
private TextArea descriptionField;
@@ -81,7 +81,7 @@ public class TabularResourceProperties extends FramedPanel {
private TextField ownerField;
private CheckBox validField;
private CheckBox finalizedField;
-
+
private ComboBox comboLicences;
private ListStore storeCombo;
@@ -94,12 +94,10 @@ public class TabularResourceProperties extends FramedPanel {
private VerticalLayoutContainer layoutTabularResource;
private TextButton saveButton;
- //private TextButton validationsButton;
- //private TextButton resourcesButton;
-
- private ArrayList licencesList;
+ // private TextButton validationsButton;
+ // private TextButton resourcesButton;
-
+ private ArrayList licencesList;
public TabularResourceProperties(String name, EventBus eventBus) {
super();
@@ -107,84 +105,81 @@ public class TabularResourceProperties extends FramedPanel {
this.eventBus = eventBus;
this.msgs = GWT.create(TabularResourcePropertiesMessages.class);
forceLayoutOnResize = true;
-
+
retrieveLicencesList();
}
public void addTabularResource() {
layoutTabularResource = new VerticalLayoutContainer();
- layoutTabularResource.setScrollMode(ScrollMode.AUTOY);
+ layoutTabularResource.setScrollMode(ScrollMode.AUTOY);
layoutTabularResource.setAdjustForScroll(true);
-
+
nameField = new TextField();
nameField.setValue("");
- FieldLabel nameLabel=new FieldLabel(nameField, msgs.nameLabel());
+ FieldLabel nameLabel = new FieldLabel(nameField, msgs.nameLabel());
nameLabel.setToolTip(msgs.nameLabelToolTip());
- layoutTabularResource.add(nameLabel,
- new VerticalLayoutData(1, -1));
+ layoutTabularResource.add(nameLabel, new VerticalLayoutData(1, -1));
descriptionField = new TextArea();
descriptionField.setHeight(DESCRIPTION_FIELD_HEIGHT);
descriptionField.setValue("");
- FieldLabel descriptionLabel=new FieldLabel(descriptionField,
+ FieldLabel descriptionLabel = new FieldLabel(descriptionField,
msgs.descriptionLabel());
descriptionLabel.setToolTip(msgs.descriptionLabelToolTip());
- layoutTabularResource.add(descriptionLabel, new VerticalLayoutData(1, -1));
-
+ layoutTabularResource.add(descriptionLabel, new VerticalLayoutData(1,
+ -1));
+
typeField = new TextField();
typeField.setReadOnly(true);
typeField.setValue("");
- FieldLabel typeLabel= new FieldLabel(typeField, msgs.typeLabel());
+ FieldLabel typeLabel = new FieldLabel(typeField, msgs.typeLabel());
typeLabel.setToolTip(msgs.typeLabelToolTip());
-
- layoutTabularResource.add(typeLabel,
- new VerticalLayoutData(1, -1));
-
+ layoutTabularResource.add(typeLabel, new VerticalLayoutData(1, -1));
+
agencyField = new TextField();
agencyField.setValue("");
- FieldLabel agencyLabel=new FieldLabel(agencyField, msgs.agencyLabel());
+ FieldLabel agencyLabel = new FieldLabel(agencyField, msgs.agencyLabel());
agencyLabel.setToolTip(msgs.agencyLabelToolTip());
- layoutTabularResource.add(agencyLabel,
- new VerticalLayoutData(1, -1));
-
+ layoutTabularResource.add(agencyLabel, new VerticalLayoutData(1, -1));
+
dateField = new TextField();
dateField.setReadOnly(true);
dateField.setValue("");
- FieldLabel dateLabel= new FieldLabel(dateField, msgs.dateLabel());
+ FieldLabel dateLabel = new FieldLabel(dateField, msgs.dateLabel());
dateLabel.setToolTip(msgs.dateLabelToolTip());
- layoutTabularResource.add(dateLabel,
- new VerticalLayoutData(1, -1));
+ layoutTabularResource.add(dateLabel, new VerticalLayoutData(1, -1));
-
tableTypeNameField = new TextField();
tableTypeNameField.setReadOnly(true);
tableTypeNameField.setValue("");
- FieldLabel tableTypeNameLabel=new FieldLabel(tableTypeNameField, msgs.tableTypeNameLabel());
+ FieldLabel tableTypeNameLabel = new FieldLabel(tableTypeNameField,
+ msgs.tableTypeNameLabel());
tableTypeNameLabel.setToolTip(msgs.tableTypeNameLabelToolTip());
- layoutTabularResource.add(tableTypeNameLabel,
- new VerticalLayoutData(1, -1));
+ layoutTabularResource.add(tableTypeNameLabel, new VerticalLayoutData(1,
+ -1));
rightField = new TextArea();
rightField.setValue("");
- FieldLabel rightLabel=new FieldLabel(rightField, msgs.rightLabel());
+ FieldLabel rightLabel = new FieldLabel(rightField, msgs.rightLabel());
rightLabel.setToolTip(msgs.rightLabelToolTip());
-
- layoutTabularResource.add(rightLabel,
- new VerticalLayoutData(1, -1));
+
+ layoutTabularResource.add(rightLabel, new VerticalLayoutData(1, -1));
validFromField = new DateField();
- FieldLabel validFromLabel=new FieldLabel(validFromField, msgs.validFromLabel());
+ FieldLabel validFromLabel = new FieldLabel(validFromField,
+ msgs.validFromLabel());
validFromLabel.setToolTip(msgs.validFromLabelToolTip());
- layoutTabularResource.add(validFromLabel,
- new VerticalLayoutData(1, -1));
+ layoutTabularResource
+ .add(validFromLabel, new VerticalLayoutData(1, -1));
validUntilToField = new DateField();
- FieldLabel validUntilToLabel= new FieldLabel(validUntilToField,
+ FieldLabel validUntilToLabel = new FieldLabel(validUntilToField,
msgs.validUntilToLabel());
validUntilToLabel.setToolTip(msgs.validUntilToLabelToolTip());
- layoutTabularResource.add(validUntilToLabel, new VerticalLayoutData(1, -1));
+ layoutTabularResource.add(validUntilToLabel, new VerticalLayoutData(1,
+ -1));
// Combo Licences
LicenceDataPropertiesCombo propsLicenceData = GWT
@@ -200,19 +195,18 @@ public class TabularResourceProperties extends FramedPanel {
comboLicences.setTriggerAction(TriggerAction.ALL);
Log.trace("Combo Licence created");
-
- FieldLabel licencesLabel=new FieldLabel(comboLicences, msgs.licencesLabel());
+
+ FieldLabel licencesLabel = new FieldLabel(comboLicences,
+ msgs.licencesLabel());
licencesLabel.setToolTip(msgs.licencesLabelToolTip());
- layoutTabularResource.add(licencesLabel,
- new VerticalLayoutData(1, -1));
+ layoutTabularResource.add(licencesLabel, new VerticalLayoutData(1, -1));
// /
ownerField = new TextField();
ownerField.setReadOnly(true);
ownerField.setValue("");
- FieldLabel ownerLabel=new FieldLabel(ownerField, msgs.ownerLabel());
+ FieldLabel ownerLabel = new FieldLabel(ownerField, msgs.ownerLabel());
ownerLabel.setToolTip(msgs.ownerLabelToolTip());
- layoutTabularResource.add(ownerLabel,
- new VerticalLayoutData(1, -1));
+ layoutTabularResource.add(ownerLabel, new VerticalLayoutData(1, -1));
btnShare = new IconButton();
btnShare.setIcon(ResourceBundle.INSTANCE.share());
@@ -234,10 +228,10 @@ public class TabularResourceProperties extends FramedPanel {
validField.setValue(false);
validField.setReadOnly(true);
validField.setEnabled(false);
- FieldLabel validLabel=new FieldLabel(validField, msgs.validLabel());
+ FieldLabel validLabel = new FieldLabel(validField, msgs.validLabel());
validLabel.setToolTip(msgs.validLabelToolTip());
- layoutTabularResource.add(validLabel,
- new VerticalLayoutData(1, -1, new Margins(0)));
+ layoutTabularResource.add(validLabel, new VerticalLayoutData(1, -1,
+ new Margins(0)));
finalizedField = new CheckBox();
finalizedField.setValue(false);
@@ -252,11 +246,12 @@ public class TabularResourceProperties extends FramedPanel {
}
}
});
-
- FieldLabel finalizedLabel=new FieldLabel(finalizedField, msgs.finalizedLabel());
+
+ FieldLabel finalizedLabel = new FieldLabel(finalizedField,
+ msgs.finalizedLabel());
finalizedLabel.setToolTip(msgs.finalizedLabelToolTip());
- layoutTabularResource.add(finalizedLabel,
- new VerticalLayoutData(1, -1, new Margins(0)));
+ layoutTabularResource.add(finalizedLabel, new VerticalLayoutData(1, -1,
+ new Margins(0)));
// Save Button
saveButton = new TextButton(msgs.saveButton());
@@ -273,50 +268,45 @@ public class TabularResourceProperties extends FramedPanel {
saveButton.addSelectHandler(saveHandler);
// Validation Button
- /*validationsButton = new TextButton(msgs.validationsButton());
- validationsButton.setIcon(ResourceBundle.INSTANCE.tableValidation());
- validationsButton.setIconAlign(IconAlign.RIGHT);
- validationsButton.setToolTip(msgs.validationsButtonToolTip());
+ /*
+ * validationsButton = new TextButton(msgs.validationsButton());
+ * validationsButton.setIcon(ResourceBundle.INSTANCE.tableValidation());
+ * validationsButton.setIconAlign(IconAlign.RIGHT);
+ * validationsButton.setToolTip(msgs.validationsButtonToolTip());
+ *
+ * SelectHandler validationsHandler = new SelectHandler() {
+ *
+ * public void onSelect(SelectEvent event) { openValidations();
+ *
+ * } }; validationsButton.addSelectHandler(validationsHandler);
+ */
- SelectHandler validationsHandler = new SelectHandler() {
-
- public void onSelect(SelectEvent event) {
- openValidations();
-
- }
- };
- validationsButton.addSelectHandler(validationsHandler);
- */
-
-
// Resources Button
- /*resourcesButton = new TextButton(msgs.resourcesButton());
- resourcesButton.setIcon(ResourceBundle.INSTANCE.resources());
- resourcesButton.setIconAlign(IconAlign.RIGHT);
- resourcesButton.setToolTip(msgs.resourcesButtonToolTip());
+ /*
+ * resourcesButton = new TextButton(msgs.resourcesButton());
+ * resourcesButton.setIcon(ResourceBundle.INSTANCE.resources());
+ * resourcesButton.setIconAlign(IconAlign.RIGHT);
+ * resourcesButton.setToolTip(msgs.resourcesButtonToolTip());
+ *
+ * SelectHandler resourcesHandler = new SelectHandler() {
+ *
+ * public void onSelect(SelectEvent event) { openResources();
+ *
+ * } }; resourcesButton.addSelectHandler(resourcesHandler);
+ */
- SelectHandler resourcesHandler = new SelectHandler() {
-
- public void onSelect(SelectEvent event) {
- openResources();
-
- }
- };
- resourcesButton.addSelectHandler(resourcesHandler);*/
-
//
HBoxLayoutContainer hBox = new HBoxLayoutContainer();
hBox.setPack(BoxLayoutPack.START);
hBox.add(saveButton, new BoxLayoutData(new Margins(2, 5, 2, 5)));
- //hBox.add(validationsButton, new BoxLayoutData(new Margins(2, 5, 2, 5)));
- //hBox.add(resourcesButton, new BoxLayoutData(new Margins(2, 5, 2, 5)));
-
+ // hBox.add(validationsButton, new BoxLayoutData(new Margins(2, 5, 2,
+ // 5)));
+ // hBox.add(resourcesButton, new BoxLayoutData(new Margins(2, 5, 2,
+ // 5)));
+
layoutTabularResource.add(hBox, new VerticalLayoutData(1, -1,
new Margins(2)));
-
-
-
add(layoutTabularResource);
}
@@ -354,40 +344,28 @@ public class TabularResourceProperties extends FramedPanel {
descriptionField.setValue(tabResource.getDescription());
typeField.setValue(tabResource.getTabResourceType());
agencyField.setValue(tabResource.getAgency());
- dateField.setValue(tabResource.getDate());
+ try {
+ dateField.setValue(sdf.format(tabResource.getDate()));
+ } catch (Throwable e) {
+ Log.error("Error parsing cration date: " + e.getLocalizedMessage());
+ }
+
tableTypeNameField.setValue(tabResource.getTableTypeName());
rightField.setValue(tabResource.getRight());
validFromField.clear();
- if (tabResource.getValidFrom() == null
- || tabResource.getValidFrom().isEmpty()) {
+ if (tabResource.getValidFrom() == null) {
Log.debug("ValidFrom null or empty");
} else {
- Date vFrom;
- try {
- vFrom = sdf.parse(tabResource.getValidFrom());
- validFromField.setValue(vFrom);
- } catch (IllegalArgumentException e) {
- Log.error("Error Parsing Valid From for Tabular Resource: "
- + tabResource);
- e.printStackTrace();
- }
+ validFromField.setValue(tabResource.getValidFrom());
}
validUntilToField.clear();
- if (tabResource.getValidUntilTo() == null
- || tabResource.getValidUntilTo().isEmpty()) {
+ if (tabResource.getValidUntilTo() == null) {
Log.debug("ValidUntilTo null or empty");
} else {
- Date vUntilTo;
- try {
- vUntilTo = sdf.parse(tabResource.getValidUntilTo());
- validUntilToField.setValue(vUntilTo);
- } catch (IllegalArgumentException e) {
- Log.error("Error Parsing Valid Until To for Tabular Resource: "
- + tabResource);
- e.printStackTrace();
- }
+ validUntilToField.setValue(tabResource.getValidUntilTo());
+
}
comboLicences.clear();
@@ -426,78 +404,56 @@ public class TabularResourceProperties extends FramedPanel {
finalizedField.setValue(false);
saveButton.setEnabled(true);
}
-
+
ArrayList contacts = tabResource.getContacts();
if (contacts != null && contacts.size() > 0) {
shareLabel.setVisible(true);
} else {
shareLabel.setVisible(false);
}
-
+
}
-
- /*
- protected void updateShareInfo(ShareInfo result) {
- ArrayList contacts = result.getContacts();
- if (contacts != null && contacts.size() > 0) {
- shareLabel.setVisible(true);
- } else {
- shareLabel.setVisible(false);
- }
- }*/
/*
- public void addTable() {
- tableFieldSet = new FieldSet();
- tableFieldSet.setHeadingText("Table");
- tableFieldSet.setCollapsible(true);
- tableFieldSet.setResize(true);
+ * protected void updateShareInfo(ShareInfo result) { ArrayList
+ * contacts = result.getContacts(); if (contacts != null && contacts.size()
+ * > 0) { shareLabel.setVisible(true); } else {
+ * shareLabel.setVisible(false); } }
+ */
- layoutTable = new VerticalLayoutContainer();
-
- tableFieldSet.add(layoutTable);
-
- 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");
- if (trId != null) {
- WidgetRequestEvent e = new WidgetRequestEvent(
- WidgetRequestType.VALIDATIONSTASKSPANEL);
- e.setTrId(trId);
- eventBus.fireEvent(e);
- } else {
- Log.error("TRId is null");
- }
- }
- */
-
+ * public void addTable() { tableFieldSet = new FieldSet();
+ * tableFieldSet.setHeadingText("Table");
+ * tableFieldSet.setCollapsible(true); tableFieldSet.setResize(true);
+ *
+ * layoutTable = new VerticalLayoutContainer();
+ *
+ * tableFieldSet.add(layoutTable);
+ *
+ * tableTypeDefField = new TextField(); tableTypeDefField.setReadOnly(true);
+ * tableTypeDefField.setValue(""); layoutTable.add(new
+ * FieldLabel(tableTypeDefField, "Type"), new VerticalLayoutData(1, -1));
+ *
+ * vl.add(tableFieldSet); }
+ */
+
/*
- protected void openResources() {
- Log.debug("Request Resources Tab");
- if (trId != null) {
- WidgetRequestEvent e = new WidgetRequestEvent(
- WidgetRequestType.RESOURCESPANEL);
- e.setTrId(trId);
- eventBus.fireEvent(e);
- } else {
- Log.error("TRId is null");
- }
- }
- */
-
+ * protected void openValidations() { Log.debug("Request Validations Tab");
+ * if (trId != null) { WidgetRequestEvent e = new WidgetRequestEvent(
+ * WidgetRequestType.VALIDATIONSTASKSPANEL); e.setTrId(trId);
+ * eventBus.fireEvent(e); } else { Log.error("TRId is null"); } }
+ */
+
+ /*
+ * protected void openResources() { Log.debug("Request Resources Tab"); if
+ * (trId != null) { WidgetRequestEvent e = new WidgetRequestEvent(
+ * WidgetRequestType.RESOURCESPANEL); e.setTrId(trId);
+ * eventBus.fireEvent(e); } else { Log.error("TRId is null"); } }
+ */
protected void updateTable(TableData tableData) {
trId = tableData.getTrId();
- Log.debug("New :"+trId);
+ Log.debug("New :" + trId);
forceLayout();
}
@@ -530,40 +486,31 @@ public class TabularResourceProperties extends FramedPanel {
});
}
-
+
/*
- protected void getShareInformation(TRId trId) {
- TDGWTServiceAsync.INSTANCE.getShareInfo(trId,
- new AsyncCallback() {
-
- public void onSuccess(ShareInfo result) {
- Log.debug("Retrived share info:" + result);
- updateShareInfo(result);
- getLastTable(tabResource.getTrId());
-
- }
-
- public void onFailure(Throwable caught) {
- if (caught instanceof TDGWTSessionExpiredException) {
- eventBus.fireEvent(new SessionExpiredEvent(
- SessionExpiredType.EXPIREDONSERVER));
- } else {
- if (caught instanceof TDGWTIsLockedException) {
- Log.error(caught.getLocalizedMessage());
- UtilsGXT3.alert("Error Locked",
- caught.getLocalizedMessage());
- } else {
- Log.error("Error retrienving Share Informations: "
- + caught.getLocalizedMessage());
- UtilsGXT3.alert("Error",
- "Error retrienving Share Informations: "
- + caught.getLocalizedMessage());
- }
- }
- }
-
- });
- }*/
+ * protected void getShareInformation(TRId trId) {
+ * TDGWTServiceAsync.INSTANCE.getShareInfo(trId, new
+ * AsyncCallback() {
+ *
+ * public void onSuccess(ShareInfo result) {
+ * Log.debug("Retrived share info:" + result); updateShareInfo(result);
+ * getLastTable(tabResource.getTrId());
+ *
+ * }
+ *
+ * public void onFailure(Throwable caught) { if (caught instanceof
+ * TDGWTSessionExpiredException) { eventBus.fireEvent(new
+ * SessionExpiredEvent( SessionExpiredType.EXPIREDONSERVER)); } else { if
+ * (caught instanceof TDGWTIsLockedException) {
+ * Log.error(caught.getLocalizedMessage()); UtilsGXT3.alert("Error Locked",
+ * caught.getLocalizedMessage()); } else {
+ * Log.error("Error retrienving Share Informations: " +
+ * caught.getLocalizedMessage()); UtilsGXT3.alert("Error",
+ * "Error retrienving Share Informations: " + caught.getLocalizedMessage());
+ * } } }
+ *
+ * }); }
+ */
protected void getLastTable(TRId trId) {
TDGWTServiceAsync.INSTANCE.getLastTable(trId,
@@ -618,40 +565,28 @@ public class TabularResourceProperties extends FramedPanel {
if (vFrom == null) {
Log.debug("No valid from set");
} else {
- try {
- String vFr = sdf.format(vFrom);
- tabResource.setValidFrom(vFr);
- } catch (Throwable e) {
- Log.error("No valid from field: " + vFrom);
- e.printStackTrace();
- }
+ tabResource.setValidFrom(vFrom);
}
Date vUntilTo = validUntilToField.getValue();
if (vUntilTo == null) {
Log.debug("No valid until to set");
} else {
- try {
- String vUTo = sdf.format(vUntilTo);
- tabResource.setValidUntilTo(vUTo);
- } catch (Throwable e) {
- Log.error("No valid until to field: " + vUntilTo);
- e.printStackTrace();
- }
-
+ tabResource.setValidUntilTo(vUntilTo);
}
-
- if(vFrom!=null && vUntilTo!=null && vFrom.compareTo(vUntilTo)>0){
+
+ if (vFrom != null && vUntilTo != null && vFrom.compareTo(vUntilTo) > 0) {
Log.debug("Attention Valid From field is higher than Valid Until To field");
- UtilsGXT3.info("Attention", "Valid From field is higher than Valid Until To field");
+ UtilsGXT3.info("Attention",
+ "Valid From field is higher than Valid Until To field");
return;
}
-
+
if (comboLicences.getCurrentValue() != null
&& comboLicences.getCurrentValue().getLicenceId() != null
&& !comboLicences.getCurrentValue().getLicenceId().isEmpty()) {
- tabResource
- .setLicence(comboLicences.getCurrentValue().getLicenceId());
+ tabResource.setLicence(comboLicences.getCurrentValue()
+ .getLicenceId());
}
tabResource.setValid(validField.getValue());
@@ -700,10 +635,13 @@ public class TabularResourceProperties extends FramedPanel {
finalizedField.setValue(false);
saveButton.setEnabled(true);
}
- DataViewRequestEvent dataViewRequestEvent=new DataViewRequestEvent();
- TabularResourceDataView tabularResouceDataView=new TabularResourceDataView(tabResource.getTrId(),tabResource.getName());
- dataViewRequestEvent.setDataView(tabularResouceDataView);
- dataViewRequestEvent.setDataViewRequestType(DataViewRequestType.UPDATE_TAB_NAME);
+ DataViewRequestEvent dataViewRequestEvent = new DataViewRequestEvent();
+ TabularResourceDataView tabularResouceDataView = new TabularResourceDataView(
+ tabResource.getTrId(), tabResource.getName());
+ dataViewRequestEvent
+ .setDataView(tabularResouceDataView);
+ dataViewRequestEvent
+ .setDataViewRequestType(DataViewRequestType.UPDATE_TAB_NAME);
eventBus.fireEvent(dataViewRequestEvent);
}