From d156932a068e7a0648667deacc1bb7931c5ae2e1 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 10 Apr 2015 09:22:33 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@113933 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/td/client/TabularDataController.java | 4 +-- .../td/client/ribbon/TemplateToolBar.java | 26 +++++++++---------- .../ribbon/TemplateToolBarMessages.java | 8 +++--- .../client/template/TemplateApplyPanel.java | 4 +-- .../client/template/TemplateDeletePanel.java | 4 +-- ...ditDialog.java => TemplateOpenDialog.java} | 8 +++--- ...eEditPanel.java => TemplateOpenPanel.java} | 26 +++++++++---------- .../client/template/TemplateSharePanel.java | 4 +-- .../ribbon/TemplateToolBarMessages.properties | 4 +-- .../TemplateToolBarMessages_es.properties | 4 +-- .../TemplateToolBarMessages_it.properties | 4 +-- 11 files changed, 48 insertions(+), 48 deletions(-) rename src/main/java/org/gcube/portlets/user/td/client/template/{TemplateEditDialog.java => TemplateOpenDialog.java} (89%) rename src/main/java/org/gcube/portlets/user/td/client/template/{TemplateEditPanel.java => TemplateOpenPanel.java} (95%) diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java index 7c04360..b5c4dcd 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java +++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java @@ -12,7 +12,7 @@ import org.gcube.portlets.user.td.client.logs.TDMLogs; import org.gcube.portlets.user.td.client.rstudio.RStudio; import org.gcube.portlets.user.td.client.template.TemplateApplyDialog; import org.gcube.portlets.user.td.client.template.TemplateDeleteDialog; -import org.gcube.portlets.user.td.client.template.TemplateEditDialog; +import org.gcube.portlets.user.td.client.template.TemplateOpenDialog; import org.gcube.portlets.user.td.client.template.TemplateShareDialog; import org.gcube.portlets.user.td.codelistmappingimportwidget.client.CodelistMappingImportWizardTD; import org.gcube.portlets.user.td.csvexportwidget.client.CSVExportWizardTD; @@ -1638,7 +1638,7 @@ public class TabularDataController { GWT.runAsync(new RunAsyncCallback() { public void onSuccess() { Log.debug("Template Open call"); - TemplateEditDialog tdDialog = new TemplateEditDialog(eventBus); + TemplateOpenDialog tdDialog = new TemplateOpenDialog(eventBus); tdDialog.show(); } diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/TemplateToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/TemplateToolBar.java index 1966bf1..1663927 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/TemplateToolBar.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/TemplateToolBar.java @@ -38,7 +38,7 @@ public class TemplateToolBar { //Template private TextButton templateNewButton; - private TextButton templateEditButton; + private TextButton templateOpenButton; private TextButton templateDeleteButton; private TextButton templateApplyButton; private TextButton templateShareButton; @@ -90,14 +90,14 @@ public class TemplateToolBar { templateLayout.setWidget(0, 0, templateNewButton); templateLayout.getFlexCellFormatter().setRowSpan(0, 0, 2); - templateEditButton = new TextButton(msgs.templateEditButton(), + templateOpenButton = new TextButton(msgs.templateOpenButton(), TabularDataResources.INSTANCE.templateEdit32()); - templateEditButton.enable(); - templateEditButton.setToolTip(msgs.templateEditButtonToolTip()); - templateEditButton.setScale(ButtonScale.LARGE); - templateEditButton.setIconAlign(IconAlign.TOP); - templateEditButton.setArrowAlign(ButtonArrowAlign.BOTTOM); - templateEditButton.addSelectHandler(new SelectHandler() { + templateOpenButton.enable(); + templateOpenButton.setToolTip(msgs.templateOpenButtonToolTip()); + templateOpenButton.setScale(ButtonScale.LARGE); + templateOpenButton.setIconAlign(IconAlign.TOP); + templateOpenButton.setArrowAlign(ButtonArrowAlign.BOTTOM); + templateOpenButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { eventBus.fireEvent(new RibbonEvent( @@ -105,7 +105,7 @@ public class TemplateToolBar { } }); - templateLayout.setWidget(0, 1, templateEditButton); + templateLayout.setWidget(0, 1, templateOpenButton); templateLayout.getFlexCellFormatter().setRowSpan(0, 1, 2); @@ -192,7 +192,7 @@ public class TemplateToolBar { try { switch (uiStateType) { case START: - templateEditButton.enable(); + templateOpenButton.enable(); templateNewButton.enable(); templateDeleteButton.enable(); templateApplyButton.disable(); @@ -200,7 +200,7 @@ public class TemplateToolBar { break; case TR_CLOSE: case TR_READONLY: - templateEditButton.enable(); + templateOpenButton.enable(); templateNewButton.enable(); templateDeleteButton.enable(); templateApplyButton.disable(); @@ -209,14 +209,14 @@ public class TemplateToolBar { case TR_OPEN: case TABLEUPDATE: case TABLECURATION: - templateEditButton.enable(); + templateOpenButton.enable(); templateNewButton.enable(); templateDeleteButton.enable(); templateApplyButton.enable(); templateShareButton.enable(); break; case WIZARD_OPEN: - templateEditButton.disable(); + templateOpenButton.disable(); templateNewButton.disable(); templateDeleteButton.disable(); templateApplyButton.disable(); diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages.java index 0a7874c..67af15c 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages.java @@ -19,11 +19,11 @@ public interface TemplateToolBarMessages extends Messages { @DefaultMessage("New") String templateNewButtonToolTip(); - @DefaultMessage("Edit") - String templateEditButton(); + @DefaultMessage("Open") + String templateOpenButton(); - @DefaultMessage("Edit") - String templateEditButtonToolTip(); + @DefaultMessage("Open") + String templateOpenButtonToolTip(); @DefaultMessage("Delete") String templateDeleteButton(); diff --git a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateApplyPanel.java b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateApplyPanel.java index 79824dd..66f348b 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateApplyPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateApplyPanel.java @@ -212,7 +212,7 @@ public class TemplateApplyPanel extends FramedPanel { btnApply = new TextButton("Apply"); btnApply.setIcon(TabularDataResources.INSTANCE.templateApply()); btnApply.setIconAlign(IconAlign.RIGHT); - btnApply.setTitle("Apply Template"); + btnApply.setToolTip("Apply Template"); btnApply.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { @@ -225,7 +225,7 @@ public class TemplateApplyPanel extends FramedPanel { btnClose = new TextButton("Close"); btnClose.setIcon(TabularDataResources.INSTANCE.close()); btnClose.setIconAlign(IconAlign.RIGHT); - btnClose.setTitle("Close"); + btnClose.setToolTip("Close"); btnClose.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { diff --git a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeletePanel.java b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeletePanel.java index c3b1b02..e554dc5 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeletePanel.java +++ b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeletePanel.java @@ -202,7 +202,7 @@ public class TemplateDeletePanel extends FramedPanel { btnDelete = new TextButton("Delete"); btnDelete.setIcon(TabularDataResources.INSTANCE.templateDelete()); btnDelete.setIconAlign(IconAlign.RIGHT); - btnDelete.setTitle("Delete Template"); + btnDelete.setToolTip("Delete Template"); btnDelete.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { @@ -215,7 +215,7 @@ public class TemplateDeletePanel extends FramedPanel { btnClose = new TextButton("Close"); btnClose.setIcon(TabularDataResources.INSTANCE.close()); btnClose.setIconAlign(IconAlign.RIGHT); - btnClose.setTitle("Close"); + btnClose.setToolTip("Close"); btnClose.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { diff --git a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateEditDialog.java b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenDialog.java similarity index 89% rename from src/main/java/org/gcube/portlets/user/td/client/template/TemplateEditDialog.java rename to src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenDialog.java index 352dfca..fb8b2bd 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateEditDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenDialog.java @@ -16,16 +16,16 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it * */ -public class TemplateEditDialog extends Window { +public class TemplateOpenDialog extends Window { private static final String WIDTH = "720px"; private static final String HEIGHT = "530px"; private EventBus eventBus; - public TemplateEditDialog(EventBus eventBus) { + public TemplateOpenDialog(EventBus eventBus) { this.eventBus = eventBus; initWindow(); - TemplateEditPanel templateOpenPanel = new TemplateEditPanel(this, + TemplateOpenPanel templateOpenPanel = new TemplateOpenPanel(this, eventBus); add(templateOpenPanel); } @@ -35,7 +35,7 @@ public class TemplateEditDialog extends Window { setHeight(HEIGHT); setBodyBorder(false); setResizable(false); - setHeadingText("Edit Template"); + setHeadingText("Open Template"); setClosable(true); setModal(true); forceLayoutOnResize = true; diff --git a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateEditPanel.java b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenPanel.java similarity index 95% rename from src/main/java/org/gcube/portlets/user/td/client/template/TemplateEditPanel.java rename to src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenPanel.java index da41b4c..d6f7c1e 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateEditPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenPanel.java @@ -58,13 +58,13 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it * */ -public class TemplateEditPanel extends FramedPanel { +public class TemplateOpenPanel extends FramedPanel { private static final String WIDTH = "630px"; private static final String HEIGHT = "520px"; private EventBus eventBus; - private TemplateEditDialog parent; + private TemplateOpenDialog parent; - private TextButton btnEdit; + private TextButton btnOpen; private TextButton btnClose; @@ -72,7 +72,7 @@ public class TemplateEditPanel extends FramedPanel { private Grid grid; private ExtendedListStore store; - public TemplateEditPanel(TemplateEditDialog parent, EventBus eventBus) { + public TemplateOpenPanel(TemplateOpenDialog parent, EventBus eventBus) { this.parent = parent; Log.debug("TemplateEditPanel"); setWidth(WIDTH); @@ -144,7 +144,7 @@ public class TemplateEditPanel extends FramedPanel { String searchTerm = searchField.getCurrentValue(); if (searchTerm == null) return true; - return TemplateEditPanel.this.select(item, searchTerm); + return TemplateOpenPanel.this.select(item, searchTerm); } }); @@ -204,14 +204,14 @@ public class TemplateEditPanel extends FramedPanel { toolBar.addStyleName(ThemeStyles.get().style().borderTop()); toolBar.getElement().getStyle().setProperty("borderBottom", "none"); - btnEdit = new TextButton("Edit"); - btnEdit.setIcon(TabularDataResources.INSTANCE.templateEdit()); - btnEdit.setIconAlign(IconAlign.RIGHT); - btnEdit.setTitle("Edit"); - btnEdit.addSelectHandler(new SelectHandler() { + btnOpen = new TextButton("Open"); + btnOpen.setIcon(TabularDataResources.INSTANCE.templateEdit()); + btnOpen.setIconAlign(IconAlign.RIGHT); + btnOpen.setToolTip("Open"); + btnOpen.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - Log.debug("Pressed Edit"); + Log.debug("Pressed Open"); open(); } @@ -220,7 +220,7 @@ public class TemplateEditPanel extends FramedPanel { btnClose = new TextButton("Close"); btnClose.setIcon(TabularDataResources.INSTANCE.close()); btnClose.setIconAlign(IconAlign.RIGHT); - btnClose.setTitle("Close"); + btnClose.setToolTip("Close"); btnClose.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { @@ -236,7 +236,7 @@ public class TemplateEditPanel extends FramedPanel { flowButton.setPack(BoxLayoutPack.CENTER); BoxLayoutData boxLayoutData = new BoxLayoutData(new Margins(2, 4, 2, 4)); - flowButton.add(btnEdit, boxLayoutData); + flowButton.add(btnOpen, boxLayoutData); flowButton.add(btnClose, boxLayoutData); diff --git a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateSharePanel.java b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateSharePanel.java index 96ed932..323259f 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateSharePanel.java +++ b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateSharePanel.java @@ -208,7 +208,7 @@ public class TemplateSharePanel extends FramedPanel { btnClose = new TextButton("Close"); btnClose.setIcon(TabularDataResources.INSTANCE.close()); btnClose.setIconAlign(IconAlign.RIGHT); - btnClose.setTitle("Close"); + btnClose.setToolTip("Close"); btnClose.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { @@ -220,7 +220,7 @@ public class TemplateSharePanel extends FramedPanel { btnShare = new TextButton("Share"); btnShare.setIcon(TabularDataResources.INSTANCE.share()); btnShare.setIconAlign(IconAlign.RIGHT); - btnShare.setTitle("Share"); + btnShare.setToolTip("Share"); btnShare.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { diff --git a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages.properties b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages.properties index dd82aa2..bbe215f 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages.properties @@ -1,8 +1,8 @@ templateGroupHeadingText = Manage templateNewButton = New templateNewButtonToolTip = New -templateEditButton = Edit -templateEditButtonToolTip = Edit +templateOpenButton = Open +templateOpenButtonToolTip = Open templateDeleteButton = Delete templateDeleteButtonToolTip = Delete templateApplyButton = Apply diff --git a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages_es.properties index 0a2b716..32f27b1 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages_es.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages_es.properties @@ -1,8 +1,8 @@ templateGroupHeadingText = Gestionar templateNewButton = Nuevo templateNewButtonToolTip = Nuevo -templateEditButton = Editar -templateEditButtonToolTip = Editar +templateOpenButton = Open +templateOpenButtonToolTip = Open templateDeleteButton = Borrar templateDeleteButtonToolTip = Borrar templateApplyButton = Aplicar diff --git a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages_it.properties b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages_it.properties index 4a91879..849f1d8 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages_it.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages_it.properties @@ -1,8 +1,8 @@ templateGroupHeadingText = Gestisci templateNewButton = Nuovo templateNewButtonToolTip = Nuovo -templateEditButton = Modifica -templateEditButtonToolTip = Modifica +templateOpenButton = Open +templateOpenButtonToolTip = Open templateDeleteButton = Elimina templateDeleteButtonToolTip = Elimina templateApplyButton = Applica