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:
parent
a0d539750a
commit
43af21aa7b
|
@ -22,8 +22,7 @@
|
|||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</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.6">
|
||||
<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>
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
|
||||
org.eclipse.jdt.core.compiler.compliance=1.6
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
|
||||
org.eclipse.jdt.core.compiler.compliance=1.5
|
||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.source=1.6
|
||||
org.eclipse.jdt.core.compiler.source=1.5
|
||||
|
|
|
@ -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">
|
||||
<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">
|
||||
<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>
|
||||
</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"/>
|
||||
<property name="component.inclusion.patterns"/>
|
||||
</wb-module>
|
||||
</project-modules>
|
||||
|
|
|
@ -3,5 +3,5 @@
|
|||
<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.6"/>
|
||||
<installed facet="java" version="1.5"/>
|
||||
</faceted-project>
|
||||
|
|
293
pom.xml
293
pom.xml
|
@ -88,8 +88,8 @@
|
|||
<artifactId>gwt-user</artifactId>
|
||||
</dependency>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- GXT 3 -->
|
||||
<dependency>
|
||||
|
@ -270,7 +270,7 @@
|
|||
<include>**/*.*</include>
|
||||
</includes>
|
||||
</resource>
|
||||
|
||||
|
||||
</resources>
|
||||
<plugins>
|
||||
|
||||
|
@ -294,139 +294,206 @@
|
|||
</configuration>
|
||||
</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>
|
||||
<artifactId>maven-war-plugin</artifactId>
|
||||
<version>2.1.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>compile</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>2.3.2</version>
|
||||
<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>
|
||||
<source>1.7</source>
|
||||
<target>1.7</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
SA Plugin
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<version>2.2</version>
|
||||
<configuration>
|
||||
<descriptors>
|
||||
<descriptor>${templatesDirectory}/descriptor.xml</descriptor>
|
||||
<descriptor>${distroDirectory}/descriptor.xml</descriptor>
|
||||
</descriptors>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>servicearchive</id>
|
||||
<phase>package</phase>
|
||||
<phase>install</phase>
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</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>
|
||||
|
||||
<dependencyManagement>
|
||||
|
|
|
@ -116,7 +116,7 @@ public class TabularDataController {
|
|||
eventBus.addHandler(RibbonEvent.TYPE,
|
||||
new RibbonEvent.RibbonEventHandler() {
|
||||
|
||||
@Override
|
||||
|
||||
public void onRibbon(RibbonEvent event) {
|
||||
doRibbonCommand(event);
|
||||
|
||||
|
@ -131,7 +131,6 @@ public class TabularDataController {
|
|||
AlertMessageBox d = new AlertMessageBox(reason, details);
|
||||
d.addHideHandler(new HideHandler() {
|
||||
|
||||
@Override
|
||||
public void onHide(HideEvent event) {
|
||||
//
|
||||
}
|
||||
|
@ -180,13 +179,12 @@ public class TabularDataController {
|
|||
Log.debug("Remove TR:" + trId);
|
||||
TDGWTServiceAsync.INSTANCE.removeTabularResource(trId,
|
||||
new AsyncCallback<Void>() {
|
||||
@Override
|
||||
|
||||
public void onFailure(Throwable caught) {
|
||||
alertMessage("Error", "Error on remove TabResource: "
|
||||
+ caught.getLocalizedMessage());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSuccess(Void result) {
|
||||
closeTabularResource();
|
||||
}
|
||||
|
@ -256,24 +254,21 @@ public class TabularDataController {
|
|||
|
||||
protected void openSDMXImportWizard() {
|
||||
GWT.runAsync(new RunAsyncCallback() {
|
||||
@Override
|
||||
|
||||
public void onSuccess() {
|
||||
openWizard();
|
||||
SDMXImportWizardTD importWizard = new SDMXImportWizardTD(
|
||||
"SDMX Import");
|
||||
importWizard.addListener(new WizardListener() {
|
||||
|
||||
@Override
|
||||
public void completed(TRId tabularResourceId) {
|
||||
openTable(tabularResourceId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void aborted() {
|
||||
resumeUIState();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void failed(Throwable throwable, String reason,
|
||||
String details) {
|
||||
alertMessage(reason, details);
|
||||
|
@ -285,7 +280,6 @@ public class TabularDataController {
|
|||
importWizard.show();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailure(Throwable reason) {
|
||||
asyncCodeLoadingFailed(reason);
|
||||
}
|
||||
|
@ -296,27 +290,23 @@ public class TabularDataController {
|
|||
protected void openCSVExportWizard() {
|
||||
GWT.runAsync(new RunAsyncCallback() {
|
||||
|
||||
@Override
|
||||
public void onSuccess() {
|
||||
openWizard();
|
||||
CSVExportWizardTD exportWizard = new CSVExportWizardTD(
|
||||
"CSV Export");
|
||||
|
||||
exportWizard.addListener(new WizardListener() {
|
||||
@Override
|
||||
public void failed(Throwable throwable, String reason,
|
||||
String details) {
|
||||
alertMessage(reason, details);
|
||||
resumeUIState();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void completed(TRId id) {
|
||||
resumeUIState();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void aborted() {
|
||||
resumeUIState();
|
||||
}
|
||||
|
@ -325,7 +315,6 @@ public class TabularDataController {
|
|||
exportWizard.show();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailure(Throwable reason) {
|
||||
asyncCodeLoadingFailed(reason);
|
||||
}
|
||||
|
@ -336,27 +325,23 @@ public class TabularDataController {
|
|||
protected void openSDMXExportWizard() {
|
||||
GWT.runAsync(new RunAsyncCallback() {
|
||||
|
||||
@Override
|
||||
public void onSuccess() {
|
||||
openWizard();
|
||||
SDMXExportWizardTD exportWizard = new SDMXExportWizardTD(
|
||||
"SDMX Export");
|
||||
|
||||
exportWizard.addListener(new WizardListener() {
|
||||
@Override
|
||||
public void failed(Throwable throwable, String reason,
|
||||
String details) {
|
||||
alertMessage(reason, details);
|
||||
resumeUIState();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void completed(TRId id) {
|
||||
resumeUIState();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void aborted() {
|
||||
resumeUIState();
|
||||
}
|
||||
|
@ -365,7 +350,6 @@ public class TabularDataController {
|
|||
exportWizard.show();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailure(Throwable reason) {
|
||||
asyncCodeLoadingFailed(reason);
|
||||
}
|
||||
|
@ -381,26 +365,22 @@ public class TabularDataController {
|
|||
|
||||
GWT.runAsync(new RunAsyncCallback() {
|
||||
|
||||
@Override
|
||||
public void onSuccess() {
|
||||
openWizard();
|
||||
TDOpen tdOpen = new TDOpen("Open Tabular Resource");
|
||||
|
||||
tdOpen.addListener(new WizardListener() {
|
||||
|
||||
@Override
|
||||
public void aborted() {
|
||||
resumeUIState();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void failed(Throwable throwable, String reason,
|
||||
String details) {
|
||||
alertMessage(reason, details);
|
||||
resumeUIState();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void completed(TRId tabularResourceId) {
|
||||
openTable(tabularResourceId);
|
||||
|
||||
|
@ -411,7 +391,6 @@ public class TabularDataController {
|
|||
tdOpen.show();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailure(Throwable reason) {
|
||||
asyncCodeLoadingFailed(reason);
|
||||
}
|
||||
|
@ -422,7 +401,6 @@ public class TabularDataController {
|
|||
protected void openCSVImportWizard() {
|
||||
GWT.runAsync(new RunAsyncCallback() {
|
||||
|
||||
@Override
|
||||
public void onSuccess() {
|
||||
openWizard();
|
||||
CSVImportWizardTD importWizard = new CSVImportWizardTD(
|
||||
|
@ -430,20 +408,17 @@ public class TabularDataController {
|
|||
|
||||
importWizard.addListener(new WizardListener() {
|
||||
|
||||
@Override
|
||||
public void failed(Throwable throwable, String reason,
|
||||
String details) {
|
||||
alertMessage(reason, details);
|
||||
resumeUIState();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void completed(TRId id) {
|
||||
openTable(id);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void aborted() {
|
||||
resumeUIState();
|
||||
}
|
||||
|
@ -452,7 +427,6 @@ public class TabularDataController {
|
|||
importWizard.show();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailure(Throwable reason) {
|
||||
asyncCodeLoadingFailed(reason);
|
||||
}
|
||||
|
|
|
@ -83,7 +83,6 @@ public class TabularDataPortlet implements EntryPoint {
|
|||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void onModuleLoad() {
|
||||
|
||||
/*
|
||||
|
@ -95,7 +94,6 @@ public class TabularDataPortlet implements EntryPoint {
|
|||
// use deferred command to catch initialization exceptions in
|
||||
// onModuleLoad2
|
||||
Scheduler.get().scheduleDeferred(new ScheduledCommand() {
|
||||
@Override
|
||||
public void execute() {
|
||||
loadMainPanel();
|
||||
}
|
||||
|
@ -111,7 +109,7 @@ public class TabularDataPortlet implements EntryPoint {
|
|||
tabularData = new TabularDataX(Constants.TDX_DATASOURCE_FACTORY_ID);
|
||||
tabularData.addFailureHandler(new FailureEventHandler() {
|
||||
|
||||
@Override
|
||||
|
||||
public void onFailure(FailureEvent event) {
|
||||
Info.display("Error: " + event.getMessage(), event.getCaught()
|
||||
.getMessage());
|
||||
|
|
|
@ -74,7 +74,7 @@ public class ChartsToolBar {
|
|||
pieButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
pieButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
|
||||
public void onSelect(SelectEvent event) {
|
||||
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
|
||||
}
|
||||
|
@ -91,7 +91,6 @@ public class ChartsToolBar {
|
|||
barButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
barButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
|
||||
}
|
||||
|
@ -108,7 +107,6 @@ public class ChartsToolBar {
|
|||
curveButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
curveButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
|
||||
}
|
||||
|
@ -124,7 +122,6 @@ public class ChartsToolBar {
|
|||
bullsButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
bullsButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
|
||||
}
|
||||
|
@ -155,7 +152,7 @@ public class ChartsToolBar {
|
|||
gisButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
gisButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
|
||||
public void onSelect(SelectEvent event) {
|
||||
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
|
||||
}
|
||||
|
@ -174,7 +171,6 @@ public class ChartsToolBar {
|
|||
rstudioButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
rstudioButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
// eventBus.fireEvent(new
|
||||
// ImportTableEvent(ImportTableType.JSON));
|
||||
|
@ -192,7 +188,6 @@ public class ChartsToolBar {
|
|||
statisticalButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
statisticalButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
// eventBus.fireEvent(new
|
||||
// ImportTableEvent(ImportTableType.JSON));
|
||||
|
|
|
@ -85,7 +85,7 @@ public class FileToolBar {
|
|||
|
||||
openButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
|
||||
public void onSelect(SelectEvent event) {
|
||||
eventBus.fireEvent(new RibbonEvent(RibbonType.OPEN));
|
||||
}
|
||||
|
@ -105,7 +105,6 @@ public class FileToolBar {
|
|||
|
||||
closeButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
eventBus.fireEvent(new RibbonEvent(RibbonType.CLOSE));
|
||||
}
|
||||
|
@ -123,7 +122,6 @@ public class FileToolBar {
|
|||
dataLayout.setWidget(0, 2, deleteButton);
|
||||
deleteButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
eventBus.fireEvent(new RibbonEvent(RibbonType.DELETE));
|
||||
}
|
||||
|
@ -138,7 +136,6 @@ public class FileToolBar {
|
|||
dataLayout.setWidget(1, 2, propertiesButton);
|
||||
propertiesButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
eventBus.fireEvent(new RibbonEvent(RibbonType.PROPERTIES));
|
||||
}
|
||||
|
@ -164,7 +161,6 @@ public class FileToolBar {
|
|||
importSDMXButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
importSDMXButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTSDMX));
|
||||
}
|
||||
|
@ -178,7 +174,6 @@ public class FileToolBar {
|
|||
importCSVButton.setToolTip("Import table from CSV source");
|
||||
importCSVButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTCSV));
|
||||
}
|
||||
|
@ -191,7 +186,6 @@ public class FileToolBar {
|
|||
importJSONButton.setToolTip("Import table from JSON source");
|
||||
importJSONButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTJSON));
|
||||
}
|
||||
|
@ -220,7 +214,6 @@ public class FileToolBar {
|
|||
exportSDMXButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
exportSDMXButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORTSDMX));
|
||||
}
|
||||
|
@ -235,7 +228,6 @@ public class FileToolBar {
|
|||
exportCSVButton.setToolTip("Export CSV document");
|
||||
exportCSVButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORTCSV));
|
||||
}
|
||||
|
@ -248,7 +240,6 @@ public class FileToolBar {
|
|||
exportJSONButton.setToolTip("Export JSON document");
|
||||
exportJSONButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORTJSON));
|
||||
}
|
||||
|
@ -275,7 +266,6 @@ public class FileToolBar {
|
|||
templateButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
templateButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
// eventBus.fireEvent(new RibbonEvent(
|
||||
// RibbonType.EXPORTSDMX));
|
||||
|
@ -290,7 +280,6 @@ public class FileToolBar {
|
|||
eventBus.addHandler(UIStateEvent.TYPE,
|
||||
new UIStateEvent.UIStateHandler() {
|
||||
|
||||
@Override
|
||||
public void onUIState(UIStateEvent event) {
|
||||
setUI(event);
|
||||
|
||||
|
|
|
@ -83,7 +83,7 @@ public class FormulasToolBar {
|
|||
filterButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
filterButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
|
||||
public void onSelect(SelectEvent event) {
|
||||
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
|
||||
}
|
||||
|
@ -99,7 +99,6 @@ public class FormulasToolBar {
|
|||
unionButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
unionButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
|
||||
}
|
||||
|
@ -116,7 +115,6 @@ public class FormulasToolBar {
|
|||
denormalizeButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
denormalizeButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
|
||||
}
|
||||
|
@ -134,7 +132,6 @@ public class FormulasToolBar {
|
|||
aggregateButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
aggregateButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
|
||||
}
|
||||
|
@ -163,7 +160,6 @@ public class FormulasToolBar {
|
|||
modifyLabelButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
modifyLabelButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
|
||||
}
|
||||
|
@ -180,7 +176,6 @@ public class FormulasToolBar {
|
|||
modifyColumnTypeButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
modifyColumnTypeButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
|
||||
}
|
||||
|
@ -196,7 +191,6 @@ public class FormulasToolBar {
|
|||
modifyColumnValuesButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
modifyColumnValuesButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
|
||||
}
|
||||
|
@ -226,7 +220,6 @@ public class FormulasToolBar {
|
|||
historyButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
historyButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
|
||||
}
|
||||
|
@ -241,7 +234,6 @@ public class FormulasToolBar {
|
|||
historyLayout.setWidget(0, 1, discardButton);
|
||||
discardButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.CSV));
|
||||
}
|
||||
|
@ -252,7 +244,6 @@ public class FormulasToolBar {
|
|||
historyLayout.setWidget(1, 1, discardAllButton);
|
||||
discardAllButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
|
||||
}
|
||||
|
|
|
@ -20,8 +20,10 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
|
|||
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 {
|
||||
|
||||
|
@ -67,7 +69,7 @@ public class ReviewToolBar {
|
|||
rulesButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
rulesButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
|
||||
public void onSelect(SelectEvent event) {
|
||||
// eventBus.fireEvent(new
|
||||
// ImportTableEvent(ImportTableType.JSON));taskButton
|
||||
|
@ -85,7 +87,6 @@ public class ReviewToolBar {
|
|||
manageRulesButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
manageRulesButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
// eventBus.fireEvent(new
|
||||
// ImportTableEvent(ImportTableType.JSON));taskButton
|
||||
|
@ -104,7 +105,6 @@ public class ReviewToolBar {
|
|||
validationButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
validationButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
// eventBus.fireEvent(new
|
||||
// ImportTableEvent(ImportTableType.JSON));
|
||||
|
@ -135,7 +135,6 @@ public class ReviewToolBar {
|
|||
operationsButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
operationsButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
// eventBus.fireEvent(new
|
||||
// ImportTableEvent(ImportTableType.JSON));
|
||||
|
|
Loading…
Reference in New Issue