gCubeSystem
/
tabular-data-manager
16
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@87000 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2013-12-16 18:36:41 +00:00
parent 43af21aa7b
commit a0112c5edd
7 changed files with 76 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +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.5
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.5
org.eclipse.jdt.core.compiler.source=1.7

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

@ -4,10 +4,7 @@
<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">
<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>
<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">

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

@ -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.5"/>
<installed facet="java" version="1.7"/>
</faceted-project>

17
pom.xml
View File

@ -234,7 +234,14 @@
<artifactId>tabular-data-toolbox-widget</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<!--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>
@ -342,7 +349,7 @@
</plugin>
<!-- Maven -->
<!-- Maven
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
@ -433,7 +440,7 @@
</executions>
</plugin>
<!--
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@ -444,7 +451,7 @@
</configuration>
</plugin>
SA Plugin
<!-- SA Plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@ -490,7 +497,7 @@
</execution>
</executions>
</plugin>
-->
</plugins>

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

@ -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.RibbonEvent;
import org.gcube.portlets.user.td.widgetcommonevent.client.event.UIStateEvent;
import org.gcube.portlets.user.td.widgetcommonevent.client.type.RibbonType;
@ -22,6 +23,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;
@ -229,6 +231,9 @@ public class TabularDataController {
break;
case EXPORTJSON:
break;
case TASKSMANAGER:
openTasksManagerWizard();
break;
default:
break;
}
@ -434,6 +439,19 @@ public class TabularDataController {
}
protected TdTaskController tdTaskController;
protected DialogBox tdTaskMainWindow;
protected void openTasksManagerWizard() {
tdTaskController = TdTaskController.getInstance();
TdTaskController.bindCommonBus(eventBus);
tdTaskMainWindow = tdTaskController.getWindowTaskMonitor(); // This is main panel
tdTaskMainWindow.show();
}
protected void asyncCodeLoadingFailed(Throwable reason) {
Log.error("Async code loading failed", reason);
Info.display("Async code loading failed",

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

@ -49,6 +49,8 @@ public class FileToolBar {
protected TextButton exportJSONButton;
protected TextButton templateButton;
protected TextButton taskButton;
public FileToolBar(EventBus eventBus) {
this.eventBus = eventBus;
@ -85,7 +87,6 @@ public class FileToolBar {
openButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.OPEN));
}
@ -245,6 +246,7 @@ public class FileToolBar {
}
});
exportLayout.setWidget(1, 2, exportJSONButton);
cleanCells(exportLayout.getElement());
// Template
ButtonGroup templateGroup = new ButtonGroup();
@ -274,8 +276,36 @@ public class FileToolBar {
templateLayout.setWidget(0, 0, templateButton);
templateLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
cleanCells(templateLayout.getElement());
cleanCells(exportLayout.getElement());
// Task
ButtonGroup taskGroup = new ButtonGroup();
taskGroup.setId("Template");
taskGroup.setStyleName("ribbon");
taskGroup.setHeadingText("Task");
toolBar.add(taskGroup);
FlexTable taskLayout = new FlexTable();
taskGroup.add(taskLayout);
taskButton = new TextButton("Task",
TabularDataResources.INSTANCE.template32());
taskButton.disable();
taskButton.setToolTip("Task");
taskButton.setScale(ButtonScale.LARGE);
taskButton.setIconAlign(IconAlign.TOP);
taskButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
taskButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(
RibbonType.TASKSMANAGER));
}
});
taskLayout.setWidget(0, 0, taskButton);
taskLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
cleanCells(taskLayout.getElement());
eventBus.addHandler(UIStateEvent.TYPE,
new UIStateEvent.UIStateHandler() {
@ -314,6 +344,8 @@ public class FileToolBar {
exportCSVButton.disable();
exportJSONButton.disable();
exportSDMXButton.disable();
templateButton.disable();
taskButton.disable();
break;
case TR_CLOSE:
openButton.enable();
@ -326,6 +358,8 @@ public class FileToolBar {
exportCSVButton.disable();
exportJSONButton.disable();
exportSDMXButton.disable();
templateButton.disable();
taskButton.disable();
break;
case TR_OPEN:
openButton.enable();
@ -343,6 +377,8 @@ public class FileToolBar {
}
exportCSVButton.enable();
exportJSONButton.disable();
templateButton.disable();
taskButton.enable();
break;
case WIZARD_OPEN:
openButton.disable();
@ -355,6 +391,8 @@ public class FileToolBar {
exportCSVButton.disable();
exportJSONButton.disable();
exportSDMXButton.disable();
templateButton.disable();
taskButton.disable();
break;
default:
break;

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

@ -4,7 +4,7 @@
<inherits name='com.google.gwt.user.User' />
<!-- Other module inherits -->
<!-- <inherits name='com.extjs.gxt.ui.GXT' /> -->
<!-- <inherits name='com.extjs.gxt.ui.GXT' /> -->
<inherits name='com.sencha.gxt.ui.GXT' />
<inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
@ -18,6 +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.toolboxwidget.ToolBox' />
<inherits name='org.gcube.portlets.user.td.openwidget.TDOpen' />
<inherits name='org.gcube.portlets.user.td.sdmximportwidget.SDMXImportWizardTD' />