From b1020383fc2a5fca6e76eb574543c8d1f1b1c2f3 Mon Sep 17 00:00:00 2001 From: Loredana Liccardo Date: Thu, 10 Jul 2014 14:43:06 +0000 Subject: [PATCH] bug fixed for the tree on elements selection git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/databases-manager-portlet@98556 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/panels/GxtTreePanel.java | 29 +++++++++++++++++-- .../server/GWTdbManagerServiceImpl.java | 10 ++++++- .../databasesmanager/DatabasesManager.gwt.xml | 8 ++--- 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtTreePanel.java b/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtTreePanel.java index 080fb9c..a8c4357 100644 --- a/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtTreePanel.java +++ b/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtTreePanel.java @@ -205,9 +205,13 @@ public class GxtTreePanel extends LayoutContainer { // selected item has not loaded if ((numChildrenFolder == 0) && (data.get(0).isLoaded() != true)) { - + + + + treePanel.disableEvents(true); // to mask the tree panel treePanel.mask("Loading", "x-mask-loading"); + // selectedItem.setIsSchema(false); switch (treeDepthSelectedItem) { @@ -218,7 +222,10 @@ public class GxtTreePanel extends LayoutContainer { case 2: // the selected item is the resource // selectedItem.setIsSchema(false); - loadDBInfo(data.get(0)); + + + loadDBInfo(data.get(0), treePanel); +// loadDBInfo(data.get(0)); break; case 3: // the selected item is a database @@ -377,7 +384,7 @@ public class GxtTreePanel extends LayoutContainer { } // load information fo a database - private void loadDBInfo(final FileModel element) { + private void loadDBInfo(final FileModel element, final TreePanel tree) { // System.out.println("Start RPC - getDBInfo"); @@ -406,6 +413,10 @@ public class GxtTreePanel extends LayoutContainer { if (treePanel.isMasked()) treePanel.unmask(); + + + + tree.enableEvents(true); } @@ -570,6 +581,10 @@ public class GxtTreePanel extends LayoutContainer { if (treePanel.isMasked()) treePanel.unmask(); + + tree.enable(); + + tree.enableEvents(true); } @@ -622,6 +637,8 @@ public class GxtTreePanel extends LayoutContainer { if (treePanel.isMasked()) treePanel.unmask(); + + treePanel.enableEvents(true); } @@ -674,6 +691,8 @@ public class GxtTreePanel extends LayoutContainer { if (treePanel.isMasked()) treePanel.unmask(); + + treePanel.enableEvents(true); } }); @@ -827,6 +846,8 @@ public class GxtTreePanel extends LayoutContainer { if (treePanel.isMasked()) treePanel.unmask(); + + treePanel.enableEvents(true); } @@ -890,6 +911,8 @@ public class GxtTreePanel extends LayoutContainer { if (treePanel.isMasked()) treePanel.unmask(); + + treePanel.enableEvents(true); } }); diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/server/GWTdbManagerServiceImpl.java b/src/main/java/org/gcube/portlets/user/databasesmanager/server/GWTdbManagerServiceImpl.java index 47998a3..2ad4138 100644 --- a/src/main/java/org/gcube/portlets/user/databasesmanager/server/GWTdbManagerServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/databasesmanager/server/GWTdbManagerServiceImpl.java @@ -270,11 +270,18 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements // System.out.println(inputParameters.get(i).getName()); rootLogger.log(Level.INFO, inputParameters.get(i).getName()); - + } inputParameters.get(0).setValue(dataInput.get("ResourceName")); inputParameters.get(1).setValue(dataInput.get("DatabaseName")); + + rootLogger.log(Level.INFO, "ResourceName: " + dataInput.get("ResourceName")); + + rootLogger.log(Level.INFO, "DatabaseName: " + dataInput.get("DatabaseName")); + + + String computationId = startComputation(algorithmId, inputParameters); @@ -371,6 +378,7 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements // System.out.println("output data retrieved"); rootLogger.log(Level.SEVERE, "output data retrieved"); + rootLogger.log(Level.SEVERE, "output data size: " + outputMap.size()); // System.out.println("size outputMap: " + outputMap.size()); diff --git a/src/main/resources/org/gcube/portlets/user/databasesmanager/DatabasesManager.gwt.xml b/src/main/resources/org/gcube/portlets/user/databasesmanager/DatabasesManager.gwt.xml index 51b719a..0eb7860 100644 --- a/src/main/resources/org/gcube/portlets/user/databasesmanager/DatabasesManager.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/databasesmanager/DatabasesManager.gwt.xml @@ -5,7 +5,7 @@ - + @@ -27,8 +27,8 @@ - - - + + +