diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/DeaAnnualPanelResult.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/DeaAnnualPanelResult.java index 9d5cd4f..3bf8eec 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/DeaAnnualPanelResult.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/DeaAnnualPanelResult.java @@ -162,7 +162,6 @@ public class DeaAnnualPanelResult extends Composite { @Override public void onClick(ClickEvent event) { - button_dea_analys_request.setEnabled(false); alert_error.clear(); cg_list_dea_input_kpi.setType(ControlGroupType.NONE); cg_list_dea_output_kpi.setType(ControlGroupType.NONE); @@ -170,14 +169,12 @@ public class DeaAnnualPanelResult extends Composite { if (list_dea_input_kpi.getItemCount() < 1) { showAlert("You must select at least one Input KPI", AlertType.ERROR, true, alert_error); cg_list_dea_input_kpi.setType(ControlGroupType.ERROR); - button_dea_analys_request.setEnabled(true); return; } if (list_dea_output_kpi.getItemCount() < 1) { showAlert("You must select at least one Output KPI", AlertType.ERROR, true, alert_error); cg_list_dea_output_kpi.setType(ControlGroupType.ERROR); - button_dea_analys_request.setEnabled(true); return; } @@ -697,8 +694,6 @@ public class DeaAnnualPanelResult extends Composite { title = title.substring(0, title.length() - 1) + "]"; } - button_dea_analys_request.setEnabled(true); - if (displayError) { Alert alert = new Alert(title); alert.setType(AlertType.ERROR); diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/DeaPanelResult.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/DeaPanelResult.java index 76a6251..99656aa 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/DeaPanelResult.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/DeaPanelResult.java @@ -164,7 +164,7 @@ public class DeaPanelResult extends Composite { @Override public void onClick(ClickEvent event) { - button_dea_analys_request.setEnabled(false); + alert_error.clear(); cg_list_dea_input_kpi.setType(ControlGroupType.NONE); cg_list_dea_output_kpi.setType(ControlGroupType.NONE); @@ -172,14 +172,12 @@ public class DeaPanelResult extends Composite { if (list_dea_input_kpi.getItemCount() < 1) { showAlert("You must select at least one Input KPI", AlertType.ERROR, true, alert_error); cg_list_dea_input_kpi.setType(ControlGroupType.ERROR); - button_dea_analys_request.setEnabled(true); return; } if (list_dea_output_kpi.getItemCount() < 1) { showAlert("You must select at least one Output KPI", AlertType.ERROR, true, alert_error); cg_list_dea_output_kpi.setType(ControlGroupType.ERROR); - button_dea_analys_request.setEnabled(true); return; } @@ -697,8 +695,6 @@ public class DeaPanelResult extends Composite { title = title.substring(0, title.length() - 1) + "]"; } - button_dea_analys_request.setEnabled(true); - if (displayError) { Alert alert = new Alert(title); alert.setType(AlertType.ERROR); diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/server/PerformFishAnalyticsServiceImpl.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/server/PerformFishAnalyticsServiceImpl.java index 6f9b76a..55b4c37 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/server/PerformFishAnalyticsServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/server/PerformFishAnalyticsServiceImpl.java @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.UUID; @@ -373,7 +372,7 @@ public class PerformFishAnalyticsServiceImpl extends RemoteServiceServlet if(response==null) throw new Exception("The response is null"); - LinkedHashMap theResponseParams = GsonUtil.toMap(response); + Map theResponseParams = GsonUtil.toMap(response); log.debug("The response was converted into map: "+theResponseParams); UUID respSessionID = UUID.randomUUID(); diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/server/util/GsonUtil.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/server/util/GsonUtil.java index 015feec..a3eeba9 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/server/util/GsonUtil.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/server/util/GsonUtil.java @@ -4,7 +4,8 @@ package org.gcube.portlets.user.performfishanalytics.server.util; import java.lang.reflect.Type; -import java.util.LinkedHashMap; +import java.util.HashMap; +import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,14 +31,14 @@ public class GsonUtil { * @param json the json * @return the map */ - public static LinkedHashMap toMap(String json){ + public static Map toMap(String json){ log.debug("Converting JSON: "+json); Gson gson = new Gson(); - Type type = new TypeToken>(){}.getType(); - LinkedHashMap myMap = gson.fromJson(json, type); + Type type = new TypeToken>(){}.getType(); + Map myMap = gson.fromJson(json, type); log.debug("Converted as map: "+myMap); //FOR GWT SERIALIZATION - LinkedHashMap theGWTMap = new LinkedHashMap(myMap.size()); + Map theGWTMap = new HashMap(myMap.size()); theGWTMap.putAll(myMap); return theGWTMap; } diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/server/util/dataminer/DataMinerOutputData.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/server/util/dataminer/DataMinerOutputData.java index baa0dea..2e93282 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/server/util/dataminer/DataMinerOutputData.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/server/util/dataminer/DataMinerOutputData.java @@ -3,7 +3,6 @@ */ package org.gcube.portlets.user.performfishanalytics.server.util.dataminer; -import java.util.LinkedHashMap; import java.util.Map; @@ -18,7 +17,7 @@ public class DataMinerOutputData { private String fileDescription; private String mimeType; private String publicURL; - private LinkedHashMap dataMinerOutputData; + private Map dataMinerOutputData; /** * Instantiates a new data miner output data. @@ -38,7 +37,7 @@ public class DataMinerOutputData { */ public DataMinerOutputData( String fileDescription, String mimeType, String publicURL, - LinkedHashMap dataMinerOutputData) { + Map dataMinerOutputData) { super(); this.fileDescription = fileDescription; @@ -132,7 +131,7 @@ public class DataMinerOutputData { * * @param dataMinerOutputData the dataMinerOutputData to set */ - public void setDataMinerOutputData(LinkedHashMap dataMinerOutputData) { + public void setDataMinerOutputData(Map dataMinerOutputData) { this.dataMinerOutputData = dataMinerOutputData; } diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/server/util/xml/WPSParserUtil.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/server/util/xml/WPSParserUtil.java index f4f4f29..4173eb2 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/server/util/xml/WPSParserUtil.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/server/util/xml/WPSParserUtil.java @@ -6,8 +6,9 @@ package org.gcube.portlets.user.performfishanalytics.server.util.xml; import java.io.BufferedInputStream; import java.io.InputStream; import java.util.ArrayList; -import java.util.LinkedHashMap; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -126,7 +127,7 @@ public class WPSParserUtil { Element mdMetadata = (Element) nodes.item(i); DataMinerOutputData dmOutput = new DataMinerOutputData(); - LinkedHashMap map = new LinkedHashMap(); + Map map = new HashMap(); String tagSearch = "d4science:Data"; NodeList nodeList = mdMetadata.getElementsByTagName(tagSearch); diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/shared/performfishservice/PerformFishResponse.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/shared/performfishservice/PerformFishResponse.java index 41cc45f..fbb9c20 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/shared/performfishservice/PerformFishResponse.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/shared/performfishservice/PerformFishResponse.java @@ -4,7 +4,6 @@ package org.gcube.portlets.user.performfishanalytics.shared.performfishservice; import java.io.Serializable; -import java.util.LinkedHashMap; import java.util.Map; @@ -21,7 +20,7 @@ public class PerformFishResponse implements Serializable{ */ private static final long serialVersionUID = 6064068032560730872L; - private LinkedHashMap mapParameters; + private Map mapParameters; private String respSessionId; @@ -38,7 +37,7 @@ public class PerformFishResponse implements Serializable{ * @param respSessionId the resp session id */ public PerformFishResponse( - LinkedHashMap mapParameters, String respSessionId) { + Map mapParameters, String respSessionId) { super(); this.mapParameters = mapParameters; @@ -73,7 +72,7 @@ public class PerformFishResponse implements Serializable{ * * @param mapParameters the mapParameters to set */ - public void setMapParameters(LinkedHashMap mapParameters) { + public void setMapParameters(Map mapParameters) { this.mapParameters = mapParameters; }