diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/MainBox.gwt.xml b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/MainBox.gwt.xml
index 8ef11a9..618f9a1 100644
--- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/MainBox.gwt.xml
+++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/MainBox.gwt.xml
@@ -2,7 +2,8 @@
-
+
+
@@ -21,20 +22,37 @@
/> -->
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBox.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBox.java
index f0b4348..4c07264 100644
--- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBox.java
+++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBox.java
@@ -43,9 +43,9 @@ public class MainBox extends TabPanel {
private static final int MIN_TAB_WIDTH = 40;
private static final int TAB_WIDTH = 160;
- protected EventBus eventBus;
- protected MainBoxPanel mainBoxPanel;
- protected ArrayList tdxPanelList;
+ private EventBus eventBus;
+
+ private ArrayList tdxPanelList;
public MainBox(String name, EventBus eventBus, MainBoxPanel mainBoxPanel) {
super(
@@ -53,7 +53,6 @@ public class MainBox extends TabPanel {
Log.debug("Create MainBox");
setId(name);
this.eventBus = eventBus;
- this.mainBoxPanel = mainBoxPanel;
init();
}
diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridContextMenu.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridContextMenu.java
index f968001..8970cfa 100644
--- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridContextMenu.java
+++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridContextMenu.java
@@ -9,6 +9,7 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.GridOperationId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.grid.model.RowRaw;
import org.gcube.portlets.user.tdwx.client.TabularDataXGridPanel;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.event.logical.shared.SelectionEvent;
import com.google.gwt.event.logical.shared.SelectionHandler;
import com.google.web.bindery.event.shared.EventBus;
@@ -33,10 +34,12 @@ public class GridContextMenu {
this.gridPanel = gridPanel;
this.eventBus = eventBus;
tableContextMenu = new Menu();
-
- MenuItem addRowItem = new MenuItem("Add Row");
+ GridContextMenuMessages msgs = GWT.create(GridContextMenuMessages.class);
+
+ MenuItem addRowItem = new MenuItem(msgs.addRowItem());
addRowItem.setId(GridOperationId.ROWADD.toString());
addRowItem.setIcon(MainboxResources.INSTANCE.rowInsert());
+ addRowItem.setToolTip(msgs.addRowItemToolTip());
addRowItem.addSelectionHandler(new SelectionHandler- () {
@Override
@@ -53,9 +56,10 @@ public class GridContextMenu {
});
tableContextMenu.add(addRowItem);
- MenuItem editRowItem = new MenuItem("Edit Row");
+ MenuItem editRowItem = new MenuItem(msgs.editRowItem());
editRowItem.setId(GridOperationId.ROWEDIT.toString());
editRowItem.setIcon(MainboxResources.INSTANCE.rowEdit());
+ editRowItem.setToolTip(msgs.editRowItemToolTip());
editRowItem.addSelectionHandler(new SelectionHandler
- () {
@Override
@@ -75,9 +79,10 @@ public class GridContextMenu {
});
tableContextMenu.add(editRowItem);
- MenuItem deleteRowItem = new MenuItem("Delete Row");
+ MenuItem deleteRowItem = new MenuItem(msgs.deleteRowItem());
deleteRowItem.setId(GridOperationId.ROWDELETE.toString());
deleteRowItem.setIcon(MainboxResources.INSTANCE.tableRowDeleteSelected());
+ deleteRowItem.setToolTip(msgs.deleteRowItemToolTip());
deleteRowItem.addSelectionHandler(new SelectionHandler
- () {
@Override
@@ -95,9 +100,10 @@ public class GridContextMenu {
});
tableContextMenu.add(deleteRowItem);
- MenuItem replaceRowsItem = new MenuItem("Replace All");
+ MenuItem replaceRowsItem = new MenuItem(msgs.replaceRowsItem());
replaceRowsItem.setId(GridOperationId.REPLACE.toString());
replaceRowsItem.setIcon(MainboxResources.INSTANCE.columnReplaceAll());
+ replaceRowsItem.setToolTip(msgs.replaceRowsItemToolTip());
replaceRowsItem.addSelectionHandler(new SelectionHandler
- () {
@Override
diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridContextMenuMessages.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridContextMenuMessages.java
new file mode 100644
index 0000000..93bf7ac
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridContextMenuMessages.java
@@ -0,0 +1,38 @@
+package org.gcube.portlets.user.td.mainboxwidget.client.grid;
+
+import com.google.gwt.i18n.client.Messages;
+
+/**
+ *
+ * @author giancarlo
+ * email: g.panichi@isti.cnr.it
+ *
+ */
+public interface GridContextMenuMessages extends Messages {
+
+ //
+ @DefaultMessage("Add Row")
+ String addRowItem();
+
+ @DefaultMessage("Add a row to tabular resource")
+ String addRowItemToolTip();
+
+ @DefaultMessage("Edit Row")
+ String editRowItem();
+
+ @DefaultMessage("Change the selected rows")
+ String editRowItemToolTip();
+
+ @DefaultMessage("Delete Row")
+ String deleteRowItem();
+
+ @DefaultMessage("Delete the selected rows")
+ String deleteRowItemToolTip();
+
+ @DefaultMessage("Replace All")
+ String replaceRowsItem();
+
+ @DefaultMessage("Replaces all rows with the same content")
+ String replaceRowsItemToolTip();
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridHeaderColumnMenu.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridHeaderColumnMenu.java
index fb5b979..5721e47 100644
--- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridHeaderColumnMenu.java
+++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridHeaderColumnMenu.java
@@ -6,6 +6,7 @@ import java.util.List;
import org.gcube.portlets.user.td.mainboxwidget.client.resources.MainboxResources;
import org.gcube.portlets.user.td.widgetcommonevent.shared.GridHeaderOperationId;
+import com.google.gwt.core.client.GWT;
import com.sencha.gxt.widget.core.client.menu.MenuItem;
/**
@@ -20,87 +21,83 @@ public class GridHeaderColumnMenu {
protected final ArrayList