# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1267804210 0
# Node ID 602521c3fac3488d2384605f4bbfcf935b44a0c5
# Parent  97d90e314af593093186d4fdf130d435b773c64f
Reset diagram options after switching from chart to histogram or the other way around (issue190).

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

diff -r 97d90e314af5 -r 602521c3fac3 gnv/ChangeLog
--- a/gnv/ChangeLog	Fri Mar 05 09:58:57 2010 +0000
+++ b/gnv/ChangeLog	Fri Mar 05 15:50:10 2010 +0000
@@ -1,3 +1,17 @@
+2010-03-05  Ingo Weinzierl <ingo.weinzierl@intevation.de>
+
+	  Issue190
+
+	* src/main/java/de/intevation/gnv/action/CreateHistogramAction.java,
+	  src/main/java/de/intevation/gnv/action/CreateChartAction.java: Reset
+	  diagram options. Switching between chart and histogram caused some 'null'
+	  values in text fields. After resetting these options, we don't have these
+	  problems anymore - text fields will be filled with default values in this
+	  case.
+
+	* src/main/webapp/WEB-INF/jsp/includes/display_diagramm_adons_inc.jsp:
+	  Removed useless file.
+
 2010-03-05  Tim Englich  <tim.englich@intevation.de>
 
 	* src/main/webapp/WEB-INF/config/templates/describe-ui.xsl: 
diff -r 97d90e314af5 -r 602521c3fac3 gnv/src/main/java/de/intevation/gnv/action/CreateChartAction.java
--- a/gnv/src/main/java/de/intevation/gnv/action/CreateChartAction.java	Fri Mar 05 09:58:57 2010 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/action/CreateChartAction.java	Fri Mar 05 15:50:10 2010 +0000
@@ -1,5 +1,8 @@
 package de.intevation.gnv.action;
 
+import de.intevation.gnv.action.sessionmodel.SessionModel;
+import de.intevation.gnv.action.sessionmodel.SessionModelFactory;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -32,6 +35,9 @@
     throws Exception {
         logger.debug("Create chart.");
 
+        SessionModel sm = SessionModelFactory.getInstance().getSessionModel(
+            request);
+        sm.setDiagrammOptions(null);
         request.setAttribute("chart", true);
 
         return super.execute(mapping, form, request, response);
diff -r 97d90e314af5 -r 602521c3fac3 gnv/src/main/java/de/intevation/gnv/action/CreateHistogramAction.java
--- a/gnv/src/main/java/de/intevation/gnv/action/CreateHistogramAction.java	Fri Mar 05 09:58:57 2010 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/action/CreateHistogramAction.java	Fri Mar 05 15:50:10 2010 +0000
@@ -1,5 +1,8 @@
 package de.intevation.gnv.action;
 
+import de.intevation.gnv.action.sessionmodel.SessionModel;
+import de.intevation.gnv.action.sessionmodel.SessionModelFactory;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -32,6 +35,9 @@
     throws Exception {
         logger.debug("Create histogram.");
 
+        SessionModel sm = SessionModelFactory.getInstance().getSessionModel(
+            request);
+        sm.setDiagrammOptions(null);
         request.setAttribute("histogram", true);
 
         return super.execute(mapping, form, request, response);
diff -r 97d90e314af5 -r 602521c3fac3 gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_adons_inc.jsp
--- a/gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_adons_inc.jsp	Fri Mar 05 09:58:57 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<div id="diagramoptions">
-    <%--
-    <jsp:include page="/WEB-INF/jsp/includes/display_diagramm_statistics_inc.jsp"></jsp:include>
-    --%>
-</div>