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@92351 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-02-26 17:12:07 +00:00
parent c5b06fac1f
commit e66f61fbba
9 changed files with 86 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.classpath
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" output="target/tabular-data-portlet-2.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java"> <classpathentry kind="src" output="target/tabular-data-portlet-2.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry excluding="**" kind="src" output="target/tabular-data-portlet-2.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources"> <classpathentry excluding="**" kind="src" output="target/tabular-data-portlet-2.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
@ -45,5 +45,5 @@
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/> <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="output" path="target/tabular-data-portlet-2.0.0-SNAPSHOT/WEB-INF/classes"/> <classpathentry kind="output" path="target/tabular-data-portlet-2.1.0-SNAPSHOT/WEB-INF/classes"/>
</classpath> </classpath>

2
.settings/com.google.gdt.eclipse.core.prefs
View File

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

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

@ -4,31 +4,37 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <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/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <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"> <dependent-module archiveName="tabular-data-expression-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-expression-widget/tabular-data-expression-widget">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </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"> <dependent-module archiveName="tabular-data-widgetx-tdx-source-1.1.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> <dependency-type>uses</dependency-type>
</dependent-module> </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"> <dependent-module archiveName="tabular-data-widgetx-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widgetx/tabular-data-widgetx">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </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"> <dependent-module archiveName="tabular-data-widget-common-event-1.1.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> <dependency-type>uses</dependency-type>
</dependent-module> </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"> <dependent-module archiveName="tabular-data-gwt-service-2.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-gwt-service/tabular-data-gwt-service">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </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"> <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> <dependency-type>uses</dependency-type>
</dependent-module> </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"> <dependent-module archiveName="tabular-data-open-widget-2.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-open-widget/tabular-data-open-widget">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </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"> <dependent-module archiveName="tabular-data-sdmx-export-widget-1.1.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> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<dependent-module archiveName="tabular-data-column-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-column-widget/tabular-data-column-widget"> <dependent-module archiveName="tabular-data-toolbox-widget-1.1.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.1.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-column-widget-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-column-widget/tabular-data-column-widget">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<property name="context-root" value="tabular-data-portlet"/> <property name="context-root" value="tabular-data-portlet"/>

1
log.txt
View File

@ -1 +0,0 @@
0 [1848249397@qtp-190359739-4] INFO gwt-log - Start upload file

7
pom.xml
View File

@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>tabular-data-portlet</artifactId> <artifactId>tabular-data-portlet</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
<name>tabular-data-portlet</name> <name>tabular-data-portlet</name>
<description>tabular-data-portlet manages tabular data</description> <description>tabular-data-portlet manages tabular data</description>
@ -122,6 +122,11 @@
<artifactId>aslcore</artifactId> <artifactId>aslcore</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.gcube.applicationsupportlayer</groupId>
<artifactId>accesslogger</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>gcube-widgets</artifactId> <artifactId>gcube-widgets</artifactId>

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

@ -14,12 +14,6 @@ package org.gcube.portlets.user.td.client;
*/ */
public class Constants { public class Constants {
public static String VERSION = "1.0.0";
public static boolean TEST_MODE = false;
public final static String DEFAULT_USER = "giancarlo.panichi";
public static final String DEFAULT_SCOPE = "/gcube/devsec";
public static final String TDX_DATASOURCE_FACTORY_ID = "TDXDataSourceFactory"; public static final String TDX_DATASOURCE_FACTORY_ID = "TDXDataSourceFactory";

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

@ -54,11 +54,12 @@ import com.sencha.gxt.widget.core.client.info.Info;
*/ */
public class TabularDataController { public class TabularDataController {
// implements HasCloseHandlers<Long>, HasOpenHandlers<Long> { // implements HasCloseHandlers<Long>, HasOpenHandlers<Long> {
protected SimpleEventBus eventBus; protected SimpleEventBus eventBus;
protected TabularDataX tabularData; protected TabularDataX tabularData;
protected UIStateType uiState = UIStateType.START; protected UIStateType uiState = UIStateType.START;
private boolean taskManagerInit = false;
protected TdTaskController tdTaskController; protected TdTaskController tdTaskController;
protected ContentPanel toolBoxPanel; protected ContentPanel toolBoxPanel;
@ -73,12 +74,12 @@ public class TabularDataController {
* Grid TableId * Grid TableId
*/ */
protected TableId tableOpening; protected TableId tableOpening;
public TabularDataController() { public TabularDataController() {
eventBus = new SimpleEventBus(); eventBus = new SimpleEventBus();
tdTaskController = TdTaskController.getInstance();
TdTaskController.bindCommonBus(eventBus);
tdTaskMainWindow = tdTaskController.getWindowTaskMonitor();
bindToEvents(); bindToEvents();
} }
@ -108,8 +109,8 @@ public class TabularDataController {
public void setWestData(BorderLayoutData westData) { public void setWestData(BorderLayoutData westData) {
this.westData = westData; this.westData = westData;
} }
//Bind Controller to events on bus // Bind Controller to events on bus
protected void bindToEvents() { protected void bindToEvents() {
eventBus.addHandler( eventBus.addHandler(
GridHeaderColumnMenuItemEvent.TYPE, GridHeaderColumnMenuItemEvent.TYPE,
@ -157,8 +158,8 @@ public class TabularDataController {
eventBus.fireEvent(new UIStateEvent(UIStateType.START)); eventBus.fireEvent(new UIStateEvent(UIStateType.START));
} }
//Simple alert // Simple alert
protected void alertMessage(String reason, String details) { protected void alertMessage(String reason, String details) {
AlertMessageBox d = new AlertMessageBox(reason, details); AlertMessageBox d = new AlertMessageBox(reason, details);
d.addHideHandler(new HideHandler() { d.addHideHandler(new HideHandler() {
@ -170,8 +171,8 @@ public class TabularDataController {
}); });
d.show(); d.show();
} }
//Resume state of user interface // Resume state of user interface
protected void resumeUIState() { protected void resumeUIState() {
try { try {
if (uiState == UIStateType.TR_OPEN) { if (uiState == UIStateType.TR_OPEN) {
@ -187,8 +188,8 @@ public class TabularDataController {
Log.debug("Resume :" + e.getLocalizedMessage()); Log.debug("Resume :" + e.getLocalizedMessage());
} }
} }
//Open Table // Open Table
protected void openTable(TRId tabularResourceId) { protected void openTable(TRId tabularResourceId) {
Log.debug("openTabe: " + tabularResourceId); Log.debug("openTabe: " + tabularResourceId);
trId = tabularResourceId; trId = tabularResourceId;
@ -201,8 +202,7 @@ public class TabularDataController {
eventBus.fireEvent(uiStateEvent); eventBus.fireEvent(uiStateEvent);
} }
// Close Tabular Resource
//Close Tabular Resource
protected void closeTabularResource() { protected void closeTabularResource() {
if (uiState == UIStateType.TR_OPEN) { if (uiState == UIStateType.TR_OPEN) {
Log.debug("CloseTabularResource Open"); Log.debug("CloseTabularResource Open");
@ -618,42 +618,53 @@ public class TabularDataController {
protected com.extjs.gxt.ui.client.widget.Window tdTaskMainWindow; protected com.extjs.gxt.ui.client.widget.Window tdTaskMainWindow;
protected void openTasksManagerWizard() { protected void openTasksManagerWizard() {
initTaskManager();
tdTaskMainWindow.setPosition((Window.getClientWidth() / 2) - 200, tdTaskMainWindow.setPosition((Window.getClientWidth() / 2) - 200,
(Window.getClientHeight() / 2) - 300); (Window.getClientHeight() / 2) - 300);
tdTaskController.updateTasks(true); tdTaskController.updateTasks(true);
tdTaskMainWindow.show(); tdTaskMainWindow.show();
} }
protected void openTemplateNew(){ protected void initTaskManager() {
if (!taskManagerInit) {
TdTemplateController tdTemplateController= new TdTemplateController(); taskManagerInit = true;
tdTaskController = TdTaskController.getInstance();
TdTaskController.bindCommonBus(eventBus);
tdTaskMainWindow = tdTaskController.getWindowTaskMonitor();
} else {
}
}
protected void openTemplateNew() {
TdTemplateController tdTemplateController = new TdTemplateController();
tdTemplateController.getWindowTemplatePanel().show(); tdTemplateController.getWindowTemplatePanel().show();
} }
protected void openTemplateOpen(){ protected void openTemplateOpen() {
} }
protected void openMultiColumnFilter() { protected void openMultiColumnFilter() {
Log.debug("Request Open Multi Column Filter Dialog"); Log.debug("Request Open Multi Column Filter Dialog");
if (trId != null) { if (trId != null) {
MultiColumnFilterDialog mcfDialog=new MultiColumnFilterDialog(trId, eventBus); MultiColumnFilterDialog mcfDialog = new MultiColumnFilterDialog(
trId, eventBus);
mcfDialog.show(); mcfDialog.show();
} }
} }
protected void openColumnFilter(String columnName) { protected void openColumnFilter(String columnName) {
Log.debug("Request Open Column Filter Dialog"); Log.debug("Request Open Column Filter Dialog");
if (trId != null) { if (trId != null) {
ColumnFilterDialog cfDialog=new ColumnFilterDialog(trId, columnName, eventBus); ColumnFilterDialog cfDialog = new ColumnFilterDialog(trId,
columnName, eventBus);
cfDialog.show(); cfDialog.show();
} }
} }
protected void openColumnType() { protected void openColumnType() {
openColumnType(null); openColumnType(null);
} }
@ -668,11 +679,7 @@ public class TabularDataController {
eventBus.fireEvent(e); eventBus.fireEvent(e);
} }
} }
protected void openColumnDelete() { protected void openColumnDelete() {
openColumnDelete(null); openColumnDelete(null);
} }
@ -687,7 +694,7 @@ public class TabularDataController {
eventBus.fireEvent(e); eventBus.fireEvent(e);
} }
} }
protected void openColumnLabel() { protected void openColumnLabel() {
openColumnLabel(null); openColumnLabel(null);
} }
@ -702,7 +709,6 @@ public class TabularDataController {
eventBus.fireEvent(e); eventBus.fireEvent(e);
} }
} }
protected void openTableType() { protected void openTableType() {
Log.debug("Request Change Table Type Tab"); Log.debug("Request Change Table Type Tab");
@ -713,14 +719,13 @@ public class TabularDataController {
eventBus.fireEvent(e); eventBus.fireEvent(e);
} }
} }
protected void doChangeTableRequestEventCommand(
ChangeTableRequestEvent event) {
protected void doChangeTableRequestEventCommand(ChangeTableRequestEvent event){ Log.debug("Change Table Request to " + event.getTrId());
Log.debug("Change Table Request to "+event.getTrId());
openTable(event.getTrId()); openTable(event.getTrId());
}; };
protected void doGridHeaderColumnMenuCommand( protected void doGridHeaderColumnMenuCommand(
GridHeaderColumnMenuItemEvent event) { GridHeaderColumnMenuItemEvent event) {
Log.debug("GridHeaderColumnMenu Fire Event", Log.debug("GridHeaderColumnMenu Fire Event",
@ -729,8 +734,7 @@ public class TabularDataController {
String opId = event.getOperationId(); String opId = event.getOperationId();
String columnName = tabularData.getColumnId(event.getColumnSelected()); String columnName = tabularData.getColumnId(event.getColumnSelected());
Log.debug("GridColumnName: " + columnName); Log.debug("GridColumnName: " + columnName);
if (opId.compareTo(GridHeaderOperationId.COLUMNLABEL.toString()) == 0) { if (opId.compareTo(GridHeaderOperationId.COLUMNLABEL.toString()) == 0) {
openColumnLabel(columnName); openColumnLabel(columnName);
} else { } else {

10
src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
View File

@ -37,11 +37,11 @@
<entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' /> <entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' />
<!-- <set-property name="log_DivLogger" value="DISABLED" /> --> <!-- <set-property name="log_DivLogger" value="DISABLED" /> -->
<set-property name="log_DivLogger" value="DISABLED" /> <set-property name="log_DivLogger" value="ENABLED" />
<set-property name="log_ConsoleLogger" value="DISABLED" /> <set-property name="log_ConsoleLogger" value="ENABLED" />
<set-property name="log_FirebugLogger" value="DISABLED" /> <set-property name="log_FirebugLogger" value="ENABLED" />
<set-property name="log_GWTLogger" value="DISABLED" /> <set-property name="log_GWTLogger" value="ENABLED" />
<set-property name="log_SystemLogger" value="DISABLED" /> <set-property name="log_SystemLogger" value="ENABLED" />

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

@ -35,12 +35,12 @@
<!-- Specify the app entry point class. --> <!-- Specify the app entry point class. -->
<entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' /> <entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' />
<set-property name="log_DivLogger" value="DISABLED" /> <set-property name="log_DivLogger" value="ENABLED" />
<set-property name="log_ConsoleLogger" value="DISABLED" /> <set-property name="log_ConsoleLogger" value="ENABLED" />
<set-property name="log_FirebugLogger" value="DISABLED" /> <set-property name="log_FirebugLogger" value="ENABLED" />
<set-property name="log_GWTLogger" value="DISABLED" /> <set-property name="log_GWTLogger" value="ENABLED" />
<set-property name="log_SystemLogger" value="DISABLED" /> <set-property name="log_SystemLogger" value="ENABLED" />
<!-- Specify the paths for translatable code --> <!-- Specify the paths for translatable code -->
<source path='client' /> <source path='client' />