diff --git a/.gwt/.gwt-log b/.gwt/.gwt-log index c46d7b8..7031228 100644 --- a/.gwt/.gwt-log +++ b/.gwt/.gwt-log @@ -4698,3 +4698,35 @@ Compiling... Compilation completed in 0.00 seconds Removing invalidated units Finding entry point classes +Public resources found in... +Translatable source found in... +Found 0 cached/archived units. Used 0 / 2719 units from cache. +Compiling... + 10% complete (ETR: 28 seconds) + 10% complete (ETR: 28 seconds) + 20% complete (ETR: 23 seconds) + 30% complete (ETR: 19 seconds) + 40% complete (ETR: 14 seconds) + 50% complete (ETR: 11 seconds) + 60% complete (ETR: 8 seconds) + 70% complete (ETR: 5 seconds) + 80% complete (ETR: 3 seconds) + 90% complete (ETR: 1 seconds) + 100% complete (ETR: 0 seconds) + Compilation completed in 22.96 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.01 seconds +Removing invalidated units +Finding entry point classes diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/mapping/ColumnMappingDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/mapping/ColumnMappingDialog.java index 05944b2..25c09bc 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/mapping/ColumnMappingDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/mapping/ColumnMappingDialog.java @@ -54,6 +54,9 @@ public class ColumnMappingDialog extends Window { add(columnMappingPanel); } + /** + * + */ protected void initWindow() { setWidth(WIDTH); setHeight(HEIGHT); @@ -83,11 +86,26 @@ public class ColumnMappingDialog extends Window { } - protected void close() { + /** + * + */ + public void close() { + fireAbortedColumnMapping(); hide(); } + /** + * + * @param columnMappingList + */ + public void saveMapping(ColumnMappingList columnMappingList) { + fireSelectedColumnMapping(columnMappingList); + hide(); + + } + + /** * * @param listener @@ -104,18 +122,30 @@ public class ColumnMappingDialog extends Window { listeners.remove(listener); } - public void fireSelectedColumnMapping(ColumnMappingList columnMappingData) { + /** + * + * @param columnMappingList + */ + public void fireSelectedColumnMapping(ColumnMappingList columnMappingList) { for (ColumnMappingListener listener : listeners) - listener.selectedColumnMapping(columnMappingData); + listener.selectedColumnMapping(columnMappingList); hide(); } + /** + * + */ public void fireAbortedColumnMapping() { for (ColumnMappingListener listener : listeners) listener.abortedColumnMapping(); hide(); } + /** + * + * @param reason + * @param detail + */ public void fireFailedColumnMapping(String reason, String detail) { for (ColumnMappingListener listener : listeners) listener.failedColumnMapping(reason, detail); diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/mapping/ColumnMappingListener.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/mapping/ColumnMappingListener.java index 530c493..11da016 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/mapping/ColumnMappingListener.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/mapping/ColumnMappingListener.java @@ -14,7 +14,7 @@ public interface ColumnMappingListener { /** * Called when created column mapping without errors */ - public void selectedColumnMapping(ColumnMappingList columnMappingData); + public void selectedColumnMapping(ColumnMappingList columnMappingList); /** * Called when the column mapping operation is aborted by the user. diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/mapping/ColumnMappingPanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/mapping/ColumnMappingPanel.java index 27e2581..55ad836 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/mapping/ColumnMappingPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/mapping/ColumnMappingPanel.java @@ -7,6 +7,7 @@ import org.gcube.portlets.user.td.columnwidget.client.dimension.DimensionRowSele import org.gcube.portlets.user.td.columnwidget.client.dimension.DimensionRowSelectionListener; import org.gcube.portlets.user.td.columnwidget.client.dimension.DimensionRowsProperties; import org.gcube.portlets.user.td.columnwidget.client.resources.ResourceBundle; +import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3; import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; import org.gcube.portlets.user.td.gwtservice.shared.tr.DimensionRow; import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; @@ -160,11 +161,43 @@ public class ColumnMappingPanel extends FramedPanel { } protected void save(){ + int lenght=vert.getWidgetCount(); + int i=0; + for(; i comboSourceValue=(ComboBox) h.getItemByItemId(itemIdSourceValueArg); + DimensionRow sourceValue=comboSourceValue.getCurrentValue(); + if(sourceValue!=null){ + @SuppressWarnings("unchecked") + ComboBox comboTargetValue=(ComboBox) h.getItemByItemId(itemIdTargetValueArg); + DimensionRow targetValue=comboTargetValue.getCurrentValue(); + if(targetValue!=null){ + ColumnMappingData columnMappingData=new ColumnMappingData(sourceValue,targetValue); + mapping.add(columnMappingData); + } + } + } else { + + } + } + if(mapping.size()>0){ + columnMappingList=new ColumnMappingList(mapping); + if(parent!=null){ + parent.saveMapping(columnMappingList); + } + } else { + UtilsGXT3.info("Attention", "Creates a valid mapping"); + } } protected void close(){ - + if(parent!=null){ + parent.close(); + } + hide(); } protected void setColumnMappingData() {