From 15d85054ed39b7510703bf6b313a2edf2c13e39e Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 21 Nov 2013 09:21:20 +0000 Subject: [PATCH] Reorganized packages tree git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@85827 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../td/gwtservice/client/rpc/TDGWTService.java | 16 ++++++++-------- .../client/rpc/TDGWTServiceAsync.java | 14 +++++++------- .../user/td/gwtservice/server/SDMXClient.java | 6 +++--- .../user/td/gwtservice/server/SessionUtil.java | 12 ++++++------ .../td/gwtservice/server/TDGWTServiceImpl.java | 18 +++++++++--------- .../server/storage/FilesStorage.java | 2 +- .../shared/csv/CSVImportMonitor.java | 4 ++-- .../shared/csv/CSVImportSession.java | 2 +- .../{ => exception}/TDGWTServiceException.java | 2 +- .../shared/sdmx/SDMXExportMonitor.java | 2 +- .../shared/sdmx/SDMXExportSession.java | 2 +- .../shared/sdmx/SDMXImportMonitor.java | 4 ++-- .../shared/sdmx/SDMXImportSession.java | 4 ++-- .../td/gwtservice/shared/{ => task}/State.java | 2 +- .../gwtservice/shared/{ => tr}/ColumnData.java | 2 +- .../td/gwtservice/shared/{ => tr}/TRId.java | 2 +- .../shared/{ => tr}/TabResource.java | 4 ++-- .../gwtservice/shared/{ => tr}/TableData.java | 2 +- .../shared/{ => tr/open}/TDOpenSession.java | 4 +++- .../shared/{ => tr/type}/Agencies.java | 2 +- .../shared/{ => tr/type}/Codelist.java | 2 +- .../shared/{ => tr/type}/Dataset.java | 2 +- .../gwtservice/client/GwtTestTDGWTService.java | 2 +- 23 files changed, 57 insertions(+), 55 deletions(-) rename src/main/java/org/gcube/portlets/user/td/gwtservice/shared/{ => exception}/TDGWTServiceException.java (88%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/shared/{ => task}/State.java (84%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/shared/{ => tr}/ColumnData.java (94%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/shared/{ => tr}/TRId.java (93%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/shared/{ => tr}/TabResource.java (93%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/shared/{ => tr}/TableData.java (96%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/shared/{ => tr/open}/TDOpenSession.java (87%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/shared/{ => tr/type}/Agencies.java (95%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/shared/{ => tr/type}/Codelist.java (96%) rename src/main/java/org/gcube/portlets/user/td/gwtservice/shared/{ => tr/type}/Dataset.java (96%) 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 b9d344c..c9ffabf 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 @@ -6,23 +6,23 @@ package org.gcube.portlets.user.td.gwtservice.client.rpc; import java.util.ArrayList; import java.util.List; -import org.gcube.portlets.user.td.gwtservice.shared.Agencies; -import org.gcube.portlets.user.td.gwtservice.shared.Codelist; -import org.gcube.portlets.user.td.gwtservice.shared.Dataset; -import org.gcube.portlets.user.td.gwtservice.shared.TDGWTServiceException; -import org.gcube.portlets.user.td.gwtservice.shared.TDOpenSession; -import org.gcube.portlets.user.td.gwtservice.shared.TRId; -import org.gcube.portlets.user.td.gwtservice.shared.TabResource; -import org.gcube.portlets.user.td.gwtservice.shared.TableData; import org.gcube.portlets.user.td.gwtservice.shared.csv.AvailableCharsetList; 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.SDMXImportMonitor; import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportSession; +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; +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 com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.rpc.RemoteService; 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 4bbc4f7..74caa94 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 @@ -6,13 +6,6 @@ package org.gcube.portlets.user.td.gwtservice.client.rpc; import java.util.ArrayList; import java.util.List; -import org.gcube.portlets.user.td.gwtservice.shared.Agencies; -import org.gcube.portlets.user.td.gwtservice.shared.Codelist; -import org.gcube.portlets.user.td.gwtservice.shared.Dataset; -import org.gcube.portlets.user.td.gwtservice.shared.TDOpenSession; -import org.gcube.portlets.user.td.gwtservice.shared.TRId; -import org.gcube.portlets.user.td.gwtservice.shared.TabResource; -import org.gcube.portlets.user.td.gwtservice.shared.TableData; import org.gcube.portlets.user.td.gwtservice.shared.csv.AvailableCharsetList; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportMonitor; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession; @@ -21,7 +14,14 @@ 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.SDMXImportMonitor; import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportSession; +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; +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 com.google.gwt.core.client.GWT; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SDMXClient.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SDMXClient.java index 1bc9622..89ea28d 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SDMXClient.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SDMXClient.java @@ -13,9 +13,9 @@ import org.gcube.datapublishing.sdmx.api.registry.SDMXRegistryClient.References; import org.gcube.datapublishing.sdmx.impl.model.GCubeSDMXRegistryDescriptor; import org.gcube.datapublishing.sdmx.impl.model.SDMXRegistryDescriptorImpl; import org.gcube.datapublishing.sdmx.impl.registry.FusionRegistryClient; -import org.gcube.portlets.user.td.gwtservice.shared.Agencies; -import org.gcube.portlets.user.td.gwtservice.shared.Codelist; -import org.gcube.portlets.user.td.gwtservice.shared.Dataset; +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.sdmxsource.sdmx.api.model.beans.SdmxBeans; import org.sdmxsource.sdmx.api.model.beans.base.AgencyBean; import org.sdmxsource.sdmx.api.model.beans.codelist.CodelistBean; 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 4767612..feff180 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 @@ -16,16 +16,16 @@ import org.gcube.data.analysis.tabulardata.service.tabular.TabularResource; import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; import org.gcube.portlets.user.td.gwtservice.server.file.FileUploadSession; import org.gcube.portlets.user.td.gwtservice.server.trservice.TRTasksManager; -import org.gcube.portlets.user.td.gwtservice.shared.Agencies; -import org.gcube.portlets.user.td.gwtservice.shared.Codelist; import org.gcube.portlets.user.td.gwtservice.shared.Constants; -import org.gcube.portlets.user.td.gwtservice.shared.Dataset; -import org.gcube.portlets.user.td.gwtservice.shared.TDOpenSession; -import org.gcube.portlets.user.td.gwtservice.shared.TRId; -import org.gcube.portlets.user.td.gwtservice.shared.TabResource; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession; 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.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 c679c15..73d4392 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 @@ -61,26 +61,22 @@ import org.gcube.portlets.user.td.gwtservice.server.file.FileUploadSession; import org.gcube.portlets.user.td.gwtservice.server.file.FileUtil; import org.gcube.portlets.user.td.gwtservice.server.storage.FilesStorage; import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationsId; -import org.gcube.portlets.user.td.gwtservice.shared.Agencies; -import org.gcube.portlets.user.td.gwtservice.shared.Codelist; -import org.gcube.portlets.user.td.gwtservice.shared.ColumnData; -import org.gcube.portlets.user.td.gwtservice.shared.Dataset; -import org.gcube.portlets.user.td.gwtservice.shared.TDGWTServiceException; -import org.gcube.portlets.user.td.gwtservice.shared.TDOpenSession; -import org.gcube.portlets.user.td.gwtservice.shared.TRId; -import org.gcube.portlets.user.td.gwtservice.shared.TabResource; -import org.gcube.portlets.user.td.gwtservice.shared.TableData; import org.gcube.portlets.user.td.gwtservice.shared.csv.AvailableCharsetList; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVFileUtil; 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.CSVParserConfiguration; 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.FileUploadState; import org.gcube.portlets.user.td.gwtservice.shared.file.HeaderPresence; 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.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.TRDescriptionsMetadata; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRExportMetadata; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRGenericMapMetadata; @@ -89,6 +85,10 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRLocalizedText; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRMetadata; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRNamesMetadata; import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRVersionMetadata; +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.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java index 78abd29..65af38a 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java @@ -17,7 +17,7 @@ import org.gcube.contentmanager.storageclient.model.protocol.smp.SMPURLConnectio import org.gcube.contentmanager.storageclient.wrapper.AccessType; import org.gcube.contentmanager.storageclient.wrapper.MemoryType; import org.gcube.contentmanager.storageclient.wrapper.StorageClient; -import org.gcube.portlets.user.td.gwtservice.shared.TDGWTServiceException; +import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 e5f3b70..e3753d2 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 @@ -5,8 +5,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.csv; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.State; -import org.gcube.portlets.user.td.gwtservice.shared.TRId; +import org.gcube.portlets.user.td.gwtservice.shared.task.State; +import org.gcube.portlets.user.td.gwtservice.shared.tr.TRId; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportSession.java index efaddbf..9e261bf 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportSession.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportSession.java @@ -7,8 +7,8 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; -import org.gcube.portlets.user.td.gwtservice.shared.TabResource; import org.gcube.portlets.user.td.gwtservice.shared.source.Source; +import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TDGWTServiceException.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/exception/TDGWTServiceException.java similarity index 88% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TDGWTServiceException.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/exception/TDGWTServiceException.java index a16dcf5..28d7782 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TDGWTServiceException.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/exception/TDGWTServiceException.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gwtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared.exception; /** * 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 2ad0a51..e87b639 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 @@ -2,7 +2,7 @@ package org.gcube.portlets.user.td.gwtservice.shared.sdmx; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.State; +import org.gcube.portlets.user.td.gwtservice.shared.task.State; /** diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXExportSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXExportSession.java index 2bae186..cb8d30a 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXExportSession.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXExportSession.java @@ -5,7 +5,7 @@ package org.gcube.portlets.user.td.gwtservice.shared.sdmx; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.TabResource; +import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; 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 693ded2..1331b1c 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 @@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.gwtservice.shared.sdmx; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.State; -import org.gcube.portlets.user.td.gwtservice.shared.TRId; +import org.gcube.portlets.user.td.gwtservice.shared.task.State; +import org.gcube.portlets.user.td.gwtservice.shared.tr.TRId; /** diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXImportSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXImportSession.java index f388d33..51a3fb8 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXImportSession.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXImportSession.java @@ -5,10 +5,10 @@ package org.gcube.portlets.user.td.gwtservice.shared.sdmx; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.Codelist; -import org.gcube.portlets.user.td.gwtservice.shared.TabResource; import org.gcube.portlets.user.td.gwtservice.shared.document.SDMXDocument; import org.gcube.portlets.user.td.gwtservice.shared.source.Source; +import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; +import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Codelist; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/State.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/State.java similarity index 84% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/State.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/State.java index e79f0b8..364e24a 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/State.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/State.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.td.gwtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared.task; import java.io.Serializable; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/ColumnData.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnData.java similarity index 94% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/ColumnData.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnData.java index a04379d..e3b27ce 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/ColumnData.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnData.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.td.gwtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared.tr; import java.io.Serializable; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TRId.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TRId.java similarity index 93% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TRId.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TRId.java index 25a2af1..f60ac70 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TRId.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TRId.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.td.gwtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared.tr; import java.io.Serializable; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TabResource.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TabResource.java similarity index 93% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TabResource.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TabResource.java index 9d121ea..291c1a2 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TabResource.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TabResource.java @@ -1,8 +1,8 @@ -package org.gcube.portlets.user.td.gwtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared.tr; import java.io.Serializable; -import org.gcube.portlets.user.td.gwtservice.shared.TRId; +import org.gcube.portlets.user.td.gwtservice.shared.tr.TRId; /** diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TableData.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TableData.java similarity index 96% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TableData.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TableData.java index 1e079fd..bfea053 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TableData.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TableData.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.td.gwtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared.tr; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TDOpenSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/open/TDOpenSession.java similarity index 87% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TDOpenSession.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/open/TDOpenSession.java index 2ae721e..48ecd47 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/TDOpenSession.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/open/TDOpenSession.java @@ -1,10 +1,12 @@ /** * */ -package org.gcube.portlets.user.td.gwtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared.tr.open; import java.io.Serializable; +import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; + /** * diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Agencies.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/type/Agencies.java similarity index 95% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Agencies.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/type/Agencies.java index 745b5da..a4d98fd 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Agencies.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/type/Agencies.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gwtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared.tr.type; import java.io.Serializable; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Codelist.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/type/Codelist.java similarity index 96% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Codelist.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/type/Codelist.java index 4e8871c..74e74c7 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Codelist.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/type/Codelist.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gwtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared.tr.type; import java.io.Serializable; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Dataset.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/type/Dataset.java similarity index 96% rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Dataset.java rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/type/Dataset.java index 35b4689..df7aadb 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Dataset.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/type/Dataset.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.td.gwtservice.shared; +package org.gcube.portlets.user.td.gwtservice.shared.tr.type; import java.io.Serializable; diff --git a/src/test/java/org/gcube/portlets/user/td/gwtservice/client/GwtTestTDGWTService.java b/src/test/java/org/gcube/portlets/user/td/gwtservice/client/GwtTestTDGWTService.java index e708272..bf127ca 100644 --- a/src/test/java/org/gcube/portlets/user/td/gwtservice/client/GwtTestTDGWTService.java +++ b/src/test/java/org/gcube/portlets/user/td/gwtservice/client/GwtTestTDGWTService.java @@ -2,7 +2,7 @@ package org.gcube.portlets.user.td.gwtservice.client; import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTService; import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; -import org.gcube.portlets.user.td.gwtservice.shared.TabResource; +import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; import com.google.gwt.core.client.GWT; import com.google.gwt.junit.client.GWTTestCase;