gCubeSystem
/
tabular-data-manager
16
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@86832 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2013-12-11 13:28:10 +00:00
parent 8cd37ce1a4
commit 3c220bb7cc
25 changed files with 355 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
.classpath Normal file
View File

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/tabular-data-portlet-2.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/tabular-data-portlet-2.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/tabular-data-portlet-2.0.0-SNAPSHOT/WEB-INF/classes"/>
</classpath>

53
.project Normal file
View File

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>tabular-data-portlet</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.google.gdt.eclipse.core.webAppProjectValidator</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.google.gwt.eclipse.core.gwtProjectValidator</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>com.google.gwt.eclipse.core.gwtNature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>

12
.settings/.jsdtscope Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/webapp"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes>
<attribute name="hide" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
<classpathentry kind="output" path=""/>
</classpath>

4
.settings/com.google.appengine.eclipse.core.prefs Normal file
View File

@ -0,0 +1,4 @@
eclipse.preferences.version=1
filesCopiedToWebInfLib=
googleCloudSqlEnabled=false
localDevMySqlEnabled=true

5
.settings/com.google.gdt.eclipse.core.prefs Normal file
View File

@ -0,0 +1,5 @@
eclipse.preferences.version=1
jarsExcludedFromWebInfLib=
lastWarOutDir=/home/giancarlo/workspace/tabular-data-portlet/target/tabular-data-portlet-2.0.0-SNAPSHOT
warSrcDir=src/main/webapp
warSrcDirIsOutput=false

2
.settings/com.google.gwt.eclipse.core.prefs Normal file
View File

@ -0,0 +1,2 @@
eclipse.preferences.version=1
entryPointModules=

6
.settings/org.eclipse.core.resources.prefs Normal file
View File

@ -0,0 +1,6 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8

8
.settings/org.eclipse.jdt.core.prefs Normal file
View File

@ -0,0 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.6

4
.settings/org.eclipse.m2e.core.prefs Normal file
View File

@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

50
.settings/org.eclipse.wst.common.component Normal file
View File

@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="tabular-data-portlet">
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<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-widget-td-source-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widget-td-source/tabular-data-widget-td-source">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-widget-2.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widget/tabular-data-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-widget-common-event-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widget-common-event/tabular-data-widget-common-event">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-csv-import-widget-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-csv-import-widget/tabular-data-csv-import-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-sdmx-import-widget-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-sdmx-import-widget/tabular-data-sdmx-import-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-open-widget-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-open-widget/tabular-data-open-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-csv-export-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-csv-export-widget/tabular-data-csv-export-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-sdmx-export-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-sdmx-export-widget/tabular-data-sdmx-export-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-gwt-service-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-gwt-service/tabular-data-gwt-service">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-wizard-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-wizard-widget/tabular-data-wizard-widget">
<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>
<dependent-module archiveName="tabular-data-information-widget-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-information-widget/tabular-data-information-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-metadata-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-metadata-widget/tabular-data-metadata-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>
</project-modules>

7
.settings/org.eclipse.wst.common.project.facet.core.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="wst.jsdt.web"/>
<installed facet="java" version="1.6"/>
<installed facet="jst.web" version="2.3"/>
<installed facet="wst.jsdt.web" version="1.0"/>
</faceted-project>

1
.settings/org.eclipse.wst.jsdt.ui.superType.container Normal file
View File

@ -0,0 +1 @@
org.eclipse.wst.jsdt.launching.baseBrowserLibrary

1
.settings/org.eclipse.wst.jsdt.ui.superType.name Normal file
View File

@ -0,0 +1 @@
Window

29
config/profile.xml Normal file
View File

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<Resource>
<ID></ID>
<Type>Service</Type>
<Profile>
<Description>tabular-data-portlet manages tabular data</Description>
<Class>PortletsUser</Class>
<Name>tabular-data-portlet</Name>
<Version>1.0.0</Version>
<Packages>
<Software>
<Description>tabular-data-portlet manages tabular data</Description>
<Name>tabular-data-portlet</Name>
<Version>2.0.0-SNAPSHOT</Version>
<MavenCoordinates>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>tabular-data-portlet</artifactId>
<version>2.0.0-SNAPSHOT</version>
</MavenCoordinates>
<Type>webapplication</Type>
<Files>
<File>tabular-data-portlet-2.0.0-SNAPSHOT.war</File>
</Files>
</Software>
</Packages>
</Profile>
</Resource>

0
distro/INSTALL Normal file
View File

6
distro/LICENSE Normal file
View File

@ -0,0 +1,6 @@
gCube System - License
------------------------------------------------------------
The gCube/gCore software is licensed as Free Open Source software conveying to the EUPL (http://ec.europa.eu/idabc/eupl).
The software and documentation is provided by its authors/distributors "as is" and no expressed or
implied warranty is given for its use, quality or fitness for a particular case.

1
distro/MAINTAINERS Normal file
View File

@ -0,0 +1 @@
Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"

40
distro/README Normal file
View File

@ -0,0 +1,40 @@
The gCube System - tabular-data-portlet
------------------------------------------------------------
This work has been supported by the following European projects: iMarine (FP7-INFRASTRUCTURES-2011-2)
Authors
-------
Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa,
Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
Version and Release Date
------------------------
v. 2.0.0-SNAPSHOT (2013-10-18)
Description
-----------
tabular-data-portlet manages tabular data
Download information
--------------------
Source code URL: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet
Documentation
-------------
tabular-data-portlet manages tabular data
Licensing
---------
This software is licensed under the terms you may find in the file named "LICENSE" in this directory.

6
distro/changelog.xml Normal file
View File

@ -0,0 +1,6 @@
<ReleaseNotes>
<Changeset component="org.gcube.portlets.user.tabular-data-portlet.1-0-0"
date="2013-10-18">
<Change>First Release</Change>
</Changeset>
</ReleaseNotes>

1
distro/svnpath.txt Normal file
View File

@ -0,0 +1 @@
https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet

20
pom.xml
View File

@ -164,14 +164,14 @@
<artifactId>csv4j</artifactId>
<version>[1.2.0-SNAPSHOT, 2.0.0-common)</version>
</dependency>
<!-- tabular-data-widget-common-event -->
<dependency>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>tabular-data-widget-common-event</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- tabular-data-csv-import-widget -->
<dependency>
<groupId>org.gcube.portlets.user</groupId>
@ -199,7 +199,7 @@
<artifactId>tabular-data-csv-export-widget</artifactId>
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency>
<!-- tabular-data-sdmx-export-widget -->
<dependency>
<groupId>org.gcube.portlets.user</groupId>
@ -207,12 +207,7 @@
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency>
<!--tabular-data-information-widget -->
<dependency>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>tabular-data-information-widget</artifactId>
<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
</dependency>
<!-- tabular-data-gwt-service -->
<dependency>
@ -228,6 +223,13 @@
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency>
<!-- tabular-data-toolbox-widget -->
<dependency>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>tabular-data-toolbox-widget</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- LOGGING -->
<dependency>
<groupId>com.allen-sauer.gwt.log</groupId>

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

@ -3,21 +3,18 @@
*/
package org.gcube.portlets.user.td.client;
import org.gcube.portlets.user.td.sdmxexportwidget.client.SDMXExportWizardTD;
import org.gcube.portlets.user.td.sdmximportwidget.client.SDMXImportWizardTD;
import org.gcube.portlets.user.td.wizardwidget.client.WizardListener;
import org.gcube.portlets.user.td.widgetcommonevent.client.event.RibbonEvent;
import org.gcube.portlets.user.td.widgetcommonevent.client.type.RibbonType;
import org.gcube.portlets.user.td.widgetcommonevent.client.event.UIStateEvent;
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.csvexportwidget.client.CSVExportWizardTD;
import org.gcube.portlets.user.td.csvimportwidget.client.CSVImportWizardTD;
import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
import org.gcube.portlets.user.td.informationwidget.client.TabularResourceProperties;
import org.gcube.portlets.user.td.openwidget.client.TDOpen;
import org.gcube.portlets.user.td.sdmxexportwidget.client.SDMXExportWizardTD;
import org.gcube.portlets.user.td.sdmximportwidget.client.SDMXImportWizardTD;
import org.gcube.portlets.user.td.widgetcommonevent.client.event.RibbonEvent;
import org.gcube.portlets.user.td.widgetcommonevent.client.event.UIStateEvent;
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;
@ -25,17 +22,12 @@ import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.RunAsyncCallback;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Widget;
import com.google.web.bindery.event.shared.EventBus;
import com.google.web.bindery.event.shared.SimpleEventBus;
import com.sencha.gxt.widget.core.client.ContentPanel;
import com.sencha.gxt.widget.core.client.TabItemConfig;
import com.sencha.gxt.widget.core.client.TabPanel;
import com.sencha.gxt.widget.core.client.box.AlertMessageBox;
import com.sencha.gxt.widget.core.client.container.BorderLayoutContainer.BorderLayoutData;
import com.sencha.gxt.widget.core.client.event.BeforeCloseEvent;
import com.sencha.gxt.widget.core.client.event.HideEvent;
import com.sencha.gxt.widget.core.client.event.BeforeCloseEvent.BeforeCloseHandler;
import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
import com.sencha.gxt.widget.core.client.info.Info;
@ -51,12 +43,8 @@ public class TabularDataController {
protected SimpleEventBus eventBus;
protected TabularData tabularData;
protected UIStateType uiState = UIStateType.START;
protected UIProperties uiProperties = UIProperties.CLOSED;
protected ContentPanel functionalityPanel;
protected TabPanel functionalityTab;
protected int indexFunctionalityTab = 0;
protected TabularResourceProperties trProperties;
protected ContentPanel toolBoxPanel;
protected BorderLayoutData eastData;
/**
@ -85,21 +73,15 @@ public class TabularDataController {
this.tabularData = tabularData;
}
public ContentPanel getFunctionalityPanel() {
return functionalityPanel;
public ContentPanel getToolBoxPanel() {
return toolBoxPanel;
}
public void setFunctionalityPanel(ContentPanel functionalityPanel) {
this.functionalityPanel = functionalityPanel;
public void setToolBoxPanel(ContentPanel toolBoxPanel) {
this.toolBoxPanel = toolBoxPanel;
}
public TabPanel getFunctionalityTab() {
return functionalityTab;
}
public void setFunctionalityTab(TabPanel functionalityTab) {
this.functionalityTab = functionalityTab;
}
public BorderLayoutData getEastData() {
return eastData;
@ -157,26 +139,22 @@ public class TabularDataController {
UIStateEvent uiStateEvent=new UIStateEvent(UIStateType.TR_OPEN);
uiStateEvent.setTrId(tabularResourceId);
eventBus.fireEvent(uiStateEvent);
updateUIProperties();
}
/*
protected void updateUIProperties(){
if (uiProperties == UIProperties.OPENED) {
if (uiToolBox == UIToolBox.OPENED) {
trProperties.update();
}
}
*/
protected void closeTabularResource() {
if (uiState == UIStateType.TR_OPEN) {
tabularData.closeTable();
uiState = UIStateType.TR_CLOSE;
eventBus.fireEvent(new UIStateEvent(UIStateType.TR_CLOSE));
if (uiProperties == UIProperties.OPENED) {
functionalityPanel.collapse();
functionalityPanel.disable();
uiProperties = UIProperties.CLOSED;
functionalityTab.remove(trProperties);
}
}
}
@ -218,7 +196,6 @@ public class TabularDataController {
deleteTabularResource();
break;
case PROPERTIES:
openFunctionalityProperties();
break;
case IMPORTSDMX:
openSDMXImportWizard();
@ -245,55 +222,28 @@ public class TabularDataController {
}
}
protected void openFunctionalityProperties() {
/*
protected void openToolBox() {
if (uiState == UIStateType.TR_OPEN) {
if (uiProperties == UIProperties.OPENED) {
functionalityPanel.collapse();
functionalityPanel.disable();
uiProperties = UIProperties.CLOSED;
functionalityTab.remove(trProperties);
if (uiToolBox == UIToolBox.OPENED) {
toolBoxPanel.collapse();
toolBoxPanel.disable();
uiToolBox = UIToolBox.CLOSED;
eventBus.fireEvent(new UIStateEvent(UIStateType.TOOLBOX_CLOSE));
toolBox.remove(trProperties);
Info.display("Properties", "Closed");
} else {
TabItemConfig propertiesItemConf = new TabItemConfig(
"Properties", true);
trProperties = new TabularResourceProperties("TRProperties",
eventBus);
trProperties.setHeaderVisible(false);
functionalityTab.add(trProperties, propertiesItemConf);
functionalityTab
.addBeforeCloseHandler(new BeforeCloseHandler<Widget>() {
@Override
public void onBeforeClose(
BeforeCloseEvent<Widget> event) {
if (functionalityTab.getWidgetCount() == 1) {
functionalityPanel.disable();
functionalityPanel.collapse();
uiProperties = UIProperties.CLOSED;
functionalityTab.remove(trProperties);
}
}
});
/*
* Label taskLabel = new Label("Task Properties");
* taskLabel.addStyleName("pad-text"); functionalityTab
* .add(taskLabel, new TabItemConfig("Task", true));
*/
functionalityTab.setActiveWidget(functionalityTab.getWidget(0));
functionalityPanel.enable();
functionalityPanel.expand();
uiProperties = UIProperties.OPENED;
eventBus.fireEvent(new UIStateEvent(UIStateType.TOOLBOX_OPEN));
toolBoxPanel.enable();
toolBoxPanel.expand();
uiToolBox = UIToolBox.OPENED;
}
} else {
Info.display("Properties", "No table open");
}
};
};*/
protected void openSDMXImportWizard() {
GWT.runAsync(new RunAsyncCallback() {
@ -353,7 +303,6 @@ public class TabularDataController {
@Override
public void completed(TRId id) {
updateUIProperties();
resumeUIState();
}
@ -394,7 +343,6 @@ public class TabularDataController {
@Override
public void completed(TRId id) {
updateUIProperties();
resumeUIState();
}

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

@ -5,6 +5,7 @@ import java.util.List;
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;
@ -24,7 +25,6 @@ import com.google.gwt.user.client.ui.RootPanel;
import com.google.web.bindery.event.shared.EventBus;
import com.sencha.gxt.core.client.Style.SelectionMode;
import com.sencha.gxt.core.client.util.Margins;
import com.sencha.gxt.widget.core.client.ContentPanel;
import com.sencha.gxt.widget.core.client.TabPanel;
import com.sencha.gxt.widget.core.client.box.AlertMessageBox;
import com.sencha.gxt.widget.core.client.container.BorderLayoutContainer;
@ -34,6 +34,7 @@ import com.sencha.gxt.widget.core.client.container.Viewport;
import com.sencha.gxt.widget.core.client.event.HideEvent;
import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
import com.sencha.gxt.widget.core.client.grid.ColumnConfig;
import com.sencha.gxt.widget.core.client.grid.ColumnModel;
import com.sencha.gxt.widget.core.client.info.Info;
import com.sencha.gxt.widget.core.client.menu.Item;
import com.sencha.gxt.widget.core.client.menu.Menu;
@ -71,8 +72,7 @@ public class TabularDataPortlet implements EntryPoint {
// Private TabularData
private static TabularData tabularData;
private static ContentPanel functionalityPanel;
private static TabPanel functionalityTab;
private static ToolBoxPanel toolBoxPanel;
private static BorderLayoutData eastData;
/**
@ -139,19 +139,10 @@ public class TabularDataPortlet implements EntryPoint {
MarginData gridData = new MarginData();
mainPanelLayout.setCenterWidget(gridPanel, gridData);
// Functionality Panel
functionalityPanel = new ContentPanel();
functionalityPanel.setWidth(310);
functionalityPanel.setHeaderVisible(false);
functionalityPanel.setResize(true);
functionalityTab = new TabPanel();
functionalityTab.setAnimScroll(true);
functionalityTab.setTabScroll(true);
functionalityTab.setCloseContextMenu(true);
functionalityPanel.add(functionalityTab);
// ToolBox Panel
toolBoxPanel = new ToolBoxPanel("ToolBoxPanel",eventBus);
eastData = new BorderLayoutData(310);
eastData.setCollapsible(true);
eastData.setSplit(false);
@ -160,16 +151,17 @@ public class TabularDataPortlet implements EntryPoint {
eastData.setMargins(new Margins(0, 5, 0, 5));
eastData.setCollapseHidden(true);
mainPanelLayout.setEastWidget(functionalityPanel, eastData);
functionalityPanel.collapse();
functionalityPanel.disable();
mainPanelLayout.setEastWidget(toolBoxPanel, eastData);
toolBoxPanel.collapse();
toolBoxPanel.disable();
controller.setFunctionalityTab(functionalityTab);
controller.setFunctionalityPanel(functionalityPanel);
controller.setToolBoxPanel(toolBoxPanel);
controller.setEastData(eastData);
bind(mainPanelLayout);
menu(gridPanel);
//menu(gridPanel);
}
protected void bind(BorderLayoutContainer mainWidget) {
@ -225,23 +217,32 @@ public class TabularDataPortlet implements EntryPoint {
@Override
public void onSelection(SelectionEvent<Item> event) {
Log.debug("Start On Selection");
Log.debug("gridPanel is: "+gridPanel);
Log.debug("gridPanel is: " + gridPanel);
if (gridPanel != null) {
List<ColumnConfig<DataRow, ?>> columns= gridPanel.getGrid().getColumnModel().getColumns();
for(ColumnConfig<DataRow,?> cc:columns){
Log.debug("ColumnConfig:"+cc.getHeader());
ColumnModel<DataRow> columnModel = gridPanel.getGrid()
.getColumnModel();
List<ColumnConfig<DataRow, ?>> columns = columnModel
.getColumns();
for (ColumnConfig<DataRow, ?> cc : columns) {
Log.debug("ColumnConfig:" + cc.getHeader());
}
DataRowColumnConfig<?> dc=(DataRowColumnConfig<?>)columns.get(0);
Log.debug("DC - Header:"+dc.getHeader());
Log.debug("DC - Definition:"+dc.getDefinition().getId()+" Label:"+dc.getDefinition().getLabel()+" Key:"+dc.getDefinition().getKey());
DataRowColumnConfig<?> dc = (DataRowColumnConfig<?>) columns
.get(0);
Log.debug("DC - Header:" + dc.getHeader());
Log.debug("DC - Definition:" + dc.getDefinition().getId()
+ " Label:" + dc.getDefinition().getLabel()
+ " Key:" + dc.getDefinition().getKey());
Row row = gridPanel.getSelectedRow();
Log.debug("Retrived row");
String rowInfo;
if (row != null) {
rowInfo = row.getFieldAsText(dc.getDefinition().getLabel());
rowInfo = row.getFieldAsText(dc.getDefinition()
.getLabel());
} else {
rowInfo = "no row retrived";
}
@ -259,6 +260,8 @@ public class TabularDataPortlet implements EntryPoint {
gridPanel.setContextMenu(menu);
}
/*
* private void configPanel(final Portlet panel) {
* panel.setCollapsible(true); panel.setAnimCollapse(false);

6
src/main/java/org/gcube/portlets/user/td/client/UIProperties.java
View File

@ -1,6 +0,0 @@
package org.gcube.portlets.user.td.client;
public enum UIProperties {
CLOSED,
OPENED;
}

6
src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
View File

@ -16,10 +16,8 @@
<inherits name='org.gcube.portlets.user.td.wizardwidget.Wizard' />
<inherits name='org.gcube.portlets.user.td.widgetcommonevent.WidgetCommonEvent' />
<inherits name='org.gcube.portlets.user.td.informationwidget.Information' />
<inherits name='org.gcube.portlets.user.td.openwidget.TDOpen' />
<inherits name='org.gcube.portlets.user.td.toolboxwidget.ToolBox' />
<inherits name='org.gcube.portlets.user.td.openwidget.TDOpen' />
<inherits name='org.gcube.portlets.user.td.sdmximportwidget.SDMXImportWizardTD' />
<inherits name='org.gcube.portlets.user.td.sdmxexportwidget.SDMXExportWizardTD' />
<inherits name='org.gcube.portlets.user.td.csvimportwidget.CSVImportWizardTD' />