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

Minor updated 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@87111 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2013-12-17 16:27:57 +00:00
parent d07e64f994
commit 1d1be24d58
6 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.classpath
View File

@ -23,16 +23,16 @@
</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.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/tabular-data-portlet-2.0.0-SNAPSHOT/WEB-INF/classes"/>
</classpath>

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

@ -1,6 +1,6 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
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

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

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

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

@ -14,7 +14,7 @@ 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.GridHeaderColumnMenuItemOperationId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.GridHeaderOperationId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.wizardwidget.client.WizardListener;
import org.gcube.portlets.user.tdwx.client.TabularDataX;
@ -446,39 +446,39 @@ public class TabularDataController {
"OperationId: " + event.getOperationId() + " Column: \n"
+ event.getColumnSelected());
String opId = event.getOperationId();
if (opId.compareTo(GridHeaderColumnMenuItemOperationId.AddLabel
if (opId.compareTo(GridHeaderOperationId.AddLabel
.toString()) == 0) {
} else {
if (opId.compareTo(GridHeaderColumnMenuItemOperationId.ChangeLabel
if (opId.compareTo(GridHeaderOperationId.ChangeLabel
.toString()) == 0) {
} else {
if (opId.compareTo(GridHeaderColumnMenuItemOperationId.RemoveLabel
if (opId.compareTo(GridHeaderOperationId.RemoveLabel
.toString()) == 0) {
} else {
if (opId.compareTo(GridHeaderColumnMenuItemOperationId.RemoveColumn
if (opId.compareTo(GridHeaderOperationId.RemoveColumn
.toString()) == 0) {
} else {
if (opId.compareTo(GridHeaderColumnMenuItemOperationId.ChangeToType
if (opId.compareTo(GridHeaderOperationId.ChangeToType
.toString()) == 0) {
} else {
if (opId.compareTo(GridHeaderColumnMenuItemOperationId.ColumnDuplicateValidation
if (opId.compareTo(GridHeaderOperationId.ColumnDuplicateValidation
.toString()) == 0) {
} else {
if (opId.compareTo(GridHeaderColumnMenuItemOperationId.Filter
if (opId.compareTo(GridHeaderOperationId.Filter
.toString()) == 0) {
} else {
if (opId.compareTo(GridHeaderColumnMenuItemOperationId.ModifyColumnValueOnCondition
if (opId.compareTo(GridHeaderOperationId.ModifyColumnValueOnCondition
.toString()) == 0) {
} else {
if (opId.compareTo(GridHeaderColumnMenuItemOperationId.NewAnnotationColumn
if (opId.compareTo(GridHeaderOperationId.NewAnnotationColumn
.toString()) == 0) {
} else {

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

@ -3,13 +3,13 @@ package org.gcube.portlets.user.td.client;
import java.util.ArrayList;
import java.util.List;
import org.gcube.portlets.user.td.client.grid.ColumnHeaderMenu;
import org.gcube.portlets.user.td.client.grid.GridHeaderColumnMenu;
import org.gcube.portlets.user.td.client.grid.GridContextMenu;
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.td.widgetcommonevent.shared.GridHeaderColumnMenuItemOperationId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.GridHeaderOperationId;
import org.gcube.portlets.user.tdwx.client.TabularDataX;
import org.gcube.portlets.user.tdwx.client.TabularDataXGridPanel;
import org.gcube.portlets.user.tdwx.client.config.Row;
@ -140,7 +140,7 @@ public class TabularDataPortlet implements EntryPoint {
final TabularDataXGridPanel gridPanel = tabularData.getGridPanel();
gridPanel.setHeaderVisible(false);
ColumnHeaderMenu columnHeaderMenu=new ColumnHeaderMenu();
GridHeaderColumnMenu columnHeaderMenu=new GridHeaderColumnMenu();
gridPanel.addGridHeaderContextMenuItems(columnHeaderMenu.getMenu(), eventBus);
GridContextMenu gridContextMenu=new GridContextMenu();

20
src/main/java/org/gcube/portlets/user/td/client/grid/ColumnHeaderMenu.java → src/main/java/org/gcube/portlets/user/td/client/grid/GridHeaderColumnMenu.java
View File

@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import org.gcube.portlets.user.td.client.resource.TabularDataResources;
import org.gcube.portlets.user.td.widgetcommonevent.shared.GridHeaderColumnMenuItemOperationId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.GridHeaderOperationId;
import com.sencha.gxt.widget.core.client.menu.MenuItem;
@ -15,48 +15,48 @@ import com.sencha.gxt.widget.core.client.menu.MenuItem;
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class ColumnHeaderMenu {
public class GridHeaderColumnMenu {
protected final ArrayList<MenuItem> menuItems;
public ColumnHeaderMenu() {
public GridHeaderColumnMenu() {
menuItems = new ArrayList<MenuItem>();
MenuItem changeLabelItem = new MenuItem("Change Label");
changeLabelItem.setId(GridHeaderColumnMenuItemOperationId.ChangeLabel
changeLabelItem.setId(GridHeaderOperationId.ChangeLabel
.toString());
changeLabelItem.setIcon(TabularDataResources.INSTANCE.columnLabel());
menuItems.add(changeLabelItem);
MenuItem removeColumnItem = new MenuItem("Remove");
removeColumnItem.setId(GridHeaderColumnMenuItemOperationId.RemoveColumn.toString());
removeColumnItem.setId(GridHeaderOperationId.RemoveColumn.toString());
removeColumnItem.setIcon(TabularDataResources.INSTANCE.columnDelete());
menuItems.add(removeColumnItem);
MenuItem changeToTypeItem = new MenuItem("Change Type");
changeToTypeItem.setId(GridHeaderColumnMenuItemOperationId.ChangeToType.toString());
changeToTypeItem.setId(GridHeaderOperationId.ChangeToType.toString());
changeToTypeItem.setIcon(TabularDataResources.INSTANCE.columnType());
menuItems.add(changeToTypeItem);
MenuItem filterItem = new MenuItem("Filter");
filterItem.setId(GridHeaderColumnMenuItemOperationId.Filter.toString());
filterItem.setId(GridHeaderOperationId.Filter.toString());
filterItem.setIcon(TabularDataResources.INSTANCE.columnFilter());
menuItems.add(filterItem);
MenuItem modifyValueOnConditionItem = new MenuItem("Modify Value On Condition");
modifyValueOnConditionItem.setId(GridHeaderColumnMenuItemOperationId.ModifyColumnValueOnCondition.toString());
modifyValueOnConditionItem.setId(GridHeaderOperationId.ModifyColumnValueOnCondition.toString());
modifyValueOnConditionItem.setIcon(TabularDataResources.INSTANCE.columnValues());
menuItems.add(modifyValueOnConditionItem);
MenuItem newAnnotationColumnItem = new MenuItem("New Annotation");
newAnnotationColumnItem.setId(GridHeaderColumnMenuItemOperationId.NewAnnotationColumn.toString());
newAnnotationColumnItem.setId(GridHeaderOperationId.NewAnnotationColumn.toString());
newAnnotationColumnItem.setIcon(TabularDataResources.INSTANCE.columnAdd());
menuItems.add(newAnnotationColumnItem);
MenuItem columnDuplicateValidationItem = new MenuItem("Duplicate Validation");
columnDuplicateValidationItem.setId(GridHeaderColumnMenuItemOperationId.ColumnDuplicateValidation.toString());
columnDuplicateValidationItem.setId(GridHeaderOperationId.ColumnDuplicateValidation.toString());
columnDuplicateValidationItem.setIcon(TabularDataResources.INSTANCE.validateAdd());
menuItems.add(columnDuplicateValidationItem);