From a8de781f3a32fcf6c0179906857d9087b44bae85 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 3 Jun 2014 15:15:45 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@96435 82a268e6-3cf1-43bd-a215-b396298e98cf --- .settings/org.eclipse.wst.common.component | 27 --------- .../td/client/resource/codelistmapping.png | Bin 0 -> 962 bytes .../td/client/resource/codelistmapping_32.png | Bin 0 -> 2160 bytes .../td/client/ribbon/CurationToolBar.java | 57 +++++++++++++----- .../td/client/resource/codelistmapping.png | Bin 0 -> 962 bytes .../td/client/resource/codelistmapping_32.png | Bin 0 -> 2160 bytes 6 files changed, 43 insertions(+), 41 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/td/client/resource/codelistmapping.png create mode 100644 src/main/java/org/gcube/portlets/user/td/client/resource/codelistmapping_32.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/client/resource/codelistmapping.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/client/resource/codelistmapping_32.png diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 2a18e39..13a1538 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -4,9 +4,6 @@ - - uses - uses @@ -19,45 +16,21 @@ uses - - uses - uses - - uses - uses - - uses - - - uses - uses uses - - uses - - - uses - - - uses - uses - - uses - diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/codelistmapping.png b/src/main/java/org/gcube/portlets/user/td/client/resource/codelistmapping.png new file mode 100644 index 0000000000000000000000000000000000000000..04850798085602bf1ab76d205809493b9f548c1a GIT binary patch literal 962 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 literal 0 HcmV?d00001 diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/CurationToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/CurationToolBar.java index 9de6aca..cc2830f 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/CurationToolBar.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/CurationToolBar.java @@ -8,6 +8,7 @@ import org.gcube.portlets.user.td.widgetcommonevent.client.event.RibbonEvent; import org.gcube.portlets.user.td.widgetcommonevent.client.event.UIStateEvent; import org.gcube.portlets.user.td.widgetcommonevent.client.type.RibbonType; import org.gcube.portlets.user.td.widgetcommonevent.client.type.UIStateType; +import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.dom.client.Element; @@ -47,7 +48,9 @@ public class CurationToolBar { protected TextButton tableTypeButton; protected TextButton addColumnButton; protected TextButton deleteColumnButton; + protected TextButton extractCodelistButton; + protected TextButton codelistMappingButton; protected TextButton generateSummaryButton; public CurationToolBar(EventBus eventBus) { @@ -120,7 +123,8 @@ public class CurationToolBar { duplicateDetectionButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - eventBus.fireEvent(new RibbonEvent(RibbonType.DUPLICATEDETECTION)); + eventBus.fireEvent(new RibbonEvent( + RibbonType.DUPLICATEDETECTION)); } }); @@ -224,7 +228,7 @@ public class CurationToolBar { structureLayout.setWidget(0, 3, addColumnButton); structureLayout.getFlexCellFormatter().setRowSpan(0, 3, 2); - + deleteColumnButton = new TextButton("Delete Column", TabularDataResources.INSTANCE.columnDelete32()); deleteColumnButton.disable(); @@ -303,7 +307,23 @@ public class CurationToolBar { helperLayout.setWidget(0, 0, extractCodelistButton); helperLayout.getFlexCellFormatter().setRowSpan(0, 0, 2); - + + codelistMappingButton = new TextButton("Map Import", + TabularDataResources.INSTANCE.codelistMapping32()); + codelistMappingButton.setScale(ButtonScale.LARGE); + codelistMappingButton.setIconAlign(IconAlign.TOP); + codelistMappingButton.setToolTip("Codelist Map Import"); + codelistMappingButton.setArrowAlign(ButtonArrowAlign.BOTTOM); + codelistMappingButton.addSelectHandler(new SelectHandler() { + + public void onSelect(SelectEvent event) { + eventBus.fireEvent(new RibbonEvent(RibbonType.EXTRACTCODELIST)); + } + }); + + helperLayout.setWidget(0, 1, codelistMappingButton); + helperLayout.getFlexCellFormatter().setRowSpan(0, 1, 2); + generateSummaryButton = new TextButton("Generate Summary", TabularDataResources.INSTANCE.summary32()); generateSummaryButton.setScale(ButtonScale.LARGE); @@ -317,11 +337,10 @@ public class CurationToolBar { } }); - helperLayout.setWidget(0, 1, generateSummaryButton); - helperLayout.getFlexCellFormatter().setRowSpan(0, 1, 2); + helperLayout.setWidget(0, 2, generateSummaryButton); + helperLayout.getFlexCellFormatter().setRowSpan(0, 2, 2); cleanCells(helperLayout.getElement()); - - + eventBus.addHandler(UIStateEvent.TYPE, new UIStateEvent.UIStateHandler() { @@ -330,7 +349,7 @@ public class CurationToolBar { } }); - + } protected void cleanCells(Element elem) { @@ -343,8 +362,7 @@ public class CurationToolBar { } } } - - + public void setUI(UIStateEvent event) { UIStateType uiStateType = event.getUIStateType(); try { @@ -362,10 +380,11 @@ public class CurationToolBar { addColumnButton.disable(); deleteColumnButton.disable(); extractCodelistButton.disable(); + codelistMappingButton.disable(); generateSummaryButton.disable(); break; case TR_CLOSE: - case TR_READONLY: + case TR_READONLY: duplicateDetectionButton.disable(); rulesButton.disable(); normalizeButton.disable(); @@ -378,10 +397,11 @@ public class CurationToolBar { addColumnButton.disable(); deleteColumnButton.disable(); extractCodelistButton.disable(); + codelistMappingButton.disable(); generateSummaryButton.disable(); break; case TR_OPEN: - case TABLEUPDATE: + case TABLEUPDATE: case TABLECURATION: duplicateDetectionButton.enable(); rulesButton.disable(); @@ -395,6 +415,13 @@ public class CurationToolBar { addColumnButton.enable(); deleteColumnButton.enable(); extractCodelistButton.enable(); + TRId trId = event.getTrId(); + if (trId != null && trId.getTableType() != null + && trId.getTableType().compareTo("Codelist") == 0) { + codelistMappingButton.enable(); + } else { + codelistMappingButton.disable(); + } generateSummaryButton.disable(); break; case WIZARD_OPEN: @@ -410,14 +437,16 @@ public class CurationToolBar { addColumnButton.disable(); deleteColumnButton.disable(); extractCodelistButton.disable(); + codelistMappingButton.disable(); generateSummaryButton.disable(); break; default: break; } } catch (Exception e) { - Log.error("setUI Error on Ribbon Curation: " + e.getLocalizedMessage()); + Log.error("setUI Error on Ribbon Curation: " + + e.getLocalizedMessage()); } } - + } diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/codelistmapping.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/codelistmapping.png new file mode 100644 index 0000000000000000000000000000000000000000..04850798085602bf1ab76d205809493b9f548c1a GIT binary patch literal 962 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 literal 0 HcmV?d00001