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

Changed Ribbon 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@82406 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2013-10-03 16:24:55 +00:00
parent 7905e395cc
commit 2efcf51e2f
15 changed files with 168 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,9 +4,6 @@
<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-information-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-information/tabular-data-information">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-widget-td-source-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widget-td-source/tabular-data-widget-td-source">
<dependency-type>uses</dependency-type>
</dependent-module>
@ -28,6 +25,9 @@
<dependent-module archiveName="tabular-data-gxtservice-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-gxtservice/tabular-data-gxtservice">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-information-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-information/tabular-data-information">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
<property name="context-root" value="tabular-data-portlet"/>
</wb-module>

79
pom.xml
View File

@ -56,32 +56,6 @@
<scope>provided</scope>
</dependency>
<!-- TD Information -->
<dependency>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>tabular-data-information</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- LOGGING -->
<dependency>
<groupId>com.allen-sauer.gwt.log</groupId>
<artifactId>gwt-log</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.0.1</version>
<scope>runtime</scope>
</dependency>
<!-- PORTAL -->
<dependency>
<groupId>javax.portlet</groupId>
@ -114,7 +88,6 @@
<artifactId>workspace-tree-widget</artifactId>
</dependency>
<dependency>
<groupId>com.extjs.gxt</groupId>
<artifactId>gxt</artifactId>
@ -200,7 +173,39 @@
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency>
<!-- TD Information -->
<dependency>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>tabular-data-information</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- LOGGING -->
<dependency>
<groupId>com.allen-sauer.gwt.log</groupId>
<artifactId>gwt-log</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.0.1</version>
<scope>runtime</scope>
</dependency>
<!-- JUnit TEST -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
@ -218,6 +223,7 @@
<execution>
<goals>
<goal>compile</goal>
<goal>test</goal>
</goals>
</execution>
</executions>
@ -236,6 +242,25 @@
<webappDirectory>${webappDirectory}</webappDirectory>
</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>
<!-- TODO check if needed -->
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit47</artifactId>
<version>2.16</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>

24
src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java
View File

@ -143,5 +143,29 @@ public interface TabularDataResources extends ClientBundle {
@Source("arrow-undo-all.png")
ImageResource discardAll();
@Source("column-type_32.png")
ImageResource columnType32();
@Source("column-type.png")
ImageResource columnType();
@Source("column-label_32.png")
ImageResource columnLabel32();
@Source("column-label.png")
ImageResource columnLabel();
@Source("column-values_32.png")
ImageResource columnValues32();
@Source("column-values.png")
ImageResource columnValues();
@Source("column_32.png")
ImageResource column32();
@Source("column.png")
ImageResource column();
}

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

@ -56,7 +56,7 @@ public class ChartsToolBar {
ButtonGroup basicGroup = new ButtonGroup();
basicGroup.setHeight("78px");
basicGroup.setStyleName("margin:2px");
basicGroup.setHeadingText("Basic");
basicGroup.setHeadingText("Charts");
toolBar.add(basicGroup);
FlexTable basicLayout = new FlexTable();

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

@ -28,13 +28,20 @@ public class FormulasToolBar {
protected EventBus eventBus;
protected ToolBar toolBar;
//Basic
//Table
protected TextButton filterButton;
protected TextButton unionButton;
protected TextButton denormalizeButton;
protected TextButton groupButton;
protected TextButton aggregateButton;
//Column
protected TextButton modifyLabelButton;
protected TextButton modifyColumnTypeButton;
protected TextButton modifyColumnValuesButton;
//History
protected TextButton historyButton;
protected TextButton discardButton;
@ -60,7 +67,7 @@ public class FormulasToolBar {
ButtonGroup basicGroup = new ButtonGroup();
basicGroup.setHeight("78px");
basicGroup.setStyleName("margin:2px");
basicGroup.setHeadingText("Basic");
basicGroup.setHeadingText("Table");
toolBar.add(basicGroup);
FlexTable basicLayout = new FlexTable();
@ -81,8 +88,7 @@ public class FormulasToolBar {
basicLayout.setWidget(0, 0, filterButton);
basicLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
cleanCells(basicLayout.getElement());
unionButton = new TextButton("Union", TabularDataResources.INSTANCE.union32());
unionButton.setScale(ButtonScale.LARGE);
unionButton.setIconAlign(IconAlign.TOP);
@ -98,8 +104,8 @@ public class FormulasToolBar {
basicLayout.setWidget(0, 1, unionButton);
basicLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
cleanCells(basicLayout.getElement());
denormalizeButton = new TextButton("Denormalize", TabularDataResources.INSTANCE.denormalize32());
denormalizeButton.setScale(ButtonScale.LARGE);
denormalizeButton.setIconAlign(IconAlign.TOP);
@ -115,9 +121,9 @@ public class FormulasToolBar {
basicLayout.setWidget(0, 2, denormalizeButton);
basicLayout.getFlexCellFormatter().setRowSpan(0, 2, 2);
cleanCells(basicLayout.getElement());
/*
groupButton = new TextButton("Group", TabularDataResources.INSTANCE.group32());
groupButton.setScale(ButtonScale.LARGE);
groupButton.setIconAlign(IconAlign.TOP);
@ -131,10 +137,10 @@ public class FormulasToolBar {
}
});
basicLayout.setWidget(0, 3, groupButton);
basicLayout.getFlexCellFormatter().setRowSpan(0, 3, 2);
basicLayout.setWidget(0, 2, groupButton);
basicLayout.getFlexCellFormatter().setRowSpan(0, 2, 2);
cleanCells(basicLayout.getElement());
*/
aggregateButton = new TextButton("Aggregate", TabularDataResources.INSTANCE.aggregate32());
aggregateButton.setScale(ButtonScale.LARGE);
aggregateButton.setIconAlign(IconAlign.TOP);
@ -148,11 +154,73 @@ public class FormulasToolBar {
}
});
basicLayout.setWidget(0, 4, aggregateButton);
basicLayout.getFlexCellFormatter().setRowSpan(0, 4, 2);
basicLayout.setWidget(0, 3, aggregateButton);
basicLayout.getFlexCellFormatter().setRowSpan(0, 3, 2);
cleanCells(basicLayout.getElement());
//Column
ButtonGroup columnGroup = new ButtonGroup();
columnGroup.setHeight("78px");
columnGroup.setStyleName("margin:2px");
columnGroup.setHeadingText("Column");
toolBar.add(columnGroup);
FlexTable columnLayout = new FlexTable();
columnGroup.add(columnLayout);
modifyLabelButton = new TextButton("Label", TabularDataResources.INSTANCE.columnLabel32());
modifyLabelButton.setScale(ButtonScale.LARGE);
modifyLabelButton.setIconAlign(IconAlign.TOP);
modifyLabelButton.setToolTip("Changes the column label");
modifyLabelButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
modifyLabelButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) {
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
}
});
columnLayout.setWidget(0, 0, modifyLabelButton);
columnLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
modifyColumnTypeButton = new TextButton("Type", TabularDataResources.INSTANCE.columnType32());
modifyColumnTypeButton.setScale(ButtonScale.LARGE);
modifyColumnTypeButton.setIconAlign(IconAlign.TOP);
modifyColumnTypeButton.setToolTip("Changes the column type");
modifyColumnTypeButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
modifyColumnTypeButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) {
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
}
});
columnLayout.setWidget(0, 1, modifyColumnTypeButton);
columnLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
modifyColumnValuesButton = new TextButton("Values", TabularDataResources.INSTANCE.columnValues32());
modifyColumnValuesButton.setScale(ButtonScale.LARGE);
modifyColumnValuesButton.setIconAlign(IconAlign.TOP);
modifyColumnValuesButton.setToolTip("Changes the column values");
modifyColumnValuesButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
modifyColumnValuesButton.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) {
//eventBus.fireEvent(new ImportTableEvent(ImportTableType.JSON));
}
});
columnLayout.setWidget(0, 2, modifyColumnValuesButton);
columnLayout.getFlexCellFormatter().setRowSpan(0, 2, 2);
cleanCells(columnLayout.getElement());
//History
ButtonGroup historyGroup = new ButtonGroup();
historyGroup.setHeight("78px");
@ -178,9 +246,7 @@ public class FormulasToolBar {
historyLayout.setWidget(0, 0, historyButton);
historyLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
cleanCells(historyLayout.getElement());
discardButton = new TextButton("Discard", TabularDataResources.INSTANCE.discard());
discardButton.setToolTip("Discard the last operation");
@ -207,6 +273,9 @@ public class FormulasToolBar {
cleanCells(historyLayout.getElement());
}
protected void cleanCells(Element elem) {

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

@ -29,7 +29,7 @@ public class TabularDataRibbon {
VerticalLayoutContainer con = new VerticalLayoutContainer();
con.setHeight("94px");
con.add(fileToolBar.getToolBar(), new VerticalLayoutData(1, -1));
ribbon.add(con, "File");
ribbon.add(con, "Home");
reviewToolBar = new ReviewToolBar(eventBus);
con = new VerticalLayoutContainer();
@ -41,14 +41,14 @@ public class TabularDataRibbon {
con = new VerticalLayoutContainer();
con.setHeight("94px");
con.add(formulasToolBar.getToolBar(), new VerticalLayoutData(1, -1));
ribbon.add(con, "Formulas");
ribbon.add(con, "Modify");
chartsToolBar = new ChartsToolBar(eventBus);
con = new VerticalLayoutContainer();
con.setHeight("94px");
con.add(chartsToolBar.getToolBar(), new VerticalLayoutData(1, -1));
ribbon.add(con, "Charts");
ribbon.add(con, "Applications");
}

BIN
src/main/resources/org/gcube/portlets/user/td/client/resource/column-label.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/main/resources/org/gcube/portlets/user/td/client/resource/column-label_32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/main/resources/org/gcube/portlets/user/td/client/resource/column-type.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/main/resources/org/gcube/portlets/user/td/client/resource/column-type_32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/main/resources/org/gcube/portlets/user/td/client/resource/column-values.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/main/resources/org/gcube/portlets/user/td/client/resource/column-values_32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/main/resources/org/gcube/portlets/user/td/client/resource/column.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 998 B

BIN
src/main/resources/org/gcube/portlets/user/td/client/resource/column_32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

12
src/main/webapp/WEB-INF/web.xml
View File

@ -29,11 +29,6 @@
<servlet-class>org.gcube.portlets.user.td.gxtservice.server.TDGXTServiceImpl</servlet-class>
</servlet>
<!-- TDOpen -->
<servlet>
<servlet-name>TDOpenService</servlet-name>
<servlet-class>org.gcube.portlets.user.td.open.server.TDOpenServiceImpl</servlet-class>
</servlet>
<!-- SDMX IMPORT WIZARD -->
<servlet>
@ -127,13 +122,6 @@
</servlet-mapping>
<!-- TDOpen -->
<servlet-mapping>
<servlet-name>TDOpenService</servlet-name>
<url-pattern>/tabulardataportlet/TDOpenService</url-pattern>
</servlet-mapping>
<!-- SDMX IMPORT WIZARD -->
<servlet-mapping>
<servlet-name>SDMXImportWizardService</servlet-name>