diff --git a/.classpath b/.classpath index 6952a3a..e33a494 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -31,5 +31,5 @@ - + diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs index d7bcb6b..e0780d1 100644 --- a/.settings/com.google.gdt.eclipse.core.prefs +++ b/.settings/com.google.gdt.eclipse.core.prefs @@ -1,5 +1,5 @@ eclipse.preferences.version=1 jarsExcludedFromWebInfLib= -lastWarOutDir=/home/francesco-mangiacrapa/wseclipse/speciesdiscovery/target/species-discovery-3.3.0-SNAPSHOT +lastWarOutDir=/home/francesco-mangiacrapa/wseclipse/speciesdiscovery/target/species-discovery-3.4.0-SNAPSHOT warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/pom.xml b/pom.xml index b060fca..0f71ec9 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.gcube.portlets.user species-discovery war - 3.3.0-SNAPSHOT + 3.4.0-SNAPSHOT gCube Species Discovery gCube Species Discovery Portlet lets the users discovery species information from the Species Service. @@ -31,7 +31,7 @@ - 2.4.0 + 2.5.1 distro 1.6 @@ -44,6 +44,19 @@ + + com.google.gwt + gwt-user + ${gwtVersion} + provided + + + com.google.gwt + gwt-servlet + ${gwtVersion} + provided + + org.gcube.data.spd @@ -51,27 +64,6 @@ [3.0.0-SNAPSHOT, 4.0.0-SNAPSHOT) provided - - - - - - - - - - - - - - - - - - - - - org.gcube.data.spd @@ -185,18 +177,7 @@ - - com.google.gwt - gwt-user - ${gwtVersion} - provided - - - com.google.gwt - gwt-servlet - ${gwtVersion} - provided - + com.sencha.gxt gxt @@ -318,7 +299,7 @@ org.codehaus.mojo gwt-maven-plugin - 2.4.0 + ${gwtVersion} diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/ConstantsSpeciesDiscovery.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/ConstantsSpeciesDiscovery.java index 00e2c56..fb0719e 100644 --- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/ConstantsSpeciesDiscovery.java +++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/ConstantsSpeciesDiscovery.java @@ -12,6 +12,7 @@ public final class ConstantsSpeciesDiscovery { public static final String RANK = "Rank"; // public static final String GROUPEDIDLIST = "GroupedIDList"; + //USED IN CLASSIFICATION FILTER public static final String BIOTACLASSID = "BiotaID"; public static final String BIOTACLASS = "Biota"; diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/shared/JobTaxonomyModel.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/shared/JobTaxonomyModel.java index a491841..55a6573 100644 --- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/shared/JobTaxonomyModel.java +++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/shared/JobTaxonomyModel.java @@ -129,8 +129,8 @@ public class JobTaxonomyModel implements Serializable { return submitTime; } - public void setSubmitTime(Date startTime) { - this.submitTime = startTime; + public void setSubmitTime(Date submitTime) { + this.submitTime = submitTime; } public Date getEndTime() {