[mapguide-commits] r7149 - sandbox/jng/weblayout/Web/src/mapviewerjava

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-10-22 00:10:20 -0700 (Mon, 22 Oct 2012)
New Revision: 7149

Modified:
   sandbox/jng/weblayout/Web/src/mapviewerjava/common.jsp
   sandbox/jng/weblayout/Web/src/mapviewerjava/mainframe.jsp
   sandbox/jng/weblayout/Web/src/mapviewerjava/mapframe.jsp
Log:
Java viewer updates to read and pass/plug the new Web Layout properties

Modified: sandbox/jng/weblayout/Web/src/mapviewerjava/common.jsp
===================================================================
--- sandbox/jng/weblayout/Web/src/mapviewerjava/common.jsp	2012-10-19 19:18:48 UTC (rev 7148)
+++ sandbox/jng/weblayout/Web/src/mapviewerjava/common.jsp	2012-10-22 07:10:20 UTC (rev 7149)
@@ -286,9 +286,14 @@
 
 String ValidateColorString(String proposedColorString)
 {
+    return ValidateColorString(proposedColorString, 6);
+}
+
+String ValidateColorString(String proposedColorString, int charCount)
+{
     String validColorString = "000000";
     if (proposedColorString != null &&
-        Pattern.matches("^[A-Fa-f0-9]{6}$", proposedColorString))
+        Pattern.matches("^[A-Fa-f0-9]{" + charCount + "}$", proposedColorString))
     {
         validColorString = proposedColorString;
     }

Modified: sandbox/jng/weblayout/Web/src/mapviewerjava/mainframe.jsp
===================================================================
--- sandbox/jng/weblayout/Web/src/mapviewerjava/mainframe.jsp	2012-10-19 19:18:48 UTC (rev 7148)
+++ sandbox/jng/weblayout/Web/src/mapviewerjava/mainframe.jsp	2012-10-22 07:10:20 UTC (rev 7149)
@@ -33,6 +33,7 @@
 String orgSessionId = "";
 String username = "";
 String password = "";
+String startupScriptCode = "";
 String locale = "";
 String mapName = "";
 int curFlyout = 0;
@@ -103,6 +104,12 @@
     MgWebTaskBar taskBar = taskPane.GetTaskBar();
     String mapDef = webLayout.GetMapDefinition();
 
+    startupScriptCode = webLayout.GetStartupScript();
+    String selectionColor = webLayout.GetSelectionColor(); 
+ 	String mapImgFormat = webLayout.GetMapImageFormat(); 
+ 	String selImgFormat = webLayout.GetSelectionImageFormat(); 
+ 	int pointBuffer = webLayout.GetPointSelectionBuffer(); 
+
     boolean showTaskPane = taskPane.IsVisible();
     boolean showTaskBar = taskBar.IsVisible();
     boolean showStatusbar = statusBar.IsVisible();
@@ -445,6 +452,10 @@
                         String.valueOf(webLayout.GetHyperlinkTarget()),
                         webLayout.GetHyperlinkTargetFrame(),
                         webLayout.IsZoomControlVisible()? "1": "0",
+                        selectionColor, 
+                        mapImgFormat, 
+                        selImgFormat, 
+                        String.valueOf(pointBuffer),
                         sessionParam,
                         vpath + "formframe.jsp",
                         String.valueOf(taskBarHeight),
@@ -473,6 +484,10 @@
                         String.valueOf(webLayout.GetHyperlinkTarget()),
                         webLayout.GetHyperlinkTargetFrame(),
                         webLayout.IsZoomControlVisible()? "1": "0",
+                        selectionColor, 
+                        mapImgFormat, 
+                        selImgFormat, 
+                        String.valueOf(pointBuffer),
                         sessionParam,
                         srcTaskFrame,
                         vpath + "formframe.jsp",
@@ -518,6 +533,7 @@
                       userCode,
                       taskItemTexts,
                       selAwareCmds,
+                      startupScriptCode,
                       vpath + "quickplotpanel.jsp",
                       vpath + "measureui.jsp",
                       vpath + "searchprompt.jsp",

Modified: sandbox/jng/weblayout/Web/src/mapviewerjava/mapframe.jsp
===================================================================
--- sandbox/jng/weblayout/Web/src/mapviewerjava/mapframe.jsp	2012-10-19 19:18:48 UTC (rev 7148)
+++ sandbox/jng/weblayout/Web/src/mapviewerjava/mapframe.jsp	2012-10-22 07:10:20 UTC (rev 7149)
@@ -35,6 +35,10 @@
 String type;
 String hlTgt;
 String hlTgtName;
+String selectionColor; 
+String mapImgFormat; 
+String selImgFormat; 
+int pointBufferSize; 
 %>
 
 <%
@@ -178,6 +182,10 @@
                     locale,
                     vpath + "getselectedfeatures.jsp",
                     scaleCreationCode,
+                    selectionColor,
+                    mapImgFormat,
+                    selImgFormat,
+                    String.valueOf(pointBufferSize),
                     vpath + "ajaxviewerabout.jsp",
                     vpath + "legendctrl.jsp",
                     URLEncoder.encode(mapName, "UTF-8"),
@@ -203,5 +211,9 @@
     showProperties = GetIntParameter(request, "SHOWPROP");
     showSlider = GetIntParameter(request, "SHOWSLIDER");
     type = GetParameter(request, "TYPE");
+    selectionColor = ValidateColorString(GetParameter(request, "SELCOLOR"), 8); 
+    mapImgFormat = GetParameter(request, "MAPIMGFORMAT"); 
+    selImgFormat = GetParameter(request, "SELIMGFORMAT"); 
+    pointBufferSize = GetIntParameter(request, "POINTBUFFERSIZE"); 
 }
 %>