From 60140acc92fa9dbbb094f695041fc39ecc257d59 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 18 Dec 2013 10:14:26 +0000 Subject: [PATCH] Minor updated git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@87144 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 37 +++ .project | 53 +++++ .settings/.jsdtscope | 12 + .settings/com.google.gdt.eclipse.core.prefs | 4 + .settings/org.eclipse.core.resources.prefs | 6 + .settings/org.eclipse.jdt.core.prefs | 8 + .settings/org.eclipse.m2e.core.prefs | 4 + .settings/org.eclipse.wst.common.component | 19 ++ ....eclipse.wst.common.project.facet.core.xml | 7 + ...rg.eclipse.wst.jsdt.ui.superType.container | 1 + .../org.eclipse.wst.jsdt.ui.superType.name | 1 + config/profile.xml | 29 +++ distro/INSTALL | 0 distro/LICENSE | 6 + distro/MAINTAINERS | 1 + distro/README | 40 ++++ distro/changelog.xml | 6 + distro/svnpath.txt | 1 + pom.xml | 213 +++++------------- .../user/td/client/TabularDataController.java | 37 ++- .../user/td/tabulardataportlet.gwt.xml | 2 +- 21 files changed, 312 insertions(+), 175 deletions(-) create mode 100644 .classpath create mode 100644 .project create mode 100644 .settings/.jsdtscope create mode 100644 .settings/com.google.gdt.eclipse.core.prefs create mode 100644 .settings/org.eclipse.core.resources.prefs create mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 .settings/org.eclipse.m2e.core.prefs create mode 100644 .settings/org.eclipse.wst.common.component create mode 100644 .settings/org.eclipse.wst.common.project.facet.core.xml create mode 100644 .settings/org.eclipse.wst.jsdt.ui.superType.container create mode 100644 .settings/org.eclipse.wst.jsdt.ui.superType.name create mode 100644 config/profile.xml create mode 100644 distro/INSTALL create mode 100644 distro/LICENSE create mode 100644 distro/MAINTAINERS create mode 100644 distro/README create mode 100644 distro/changelog.xml create mode 100644 distro/svnpath.txt diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..cc134f7 --- /dev/null +++ b/.classpath @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000..a4ced1e --- /dev/null +++ b/.project @@ -0,0 +1,53 @@ + + + tabular-data-portlet + + + + + + org.eclipse.wst.jsdt.core.javascriptValidator + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + com.google.gdt.eclipse.core.webAppProjectValidator + + + + + com.google.gwt.eclipse.core.gwtProjectValidator + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + com.google.gwt.eclipse.core.gwtNature + org.eclipse.wst.jsdt.core.jsNature + + diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope new file mode 100644 index 0000000..b46b920 --- /dev/null +++ b/.settings/.jsdtscope @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs new file mode 100644 index 0000000..f28db8c --- /dev/null +++ b/.settings/com.google.gdt.eclipse.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +lastWarOutDir=/home/giancarlo/workspace/tabular-data-portlet/target/tabular-data-portlet-2.0.0-SNAPSHOT +warSrcDir=src/main/webapp +warSrcDirIsOutput=false diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..29abf99 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -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/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..443e085 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +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.7 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component new file mode 100644 index 0000000..031c963 --- /dev/null +++ b/.settings/org.eclipse.wst.common.component @@ -0,0 +1,19 @@ + + + + + + + + uses + + + uses + + + uses + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 0000000..4045d87 --- /dev/null +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/.settings/org.eclipse.wst.jsdt.ui.superType.container new file mode 100644 index 0000000..3bd5d0a --- /dev/null +++ b/.settings/org.eclipse.wst.jsdt.ui.superType.container @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/.settings/org.eclipse.wst.jsdt.ui.superType.name new file mode 100644 index 0000000..05bd71b --- /dev/null +++ b/.settings/org.eclipse.wst.jsdt.ui.superType.name @@ -0,0 +1 @@ +Window \ No newline at end of file diff --git a/config/profile.xml b/config/profile.xml new file mode 100644 index 0000000..8023006 --- /dev/null +++ b/config/profile.xml @@ -0,0 +1,29 @@ + + + + Service + + tabular-data-portlet manages tabular data + PortletsUser + tabular-data-portlet + 1.0.0 + + + tabular-data-portlet manages tabular data + tabular-data-portlet + 2.0.0-SNAPSHOT + + org.gcube.portlets.user + tabular-data-portlet + 2.0.0-SNAPSHOT + + webapplication + + tabular-data-portlet-2.0.0-SNAPSHOT.war + + + + + + + diff --git a/distro/INSTALL b/distro/INSTALL new file mode 100644 index 0000000..e69de29 diff --git a/distro/LICENSE b/distro/LICENSE new file mode 100644 index 0000000..cc51139 --- /dev/null +++ b/distro/LICENSE @@ -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. \ No newline at end of file diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS new file mode 100644 index 0000000..0bc9be3 --- /dev/null +++ b/distro/MAINTAINERS @@ -0,0 +1 @@ +Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" diff --git a/distro/README b/distro/README new file mode 100644 index 0000000..237bea8 --- /dev/null +++ b/distro/README @@ -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. + + + diff --git a/distro/changelog.xml b/distro/changelog.xml new file mode 100644 index 0000000..99579cc --- /dev/null +++ b/distro/changelog.xml @@ -0,0 +1,6 @@ + + + First Release + + \ No newline at end of file diff --git a/distro/svnpath.txt b/distro/svnpath.txt new file mode 100644 index 0000000..b32abff --- /dev/null +++ b/distro/svnpath.txt @@ -0,0 +1 @@ +https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet \ No newline at end of file diff --git a/pom.xml b/pom.xml index 4a17d28..b3e1580 100644 --- a/pom.xml +++ b/pom.xml @@ -234,14 +234,14 @@ tabular-data-toolbox-widget 1.0.0-SNAPSHOT - - org.gcube.portlets.user tabular-data-tasks-widget 1.0.0-SNAPSHOT - --> + com.allen-sauer.gwt.log @@ -277,10 +277,11 @@ **/*.* - + + org.codehaus.mojo @@ -290,158 +291,62 @@ compile - test + + + + + + + TabularDataPortlet.html + ${webappDirectory} + ${webappDirectory} + + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-war-plugin + 2.1.1 + + + compile + + exploded - TabularDataPortlet.html - ${webappDirectory} - org.gcube.portlets.user.td.tabulardataportlet + ${webappDirectory} + + + + + + lib + + *.jar + + WEB-INF/lib + + + + + - - - - - - org.apache.maven.plugins - maven-war-plugin - 2.1.1 - - - compile - - exploded - - - - - ${webappDirectory} - - - - lib - - *.jar - - WEB-INF/lib - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.16 - - false - - - - org.apache.maven.surefire - surefire-junit47 - 2.16 - - - - - - - - maven-resources-plugin - 2.6 - - - copy-profile - process-resources - - copy-resources - - - ${configDirectory} - - - ${templatesDirectory} - - profile.xml - - true - - - - - - copy-distro-resources - process-resources - - copy-resources - - - ${distroDirectory} - - - ${templatesDirectory} - - profile.xml - descriptor.xml - - true - - - - - - - - - - - maven-clean-plugin - 2.5 - - - - ${distroDirectory} - - ** - - false - - - ${configDirectory} - - ** - - false - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2 - - - ${templatesDirectory}/descriptor.xml - - - - - servicearchive - package - - single - - - - - - org.apache.maven.plugins maven-assembly-plugin @@ -497,10 +401,9 @@ - ---> - + + 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 9578b72..6331155 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 @@ -9,6 +9,7 @@ import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; 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.taskswidget.client.TdTaskController; import org.gcube.portlets.user.td.widgetcommonevent.client.event.GridHeaderColumnMenuItemEvent; import org.gcube.portlets.user.td.widgetcommonevent.client.event.RibbonEvent; import org.gcube.portlets.user.td.widgetcommonevent.client.event.UIStateEvent; @@ -24,6 +25,7 @@ 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.DialogBox; import com.google.web.bindery.event.shared.EventBus; import com.google.web.bindery.event.shared.SimpleEventBus; import com.sencha.gxt.widget.core.client.ContentPanel; @@ -427,17 +429,17 @@ public class TabularDataController { } - /* - * protected TdTaskController tdTaskController; protected DialogBox - * tdTaskMainWindow; - */ + protected TdTaskController tdTaskController; + protected DialogBox tdTaskMainWindow; + protected void openTasksManagerWizard() { - /* - * tdTaskController = TdTaskController.getInstance(); - * TdTaskController.bindCommonBus(eventBus); tdTaskMainWindow = - * tdTaskController.getWindowTaskMonitor(); // This is main panel - * tdTaskMainWindow.show(); - */ + + tdTaskController = TdTaskController.getInstance(); + TdTaskController.bindCommonBus(eventBus); + tdTaskMainWindow = tdTaskController.getWindowTaskMonitor(); + + tdTaskMainWindow.show(); + } protected void doGridHeaderColumnMenuCommand( @@ -446,21 +448,18 @@ public class TabularDataController { "OperationId: " + event.getOperationId() + " Column: \n" + event.getColumnSelected()); String opId = event.getOperationId(); - if (opId.compareTo(GridHeaderOperationId.AddLabel - .toString()) == 0) { + if (opId.compareTo(GridHeaderOperationId.AddLabel.toString()) == 0) { } else { - if (opId.compareTo(GridHeaderOperationId.ChangeLabel - .toString()) == 0) { + if (opId.compareTo(GridHeaderOperationId.ChangeLabel.toString()) == 0) { } else { - if (opId.compareTo(GridHeaderOperationId.RemoveLabel - .toString()) == 0) { + if (opId.compareTo(GridHeaderOperationId.RemoveLabel.toString()) == 0) { } else { if (opId.compareTo(GridHeaderOperationId.RemoveColumn .toString()) == 0) { - + } else { if (opId.compareTo(GridHeaderOperationId.ChangeToType .toString()) == 0) { @@ -482,9 +481,9 @@ public class TabularDataController { .toString()) == 0) { } else { - + } - + } } diff --git a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml index 2039358..1835e46 100644 --- a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml @@ -18,7 +18,7 @@ - +