# HG changeset patch
# User Tim Englich <tim.englich@intevation.de>
# Date 1252077553 0
# Node ID f95d9a4492157173903c48f130cdf5e571c462af
# Parent  48eb2367de2a78a066f765bbb366da67c9607003
Insert new Parameter to Setuproutine

artifacts/trunk@21 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 48eb2367de2a -r f95d9a449215 Changelog
--- a/Changelog	Fri Sep 04 12:19:26 2009 +0000
+++ b/Changelog	Fri Sep 04 15:19:13 2009 +0000
@@ -1,3 +1,9 @@
+2009-09-04  Tim Englich  <tim.englich@intevation.de>
+
+    * src/main/java/de/intevation/artifactdatabase/FactoryBootstrap.java (loa,
+    * src/main/java/de/intevation/artifacts/ArtifactFactory.java (setup):
+     New Parameter for Setop to put the ArtifactFactoryNode into the setup routine.
+
 2009-09-04  Tim Englich <tim.englich@intevation.de>  <Tim Englich <tim.englich@intevation.de>@nomia>
 
     * pom.xml: Edited
@@ -30,6 +36,7 @@
 
 	* TODO: Added remark to add logging to artifact database.
 
+>>>>>>> .r20
 2009-09-04	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* artifacts/src/main/java/de/intevation/artifacts/ArtifactContextFactory.java:
diff -r 48eb2367de2a -r f95d9a449215 artifact-database/src/main/java/de/intevation/artifactdatabase/FactoryBootstrap.java
--- a/artifact-database/src/main/java/de/intevation/artifactdatabase/FactoryBootstrap.java	Fri Sep 04 12:19:26 2009 +0000
+++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/FactoryBootstrap.java	Fri Sep 04 15:19:13 2009 +0000
@@ -91,7 +91,7 @@
             }
 
             if (factory != null) {
-                factory.setup(config);
+                factory.setup(config,nodes.item(i));
                 loadedFactories.add(factory);
             }
         }
diff -r 48eb2367de2a -r f95d9a449215 artifact-database/target/artifact-database-1.0-SNAPSHOT.jar
Binary file artifact-database/target/artifact-database-1.0-SNAPSHOT.jar has changed
diff -r 48eb2367de2a -r f95d9a449215 artifacts/src/main/java/de/intevation/artifacts/ArtifactFactory.java
--- a/artifacts/src/main/java/de/intevation/artifacts/ArtifactFactory.java	Fri Sep 04 12:19:26 2009 +0000
+++ b/artifacts/src/main/java/de/intevation/artifacts/ArtifactFactory.java	Fri Sep 04 15:19:13 2009 +0000
@@ -1,6 +1,7 @@
 package de.intevation.artifacts;
 
 import org.w3c.dom.Document;
+import org.w3c.dom.Node;
 
 /**
  * Interface of an artifact producing factory.
@@ -33,7 +34,8 @@
     /**
      * Setup the factory with a given configuration
      * @param config the configuration
+     * @param factoryNode the ConfigurationNode of this Factory
      */
-    void setup(Document config);
+    void setup(Document config, Node factoryNode);
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8: