Updated Batch Replace

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

src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/ReplaceBatchPanel.java

@@ -94,8 +94,10 @@ public class ReplaceBatchPanel extends FramedPanel implements
 	protected ColumnData column;
 	protected boolean hasValidationColumns;
 	protected ShowOccurrencesType showOccurencesType;
+	protected ColumnData connection;
 
 	protected ReplaceBatchDialog parent;
+
 	private ReplaceEntry currentReplaceEntry;
 	private int currentRowIndex;
 
@@ -115,7 +117,9 @@ public class ReplaceBatchPanel extends FramedPanel implements
 	protected Grid<ReplaceEntry> grid;
 	protected ListStore<ReplaceEntry> store;
 	protected HTML info;
-	private TextButton btnDisconnect;
+	protected TextButton btnDisconnect;
+
+	private boolean simpleReplace;
 
 	public ReplaceBatchPanel(ReplaceBatchDialog parent, TRId trId,
 			String columnName, EventBus eventBus) {
@@ -123,6 +127,7 @@ public class ReplaceBatchPanel extends FramedPanel implements
 		this.trId = trId;
 		this.columnName = columnName;
 		this.eventBus = eventBus;
+		connection = null;
 		hasValidationColumns = false;
 		Log.debug("Create BatchReplacePanel(): [" + trId.toString()
 				+ " , columnName:" + columnName + "]");
@@ -168,44 +173,47 @@ public class ReplaceBatchPanel extends FramedPanel implements
 
 		toolBarHead.add(comboShowOccurrencesType);
 
-		// Connect Codelist
+		if (!column.isViewColumn()) {
-		btnConnect = new TextButton();
+			// Connect Codelist
-		btnConnect.setIcon(ResourceBundle.INSTANCE.codelistLink24());
+			btnConnect = new TextButton();
-		btnConnect.setIconAlign(IconAlign.TOP);
+			btnConnect.setIcon(ResourceBundle.INSTANCE.codelistLink24());
-		btnConnect.setTitle("Connect");
+			btnConnect.setIconAlign(IconAlign.TOP);
-		btnConnect.addSelectHandler(new SelectHandler() {
+			btnConnect.setTitle("Connect");
+			btnConnect.addSelectHandler(new SelectHandler() {
 
-			public void onSelect(SelectEvent event) {
+				public void onSelect(SelectEvent event) {
-				Log.debug("Pressed Connect");
+					Log.debug("Pressed Connect");
-				btnConnect.disable();
+					btnConnect.disable();
-				connectCodelist();
+					connectCodelist();
 
-			}
+				}
 
-		});
+			});
 
-		toolBarHead.add(btnConnect);
+			toolBarHead.add(btnConnect);
 
+			// Disconnect Codelist
+			btnDisconnect = new TextButton();
+			btnDisconnect
+					.setIcon(ResourceBundle.INSTANCE.codelistLinkBreak24());
+			btnDisconnect.setIconAlign(IconAlign.TOP);
+			btnDisconnect.setTitle("Disconnect");
+			btnDisconnect.addSelectHandler(new SelectHandler() {
 
-		// Disconnect Codelist
+				public void onSelect(SelectEvent event) {
-		btnDisconnect = new TextButton();
+					Log.debug("Pressed Disconnect");
-		btnDisconnect.setIcon(ResourceBundle.INSTANCE.codelistLinkBreak24());
+					btnDisconnect.disable();
-		btnDisconnect.setIconAlign(IconAlign.TOP);
+					disconnectCodelist();
-		btnDisconnect.setTitle("Disconnect");
-		btnDisconnect.addSelectHandler(new SelectHandler() {
 
-			public void onSelect(SelectEvent event) {
+				}
-				Log.debug("Pressed Disconnect");
-				btnDisconnect.disable();
-				disconnectCodelist();
 
-			}
+			});
+			toolBarHead.add(btnDisconnect);
 
-		});
+			connectionField = new TextField();
-		toolBarHead.add(btnDisconnect);
+			toolBarHead.add(connectionField);
 
-		connectionField = new TextField();
+		}
-		toolBarHead.add(connectionField);
 
 		// Create Grid
 		IdentityValueProvider<ReplaceEntry> identity = new IdentityValueProvider<ReplaceEntry>();
@@ -320,7 +328,7 @@ public class ReplaceBatchPanel extends FramedPanel implements
 		grid.setLoader(loader);
 		grid.setSelectionModel(sm);
 		number.initPlugin(grid);
-		grid.setHeight("388px");
+		grid.setHeight("376px");
 		grid.getView().setStripeRows(true);
 		grid.getView().setColumnLines(true);
 		grid.getView().setAutoFill(true);
@@ -378,9 +386,10 @@ public class ReplaceBatchPanel extends FramedPanel implements
 				new Margins(5, 2, 5, 2)));
 		add(v);
 
-		connectionField.setVisible(false);
+		if (!column.isViewColumn()) {
-		btnDisconnect.setVisible(false);
+			connectionField.setVisible(false);
-		
+			btnDisconnect.setVisible(false);
+		}
 	}
 
 	protected void retrieveColumn() {
@@ -592,14 +601,28 @@ public class ReplaceBatchPanel extends FramedPanel implements
 
 	protected void callSingleValueReplaceDialog() {
 		Log.debug("callSingleValueReplaceDialog");
-		SingleValueReplaceDialog dialogSingleValueReplace = new SingleValueReplaceDialog(
+		simpleReplace = true;
-				currentReplaceEntry.getValue(),
+		if (connection == null) {
-				currentReplaceEntry.getReplacementValue(), column, eventBus);
+			SingleValueReplaceDialog dialogSingleValueReplace = new SingleValueReplaceDialog(
-		dialogSingleValueReplace.addListener(this);
+					currentReplaceEntry.getValue(),
-		dialogSingleValueReplace.show();
+					currentReplaceEntry.getReplacementValue(), column, eventBus);
+			dialogSingleValueReplace.addListener(this);
+			dialogSingleValueReplace.show();
+		} else {
+			Log.debug("callDimensionRowSelectionDialog");
+			CellData cellData = new CellData(currentReplaceEntry.getValue(),
+					connection.getName(), connection.getColumnId(),
+					connection.getLabel(), currentReplaceEntry.getRowId(), 0, 0);
+			DimensionRowSelectionDialog dialogDimensionRowSelection = new DimensionRowSelectionDialog(
+					connection, cellData, eventBus);
+			dialogDimensionRowSelection.addListener(this);
+			dialogDimensionRowSelection.show();
+		}
+
 	}
 
 	protected void callDimensionRowSelectionDialog() {
+		simpleReplace = false;
 		Log.debug("callDimensionRowSelectionDialog");
 		CellData cellData = new CellData(currentReplaceEntry.getValue(),
 				column.getName(), column.getColumnId(), column.getLabel(),
@@ -614,10 +637,16 @@ public class ReplaceBatchPanel extends FramedPanel implements
 	@Override
 	public void selectedDimensionRow(DimensionRow dimensionRow) {
 		Log.debug("Change Value: " + dimensionRow);
-		currentReplaceEntry.setReplacementValue(dimensionRow.getValue());
+		if (simpleReplace) {
-		currentReplaceEntry.setReplacementDimensionRow(dimensionRow);
+			currentReplaceEntry.setReplacementValue(dimensionRow.getValue());
-		store.update(currentReplaceEntry);
+			store.update(currentReplaceEntry);
-		updateInfo();
+			updateInfo();
+		} else {
+			currentReplaceEntry.setReplacementValue(dimensionRow.getValue());
+			currentReplaceEntry.setReplacementDimensionRow(dimensionRow);
+			store.update(currentReplaceEntry);
+			updateInfo();
+		}
 	}
 
 	@Override
@@ -663,6 +692,7 @@ public class ReplaceBatchPanel extends FramedPanel implements
 
 	protected void disconnectCodelist() {
 		Log.debug("Disconnect codelist");
+		this.connection = null;
 		connectionField.setValue("");
 		connectionField.setVisible(false);
 		btnDisconnect.setVisible(false);
@@ -674,6 +704,7 @@ public class ReplaceBatchPanel extends FramedPanel implements
 	@Override
 	public void selectedConnectCodelist(ColumnData connection) {
 		Log.debug("Selected connection: " + connection);
+		this.connection = connection;
 		connectionField.setValue(connection.getLabel());
 		connectionField.setVisible(true);
 		btnDisconnect.setVisible(true);

src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/SingleValueReplaceDialog.java

@@ -12,8 +12,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author "Giancarlo Panichi" <a
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
  * 
  */
 public class SingleValueReplaceDialog extends Window {
@@ -26,12 +26,12 @@ public class SingleValueReplaceDialog extends Window {
 	protected ColumnData column;
 	protected ArrayList<SingleValueReplaceListener> listeners;
 
-	
+	public SingleValueReplaceDialog(String value, String replaceValue,
-	public SingleValueReplaceDialog(String value, String replaceValue, ColumnData column, EventBus eventBus) {
+			ColumnData column, EventBus eventBus) {
-		listeners=new ArrayList<SingleValueReplaceListener>();
+		listeners = new ArrayList<SingleValueReplaceListener>();
-		this.value=value;
+		this.value = value;
-		this.replaceValue=replaceValue;
+		this.replaceValue = replaceValue;
-		this.column=column;
+		this.column = column;
 		this.eventBus = eventBus;
 		initWindow();
 		create();
@@ -66,8 +66,8 @@ public class SingleValueReplaceDialog extends Window {
 	}
 
 	protected void create() {
-		SingleValueReplacePanel replacePanel = new SingleValueReplacePanel(this, value, replaceValue,column,
+		SingleValueReplacePanel replacePanel = new SingleValueReplacePanel(
-				eventBus);
+					this, value, replaceValue, column, eventBus);
 		add(replacePanel);
 	}
 

src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/SingleValueReplacePanel.java

@@ -62,6 +62,8 @@ public class SingleValueReplacePanel extends FramedPanel {
 
 	}
 	
+	
+
 	protected void initPanel() {
 		setWidth(WIDTH);
 		setHeight(HEIGHT);