code cleaned up removing commented lines

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/databases-manager-portlet@98788 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Loredana Liccardo 2014-07-18 13:02:12 +00:00
parent 7e0d33d48c
commit 18e842f39b
25 changed files with 88 additions and 215 deletions

View File

@ -1,8 +1,5 @@
package org.gcube.portlets.user.databasesmanager.client;
//import org.gcube.portlets.user.dbmanager.client.panels.GxtBorderLayoutPanel;
//import org.gcube.portlets.user.dbmanager.client.utils.ConstantsPortlet;
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.logical.shared.ResizeEvent;
@ -16,14 +13,14 @@ import org.gcube.portlets.user.databasesmanager.client.panels.GxtBorderLayoutPan
import org.gcube.portlets.user.databasesmanager.client.resources.Resources;
import org.gcube.portlets.user.databasesmanager.client.utils.ConstantsPortlet;
/**
* Entry point classes define <code>onModuleLoad()</code>.
*/
public class DatabasesManager implements EntryPoint {
private GxtBorderLayoutPanel borderLayout;
public static Resources resources = GWT.create(Resources.class);
/**
* This is the entry point method.
*/
@ -44,11 +41,10 @@ public class DatabasesManager implements EntryPoint {
try {
borderLayout = new GxtBorderLayoutPanel(eventBus, service);
RootPanel.get(ConstantsPortlet.CONTENTDIV).add(borderLayout);
Window.addResizeHandler(new ResizeHandler() {
// @Override
// @Override
public void onResize(ResizeEvent event) {
System.out.println("onWindowResized width: "
+ event.getWidth() + " height: "
@ -60,11 +56,9 @@ public class DatabasesManager implements EntryPoint {
updateSize();
} catch (Exception e) {
e.printStackTrace();
e.printStackTrace();
}
}
/**
@ -104,5 +98,5 @@ public class DatabasesManager implements EntryPoint {
borderLayout.setWidth(rootWidth);
}
}

View File

@ -6,12 +6,7 @@ import java.util.List;
import org.gcube.portlets.user.databasesmanager.client.datamodel.FileModel;
import org.gcube.portlets.user.databasesmanager.client.datamodel.Result;
import org.gcube.portlets.user.databasesmanager.client.datamodel.Row;
import com.extjs.gxt.ui.client.data.PagingLoadConfig;
//import org.gcube.portlets.user.dbmanager.client.datamodel.FileModel;
//import org.gcube.portlets.user.dbmanager.client.datamodel.Result;
//import org.gcube.portlets.user.dbmanager.client.datamodel.Row;
import com.extjs.gxt.ui.client.data.PagingLoadConfig;
import com.extjs.gxt.ui.client.data.PagingLoadResult;
import com.google.gwt.user.client.rpc.RemoteService;
import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
@ -22,8 +17,6 @@ public interface GWTdbManagerService extends RemoteService {
List<FileModel> getResource() throws Exception;
LinkedHashMap<String, FileModel> getDBInfo(String resourceName)
throws Exception;
@ -33,21 +26,24 @@ public interface GWTdbManagerService extends RemoteService {
List<Result> submitQuery(LinkedHashMap<String, String> dataDB,
String query, boolean valueReadOnlyQuery,
boolean smartCorrectionQuery, String language) throws Exception;
List<Result> sample(LinkedHashMap<String, String> dataInput) throws Exception;
List<Result> smartSample(LinkedHashMap<String, String> dataInput) throws Exception;
List<Result> randomSample(LinkedHashMap<String, String> dataInput) throws Exception;
List<Result> sample(LinkedHashMap<String, String> dataInput)
throws Exception;
List<Result> smartSample(LinkedHashMap<String, String> dataInput)
throws Exception;
List<Result> randomSample(LinkedHashMap<String, String> dataInput)
throws Exception;
List<Row> parseCVSString(List<Result> result, List<String> attrNames)
throws Exception;
LinkedHashMap<String, FileModel> getTableDetails(LinkedHashMap<String, String> dataInput) throws Exception;
PagingLoadResult<Result> LoadTables(PagingLoadConfig config, LinkedHashMap<String, String> dataInput, boolean SearchTable, String keyword) throws Exception;
// PagingLoadResult<Result> SearchTable(PagingLoadConfig config, LinkedHashMap<String, String> dataInput, String keyword) throws Exception;
LinkedHashMap<String, FileModel> getTableDetails(
LinkedHashMap<String, String> dataInput) throws Exception;
PagingLoadResult<Result> LoadTables(PagingLoadConfig config,
LinkedHashMap<String, String> dataInput, boolean SearchTable,
String keyword) throws Exception;
}

View File

@ -6,11 +6,7 @@ import java.util.List;
import org.gcube.portlets.user.databasesmanager.client.datamodel.FileModel;
import org.gcube.portlets.user.databasesmanager.client.datamodel.Result;
import org.gcube.portlets.user.databasesmanager.client.datamodel.Row;
import com.extjs.gxt.ui.client.data.PagingLoadConfig;
//import org.gcube.portlets.user.dbmanager.client.datamodel.FileModel;
//import org.gcube.portlets.user.dbmanager.client.datamodel.Result;
//import org.gcube.portlets.user.dbmanager.client.datamodel.Row;
import com.extjs.gxt.ui.client.data.PagingLoadConfig;
import com.extjs.gxt.ui.client.data.PagingLoadResult;
import com.google.gwt.user.client.rpc.AsyncCallback;
@ -22,11 +18,6 @@ public interface GWTdbManagerServiceAsync {
void getDBInfo(String resourceName,
AsyncCallback<LinkedHashMap<String, FileModel>> asyncCallback);
// void getTables(LinkedHashMap<String, String> dataInput,
// AsyncCallback<List<FileModel>> callback);
void getDBSchema(LinkedHashMap<String, String> dataInput,
AsyncCallback<List<FileModel>> callback);
@ -49,10 +40,8 @@ public interface GWTdbManagerServiceAsync {
void randomSample(LinkedHashMap<String, String> dataInput,
AsyncCallback<List<Result>> callback);
void LoadTables(PagingLoadConfig config, LinkedHashMap<String, String> dataInput, boolean SearchTable, String keyword,
AsyncCallback<PagingLoadResult<Result>> callback);
// void SearchTable(PagingLoadConfig config, LinkedHashMap<String, String> dataInput, String keyword,
// AsyncCallback<PagingLoadResult<Result>> callback);
void LoadTables(PagingLoadConfig config,
LinkedHashMap<String, String> dataInput, boolean SearchTable,
String keyword, AsyncCallback<PagingLoadResult<Result>> callback);
}

View File

@ -5,7 +5,8 @@ import java.util.List;
import com.extjs.gxt.ui.client.data.BaseModelData;
//class that represents an item that will be displayed in the tree. The item can be a resource, a database, a schema and a table.
//class that represents an item that will be displayed in the tree.
//The item can be a resource, a database, a schema and a table.
public class FileModel extends BaseModelData implements Serializable {
private static final long serialVersionUID = 1L;
@ -17,20 +18,23 @@ public class FileModel extends BaseModelData implements Serializable {
// set to true value if the object has been managed calling rpc remote
// methods
private boolean isLoaded = false;
// set if the object is a table
private boolean isTable = false;
// set if the object is a schema
private boolean isSchema = false;
// set if the object is a database
private boolean isDatabase = false;
// to keep track information about the database
private List<Result> DBInfo = null;
// set if database information are displayed
private boolean isDBInfoDisplayed = false;
// to keep track information about the details of a table
private List<Result> TableDetails = null;
// set if table information are displayed
private boolean isTableDetailsDisplayed = false;
// to keep track of the database type
private String DatabaseType=null;
private String DatabaseType = null;
private String ResourceName = null;
private String DatabaseName = null;

View File

@ -4,9 +4,6 @@ import java.io.Serializable;
public class Parameter implements Serializable {
/**
*
*/
private static final long serialVersionUID = 1L;
private String value;
private String name;
@ -16,7 +13,7 @@ public class Parameter implements Serializable {
public Parameter(String paramName, String paramDescription,
String objectType, String defaultValue) {
this.setName(paramName);
this.setParamDescription(paramDescription);
this.setObjectType(objectType);
@ -28,12 +25,10 @@ public class Parameter implements Serializable {
// TODO Auto-generated constructor stub
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
@ -53,24 +48,24 @@ public class Parameter implements Serializable {
public void setParamDescription(String paramDescription) {
this.paramDescription = paramDescription;
}
public void setObjectType(String objectType){
public void setObjectType(String objectType) {
this.objectType = objectType;
}
public String getObjectType(){
public String getObjectType() {
return objectType;
}
public void setDefaultValue(String defaultValue){
public void setDefaultValue(String defaultValue) {
this.defaultValue = defaultValue;
}
public String getDefaultValue(){
public String getDefaultValue() {
return defaultValue;
}

View File

@ -1,6 +1,5 @@
package org.gcube.portlets.user.databasesmanager.client.datamodel;
import java.io.Serializable;
import com.extjs.gxt.ui.client.data.BaseModelData;
@ -9,8 +8,8 @@ public class Result extends BaseModelData implements Serializable {
private static final long serialVersionUID = 1L;
// private String index;
// private String value;
// private String index;
// private String value;
public Result() {
}

View File

@ -2,8 +2,7 @@ package org.gcube.portlets.user.databasesmanager.client.datamodel;
import java.io.Serializable;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
//import java.util.logging.Logger;
import com.extjs.gxt.ui.client.data.BaseModelData;
@ -11,56 +10,27 @@ public class Row extends BaseModelData implements Serializable {
private static final long serialVersionUID = 1L;
private static int ID = 0;
// private static int ID = 0;
private static Logger rootLogger = Logger.getLogger("Row");
// String row;
// List<String> tokens;
// public Row(String [] attributes){
//
// for (int i=0; i<attributes.length;i++){
//
// set("\""+attributes[i]+"\"", attributes[i]);
//
// }
//
// }
// private static Logger rootLogger = Logger.getLogger("Row");
public Row() {
}
// public Row(List<String> attributes) {
//
// for(int i=0;i<attributes.size();i++){
//
// set("\""+attributes.get(i)+"\"", attributes.get(i));
//
// // set("value", attributes.get(i));
//
// }
//
// }
public Row(List<String> attributes, List<String> values, int index) {
// set("index", ID++);
set("index", index);
// System.out.println("setting Row value");
for (int i = 0; i < attributes.size(); i++) {
set(attributes.get(i), values.get(i));
// print check
// System.out.println("attribute: " + attributes.get(i) + " value: "
// + values.get(i));
//print check
// print check
// rootLogger.log(Level.INFO, "Row-> attribute: "
// +attributes.get(i)+ "value: " + values.get(i));

View File

@ -2,22 +2,15 @@ package org.gcube.portlets.user.databasesmanager.client.datamodel;
import java.util.ArrayList;
import java.util.List;
import org.gcube.portlets.user.databasesmanager.client.utils.ConstantsPortlet;
import com.extjs.gxt.ui.client.data.BaseModelData;
public class SQLDialect extends BaseModelData {
/**
*
*/
private static final long serialVersionUID = 1L;
// private String name;
// private String name;
public SQLDialect() {
}
@ -34,49 +27,21 @@ public class SQLDialect extends BaseModelData {
return get("name");
}
public static List<SQLDialect> loadData(){
List<SQLDialect> dialects = new ArrayList<SQLDialect>();
SQLDialect element1 = new SQLDialect(ConstantsPortlet.NONE);
SQLDialect element2 = new SQLDialect(ConstantsPortlet.POSTGRES);
SQLDialect element3 = new SQLDialect(ConstantsPortlet.MYSQL);
public static List<SQLDialect> loadData() {
dialects.add(element1);
dialects.add(element2);
dialects.add(element3);
return dialects;
}
List<SQLDialect> dialects = new ArrayList<SQLDialect>();
SQLDialect element1 = new SQLDialect(ConstantsPortlet.NONE);
SQLDialect element2 = new SQLDialect(ConstantsPortlet.POSTGRES);
SQLDialect element3 = new SQLDialect(ConstantsPortlet.MYSQL);
dialects.add(element1);
dialects.add(element2);
dialects.add(element3);
return dialects;
}
}
//public class SQLDialect {
//
// public SQLDialect() {
//
// }
//
//
// public static List<Data> loadData(){
//
// List<Data> dialects = new ArrayList<Data>();
//
// Data element1 = new Data(ConstantsPortlet.NONE);
// Data element2 = new Data(ConstantsPortlet.POSTGRES);
// Data element3 = new Data(ConstantsPortlet.MYSQL);
//
// dialects.add(element1);
// dialects.add(element2);
// dialects.add(element3);
//
// return dialects;
//
// }
//
//}

View File

@ -5,6 +5,7 @@ public class SubmitQueryData {
private String query;
private boolean readOnlyQuery;
private boolean smartCorrection;
//the dialect information
private String language;
public SubmitQueryData(){

View File

@ -1,21 +1,18 @@
package org.gcube.portlets.user.databasesmanager.client.events;
import org.gcube.portlets.user.databasesmanager.client.events.interfaces.LoadTablesEventHandler;
import org.gcube.portlets.user.databasesmanager.client.events.interfaces.RandomSamplingEventHandler;
import com.google.gwt.event.shared.GwtEvent;
import com.google.gwt.event.shared.GwtEvent.Type;
public class LoadTablesEvent extends GwtEvent<LoadTablesEventHandler>{
public class LoadTablesEvent extends GwtEvent<LoadTablesEventHandler> {
public static Type<LoadTablesEventHandler> TYPE = new Type<LoadTablesEventHandler>();
@Override
protected void dispatch(LoadTablesEventHandler handler) {
// TODO Auto-generated method stub
handler.onLoadTables(this);
}
@Override
@ -23,7 +20,7 @@ public class LoadTablesEvent extends GwtEvent<LoadTablesEventHandler>{
// TODO Auto-generated method stub
return TYPE;
}
public EventsTypeEnum getKey() {
// TODO Auto-generated method stub

View File

@ -1,21 +1,18 @@
package org.gcube.portlets.user.databasesmanager.client.events;
import org.gcube.portlets.user.databasesmanager.client.events.interfaces.RandomSamplingEventHandler;
import com.google.gwt.event.shared.GwtEvent;
public class RandomSamplingEvent extends GwtEvent<RandomSamplingEventHandler> {
public class RandomSamplingEvent extends GwtEvent<RandomSamplingEventHandler>{
public static Type<RandomSamplingEventHandler> TYPE = new Type<RandomSamplingEventHandler>();
@Override
protected void dispatch(RandomSamplingEventHandler handler) {
// TODO Auto-generated method stub
handler.onRandomSampling(this);
}
@Override
@ -23,7 +20,7 @@ public class RandomSamplingEvent extends GwtEvent<RandomSamplingEventHandler>{
// TODO Auto-generated method stub
return TYPE;
}
public EventsTypeEnum getKey() {
// TODO Auto-generated method stub

View File

@ -1,7 +1,6 @@
package org.gcube.portlets.user.databasesmanager.client.events;
import org.gcube.portlets.user.databasesmanager.client.events.interfaces.SamplingEventHandler;
import com.google.gwt.event.shared.GwtEvent;
public class SamplingEvent extends GwtEvent<SamplingEventHandler> {
@ -29,4 +28,3 @@ public class SamplingEvent extends GwtEvent<SamplingEventHandler> {
}
}

View File

@ -1,14 +1,9 @@
package org.gcube.portlets.user.databasesmanager.client.events;
//import org.gcube.portlets.user.dbmanager.client.events.interfaces.SelectedItemEventHandler;
import org.gcube.portlets.user.databasesmanager.client.events.interfaces.SelectedItemEventHandler;
import com.google.gwt.event.shared.GwtEvent;
//"SelectedItemEvent" event definition
public class SelectedItemEvent extends GwtEvent<SelectedItemEventHandler> {
public class SelectedItemEvent extends GwtEvent<SelectedItemEventHandler> {
public static Type<SelectedItemEventHandler> TYPE = new Type<SelectedItemEventHandler>();

View File

@ -1,12 +1,10 @@
package org.gcube.portlets.user.databasesmanager.client.events;
import org.gcube.portlets.user.databasesmanager.client.events.interfaces.SelectedTableEventHandler;
import com.google.gwt.event.shared.GwtEvent;
public class SelectedTableEvent extends GwtEvent<SelectedTableEventHandler> {
public static Type<SelectedTableEventHandler> TYPE = new Type<SelectedTableEventHandler>();
@Override
@ -30,5 +28,3 @@ public class SelectedTableEvent extends GwtEvent<SelectedTableEventHandler> {
}
}

View File

@ -1,7 +1,6 @@
package org.gcube.portlets.user.databasesmanager.client.events;
import org.gcube.portlets.user.databasesmanager.client.events.interfaces.ShowCreateTableEventHandler;
import com.google.gwt.event.shared.GwtEvent;
public class ShowCreateTableEvent extends GwtEvent<ShowCreateTableEventHandler> {

View File

@ -1,7 +1,6 @@
package org.gcube.portlets.user.databasesmanager.client.events;
import org.gcube.portlets.user.databasesmanager.client.events.interfaces.SmartSamplingEventHandler;
import com.google.gwt.event.shared.GwtEvent;
public class SmartSamplingEvent extends GwtEvent<SmartSamplingEventHandler> {

View File

@ -1,14 +1,8 @@
package org.gcube.portlets.user.databasesmanager.client.events;
//import org.gcube.portlets.user.dbmanager.client.events.interfaces.SubmitQueryEventHandler;
import org.gcube.portlets.user.databasesmanager.client.events.interfaces.SubmitQueryEventHandler;
import com.google.gwt.event.shared.GwtEvent;
//"SubmitQueryEvent" event definition
public class SubmitQueryEvent extends GwtEvent<SubmitQueryEventHandler> {
public static Type<SubmitQueryEventHandler> TYPE = new Type<SubmitQueryEventHandler>();

View File

@ -1,9 +1,8 @@
package org.gcube.portlets.user.databasesmanager.client.events.interfaces;
import org.gcube.portlets.user.databasesmanager.client.events.LoadTablesEvent;
import com.google.gwt.event.shared.EventHandler;
public interface LoadTablesEventHandler extends EventHandler{
public interface LoadTablesEventHandler extends EventHandler {
public void onLoadTables(LoadTablesEvent loadTablesEvent);
}

View File

@ -3,8 +3,8 @@ package org.gcube.portlets.user.databasesmanager.client.events.interfaces;
import org.gcube.portlets.user.databasesmanager.client.events.RandomSamplingEvent;
import com.google.gwt.event.shared.EventHandler;
public interface RandomSamplingEventHandler extends EventHandler{
public interface RandomSamplingEventHandler extends EventHandler {
public void onRandomSampling(RandomSamplingEvent randomSamplingEvent);
}

View File

@ -1,8 +1,6 @@
package org.gcube.portlets.user.databasesmanager.client.events.interfaces;
import org.gcube.portlets.user.databasesmanager.client.events.SamplingEvent;
import com.google.gwt.event.shared.EventHandler;
public interface SamplingEventHandler extends EventHandler {

View File

@ -1,12 +1,8 @@
package org.gcube.portlets.user.databasesmanager.client.events.interfaces;
import org.gcube.portlets.user.databasesmanager.client.events.SelectedItemEvent;
import com.google.gwt.event.shared.EventHandler;
// Handler for "SelectedItemEvent" event
public interface SelectedItemEventHandler extends EventHandler {
public void onSelectedItem(SelectedItemEvent selectedItemEvent);

View File

@ -1,11 +1,10 @@
package org.gcube.portlets.user.databasesmanager.client.events.interfaces;
import org.gcube.portlets.user.databasesmanager.client.events.SelectedTableEvent;
import com.google.gwt.event.shared.EventHandler;
public interface SelectedTableEventHandler extends EventHandler{
public interface SelectedTableEventHandler extends EventHandler {
public void onSelectedTable(SelectedTableEvent selectedTableEvent);
}

View File

@ -1,11 +1,9 @@
package org.gcube.portlets.user.databasesmanager.client.events.interfaces;
import org.gcube.portlets.user.databasesmanager.client.events.ShowCreateTableEvent;
import com.google.gwt.event.shared.EventHandler;
public interface ShowCreateTableEventHandler extends EventHandler{
public interface ShowCreateTableEventHandler extends EventHandler {
public void onShowCreateTable(ShowCreateTableEvent showCreateTableEvent);
}

View File

@ -1,12 +1,10 @@
package org.gcube.portlets.user.databasesmanager.client.events.interfaces;
import org.gcube.portlets.user.databasesmanager.client.events.ShowCreateTableEvent;
import org.gcube.portlets.user.databasesmanager.client.events.SmartSamplingEvent;
import com.google.gwt.event.shared.EventHandler;
public interface SmartSamplingEventHandler extends EventHandler{
public interface SmartSamplingEventHandler extends EventHandler {
public void onSmartSampling(SmartSamplingEvent smartSamplingEvent);
}

View File

@ -1,9 +1,6 @@
package org.gcube.portlets.user.databasesmanager.client.events.interfaces;
import org.gcube.portlets.user.databasesmanager.client.events.SubmitQueryEvent;
import com.google.gwt.event.shared.EventHandler;
//Handler for "SubmitQueryEvent" event