gCubeSystem
/
species-discovery
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#19312 fixed. Updated changelog

This commit is contained in:
Francesco Mangiacrapa 2020-05-22 17:33:17 +02:00
parent 152bf4615e
commit 38ecd99ad4
7 changed files with 218 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.classpath
View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="lib" path="/home/francesco-mangiacrapa/libraries/asm-5.0.3/lib/asm-5.0.3.jar"/>
<classpathentry kind="src" output="target/species-discovery-3.10.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/species-discovery-3.10.0/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/species-discovery-3.10.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<classpathentry excluding="**" kind="src" output="target/species-discovery-3.10.0/WEB-INF/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
@ -41,5 +41,5 @@
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/species-discovery-3.10.0-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="output" path="target/species-discovery-3.10.0/WEB-INF/classes"/>
</classpath>

2
.settings/com.gwtplugins.gdt.eclipse.core.prefs
View File

@ -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

2
.settings/org.eclipse.wst.common.component
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="species-discovery-3.10.0-SNAPSHOT">
<wb-module deploy-name="species-discovery-3.10.0">
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>

138
changelog.md
View File

@ -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

7
pom.xml
View File

@ -68,6 +68,13 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-dev</artifactId>
<version>${gwtVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>

30
src/main/java/org/gcube/portlets/user/speciesdiscovery/SpeciesDiscovery.gwt.xml Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<module rename-to='speciesdiscovery'>
<inherits name='com.google.gwt.user.User' />
<inherits name='org.gcube.portlets.widgets.wsexplorer.WorkspaceExplorer' />
<inherits name='org.gcube.portlets.widgets.sessionchecker.SessionChecker' />
<!-- Other module inherits -->
<inherits name="com.extjs.gxt.ui.GXT" />
<!-- Used to show a layer via GisViewer -->
<!-- <inherits name="org.gcube.portlets.user.gcubegisviewer.GCubeGisViewer" /> -->
<inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
<set-property name="log_DivLogger" value="DISABLED" />
<!-- <inherits name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree'
/> -->
<!-- <inherits name='com.google.gwt.query.Query'/> -->
<!-- Specify the app entry point class. -->
<entry-point
class='org.gcube.portlets.user.speciesdiscovery.client.SpeciesDiscovery' />
<!-- Specify the paths for translatable code -->
<source path='client' />
<source path='shared' />
</module>

69
src/main/java/org/gcube/portlets/user/speciesdiscovery/client/SearchController.java
View File

@ -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<org.gcube.portlets.user.speciesdiscovery.shared.DataSource> 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<String>() {
//
// @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","");
}
});
}