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

Updated labels 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/speciesdiscovery@117170 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2015-07-10 13:32:44 +00:00
parent 2bddf45b44
commit 3348362cab
2 changed files with 17 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pom.xml
View File

@ -73,7 +73,7 @@
<dependency>
<groupId>com.sencha.gxt</groupId>
<artifactId>gxt2.2.5-gwt2.X</artifactId>
<version>2.7.0</version>
<version>${gwtVersion}</version>
<scope>compile</scope>
</dependency>
@ -166,6 +166,10 @@
<artifactId>servlet-api</artifactId>
<groupId>javax.servlet</groupId>
</exclusion>
<exclusion>
<artifactId>gxt</artifactId>
<groupId>com.sencha.gxt</groupId>
</exclusion>
</exclusions>
</dependency>
@ -174,6 +178,12 @@
<artifactId>gcube-gis-viewer</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>gxt</artifactId>
<groupId>com.sencha.gxt</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- <dependency> -->

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

@ -930,7 +930,7 @@ public class SearchController {
case DARWIN_CORE: fileName += ".xml"; break;
}
final WorkspaceExplorerSaveDialog navigator = new WorkspaceExplorerSaveDialog("Select where to save the Occurrence points", fileName, true);
final WorkspaceExplorerSaveDialog navigator = new WorkspaceExplorerSaveDialog("Select where to save "+fileFormat.toString()+" Occurrence points", fileName, true);
WorskpaceExplorerSaveNotificationListener listener = new WorskpaceExplorerSaveNotificationListener(){
@ -969,49 +969,6 @@ public class SearchController {
navigator.addWorkspaceExplorerSaveNotificationListener(listener);
navigator.show();
/*
WorkspaceLightTreeSavePopup popup = new WorkspaceLightTreeSavePopup("Select where to save the Occurrence points", true, fileName);
popup.setModal(false);
popup.setSelectableTypes(ItemType.FOLDER, ItemType.ROOT);
popup.center();
popup.addPopupHandler(new PopupHandler() {
public void onPopup(PopupEvent event) {
if (!event.isCanceled()){
org.gcube.portlets.widgets.lighttree.client.Item destinationFolder = event.getSelectedItem();
final String name = event.getName();
Info.display("Saving in progress", "...");
SpeciesDiscovery.taxonomySearchService.saveSelectedOccurrencePoints(destinationFolder.getId(), name, fileFormat, typeCSV, new AsyncCallback<Void>() {
@Override
public void onSuccess(Void result) {
Info.display("File saved", "The "+name+" file has been saved in the workspace.");
}
@Override
public void onFailure(Throwable caught) {
Info.display("Error saving the file", "An error occurred saving the file, retry.");
Log.error("Error saving the file", "An error occurred saving the file, retry." +caught.getMessage());
}
});
}
}
});
popup.addDataLoadHandler(new DataLoadHandler() {
@Override
public void onDataLoad(DataLoadEvent event) {
if (event.isFailed())GWT.log("Workspace loading failure", event.getCaught());
}
});
popup.getElement().getStyle().setZIndex(10001);
popup.show();
*/
}
@ -1044,7 +1001,7 @@ public class SearchController {
private void saveTaxonomyJobErrorFile() {
final WorkspaceExplorerSaveDialog navigator = new WorkspaceExplorerSaveDialog("Select where to save the file with Job error", fileName, true);
final WorkspaceExplorerSaveDialog navigator = new WorkspaceExplorerSaveDialog("Select where to save the file with Job Error/s", fileName, true);
WorskpaceExplorerSaveNotificationListener listener = new WorskpaceExplorerSaveNotificationListener(){
@ -1088,53 +1045,6 @@ public class SearchController {
navigator.addWorkspaceExplorerSaveNotificationListener(listener);
navigator.show();
/*
WorkspaceLightTreeSavePopup popup = new WorkspaceLightTreeSavePopup("Select where to save the file with Job error", true, fileName);
popup.setModal(false);
popup.setSelectableTypes(ItemType.FOLDER, ItemType.ROOT);
popup.center();
popup.addPopupHandler(new PopupHandler() {
public void onPopup(PopupEvent event) {
if (!event.isCanceled()){
org.gcube.portlets.widgets.lighttree.client.Item destinationFolder = event.getSelectedItem();
final String name = event.getName();
Info.display("Saving in progress", "...");
SpeciesDiscovery.taxonomySearchService.saveTaxonomyJobError(jobTaxonomyModel.getIdentifier(), destinationFolder.getId(), name, scientificName, dataSourceName, new AsyncCallback<Boolean>() {
@Override
public void onSuccess(Boolean result) {
if(result){
Info.display("File saved", "The "+name+" file has been saved in the workspace.");
changeStatusJob(SearchResultType.TAXONOMY_ITEM, jobTaxonomyModel.getIdentifier(), DownloadState.SAVED);
}
}
@Override
public void onFailure(Throwable caught) {
Info.display("Error saving the file", "An error occurred saving the file, retry.");
Log.error("Error saving the file", "An error occurred saving the file, retry." +caught.getMessage());
}
});
}
}
});
popup.addDataLoadHandler(new DataLoadHandler() {
@Override
public void onDataLoad(DataLoadEvent event) {
if (event.isFailed())GWT.log("Workspace loading failure", event.getCaught());
}
});
popup.show();
*/
}
});
}
@ -1146,7 +1056,7 @@ public class SearchController {
String fileName = jobTaxonomyModel.getName() +" from "+dataSourceName+" - DWCA.zip";
final WorkspaceExplorerSaveDialog navigator = new WorkspaceExplorerSaveDialog("Select where to save the Job", fileName, true);
final WorkspaceExplorerSaveDialog navigator = new WorkspaceExplorerSaveDialog("Select where to save DWCA", fileName, true);
WorskpaceExplorerSaveNotificationListener listener = new WorskpaceExplorerSaveNotificationListener(){
@ -1190,54 +1100,6 @@ public class SearchController {
navigator.addWorkspaceExplorerSaveNotificationListener(listener);
navigator.show();
/*
WorkspaceLightTreeSavePopup popup = new WorkspaceLightTreeSavePopup("Select where to save the Job", true, fileName);
popup.setModal(false);
popup.setSelectableTypes(ItemType.FOLDER, ItemType.ROOT);
popup.center();
popup.addPopupHandler(new PopupHandler() {
public void onPopup(PopupEvent event) {
if (!event.isCanceled()){
org.gcube.portlets.widgets.lighttree.client.Item destinationFolder = event.getSelectedItem();
final String name = event.getName();
Info.display("Saving in progress", "...");
SpeciesDiscovery.taxonomySearchService.saveTaxonomyJob(jobTaxonomyModel.getIdentifier(), destinationFolder.getId(), name, scientificName, dataSourceName, new AsyncCallback<Boolean>() {
@Override
public void onSuccess(Boolean result) {
if(result){
Info.display("File saved", "The "+name+" file has been saved in the workspace.");
changeStatusJob(SearchResultType.TAXONOMY_ITEM, jobTaxonomyModel.getIdentifier(), DownloadState.SAVED);
}
}
@Override
public void onFailure(Throwable caught) {
Info.display("Error saving the file", "An error occurred saving the file, retry.");
Log.error("Error saving the file", "An error occurred saving the file, retry." +caught.getMessage());
}
});
}
}
});
popup.addDataLoadHandler(new DataLoadHandler() {
@Override
public void onDataLoad(DataLoadEvent event) {
if (event.isFailed())GWT.log("Workspace loading failure", event.getCaught());
}
});
popup.show();
*/
}
private void saveOccurencesJobError(final JobOccurrencesModel jobOccurrencesModel,final String scientificName, List<org.gcube.portlets.user.speciesdiscovery.shared.DataSource> dataSourceList) {
@ -1277,7 +1139,7 @@ public class SearchController {
private void saveOccurrenceJobError() {
final WorkspaceExplorerSaveDialog navigator = new WorkspaceExplorerSaveDialog("Select where to save the error file", fileName, true);
final WorkspaceExplorerSaveDialog navigator = new WorkspaceExplorerSaveDialog("Select where to save the Error File", fileName, true);
WorskpaceExplorerSaveNotificationListener listener = new WorskpaceExplorerSaveNotificationListener(){
@ -1320,53 +1182,6 @@ public class SearchController {
navigator.addWorkspaceExplorerSaveNotificationListener(listener);
navigator.show();
/*
WorkspaceLightTreeSavePopup popup = new WorkspaceLightTreeSavePopup("Select where to save the error file", true, fileName);
popup.setModal(false);
popup.setSelectableTypes(ItemType.FOLDER, ItemType.ROOT);
popup.center();
popup.addPopupHandler(new PopupHandler() {
public void onPopup(PopupEvent event) {
if (!event.isCanceled()){
org.gcube.portlets.widgets.lighttree.client.Item destinationFolder = event.getSelectedItem();
final String name = event.getName();
Info.display("Saving in progress", "...");
SpeciesDiscovery.taxonomySearchService.saveOccurrenceJobError(jobOccurrencesModel, destinationFolder.getId(), name, scientificName, dataSources, new AsyncCallback<Boolean>() {
@Override
public void onSuccess(Boolean result) {
if(result){
Info.display("File saved", "The "+name+" file has been saved in the workspace.");
changeStatusJob(SearchResultType.OCCURRENCE_POINT, jobOccurrencesModel.getJobIdentifier(), DownloadState.SAVED);
}
}
@Override
public void onFailure(Throwable caught) {
Info.display("Error saving the file", "An error occurred saving the file, retry.");
Log.error("Error saving the file", "An error occurred saving the file, retry." +caught.getMessage());
}
});
}
}
});
popup.addDataLoadHandler(new DataLoadHandler() {
@Override
public void onDataLoad(DataLoadEvent event) {
if (event.isFailed())GWT.log("Workspace loading failure", event.getCaught());
}
});
popup.show();
*/
}
});
@ -1402,7 +1217,7 @@ public class SearchController {
String fileName = jobOccurrencesModel.getJobName() +" from "+dataSourceName+" - "+suffix+"."+extension;
final String dataSources = dataSourceName;
final WorkspaceExplorerSaveDialog navigator = new WorkspaceExplorerSaveDialog("Select where to save the Occurrences", fileName, true);
final WorkspaceExplorerSaveDialog navigator = new WorkspaceExplorerSaveDialog("Select where to save "+jobOccurrencesModel.getFileFormat().toString() +" Occurrences", fileName, true);
WorskpaceExplorerSaveNotificationListener listener = new WorskpaceExplorerSaveNotificationListener(){
@Override
@ -1444,54 +1259,6 @@ public class SearchController {
navigator.addWorkspaceExplorerSaveNotificationListener(listener);
navigator.show();
/*
WorkspaceLightTreeSavePopup popup = new WorkspaceLightTreeSavePopup("Select where to save the Occurrence points", true, fileName);
popup.setModal(false);
popup.setSelectableTypes(ItemType.FOLDER, ItemType.ROOT);
popup.center();
final String dataSources = dataSourceName;
popup.addPopupHandler(new PopupHandler() {
public void onPopup(PopupEvent event) {
if (!event.isCanceled()){
org.gcube.portlets.widgets.lighttree.client.Item destinationFolder = event.getSelectedItem();
final String name = event.getName();
Info.display("Saving in progress", "...");
SpeciesDiscovery.taxonomySearchService.saveOccurrenceJob(jobOccurrencesModel, destinationFolder.getId(), name, scientificName, dataSources, new AsyncCallback<Boolean>() {
@Override
public void onSuccess(Boolean result) {
if(result){
Info.display("File saved", "The "+name+" file has been saved in the workspace.");
changeStatusJob(SearchResultType.OCCURRENCE_POINT, jobOccurrencesModel.getJobIdentifier(), DownloadState.SAVED);
}
}
@Override
public void onFailure(Throwable caught) {
Info.display("Error saving the file", "An error occurred saving the file, retry.");
Log.error("Error saving the file", "An error occurred saving the file, retry." +caught.getMessage());
}
});
}
}
});
popup.addDataLoadHandler(new DataLoadHandler() {
@Override
public void onDataLoad(DataLoadEvent event) {
if (event.isFailed())GWT.log("Workspace loading failure", event.getCaught());
}
});
popup.show();
*/
}
@ -1541,7 +1308,7 @@ public class SearchController {
case DARWIN_CORE_ARCHIVE: fileName += ".zip"; break;
}
final WorkspaceExplorerSaveDialog navigator = new WorkspaceExplorerSaveDialog("Select where to save the Taxonomy", fileName, true);
final WorkspaceExplorerSaveDialog navigator = new WorkspaceExplorerSaveDialog("Select where to save "+fileFormat.toString(), fileName, true);
WorskpaceExplorerSaveNotificationListener listener = new WorskpaceExplorerSaveNotificationListener(){
@Override
@ -1579,48 +1346,6 @@ public class SearchController {
navigator.addWorkspaceExplorerSaveNotificationListener(listener);
navigator.show();
/*
WorkspaceLightTreeSavePopup popup = new WorkspaceLightTreeSavePopup("Select where to save the Taxonomy", true, fileName);
popup.setModal(false);
popup.setSelectableTypes(ItemType.FOLDER, ItemType.ROOT);
popup.center();
popup.addPopupHandler(new PopupHandler() {
public void onPopup(PopupEvent event) {
if (!event.isCanceled()){
org.gcube.portlets.widgets.lighttree.client.Item destinationFolder = event.getSelectedItem();
final String name = event.getName();
Info.display("Saving in progress", "...");
SpeciesDiscovery.taxonomySearchService.saveSelectedTaxonomyPoints(destinationFolder.getId(), name, fileFormat, new AsyncCallback<Void>() {
@Override
public void onSuccess(Void result) {
Info.display("File saved", "The "+name+" file has been saved in the workspace.");
}
@Override
public void onFailure(Throwable caught) {
Info.display("Error saving the file", "An error occurred saving the file, retry.");
Log.error("Error saving the file", "An error occurred saving the file, retry." +caught.getMessage());
}
});
}
}
});
popup.addDataLoadHandler(new DataLoadHandler() {
@Override
public void onDataLoad(DataLoadEvent event) {
if (event.isFailed())GWT.log("Workspace loading failure", event.getCaught());
}
});
popup.show();
*/
}
public void showOccurrencesMap()