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

Minor Update 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@90711 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-01-29 18:51:28 +00:00
parent 6d32a427c5
commit e0b4a33b3f
8 changed files with 187 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,9 +4,24 @@
<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-model-3.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-model/tabular-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-widget-common-event-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widget-common-event/tabular-data-widget-common-event">
<dependency-type>uses</dependency-type>
</dependent-module>
<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-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-wizard-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-wizard-widget/tabular-data-wizard-widget">
<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>
<property name="context-root" value="tabular-data-portlet"/>
<property name="java-output-path" value="/tabular-data-portlet/target/tabular-data-portlet-2.0.0-SNAPSHOT/WEB-INF/classes"/>
</wb-module>

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

@ -259,7 +259,7 @@ public class TabularDataController {
break;
case EXPORTJSON:
break;
case TASKSMANAGER:
case TIMELINE:
openTasksManagerWizard();
break;
default:

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

@ -160,10 +160,10 @@ public class TabularDataPortlet implements EntryPoint {
westData.setCollapseMini(true);
westData.setMargins(new Margins(0, 5, 0, 5));
westData.setCollapseHidden(true);
mainPanelLayout.setWestWidget(toolBoxPanel, westData);
toolBoxPanel.collapse();
toolBoxPanel.disable();
toolBoxPanel.expand();
toolBoxPanel.enable();
controller.setToolBoxPanel(toolBoxPanel);

4
src/main/java/org/gcube/portlets/user/td/client/ribbon/ChartsToolBar.java → src/main/java/org/gcube/portlets/user/td/client/ribbon/AnalyseToolBar.java
View File

@ -23,7 +23,7 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
* @author "Federico De Faveri defaveri@isti.cnr.it"
*
*/
public class ChartsToolBar {
public class AnalyseToolBar {
protected EventBus eventBus;
protected ToolBar toolBar;
@ -39,7 +39,7 @@ public class ChartsToolBar {
public ChartsToolBar(EventBus eventBus)
public AnalyseToolBar(EventBus eventBus)
{
this.eventBus = eventBus;
build();

4
src/main/java/org/gcube/portlets/user/td/client/ribbon/ReviewToolBar.java → src/main/java/org/gcube/portlets/user/td/client/ribbon/CurationToolBar.java
View File

@ -25,7 +25,7 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class ReviewToolBar {
public class CurationToolBar {
protected EventBus eventBus;
protected ToolBar toolBar;
@ -36,7 +36,7 @@ public class ReviewToolBar {
protected TextButton operationsButton;
protected TextButton manageRulesButton;
public ReviewToolBar(EventBus eventBus) {
public CurationToolBar(EventBus eventBus) {
this.eventBus = eventBus;
build();
}

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

@ -37,7 +37,7 @@ public class FileToolBar {
protected TextButton openButton;
protected TextButton closeButton;
protected TextButton shareButton;
protected TextButton deleteButton;
protected TextButton propertiesButton;
@ -50,8 +50,17 @@ public class FileToolBar {
protected TextButton exportJSONButton;
protected TextButton templateButton;
protected TextButton taskButton;
protected TextButton shareButton;
protected TextButton timelineButton;
// History
protected TextButton historyButton;
protected TextButton discardButton;
protected TextButton discardAllButton;
protected TextButton helpButton;
public FileToolBar(EventBus eventBus) {
this.eventBus = eventBus;
@ -74,9 +83,9 @@ public class FileToolBar {
fileGroup.setHeadingText("File");
toolBar.add(fileGroup);
FlexTable dataLayout = new FlexTable();
dataLayout.setStyleName("ribbon");
fileGroup.add(dataLayout);
FlexTable fileLayout = new FlexTable();
fileLayout.setStyleName("ribbon");
fileGroup.add(fileLayout);
openButton = new TextButton("Open",
TabularDataResources.INSTANCE.open32());
@ -93,8 +102,8 @@ public class FileToolBar {
}
});
dataLayout.setWidget(0, 0, openButton);
dataLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
fileLayout.setWidget(0, 0, openButton);
fileLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
closeButton = new TextButton("Close",
TabularDataResources.INSTANCE.close32());
@ -112,37 +121,16 @@ public class FileToolBar {
}
});
dataLayout.setWidget(0, 1, closeButton);
dataLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
shareButton = new TextButton("Share",
TabularDataResources.INSTANCE.share32());
shareButton.disable();
shareButton.setId("shareButton");
shareButton.setScale(ButtonScale.LARGE);
shareButton.setIconAlign(IconAlign.TOP);
shareButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
shareButton.setToolTip("Share Tabular Resource");
fileLayout.setWidget(0, 1, closeButton);
fileLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
shareButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.SHARE));
}
});
dataLayout.setWidget(0, 2, shareButton);
dataLayout.getFlexCellFormatter().setRowSpan(0, 2, 2);
deleteButton = new TextButton("Delete",
TabularDataResources.INSTANCE.delete());
deleteButton.disable();
deleteButton.setId("closeButton");
deleteButton.setToolTip("Delete Tabular Resource");
dataLayout.setWidget(0, 3, deleteButton);
fileLayout.setWidget(0, 3, deleteButton);
deleteButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
@ -156,7 +144,7 @@ public class FileToolBar {
propertiesButton.setId("propertiesButton");
propertiesButton.setToolTip("Show properties");
dataLayout.setWidget(1, 3, propertiesButton);
fileLayout.setWidget(1, 3, propertiesButton);
propertiesButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
@ -164,7 +152,7 @@ public class FileToolBar {
}
});
cleanCells(dataLayout.getElement());
cleanCells(fileLayout.getElement());
// Import
ButtonGroup importGroup = new ButtonGroup();
@ -300,35 +288,146 @@ public class FileToolBar {
templateLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
cleanCells(templateLayout.getElement());
// Task
// Share
ButtonGroup shareGroup = new ButtonGroup();
shareGroup.setId("Share");
shareGroup.setStyleName("ribbon");
shareGroup.setHeadingText("Share");
toolBar.add(shareGroup);
FlexTable shareLayout = new FlexTable();
shareGroup.add(shareLayout);
shareButton = new TextButton("Share",
TabularDataResources.INSTANCE.share32());
shareButton.disable();
shareButton.setId("shareButton");
shareButton.setScale(ButtonScale.LARGE);
shareButton.setIconAlign(IconAlign.TOP);
shareButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
shareButton.setToolTip("Share Tabular Resource");
shareButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.SHARE));
}
});
shareLayout.setWidget(0, 0, shareButton);
shareLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
cleanCells(shareLayout.getElement());
// Tasks (TimeLine)
ButtonGroup taskGroup = new ButtonGroup();
taskGroup.setId("Template");
taskGroup.setStyleName("ribbon");
taskGroup.setHeadingText("Task");
taskGroup.setHeadingText("Timeline");
toolBar.add(taskGroup);
FlexTable taskLayout = new FlexTable();
taskGroup.add(taskLayout);
taskButton = new TextButton("Task",
timelineButton = new TextButton("Timeline",
TabularDataResources.INSTANCE.template32());
taskButton.disable();
taskButton.setToolTip("Task");
taskButton.setScale(ButtonScale.LARGE);
taskButton.setIconAlign(IconAlign.TOP);
taskButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
taskButton.addSelectHandler(new SelectHandler() {
timelineButton.disable();
timelineButton.setToolTip("Timeline");
timelineButton.setScale(ButtonScale.LARGE);
timelineButton.setIconAlign(IconAlign.TOP);
timelineButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
timelineButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(
RibbonType.TASKSMANAGER));
eventBus.fireEvent(new RibbonEvent(RibbonType.TIMELINE));
}
});
taskLayout.setWidget(0, 0, taskButton);
taskLayout.setWidget(0, 0, timelineButton);
taskLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
cleanCells(taskLayout.getElement());
// History Group
ButtonGroup historyGroup = new ButtonGroup();
historyGroup.setId("History");
historyGroup.setStyleName("ribbon");
historyGroup.setHeadingText("History");
historyGroup.disable();
toolBar.add(historyGroup);
FlexTable historyLayout = new FlexTable();
historyGroup.add(historyLayout);
historyButton = new TextButton("History",
TabularDataResources.INSTANCE.history32());
historyButton.setScale(ButtonScale.LARGE);
historyButton.setIconAlign(IconAlign.TOP);
historyButton.setToolTip("Show history");
historyButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
historyButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
// eventBus.fireEvent(new
// ImportTableEvent(ImportTableType.JSON));
}
});
historyLayout.setWidget(0, 0, historyButton);
historyLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
discardButton = new TextButton("Discard",
TabularDataResources.INSTANCE.discard());
discardButton.setToolTip("Discard the last operation");
historyLayout.setWidget(0, 1, discardButton);
discardButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
// eventBus.fireEvent(new
// ImportTableEvent(ImportTableType.CSV));
}
});
discardAllButton = new TextButton("Discard All",
TabularDataResources.INSTANCE.discardAll());
discardAllButton.setToolTip("Discard all unsaved operations");
historyLayout.setWidget(1, 1, discardAllButton);
discardAllButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
// eventBus.fireEvent(new
// ImportTableEvent(ImportTableType.JSON));
}
});
cleanCells(historyLayout.getElement());
// Help
ButtonGroup helpGroup = new ButtonGroup();
helpGroup.setId("Help");
helpGroup.setStyleName("ribbon");
helpGroup.setHeadingText("Help");
toolBar.add(helpGroup);
FlexTable helpLayout = new FlexTable();
helpGroup.add(helpLayout);
helpButton = new TextButton("Help",
TabularDataResources.INSTANCE.template32());
helpButton.enable();
helpButton.setToolTip("Help");
helpButton.setScale(ButtonScale.LARGE);
helpButton.setIconAlign(IconAlign.TOP);
helpButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
helpButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.HELP));
}
});
helpLayout.setWidget(0, 0, helpButton);
helpLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
cleanCells(helpLayout.getElement());
eventBus.addHandler(UIStateEvent.TYPE,
new UIStateEvent.UIStateHandler() {
@ -368,7 +467,7 @@ public class FileToolBar {
exportJSONButton.disable();
exportSDMXButton.disable();
templateButton.disable();
taskButton.disable();
timelineButton.disable();
break;
case TR_CLOSE:
openButton.enable();
@ -383,7 +482,7 @@ public class FileToolBar {
exportJSONButton.disable();
exportSDMXButton.disable();
templateButton.disable();
taskButton.disable();
timelineButton.disable();
break;
case TR_OPEN:
openButton.enable();
@ -403,7 +502,7 @@ public class FileToolBar {
exportCSVButton.enable();
exportJSONButton.disable();
templateButton.disable();
taskButton.enable();
timelineButton.enable();
break;
case WIZARD_OPEN:
openButton.disable();
@ -418,7 +517,7 @@ public class FileToolBar {
exportJSONButton.disable();
exportSDMXButton.disable();
templateButton.disable();
taskButton.disable();
timelineButton.disable();
break;
default:
break;

63
src/main/java/org/gcube/portlets/user/td/client/ribbon/FormulasToolBar.java → src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java
View File

@ -23,7 +23,7 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
* @author "Federico De Faveri defaveri@isti.cnr.it"
*
*/
public class FormulasToolBar {
public class ModifyToolBar {
protected EventBus eventBus;
protected ToolBar toolBar;
@ -44,12 +44,9 @@ public class FormulasToolBar {
protected TextButton addAnnotationColumnButton;
protected TextButton validateColumnDuplicateButton;
// History
protected TextButton historyButton;
protected TextButton discardButton;
protected TextButton discardAllButton;
public FormulasToolBar(EventBus eventBus) {
public ModifyToolBar(EventBus eventBus) {
this.eventBus = eventBus;
build();
}
@ -291,59 +288,7 @@ public class FormulasToolBar {
cleanCells(columnLayout.getElement());
// History Group
ButtonGroup historyGroup = new ButtonGroup();
historyGroup.setId("History");
historyGroup.setStyleName("ribbon");
historyGroup.setHeadingText("History");
historyGroup.disable();
toolBar.add(historyGroup);
FlexTable historyLayout = new FlexTable();
historyGroup.add(historyLayout);
historyButton = new TextButton("History",
TabularDataResources.INSTANCE.history32());
historyButton.setScale(ButtonScale.LARGE);
historyButton.setIconAlign(IconAlign.TOP);
historyButton.setToolTip("Show history");
historyButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
historyButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
// eventBus.fireEvent(new
// ImportTableEvent(ImportTableType.JSON));
}
});
historyLayout.setWidget(0, 0, historyButton);
historyLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
discardButton = new TextButton("Discard",
TabularDataResources.INSTANCE.discard());
discardButton.setToolTip("Discard the last operation");
historyLayout.setWidget(0, 1, discardButton);
discardButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
// eventBus.fireEvent(new
// ImportTableEvent(ImportTableType.CSV));
}
});
discardAllButton = new TextButton("Discard All",
TabularDataResources.INSTANCE.discardAll());
discardAllButton.setToolTip("Discard all unsaved operations");
historyLayout.setWidget(1, 1, discardAllButton);
discardAllButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
// eventBus.fireEvent(new
// ImportTableEvent(ImportTableType.JSON));
}
});
cleanCells(historyLayout.getElement());
}

22
src/main/java/org/gcube/portlets/user/td/client/ribbon/TabularDataRibbon.java
View File

@ -23,9 +23,9 @@ public class TabularDataRibbon {
//protected PlainTabPanel ribbon;
protected FileToolBar fileToolBar;
protected ReviewToolBar reviewToolBar;
protected FormulasToolBar formulasToolBar;
protected ChartsToolBar chartsToolBar;
protected CurationToolBar curationToolBar;
protected ModifyToolBar modifyToolBar;
protected AnalyseToolBar analyseToolBar;
public TabularDataRibbon(EventBus eventBus) {
try {
@ -40,21 +40,21 @@ public class TabularDataRibbon {
con.add(fileToolBar.getToolBar(), vldata);
ribbon.add(con, "Home");
reviewToolBar = new ReviewToolBar(eventBus);
curationToolBar = new CurationToolBar(eventBus);
con = new VerticalLayoutContainer();
con.add(reviewToolBar.getToolBar(), vldata);
ribbon.add(con, "Review");
con.add(curationToolBar.getToolBar(), vldata);
ribbon.add(con, "Curation");
formulasToolBar = new FormulasToolBar(eventBus);
modifyToolBar = new ModifyToolBar(eventBus);
con = new VerticalLayoutContainer();
con.add(formulasToolBar.getToolBar(), vldata);
con.add(modifyToolBar.getToolBar(), vldata);
ribbon.add(con, "Modify");
chartsToolBar = new ChartsToolBar(eventBus);
analyseToolBar = new AnalyseToolBar(eventBus);
con = new VerticalLayoutContainer();
con.add(chartsToolBar.getToolBar(), vldata);
ribbon.add(con, "Applications");
con.add(analyseToolBar.getToolBar(), vldata);
ribbon.add(con, "Analyse");
} catch (Exception e) {
e.printStackTrace();