From bc31731cdd95e3526ab8d9b5d3e34b924fce1043 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 13 Dec 2013 17:02:10 +0000 Subject: [PATCH] Minor updated git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@86932 82a268e6-3cf1-43bd-a215-b396298e98cf --- .settings/org.eclipse.wst.common.component | 9 ++++++++ pom.xml | 4 ++-- .../portlets/user/td/client/Constants.java | 2 +- .../user/td/client/TabularDataController.java | 10 ++++----- .../user/td/client/TabularDataPortlet.java | 22 +++++++++---------- .../td/server/TabularDataServiceImpl.java | 6 ++--- src/main/webapp/WEB-INF/web.xml | 12 +++++----- 7 files changed, 37 insertions(+), 28 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 0f74935..da7f835 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -4,6 +4,15 @@ + + uses + + + uses + + + uses + diff --git a/pom.xml b/pom.xml index 81bda6d..c548bfd 100644 --- a/pom.xml +++ b/pom.xml @@ -146,8 +146,8 @@ org.gcube.portlets.user - tabular-data-widget-td-source - [1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT) + tabular-data-widgetx-tdx-source + [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) diff --git a/src/main/java/org/gcube/portlets/user/td/client/Constants.java b/src/main/java/org/gcube/portlets/user/td/client/Constants.java index 3dc8b25..7a8d619 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/Constants.java +++ b/src/main/java/org/gcube/portlets/user/td/client/Constants.java @@ -21,7 +21,7 @@ public class Constants { public static final String DEFAULT_SCOPE = "/gcube/devsec/devVRE";//"/gcube/devsec"; - public static final String TD_DATASOURCE_FACTORY_ID = "TDDataSourceFactory"; + public static final String TDX_DATASOURCE_FACTORY_ID = "TDXDataSourceFactory"; public static final String APPLICATION_ID = "org.gcube.portlets.user.td.server.portlet.TabularDataPortlet"; 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 ec2ec57..343e109 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 @@ -15,8 +15,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.client.type.RibbonType; import org.gcube.portlets.user.td.widgetcommonevent.client.type.UIStateType; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import org.gcube.portlets.user.td.wizardwidget.client.WizardListener; -import org.gcube.portlets.user.tdw.client.TabularData; -import org.gcube.portlets.user.tdw.shared.model.TableId; +import org.gcube.portlets.user.tdwx.client.TabularDataX; +import org.gcube.portlets.user.tdwx.shared.model.TableId; import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.GWT; @@ -41,7 +41,7 @@ public class TabularDataController { // implements HasCloseHandlers, HasOpenHandlers { protected SimpleEventBus eventBus; - protected TabularData tabularData; + protected TabularDataX tabularData; protected UIStateType uiState = UIStateType.START; protected ContentPanel toolBoxPanel; @@ -69,7 +69,7 @@ public class TabularDataController { return eventBus; } - public void setTabularData(TabularData tabularData) { + public void setTabularData(TabularDataX tabularData) { this.tabularData = tabularData; } @@ -132,7 +132,7 @@ public class TabularDataController { protected void openTable(TRId tabularResourceId) { Log.debug("openTabe: "+tabularResourceId); trId = tabularResourceId; - tableOpening = new TableId(Constants.TD_DATASOURCE_FACTORY_ID, + tableOpening = new TableId(Constants.TDX_DATASOURCE_FACTORY_ID, trId.getTableId()); tabularData.openTable(tableOpening); uiState = UIStateType.TR_OPEN; diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java index 0425535..7202bb1 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java +++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java @@ -6,13 +6,13 @@ import org.gcube.portlets.user.td.client.ribbon.TabularDataRibbon; import org.gcube.portlets.user.td.client.rpc.TabularDataService; import org.gcube.portlets.user.td.client.rpc.TabularDataServiceAsync; import org.gcube.portlets.user.td.toolboxwidget.client.ToolBoxPanel; -import org.gcube.portlets.user.tdw.client.TabularData; -import org.gcube.portlets.user.tdw.client.TabularDataGridPanel; -import org.gcube.portlets.user.tdw.client.config.Row; -import org.gcube.portlets.user.tdw.client.event.FailureEvent; -import org.gcube.portlets.user.tdw.client.event.FailureEventHandler; -import org.gcube.portlets.user.tdw.client.model.grid.DataRowColumnConfig; -import org.gcube.portlets.user.tdw.shared.model.DataRow; +import org.gcube.portlets.user.tdwx.client.TabularDataX; +import org.gcube.portlets.user.tdwx.client.TabularDataXGridPanel; +import org.gcube.portlets.user.tdwx.client.config.Row; +import org.gcube.portlets.user.tdwx.client.event.FailureEvent; +import org.gcube.portlets.user.tdwx.client.event.FailureEventHandler; +import org.gcube.portlets.user.tdwx.client.model.grid.DataRowColumnConfig; +import org.gcube.portlets.user.tdwx.shared.model.DataRow; import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.EntryPoint; @@ -71,7 +71,7 @@ public class TabularDataPortlet implements EntryPoint { private static BorderLayoutContainer mainPanelLayout; // Private TabularData - private static TabularData tabularData; + private static TabularDataX tabularData; private static ToolBoxPanel toolBoxPanel; private static BorderLayoutData westData; @@ -103,7 +103,7 @@ public class TabularDataPortlet implements EntryPoint { TabularDataController controller = new TabularDataController(); EventBus eventBus = controller.getEventBus(); - tabularData = new TabularData(Constants.TD_DATASOURCE_FACTORY_ID); + tabularData = new TabularDataX(Constants.TDX_DATASOURCE_FACTORY_ID); tabularData.addFailureHandler(new FailureEventHandler() { @Override @@ -133,7 +133,7 @@ public class TabularDataPortlet implements EntryPoint { mainPanelLayout.setNorthWidget(toolBarPanel, toolBarData); // Grid Panel - final TabularDataGridPanel gridPanel = tabularData.getGridPanel(); + final TabularDataXGridPanel gridPanel = tabularData.getGridPanel(); gridPanel.setHeaderVisible(false); MarginData gridData = new MarginData(); @@ -195,7 +195,7 @@ public class TabularDataPortlet implements EntryPoint { } } - protected void menu(final TabularDataGridPanel gridPanel) { + protected void menu(final TabularDataXGridPanel gridPanel) { Log.debug("Add Menu to tabular data widget"); final HideHandler hideHandler = new HideHandler() { diff --git a/src/main/java/org/gcube/portlets/user/td/server/TabularDataServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/server/TabularDataServiceImpl.java index b791d60..903270b 100644 --- a/src/main/java/org/gcube/portlets/user/td/server/TabularDataServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/td/server/TabularDataServiceImpl.java @@ -8,8 +8,8 @@ import org.gcube.application.framework.core.session.SessionManager; import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; import org.gcube.portlets.user.td.client.rpc.TabularDataService; import org.gcube.portlets.user.td.gwtservice.shared.Constants; -import org.gcube.portlets.user.tdw.datasource.td.TDDataSourceFactory; -import org.gcube.portlets.user.tdw.server.datasource.DataSourceFactoryRegistry; +import org.gcube.portlets.user.tdwx.datasource.td.TDXDataSourceFactory; +import org.gcube.portlets.user.tdwx.server.datasource.DataSourceXFactoryRegistry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,7 +44,7 @@ public class TabularDataServiceImpl extends RemoteServiceServlet implements Tabu //ScopeProvider.instance.get(); System.out.println("initializing TDDataSourceFactory"); - DataSourceFactoryRegistry.getInstance().add(new TDDataSourceFactory()); + DataSourceXFactoryRegistry.getInstance().add(new TDXDataSourceFactory()); } diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index ec5f3c5..7d24956 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -14,13 +14,13 @@ - tdwService - org.gcube.portlets.user.tdw.server.TabularDataServiceImpl + tdwxService + org.gcube.portlets.user.tdwx.server.TabularDataXServiceImpl - tdwServlet - org.gcube.portlets.user.tdw.server.TabularDataServlet + tdwxServlet + org.gcube.portlets.user.tdwx.server.TabularDataXServlet @@ -87,12 +87,12 @@ tdwService - /tabulardataportlet/tdw + /tabulardataportlet/tdwx tdwServlet - /tabulardataportlet/tdwdata + /tabulardataportlet/tdwxdata