Mercurial > dive4elements > gnv-client

changeset 165:183850730a90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Made all Interfaces Serailizable and add UID to all Objects issue71 Organize Imports gnv/trunk@328 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Thu, 12 Nov 2009 11:03:11 +0000
parents 5570d9b3282f
children c5edd8fcae8c
files gnv/ChangeLog gnv/src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java gnv/src/main/java/de/intevation/gnv/action/sessionmodel/DefaultSessionModel.java gnv/src/main/java/de/intevation/gnv/action/sessionmodel/SessionModel.java gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClient.java gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/DefaultArtifactDatabaseClient.java gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/Artifact.java gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactDescription.java gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactFactory.java gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactObject.java gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactStatisticValue.java gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactStatisticsSet.java gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultArtifactStatisticValue.java gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultArtifactStatisticsSet.java gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultInputParameter.java gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultOutputMode.java gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultOutputParameter.java gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/InputParameter.java gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/OutputMode.java gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/OutputParameter.java
diffstat 20 files changed, 65 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/gnv/ChangeLog	Thu Nov 12 10:22:30 2009 +0000
+++ b/gnv/ChangeLog	Thu Nov 12 11:03:11 2009 +0000
@@ -1,3 +1,14 @@
+2009-11-12  Tim Englich  <tim.englich@intevation.de>
+
+	* src/main/java/de/intevation/gnv/action/sessionmodel/SessionModel.java,
+	  src/main/java/de/intevation/gnv/action/sessionmodel/DefaultSessionModel.java,
+	  src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java,
+	  src/main/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClient.java, 
+	  src/main/java/de/intevation/gnv/artifactdatabase/client/DefaultArtifactDatabaseClient.java:
+	  Imports organized.
+	* src/main/java/de/intevation/gnv/artifactdatabase/objects/*.java:
+	  Made all Interfaces Serailizable and add UID to all Objects issue71
+	
 2009-11-12  Tim Englich  <tim.englich@intevation.de>
 
 	* src/main/webapp/WEB-INF/jsp/includes/display_diagramm_statistics_inc.jsp: 
--- a/gnv/src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java	Thu Nov 12 10:22:30 2009 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java	Thu Nov 12 11:03:11 2009 +0000
@@ -21,7 +21,6 @@
 import de.intevation.gnv.artifactdatabase.client.ArtifactDatabaseClient;
 import de.intevation.gnv.artifactdatabase.client.ArtifactDatabaseClientFactory;
 import de.intevation.gnv.artifactdatabase.objects.ArtifactDescription;
-import de.intevation.gnv.artifactdatabase.objects.ArtifactStatisticValue;
 import de.intevation.gnv.artifactdatabase.objects.ArtifactStatisticsSet;
 import de.intevation.gnv.artifactdatabase.objects.DefaultInputParameter;
 import de.intevation.gnv.artifactdatabase.objects.InputParameter;
--- a/gnv/src/main/java/de/intevation/gnv/action/sessionmodel/DefaultSessionModel.java	Thu Nov 12 10:22:30 2009 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/action/sessionmodel/DefaultSessionModel.java	Thu Nov 12 11:03:11 2009 +0000
@@ -10,7 +10,6 @@
 
 import de.intevation.gnv.artifactdatabase.objects.ArtifactDescription;
 import de.intevation.gnv.artifactdatabase.objects.ArtifactObject;
-import de.intevation.gnv.artifactdatabase.objects.ArtifactStatisticValue;
 import de.intevation.gnv.artifactdatabase.objects.ArtifactStatisticsSet;
 import de.intevation.gnv.artifactdatabase.objects.OutputMode;
 
--- a/gnv/src/main/java/de/intevation/gnv/action/sessionmodel/SessionModel.java	Thu Nov 12 10:22:30 2009 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/action/sessionmodel/SessionModel.java	Thu Nov 12 11:03:11 2009 +0000
@@ -8,7 +8,6 @@
 
 import de.intevation.gnv.artifactdatabase.objects.ArtifactDescription;
 import de.intevation.gnv.artifactdatabase.objects.ArtifactObject;
-import de.intevation.gnv.artifactdatabase.objects.ArtifactStatisticValue;
 import de.intevation.gnv.artifactdatabase.objects.ArtifactStatisticsSet;
 import de.intevation.gnv.artifactdatabase.objects.OutputMode;
 
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClient.java	Thu Nov 12 10:22:30 2009 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClient.java	Thu Nov 12 11:03:11 2009 +0000
@@ -10,7 +10,6 @@
 import de.intevation.gnv.artifactdatabase.client.exception.ArtifactDatabaseClientException;
 import de.intevation.gnv.artifactdatabase.objects.ArtifactDescription;
 import de.intevation.gnv.artifactdatabase.objects.ArtifactObject;
-import de.intevation.gnv.artifactdatabase.objects.ArtifactStatisticValue;
 import de.intevation.gnv.artifactdatabase.objects.ArtifactStatisticsSet;
 import de.intevation.gnv.artifactdatabase.objects.InputParameter;
 
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/DefaultArtifactDatabaseClient.java	Thu Nov 12 10:22:30 2009 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/DefaultArtifactDatabaseClient.java	Thu Nov 12 11:03:11 2009 +0000
@@ -38,7 +38,6 @@
 import de.intevation.gnv.artifactdatabase.objects.ArtifactDescription;
 import de.intevation.gnv.artifactdatabase.objects.ArtifactFactory;
 import de.intevation.gnv.artifactdatabase.objects.ArtifactObject;
-import de.intevation.gnv.artifactdatabase.objects.ArtifactStatisticValue;
 import de.intevation.gnv.artifactdatabase.objects.ArtifactStatisticsSet;
 import de.intevation.gnv.artifactdatabase.objects.DefaultArtifactStatisticValue;
 import de.intevation.gnv.artifactdatabase.objects.DefaultArtifactStatisticsSet;
@@ -600,7 +599,6 @@
                          Collection<InputParameter> inputParameter)
                                                                    throws ArtifactDatabaseClientException {
         try {
-            XMLUtils xmlUtils = new XMLUtils();
             Document requestBody = this.createOutRequestBody(currentArtifact,
                     targetName, mimeType, inputParameter);
 
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/Artifact.java	Thu Nov 12 10:22:30 2009 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/Artifact.java	Thu Nov 12 11:03:11 2009 +0000
@@ -14,6 +14,12 @@
  */
 public class Artifact implements ArtifactObject, ArtifactDescription {
 
+
+    /**
+     * The UID of this Class
+     */
+    private static final long serialVersionUID = 8606869493141810364L;
+    
     private String id = null;
     private String hash = null;
     private boolean selected = false;
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactDescription.java	Thu Nov 12 10:22:30 2009 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactDescription.java	Thu Nov 12 11:03:11 2009 +0000
@@ -3,6 +3,7 @@
  */
 package de.intevation.gnv.artifactdatabase.objects;
 
+import java.io.Serializable;
 import java.util.Collection;
 import java.util.Map;
 
@@ -12,7 +13,7 @@
  * @author Tim Englich <tim.englich@intevation.de>
  * 
  */
-public interface ArtifactDescription {
+public interface ArtifactDescription extends Serializable {
 
     /**
      * @return the currentUI
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactFactory.java	Thu Nov 12 10:22:30 2009 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactFactory.java	Thu Nov 12 11:03:11 2009 +0000
@@ -9,6 +9,11 @@
  */
 public class ArtifactFactory implements ArtifactObject {
 
+    /**
+     * The UID of this Class.
+     */
+    private static final long serialVersionUID = 5453748230625831527L;
+
     private String name = null;
 
     private String description = null;
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactObject.java	Thu Nov 12 10:22:30 2009 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactObject.java	Thu Nov 12 11:03:11 2009 +0000
@@ -3,11 +3,13 @@
  */
 package de.intevation.gnv.artifactdatabase.objects;
 
+import java.io.Serializable;
+
 /**
  * @author Tim Englich <tim.englich@intevation.de>
  * 
  */
-public interface ArtifactObject {
+public interface ArtifactObject extends Serializable {
 
     public String getId();
 
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactStatisticValue.java	Thu Nov 12 10:22:30 2009 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactStatisticValue.java	Thu Nov 12 11:03:11 2009 +0000
@@ -3,11 +3,13 @@
  */
 package de.intevation.gnv.artifactdatabase.objects;
 
+import java.io.Serializable;
+
 /**
  * @author Tim Englich <tim.englich@intevation.de>
  * 
  */
-public interface ArtifactStatisticValue {
+public interface ArtifactStatisticValue extends Serializable {
 
     String getKey();
 
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactStatisticsSet.java	Thu Nov 12 10:22:30 2009 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactStatisticsSet.java	Thu Nov 12 11:03:11 2009 +0000
@@ -3,13 +3,14 @@
  */
 package de.intevation.gnv.artifactdatabase.objects;
 
+import java.io.Serializable;
 import java.util.Collection;
 
 /**
  * @author Tim Englich <tim.englich@intevation.de>
  *
  */
-public interface ArtifactStatisticsSet {
+public interface ArtifactStatisticsSet extends Serializable {
     
     
     String getName();
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultArtifactStatisticValue.java	Thu Nov 12 10:22:30 2009 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultArtifactStatisticValue.java	Thu Nov 12 11:03:11 2009 +0000
@@ -9,6 +9,11 @@
  */
 public class DefaultArtifactStatisticValue implements ArtifactStatisticValue {
 
+    /**
+     * The UID of this Class.
+     */
+    private static final long serialVersionUID = -8409111023127835398L;
+
     private String key = null;
 
     private String value = null;
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultArtifactStatisticsSet.java	Thu Nov 12 10:22:30 2009 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultArtifactStatisticsSet.java	Thu Nov 12 11:03:11 2009 +0000
@@ -12,6 +12,11 @@
  */
 public class DefaultArtifactStatisticsSet implements ArtifactStatisticsSet{
 
+    /**
+     * The UID of this Class.
+     */
+    private static final long serialVersionUID = 6738878381515708602L;
+
     private String name = null;
     
     private Collection<ArtifactStatisticValue> statisticValues = 
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultInputParameter.java	Thu Nov 12 10:22:30 2009 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultInputParameter.java	Thu Nov 12 11:03:11 2009 +0000
@@ -9,6 +9,11 @@
  */
 public class DefaultInputParameter implements InputParameter {
 
+    /**
+     * The UID of this Class.
+     */
+    private static final long serialVersionUID = 6597439837482244211L;
+
     private String name = null;
 
     private String[] values = null;
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultOutputMode.java	Thu Nov 12 10:22:30 2009 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultOutputMode.java	Thu Nov 12 11:03:11 2009 +0000
@@ -11,6 +11,11 @@
  */
 public class DefaultOutputMode implements OutputMode {
 
+    /**
+     * The UID of this Class.
+     */
+    private static final long serialVersionUID = 7487880486604174521L;
+
     private String name = null;
 
     private String mimeType = null;
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultOutputParameter.java	Thu Nov 12 10:22:30 2009 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultOutputParameter.java	Thu Nov 12 11:03:11 2009 +0000
@@ -9,6 +9,11 @@
  */
 public class DefaultOutputParameter implements OutputParameter {
 
+    /**
+     * The UID of this Class.
+     */
+    private static final long serialVersionUID = -8416057640116638152L;
+
     private String name = null;
 
     private String value = null;
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/InputParameter.java	Thu Nov 12 10:22:30 2009 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/InputParameter.java	Thu Nov 12 11:03:11 2009 +0000
@@ -3,11 +3,13 @@
  */
 package de.intevation.gnv.artifactdatabase.objects;
 
+import java.io.Serializable;
+
 /**
  * @author Tim Englich <tim.englich@intevation.de>
  * 
  */
-public interface InputParameter {
+public interface InputParameter extends Serializable {
 
     public String getName();
 
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/OutputMode.java	Thu Nov 12 10:22:30 2009 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/OutputMode.java	Thu Nov 12 11:03:11 2009 +0000
@@ -3,13 +3,14 @@
  */
 package de.intevation.gnv.artifactdatabase.objects;
 
+import java.io.Serializable;
 import java.util.Collection;
 
 /**
  * @author Tim Englich <tim.englich@intevation.de>
  * 
  */
-public interface OutputMode {
+public interface OutputMode extends Serializable{
 
     public String getName();
 
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/OutputParameter.java	Thu Nov 12 10:22:30 2009 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/OutputParameter.java	Thu Nov 12 11:03:11 2009 +0000
@@ -3,11 +3,13 @@
  */
 package de.intevation.gnv.artifactdatabase.objects;
 
+import java.io.Serializable;
+
 /**
  * @author Tim Englich <tim.englich@intevation.de>
  * 
  */
-public interface OutputParameter {
+public interface OutputParameter extends Serializable{
 
     String getName();
http://dive4elements.wald.intevation.org