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

@@ -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.7">
+		<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>

.project

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

.settings/.jsdtscope

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

.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

.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/<project>=UTF-8

.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

.settings/org.eclipse.m2e.core.prefs

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

.settings/org.eclipse.wst.common.component

@@ -0,0 +1,19 @@
+<?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-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-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>
+        <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>

.settings/org.eclipse.wst.common.project.facet.core.xml

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

.settings/org.eclipse.wst.jsdt.ui.superType.container

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

.settings/org.eclipse.wst.jsdt.ui.superType.name

@@ -0,0 +1 @@
+Window

config/profile.xml

@@ -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>
+
+

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.

distro/MAINTAINERS

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

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.
+
+
+

distro/changelog.xml

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

distro/svnpath.txt

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

pom.xml

@@ -234,14 +234,14 @@
 			<artifactId>tabular-data-toolbox-widget</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
-		
+
-		<!--tabular-data-tasks-widget 
+		<!--tabular-data-tasks-widget -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>tabular-data-tasks-widget</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
-		-->
+
 		<!-- LOGGING -->
 		<dependency>
 			<groupId>com.allen-sauer.gwt.log</groupId>
@@ -277,10 +277,11 @@
 					<include>**/*.*</include>
 				</includes>
 			</resource>
-			
+
 		</resources>
 		<plugins>
 
+
 			<!-- GWT Maven Plugin -->
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -290,158 +291,62 @@
 					<execution>
 						<goals>
 							<goal>compile</goal>
-							<goal>test</goal>
+							<!-- <goal>test</goal> -->
+						</goals>
+					</execution>
+				</executions>
+				<!-- Plugin configuration. There are many available options, see gwt-maven-plugin 
+					documentation at codehaus.org -->
+				<configuration>
+					<runTarget>TabularDataPortlet.html</runTarget>
+					<hostedWebapp>${webappDirectory}</hostedWebapp>
+					<webappDirectory>${webappDirectory}</webappDirectory>
+					<!-- <webResources> -->
+					<!-- <resource> -->
+					<!-- <directory>lib</directory> -->
+					<!-- <includes> -->
+					<!-- <include>gxt-2.2.5.jar</include> -->
+					<!-- </includes> -->
+					<!-- <targetPath>WEB-INF/lib</targetPath> -->
+					<!-- </resource> -->
+					<!-- </webResources> -->
+				</configuration>
+
+			</plugin>
+
+			<!-- Copy static web files before executing gwt:run -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.1.1</version>
+				<executions>
+					<execution>
+						<phase>compile</phase>
+						<goals>
+							<goal>exploded</goal>
 						</goals>
 					</execution>
 				</executions>
 				<configuration>
-					<runTarget>TabularDataPortlet.html</runTarget>
+					<webappDirectory>${webappDirectory}</webappDirectory>
-					<hostedWebapp>${webappDirectory}</hostedWebapp>
+
-					<module>org.gcube.portlets.user.td.tabulardataportlet</module>
+
+					<!-- Include static jar into WEB-INF/lib -->
+					<webResources>
+						<resource>
+							<directory>lib</directory>
+							<includes>
+								<include>*.jar</include>
+							</includes>
+							<targetPath>WEB-INF/lib</targetPath>
+						</resource>
+					</webResources>
+
+
 				</configuration>
+
 			</plugin>
-
+			<plugin>
-			
-			
-		<!-- Copy static web files before executing gwt:run -->
-		<plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-war-plugin</artifactId>
-			<version>2.1.1</version>
-			<executions>
-				<execution>
-					<phase>compile</phase>
-					<goals>
-						<goal>exploded</goal>
-					</goals>
-				</execution>
-			</executions>
-			<configuration>
-				<webappDirectory>${webappDirectory}</webappDirectory>
-				<!-- Include static jar into WEB-INF/lib -->
-				<webResources>
-					<resource>
-						<directory>lib</directory>
-						<includes>
-							<include>*.jar</include>
-						</includes>
-						<targetPath>WEB-INF/lib</targetPath>
-					</resource>
-				</webResources>
-			</configuration>
-		</plugin>
-
-		<!-- Maven Surefire Plugin for Test -->
-		<plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-surefire-plugin</artifactId>
-			<version>2.16</version>
-			<configuration>
-				<skipTests>false</skipTests>
-			</configuration>
-			<dependencies>
-				<dependency>
-					<groupId>org.apache.maven.surefire</groupId>
-					<artifactId>surefire-junit47</artifactId>
-					<version>2.16</version>
-				</dependency>
-			</dependencies>
-		</plugin>
-
-
-		<!-- Maven -->
-		<plugin>
-			<artifactId>maven-resources-plugin</artifactId>
-			<version>2.6</version>
-			<executions>
-				<execution>
-					<id>copy-profile</id>
-					<phase>process-resources</phase>
-					<goals>
-						<goal>copy-resources</goal>
-					</goals>
-					<configuration>
-						<outputDirectory>${configDirectory}</outputDirectory>
-						<resources>
-							<resource>
-								<directory>${templatesDirectory}</directory>
-								<includes>
-									<include>profile.xml</include>
-								</includes>
-								<filtering>true</filtering>
-							</resource>
-						</resources>
-					</configuration>
-				</execution>
-				<execution>
-					<id>copy-distro-resources</id>
-					<phase>process-resources</phase>
-					<goals>
-						<goal>copy-resources</goal>
-					</goals>
-					<configuration>
-						<outputDirectory>${distroDirectory}</outputDirectory>
-						<resources>
-							<resource>
-								<directory>${templatesDirectory}</directory>
-								<excludes>
-									<exclude>profile.xml</exclude>
-									<exclude>descriptor.xml</exclude>
-								</excludes>
-								<filtering>true</filtering>
-							</resource>
-						</resources>
-					</configuration>
-				</execution>
-
-
-
-			</executions>
-		</plugin>
-		<plugin>
-			<artifactId>maven-clean-plugin</artifactId>
-			<version>2.5</version>
-			<configuration>
-				<filesets>
-					<fileset>
-						<directory>${distroDirectory}</directory>
-						<includes>
-							<include>**</include>
-						</includes>
-						<followSymlinks>false</followSymlinks>
-					</fileset>
-					<fileset>
-						<directory>${configDirectory}</directory>
-						<includes>
-							<include>**</include>
-						</includes>
-						<followSymlinks>false</followSymlinks>
-					</fileset>
-				</filesets>
-			</configuration>
-		</plugin>
-		<plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-assembly-plugin</artifactId>
-			<version>2.2</version>
-			<configuration>
-				<descriptors>
-					<descriptor>${templatesDirectory}/descriptor.xml</descriptor>
-				</descriptors>
-			</configuration>
-			<executions>
-				<execution>
-					<id>servicearchive</id>
-					<phase>package</phase>
-					<goals>
-						<goal>single</goal>
-					</goals>
-				</execution>
-			</executions>
-		</plugin>
-
-	<!--  
-		  <plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.3.2</version>
@@ -450,8 +355,7 @@
 					<target>1.7</target>
 				</configuration>
 			</plugin>
-			
+			<!-- SA Plugin -->
-			  SA Plugin 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -497,10 +401,9 @@
 					</execution>
 				</executions>
 			</plugin>
-	
--->
 
-	</plugins>
+
+		</plugins>
 	</build>
 
 	<dependencyManagement>

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 TdTaskController tdTaskController; protected DialogBox
+	protected DialogBox tdTaskMainWindow;
-	 * tdTaskMainWindow;
+
-	 */
 	protected void openTasksManagerWizard() {
-		/*
+
-		 * tdTaskController = TdTaskController.getInstance();
+		tdTaskController = TdTaskController.getInstance();
-		 * TdTaskController.bindCommonBus(eventBus); tdTaskMainWindow =
+		TdTaskController.bindCommonBus(eventBus);
-		 * tdTaskController.getWindowTaskMonitor(); // This is main panel
+		tdTaskMainWindow = tdTaskController.getWindowTaskMonitor(); 
-		 * tdTaskMainWindow.show();
+		
-		 */
+		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
+		if (opId.compareTo(GridHeaderOperationId.AddLabel.toString()) == 0) {
-				.toString()) == 0) {
 
 		} else {
-			if (opId.compareTo(GridHeaderOperationId.ChangeLabel
+			if (opId.compareTo(GridHeaderOperationId.ChangeLabel.toString()) == 0) {
-					.toString()) == 0) {
 
 			} else {
-				if (opId.compareTo(GridHeaderOperationId.RemoveLabel
+				if (opId.compareTo(GridHeaderOperationId.RemoveLabel.toString()) == 0) {
-						.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 {
-							
+
 										}
-										
+
 									}
 
 								}

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

@@ -18,7 +18,7 @@
 	<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.taskswidget.TdTasksWidget' /> -->
+	<inherits name='org.gcube.portlets.user.td.taskswidget.TdTasksWidget' /> 
 	<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' />