From f668614695c53ab69e4c954ae0ff19e577604ae1 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 17 Apr 2014 09:58:33 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@94948 82a268e6-3cf1-43bd-a215-b396298e98cf --- .gwt/.gwt-log | 32 +++++++++++++++++++ .../ChangeColumnTypeProgressDialog.java | 6 +++- .../progress/DeleteColumnProgressDialog.java | 6 +++- .../progress/LabelColumnProgressDialog.java | 6 +++- .../ReplaceBatchColumnProgressDialog.java | 6 +++- .../progress/ReplaceColumnProgressDialog.java | 6 +++- 6 files changed, 57 insertions(+), 5 deletions(-) diff --git a/.gwt/.gwt-log b/.gwt/.gwt-log index b47ad57..fb294cf 100644 --- a/.gwt/.gwt-log +++ b/.gwt/.gwt-log @@ -2760,3 +2760,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... + 30% complete (ETR: 11 seconds) + 30% complete (ETR: 11 seconds) + 30% complete (ETR: 11 seconds) + 30% complete (ETR: 11 seconds) + 40% complete (ETR: 9 seconds) + 50% complete (ETR: 7 seconds) + 60% complete (ETR: 5 seconds) + 70% complete (ETR: 4 seconds) + 80% complete (ETR: 2 seconds) + 90% complete (ETR: 1 seconds) + 100% complete (ETR: 0 seconds) + Compilation completed in 20.67 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.00 seconds +Removing invalidated units +Finding entry point classes diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressDialog.java index 33cef27..f5ed91b 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressDialog.java @@ -4,6 +4,7 @@ import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.type.ChangeColumnTypeSession; import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent; import org.gcube.portlets.user.td.widgetcommonevent.client.type.ChangeTableRequestType; +import org.gcube.portlets.user.td.widgetcommonevent.client.type.ChangeTableWhy; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import com.allen_sauer.gwt.log.client.Log; @@ -35,6 +36,7 @@ public class ChangeColumnTypeProgressDialog extends Window implements ChangeColu protected ChangeColumnTypeProgressUpdater progressUpdater; protected TextButton ok; protected TRId trId; + private ChangeTableWhy why; public ChangeColumnTypeProgressDialog(ChangeColumnTypeSession changeColumnTypeSession, EventBus eventBus) { this.changeColumnTypeSession=changeColumnTypeSession; @@ -97,6 +99,7 @@ public class ChangeColumnTypeProgressDialog extends Window implements ChangeColu public void operationComplete(TRId trId) { Log.debug("Operation Complete return: "+trId.toString()); this.trId=trId; + why=ChangeTableWhy.TABLEUPDATED; updateInvocation(); } @@ -110,7 +113,7 @@ public class ChangeColumnTypeProgressDialog extends Window implements ChangeColu public void updateInvocation(){ if(trId!=null){ ChangeTableRequestEvent changeTableRequestEvent= - new ChangeTableRequestEvent(ChangeTableRequestType.CHANGECOLUMNTYPE, trId); + new ChangeTableRequestEvent(ChangeTableRequestType.CHANGECOLUMNTYPE, trId,why); eventBus.fireEvent(changeTableRequestEvent); } hide(); @@ -122,5 +125,6 @@ public class ChangeColumnTypeProgressDialog extends Window implements ChangeColu Log.debug("Operation Stopped: ["+trId.toString()+", "+reason+", "+details+"]"); ok.setVisible(true); this.trId=trId; + why=ChangeTableWhy.TABLECURATION; } } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressDialog.java index 0a874ed..4eb5b7e 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressDialog.java @@ -4,6 +4,7 @@ import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.DeleteColumnSession; import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent; import org.gcube.portlets.user.td.widgetcommonevent.client.type.ChangeTableRequestType; +import org.gcube.portlets.user.td.widgetcommonevent.client.type.ChangeTableWhy; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import com.allen_sauer.gwt.log.client.Log; @@ -35,6 +36,7 @@ public class DeleteColumnProgressDialog extends Window implements DeleteColumnPr protected DeleteColumnProgressUpdater progressUpdater; protected TextButton ok; protected TRId trId; + private ChangeTableWhy why; public DeleteColumnProgressDialog(DeleteColumnSession deleteColumnSession, EventBus eventBus) { this.deleteColumnSession=deleteColumnSession; @@ -97,6 +99,7 @@ public class DeleteColumnProgressDialog extends Window implements DeleteColumnPr public void operationComplete(TRId trId) { Log.debug("Operation Complete return: "+trId.toString()); this.trId=trId; + why=ChangeTableWhy.TABLEUPDATED; updateInvocation(); } @@ -111,7 +114,7 @@ public class DeleteColumnProgressDialog extends Window implements DeleteColumnPr public void updateInvocation(){ if(trId!=null){ ChangeTableRequestEvent changeTableRequestEvent= - new ChangeTableRequestEvent(ChangeTableRequestType.DELETECOLUMN, trId); + new ChangeTableRequestEvent(ChangeTableRequestType.DELETECOLUMN, trId,why); eventBus.fireEvent(changeTableRequestEvent); } hide(); @@ -122,6 +125,7 @@ public class DeleteColumnProgressDialog extends Window implements DeleteColumnPr Log.debug("Operation Stopped: ["+trId.toString()+", "+reason+", "+details+"]"); ok.setVisible(true); this.trId=trId; + why=ChangeTableWhy.TABLECURATION; } } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressDialog.java index f944726..0d454b1 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressDialog.java @@ -4,6 +4,7 @@ import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.LabelColumnSession; import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent; import org.gcube.portlets.user.td.widgetcommonevent.client.type.ChangeTableRequestType; +import org.gcube.portlets.user.td.widgetcommonevent.client.type.ChangeTableWhy; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import com.allen_sauer.gwt.log.client.Log; @@ -36,6 +37,7 @@ public class LabelColumnProgressDialog extends Window implements LabelColumnProg protected LabelColumnProgressUpdater progressUpdater; protected TextButton ok; protected TRId trId; + private ChangeTableWhy why; public LabelColumnProgressDialog(LabelColumnSession labelColumnSession, EventBus eventBus) { this.labelColumnSession=labelColumnSession; @@ -98,6 +100,7 @@ public class LabelColumnProgressDialog extends Window implements LabelColumnProg public void operationComplete(TRId trId) { Log.debug("Operation Complete return: "+trId.toString()); this.trId=trId; + why=ChangeTableWhy.TABLEUPDATED; updateInvocation(); } @@ -112,7 +115,7 @@ public class LabelColumnProgressDialog extends Window implements LabelColumnProg public void updateInvocation(){ if(trId!=null){ ChangeTableRequestEvent changeTableRequestEvent= - new ChangeTableRequestEvent(ChangeTableRequestType.CHANGECOLUMNLABEL, trId); + new ChangeTableRequestEvent(ChangeTableRequestType.CHANGECOLUMNLABEL, trId,why); eventBus.fireEvent(changeTableRequestEvent); } hide(); @@ -123,5 +126,6 @@ public class LabelColumnProgressDialog extends Window implements LabelColumnProg Log.debug("Operation Stopped: ["+trId.toString()+", "+reason+", "+details+"]"); ok.setVisible(true); this.trId=trId; + why=ChangeTableWhy.TABLECURATION; } } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceBatchColumnProgressDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceBatchColumnProgressDialog.java index c976ef3..f04d2b2 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceBatchColumnProgressDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceBatchColumnProgressDialog.java @@ -4,6 +4,7 @@ import org.gcube.portlets.user.td.columnwidget.client.batch.ReplaceBatchDialog; import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3; import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent; import org.gcube.portlets.user.td.widgetcommonevent.client.type.ChangeTableRequestType; +import org.gcube.portlets.user.td.widgetcommonevent.client.type.ChangeTableWhy; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import com.allen_sauer.gwt.log.client.Log; @@ -36,6 +37,7 @@ public class ReplaceBatchColumnProgressDialog extends Window implements ReplaceB protected ReplaceBatchColumnProgressUpdater progressUpdater; protected TextButton ok; protected TRId trId; + private ChangeTableWhy why; public ReplaceBatchColumnProgressDialog(ReplaceBatchDialog parent, EventBus eventBus) { this.parent=parent; @@ -98,6 +100,7 @@ public class ReplaceBatchColumnProgressDialog extends Window implements ReplaceB public void operationComplete(TRId trId) { Log.debug("Operation Complete return: "+trId.toString()); this.trId=trId; + why=ChangeTableWhy.TABLEUPDATED; updateInvocation(); } @@ -112,7 +115,7 @@ public class ReplaceBatchColumnProgressDialog extends Window implements ReplaceB public void updateInvocation(){ if(trId!=null){ ChangeTableRequestEvent changeTableRequestEvent= - new ChangeTableRequestEvent(ChangeTableRequestType.COLUMNREPLACEBATCH, trId); + new ChangeTableRequestEvent(ChangeTableRequestType.COLUMNREPLACEBATCH, trId,why); eventBus.fireEvent(changeTableRequestEvent); } parent.hide(); @@ -125,5 +128,6 @@ public class ReplaceBatchColumnProgressDialog extends Window implements ReplaceB Log.debug("Operation Stopped: ["+trId.toString()+", "+reason+", "+details+"]"); ok.setVisible(true); this.trId=trId; + why=ChangeTableWhy.TABLECURATION; } } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressDialog.java index 765c189..f00bcad 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressDialog.java @@ -4,6 +4,7 @@ import org.gcube.portlets.user.td.columnwidget.client.replace.ReplaceDialog; import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3; import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent; import org.gcube.portlets.user.td.widgetcommonevent.client.type.ChangeTableRequestType; +import org.gcube.portlets.user.td.widgetcommonevent.client.type.ChangeTableWhy; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import com.allen_sauer.gwt.log.client.Log; @@ -36,6 +37,7 @@ public class ReplaceColumnProgressDialog extends Window implements ReplaceColumn protected ReplaceColumnProgressUpdater progressUpdater; protected TextButton ok; protected TRId trId; + private ChangeTableWhy why; public ReplaceColumnProgressDialog(ReplaceDialog replaceDialog, EventBus eventBus) { this.parent=replaceDialog; @@ -98,6 +100,7 @@ public class ReplaceColumnProgressDialog extends Window implements ReplaceColumn public void operationComplete(TRId trId) { Log.debug("Operation Complete return: "+trId.toString()); this.trId=trId; + why=ChangeTableWhy.TABLEUPDATED; updateInvocation(); } @@ -112,7 +115,7 @@ public class ReplaceColumnProgressDialog extends Window implements ReplaceColumn public void updateInvocation(){ if(trId!=null){ ChangeTableRequestEvent changeTableRequestEvent= - new ChangeTableRequestEvent(ChangeTableRequestType.COLUMNREPLACE, trId); + new ChangeTableRequestEvent(ChangeTableRequestType.COLUMNREPLACE, trId,why); eventBus.fireEvent(changeTableRequestEvent); } parent.hide(); @@ -125,5 +128,6 @@ public class ReplaceColumnProgressDialog extends Window implements ReplaceColumn Log.debug("Operation Stopped: ["+trId.toString()+", "+reason+", "+details+"]"); ok.setVisible(true); this.trId=trId; + why=ChangeTableWhy.TABLECURATION; } }