From 3c220bb7cc5dfdfcd37407e2ea99098b2adaf8f4 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 11 Dec 2013 13:28:10 +0000 Subject: [PATCH] Minor updated git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@86832 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 37 ++++++ .project | 53 ++++++++ .settings/.jsdtscope | 12 ++ .../com.google.appengine.eclipse.core.prefs | 4 + .settings/com.google.gdt.eclipse.core.prefs | 5 + .settings/com.google.gwt.eclipse.core.prefs | 2 + .settings/org.eclipse.core.resources.prefs | 6 + .settings/org.eclipse.jdt.core.prefs | 8 ++ .settings/org.eclipse.m2e.core.prefs | 4 + .settings/org.eclipse.wst.common.component | 50 ++++++++ ....eclipse.wst.common.project.facet.core.xml | 7 ++ ...rg.eclipse.wst.jsdt.ui.superType.container | 1 + .../org.eclipse.wst.jsdt.ui.superType.name | 1 + config/profile.xml | 29 +++++ distro/INSTALL | 0 distro/LICENSE | 6 + distro/MAINTAINERS | 1 + distro/README | 40 ++++++ distro/changelog.xml | 6 + distro/svnpath.txt | 1 + pom.xml | 20 +-- .../user/td/client/TabularDataController.java | 118 +++++------------- .../user/td/client/TabularDataPortlet.java | 69 +++++----- .../portlets/user/td/client/UIProperties.java | 6 - .../user/td/tabulardataportlet.gwt.xml | 6 +- 25 files changed, 355 insertions(+), 137 deletions(-) create mode 100644 .classpath create mode 100644 .project create mode 100644 .settings/.jsdtscope create mode 100644 .settings/com.google.appengine.eclipse.core.prefs create mode 100644 .settings/com.google.gdt.eclipse.core.prefs create mode 100644 .settings/com.google.gwt.eclipse.core.prefs create mode 100644 .settings/org.eclipse.core.resources.prefs create mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 .settings/org.eclipse.m2e.core.prefs create mode 100644 .settings/org.eclipse.wst.common.component create mode 100644 .settings/org.eclipse.wst.common.project.facet.core.xml create mode 100644 .settings/org.eclipse.wst.jsdt.ui.superType.container create mode 100644 .settings/org.eclipse.wst.jsdt.ui.superType.name create mode 100644 config/profile.xml create mode 100644 distro/INSTALL create mode 100644 distro/LICENSE create mode 100644 distro/MAINTAINERS create mode 100644 distro/README create mode 100644 distro/changelog.xml create mode 100644 distro/svnpath.txt delete mode 100644 src/main/java/org/gcube/portlets/user/td/client/UIProperties.java diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..fc28f47 --- /dev/null +++ b/.classpath @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000..a4ced1e --- /dev/null +++ b/.project @@ -0,0 +1,53 @@ + + + tabular-data-portlet + + + + + + org.eclipse.wst.jsdt.core.javascriptValidator + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + com.google.gdt.eclipse.core.webAppProjectValidator + + + + + com.google.gwt.eclipse.core.gwtProjectValidator + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + com.google.gwt.eclipse.core.gwtNature + org.eclipse.wst.jsdt.core.jsNature + + diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope new file mode 100644 index 0000000..b46b920 --- /dev/null +++ b/.settings/.jsdtscope @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/.settings/com.google.appengine.eclipse.core.prefs b/.settings/com.google.appengine.eclipse.core.prefs new file mode 100644 index 0000000..5260f5f --- /dev/null +++ b/.settings/com.google.appengine.eclipse.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +filesCopiedToWebInfLib= +googleCloudSqlEnabled=false +localDevMySqlEnabled=true diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs new file mode 100644 index 0000000..6d6f9dc --- /dev/null +++ b/.settings/com.google.gdt.eclipse.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +jarsExcludedFromWebInfLib= +lastWarOutDir=/home/giancarlo/workspace/tabular-data-portlet/target/tabular-data-portlet-2.0.0-SNAPSHOT +warSrcDir=src/main/webapp +warSrcDirIsOutput=false diff --git a/.settings/com.google.gwt.eclipse.core.prefs b/.settings/com.google.gwt.eclipse.core.prefs new file mode 100644 index 0000000..f23a752 --- /dev/null +++ b/.settings/com.google.gwt.eclipse.core.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +entryPointModules= diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..29abf99 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,6 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..69c31cd --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +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 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component new file mode 100644 index 0000000..a33d07e --- /dev/null +++ b/.settings/org.eclipse.wst.common.component @@ -0,0 +1,50 @@ + + + + + + + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + uses + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 0000000..5272955 --- /dev/null +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/.settings/org.eclipse.wst.jsdt.ui.superType.container new file mode 100644 index 0000000..3bd5d0a --- /dev/null +++ b/.settings/org.eclipse.wst.jsdt.ui.superType.container @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/.settings/org.eclipse.wst.jsdt.ui.superType.name new file mode 100644 index 0000000..05bd71b --- /dev/null +++ b/.settings/org.eclipse.wst.jsdt.ui.superType.name @@ -0,0 +1 @@ +Window \ No newline at end of file diff --git a/config/profile.xml b/config/profile.xml new file mode 100644 index 0000000..8023006 --- /dev/null +++ b/config/profile.xml @@ -0,0 +1,29 @@ + + + + Service + + tabular-data-portlet manages tabular data + PortletsUser + tabular-data-portlet + 1.0.0 + + + tabular-data-portlet manages tabular data + tabular-data-portlet + 2.0.0-SNAPSHOT + + org.gcube.portlets.user + tabular-data-portlet + 2.0.0-SNAPSHOT + + webapplication + + tabular-data-portlet-2.0.0-SNAPSHOT.war + + + + + + + diff --git a/distro/INSTALL b/distro/INSTALL new file mode 100644 index 0000000..e69de29 diff --git a/distro/LICENSE b/distro/LICENSE new file mode 100644 index 0000000..cc51139 --- /dev/null +++ b/distro/LICENSE @@ -0,0 +1,6 @@ +gCube System - License +------------------------------------------------------------ + +The gCube/gCore software is licensed as Free Open Source software conveying to the EUPL (http://ec.europa.eu/idabc/eupl). +The software and documentation is provided by its authors/distributors "as is" and no expressed or +implied warranty is given for its use, quality or fitness for a particular case. \ No newline at end of file diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS new file mode 100644 index 0000000..0bc9be3 --- /dev/null +++ b/distro/MAINTAINERS @@ -0,0 +1 @@ +Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" diff --git a/distro/README b/distro/README new file mode 100644 index 0000000..237bea8 --- /dev/null +++ b/distro/README @@ -0,0 +1,40 @@ +The gCube System - tabular-data-portlet +------------------------------------------------------------ + +This work has been supported by the following European projects: iMarine (FP7-INFRASTRUCTURES-2011-2) + +Authors +------- + +Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, +Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" + + +Version and Release Date +------------------------ + +v. 2.0.0-SNAPSHOT (2013-10-18) + +Description +----------- + +tabular-data-portlet manages tabular data + +Download information +-------------------- +Source code URL: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet + + +Documentation +------------- + +tabular-data-portlet manages tabular data + + +Licensing +--------- + +This software is licensed under the terms you may find in the file named "LICENSE" in this directory. + + + diff --git a/distro/changelog.xml b/distro/changelog.xml new file mode 100644 index 0000000..99579cc --- /dev/null +++ b/distro/changelog.xml @@ -0,0 +1,6 @@ + + + First Release + + \ No newline at end of file diff --git a/distro/svnpath.txt b/distro/svnpath.txt new file mode 100644 index 0000000..b32abff --- /dev/null +++ b/distro/svnpath.txt @@ -0,0 +1 @@ +https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet \ No newline at end of file diff --git a/pom.xml b/pom.xml index e72a88d..6bf95d6 100644 --- a/pom.xml +++ b/pom.xml @@ -164,14 +164,14 @@ csv4j [1.2.0-SNAPSHOT, 2.0.0-common) - + org.gcube.portlets.user tabular-data-widget-common-event 1.0.0-SNAPSHOT - + org.gcube.portlets.user @@ -199,7 +199,7 @@ tabular-data-csv-export-widget [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) - + org.gcube.portlets.user @@ -207,12 +207,7 @@ [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) - - - org.gcube.portlets.user - tabular-data-information-widget - [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) - + @@ -228,6 +223,13 @@ [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + + + org.gcube.portlets.user + tabular-data-toolbox-widget + 1.0.0-SNAPSHOT + + com.allen-sauer.gwt.log diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java index ed08901..ec2ec57 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java +++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java @@ -3,21 +3,18 @@ */ package org.gcube.portlets.user.td.client; -import org.gcube.portlets.user.td.sdmxexportwidget.client.SDMXExportWizardTD; -import org.gcube.portlets.user.td.sdmximportwidget.client.SDMXImportWizardTD; -import org.gcube.portlets.user.td.wizardwidget.client.WizardListener; - -import org.gcube.portlets.user.td.widgetcommonevent.client.event.RibbonEvent; -import org.gcube.portlets.user.td.widgetcommonevent.client.type.RibbonType; -import org.gcube.portlets.user.td.widgetcommonevent.client.event.UIStateEvent; -import org.gcube.portlets.user.td.widgetcommonevent.client.type.UIStateType; -import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import org.gcube.portlets.user.td.csvexportwidget.client.CSVExportWizardTD; import org.gcube.portlets.user.td.csvimportwidget.client.CSVImportWizardTD; import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; -import org.gcube.portlets.user.td.informationwidget.client.TabularResourceProperties; - 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.widgetcommonevent.client.event.RibbonEvent; +import org.gcube.portlets.user.td.widgetcommonevent.client.event.UIStateEvent; +import org.gcube.portlets.user.td.widgetcommonevent.client.type.RibbonType; +import org.gcube.portlets.user.td.widgetcommonevent.client.type.UIStateType; +import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; +import org.gcube.portlets.user.td.wizardwidget.client.WizardListener; import org.gcube.portlets.user.tdw.client.TabularData; import org.gcube.portlets.user.tdw.shared.model.TableId; @@ -25,17 +22,12 @@ 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.Widget; import com.google.web.bindery.event.shared.EventBus; import com.google.web.bindery.event.shared.SimpleEventBus; import com.sencha.gxt.widget.core.client.ContentPanel; -import com.sencha.gxt.widget.core.client.TabItemConfig; -import com.sencha.gxt.widget.core.client.TabPanel; import com.sencha.gxt.widget.core.client.box.AlertMessageBox; import com.sencha.gxt.widget.core.client.container.BorderLayoutContainer.BorderLayoutData; -import com.sencha.gxt.widget.core.client.event.BeforeCloseEvent; import com.sencha.gxt.widget.core.client.event.HideEvent; -import com.sencha.gxt.widget.core.client.event.BeforeCloseEvent.BeforeCloseHandler; import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler; import com.sencha.gxt.widget.core.client.info.Info; @@ -51,12 +43,8 @@ public class TabularDataController { protected SimpleEventBus eventBus; protected TabularData tabularData; protected UIStateType uiState = UIStateType.START; - protected UIProperties uiProperties = UIProperties.CLOSED; - protected ContentPanel functionalityPanel; - protected TabPanel functionalityTab; - protected int indexFunctionalityTab = 0; - protected TabularResourceProperties trProperties; + protected ContentPanel toolBoxPanel; protected BorderLayoutData eastData; /** @@ -85,21 +73,15 @@ public class TabularDataController { this.tabularData = tabularData; } - public ContentPanel getFunctionalityPanel() { - return functionalityPanel; + public ContentPanel getToolBoxPanel() { + return toolBoxPanel; } - public void setFunctionalityPanel(ContentPanel functionalityPanel) { - this.functionalityPanel = functionalityPanel; + public void setToolBoxPanel(ContentPanel toolBoxPanel) { + this.toolBoxPanel = toolBoxPanel; } - public TabPanel getFunctionalityTab() { - return functionalityTab; - } - - public void setFunctionalityTab(TabPanel functionalityTab) { - this.functionalityTab = functionalityTab; - } + public BorderLayoutData getEastData() { return eastData; @@ -157,26 +139,22 @@ public class TabularDataController { UIStateEvent uiStateEvent=new UIStateEvent(UIStateType.TR_OPEN); uiStateEvent.setTrId(tabularResourceId); eventBus.fireEvent(uiStateEvent); - updateUIProperties(); } + /* protected void updateUIProperties(){ - if (uiProperties == UIProperties.OPENED) { + if (uiToolBox == UIToolBox.OPENED) { trProperties.update(); } } - + */ + protected void closeTabularResource() { if (uiState == UIStateType.TR_OPEN) { tabularData.closeTable(); uiState = UIStateType.TR_CLOSE; eventBus.fireEvent(new UIStateEvent(UIStateType.TR_CLOSE)); - if (uiProperties == UIProperties.OPENED) { - functionalityPanel.collapse(); - functionalityPanel.disable(); - uiProperties = UIProperties.CLOSED; - functionalityTab.remove(trProperties); - } + } } @@ -218,7 +196,6 @@ public class TabularDataController { deleteTabularResource(); break; case PROPERTIES: - openFunctionalityProperties(); break; case IMPORTSDMX: openSDMXImportWizard(); @@ -245,55 +222,28 @@ public class TabularDataController { } } - protected void openFunctionalityProperties() { + /* + protected void openToolBox() { if (uiState == UIStateType.TR_OPEN) { - if (uiProperties == UIProperties.OPENED) { - functionalityPanel.collapse(); - functionalityPanel.disable(); - uiProperties = UIProperties.CLOSED; - functionalityTab.remove(trProperties); + if (uiToolBox == UIToolBox.OPENED) { + toolBoxPanel.collapse(); + toolBoxPanel.disable(); + + uiToolBox = UIToolBox.CLOSED; + eventBus.fireEvent(new UIStateEvent(UIStateType.TOOLBOX_CLOSE)); + toolBox.remove(trProperties); Info.display("Properties", "Closed"); } else { - TabItemConfig propertiesItemConf = new TabItemConfig( - "Properties", true); - - trProperties = new TabularResourceProperties("TRProperties", - eventBus); - trProperties.setHeaderVisible(false); - functionalityTab.add(trProperties, propertiesItemConf); - functionalityTab - .addBeforeCloseHandler(new BeforeCloseHandler() { - - @Override - public void onBeforeClose( - BeforeCloseEvent event) { - if (functionalityTab.getWidgetCount() == 1) { - functionalityPanel.disable(); - functionalityPanel.collapse(); - uiProperties = UIProperties.CLOSED; - functionalityTab.remove(trProperties); - } - - } - - }); - - /* - * Label taskLabel = new Label("Task Properties"); - * taskLabel.addStyleName("pad-text"); functionalityTab - * .add(taskLabel, new TabItemConfig("Task", true)); - */ - functionalityTab.setActiveWidget(functionalityTab.getWidget(0)); - - functionalityPanel.enable(); - functionalityPanel.expand(); - uiProperties = UIProperties.OPENED; + eventBus.fireEvent(new UIStateEvent(UIStateType.TOOLBOX_OPEN)); + toolBoxPanel.enable(); + toolBoxPanel.expand(); + uiToolBox = UIToolBox.OPENED; } } else { Info.display("Properties", "No table open"); } - }; + };*/ protected void openSDMXImportWizard() { GWT.runAsync(new RunAsyncCallback() { @@ -353,7 +303,6 @@ public class TabularDataController { @Override public void completed(TRId id) { - updateUIProperties(); resumeUIState(); } @@ -394,7 +343,6 @@ public class TabularDataController { @Override public void completed(TRId id) { - updateUIProperties(); resumeUIState(); } diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java index 320677a..8229352 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java +++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java @@ -5,6 +5,7 @@ import java.util.List; import org.gcube.portlets.user.td.client.ribbon.TabularDataRibbon; import org.gcube.portlets.user.td.client.rpc.TabularDataService; import org.gcube.portlets.user.td.client.rpc.TabularDataServiceAsync; +import org.gcube.portlets.user.td.toolboxwidget.client.ToolBoxPanel; import org.gcube.portlets.user.tdw.client.TabularData; import org.gcube.portlets.user.tdw.client.TabularDataGridPanel; import org.gcube.portlets.user.tdw.client.config.Row; @@ -24,7 +25,6 @@ import com.google.gwt.user.client.ui.RootPanel; import com.google.web.bindery.event.shared.EventBus; import com.sencha.gxt.core.client.Style.SelectionMode; import com.sencha.gxt.core.client.util.Margins; -import com.sencha.gxt.widget.core.client.ContentPanel; import com.sencha.gxt.widget.core.client.TabPanel; import com.sencha.gxt.widget.core.client.box.AlertMessageBox; import com.sencha.gxt.widget.core.client.container.BorderLayoutContainer; @@ -34,6 +34,7 @@ import com.sencha.gxt.widget.core.client.container.Viewport; import com.sencha.gxt.widget.core.client.event.HideEvent; import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler; import com.sencha.gxt.widget.core.client.grid.ColumnConfig; +import com.sencha.gxt.widget.core.client.grid.ColumnModel; import com.sencha.gxt.widget.core.client.info.Info; import com.sencha.gxt.widget.core.client.menu.Item; import com.sencha.gxt.widget.core.client.menu.Menu; @@ -71,8 +72,7 @@ public class TabularDataPortlet implements EntryPoint { // Private TabularData private static TabularData tabularData; - private static ContentPanel functionalityPanel; - private static TabPanel functionalityTab; + private static ToolBoxPanel toolBoxPanel; private static BorderLayoutData eastData; /** @@ -139,19 +139,10 @@ public class TabularDataPortlet implements EntryPoint { MarginData gridData = new MarginData(); mainPanelLayout.setCenterWidget(gridPanel, gridData); - // Functionality Panel - functionalityPanel = new ContentPanel(); - functionalityPanel.setWidth(310); - functionalityPanel.setHeaderVisible(false); - functionalityPanel.setResize(true); - - functionalityTab = new TabPanel(); - functionalityTab.setAnimScroll(true); - functionalityTab.setTabScroll(true); - functionalityTab.setCloseContextMenu(true); - - functionalityPanel.add(functionalityTab); - + // ToolBox Panel + toolBoxPanel = new ToolBoxPanel("ToolBoxPanel",eventBus); + + eastData = new BorderLayoutData(310); eastData.setCollapsible(true); eastData.setSplit(false); @@ -160,16 +151,17 @@ public class TabularDataPortlet implements EntryPoint { eastData.setMargins(new Margins(0, 5, 0, 5)); eastData.setCollapseHidden(true); - mainPanelLayout.setEastWidget(functionalityPanel, eastData); - functionalityPanel.collapse(); - functionalityPanel.disable(); + mainPanelLayout.setEastWidget(toolBoxPanel, eastData); + toolBoxPanel.collapse(); + toolBoxPanel.disable(); - controller.setFunctionalityTab(functionalityTab); - controller.setFunctionalityPanel(functionalityPanel); + + controller.setToolBoxPanel(toolBoxPanel); controller.setEastData(eastData); bind(mainPanelLayout); - menu(gridPanel); + //menu(gridPanel); + } protected void bind(BorderLayoutContainer mainWidget) { @@ -225,23 +217,32 @@ public class TabularDataPortlet implements EntryPoint { @Override public void onSelection(SelectionEvent event) { Log.debug("Start On Selection"); - Log.debug("gridPanel is: "+gridPanel); + Log.debug("gridPanel is: " + gridPanel); if (gridPanel != null) { - List> columns= gridPanel.getGrid().getColumnModel().getColumns(); - for(ColumnConfig cc:columns){ - Log.debug("ColumnConfig:"+cc.getHeader()); + ColumnModel columnModel = gridPanel.getGrid() + .getColumnModel(); + + List> columns = columnModel + .getColumns(); + for (ColumnConfig cc : columns) { + Log.debug("ColumnConfig:" + cc.getHeader()); } - - DataRowColumnConfig dc=(DataRowColumnConfig)columns.get(0); - Log.debug("DC - Header:"+dc.getHeader()); - Log.debug("DC - Definition:"+dc.getDefinition().getId()+" Label:"+dc.getDefinition().getLabel()+" Key:"+dc.getDefinition().getKey()); - + + DataRowColumnConfig dc = (DataRowColumnConfig) columns + .get(0); + + Log.debug("DC - Header:" + dc.getHeader()); + Log.debug("DC - Definition:" + dc.getDefinition().getId() + + " Label:" + dc.getDefinition().getLabel() + + " Key:" + dc.getDefinition().getKey()); + Row row = gridPanel.getSelectedRow(); Log.debug("Retrived row"); - + String rowInfo; if (row != null) { - rowInfo = row.getFieldAsText(dc.getDefinition().getLabel()); + rowInfo = row.getFieldAsText(dc.getDefinition() + .getLabel()); } else { rowInfo = "no row retrived"; } @@ -259,6 +260,8 @@ public class TabularDataPortlet implements EntryPoint { gridPanel.setContextMenu(menu); } + + /* * private void configPanel(final Portlet panel) { * panel.setCollapsible(true); panel.setAnimCollapse(false); diff --git a/src/main/java/org/gcube/portlets/user/td/client/UIProperties.java b/src/main/java/org/gcube/portlets/user/td/client/UIProperties.java deleted file mode 100644 index 9a7fd00..0000000 --- a/src/main/java/org/gcube/portlets/user/td/client/UIProperties.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.gcube.portlets.user.td.client; - -public enum UIProperties { - CLOSED, - OPENED; -} diff --git a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml index b51af07..72bc9ac 100644 --- a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml @@ -16,10 +16,8 @@ - - - - + +