From 598ba1398890819e4eba718d5a329374d719282d Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 2 Dec 2013 19:01:07 +0000 Subject: [PATCH] Reorganized the event classes git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-widget-common-event@86469 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../event/CloseTabularResourceEvent.java | 50 ------------------- .../client/event/ExportTableEvent.java | 50 ------------------- .../client/event/ImportTableEvent.java | 50 ------------------- .../client/event/OpenFunctionalityEvent.java | 50 ------------------- .../event/OpenTabularResourceEvent.java | 50 ------------------- .../client/type/CloseTabularResourceType.java | 14 ------ .../client/type/ExportTableType.java | 14 ------ .../client/type/ImportTableType.java | 16 ------ .../client/type/OpenFunctionalityType.java | 12 ----- .../client/type/OpenTabularResourceType.java | 14 ------ .../client/GwtTestWidgetCommonEvent.java | 39 ++++++++------- 11 files changed, 20 insertions(+), 339 deletions(-) delete mode 100644 src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/CloseTabularResourceEvent.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ExportTableEvent.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ImportTableEvent.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/OpenFunctionalityEvent.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/OpenTabularResourceEvent.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/CloseTabularResourceType.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/ExportTableType.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/ImportTableType.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/OpenFunctionalityType.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/OpenTabularResourceType.java diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/CloseTabularResourceEvent.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/CloseTabularResourceEvent.java deleted file mode 100644 index b474033..0000000 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/CloseTabularResourceEvent.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.gcube.portlets.user.td.widgetcommonevent.client.event; - -import org.gcube.portlets.user.td.widgetcommonevent.client.type.CloseTabularResourceType; - -import com.google.gwt.event.shared.GwtEvent; -import com.google.gwt.event.shared.EventHandler; - -import com.google.gwt.event.shared.HasHandlers; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class CloseTabularResourceEvent extends GwtEvent { - - public static Type TYPE = new Type(); - private CloseTabularResourceType closeType; - - public interface CloseTabularResourceHandler extends EventHandler { - void onCloseTabularResource(CloseTabularResourceEvent event); - } - - public CloseTabularResourceEvent(CloseTabularResourceType closeType) { - this.closeType = closeType; - } - - public CloseTabularResourceType getCloseType() { - return closeType; - } - - @Override - protected void dispatch(CloseTabularResourceHandler handler) { - handler.onCloseTabularResource(this); - } - - @Override - public Type getAssociatedType() { - return TYPE; - } - - public static Type getType() { - return TYPE; - } - - public static void fire(HasHandlers source, CloseTabularResourceType closeType) { - source.fireEvent(new CloseTabularResourceEvent(closeType)); - } -} diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ExportTableEvent.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ExportTableEvent.java deleted file mode 100644 index d7e321f..0000000 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ExportTableEvent.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.gcube.portlets.user.td.widgetcommonevent.client.event; - -import com.google.gwt.event.shared.GwtEvent; -import com.google.gwt.event.shared.EventHandler; - -import org.gcube.portlets.user.td.widgetcommonevent.client.type.ExportTableType; - -import com.google.gwt.event.shared.HasHandlers; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class ExportTableEvent extends GwtEvent { - - public static Type TYPE = new Type(); - private ExportTableType exportType; - - public interface ExportTableHandler extends EventHandler { - void onExportTable(ExportTableEvent event); - } - - public ExportTableEvent(ExportTableType exportType) { - this.exportType = exportType; - } - - public ExportTableType getExportType() { - return exportType; - } - - @Override - protected void dispatch(ExportTableHandler handler) { - handler.onExportTable(this); - } - - @Override - public Type getAssociatedType() { - return TYPE; - } - - public static Type getType() { - return TYPE; - } - - public static void fire(HasHandlers source, ExportTableType exportType) { - source.fireEvent(new ExportTableEvent(exportType)); - } -} diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ImportTableEvent.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ImportTableEvent.java deleted file mode 100644 index 4d33961..0000000 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ImportTableEvent.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.gcube.portlets.user.td.widgetcommonevent.client.event; - -import com.google.gwt.event.shared.GwtEvent; -import com.google.gwt.event.shared.EventHandler; - -import org.gcube.portlets.user.td.widgetcommonevent.client.type.ImportTableType; - -import com.google.gwt.event.shared.HasHandlers; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class ImportTableEvent extends GwtEvent { - - public static Type TYPE = new Type(); - private ImportTableType importType; - - public interface ImportTableHandler extends EventHandler { - void onImportTable(ImportTableEvent event); - } - - public ImportTableEvent(ImportTableType importType) { - this.importType = importType; - } - - public ImportTableType getImportType() { - return importType; - } - - @Override - protected void dispatch(ImportTableHandler handler) { - handler.onImportTable(this); - } - - @Override - public Type getAssociatedType() { - return TYPE; - } - - public static Type getType() { - return TYPE; - } - - public static void fire(HasHandlers source, ImportTableType importType) { - source.fireEvent(new ImportTableEvent(importType)); - } -} diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/OpenFunctionalityEvent.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/OpenFunctionalityEvent.java deleted file mode 100644 index 2c6a814..0000000 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/OpenFunctionalityEvent.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.gcube.portlets.user.td.widgetcommonevent.client.event; - -import org.gcube.portlets.user.td.widgetcommonevent.client.type.OpenFunctionalityType; - -import com.google.gwt.event.shared.GwtEvent; -import com.google.gwt.event.shared.EventHandler; - -import com.google.gwt.event.shared.HasHandlers; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class OpenFunctionalityEvent extends GwtEvent { - - public static Type TYPE = new Type(); - private OpenFunctionalityType openFunctionalityType; - - public interface OpenFunctionalityHandler extends EventHandler { - void onOpenFunctionality(OpenFunctionalityEvent event); - } - - public OpenFunctionalityEvent(OpenFunctionalityType openFunctionalityType) { - this.openFunctionalityType = openFunctionalityType; - } - - public OpenFunctionalityType getOpenFunctionalityType() { - return openFunctionalityType; - } - - @Override - protected void dispatch(OpenFunctionalityHandler handler) { - handler.onOpenFunctionality(this); - } - - @Override - public Type getAssociatedType() { - return TYPE; - } - - public static Type getType() { - return TYPE; - } - - public static void fire(HasHandlers source, OpenFunctionalityType openFunctionalityType) { - source.fireEvent(new OpenFunctionalityEvent(openFunctionalityType)); - } -} diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/OpenTabularResourceEvent.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/OpenTabularResourceEvent.java deleted file mode 100644 index c9effe0..0000000 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/OpenTabularResourceEvent.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.gcube.portlets.user.td.widgetcommonevent.client.event; - -import org.gcube.portlets.user.td.widgetcommonevent.client.type.OpenTabularResourceType; - -import com.google.gwt.event.shared.GwtEvent; -import com.google.gwt.event.shared.EventHandler; - -import com.google.gwt.event.shared.HasHandlers; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class OpenTabularResourceEvent extends GwtEvent { - - public static Type TYPE = new Type(); - private OpenTabularResourceType openType; - - public interface OpenTabularResourceHandler extends EventHandler { - void onOpenTabularResource(OpenTabularResourceEvent event); - } - - public OpenTabularResourceEvent(OpenTabularResourceType openType) { - this.openType = openType; - } - - public OpenTabularResourceType getOpenType() { - return openType; - } - - @Override - protected void dispatch(OpenTabularResourceHandler handler) { - handler.onOpenTabularResource(this); - } - - @Override - public Type getAssociatedType() { - return TYPE; - } - - public static Type getType() { - return TYPE; - } - - public static void fire(HasHandlers source, OpenTabularResourceType openType) { - source.fireEvent(new OpenTabularResourceEvent(openType)); - } -} diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/CloseTabularResourceType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/CloseTabularResourceType.java deleted file mode 100644 index ecf507f..0000000 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/CloseTabularResourceType.java +++ /dev/null @@ -1,14 +0,0 @@ -/** - * - */ -package org.gcube.portlets.user.td.widgetcommonevent.client.type; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public enum CloseTabularResourceType { - TABLE; -} diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/ExportTableType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/ExportTableType.java deleted file mode 100644 index 0872564..0000000 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/ExportTableType.java +++ /dev/null @@ -1,14 +0,0 @@ - -package org.gcube.portlets.user.td.widgetcommonevent.client.type; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public enum ExportTableType { - CSV, - SDMX, - JSON; -} diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/ImportTableType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/ImportTableType.java deleted file mode 100644 index 626256c..0000000 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/ImportTableType.java +++ /dev/null @@ -1,16 +0,0 @@ -/** - * - */ -package org.gcube.portlets.user.td.widgetcommonevent.client.type; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public enum ImportTableType { - CSV, - SDMX, - JSON; -} diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/OpenFunctionalityType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/OpenFunctionalityType.java deleted file mode 100644 index e5e1279..0000000 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/OpenFunctionalityType.java +++ /dev/null @@ -1,12 +0,0 @@ - -package org.gcube.portlets.user.td.widgetcommonevent.client.type; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public enum OpenFunctionalityType { - PROPERTIES; -} diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/OpenTabularResourceType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/OpenTabularResourceType.java deleted file mode 100644 index 920681b..0000000 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/OpenTabularResourceType.java +++ /dev/null @@ -1,14 +0,0 @@ -/** - * - */ -package org.gcube.portlets.user.td.widgetcommonevent.client.type; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public enum OpenTabularResourceType { - TABLE; -} diff --git a/src/test/java/org/gcube/portlets/user/td/widgetcommonevent/client/GwtTestWidgetCommonEvent.java b/src/test/java/org/gcube/portlets/user/td/widgetcommonevent/client/GwtTestWidgetCommonEvent.java index 37f23d6..62b7e11 100644 --- a/src/test/java/org/gcube/portlets/user/td/widgetcommonevent/client/GwtTestWidgetCommonEvent.java +++ b/src/test/java/org/gcube/portlets/user/td/widgetcommonevent/client/GwtTestWidgetCommonEvent.java @@ -1,7 +1,7 @@ package org.gcube.portlets.user.td.widgetcommonevent.client; -import org.gcube.portlets.user.td.widgetcommonevent.client.event.ImportTableEvent; -import org.gcube.portlets.user.td.widgetcommonevent.client.type.ImportTableType; +import org.gcube.portlets.user.td.widgetcommonevent.client.event.RibbonEvent; +import org.gcube.portlets.user.td.widgetcommonevent.client.type.RibbonType; import org.junit.Test; import com.google.gwt.junit.client.GWTTestCase; @@ -33,40 +33,41 @@ public class GwtTestWidgetCommonEvent extends GWTTestCase { SimpleEventBus eventBus=new SimpleEventBus(); - eventBus.addHandler(ImportTableEvent.TYPE, - new ImportTableEvent.ImportTableHandler() { - + eventBus.addHandler(RibbonEvent.TYPE, + new RibbonEvent.RibbonEventHandler() { + @Override - public void onImportTable(ImportTableEvent event) { - doImportTable(event.getImportType()); + public void onRibbon(RibbonEvent event) { + doRibbonCommand(event); + } - }); + }); + + eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTSDMX)); + eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTCSV)); + eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTJSON)); - eventBus.fireEvent(new ImportTableEvent(ImportTableType.SDMX)); - eventBus.fireEvent(new ImportTableEvent(ImportTableType.CSV)); - eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON)); - } - private void doImportTable(ImportTableType importType) { - System.out.println("doImportTable importType: " + importType); + private void doRibbonCommand(RibbonEvent event) { + System.out.println("doRibbonCommand Type: " + event.getRibbonType()); try { - switch (importType) { - case SDMX: + switch (event.getRibbonType()) { + case IMPORTSDMX: System.out.println("Start Import SDMX"); break; - case CSV: + case IMPORTCSV: System.out.println("Start Import CSV"); break; - case JSON: + case IMPORTJSON: System.out.println("Start Import JSON"); break; default: break; } } catch (Exception e) { - System.out.println("doImportTable Error : " + e.getLocalizedMessage() + System.out.println("doRibbonCommand Error : " + e.getLocalizedMessage() + " \n " + e.getMessage()); } }