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 a189591..d3e3a69 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 @@ -72,6 +72,7 @@ import com.extjs.gxt.ui.client.event.MessageBoxEvent; import com.extjs.gxt.ui.client.event.SelectionChangedEvent; import com.extjs.gxt.ui.client.event.SelectionChangedListener; import com.extjs.gxt.ui.client.event.SelectionListener; +import com.extjs.gxt.ui.client.event.WindowEvent; //class that represents the container of all components public class GxtBorderLayoutPanel extends ContentPanel { @@ -97,7 +98,7 @@ public class GxtBorderLayoutPanel extends ContentPanel { private GWTdbManagerServiceAsync RPCservice = null; // variable that keeps track of the "submitquery" managed event -// private boolean submitQueryEventManaged = false; + // private boolean submitQueryEventManaged = false; // to keep track that the tables list is not null // private boolean tablesListNotNull = false; @@ -127,6 +128,8 @@ public class GxtBorderLayoutPanel extends ContentPanel { center = new LayoutContainer(); treePanel = new GxtTreePanel(eventBus, service); toolbar = new GxtToolbarFunctionality(eventBus, RPCservice); + + this.setHeaderVisible(false); initLayout(); createLayouts(); @@ -261,9 +264,9 @@ public class GxtBorderLayoutPanel extends ContentPanel { String text = selectedItem.getName(); // print check -// System.out -// .println("GxtBorderLayoutPanel--> selected item: " -// + text); + // System.out + // .println("GxtBorderLayoutPanel--> selected item: " + // + text); rootLogger.log(Level.INFO, "selected item: " + text); @@ -326,6 +329,7 @@ public class GxtBorderLayoutPanel extends ContentPanel { }); + eventBus.addHandler(LoadTablesEvent.TYPE, new LoadTablesEventHandler() { @Override @@ -343,13 +347,13 @@ public class GxtBorderLayoutPanel extends ContentPanel { @Override public void onSubmitQuery(SubmitQueryEvent submitQueryEvent) { // TODO Auto-generated method stub - -// Integer dialogID = toolbar.getDialogID(); - - Integer dialogID = new Integer(submitQueryEvent.getDialogID()); - - rootLogger.log(Level.INFO, "dialogID: " - + dialogID); + + // Integer dialogID = toolbar.getDialogID(); + + Integer dialogID = new Integer(submitQueryEvent + .getDialogID()); + + rootLogger.log(Level.INFO, "dialogID: " + dialogID); submitQuery(dialogID); @@ -416,12 +420,12 @@ public class GxtBorderLayoutPanel extends ContentPanel { } // print check -// System.out -// .println("GxtBorderLayoutPanel--> selected table: " -// + table.getName()); + // System.out + // .println("GxtBorderLayoutPanel--> selected table: " + // + table.getName()); - rootLogger.log(Level.INFO, "selected table: " - + table.getName()); + rootLogger.log(Level.INFO, + "selected table: " + table.getName()); // get table details getTableDetails(table); @@ -517,10 +521,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { @Override public void onFailure(Throwable caught) { // TODO Auto-generated method stub - - //print check -// System.out -// .println("GxtBorderLayoutPanel--> FAILURE RPC LoadTables"); + + // print check + // System.out + // .println("GxtBorderLayoutPanel--> FAILURE RPC LoadTables"); rootLogger.log(Level.SEVERE, "FAILURE RPC LoadTables"); @@ -558,10 +562,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { public void onSuccess( PagingLoadResult result) { // TODO Auto-generated method stub - - //print check -// System.out -// .println("GxtBorderLayoutPanel--> SUCCESS RPC LoadTables"); + + // print check + // System.out + // .println("GxtBorderLayoutPanel--> SUCCESS RPC LoadTables"); rootLogger.log(Level.SEVERE, "SUCCESS RPC LoadTables"); @@ -980,6 +984,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { keyword = null; startSearchTable = false; + + //refresh the database information panel + centerUpper.removeAll(); + centerUpper.layout(true); tablesLoaded.hide(); @@ -1053,7 +1061,7 @@ public class GxtBorderLayoutPanel extends ContentPanel { private void submitQuery(final Integer dialogID) { // clear variable that keeps track of the managed event -// boolean submitQueryEventManaged = false; + // boolean submitQueryEventManaged = false; // get the selected item List data = treePanel.getTreePanel().getSelectionModel() @@ -1072,25 +1080,24 @@ public class GxtBorderLayoutPanel extends ContentPanel { // System.out.println("DatabaseName" + selectedItem.getDatabaseName()); // get data inserted in the form -// final SubmitQueryData dataQuery = toolbar.getSubmitQueryData(); - - //get data list (inserted in the form) - LinkedHashMap submitQueryDataList = toolbar.getSubmitQueryDataList(); - - //get dialog list + // final SubmitQueryData dataQuery = toolbar.getSubmitQueryData(); + + // get data list (inserted in the form) + LinkedHashMap submitQueryDataList = toolbar + .getSubmitQueryDataList(); + + // get dialog list LinkedHashMap dialogList = toolbar.getDialogFormList(); - - - //get the dialog related to the ID + + // get the dialog related to the ID final Dialog form = dialogList.get(dialogID); - //get the data form related to the ID + // get the data form related to the ID final SubmitQueryData dataQuery = submitQueryDataList.get(dialogID); - - -// rootLogger.log(Level.INFO, "query: "+ dataQuery.getQuery() + "submitquery->dialogID: " -// + dialogID); - - + + // rootLogger.log(Level.INFO, "query: "+ dataQuery.getQuery() + + // "submitquery->dialogID: " + // + dialogID); + // determine the language String dialect; @@ -1168,10 +1175,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { public void onFailure(Throwable caught) { // Window.alert(caught.getMessage()); - - //print check -// System.out -// .println("GxtBorderLayoutPanel--> FAILURE RPC submitQuery"); + + // print check + // System.out + // .println("GxtBorderLayoutPanel--> FAILURE RPC submitQuery"); rootLogger.log(Level.SEVERE, "FAILURE RPC submitQuery"); @@ -1183,7 +1190,7 @@ public class GxtBorderLayoutPanel extends ContentPanel { // btn.getHtml()); // Button btn = ce.getButtonClicked(); -// Dialog form = toolbar.getDialogForm(); + // Dialog form = toolbar.getDialogForm(); if (form.getBody().isMasked()) form.getBody().unmask(); @@ -1201,10 +1208,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { @Override public void onSuccess(List result) { // TODO Auto-generated method stub - - //print check -// System.out -// .println("GxtBorderLayoutPanel--> SUCCESS RPC submitQuery"); + + // print check + // System.out + // .println("GxtBorderLayoutPanel--> SUCCESS RPC submitQuery"); rootLogger.log(Level.SEVERE, "SUCCESS RPC submitQuery"); @@ -1233,11 +1240,12 @@ public class GxtBorderLayoutPanel extends ContentPanel { result.remove(0); // variable that keeps track of the managed event -// submitQueryEventManaged = true; + // submitQueryEventManaged = true; // parse the result in order to obtain a table boolean submitQueryEventManaged = true; - parseResult(result, form, dialogID, submitQueryEventManaged); + parseResult(result, form, dialogID, + submitQueryEventManaged); } @@ -1322,10 +1330,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { public void onFailure(Throwable caught) { // Window.alert(caught.getMessage()); - - //print check -// System.out -// .println("GxtBorderLayoutPanel--> FAILURE RPC sample"); + + // print check + // System.out + // .println("GxtBorderLayoutPanel--> FAILURE RPC sample"); rootLogger.log(Level.SEVERE, "FAILURE RPC sample"); @@ -1340,10 +1348,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { @Override public void onSuccess(List result) { - - //print check -// System.out -// .println("GxtBorderLayoutPanel--> SUCCESS RPC sample"); + + // print check + // System.out + // .println("GxtBorderLayoutPanel--> SUCCESS RPC sample"); rootLogger.log(Level.SEVERE, "SUCCESS RPC sample"); @@ -1453,11 +1461,11 @@ public class GxtBorderLayoutPanel extends ContentPanel { // Window.alert(caught.getMessage()); // System.out.println("FAILURE"); - - //print check -// System.out -// .println("GxtBorderLayoutPanel--> FAILURE RPC smartSample"); - + + // print check + // System.out + // .println("GxtBorderLayoutPanel--> FAILURE RPC smartSample"); + rootLogger.log(Level.SEVERE, "FAILURE RPC smartSample"); MessageBox.alert("Error ", @@ -1472,11 +1480,11 @@ public class GxtBorderLayoutPanel extends ContentPanel { @Override public void onSuccess(List result) { - //print check - //print check -// System.out -// .println("GxtBorderLayoutPanel--> SUCCESS RPC smartSample"); - + // print check + // print check + // System.out + // .println("GxtBorderLayoutPanel--> SUCCESS RPC smartSample"); + rootLogger.log(Level.SEVERE, "SUCCESS RPC smartSample"); rootLogger.log(Level.SEVERE, "output size: " + result.size()); @@ -1585,11 +1593,11 @@ public class GxtBorderLayoutPanel extends ContentPanel { // Window.alert(caught.getMessage()); // System.out.println("FAILURE"); - - //print check -// System.out -// .println("GxtBorderLayoutPanel--> FAILURE RPC randomSample"); - + + // print check + // System.out + // .println("GxtBorderLayoutPanel--> FAILURE RPC randomSample"); + rootLogger.log(Level.SEVERE, "FAILURE RPC randomSample"); MessageBox.alert("Error ", @@ -1603,10 +1611,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { @Override public void onSuccess(List result) { - - //print check -// System.out -// .println("GxtBorderLayoutPanel--> SUCCESS RPC randomSample"); + + // print check + // System.out + // .println("GxtBorderLayoutPanel--> SUCCESS RPC randomSample"); rootLogger.log(Level.SEVERE, "SUCCESS RPC randomSample"); @@ -1640,11 +1648,12 @@ public class GxtBorderLayoutPanel extends ContentPanel { } // start the parsing of the submit result in order to obtain a table - private void parseResult(List result, Dialog dialog, final int dialogID, final boolean submitQueryEventManaged) { + private void parseResult(List result, Dialog dialog, + final int dialogID, final boolean submitQueryEventManaged) { // to unmask the entire content panel final GxtBorderLayoutPanel obj = this; - + final Dialog form = dialog; RPCservice.parseCVSString(result, listAttributes, @@ -1656,31 +1665,29 @@ public class GxtBorderLayoutPanel extends ContentPanel { // Window.alert(caught.getMessage()); // System.out.println("FAILURE StartParse"); - - //print check -// System.out -// .println("GxtBorderLayoutPanel--> FAILURE RPC parseResult"); - - rootLogger.log(Level.SEVERE, "FAILURE RPC parseResult"); + + // print check + // System.out + // .println("GxtBorderLayoutPanel--> FAILURE RPC parseResult"); + + rootLogger.log(Level.SEVERE, "FAILURE RPC parseResult"); MessageBox.alert("Error ", "
Message:" + caught.getMessage(), null); - - // if the submit query event has been performed the // dialog form is unmasked otherwise if a sampling // operation is performed the entire panel is masked. if (submitQueryEventManaged == true) { -// submitQueryEventManaged = false; + // submitQueryEventManaged = false; -// Dialog form = toolbar.getDialogForm(); -// + // Dialog form = toolbar.getDialogForm(); + // if (form.getBody().isMasked()) form.getBody().unmask(); -// form.hide(); + // form.hide(); } else { if (obj.isMasked()) { @@ -1693,37 +1700,50 @@ public class GxtBorderLayoutPanel extends ContentPanel { @Override public void onSuccess(List rows) { - - //print check -// System.out -// .println("GxtBorderLayoutPanel--> SUCCESS RPC parseResult"); + + // print check + // System.out + // .println("GxtBorderLayoutPanel--> SUCCESS RPC parseResult"); rootLogger.log(Level.SEVERE, "SUCCESS RPC parseResult"); if (rows != null) { // Display the submit query result as a table - Dialog submitResult = new Dialog(); + Dialog submitResult = new Dialog() { + // override the maximize event modifying it with + // a different behaviour if the mimimize event + // occurs + public void maximize() { + if (isCollapsed()) { + expand(); + } else { + super.maximize(); + } + } + }; submitResult.setLayout(new FitLayout()); - if (submitQueryEventManaged==true){ - submitResult.setHeading("Result Query " + dialogID); - } - else{ + + if (submitQueryEventManaged == true) { + submitResult.setHeading("Result Query " + + dialogID); + } else { submitResult.setHeading("Result"); } - + submitResult.setResizable(false); // submitResult.setHeading("Submit Query"); // submitResult.setWidth(290); // submitResult.setHeight(250); -// submitResult.setModal(true); -// submitResult.setBlinkModal(true); + // submitResult.setModal(true); + // submitResult.setBlinkModal(true); // submitResult.setBodyStyle("padding:9px;"); submitResult.setSize(600, 400); // submitResult.setScrollMode(Scroll.AUTO); submitResult.setScrollMode(Scroll.NONE); submitResult.setHideOnButtonClick(true); submitResult.setMaximizable(true); + submitResult.setMinimizable(true); // submitResult.addText("Result Table"); ListStore store = new ListStore(); @@ -1739,8 +1759,37 @@ public class GxtBorderLayoutPanel extends ContentPanel { RowData data = new RowData(.5, 1); data.setMargins(new Margins(6)); - submitResult.add(grid, data); + // mimimize event handled + submitResult.addListener(Events.Minimize, + new Listener() { + @Override + public void handleEvent(WindowEvent be) { + // TODO Auto-generated method stub + // collpse the dialog + be.getWindow().collapse(); + + } + }); + // maximize event handled + submitResult.addListener(Events.Maximize, + new Listener() { + + @Override + public void handleEvent(WindowEvent be) { + // TODO Auto-generated method stub + + // expand the dialog + if (be.getWindow().isCollapsed()) { + + be.getWindow().expand(); + + } + + } + }); + + submitResult.add(grid, data); submitResult.show(); // if the submit query event has been performed the @@ -1750,14 +1799,14 @@ public class GxtBorderLayoutPanel extends ContentPanel { if (submitQueryEventManaged == true) { // clear variable -// submitQueryEventManaged = false; + // submitQueryEventManaged = false; -// Dialog form = toolbar.getDialogForm(); -// + // Dialog form = toolbar.getDialogForm(); + // if (form.getBody().isMasked()) form.getBody().unmask(); -// -// form.hide(); + // + // form.hide(); } else { if (obj.isMasked()) { @@ -1768,13 +1817,13 @@ public class GxtBorderLayoutPanel extends ContentPanel { if (submitQueryEventManaged == true) { -// submitQueryEventManaged = false; + // submitQueryEventManaged = false; -// Dialog form = toolbar.getDialogForm(); + // Dialog form = toolbar.getDialogForm(); if (form.getBody().isMasked()) form.getBody().unmask(); -// -// form.hide(); + // + // form.hide(); } else { if (obj.isMasked()) { obj.unmask(); @@ -1822,11 +1871,11 @@ public class GxtBorderLayoutPanel extends ContentPanel { column = new ColumnConfig(); -// column.setId("index"); -// column.setHeader("Index"); -// column.setWidth(100); -// column.setSortable(false); -// configs.add(column); + // column.setId("index"); + // column.setHeader("Index"); + // column.setWidth(100); + // column.setSortable(false); + // configs.add(column); for (int i = 0; i < listAttributes.size(); i++) { @@ -2057,10 +2106,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { public void onFailure(Throwable caught) { // TODO Auto-generated method // stub - - //print check -// System.out -// .println("GxtBorderLayoutPanel--> FAILURE RPC getTableDetails"); + + // print check + // System.out + // .println("GxtBorderLayoutPanel--> FAILURE RPC getTableDetails"); rootLogger.log(Level.SEVERE, "FAILURE RPC getTableDetails"); @@ -2079,10 +2128,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { LinkedHashMap result) { // TODO Auto-generated method // stub - - //print check -// System.out -// .println("GxtBorderLayoutPanel--> SUCCESS RPC getTableDetails"); + + // print check + // System.out + // .println("GxtBorderLayoutPanel--> SUCCESS RPC getTableDetails"); rootLogger.log(Level.SEVERE, "SUCCESS RPC getTableDetails"); @@ -2111,8 +2160,9 @@ public class GxtBorderLayoutPanel extends ContentPanel { // showCreateTable // statement - Result row = new Result("Create statement", - result.get(array[i].toString()) + Result row = new Result( + "Create statement", result.get( + array[i].toString()) .getName()); TableDetails.add(row); @@ -2135,8 +2185,9 @@ public class GxtBorderLayoutPanel extends ContentPanel { // recover the // column names - Result row = new Result("Number of rows", - result.get(array[i].toString()) + Result row = new Result( + "Number of rows", result.get( + array[i].toString()) .getName()); TableDetails.add(row); 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 2cad55e..ab2bb43 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 @@ -553,6 +553,8 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements String computationId = startComputation(algorithmId, inputParameters, outputData); + +// logger.info("COMPUTATION ID: " + computationId); // print check // retrieve data diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/server/util/SessionUtil.java b/src/main/java/org/gcube/portlets/user/databasesmanager/server/util/SessionUtil.java index 864b94e..6019b24 100644 --- a/src/main/java/org/gcube/portlets/user/databasesmanager/server/util/SessionUtil.java +++ b/src/main/java/org/gcube/portlets/user/databasesmanager/server/util/SessionUtil.java @@ -32,7 +32,8 @@ public class SessionUtil { if (user == null) { - user = "loredana.liccardo"; +// user = "loredana.liccardo"; + user = "dbmanager"; httpSession.setAttribute(ScopeHelper.USERNAME_ATTRIBUTE, user); ScopeProvider.instance.set("/gcube/devsec/devVRE"); ASLSession session = SessionManager.getInstance().getASLSession(