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

Updated to JAVA 7 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@86998 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2013-12-16 18:09:51 +00:00
parent a0d539750a
commit 43af21aa7b
11 changed files with 223 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.classpath
View File

@ -22,8 +22,7 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="lib" path="lib/gxt-2.2.5.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>

6
.settings/org.eclipse.jdt.core.prefs
View File

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

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

@ -10,10 +10,35 @@
<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-1.0.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-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-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-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> <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"/>
<property name="java-output-path" value="/tabular-data-portlet/target/tabular-data-portlet-2.0.0-SNAPSHOT/WEB-INF/classes"/> <property name="java-output-path" value="/tabular-data-portlet/target/tabular-data-portlet-2.0.0-SNAPSHOT/WEB-INF/classes"/>
<property name="component.inclusion.patterns"/>
</wb-module> </wb-module>
</project-modules> </project-modules>

2
.settings/org.eclipse.wst.common.project.facet.core.xml
View File

@ -3,5 +3,5 @@
<fixed facet="wst.jsdt.web"/> <fixed facet="wst.jsdt.web"/>
<installed facet="jst.web" version="2.3"/> <installed facet="jst.web" version="2.3"/>
<installed facet="wst.jsdt.web" version="1.0"/> <installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="java" version="1.6"/> <installed facet="java" version="1.5"/>
</faceted-project> </faceted-project>

293
pom.xml
View File

@ -88,8 +88,8 @@
<artifactId>gwt-user</artifactId> <artifactId>gwt-user</artifactId>
</dependency> </dependency>
<!-- GXT 3 --> <!-- GXT 3 -->
<dependency> <dependency>
@ -270,7 +270,7 @@
<include>**/*.*</include> <include>**/*.*</include>
</includes> </includes>
</resource> </resource>
</resources> </resources>
<plugins> <plugins>
@ -294,139 +294,206 @@
</configuration> </configuration>
</plugin> </plugin>
<!-- Copy static web files before executing gwt:run -->
<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> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.1.1</version> <version>2.3.2</version>
<executions>
<execution>
<phase>compile</phase>
</execution>
</executions>
<configuration> <configuration>
<webappDirectory>${webappDirectory}</webappDirectory> <source>1.7</source>
<!-- Include static jar into WEB-INF/lib --> <target>1.7</target>
<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> </configuration>
</plugin> </plugin>
SA Plugin
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.2</version> <version>2.2</version>
<configuration> <configuration>
<descriptors> <descriptors>
<descriptor>${templatesDirectory}/descriptor.xml</descriptor> <descriptor>${distroDirectory}/descriptor.xml</descriptor>
</descriptors> </descriptors>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>servicearchive</id> <id>servicearchive</id>
<phase>package</phase> <phase>install</phase>
<goals> <goals>
<goal>single</goal> <goal>single</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.5</version>
<executions>
<execution>
<id>copy-profile</id>
<phase>install</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>target</outputDirectory>
<resources>
<resource>
<directory>${distroDirectory}</directory>
<filtering>true</filtering>
<includes>
<include>profile.xml</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
-->
</plugins> </plugins>
</build> </build>
<dependencyManagement> <dependencyManagement>

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

@ -116,7 +116,7 @@ public class TabularDataController {
eventBus.addHandler(RibbonEvent.TYPE, eventBus.addHandler(RibbonEvent.TYPE,
new RibbonEvent.RibbonEventHandler() { new RibbonEvent.RibbonEventHandler() {
@Override
public void onRibbon(RibbonEvent event) { public void onRibbon(RibbonEvent event) {
doRibbonCommand(event); doRibbonCommand(event);
@ -131,7 +131,6 @@ public class TabularDataController {
AlertMessageBox d = new AlertMessageBox(reason, details); AlertMessageBox d = new AlertMessageBox(reason, details);
d.addHideHandler(new HideHandler() { d.addHideHandler(new HideHandler() {
@Override
public void onHide(HideEvent event) { public void onHide(HideEvent event) {
// //
} }
@ -180,13 +179,12 @@ public class TabularDataController {
Log.debug("Remove TR:" + trId); Log.debug("Remove TR:" + trId);
TDGWTServiceAsync.INSTANCE.removeTabularResource(trId, TDGWTServiceAsync.INSTANCE.removeTabularResource(trId,
new AsyncCallback<Void>() { new AsyncCallback<Void>() {
@Override
public void onFailure(Throwable caught) { public void onFailure(Throwable caught) {
alertMessage("Error", "Error on remove TabResource: " alertMessage("Error", "Error on remove TabResource: "
+ caught.getLocalizedMessage()); + caught.getLocalizedMessage());
} }
@Override
public void onSuccess(Void result) { public void onSuccess(Void result) {
closeTabularResource(); closeTabularResource();
} }
@ -256,24 +254,21 @@ public class TabularDataController {
protected void openSDMXImportWizard() { protected void openSDMXImportWizard() {
GWT.runAsync(new RunAsyncCallback() { GWT.runAsync(new RunAsyncCallback() {
@Override
public void onSuccess() { public void onSuccess() {
openWizard(); openWizard();
SDMXImportWizardTD importWizard = new SDMXImportWizardTD( SDMXImportWizardTD importWizard = new SDMXImportWizardTD(
"SDMX Import"); "SDMX Import");
importWizard.addListener(new WizardListener() { importWizard.addListener(new WizardListener() {
@Override
public void completed(TRId tabularResourceId) { public void completed(TRId tabularResourceId) {
openTable(tabularResourceId); openTable(tabularResourceId);
} }
@Override
public void aborted() { public void aborted() {
resumeUIState(); resumeUIState();
} }
@Override
public void failed(Throwable throwable, String reason, public void failed(Throwable throwable, String reason,
String details) { String details) {
alertMessage(reason, details); alertMessage(reason, details);
@ -285,7 +280,6 @@ public class TabularDataController {
importWizard.show(); importWizard.show();
} }
@Override
public void onFailure(Throwable reason) { public void onFailure(Throwable reason) {
asyncCodeLoadingFailed(reason); asyncCodeLoadingFailed(reason);
} }
@ -296,27 +290,23 @@ public class TabularDataController {
protected void openCSVExportWizard() { protected void openCSVExportWizard() {
GWT.runAsync(new RunAsyncCallback() { GWT.runAsync(new RunAsyncCallback() {
@Override
public void onSuccess() { public void onSuccess() {
openWizard(); openWizard();
CSVExportWizardTD exportWizard = new CSVExportWizardTD( CSVExportWizardTD exportWizard = new CSVExportWizardTD(
"CSV Export"); "CSV Export");
exportWizard.addListener(new WizardListener() { exportWizard.addListener(new WizardListener() {
@Override
public void failed(Throwable throwable, String reason, public void failed(Throwable throwable, String reason,
String details) { String details) {
alertMessage(reason, details); alertMessage(reason, details);
resumeUIState(); resumeUIState();
} }
@Override
public void completed(TRId id) { public void completed(TRId id) {
resumeUIState(); resumeUIState();
} }
@Override
public void aborted() { public void aborted() {
resumeUIState(); resumeUIState();
} }
@ -325,7 +315,6 @@ public class TabularDataController {
exportWizard.show(); exportWizard.show();
} }
@Override
public void onFailure(Throwable reason) { public void onFailure(Throwable reason) {
asyncCodeLoadingFailed(reason); asyncCodeLoadingFailed(reason);
} }
@ -336,27 +325,23 @@ public class TabularDataController {
protected void openSDMXExportWizard() { protected void openSDMXExportWizard() {
GWT.runAsync(new RunAsyncCallback() { GWT.runAsync(new RunAsyncCallback() {
@Override
public void onSuccess() { public void onSuccess() {
openWizard(); openWizard();
SDMXExportWizardTD exportWizard = new SDMXExportWizardTD( SDMXExportWizardTD exportWizard = new SDMXExportWizardTD(
"SDMX Export"); "SDMX Export");
exportWizard.addListener(new WizardListener() { exportWizard.addListener(new WizardListener() {
@Override
public void failed(Throwable throwable, String reason, public void failed(Throwable throwable, String reason,
String details) { String details) {
alertMessage(reason, details); alertMessage(reason, details);
resumeUIState(); resumeUIState();
} }
@Override
public void completed(TRId id) { public void completed(TRId id) {
resumeUIState(); resumeUIState();
} }
@Override
public void aborted() { public void aborted() {
resumeUIState(); resumeUIState();
} }
@ -365,7 +350,6 @@ public class TabularDataController {
exportWizard.show(); exportWizard.show();
} }
@Override
public void onFailure(Throwable reason) { public void onFailure(Throwable reason) {
asyncCodeLoadingFailed(reason); asyncCodeLoadingFailed(reason);
} }
@ -381,26 +365,22 @@ public class TabularDataController {
GWT.runAsync(new RunAsyncCallback() { GWT.runAsync(new RunAsyncCallback() {
@Override
public void onSuccess() { public void onSuccess() {
openWizard(); openWizard();
TDOpen tdOpen = new TDOpen("Open Tabular Resource"); TDOpen tdOpen = new TDOpen("Open Tabular Resource");
tdOpen.addListener(new WizardListener() { tdOpen.addListener(new WizardListener() {
@Override
public void aborted() { public void aborted() {
resumeUIState(); resumeUIState();
} }
@Override
public void failed(Throwable throwable, String reason, public void failed(Throwable throwable, String reason,
String details) { String details) {
alertMessage(reason, details); alertMessage(reason, details);
resumeUIState(); resumeUIState();
} }
@Override
public void completed(TRId tabularResourceId) { public void completed(TRId tabularResourceId) {
openTable(tabularResourceId); openTable(tabularResourceId);
@ -411,7 +391,6 @@ public class TabularDataController {
tdOpen.show(); tdOpen.show();
} }
@Override
public void onFailure(Throwable reason) { public void onFailure(Throwable reason) {
asyncCodeLoadingFailed(reason); asyncCodeLoadingFailed(reason);
} }
@ -422,7 +401,6 @@ public class TabularDataController {
protected void openCSVImportWizard() { protected void openCSVImportWizard() {
GWT.runAsync(new RunAsyncCallback() { GWT.runAsync(new RunAsyncCallback() {
@Override
public void onSuccess() { public void onSuccess() {
openWizard(); openWizard();
CSVImportWizardTD importWizard = new CSVImportWizardTD( CSVImportWizardTD importWizard = new CSVImportWizardTD(
@ -430,20 +408,17 @@ public class TabularDataController {
importWizard.addListener(new WizardListener() { importWizard.addListener(new WizardListener() {
@Override
public void failed(Throwable throwable, String reason, public void failed(Throwable throwable, String reason,
String details) { String details) {
alertMessage(reason, details); alertMessage(reason, details);
resumeUIState(); resumeUIState();
} }
@Override
public void completed(TRId id) { public void completed(TRId id) {
openTable(id); openTable(id);
} }
@Override
public void aborted() { public void aborted() {
resumeUIState(); resumeUIState();
} }
@ -452,7 +427,6 @@ public class TabularDataController {
importWizard.show(); importWizard.show();
} }
@Override
public void onFailure(Throwable reason) { public void onFailure(Throwable reason) {
asyncCodeLoadingFailed(reason); asyncCodeLoadingFailed(reason);
} }

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

@ -83,7 +83,6 @@ public class TabularDataPortlet implements EntryPoint {
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override
public void onModuleLoad() { public void onModuleLoad() {
/* /*
@ -95,7 +94,6 @@ public class TabularDataPortlet implements EntryPoint {
// use deferred command to catch initialization exceptions in // use deferred command to catch initialization exceptions in
// onModuleLoad2 // onModuleLoad2
Scheduler.get().scheduleDeferred(new ScheduledCommand() { Scheduler.get().scheduleDeferred(new ScheduledCommand() {
@Override
public void execute() { public void execute() {
loadMainPanel(); loadMainPanel();
} }
@ -111,7 +109,7 @@ public class TabularDataPortlet implements EntryPoint {
tabularData = new TabularDataX(Constants.TDX_DATASOURCE_FACTORY_ID); tabularData = new TabularDataX(Constants.TDX_DATASOURCE_FACTORY_ID);
tabularData.addFailureHandler(new FailureEventHandler() { tabularData.addFailureHandler(new FailureEventHandler() {
@Override
public void onFailure(FailureEvent event) { public void onFailure(FailureEvent event) {
Info.display("Error: " + event.getMessage(), event.getCaught() Info.display("Error: " + event.getMessage(), event.getCaught()
.getMessage()); .getMessage());

9
src/main/java/org/gcube/portlets/user/td/client/ribbon/ChartsToolBar.java
View File

@ -74,7 +74,7 @@ public class ChartsToolBar {
pieButton.setArrowAlign(ButtonArrowAlign.BOTTOM); pieButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
pieButton.addSelectHandler(new SelectHandler() { pieButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON)); //eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
} }
@ -91,7 +91,6 @@ public class ChartsToolBar {
barButton.setArrowAlign(ButtonArrowAlign.BOTTOM); barButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
barButton.addSelectHandler(new SelectHandler() { barButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON)); //eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
} }
@ -108,7 +107,6 @@ public class ChartsToolBar {
curveButton.setArrowAlign(ButtonArrowAlign.BOTTOM); curveButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
curveButton.addSelectHandler(new SelectHandler() { curveButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON)); //eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
} }
@ -124,7 +122,6 @@ public class ChartsToolBar {
bullsButton.setArrowAlign(ButtonArrowAlign.BOTTOM); bullsButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
bullsButton.addSelectHandler(new SelectHandler() { bullsButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON)); //eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
} }
@ -155,7 +152,7 @@ public class ChartsToolBar {
gisButton.setArrowAlign(ButtonArrowAlign.BOTTOM); gisButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
gisButton.addSelectHandler(new SelectHandler() { gisButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON)); //eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
} }
@ -174,7 +171,6 @@ public class ChartsToolBar {
rstudioButton.setArrowAlign(ButtonArrowAlign.BOTTOM); rstudioButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
rstudioButton.addSelectHandler(new SelectHandler() { rstudioButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
// eventBus.fireEvent(new // eventBus.fireEvent(new
// ImportTableEvent(ImportTableType.JSON)); // ImportTableEvent(ImportTableType.JSON));
@ -192,7 +188,6 @@ public class ChartsToolBar {
statisticalButton.setArrowAlign(ButtonArrowAlign.BOTTOM); statisticalButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
statisticalButton.addSelectHandler(new SelectHandler() { statisticalButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
// eventBus.fireEvent(new // eventBus.fireEvent(new
// ImportTableEvent(ImportTableType.JSON)); // ImportTableEvent(ImportTableType.JSON));

13
src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java
View File

@ -85,7 +85,7 @@ public class FileToolBar {
openButton.addSelectHandler(new SelectHandler() { openButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.OPEN)); eventBus.fireEvent(new RibbonEvent(RibbonType.OPEN));
} }
@ -105,7 +105,6 @@ public class FileToolBar {
closeButton.addSelectHandler(new SelectHandler() { closeButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.CLOSE)); eventBus.fireEvent(new RibbonEvent(RibbonType.CLOSE));
} }
@ -123,7 +122,6 @@ public class FileToolBar {
dataLayout.setWidget(0, 2, deleteButton); dataLayout.setWidget(0, 2, deleteButton);
deleteButton.addSelectHandler(new SelectHandler() { deleteButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.DELETE)); eventBus.fireEvent(new RibbonEvent(RibbonType.DELETE));
} }
@ -138,7 +136,6 @@ public class FileToolBar {
dataLayout.setWidget(1, 2, propertiesButton); dataLayout.setWidget(1, 2, propertiesButton);
propertiesButton.addSelectHandler(new SelectHandler() { propertiesButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.PROPERTIES)); eventBus.fireEvent(new RibbonEvent(RibbonType.PROPERTIES));
} }
@ -164,7 +161,6 @@ public class FileToolBar {
importSDMXButton.setArrowAlign(ButtonArrowAlign.BOTTOM); importSDMXButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
importSDMXButton.addSelectHandler(new SelectHandler() { importSDMXButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTSDMX)); eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTSDMX));
} }
@ -178,7 +174,6 @@ public class FileToolBar {
importCSVButton.setToolTip("Import table from CSV source"); importCSVButton.setToolTip("Import table from CSV source");
importCSVButton.addSelectHandler(new SelectHandler() { importCSVButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTCSV)); eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTCSV));
} }
@ -191,7 +186,6 @@ public class FileToolBar {
importJSONButton.setToolTip("Import table from JSON source"); importJSONButton.setToolTip("Import table from JSON source");
importJSONButton.addSelectHandler(new SelectHandler() { importJSONButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTJSON)); eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTJSON));
} }
@ -220,7 +214,6 @@ public class FileToolBar {
exportSDMXButton.setArrowAlign(ButtonArrowAlign.BOTTOM); exportSDMXButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
exportSDMXButton.addSelectHandler(new SelectHandler() { exportSDMXButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORTSDMX)); eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORTSDMX));
} }
@ -235,7 +228,6 @@ public class FileToolBar {
exportCSVButton.setToolTip("Export CSV document"); exportCSVButton.setToolTip("Export CSV document");
exportCSVButton.addSelectHandler(new SelectHandler() { exportCSVButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORTCSV)); eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORTCSV));
} }
@ -248,7 +240,6 @@ public class FileToolBar {
exportJSONButton.setToolTip("Export JSON document"); exportJSONButton.setToolTip("Export JSON document");
exportJSONButton.addSelectHandler(new SelectHandler() { exportJSONButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORTJSON)); eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORTJSON));
} }
@ -275,7 +266,6 @@ public class FileToolBar {
templateButton.setArrowAlign(ButtonArrowAlign.BOTTOM); templateButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
templateButton.addSelectHandler(new SelectHandler() { templateButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
// eventBus.fireEvent(new RibbonEvent( // eventBus.fireEvent(new RibbonEvent(
// RibbonType.EXPORTSDMX)); // RibbonType.EXPORTSDMX));
@ -290,7 +280,6 @@ public class FileToolBar {
eventBus.addHandler(UIStateEvent.TYPE, eventBus.addHandler(UIStateEvent.TYPE,
new UIStateEvent.UIStateHandler() { new UIStateEvent.UIStateHandler() {
@Override
public void onUIState(UIStateEvent event) { public void onUIState(UIStateEvent event) {
setUI(event); setUI(event);

11
src/main/java/org/gcube/portlets/user/td/client/ribbon/FormulasToolBar.java
View File

@ -83,7 +83,7 @@ public class FormulasToolBar {
filterButton.setArrowAlign(ButtonArrowAlign.BOTTOM); filterButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
filterButton.addSelectHandler(new SelectHandler() { filterButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON)); //eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
} }
@ -99,7 +99,6 @@ public class FormulasToolBar {
unionButton.setArrowAlign(ButtonArrowAlign.BOTTOM); unionButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
unionButton.addSelectHandler(new SelectHandler() { unionButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON)); //eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
} }
@ -116,7 +115,6 @@ public class FormulasToolBar {
denormalizeButton.setArrowAlign(ButtonArrowAlign.BOTTOM); denormalizeButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
denormalizeButton.addSelectHandler(new SelectHandler() { denormalizeButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON)); //eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
} }
@ -134,7 +132,6 @@ public class FormulasToolBar {
aggregateButton.setArrowAlign(ButtonArrowAlign.BOTTOM); aggregateButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
aggregateButton.addSelectHandler(new SelectHandler() { aggregateButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON)); //eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
} }
@ -163,7 +160,6 @@ public class FormulasToolBar {
modifyLabelButton.setArrowAlign(ButtonArrowAlign.BOTTOM); modifyLabelButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
modifyLabelButton.addSelectHandler(new SelectHandler() { modifyLabelButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON)); //eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
} }
@ -180,7 +176,6 @@ public class FormulasToolBar {
modifyColumnTypeButton.setArrowAlign(ButtonArrowAlign.BOTTOM); modifyColumnTypeButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
modifyColumnTypeButton.addSelectHandler(new SelectHandler() { modifyColumnTypeButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON)); //eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
} }
@ -196,7 +191,6 @@ public class FormulasToolBar {
modifyColumnValuesButton.setArrowAlign(ButtonArrowAlign.BOTTOM); modifyColumnValuesButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
modifyColumnValuesButton.addSelectHandler(new SelectHandler() { modifyColumnValuesButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON)); //eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
} }
@ -226,7 +220,6 @@ public class FormulasToolBar {
historyButton.setArrowAlign(ButtonArrowAlign.BOTTOM); historyButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
historyButton.addSelectHandler(new SelectHandler() { historyButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON)); //eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
} }
@ -241,7 +234,6 @@ public class FormulasToolBar {
historyLayout.setWidget(0, 1, discardButton); historyLayout.setWidget(0, 1, discardButton);
discardButton.addSelectHandler(new SelectHandler() { discardButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.CSV)); //eventBus.fireEvent(new ImportTableEvent(ImportTableType.CSV));
} }
@ -252,7 +244,6 @@ public class FormulasToolBar {
historyLayout.setWidget(1, 1, discardAllButton); historyLayout.setWidget(1, 1, discardAllButton);
discardAllButton.addSelectHandler(new SelectHandler() { discardAllButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON)); //eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
} }

9
src/main/java/org/gcube/portlets/user/td/client/ribbon/ReviewToolBar.java
View File

@ -20,8 +20,10 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
import com.sencha.gxt.widget.core.client.toolbar.ToolBar; import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/** /**
* @author "Federico De Faveri defaveri@isti.cnr.it"
* *
* @author "Giancarlo Panichi"
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/ */
public class ReviewToolBar { public class ReviewToolBar {
@ -67,7 +69,7 @@ public class ReviewToolBar {
rulesButton.setArrowAlign(ButtonArrowAlign.BOTTOM); rulesButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
rulesButton.addSelectHandler(new SelectHandler() { rulesButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
// eventBus.fireEvent(new // eventBus.fireEvent(new
// ImportTableEvent(ImportTableType.JSON));taskButton // ImportTableEvent(ImportTableType.JSON));taskButton
@ -85,7 +87,6 @@ public class ReviewToolBar {
manageRulesButton.setArrowAlign(ButtonArrowAlign.BOTTOM); manageRulesButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
manageRulesButton.addSelectHandler(new SelectHandler() { manageRulesButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
// eventBus.fireEvent(new // eventBus.fireEvent(new
// ImportTableEvent(ImportTableType.JSON));taskButton // ImportTableEvent(ImportTableType.JSON));taskButton
@ -104,7 +105,6 @@ public class ReviewToolBar {
validationButton.setArrowAlign(ButtonArrowAlign.BOTTOM); validationButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
validationButton.addSelectHandler(new SelectHandler() { validationButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
// eventBus.fireEvent(new // eventBus.fireEvent(new
// ImportTableEvent(ImportTableType.JSON)); // ImportTableEvent(ImportTableType.JSON));
@ -135,7 +135,6 @@ public class ReviewToolBar {
operationsButton.setArrowAlign(ButtonArrowAlign.BOTTOM); operationsButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
operationsButton.addSelectHandler(new SelectHandler() { operationsButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
// eventBus.fireEvent(new // eventBus.fireEvent(new
// ImportTableEvent(ImportTableType.JSON)); // ImportTableEvent(ImportTableType.JSON));