diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtBorderLayoutPanel.java b/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtBorderLayoutPanel.java index cd946d5..9b5d8d6 100644 --- a/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtBorderLayoutPanel.java +++ b/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtBorderLayoutPanel.java @@ -63,12 +63,12 @@ public class GxtBorderLayoutPanel extends ContentPanel { private ContentPanel centerBottom; private GxtTreePanel treePanel; private GxtToolbarFunctionality toolbar; -// private ArrayList parsedList; + // private ArrayList parsedList; private List listAttributes; -// private List rows; + // private List rows; - //to manage events + // to manage events private HandlerManager eventBus = null; // RPC service @@ -206,45 +206,36 @@ public class GxtBorderLayoutPanel extends ContentPanel { rootLogger.log(Level.SEVERE, "Event received"); -// int DepthSelectedItem = treePanel -// .getTreeDepthSelectedItem(); - - + // int DepthSelectedItem = treePanel + // .getTreeDepthSelectedItem(); // System.out.println("GxtBorderLayoutPanel-> Depth: " // + DepthSelectedItem); // element name selected -// String text = treePanel.getValue(); + // String text = treePanel.getValue(); // System.out // .println("GxtBorderLayoutPanel-> item selected: " // + text); - - List data = treePanel.getTreePanel() .getSelectionModel().getSelectedItems(); FileModel selectedItem = data.get(0); - - int DepthSelectedItem = treePanel.getTreeStore().getDepth(selectedItem); - - - - + + int DepthSelectedItem = treePanel.getTreeStore() + .getDepth(selectedItem); + String text = selectedItem.getName(); - + rootLogger.log(Level.INFO, "item selected: " + text); -// toolbar.disableButtonOnToolbar(DepthSelectedItem, -// treePanel.getSelectedItemIsSchema()); - + // toolbar.disableButtonOnToolbar(DepthSelectedItem, + // treePanel.getSelectedItemIsSchema()); + toolbar.disableButtonOnToolbar(DepthSelectedItem, selectedItem.isSchema()); - - - if (DepthSelectedItem != 3) { @@ -254,8 +245,6 @@ public class GxtBorderLayoutPanel extends ContentPanel { } - - if (DepthSelectedItem == 3) { // the item selected is a // database. @@ -265,8 +254,8 @@ public class GxtBorderLayoutPanel extends ContentPanel { // .getSelectionModel().getSelectedItems(); // FileModel selectedItem = data.get(0); -// FileModel parent = treePanel.getTreeStore() -// .getParent(selectedItem); + // FileModel parent = treePanel.getTreeStore() + // .getParent(selectedItem); // displayDBInfo(parent); @@ -398,26 +387,25 @@ public class GxtBorderLayoutPanel extends ContentPanel { // variable that keeps track of the managed event submitQueryEventManaged = false; - - + List data = treePanel.getTreePanel().getSelectionModel() .getSelectedItems(); FileModel selectedItem = data.get(0); // recover input data -// LinkedHashMap dataForSubmitQuery = treePanel -// .getInfoOnSelectedItem(); - + // LinkedHashMap dataForSubmitQuery = treePanel + // .getInfoOnSelectedItem(); + LinkedHashMap dataForSubmitQuery = new LinkedHashMap(); - + dataForSubmitQuery.put("ResourceName", selectedItem.getResourceName()); dataForSubmitQuery.put("DatabaseName", selectedItem.getDatabaseName()); - - //print check -// System.out.println("ResourceName" + selectedItem.getResourceName()); -// -// System.out.println("DatabaseName" + selectedItem.getDatabaseName()); + + // print check + // System.out.println("ResourceName" + selectedItem.getResourceName()); + // + // System.out.println("DatabaseName" + selectedItem.getDatabaseName()); final SubmitQueryData dataQuery = toolbar.getSubmitQueryData(); @@ -428,7 +416,7 @@ public class GxtBorderLayoutPanel extends ContentPanel { // force the "true" value for the readonly input. // determine the language - + String dialect; if (selectedItem.isDatabase()) { // the selected item is a database @@ -544,7 +532,7 @@ public class GxtBorderLayoutPanel extends ContentPanel { rootLogger.log(Level.SEVERE, "SUCCESS RPC submitQuery"); -// rows = new ArrayList(); + // rows = new ArrayList(); // System.out.println("result size: " + result.size()); @@ -589,6 +577,8 @@ public class GxtBorderLayoutPanel extends ContentPanel { this.mask("Loading", "x-mask-loading"); // System.out.println("Start RPC - submitQuery"); + + final GxtBorderLayoutPanel obj = this; rootLogger.log(Level.SEVERE, "Start RPC - sample"); @@ -600,7 +590,8 @@ public class GxtBorderLayoutPanel extends ContentPanel { // the selected item is a table FileModel selectedItem = data.get(0); - rootLogger.log(Level.INFO, "the selected table is: " + selectedItem.getName()); + rootLogger.log(Level.INFO, + "the selected table is: " + selectedItem.getName()); // recover data inputs @@ -612,39 +603,42 @@ public class GxtBorderLayoutPanel extends ContentPanel { FileModel resource; if (treePanel.getTreeStore().getParent(selectedItem).isDatabase()) { - + // the table has not a schema - - database = treePanel.getTreeStore().getParent(selectedItem); - resource = treePanel.getTreeStore().getParent(database); - dataInput.put("ResourceName", resource.getName()); - dataInput.put("DatabaseName", database.getName()); - dataInput.put("SchemaName", ""); - dataInput.put("TableName", selectedItem.getName()); + database = treePanel.getTreeStore().getParent(selectedItem); + resource = treePanel.getTreeStore().getParent(database); - rootLogger.log(Level.INFO, "ResourceName: " + resource.getName()); - rootLogger.log(Level.INFO, "DatabaseName: " + database.getName()); - rootLogger.log(Level.INFO, "SchemaName: " + ""); - rootLogger.log(Level.INFO, "SchemaName: " + selectedItem.getName()); - -// schema = treePanel.getTreeStore().getParent(selectedItem); -// database = treePanel.getTreeStore().getParent(schema); -// resource = treePanel.getTreeStore().getParent(database); -// -// dataInput.put("ResourceName", resource.getName()); -// dataInput.put("DatabaseName", database.getName()); -// dataInput.put("SchemaName", schema.getName()); -// dataInput.put("TableName", selectedItem.getName()); -// -// rootLogger.log(Level.INFO, "ResourceName: " + resource.getName()); -// rootLogger.log(Level.INFO, "DatabaseName: " + database.getName()); -// rootLogger.log(Level.INFO, "SchemaName: " + schema.getName()); -// rootLogger.log(Level.INFO, "SchemaName: " + selectedItem.getName()); + dataInput.put("ResourceName", resource.getName()); + dataInput.put("DatabaseName", database.getName()); + dataInput.put("SchemaName", ""); + dataInput.put("TableName", selectedItem.getName()); + + rootLogger.log(Level.INFO, "ResourceName: " + resource.getName()); + rootLogger.log(Level.INFO, "DatabaseName: " + database.getName()); + rootLogger.log(Level.INFO, "SchemaName: " + ""); + rootLogger.log(Level.INFO, "SchemaName: " + selectedItem.getName()); + + // schema = treePanel.getTreeStore().getParent(selectedItem); + // database = treePanel.getTreeStore().getParent(schema); + // resource = treePanel.getTreeStore().getParent(database); + // + // dataInput.put("ResourceName", resource.getName()); + // dataInput.put("DatabaseName", database.getName()); + // dataInput.put("SchemaName", schema.getName()); + // dataInput.put("TableName", selectedItem.getName()); + // + // rootLogger.log(Level.INFO, "ResourceName: " + + // resource.getName()); + // rootLogger.log(Level.INFO, "DatabaseName: " + + // database.getName()); + // rootLogger.log(Level.INFO, "SchemaName: " + schema.getName()); + // rootLogger.log(Level.INFO, "SchemaName: " + + // selectedItem.getName()); + + } else { + // the table has a schema - } else { - //the table has a schema - schema = treePanel.getTreeStore().getParent(selectedItem); database = treePanel.getTreeStore().getParent(schema); resource = treePanel.getTreeStore().getParent(database); @@ -658,20 +652,23 @@ public class GxtBorderLayoutPanel extends ContentPanel { rootLogger.log(Level.INFO, "DatabaseName: " + database.getName()); rootLogger.log(Level.INFO, "SchemaName: " + schema.getName()); rootLogger.log(Level.INFO, "SchemaName: " + selectedItem.getName()); - + // the table has not a schema -// database = treePanel.getTreeStore().getParent(selectedItem); -// resource = treePanel.getTreeStore().getParent(database); -// -// dataInput.put("ResourceName", resource.getName()); -// dataInput.put("DatabaseName", database.getName()); -// dataInput.put("SchemaName", ""); -// dataInput.put("TableName", selectedItem.getName()); -// -// rootLogger.log(Level.INFO, "ResourceName: " + resource.getName()); -// rootLogger.log(Level.INFO, "DatabaseName: " + database.getName()); -// rootLogger.log(Level.INFO, "SchemaName: " + ""); -// rootLogger.log(Level.INFO, "SchemaName: " + selectedItem.getName()); + // database = treePanel.getTreeStore().getParent(selectedItem); + // resource = treePanel.getTreeStore().getParent(database); + // + // dataInput.put("ResourceName", resource.getName()); + // dataInput.put("DatabaseName", database.getName()); + // dataInput.put("SchemaName", ""); + // dataInput.put("TableName", selectedItem.getName()); + // + // rootLogger.log(Level.INFO, "ResourceName: " + + // resource.getName()); + // rootLogger.log(Level.INFO, "DatabaseName: " + + // database.getName()); + // rootLogger.log(Level.INFO, "SchemaName: " + ""); + // rootLogger.log(Level.INFO, "SchemaName: " + + // selectedItem.getName()); } // call remote service @@ -687,6 +684,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { MessageBox.alert("Error ", "
Message:" + caught.getMessage(), null); + + if (obj.isMasked()){ + obj.unmask(); + } } @@ -695,7 +696,7 @@ public class GxtBorderLayoutPanel extends ContentPanel { rootLogger.log(Level.SEVERE, "SUCCESS RPC sample"); -// rows = new ArrayList(); + // rows = new ArrayList(); // System.out.println("result size: " + result.size()); @@ -721,6 +722,8 @@ public class GxtBorderLayoutPanel extends ContentPanel { // to mask the entire content panel this.mask("Loading", "x-mask-loading"); + + final GxtBorderLayoutPanel obj = this; // System.out.println("Start RPC - submitQuery"); @@ -745,8 +748,13 @@ public class GxtBorderLayoutPanel extends ContentPanel { FileModel database; FileModel resource; - if (treePanel.getTreeStore().getParent(selectedItem).isDatabase()) { //the table has not a schema - + if (treePanel.getTreeStore().getParent(selectedItem).isDatabase()) { // the + // table + // has + // not + // a + // schema + database = treePanel.getTreeStore().getParent(selectedItem); resource = treePanel.getTreeStore().getParent(database); @@ -759,26 +767,27 @@ public class GxtBorderLayoutPanel extends ContentPanel { rootLogger.log(Level.INFO, "DatabaseName: " + database.getName()); rootLogger.log(Level.INFO, "SchemaName: " + ""); rootLogger.log(Level.INFO, "SchemaName: " + selectedItem.getName()); - - -// schema = treePanel.getTreeStore().getParent(selectedItem); -// database = treePanel.getTreeStore().getParent(schema); -// resource = treePanel.getTreeStore().getParent(database); -// -// dataInput.put("ResourceName", resource.getName()); -// dataInput.put("DatabaseName", database.getName()); -// dataInput.put("SchemaName", schema.getName()); -// dataInput.put("TableName", selectedItem.getName()); -// -// rootLogger.log(Level.INFO, "ResourceName: " + resource.getName()); -// rootLogger.log(Level.INFO, "DatabaseName: " + database.getName()); -// rootLogger.log(Level.INFO, "SchemaName: " + schema.getName()); -// rootLogger.log(Level.INFO, "SchemaName: " + selectedItem.getName()); + + // schema = treePanel.getTreeStore().getParent(selectedItem); + // database = treePanel.getTreeStore().getParent(schema); + // resource = treePanel.getTreeStore().getParent(database); + // + // dataInput.put("ResourceName", resource.getName()); + // dataInput.put("DatabaseName", database.getName()); + // dataInput.put("SchemaName", schema.getName()); + // dataInput.put("TableName", selectedItem.getName()); + // + // rootLogger.log(Level.INFO, "ResourceName: " + + // resource.getName()); + // rootLogger.log(Level.INFO, "DatabaseName: " + + // database.getName()); + // rootLogger.log(Level.INFO, "SchemaName: " + schema.getName()); + // rootLogger.log(Level.INFO, "SchemaName: " + + // selectedItem.getName()); } else { // the table has a schema - - + schema = treePanel.getTreeStore().getParent(selectedItem); database = treePanel.getTreeStore().getParent(schema); resource = treePanel.getTreeStore().getParent(database); @@ -792,19 +801,22 @@ public class GxtBorderLayoutPanel extends ContentPanel { rootLogger.log(Level.INFO, "DatabaseName: " + database.getName()); rootLogger.log(Level.INFO, "SchemaName: " + schema.getName()); rootLogger.log(Level.INFO, "SchemaName: " + selectedItem.getName()); - -// database = treePanel.getTreeStore().getParent(selectedItem); -// resource = treePanel.getTreeStore().getParent(database); -// -// dataInput.put("ResourceName", resource.getName()); -// dataInput.put("DatabaseName", database.getName()); -// dataInput.put("SchemaName", ""); -// dataInput.put("TableName", selectedItem.getName()); -// -// rootLogger.log(Level.INFO, "ResourceName: " + resource.getName()); -// rootLogger.log(Level.INFO, "DatabaseName: " + database.getName()); -// rootLogger.log(Level.INFO, "SchemaName: " + ""); -// rootLogger.log(Level.INFO, "SchemaName: " + selectedItem.getName()); + + // database = treePanel.getTreeStore().getParent(selectedItem); + // resource = treePanel.getTreeStore().getParent(database); + // + // dataInput.put("ResourceName", resource.getName()); + // dataInput.put("DatabaseName", database.getName()); + // dataInput.put("SchemaName", ""); + // dataInput.put("TableName", selectedItem.getName()); + // + // rootLogger.log(Level.INFO, "ResourceName: " + + // resource.getName()); + // rootLogger.log(Level.INFO, "DatabaseName: " + + // database.getName()); + // rootLogger.log(Level.INFO, "SchemaName: " + ""); + // rootLogger.log(Level.INFO, "SchemaName: " + + // selectedItem.getName()); } // call remote service @@ -820,6 +832,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { MessageBox.alert("Error ", "
Message:" + caught.getMessage(), null); + + if (obj.isMasked()){ + obj.unmask(); + } } @@ -828,7 +844,7 @@ public class GxtBorderLayoutPanel extends ContentPanel { rootLogger.log(Level.SEVERE, "SUCCESS RPC smartSample"); -// rows = new ArrayList(); + // rows = new ArrayList(); // System.out.println("result size: " + result.size()); @@ -852,134 +868,148 @@ public class GxtBorderLayoutPanel extends ContentPanel { private void randomSample() { // to mask the entire content panel - this.mask("Loading", "x-mask-loading"); + this.mask("Loading", "x-mask-loading"); - // System.out.println("Start RPC - submitQuery"); + final GxtBorderLayoutPanel obj = this; - rootLogger.log(Level.SEVERE, "Start RPC - randomSample"); + // System.out.println("Start RPC - submitQuery"); - // get the selected table + rootLogger.log(Level.SEVERE, "Start RPC - randomSample"); - List data = treePanel.getTreePanel().getSelectionModel() - .getSelectedItems(); + // get the selected table - // the selected item is a table - FileModel selectedItem = data.get(0); + List data = treePanel.getTreePanel().getSelectionModel() + .getSelectedItems(); - rootLogger.log(Level.INFO, "the selected table is: " + selectedItem); + // the selected item is a table + FileModel selectedItem = data.get(0); - // recover data inputs for the algorithm + rootLogger.log(Level.INFO, "the selected table is: " + selectedItem); - LinkedHashMap dataInput = new LinkedHashMap(); + // recover data inputs for the algorithm - // check if the table has an associated schema - FileModel schema; - FileModel database; - FileModel resource; + LinkedHashMap dataInput = new LinkedHashMap(); - if (treePanel.getTreeStore().getParent(selectedItem).isDatabase()) { //the has not a schema - - database = treePanel.getTreeStore().getParent(selectedItem); - resource = treePanel.getTreeStore().getParent(database); + // check if the table has an associated schema + FileModel schema; + FileModel database; + FileModel resource; - dataInput.put("ResourceName", resource.getName()); - dataInput.put("DatabaseName", database.getName()); - dataInput.put("SchemaName", ""); - dataInput.put("TableName", selectedItem.getName()); + if (treePanel.getTreeStore().getParent(selectedItem).isDatabase()) { // the + // has + // not + // a + // schema - rootLogger.log(Level.INFO, "ResourceName: " + resource.getName()); - rootLogger.log(Level.INFO, "DatabaseName: " + database.getName()); - rootLogger.log(Level.INFO, "SchemaName: " + ""); - rootLogger.log(Level.INFO, "SchemaName: " + selectedItem.getName()); - -// schema = treePanel.getTreeStore().getParent(selectedItem); -// database = treePanel.getTreeStore().getParent(schema); -// resource = treePanel.getTreeStore().getParent(database); -// -// dataInput.put("ResourceName", resource.getName()); -// dataInput.put("DatabaseName", database.getName()); -// dataInput.put("SchemaName", schema.getName()); -// dataInput.put("TableName", selectedItem.getName()); -// -// rootLogger.log(Level.INFO, "ResourceName: " + resource.getName()); -// rootLogger.log(Level.INFO, "DatabaseName: " + database.getName()); -// rootLogger.log(Level.INFO, "SchemaName: " + schema.getName()); -// rootLogger.log(Level.INFO, "SchemaName: " + selectedItem.getName()); + database = treePanel.getTreeStore().getParent(selectedItem); + resource = treePanel.getTreeStore().getParent(database); - } else { - - //the table has a schema - - schema = treePanel.getTreeStore().getParent(selectedItem); - database = treePanel.getTreeStore().getParent(schema); - resource = treePanel.getTreeStore().getParent(database); + dataInput.put("ResourceName", resource.getName()); + dataInput.put("DatabaseName", database.getName()); + dataInput.put("SchemaName", ""); + dataInput.put("TableName", selectedItem.getName()); - dataInput.put("ResourceName", resource.getName()); - dataInput.put("DatabaseName", database.getName()); - dataInput.put("SchemaName", schema.getName()); - dataInput.put("TableName", selectedItem.getName()); + rootLogger.log(Level.INFO, "ResourceName: " + resource.getName()); + rootLogger.log(Level.INFO, "DatabaseName: " + database.getName()); + rootLogger.log(Level.INFO, "SchemaName: " + ""); + rootLogger.log(Level.INFO, "SchemaName: " + selectedItem.getName()); - rootLogger.log(Level.INFO, "ResourceName: " + resource.getName()); - rootLogger.log(Level.INFO, "DatabaseName: " + database.getName()); - rootLogger.log(Level.INFO, "SchemaName: " + schema.getName()); - rootLogger.log(Level.INFO, "SchemaName: " + selectedItem.getName()); - - -// // the table has not a schema -// database = treePanel.getTreeStore().getParent(selectedItem); -// resource = treePanel.getTreeStore().getParent(database); -// -// dataInput.put("ResourceName", resource.getName()); -// dataInput.put("DatabaseName", database.getName()); -// dataInput.put("SchemaName", ""); -// dataInput.put("TableName", selectedItem.getName()); -// -// rootLogger.log(Level.INFO, "ResourceName: " + resource.getName()); -// rootLogger.log(Level.INFO, "DatabaseName: " + database.getName()); -// rootLogger.log(Level.INFO, "SchemaName: " + ""); -// rootLogger.log(Level.INFO, "SchemaName: " + selectedItem.getName()); + // schema = treePanel.getTreeStore().getParent(selectedItem); + // database = treePanel.getTreeStore().getParent(schema); + // resource = treePanel.getTreeStore().getParent(database); + // + // dataInput.put("ResourceName", resource.getName()); + // dataInput.put("DatabaseName", database.getName()); + // dataInput.put("SchemaName", schema.getName()); + // dataInput.put("TableName", selectedItem.getName()); + // + // rootLogger.log(Level.INFO, "ResourceName: " + + // resource.getName()); + // rootLogger.log(Level.INFO, "DatabaseName: " + + // database.getName()); + // rootLogger.log(Level.INFO, "SchemaName: " + schema.getName()); + // rootLogger.log(Level.INFO, "SchemaName: " + + // selectedItem.getName()); + + } else { + + // the table has a schema + + schema = treePanel.getTreeStore().getParent(selectedItem); + database = treePanel.getTreeStore().getParent(schema); + resource = treePanel.getTreeStore().getParent(database); + + dataInput.put("ResourceName", resource.getName()); + dataInput.put("DatabaseName", database.getName()); + dataInput.put("SchemaName", schema.getName()); + dataInput.put("TableName", selectedItem.getName()); + + rootLogger.log(Level.INFO, "ResourceName: " + resource.getName()); + rootLogger.log(Level.INFO, "DatabaseName: " + database.getName()); + rootLogger.log(Level.INFO, "SchemaName: " + schema.getName()); + rootLogger.log(Level.INFO, "SchemaName: " + selectedItem.getName()); + + // // the table has not a schema + // database = treePanel.getTreeStore().getParent(selectedItem); + // resource = treePanel.getTreeStore().getParent(database); + // + // dataInput.put("ResourceName", resource.getName()); + // dataInput.put("DatabaseName", database.getName()); + // dataInput.put("SchemaName", ""); + // dataInput.put("TableName", selectedItem.getName()); + // + // rootLogger.log(Level.INFO, "ResourceName: " + + // resource.getName()); + // rootLogger.log(Level.INFO, "DatabaseName: " + + // database.getName()); + // rootLogger.log(Level.INFO, "SchemaName: " + ""); + // rootLogger.log(Level.INFO, "SchemaName: " + + // selectedItem.getName()); + } + + // call remote service + + RPCservice.randomSample(dataInput, new AsyncCallback>() { + + @Override + public void onFailure(Throwable caught) { + + // Window.alert(caught.getMessage()); + // System.out.println("FAILURE"); + rootLogger.log(Level.SEVERE, "FAILURE RPC randomSample"); + + MessageBox.alert("Error ", + "
Message:" + caught.getMessage(), null); + + if (obj.isMasked()) { + obj.unmask(); } - // call remote service + } - RPCservice.randomSample(dataInput, new AsyncCallback>() { + @Override + public void onSuccess(List result) { - @Override - public void onFailure(Throwable caught) { + rootLogger.log(Level.SEVERE, "SUCCESS RPC randomSample"); - // Window.alert(caught.getMessage()); - // System.out.println("FAILURE"); - rootLogger.log(Level.SEVERE, "FAILURE RPC randomSample"); + // rows = new ArrayList(); - MessageBox.alert("Error ", - "
Message:" + caught.getMessage(), null); + // System.out.println("result size: " + result.size()); - } + rootLogger.log(Level.SEVERE, "output size: " + result.size()); - @Override - public void onSuccess(List result) { + // get the attributes list for the result table + getListAttributes(result.get(0).getValue()); - rootLogger.log(Level.SEVERE, "SUCCESS RPC randomSample"); + // remove the header in order to parse only the result + result.remove(0); -// rows = new ArrayList(); + // parse the result in order to obtain a table + parseResult(result); - // System.out.println("result size: " + result.size()); - - rootLogger.log(Level.SEVERE, "output size: " + result.size()); - - // get the attributes list for the result table - getListAttributes(result.get(0).getValue()); - - // remove the header in order to parse only the result - result.remove(0); - - // parse the result in order to obtain a table - parseResult(result); - - } - - }); + } + }); } @@ -1000,20 +1030,14 @@ public class GxtBorderLayoutPanel extends ContentPanel { public void onFailure(Throwable caught) { // TODO Auto-generated method stub - Window.alert(caught.getMessage()); + // Window.alert(caught.getMessage()); // System.out.println("FAILURE StartParse"); + MessageBox.alert("Error ", + "
Message:" + caught.getMessage(), null); + rootLogger.log(Level.SEVERE, "FAILURE RPC parseResult"); - } - - @Override - public void onSuccess(List rows) { - - // System.out.println("Success StartParse"); - - rootLogger.log(Level.SEVERE, "SUCCESS RPC parseResult"); - if (submitQueryEventManaged == true) { Dialog form = toolbar.getDialogForm(); @@ -1023,8 +1047,22 @@ public class GxtBorderLayoutPanel extends ContentPanel { form.hide(); + } else { + if (obj.isMasked()) { + obj.unmask(); + + } } + } + + @Override + public void onSuccess(List rows) { + + // System.out.println("Success StartParse"); + + rootLogger.log(Level.SEVERE, "SUCCESS RPC parseResult"); + // else { if (rows != null) { @@ -1077,14 +1115,43 @@ public class GxtBorderLayoutPanel extends ContentPanel { submitResult.show(); + if (submitQueryEventManaged == true) { + + Dialog form = toolbar.getDialogForm(); + + if (form.isMasked()) + form.unmask(); + + form.hide(); + + } else { + if (obj.isMasked()) { + obj.unmask(); + + } + } + + } else { + + if (submitQueryEventManaged == true) { + + Dialog form = toolbar.getDialogForm(); + + if (form.isMasked()) + form.unmask(); + + form.hide(); + + } else { + if (obj.isMasked()) { + obj.unmask(); + + } + } + } // } - if (obj.isMasked()) { - obj.unmask(); - - } - } }); @@ -1288,7 +1355,7 @@ public class GxtBorderLayoutPanel extends ContentPanel { // to mask the entire content panel this.mask("Loading", "x-mask-loading"); - + // to unmask the entire content panel final GxtBorderLayoutPanel obj = this; @@ -1316,8 +1383,13 @@ public class GxtBorderLayoutPanel extends ContentPanel { FileModel database; FileModel resource; - if (treePanel.getTreeStore().getParent(selectedTable).isDatabase()) { //the table has not a schema - + if (treePanel.getTreeStore().getParent(selectedTable).isDatabase()) { // the + // table + // has + // not + // a + // schema + database = treePanel.getTreeStore().getParent(selectedTable); resource = treePanel.getTreeStore().getParent(database); @@ -1331,25 +1403,27 @@ public class GxtBorderLayoutPanel extends ContentPanel { rootLogger.log(Level.INFO, "SchemaName: " + ""); rootLogger .log(Level.INFO, "SchemaName: " + selectedTable.getName()); - -// schema = treePanel.getTreeStore().getParent(selectedTable); -// database = treePanel.getTreeStore().getParent(schema); -// resource = treePanel.getTreeStore().getParent(database); -// -// dataInput.put("ResourceName", resource.getName()); -// dataInput.put("DatabaseName", database.getName()); -// dataInput.put("SchemaName", schema.getName()); -// dataInput.put("TableName", selectedTable.getName()); -// -// rootLogger.log(Level.INFO, "ResourceName: " + resource.getName()); -// rootLogger.log(Level.INFO, "DatabaseName: " + database.getName()); -// rootLogger.log(Level.INFO, "SchemaName: " + schema.getName()); -// rootLogger -// .log(Level.INFO, "SchemaName: " + selectedTable.getName()); + + // schema = treePanel.getTreeStore().getParent(selectedTable); + // database = treePanel.getTreeStore().getParent(schema); + // resource = treePanel.getTreeStore().getParent(database); + // + // dataInput.put("ResourceName", resource.getName()); + // dataInput.put("DatabaseName", database.getName()); + // dataInput.put("SchemaName", schema.getName()); + // dataInput.put("TableName", selectedTable.getName()); + // + // rootLogger.log(Level.INFO, "ResourceName: " + + // resource.getName()); + // rootLogger.log(Level.INFO, "DatabaseName: " + + // database.getName()); + // rootLogger.log(Level.INFO, "SchemaName: " + schema.getName()); + // rootLogger + // .log(Level.INFO, "SchemaName: " + selectedTable.getName()); } else { // the table has a schema - + schema = treePanel.getTreeStore().getParent(selectedTable); database = treePanel.getTreeStore().getParent(schema); resource = treePanel.getTreeStore().getParent(database); @@ -1364,21 +1438,22 @@ public class GxtBorderLayoutPanel extends ContentPanel { rootLogger.log(Level.INFO, "SchemaName: " + schema.getName()); rootLogger .log(Level.INFO, "SchemaName: " + selectedTable.getName()); - - -// database = treePanel.getTreeStore().getParent(selectedTable); -// resource = treePanel.getTreeStore().getParent(database); -// -// dataInput.put("ResourceName", resource.getName()); -// dataInput.put("DatabaseName", database.getName()); -// dataInput.put("SchemaName", ""); -// dataInput.put("TableName", selectedTable.getName()); -// -// rootLogger.log(Level.INFO, "ResourceName: " + resource.getName()); -// rootLogger.log(Level.INFO, "DatabaseName: " + database.getName()); -// rootLogger.log(Level.INFO, "SchemaName: " + ""); -// rootLogger -// .log(Level.INFO, "SchemaName: " + selectedTable.getName()); + + // database = treePanel.getTreeStore().getParent(selectedTable); + // resource = treePanel.getTreeStore().getParent(database); + // + // dataInput.put("ResourceName", resource.getName()); + // dataInput.put("DatabaseName", database.getName()); + // dataInput.put("SchemaName", ""); + // dataInput.put("TableName", selectedTable.getName()); + // + // rootLogger.log(Level.INFO, "ResourceName: " + + // resource.getName()); + // rootLogger.log(Level.INFO, "DatabaseName: " + + // database.getName()); + // rootLogger.log(Level.INFO, "SchemaName: " + ""); + // rootLogger + // .log(Level.INFO, "SchemaName: " + selectedTable.getName()); } if (selectedTable.isTableDetailsDisplayed()) { @@ -1400,7 +1475,7 @@ public class GxtBorderLayoutPanel extends ContentPanel { MessageBox.alert("Error ", "
Message:" + caught.getMessage(), null); - + if (obj.isMasked()) { obj.unmask(); } @@ -1483,6 +1558,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { } + // if (obj.isMasked()) { + // obj.unmask(); + // } + } }); 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 e0786e8..75b3a71 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 @@ -41,18 +41,18 @@ public class GxtTreePanel extends LayoutContainer { private String value = ""; private int treeDepthSelectedItem; -// private boolean SelectedItemIsSchema = false; + // private boolean SelectedItemIsSchema = false; // the rpc remote service private GWTdbManagerServiceAsync RPCservice = null; // to keep track of information associated to a database -// private LinkedHashMap dataDBInfo = null; + // private LinkedHashMap dataDBInfo = null; -// private String ResourceNameSelected; -// private String DatabaseNameSelected; -// private String SchemaNameSelected; -// private String TableNameSelected; + // private String ResourceNameSelected; + // private String DatabaseNameSelected; + // private String SchemaNameSelected; + // private String TableNameSelected; // to keep track of information associated to the selected item private LinkedHashMap infoOnSelectedItem; @@ -151,13 +151,13 @@ public class GxtTreePanel extends LayoutContainer { SelectionChangedEvent se) { // reset infromation at each selection -// dataDBInfo = null; -// ResourceNameSelected = null; -// DatabaseNameSelected = null; -// SchemaNameSelected = null; -// TableNameSelected = null; -// infoOnSelectedItem = null; -// SelectedItemIsSchema = false; + // dataDBInfo = null; + // ResourceNameSelected = null; + // DatabaseNameSelected = null; + // SchemaNameSelected = null; + // TableNameSelected = null; + // infoOnSelectedItem = null; + // SelectedItemIsSchema = false; // the selected element List data = treePanel.getSelectionModel() @@ -170,8 +170,6 @@ public class GxtTreePanel extends LayoutContainer { // selected FileModel selectedItem = data.get(0); - - value = data.get(0).get("name"); @@ -285,11 +283,11 @@ public class GxtTreePanel extends LayoutContainer { } -// // get the tree depth -// public int getTreeDepthSelectedItem() { -// -// return treeDepthSelectedItem; -// } + // // get the tree depth + // public int getTreeDepthSelectedItem() { + // + // return treeDepthSelectedItem; + // } // load resources private void loadResources(final FileModel element, final GxtTreePanel tree) { @@ -318,14 +316,15 @@ public class GxtTreePanel extends LayoutContainer { MessageBox.alert("Error ", "
Message:" + caught.getMessage(), null); + if (tree.isMasked()) { + tree.unmask(); + } + } @Override public void onSuccess(List result) { - if (tree.isMasked()) - tree.unmask(); - // if (treePanel.isMasked()) // treePanel.unmask(); @@ -355,6 +354,9 @@ public class GxtTreePanel extends LayoutContainer { element.setIsLoaded(true); + if (tree.isMasked()) + tree.unmask(); + } }); @@ -394,15 +396,15 @@ public class GxtTreePanel extends LayoutContainer { MessageBox.alert("Error ", "
Message:" + caught.getMessage(), null); + if (treePanel.isMasked()) + treePanel.unmask(); + } @Override public void onSuccess( LinkedHashMap result) { - if (treePanel.isMasked()) - treePanel.unmask(); - // System.out.println("SUCCESS"); // rootLogger.log(Level.SEVERE, @@ -553,6 +555,9 @@ public class GxtTreePanel extends LayoutContainer { // // fire event // eventBus.fireEvent(new DisplayDBInfoEvent()); + if (treePanel.isMasked()) + treePanel.unmask(); + } }); @@ -602,6 +607,9 @@ public class GxtTreePanel extends LayoutContainer { MessageBox.alert("Error ", "
Message:" + caught.getMessage(), null); + if (treePanel.isMasked()) + treePanel.unmask(); + } @Override @@ -624,9 +632,6 @@ public class GxtTreePanel extends LayoutContainer { } else { - if (treePanel.isMasked()) - treePanel.unmask(); - // // print check // for (int i = 0; i < result.size(); i++) { // System.out.println(result.get(i).getName()); @@ -649,6 +654,9 @@ public class GxtTreePanel extends LayoutContainer { // } } + if (treePanel.isMasked()) + treePanel.unmask(); + } }); @@ -797,11 +805,11 @@ public class GxtTreePanel extends LayoutContainer { treePanel.setExpanded(element, false); + element.setIsLoaded(true); + if (treePanel.isMasked()) treePanel.unmask(); - element.setIsLoaded(true); - } // MessageBox.alert("Error ","
Message:"+caught.getMessage(), @@ -812,8 +820,7 @@ public class GxtTreePanel extends LayoutContainer { @Override public void onSuccess(List result) { - if (treePanel.isMasked()) - treePanel.unmask(); + // System.out.println("SUCCESS"); @@ -862,6 +869,9 @@ public class GxtTreePanel extends LayoutContainer { } element.setIsLoaded(true); + + if (treePanel.isMasked()) + treePanel.unmask(); } }); @@ -872,14 +882,14 @@ public class GxtTreePanel extends LayoutContainer { } -// public boolean getSelectedItemIsSchema() { -// -// return SelectedItemIsSchema; -// } + // public boolean getSelectedItemIsSchema() { + // + // return SelectedItemIsSchema; + // } -// public LinkedHashMap getDataOnDB() { -// return dataDBInfo; -// } + // public LinkedHashMap getDataOnDB() { + // return dataDBInfo; + // } // public FileModel getSelectedItem(){ // @@ -900,35 +910,35 @@ public class GxtTreePanel extends LayoutContainer { } } -// public String getResourceNameSelected() { -// -// return ResourceNameSelected; -// -// } -// -// public String getDatabaseNameSelected() { -// -// return DatabaseNameSelected; -// -// } + // public String getResourceNameSelected() { + // + // return ResourceNameSelected; + // + // } + // + // public String getDatabaseNameSelected() { + // + // return DatabaseNameSelected; + // + // } -// public String getSchemaNameSelected() { -// -// return SchemaNameSelected; -// -// } -// -// public String getTableNameSelected() { -// -// return TableNameSelected; -// -// } + // public String getSchemaNameSelected() { + // + // return SchemaNameSelected; + // + // } + // + // public String getTableNameSelected() { + // + // return TableNameSelected; + // + // } // set information (useful for the submitquery operation) for the selected // item. The selected item can be a schema, a table and a database. private void setInfoOnSelectedItem(FileModel element) { -// infoOnSelectedItem = new LinkedHashMap(); + // infoOnSelectedItem = new LinkedHashMap(); if ((treeDepthSelectedItem == 4) && (element.isSchema() == true)) { // the // selected @@ -939,24 +949,22 @@ public class GxtTreePanel extends LayoutContainer { rootLogger.log(Level.SEVERE, "setInfo for selected item schema"); -// SelectedItemIsSchema = true; - + // SelectedItemIsSchema = true; // recover database name FileModel database = store.getParent(element); String DatabaseName = database.getName(); - // recover resource name FileModel resource = store.getParent(database); String ResourceName = resource.getName(); - + element.setResourceName(ResourceName); element.setDatabaseName(DatabaseName); -// infoOnSelectedItem.put("ResourceName", ResourceNameSelected); -// infoOnSelectedItem.put("DatabaseName", DatabaseNameSelected); + // infoOnSelectedItem.put("ResourceName", ResourceNameSelected); + // infoOnSelectedItem.put("DatabaseName", DatabaseNameSelected); } @@ -976,7 +984,7 @@ public class GxtTreePanel extends LayoutContainer { rootLogger.log(Level.SEVERE, "setInfo for selected item table"); // recover table name -// TableNameSelected = element.getName(); + // TableNameSelected = element.getName(); // recover database name FileModel database = store.getParent(element); @@ -986,12 +994,12 @@ public class GxtTreePanel extends LayoutContainer { // recover resource name FileModel resource = store.getParent(database); String ResourceName = resource.getName(); - + element.setResourceName(ResourceName); element.setDatabaseName(DatabaseName); -// infoOnSelectedItem.put("ResourceName", ResourceNameSelected); -// infoOnSelectedItem.put("DatabaseName", DatabaseNameSelected); + // infoOnSelectedItem.put("ResourceName", ResourceNameSelected); + // infoOnSelectedItem.put("DatabaseName", DatabaseNameSelected); // infoOnSelectedItem.put("SchemaName", ""); // infoOnSelectedItem.put("TableName", TableNameSelected); @@ -1004,11 +1012,11 @@ public class GxtTreePanel extends LayoutContainer { rootLogger.log(Level.SEVERE, "setInfo for selected item table"); // recover table name -// TableNameSelected = element.getName(); + // TableNameSelected = element.getName(); // recover schema name FileModel schema = store.getParent(element); -// SchemaNameSelected = schema.getName(); + // SchemaNameSelected = schema.getName(); // recover database name FileModel database = store.getParent(schema); @@ -1017,13 +1025,13 @@ public class GxtTreePanel extends LayoutContainer { // recover resource name FileModel resource = store.getParent(database); - String ResourceName = resource.getName(); - + String ResourceName = resource.getName(); + element.setResourceName(ResourceName); element.setDatabaseName(DatabaseName); -// infoOnSelectedItem.put("ResourceName", ResourceNameSelected); -// infoOnSelectedItem.put("DatabaseName", DatabaseNameSelected); + // infoOnSelectedItem.put("ResourceName", ResourceNameSelected); + // infoOnSelectedItem.put("DatabaseName", DatabaseNameSelected); // infoOnSelectedItem.put("SchemaName", SchemaNameSelected); // infoOnSelectedItem.put("TableName", TableNameSelected); @@ -1038,21 +1046,21 @@ public class GxtTreePanel extends LayoutContainer { // recover resource name FileModel resource = store.getParent(element); String ResourceName = resource.getName(); - + element.setResourceName(ResourceName); element.setDatabaseName(DatabaseName); -// infoOnSelectedItem.put("ResourceName", ResourceNameSelected); -// infoOnSelectedItem.put("DatabaseName", DatabaseNameSelected); + // infoOnSelectedItem.put("ResourceName", ResourceNameSelected); + // infoOnSelectedItem.put("DatabaseName", DatabaseNameSelected); } } -// // get information about the selected item -// public LinkedHashMap getInfoOnSelectedItem() { -// -// return infoOnSelectedItem; -// } + // // get information about the selected item + // public LinkedHashMap getInfoOnSelectedItem() { + // + // return infoOnSelectedItem; + // } public TreePanel getTreePanel() { return this.treePanel;