# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1318499163 0
# Node ID 956605001cfbcc903ad009afb36e4be5a393b36e
# Parent  cf0f906921deb50dc50db81237c136b6f5baf16e
Updated SmartGWT to 2.5

flys-client/trunk@2955 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r cf0f906921de -r 956605001cfb flys-client/ChangeLog
--- a/flys-client/ChangeLog	Thu Oct 13 09:08:43 2011 +0000
+++ b/flys-client/ChangeLog	Thu Oct 13 09:46:03 2011 +0000
@@ -1,3 +1,12 @@
+2011-10-13	Sascha L, Teichmann	<sascha.teichmann@intevation.de>
+
+	Updated SmartGWT to 2.5
+
+	* pom.xml: Bumped SmartGWT from 2.4 to 2.5
+
+	* src/main/java/de/intevation/flys/client/FLYS.gwt.xml:
+	  Using Enterprise instead of EnterpriseBlue theme.
+
 2011-10-12  Ingo Weinzierl <ingo@intevation.de>
 
 	flys/issue297 (ÜSK: Eingabe von Höhen ermöglichen)
diff -r cf0f906921de -r 956605001cfb flys-client/pom.xml
--- a/flys-client/pom.xml	Thu Oct 13 09:08:43 2011 +0000
+++ b/flys-client/pom.xml	Thu Oct 13 09:46:03 2011 +0000
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>com.smartgwt</groupId>
       <artifactId>smartgwt</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
     </dependency>
     <dependency>
       <groupId>de.intevation.artifacts.common</groupId>
diff -r cf0f906921de -r 956605001cfb flys-client/src/main/java/de/intevation/flys/client/FLYS.gwt.xml
--- a/flys-client/src/main/java/de/intevation/flys/client/FLYS.gwt.xml	Thu Oct 13 09:08:43 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/FLYS.gwt.xml	Thu Oct 13 09:46:03 2011 +0000
@@ -14,10 +14,20 @@
 
   <inherits name="de.intevation.artifacts.common.Common"/>
 
-  <!-- Inherit the smartgwt Enterprise Blue Theme.                -->
+  <!-- Inherit the smartgwt Enterprise Theme.                -->
   <inherits name="com.smartgwt.SmartGwtNoTheme" />
+  <inherits name="com.smartclient.theme.enterprise.Enterprise"/>
+  <inherits name="com.smartclient.theme.enterprise.EnterpriseResources"/>
+
+  <!-- Does not work
   <inherits name="com.smartclient.theme.enterpriseblue.EnterpriseBlue"/>
   <inherits name="com.smartclient.theme.enterpriseblue.EnterpriseBlueResources"/>
+  -->
+
+  <!-- Works:
+  <inherits name="com.smartclient.theme.graphite.Graphite"/>
+  <inherits name="com.smartclient.theme.graphite.GraphiteResources"/>
+  -->
 
   <!-- Inherit the gwtopenlayers stuff -->
   <inherits name="org.gwtopenmaps.openlayers.OpenLayers"/>