# HG changeset patch # User Tim Englich # Date 1258023791 0 # Node ID 183850730a907a6bf02afbe4c870e0e5378e2d6d # Parent 5570d9b3282f44c7f9562011512266f228dfb652 Made all Interfaces Serailizable and add UID to all Objects issue71 Organize Imports gnv/trunk@328 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 5570d9b3282f -r 183850730a90 gnv/ChangeLog --- 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 + + * 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 * src/main/webapp/WEB-INF/jsp/includes/display_diagramm_statistics_inc.jsp: diff -r 5570d9b3282f -r 183850730a90 gnv/src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java --- 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; diff -r 5570d9b3282f -r 183850730a90 gnv/src/main/java/de/intevation/gnv/action/sessionmodel/DefaultSessionModel.java --- 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; diff -r 5570d9b3282f -r 183850730a90 gnv/src/main/java/de/intevation/gnv/action/sessionmodel/SessionModel.java --- 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; diff -r 5570d9b3282f -r 183850730a90 gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClient.java --- 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; diff -r 5570d9b3282f -r 183850730a90 gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/DefaultArtifactDatabaseClient.java --- 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) throws ArtifactDatabaseClientException { try { - XMLUtils xmlUtils = new XMLUtils(); Document requestBody = this.createOutRequestBody(currentArtifact, targetName, mimeType, inputParameter); diff -r 5570d9b3282f -r 183850730a90 gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/Artifact.java --- 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; diff -r 5570d9b3282f -r 183850730a90 gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactDescription.java --- 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 * */ -public interface ArtifactDescription { +public interface ArtifactDescription extends Serializable { /** * @return the currentUI diff -r 5570d9b3282f -r 183850730a90 gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactFactory.java --- 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; diff -r 5570d9b3282f -r 183850730a90 gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactObject.java --- 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 * */ -public interface ArtifactObject { +public interface ArtifactObject extends Serializable { public String getId(); diff -r 5570d9b3282f -r 183850730a90 gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactStatisticValue.java --- 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 * */ -public interface ArtifactStatisticValue { +public interface ArtifactStatisticValue extends Serializable { String getKey(); diff -r 5570d9b3282f -r 183850730a90 gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactStatisticsSet.java --- 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 * */ -public interface ArtifactStatisticsSet { +public interface ArtifactStatisticsSet extends Serializable { String getName(); diff -r 5570d9b3282f -r 183850730a90 gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultArtifactStatisticValue.java --- 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; diff -r 5570d9b3282f -r 183850730a90 gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultArtifactStatisticsSet.java --- 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 statisticValues = diff -r 5570d9b3282f -r 183850730a90 gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultInputParameter.java --- 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; diff -r 5570d9b3282f -r 183850730a90 gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultOutputMode.java --- 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; diff -r 5570d9b3282f -r 183850730a90 gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultOutputParameter.java --- 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; diff -r 5570d9b3282f -r 183850730a90 gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/InputParameter.java --- 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 * */ -public interface InputParameter { +public interface InputParameter extends Serializable { public String getName(); diff -r 5570d9b3282f -r 183850730a90 gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/OutputMode.java --- 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 * */ -public interface OutputMode { +public interface OutputMode extends Serializable{ public String getName(); diff -r 5570d9b3282f -r 183850730a90 gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/OutputParameter.java --- 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 * */ -public interface OutputParameter { +public interface OutputParameter extends Serializable{ String getName();