# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1261514745 0
# Node ID 23e9352df09b3ff19beb113b0dbca9f9cf7c249a
# Parent  bed9735adf8439d4c1d1d19ce8ba8612d86ea849
Load salinity palette correctly.


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

diff -r bed9735adf84 -r 23e9352df09b gnv-artifacts/ChangeLog
--- a/gnv-artifacts/ChangeLog	Tue Dec 22 17:19:10 2009 +0000
+++ b/gnv-artifacts/ChangeLog	Tue Dec 22 20:45:45 2009 +0000
@@ -1,3 +1,7 @@
+2009-12-22	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* doc/conf/conf.xml: Load salinity palette correctly.
+
 2009-12-22  Ingo Weinzierl <ingo.weinzierl@intevation.de>
 
 	* src/main/java/de/intevation/gnv/state/profile/verticalcrosssection/VerticalCrossSectionOutputState.java:
@@ -48,8 +52,8 @@
 
 	* src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java:
 	  load palettes at start up.
-	  They are store in a hash map under the key 'color.palettes'. The keys of
-	  the maps are the names from the configuration, the values are 
+	  They are stored in a hash map under the key 'color.palettes'. The keys of
+	  the map are the names from the configuration, the values are 
 	  de.intevation.gnv.raster.Palette objects.
 	  Put configuration of chart template into own method.
 
diff -r bed9735adf84 -r 23e9352df09b gnv-artifacts/doc/conf/conf.xml
--- a/gnv-artifacts/doc/conf/conf.xml	Tue Dec 22 17:19:10 2009 +0000
+++ b/gnv-artifacts/doc/conf/conf.xml	Tue Dec 22 20:45:45 2009 +0000
@@ -397,7 +397,7 @@
                  file="${artifacts.config.dir}/palette/flow-velocity.xml"/>
         <palette name="salinity"
                  description="Palette for salinity"
-                 file="${artifacts.config.dir}/palette/flow-velocity.xml"/>
+                 file="${artifacts.config.dir}/palette/salinity.xml"/>
         <palette name="water-levels"
                  description="Palette for water levels"
                  file="${artifacts.config.dir}/palette/water-levels.xml"/>