changeset 70:0035862b0295

Refactoringwork done because of changes in the artifact-module gnv-artifacts/trunk@60 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Thu, 10 Sep 2009 09:40:49 +0000
parents f24c825144bc
children e4ecf3188bdf
files gnv-artifacts/Changelog gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java
diffstat 3 files changed, 16 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/Changelog	Thu Sep 10 07:57:30 2009 +0000
+++ b/gnv-artifacts/Changelog	Thu Sep 10 09:40:49 2009 +0000
@@ -1,3 +1,9 @@
+2009-09-10  Tim Englich  <tim.englich@intevation.de>
+
+    * src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Edited, 
+      src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java Edited:
+      Refactoringwork done because of changes in the artifact-module
+      
 2009-09-10  Tim Englich  <tim.englich@intevation.de>
 
     * src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java Edited:
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java	Thu Sep 10 07:57:30 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java	Thu Sep 10 09:40:49 2009 +0000
@@ -17,6 +17,8 @@
 
 import de.intevation.artifactdatabase.Config;
 import de.intevation.artifactdatabase.DefaultArtifact;
+import de.intevation.artifacts.ArtifactFactory;
+import de.intevation.artifacts.ArtifactNamespaceContext;
 import de.intevation.gnv.artifacts.context.GNVArtifactContext;
 import de.intevation.gnv.transition.DefaultInputData;
 import de.intevation.gnv.transition.InputData;
@@ -151,9 +153,9 @@
      * @see de.intevation.artifactdatabase.DefaultArtifact#setup(java.lang.String, java.lang.Object)
      */
     @Override
-    public void setup(String identifier, Object context) {
+    public void setup(String identifier, ArtifactFactory factory, Object context) {
         log.debug("GNVArtifactBase.setup");
-        super.setup(identifier, context);
+        super.setup(identifier, factory, context);
         if (context instanceof GNVArtifactContext){
             GNVArtifactContext gnvContext = (GNVArtifactContext)context;
             Document doc = gnvContext.getConfig();
@@ -288,8 +290,8 @@
      * @return
      */
     private Element createElement(Document document, String name) {
-        Element node = document.createElementNS(DefaultArtifact.NAMESPACE_URI, name);
-        node.setPrefix(DefaultArtifact.NAMESPACE_PREFIX);
+        Element node = document.createElementNS(ArtifactNamespaceContext.NAMESPACE_URI, name);
+        node.setPrefix(ArtifactNamespaceContext.NAMESPACE_PREFIX);
         return node;
     }
     
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java	Thu Sep 10 07:57:30 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java	Thu Sep 10 09:40:49 2009 +0000
@@ -7,6 +7,7 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
+import de.intevation.artifacts.ArtifactFactory;
 import de.intevation.gnv.artifacts.GNVArtifactBase;
 import de.intevation.gnv.artifacts.context.GNVArtifactContext;
 
@@ -45,11 +46,11 @@
     }
 
     /**
-     * @see de.intevation.artifactdatabase.DefaultArtifact#setup(java.lang.String, java.lang.Object)
+     * @see de.intevation.gnv.artifacts.GNVArtifactBase#setup(java.lang.String, de.intevation.artifacts.ArtifactFactory, java.lang.Object)
      */
     @Override
-    public void setup(String identifier, Object context) {
+    public void setup(String identifier, ArtifactFactory factory, Object context) {
         log.debug("TimeSeriesArtifact.setup");
-        super.setup(identifier, context);
+        super.setup(identifier,factory,context);
     }
 }

http://dive4elements.wald.intevation.org