From 38ecd99ad45897c23fa9d94d9c26e86cc1fd7328 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Fri, 22 May 2020 17:33:17 +0200 Subject: [PATCH] #19312 fixed. Updated changelog --- .classpath | 6 +- .../com.gwtplugins.gdt.eclipse.core.prefs | 2 +- .settings/org.eclipse.wst.common.component | 2 +- changelog.md | 138 +++++++++++++++++- pom.xml | 7 + .../speciesdiscovery/SpeciesDiscovery.gwt.xml | 30 ++++ .../client/SearchController.java | 69 +++++---- 7 files changed, 218 insertions(+), 36 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/speciesdiscovery/SpeciesDiscovery.gwt.xml diff --git a/.classpath b/.classpath index 5888f90..e7f33f3 100644 --- a/.classpath +++ b/.classpath @@ -1,13 +1,13 @@ - + - + @@ -41,5 +41,5 @@ - + diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs index b981956..680c947 100644 --- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs +++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs @@ -1,4 +1,4 @@ eclipse.preferences.version=1 -lastWarOutDir=/home/francesco/git/species-discovery/target/species-discovery-3.10.0-SNAPSHOT +lastWarOutDir=/home/francesco/git/species-discovery/target/species-discovery-3.10.0 warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 0d14683..e80dfae 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,5 @@ - + diff --git a/changelog.md b/changelog.md index 05a21d1..e9ec1d7 100644 --- a/changelog.md +++ b/changelog.md @@ -3,10 +3,142 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [3-10-0] - 2020-05-15 +## [v3-10-0] [r4-23-0] - 2020-05-22 -### Added +[#19221] Ported to git/jenkins -[#19221] Migrated to git/jenkins +**Fixes** + +[#19312] the WorkspaceExplorer window appears behind the Job Window (z-index issue) + + + +## [3-9-1] - [20-03-2017] + +[Bug #7568] Managed ASL session expiration during polling on SPD jobs + + + +## [3-9-0] - [11-01-2016] + +[Feature #6313] SPD portlet upgrade: porting to spd-client-library 4.0.0 + +[Task #7001] Create Gis Layer via job + + + +## [3-8-1] - [15-09-2016] + +Removed Gis -viewer dependency + + + +## [3-8-0] - [15-05-2015] + +Upgraded to gwt 2.6.1 + +Integrated with Workspace Explorer + +Updated to Liferay 6.2 + + + +## [3-7-2] - [15-05-2015] + +Changed dateformat at dd-MM-yyyy + + + +## [3-7-1] - [09-12-2014] + +Removed openlayers dependency from pom + + + +## [3-7-0] - [04-06-2014] + +Updated pom to support new portal configuration (gcube release 3.2) + + + +## [3-6-0] - [23-04-2014] + +Portlet updated to support service updating + + + +## [3-5-0] - [24-10-2013] + +Portlet updated to support GWT 2.5.1 + +Ticket 2224: was implemented + + + +## [3-4-0] - [06-09-2013] + +Enhancements on GUI of SPD portlet was realized (view last query, new expand button are available) + +The functionalities was updated in order to fit the changes in the service client. New advanced options are now available: "Expand with synonyms", "Unfold the taxa group by". + + + +## [3-3-0] - [09-07-2013] + +Bug Fixed: on species classification + + + +## [3-2-0] - [29-05-2013] + +Bug Fixed: #612 (SPD: Error when saving csv file in workspace) + + + +## [3-1-0] - [14-04-2013] + +Synch with SPD service changes + + + +## [3-0-0] - [05-03-2013] + +Ticket #1260: This component has been mavenized + + + +## [2-3-0] - [17-01-2013] + +Ticket #986: Species Occurrence jobs / Re-submit job and "info" + +Ticket #1002: SPD portlet persistence refactoring + + + +## [2-2-0] - [30-11-2012] + +Ticket #508: Implementation of requirements resulting from ticket #508 + + + +## [2-0-0] - [13-09-2012] + +Ticket #81: Implementation of requirements resulting from user feedback + +Dynamic clustering of result set items + +Revised the occurrence points visualization strategy through the GIS Viewer + + + +## [1-0-1] - [23-07-2012] + +Fixed 447: Map generation fails in Species Discovery Portlet + + + +## [1-0-0] - [04-05-2012] + +First release diff --git a/pom.xml b/pom.xml index 340bbf1..1996104 100644 --- a/pom.xml +++ b/pom.xml @@ -68,6 +68,13 @@ provided + + com.google.gwt + gwt-dev + ${gwtVersion} + provided + + com.google.gwt gwt-servlet diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/SpeciesDiscovery.gwt.xml b/src/main/java/org/gcube/portlets/user/speciesdiscovery/SpeciesDiscovery.gwt.xml new file mode 100644 index 0000000..221c5e8 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/SpeciesDiscovery.gwt.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/SearchController.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/SearchController.java index da76038..95609e2 100644 --- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/SearchController.java +++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/SearchController.java @@ -963,7 +963,6 @@ public class SearchController { } final WorkspaceExplorerSaveDialog navigator = new WorkspaceExplorerSaveDialog("Save "+fileFormat.toString()+" As... ", fileName, false); - WorskpaceExplorerSaveNotificationListener listener = new WorskpaceExplorerSaveNotificationListener(){ @Override @@ -998,10 +997,25 @@ public class SearchController { GWT.log("onFailed"); } }; - + + int topZIndex = getTopZIndex(); + if(topZIndex>-1) + navigator.setZIndex(topZIndex); + navigator.addWorkspaceExplorerSaveNotificationListener(listener); navigator.show(); } + + private int getTopZIndex() { + int topZIndex = -1; + try { + //5 is an offset to be sure that + //it will be the highest z-index + topZIndex = XDOM.getTopZIndex()+ 5; + }catch (Exception e) { + } + return topZIndex; + } public void saveTaxonomyJobError(final JobTaxonomyModel jobTaxonomyModel, final String scientificName, final List listDataSources, final String rank) { @@ -1075,6 +1089,10 @@ public class SearchController { } }; + int topZIndex = getTopZIndex(); + if(topZIndex>-1) + navigator.setZIndex(topZIndex); + navigator.addWorkspaceExplorerSaveNotificationListener(listener); navigator.show(); } @@ -1129,7 +1147,11 @@ public class SearchController { GWT.log("onFailed"); } }; - + + int topZIndex = getTopZIndex(); + if(topZIndex>-1) + navigator.setZIndex(topZIndex); + navigator.addWorkspaceExplorerSaveNotificationListener(listener); navigator.show(); } @@ -1212,6 +1234,10 @@ public class SearchController { } }; + int topZIndex = getTopZIndex(); + if(topZIndex>-1) + navigator.setZIndex(topZIndex); + navigator.addWorkspaceExplorerSaveNotificationListener(listener); navigator.show(); } @@ -1262,8 +1288,11 @@ public class SearchController { } }; + int topZIndex = getTopZIndex(); + if(topZIndex>-1) + navigator.setZIndex(topZIndex); + navigator.addWorkspaceExplorerSaveNotificationListener(listener); - navigator.setZIndex(XDOM.getTopZIndex()+1000); navigator.show(); } @@ -1338,6 +1367,10 @@ public class SearchController { } }; + int topZIndex = getTopZIndex(); + if(topZIndex>-1) + navigator.setZIndex(topZIndex); + navigator.addWorkspaceExplorerSaveNotificationListener(listener); navigator.show(); } @@ -1442,33 +1475,14 @@ public class SearchController { } }; + int topZIndex = getTopZIndex(); + if(topZIndex>-1) + navigator.setZIndex(topZIndex); + navigator.addWorkspaceExplorerSaveNotificationListener(listener); navigator.show(); } - //MOVED -// public void showOccurrencesMap() -// { -// final MessageBox progress = MessageBox.wait("Generating map", "Calculating occurrence points", "generating..."); -// -// SpeciesDiscovery.taxonomySearchService.generateMapFromSelectedOccurrencePoints(new AsyncCallback() { -// -// @Override -// public void onFailure(Throwable caught) { -// progress.close(); -// Info.display("Error generating the map", "An error occurred generating the map, retry"); -// Log.error("Error on loading", "An error occurred on edit listner, retry." +caught.getMessage()); -// -// } -// -// @Override -// public void onSuccess(String layerName) { -// progress.close(); -// showMap(layerName); -// } -// }); -// } - public void showMap(final String layerName){ Log.trace("Obtaining public link for layer : "+layerName); @@ -1497,7 +1511,6 @@ public class SearchController { @Override public void onSuccess(String result) { form.setTextMessage(result, true); - //com.google.gwt.user.client.Window.open(result,"Occurrence Map",""); } }); }