From 7a5ea9243d21fa0398e628f0e2bfc3affa30b3f9 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 27 Jan 2016 08:31:02 +0000 Subject: [PATCH] 1452: Implement a GUI for StatMan Algorithms Importer Task-Url: https://support.d4science.org/issues/1452 Fixed explorer refresh on repackage git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/statistical-algorithms-importer@122541 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/maindata/MainDataPanel.java | 11 +- .../client/project/ProjectManager.java | 160 ++++++++++-------- .../tools/explorer/ExplorerProjectPanel.java | 6 +- .../tools/input/InputVariablePanel.java | 10 +- .../client/type/ProjectStatusEventType.java | 2 + 5 files changed, 101 insertions(+), 88 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/maindata/MainDataPanel.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/maindata/MainDataPanel.java index fd403a5..e1e76ae 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/maindata/MainDataPanel.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/maindata/MainDataPanel.java @@ -58,10 +58,6 @@ public class MainDataPanel extends SimpleContainer { return; } switch (event.getProjectStatusEventType()) { - case ADD_RESOURCE: - break; - case DELETE_RESOURCE: - break; case DELETE_MAIN_CODE: case MAIN_CODE_SET: codeEditPanel.codeUpdate(event.getProject()); @@ -70,10 +66,13 @@ public class MainDataPanel extends SimpleContainer { addCodeEditPanel(event.getProject()); break; case SAVE: - break; case START: - break; case UPDATE: + case SOFTWARE_CREATED: + case SOFTWARE_PUBLISH: + case SOFTWARE_REPACKAGE: + case ADD_RESOURCE: + case DELETE_RESOURCE: break; default: break; diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/project/ProjectManager.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/project/ProjectManager.java index fa65fe5..896ef7a 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/project/ProjectManager.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/project/ProjectManager.java @@ -548,77 +548,7 @@ public class ProjectManager { } - public void startProjectManager() { - fireProjectStatusStartEvent(); - } - - private void fireProjectStatusOpenEvent() { - ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( - ProjectStatusEventType.OPEN, project); - eventBus.fireEvent(projectStatusEvent); - Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); - - } - - @SuppressWarnings("unused") - private void fireProjectStatusSaveProjectEvent() { - ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( - ProjectStatusEventType.SAVE, project); - eventBus.fireEvent(projectStatusEvent); - Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); - } - - private void fireProjectStatusAddResourceEvent() { - ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( - ProjectStatusEventType.ADD_RESOURCE, project); - eventBus.fireEvent(projectStatusEvent); - Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); - } - - private void fireProjectStatusDeleteEvent() { - ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( - ProjectStatusEventType.DELETE_RESOURCE, project); - eventBus.fireEvent(projectStatusEvent); - Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); - } - - private void fireProjectStatusDeleteMainCodeEvent() { - ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( - ProjectStatusEventType.DELETE_MAIN_CODE, project); - eventBus.fireEvent(projectStatusEvent); - Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); - } - - @SuppressWarnings("unused") - private void fireProjectStatusUpdateEvent() { - ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( - ProjectStatusEventType.UPDATE, project); - eventBus.fireEvent(projectStatusEvent); - Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); - } - - private void fireProjectStatusMainCodeSetEvent() { - ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( - ProjectStatusEventType.MAIN_CODE_SET, project); - eventBus.fireEvent(projectStatusEvent); - Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); - } - - private void fireProjectStatusSoftwareCreatedEvent() { - ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( - ProjectStatusEventType.SOFTWARE_CREATED, project); - eventBus.fireEvent(projectStatusEvent); - Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); - } - - private void fireProjectStatusStartEvent() { - ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( - ProjectStatusEventType.START, project); - eventBus.fireEvent(projectStatusEvent); - Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); - } - public void startProjectManager(String value) { StatAlgoImporterServiceAsync.INSTANCE.restoreUISession(value, @@ -699,7 +629,7 @@ public class ProjectManager { monitor.hide(); UtilsGXT3.info("Repackage", "The script has been repackaged!"); - + fireProjectStatusSoftwareRepackageEvent(); } }); @@ -759,12 +689,98 @@ public class ProjectManager { monitor.hide(); UtilsGXT3.info("Publish", "The software has been published!"); - + fireProjectStatusSoftwarePublishEvent(); } }); } + public void startProjectManager() { + fireProjectStatusStartEvent(); + } + + private void fireProjectStatusOpenEvent() { + ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( + ProjectStatusEventType.OPEN, project); + eventBus.fireEvent(projectStatusEvent); + Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); + + } + + + @SuppressWarnings("unused") + private void fireProjectStatusSaveProjectEvent() { + ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( + ProjectStatusEventType.SAVE, project); + eventBus.fireEvent(projectStatusEvent); + Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); + } + + private void fireProjectStatusAddResourceEvent() { + ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( + ProjectStatusEventType.ADD_RESOURCE, project); + eventBus.fireEvent(projectStatusEvent); + Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); + } + + private void fireProjectStatusDeleteEvent() { + ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( + ProjectStatusEventType.DELETE_RESOURCE, project); + eventBus.fireEvent(projectStatusEvent); + Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); + } + + private void fireProjectStatusDeleteMainCodeEvent() { + ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( + ProjectStatusEventType.DELETE_MAIN_CODE, project); + eventBus.fireEvent(projectStatusEvent); + Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); + } + + @SuppressWarnings("unused") + private void fireProjectStatusUpdateEvent() { + ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( + ProjectStatusEventType.UPDATE, project); + eventBus.fireEvent(projectStatusEvent); + Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); + } + + private void fireProjectStatusMainCodeSetEvent() { + ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( + ProjectStatusEventType.MAIN_CODE_SET, project); + eventBus.fireEvent(projectStatusEvent); + Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); + } + + private void fireProjectStatusSoftwareCreatedEvent() { + ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( + ProjectStatusEventType.SOFTWARE_CREATED, project); + eventBus.fireEvent(projectStatusEvent); + Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); + } + + private void fireProjectStatusSoftwarePublishEvent() { + ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( + ProjectStatusEventType.SOFTWARE_PUBLISH, project); + eventBus.fireEvent(projectStatusEvent); + Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); + } + + private void fireProjectStatusSoftwareRepackageEvent() { + ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( + ProjectStatusEventType.SOFTWARE_REPACKAGE, project); + eventBus.fireEvent(projectStatusEvent); + Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); + } + + private void fireProjectStatusStartEvent() { + ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( + ProjectStatusEventType.START, project); + eventBus.fireEvent(projectStatusEvent); + Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); + } + + } diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/tools/explorer/ExplorerProjectPanel.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/tools/explorer/ExplorerProjectPanel.java index b6899d0..e3b3395 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/tools/explorer/ExplorerProjectPanel.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/tools/explorer/ExplorerProjectPanel.java @@ -116,12 +116,10 @@ public class ExplorerProjectPanel extends ContentPanel { create(event); break; case SAVE: - reloadWSResourceExplorerPanel(); - break; case MAIN_CODE_SET: - reloadWSResourceExplorerPanel(); - break; case SOFTWARE_CREATED: + case SOFTWARE_PUBLISH: + case SOFTWARE_REPACKAGE: reloadWSResourceExplorerPanel(); break; default: diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/tools/input/InputVariablePanel.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/tools/input/InputVariablePanel.java index cd6e16f..3daa677 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/tools/input/InputVariablePanel.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/tools/input/InputVariablePanel.java @@ -109,10 +109,12 @@ public class InputVariablePanel extends ContentPanel { + event.toString()); switch (event.getProjectStatusEventType()) { case SAVE: - break; case SOFTWARE_CREATED: - break; + case SOFTWARE_PUBLISH: + case SOFTWARE_REPACKAGE: case START: + case ADD_RESOURCE: + case DELETE_RESOURCE: break; case OPEN: create(event.getProject()); @@ -120,10 +122,6 @@ public class InputVariablePanel extends ContentPanel { case UPDATE: updatePanel(event.getProject()); break; - case ADD_RESOURCE: - break; - case DELETE_RESOURCE: - break; case DELETE_MAIN_CODE: setMainCode(event.getProject()); break; diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/type/ProjectStatusEventType.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/type/ProjectStatusEventType.java index b6e3d06..a2b77ab 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/type/ProjectStatusEventType.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/type/ProjectStatusEventType.java @@ -15,6 +15,8 @@ public enum ProjectStatusEventType { DELETE_RESOURCE, DELETE_MAIN_CODE, SOFTWARE_CREATED, + SOFTWARE_PUBLISH, + SOFTWARE_REPACKAGE, SAVE;