Minor Update

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-table-widget@95537 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/portlets/user/td/tablewidget/client/resources/ResourceBundle.java

@@ -4,6 +4,7 @@ package org.gcube.portlets.user.td.tablewidget.client.resources;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.resources.client.ClientBundle;
 import com.google.gwt.resources.client.ImageResource;
+import com.google.gwt.resources.client.ClientBundle.Source;
 
 /**
  * Resource Bundle
@@ -87,5 +88,11 @@ public interface ResourceBundle extends ClientBundle {
 	
 	@Source("basket_32.png")
 	ImageResource basket32();
+	
+	@Source("pencil_32.png")
+	ImageResource rowEdit32();
+	
+	@Source("pencil.png")
+	ImageResource rowEdit();
 
 }

src/main/java/org/gcube/portlets/user/td/tablewidget/client/rows/EditRowDialog.java

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DeleteRowsSession;
 import org.gcube.portlets.user.td.tablewidget.client.progress.DeleteRowsProgressDialog;
 import org.gcube.portlets.user.td.tablewidget.client.resources.ResourceBundle;
+import org.gcube.portlets.user.td.tablewidget.client.util.UtilsGXT3;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
 
 import com.google.web.bindery.event.shared.EventBus;
@@ -16,27 +17,32 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
  * Edit Row
  * 
  * @author "Giancarlo Panichi"
- *
+ * 
  */
 public class EditRowDialog extends Window {
 	protected String WIDTH = "650px";
-	protected String HEIGHT = "530px";
+	protected String HEIGHT = "486px";
 	protected TRId trId;
 	protected EventBus eventBus;
 	protected ArrayList<String> rows;
 	protected DeleteRowsSession deleteRowsSession;
-    protected DeleteRowsProgressDialog deleteRowsProgressDialog;
+	protected DeleteRowsProgressDialog deleteRowsProgressDialog;
-    
+
-	public EditRowDialog(TRId trId, ArrayList<String> rows,EventBus eventBus) {
+	public EditRowDialog(TRId trId, ArrayList<String> rows, EventBus eventBus) {
 		this.trId = trId;
-		this.rows=rows;
+		this.rows = rows;
 		this.eventBus = eventBus;
-		initWindow();
+		if (rows == null || rows.size() <= 0) {
-		EditRowPanel editRowPanel= new EditRowPanel(this, trId,rows,eventBus);
+			UtilsGXT3.alert("Attentions",
-		add(editRowPanel); 
+					"No row selected");
-		
+		} else {
+			initWindow();
+			EditRowPanel editRowPanel = new EditRowPanel(this, trId, rows,
+					eventBus);
+			add(editRowPanel);
+		}
 	}
-	
+
 	protected void initWindow() {
 		setWidth(WIDTH);
 		setHeight(HEIGHT);
@@ -46,10 +52,10 @@ public class EditRowDialog extends Window {
 		setClosable(true);
 		setModal(true);
 		forceLayoutOnResize = true;
-		getHeader().setIcon(ResourceBundle.INSTANCE.ok());
+		getHeader().setIcon(ResourceBundle.INSTANCE.rowEdit());
 
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -59,20 +65,16 @@ public class EditRowDialog extends Window {
 
 		closeBtn.addSelectHandler(new SelectHandler() {
 
-			
 			public void onSelect(SelectEvent event) {
 				close();
 			}
 		});
 
 	}
-	
+
-	protected void close (){
+	protected void close() {
 		hide();
-		
+
 	}
-	
+
-	
-	
-	
 }

src/main/java/org/gcube/portlets/user/td/tablewidget/client/rows/EditRowPanel.java

@@ -34,6 +34,7 @@ import com.sencha.gxt.widget.core.client.container.BoxLayoutContainer.BoxLayoutD
 import com.sencha.gxt.widget.core.client.container.BoxLayoutContainer.BoxLayoutPack;
 import com.sencha.gxt.widget.core.client.container.HBoxLayoutContainer;
 import com.sencha.gxt.widget.core.client.container.HBoxLayoutContainer.HBoxLayoutAlign;
+import com.sencha.gxt.widget.core.client.container.SimpleContainer;
 import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer;
 import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData;
 import com.sencha.gxt.widget.core.client.event.SelectEvent;
@@ -53,28 +54,34 @@ import com.sencha.gxt.widget.core.client.form.TextField;
  */
 public class EditRowPanel extends FramedPanel {
 	protected String WIDTH = "560px";
-	protected String HEIGHT = "520px";
+	protected String HEIGHT = "400px";
+	protected String FIELDSHEIGHT = "400px";
 
 	protected EditRowDialog parent;
 	protected TRId trId;
 	protected EventBus eventBus;
 	protected ArrayList<String> rows;
 	protected ArrayList<ColumnData> columns;
-
+	protected String currentRow;
 	private TextButton btnSave;
 	private TextButton btnClose;
 
 	public EditRowPanel(EditRowDialog parent, TRId trId,
 			ArrayList<String> rows, EventBus eventBus) {
+		super();
 		this.parent = parent;
 		this.trId = trId;
 		this.rows = rows;
 		this.eventBus = eventBus;
 		Log.debug("Create EditRowPanel(): [" + trId.toString() + " , rows:"
 				+ rows + "]");
-		init();
+		if (rows == null || rows.size() <= 0) {
-		retrieveColumn();
+			currentRow=rows.get(0);
-
+			UtilsGXT3.alert("Attentions", "No row selected");
+		} else {
+			init();
+			retrieveColumn();
+		}
 	}
 
 	protected void init() {
@@ -85,8 +92,12 @@ public class EditRowPanel extends FramedPanel {
 	}
 
 	protected void create() {
+		SimpleContainer container = new SimpleContainer();
+		container.setHeight(FIELDSHEIGHT);
+
 		VerticalLayoutContainer v = new VerticalLayoutContainer();
-		
+		container.add(v);
+
 		btnSave = new TextButton("Save");
 		btnSave.setIcon(ResourceBundle.INSTANCE.save());
 		btnSave.setIconAlign(IconAlign.RIGHT);
@@ -120,16 +131,16 @@ public class EditRowPanel extends FramedPanel {
 		flowButton.add(btnSave, new BoxLayoutData(new Margins(2, 4, 2, 4)));
 		flowButton.add(btnClose, new BoxLayoutData(new Margins(2, 4, 2, 4)));
 
-		ArrayList<FieldLabel> fields=generateFields();
+		ArrayList<FieldLabel> fields = generateFields();
-		for(FieldLabel fl:fields){
+		for (FieldLabel fl : fields) {
-			v.add(fl, new VerticalLayoutData(1, -1,
+			v.add(fl, new VerticalLayoutData(1, -1, new Margins(1)));
-					new Margins(1)));
+
-			
 		}
-		
+
-		v.add(flowButton, new VerticalLayoutData(-1, 36,
+		VerticalLayoutContainer vPanel = new VerticalLayoutContainer();
-				new Margins(5, 2, 5, 2)));
+		vPanel.add(container, new VerticalLayoutData(1, -1));
-		add(v);
+		vPanel.add(flowButton, new VerticalLayoutData(1, -1, new Margins(1)));
+		add(vPanel);
 
 	}
 
@@ -158,194 +169,223 @@ public class EditRowPanel extends FramedPanel {
 	}
 
 	protected void close() {
+		parent.close();
 	}
-	
+
-	
+	protected ArrayList<FieldLabel> generateFields() {
-	protected ArrayList<FieldLabel> generateFields(){
+		ArrayList<FieldLabel> fields = new ArrayList<FieldLabel>();
-		ArrayList<FieldLabel> fields=new ArrayList<FieldLabel>();
+
-		
+		for (ColumnData col : columns) {
-		for(ColumnData col:columns){
+			if (col.getTypeCode()
-			if(col.getTypeCode().compareTo(ColumnTypeCode.DIMENSION.toString())==0||
+					.compareTo(ColumnTypeCode.DIMENSION.toString()) == 0
-					col.getTypeCode().compareTo(ColumnTypeCode.TIMEDIMENSION.toString())==0)
+					|| col.getTypeCode().compareTo(
-			{ 
+							ColumnTypeCode.TIMEDIMENSION.toString()) == 0) {
-				//Dimension Reference		
+				// Dimension Reference
 				ColumnDataPropertiesCombo propsColumnReferenceType = GWT
 						.create(ColumnDataPropertiesCombo.class);
 				final ListStore<ColumnData> storeComboColumnReferenceType = new ListStore<ColumnData>(
 						propsColumnReferenceType.id());
 
 				final ComboBox<ColumnData> comboColumnReferenceType = new ComboBox<ColumnData>(
-						storeComboColumnReferenceType, propsColumnReferenceType.label());
+						storeComboColumnReferenceType,
+						propsColumnReferenceType.label());
 				Log.trace("ComboColumnReferenceType created");
 
 				comboColumnReferenceType
-				.addSelectionHandler(new SelectionHandler<ColumnData>() {
+						.addSelectionHandler(new SelectionHandler<ColumnData>() {
-					public void onSelection(SelectionEvent<ColumnData> event) {
+							public void onSelection(
-						Log.debug("ComboColumnReferenceType selected: "
+									SelectionEvent<ColumnData> event) {
-								+ event.getSelectedItem());
+								Log.debug("ComboColumnReferenceType selected: "
+										+ event.getSelectedItem());
 
-					}
+							}
 
-				});
+						});
 
-				comboColumnReferenceType.setEmptyText("Select a Column Reference...");
+				comboColumnReferenceType
+						.setEmptyText("Select a Column Reference...");
 				comboColumnReferenceType.setWidth(191);
 				comboColumnReferenceType.setEditable(false);
 				comboColumnReferenceType.setTriggerAction(TriggerAction.ALL);
-			
+
-				
+				// Dimension
-				//Dimension
 				TabResourceProperties propsDimensionType = GWT
 						.create(TabResourceProperties.class);
 				ListStore<TabResource> storeComboDimensionType = new ListStore<TabResource>(
 						propsDimensionType.id());
-				
 
-				final ComboBox<TabResource> comboDimension = new ComboBox<TabResource>(storeComboDimensionType,
+				final ComboBox<TabResource> comboDimension = new ComboBox<TabResource>(
-						propsDimensionType.label());
+						storeComboDimensionType, propsDimensionType.label());
 				Log.trace("ComboDimensionType created");
-				
-				comboDimension.addTriggerClickHandler(new TriggerClickHandler() {
 
-					@Override
+				comboDimension
-					public void onTriggerClick(TriggerClickEvent event) {
+						.addTriggerClickHandler(new TriggerClickHandler() {
-						Log.debug("ComboDimension TriggerClickEvent");
-						CodelistSelectionDialog dialogCodelistSelection = new CodelistSelectionDialog(
-								eventBus);
-						CodelistSelectionListener codelistSelectionListener=new CodelistSelectionListener() {
-							
-							@Override
-							public void selected(TabResource tabResource) {
-								Log.debug("Selected Codelist: " + tabResource);
-								comboDimension.setValue(tabResource);
-								TDGWTServiceAsync.INSTANCE.getColumnsForDimension(
-										tabResource.getTrId(),
-										new AsyncCallback<ArrayList<ColumnData>>() {
-
-											@Override
-											public void onFailure(Throwable caught) {
-												Log.debug("Error retrieving columns: "
-														+ caught.getLocalizedMessage());
-												UtilsGXT3.alert("Error retrieving columns",
-														"Error retrieving columns on server!");
-
-											}
-
-											@Override
-											public void onSuccess(ArrayList<ColumnData> result) {
-												storeComboColumnReferenceType.clear();
-												storeComboColumnReferenceType.addAll(result);
-												storeComboColumnReferenceType.commitChanges();
-
-											}
-										});
-							}
 
 							@Override
-							public void aborted() {
+							public void onTriggerClick(TriggerClickEvent event) {
-								Log.debug("Select Codelist Aborted");
+								Log.debug("ComboDimension TriggerClickEvent");
+								CodelistSelectionDialog dialogCodelistSelection = new CodelistSelectionDialog(
+										eventBus);
+								CodelistSelectionListener codelistSelectionListener = new CodelistSelectionListener() {
+
+									@Override
+									public void selected(TabResource tabResource) {
+										Log.debug("Selected Codelist: "
+												+ tabResource);
+										comboDimension.setValue(tabResource);
+										TDGWTServiceAsync.INSTANCE.getColumnsForDimension(
+												tabResource.getTrId(),
+												new AsyncCallback<ArrayList<ColumnData>>() {
+
+													@Override
+													public void onFailure(
+															Throwable caught) {
+														Log.debug("Error retrieving columns: "
+																+ caught.getLocalizedMessage());
+														UtilsGXT3
+																.alert("Error retrieving columns",
+																		"Error retrieving columns on server!");
+
+													}
+
+													@Override
+													public void onSuccess(
+															ArrayList<ColumnData> result) {
+														storeComboColumnReferenceType
+																.clear();
+														storeComboColumnReferenceType
+																.addAll(result);
+														storeComboColumnReferenceType
+																.commitChanges();
+
+													}
+												});
+									}
+
+									@Override
+									public void aborted() {
+										Log.debug("Select Codelist Aborted");
+
+									}
+
+									@Override
+									public void failed(String reason,
+											String detail) {
+										Log.error("Select Codelist Failed[reason: "
+												+ reason
+												+ " , detail:"
+												+ detail + "]");
+
+									}
+								};
+
+								dialogCodelistSelection
+										.addListener(codelistSelectionListener);
+								dialogCodelistSelection.show();
+								comboDimension.collapse();
 
 							}
 
-							@Override
+						});
-							public void failed(String reason, String detail) {
-								Log.error("Select Codelist Failed[reason: " + reason + " , detail:"
-										+ detail + "]");
 
-							}
-						};
-						
-						dialogCodelistSelection.addListener(codelistSelectionListener);
-						dialogCodelistSelection.show();
-						comboDimension.collapse();
-
-					}
-
-				});
-				
-				
 				comboDimension.setEmptyText("Select...");
 				comboDimension.setWidth(191);
 				comboDimension.setEditable(false);
 				comboDimension.setTriggerAction(TriggerAction.ALL);
-				
+
 				HorizontalPanel hpDimension = new HorizontalPanel();
 				hpDimension.add(comboDimension);
 				hpDimension.add(comboColumnReferenceType);
-				
+
-				FieldLabel comboDimensionLabel = new FieldLabel(hpDimension, col.getLabel());
+				FieldLabel comboDimensionLabel = new FieldLabel(hpDimension,
-			    comboDimensionLabel.setId(col.getColumnId());
+						col.getLabel());
+				comboDimensionLabel.setId(col.getColumnId());
 				fields.add(comboDimensionLabel);
 			} else {
-				if(col.getDataTypeName().compareTo(ColumnDataType.Boolean.toString())==0){
+				if (col.getDataTypeName().compareTo(
+						ColumnDataType.Boolean.toString()) == 0) {
 					Radio radioTrue = new Radio();
-				    radioTrue.setBoxLabel("true");
+					radioTrue.setBoxLabel("true");
-				    Radio radioFalse = new Radio();
+					Radio radioFalse = new Radio();
-				    radioFalse.setBoxLabel("false");
+					radioFalse.setBoxLabel("false");
-				    HorizontalPanel hp = new HorizontalPanel();
+					HorizontalPanel hp = new HorizontalPanel();
-				    hp.add(radioTrue);
+					hp.add(radioTrue);
-				    hp.add(radioFalse);
+					hp.add(radioFalse);
-				    FieldLabel booleanLabel= new FieldLabel(hp, col.getLabel());
+					FieldLabel booleanLabel = new FieldLabel(hp, col.getLabel());
-				    booleanLabel.setId(col.getColumnId());
+					booleanLabel.setId(col.getColumnId());
-				    fields.add(booleanLabel);
+					fields.add(booleanLabel);
 				} else {
-					if(col.getDataTypeName().compareTo(ColumnDataType.Date.toString())==0){
+					if (col.getDataTypeName().compareTo(
+							ColumnDataType.Date.toString()) == 0) {
 						DateField date = new DateField();
-						FieldLabel dateLabel=new FieldLabel(date, col.getLabel());
+						FieldLabel dateLabel = new FieldLabel(date,
+								col.getLabel());
 						dateLabel.setId(col.getColumnId());
 						fields.add(dateLabel);
 					} else {
-						if(col.getDataTypeName().compareTo(ColumnDataType.Text.toString())==0){
+						if (col.getDataTypeName().compareTo(
+								ColumnDataType.Text.toString()) == 0) {
 							TextField text = new TextField();
 							text.addValueChangeHandler(new ValueChangeHandler<String>() {
 								@Override
-								public void onValueChange(ValueChangeEvent<String> event) {
+								public void onValueChange(
-									
+										ValueChangeEvent<String> event) {
+
 								}
 							});
-							FieldLabel textLabel=new FieldLabel(text, col.getLabel());
+							FieldLabel textLabel = new FieldLabel(text,
+									col.getLabel());
 							textLabel.setId(col.getColumnId());
 							fields.add(textLabel);
 						} else {
-							if(col.getDataTypeName().compareTo(ColumnDataType.Geometry.toString())==0){
+							if (col.getDataTypeName().compareTo(
+									ColumnDataType.Geometry.toString()) == 0) {
 								TextField geometry = new TextField();
 								geometry.addValueChangeHandler(new ValueChangeHandler<String>() {
 									@Override
-									public void onValueChange(ValueChangeEvent<String> event) {
+									public void onValueChange(
-										
+											ValueChangeEvent<String> event) {
+
 									}
 								});
-								FieldLabel geometryLabel=new FieldLabel(geometry, col.getLabel());
+								FieldLabel geometryLabel = new FieldLabel(
+										geometry, col.getLabel());
 								geometryLabel.setId(col.getColumnId());
 								fields.add(geometryLabel);
 							} else {
-								if(col.getDataTypeName().compareTo(ColumnDataType.Integer.toString())==0){
+								if (col.getDataTypeName().compareTo(
+										ColumnDataType.Integer.toString()) == 0) {
 									TextField integ = new TextField();
-									
+
 									integ.addValueChangeHandler(new ValueChangeHandler<String>() {
 										@Override
-										public void onValueChange(ValueChangeEvent<String> event) {
+										public void onValueChange(
-											
+												ValueChangeEvent<String> event) {
+
 										}
 									});
-									FieldLabel integLabel=new FieldLabel(integ, col.getLabel());
+									FieldLabel integLabel = new FieldLabel(
+											integ, col.getLabel());
 									integLabel.setId(col.getColumnId());
 									fields.add(integLabel);
 								} else {
-									if(col.getDataTypeName().compareTo(ColumnDataType.Numeric.toString())==0){
+									if (col.getDataTypeName().compareTo(
+											ColumnDataType.Numeric.toString()) == 0) {
 										TextField numeric = new TextField();
 										numeric.setId(col.getColumnId());
 										numeric.addValueChangeHandler(new ValueChangeHandler<String>() {
 											@Override
-											public void onValueChange(ValueChangeEvent<String> event) {
+											public void onValueChange(
-												
+													ValueChangeEvent<String> event) {
+
 											}
 										});
-										FieldLabel numericLabel=new FieldLabel(numeric, col.getLabel());
+										FieldLabel numericLabel = new FieldLabel(
+												numeric, col.getLabel());
 										numericLabel.setId(col.getColumnId());
 										fields.add(numericLabel);
 									} else {
-										
+
 									}
 								}
 							}
@@ -353,12 +393,10 @@ public class EditRowPanel extends FramedPanel {
 					}
 				}
 			}
-	
+
 		}
 		return fields;
-		
+
 	}
 
-	
-
 }

src/main/java/org/gcube/portlets/user/td/tablewidget/client/rows/RowsDataClient.java

@@ -0,0 +1,41 @@
+package org.gcube.portlets.user.td.tablewidget.client.rows;
+
+import com.allen_sauer.gwt.log.client.Log;
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.http.client.Request;
+import com.google.gwt.http.client.RequestBuilder;
+import com.google.gwt.http.client.RequestCallback;
+import com.google.gwt.http.client.RequestException;
+import com.google.gwt.http.client.Response;
+
+public class RowsDataClient {
+	public void retrievesRowsAsJson()  {
+		// Send request to server and catch any errors.
+		String path = GWT.getModuleBaseURL() + "tdwxrowsdata";
+		RequestBuilder builder = new RequestBuilder(RequestBuilder.POST, path);
+		//builder.setHeader(ServletParameters.TD_SESSION_ID,
+		//		String.valueOf(tdSessionId));
+
+		try {
+			Request request = builder.sendRequest(null, new RequestCallback() {
+				public void onError(Request request, Throwable exception) {
+					//displayError("Couldn't retrieve JSON");
+				}
+
+				public void onResponseReceived(Request request,
+						Response response) {
+					if (200 == response.getStatusCode()) {
+						//updateTable(JsonUtils.safeEval(response.getText()));
+					} else {
+						//displayError("Couldn't retrieve JSON ("
+						//		+ response.getStatusText() + ")");
+					}
+				}
+			});
+			Log.debug("Request: "+request.toString());
+		} catch (RequestException e) {
+			e.printStackTrace();
+		}
+
+	}
+}