From f5f0a20244d342fa058b0f07fb141a9bec50ab42 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 23 Apr 2015 13:44:33 +0000 Subject: [PATCH] Updated Rules git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@114366 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/resource/TabularDataResources.java | 8 ++--- .../resource/{rule-edit.png => rule-open.png} | Bin .../{rule-edit_32.png => rule-open_32.png} | Bin .../user/td/client/ribbon/RuleToolBar.java | 2 +- .../user/td/client/rule/RuleOpenDialog.java | 32 +++++++++++------- .../user/td/client/rule/RuleOpenPanel.java | 2 +- .../resource/{rule-edit.png => rule-open.png} | Bin .../{rule-edit_32.png => rule-open_32.png} | Bin 8 files changed, 26 insertions(+), 18 deletions(-) rename src/main/java/org/gcube/portlets/user/td/client/resource/{rule-edit.png => rule-open.png} (100%) rename src/main/java/org/gcube/portlets/user/td/client/resource/{rule-edit_32.png => rule-open_32.png} (100%) rename src/main/resources/org/gcube/portlets/user/td/client/resource/{rule-edit.png => rule-open.png} (100%) rename src/main/resources/org/gcube/portlets/user/td/client/resource/{rule-edit_32.png => rule-open_32.png} (100%) diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java b/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java index 24a6e4d..af9dfc7 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java +++ b/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java @@ -135,11 +135,11 @@ public interface TabularDataResources extends ClientBundle { @Source("rule-close.png") ImageResource ruleClose(); - @Source("rule-edit_32.png") - ImageResource ruleEdit32(); + @Source("rule-open_32.png") + ImageResource ruleOpen32(); - @Source("rule-edit.png") - ImageResource ruleEdit(); + @Source("rule-open.png") + ImageResource ruleOpen(); @Source("rule-delete.png") ImageResource ruleDelete(); diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/rule-edit.png b/src/main/java/org/gcube/portlets/user/td/client/resource/rule-open.png similarity index 100% rename from src/main/java/org/gcube/portlets/user/td/client/resource/rule-edit.png rename to src/main/java/org/gcube/portlets/user/td/client/resource/rule-open.png diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/rule-edit_32.png b/src/main/java/org/gcube/portlets/user/td/client/resource/rule-open_32.png similarity index 100% rename from src/main/java/org/gcube/portlets/user/td/client/resource/rule-edit_32.png rename to src/main/java/org/gcube/portlets/user/td/client/resource/rule-open_32.png diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/RuleToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/RuleToolBar.java index fe00e6a..b1b808a 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/RuleToolBar.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/RuleToolBar.java @@ -74,7 +74,7 @@ public class RuleToolBar { rulesGroup.add(ruleLayout); ruleOpenButton = new TextButton(msgs.ruleOpenButton(), - TabularDataResources.INSTANCE.ruleEdit32()); + TabularDataResources.INSTANCE.ruleOpen32()); ruleOpenButton.enable(); ruleOpenButton.setToolTip(msgs.ruleOpenButtonToolTip()); ruleOpenButton.setScale(ButtonScale.LARGE); diff --git a/src/main/java/org/gcube/portlets/user/td/client/rule/RuleOpenDialog.java b/src/main/java/org/gcube/portlets/user/td/client/rule/RuleOpenDialog.java index ac1f9d0..f8736e7 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/rule/RuleOpenDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/client/rule/RuleOpenDialog.java @@ -1,9 +1,9 @@ package org.gcube.portlets.user.td.client.rule; import org.gcube.portlets.user.td.client.resource.TabularDataResources; -import org.gcube.portlets.user.td.expressionwidget.client.RuleDialog; -import org.gcube.portlets.user.td.expressionwidget.client.notification.RuleDialogNotification; -import org.gcube.portlets.user.td.expressionwidget.client.notification.RuleDialogNotification.RuleDialogNotificationListener; +import org.gcube.portlets.user.td.expressionwidget.client.RuleEditDialog; +import org.gcube.portlets.user.td.expressionwidget.client.notification.RuleEditDialogNotification; +import org.gcube.portlets.user.td.expressionwidget.client.notification.RuleEditDialogNotification.RuleEditDialogNotificationListener; import org.gcube.portlets.user.td.gwtservice.shared.rule.RuleDescriptionData; import com.allen_sauer.gwt.log.client.Log; @@ -18,16 +18,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 RuleOpenDialog extends Window implements RuleDialogNotificationListener { +public class RuleOpenDialog extends Window implements RuleEditDialogNotificationListener { private static final String WIDTH = "720px"; private static final String HEIGHT = "530px"; - private EventBus eventBus; private RuleOpenPanel rulesOpenPanel; - + private EventBus eventBus; + public RuleOpenDialog(EventBus eventBus) { - initWindow(); this.eventBus=eventBus; - rulesOpenPanel= new RuleOpenPanel(this, + initWindow(); + rulesOpenPanel= new RuleOpenPanel(this, eventBus); add(rulesOpenPanel); } @@ -41,7 +41,7 @@ public class RuleOpenDialog extends Window implements RuleDialogNotificationList setClosable(true); setModal(true); forceLayoutOnResize = true; - getHeader().setIcon(TabularDataResources.INSTANCE.ruleEdit()); + getHeader().setIcon(TabularDataResources.INSTANCE.ruleOpen()); } @@ -72,14 +72,20 @@ public class RuleOpenDialog extends Window implements RuleDialogNotificationList protected void openRuleDialog(RuleDescriptionData ruleDescriptionData) { Log.debug("Request Open New Rule Dialog"); - RuleDialog cfDialog = new RuleDialog(ruleDescriptionData,eventBus); + RuleEditDialog reDialog = new RuleEditDialog(ruleDescriptionData,eventBus); + reDialog.addRuleEditDialogNotificationListener(this); + reDialog.show(); + + + /*RuleDialog cfDialog = new RuleDialog(ruleDescriptionData,eventBus); cfDialog.addRuleDialogNotificationListener(this); - cfDialog.show(); + cfDialog.show();*/ + } @Override - public void onNotification(RuleDialogNotification ruleDialogNotification) { + public void onNotification(RuleEditDialogNotification ruleEditDialogNotification) { rulesOpenPanel.gridReload(); } @@ -94,6 +100,8 @@ public class RuleOpenDialog extends Window implements RuleDialogNotificationList Log.debug("Error in edit rule: "+throwable.getLocalizedMessage()); } + + diff --git a/src/main/java/org/gcube/portlets/user/td/client/rule/RuleOpenPanel.java b/src/main/java/org/gcube/portlets/user/td/client/rule/RuleOpenPanel.java index e738b58..b14c436 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/rule/RuleOpenPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/client/rule/RuleOpenPanel.java @@ -282,7 +282,7 @@ public class RuleOpenPanel extends FramedPanel { toolBar.getElement().getStyle().setProperty("borderBottom", "none"); btnOpen = new TextButton("Edit"); - btnOpen.setIcon(TabularDataResources.INSTANCE.ruleEdit()); + btnOpen.setIcon(TabularDataResources.INSTANCE.ruleOpen()); btnOpen.setIconAlign(IconAlign.RIGHT); btnOpen.setToolTip("Edit"); btnOpen.addSelectHandler(new SelectHandler() { diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/rule-edit.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/rule-open.png similarity index 100% rename from src/main/resources/org/gcube/portlets/user/td/client/resource/rule-edit.png rename to src/main/resources/org/gcube/portlets/user/td/client/resource/rule-open.png diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/rule-edit_32.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/rule-open_32.png similarity index 100% rename from src/main/resources/org/gcube/portlets/user/td/client/resource/rule-edit_32.png rename to src/main/resources/org/gcube/portlets/user/td/client/resource/rule-open_32.png