gCubeSystem
/
tabular-data-manager
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor updated 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@86932 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2013-12-13 17:02:10 +00:00
parent c3d4e718ae
commit bc31731cdd
7 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.settings/org.eclipse.wst.common.component
View File

@ -4,6 +4,15 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="tabular-data-widgetx-tdx-source-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widgetx-tdx-source/tabular-data-widgetx-tdx-source">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-widgetx-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widgetx/tabular-data-widgetx">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-toolbox-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-toolbox-widget/tabular-data-toolbox-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="tabular-data-portlet"/>
<property name="java-output-path" value="/tabular-data-portlet/target/tabular-data-portlet-2.0.0-SNAPSHOT/WEB-INF/classes"/>
</wb-module>

4
pom.xml
View File

@ -146,8 +146,8 @@
<!-- TD Source -->
<dependency>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>tabular-data-widget-td-source</artifactId>
<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<artifactId>tabular-data-widgetx-tdx-source</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
</dependency>

2
src/main/java/org/gcube/portlets/user/td/client/Constants.java
View File

@ -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";

10
src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
View File

@ -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<Long>, HasOpenHandlers<Long> {
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;

22
src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java
View File

@ -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() {

6
src/main/java/org/gcube/portlets/user/td/server/TabularDataServiceImpl.java
View File

@ -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());
}

12
src/main/webapp/WEB-INF/web.xml
View File

@ -14,13 +14,13 @@
<!-- TDWidget -->
<servlet>
<servlet-name>tdwService</servlet-name>
<servlet-class>org.gcube.portlets.user.tdw.server.TabularDataServiceImpl</servlet-class>
<servlet-name>tdwxService</servlet-name>
<servlet-class>org.gcube.portlets.user.tdwx.server.TabularDataXServiceImpl</servlet-class>
</servlet>
<servlet>
<servlet-name>tdwServlet</servlet-name>
<servlet-class>org.gcube.portlets.user.tdw.server.TabularDataServlet</servlet-class>
<servlet-name>tdwxServlet</servlet-name>
<servlet-class>org.gcube.portlets.user.tdwx.server.TabularDataXServlet</servlet-class>
</servlet>
<!-- TD GWTService -->
@ -87,12 +87,12 @@
<servlet-mapping>
<servlet-name>tdwService</servlet-name>
<url-pattern>/tabulardataportlet/tdw</url-pattern>
<url-pattern>/tabulardataportlet/tdwx</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>tdwServlet</servlet-name>
<url-pattern>/tabulardataportlet/tdwdata</url-pattern>
<url-pattern>/tabulardataportlet/tdwxdata</url-pattern>
</servlet-mapping>
<!-- TD GWTService -->