diff --git a/pom.xml b/pom.xml index c354925..db3dbda 100644 --- a/pom.xml +++ b/pom.xml @@ -167,6 +167,14 @@ [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) + + + + org.gcube.portlets.user + tabular-data-widget-common-event + 1.0.0-SNAPSHOT + + com.allen-sauer.gwt.log diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java index eaaf00f..ec78a6c 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java @@ -20,7 +20,6 @@ import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportMonitor; import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportSession; import org.gcube.portlets.user.td.gwtservice.shared.source.SDMXRegistrySource; import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; -import org.gcube.portlets.user.td.gwtservice.shared.tr.TRId; import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; import org.gcube.portlets.user.td.gwtservice.shared.tr.TableData; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRMetadata; @@ -29,8 +28,8 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.table.metadata.TabMetadat import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Agencies; import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Codelist; import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Dataset; +import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; -import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.rpc.RemoteService; import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java index 03d2609..ca3fae3 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java @@ -11,7 +11,6 @@ import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVExportSession; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportMonitor; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVRowError; -import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException; import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadMonitor; import org.gcube.portlets.user.td.gwtservice.shared.file.HeaderPresence; import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportMonitor; @@ -20,7 +19,6 @@ import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportMonitor; import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportSession; import org.gcube.portlets.user.td.gwtservice.shared.source.SDMXRegistrySource; import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; -import org.gcube.portlets.user.td.gwtservice.shared.tr.TRId; import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; import org.gcube.portlets.user.td.gwtservice.shared.tr.TableData; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRMetadata; @@ -29,6 +27,7 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.table.metadata.TabMetadat import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Agencies; import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Codelist; import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Dataset; +import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.rpc.AsyncCallback; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java index 4436638..1ddf318 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java @@ -22,12 +22,12 @@ import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession; import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportSession; import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportSession; import org.gcube.portlets.user.td.gwtservice.shared.source.SDMXRegistrySource; -import org.gcube.portlets.user.td.gwtservice.shared.tr.TRId; import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; import org.gcube.portlets.user.td.gwtservice.shared.tr.open.TDOpenSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Agencies; import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Codelist; import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Dataset; +import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java index f1921d3..da32db8 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java @@ -84,7 +84,6 @@ import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportSession; import org.gcube.portlets.user.td.gwtservice.shared.source.SDMXRegistrySource; import org.gcube.portlets.user.td.gwtservice.shared.task.State; import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; -import org.gcube.portlets.user.td.gwtservice.shared.tr.TRId; import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; import org.gcube.portlets.user.td.gwtservice.shared.tr.TableData; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRAgencyMetadata; @@ -105,6 +104,7 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.table.metadata.TabVersion import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Agencies; import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Codelist; import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Dataset; +import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVExportMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVExportMonitor.java index fd4e0d4..128c12e 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVExportMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVExportMonitor.java @@ -6,8 +6,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.csv; import java.io.Serializable; import org.gcube.portlets.user.td.gwtservice.shared.task.State; -import org.gcube.portlets.user.td.gwtservice.shared.tr.TRId; import org.gcube.portlets.user.td.gwtservice.shared.tr.table.metadata.TabExportMetadata; +import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportMonitor.java index e3753d2..091cff6 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportMonitor.java @@ -6,7 +6,7 @@ package org.gcube.portlets.user.td.gwtservice.shared.csv; import java.io.Serializable; import org.gcube.portlets.user.td.gwtservice.shared.task.State; -import org.gcube.portlets.user.td.gwtservice.shared.tr.TRId; +import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXExportMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXExportMonitor.java index 6999a8f..565f3e5 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXExportMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXExportMonitor.java @@ -3,8 +3,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.sdmx; import java.io.Serializable; import org.gcube.portlets.user.td.gwtservice.shared.task.State; -import org.gcube.portlets.user.td.gwtservice.shared.tr.TRId; import org.gcube.portlets.user.td.gwtservice.shared.tr.table.metadata.TabExportMetadata; +import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; /** diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXImportMonitor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXImportMonitor.java index 1331b1c..532ef9c 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXImportMonitor.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXImportMonitor.java @@ -3,7 +3,7 @@ package org.gcube.portlets.user.td.gwtservice.shared.sdmx; import java.io.Serializable; import org.gcube.portlets.user.td.gwtservice.shared.task.State; -import org.gcube.portlets.user.td.gwtservice.shared.tr.TRId; +import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; /** diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnData.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnData.java index dd519b3..6c50449 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnData.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnData.java @@ -2,6 +2,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr; import java.io.Serializable; +import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; + /** * * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * - */ -public class TRId implements Serializable { - - private static final long serialVersionUID = 192846115142001630L; - - - /** - * Tabular resource id - */ - String id; - - /** - * Last table id of tabular resource - */ - String tableId; - - /** - * Type of last table - */ - String tableType; - - - public TRId() { - - } - - public TRId(String id) { - this.id = id; - this.tableId = null; - this.tableType = null; - } - - - - public TRId(String id, String tableId) { - this.id = id; - this.tableId = tableId; - this.tableType = null; - } - - public TRId(String id, String tableId, String tableType) { - this.id = id; - this.tableId = tableId; - this.tableType = null; - } - - - public String getTableId() { - return tableId; - } - - public void setTableId(String tableId) { - this.tableId = tableId; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTableType() { - return tableType; - } - - public void setTableType(String tableType) { - this.tableType = tableType; - } - - @Override - public String toString() { - return "TRId [id=" + id + ", tableId=" + tableId + ", tableType=" - + tableType + "]"; - } - - - -} diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TabResource.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TabResource.java index 63a7fee..06b1ccb 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TabResource.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TabResource.java @@ -2,7 +2,7 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.tr.TRId; +import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; /** diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TableData.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TableData.java index cf873ec..0aa267b 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TableData.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TableData.java @@ -3,6 +3,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr; import java.io.Serializable; import java.util.ArrayList; +import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; + /** * * @author "Giancarlo Panichi" + + - + diff --git a/src/test/resources/org/gcube/portlets/user/td/gwtservice/TDGWTServiceJUnit.gwt.xml b/src/test/resources/org/gcube/portlets/user/td/gwtservice/TDGWTServiceJUnit.gwt.xml index 1b5f789..ddda6cc 100644 --- a/src/test/resources/org/gcube/portlets/user/td/gwtservice/TDGWTServiceJUnit.gwt.xml +++ b/src/test/resources/org/gcube/portlets/user/td/gwtservice/TDGWTServiceJUnit.gwt.xml @@ -2,7 +2,7 @@ - +