[mapguide-commits] r9856 - in trunk/MgDev/Doc/samples/javaviewersample: . findaddress plot query query/classes theme

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Thu Jun 17 09:49:08 PDT 2021


Author: jng
Date: 2021-06-17 09:49:08 -0700 (Thu, 17 Jun 2021)
New Revision: 9856

Modified:
   trunk/MgDev/Doc/samples/javaviewersample/findaddress/findaddress.jsp
   trunk/MgDev/Doc/samples/javaviewersample/plot/plot.jsp
   trunk/MgDev/Doc/samples/javaviewersample/plot/plotmain.jsp
   trunk/MgDev/Doc/samples/javaviewersample/query/classes/feature.jsp
   trunk/MgDev/Doc/samples/javaviewersample/query/classes/query.jsp
   trunk/MgDev/Doc/samples/javaviewersample/query/querycontroller.jsp
   trunk/MgDev/Doc/samples/javaviewersample/query/querymain.jsp
   trunk/MgDev/Doc/samples/javaviewersample/theme/themecontroller.jsp
   trunk/MgDev/Doc/samples/javaviewersample/utilityfunctions.jsp
Log:
#2839: Fix up remainder of javaviewersample to use MapGuideApiEx.jar

Modified: trunk/MgDev/Doc/samples/javaviewersample/findaddress/findaddress.jsp
===================================================================
--- trunk/MgDev/Doc/samples/javaviewersample/findaddress/findaddress.jsp	2021-06-17 15:59:09 UTC (rev 9855)
+++ trunk/MgDev/Doc/samples/javaviewersample/findaddress/findaddress.jsp	2021-06-17 16:49:08 UTC (rev 9856)
@@ -59,7 +59,7 @@
 
         MgUserInformation userInfo = new MgUserInformation(mgSessionId);
         MgSiteConnection siteConnection = new MgSiteConnection();
-        siteConnection.Open(userInfo);
+        siteConnection.open(userInfo);
 
         String address = request.getParameter("address") + ", Sheboygan, WI";
 
@@ -81,11 +81,11 @@
             // the ResourceService object to open the map instance in
             // session state.
 
-            MgResourceService resourceService = (MgResourceService)siteConnection.CreateService(MgServiceType.ResourceService);
-            MgFeatureService featureService = (MgFeatureService)siteConnection.CreateService(MgServiceType.FeatureService);
+            MgResourceService resourceService = (MgResourceService)siteConnection.createService(MgServiceType.ResourceService);
+            MgFeatureService featureService = (MgFeatureService)siteConnection.createService(MgServiceType.FeatureService);
 
             MgMap map = new MgMap(siteConnection);
-            map.Open("Sheboygan");
+            map.open("Sheboygan");
 
             // Check the map for the AddressMarker layer. If it does not
             // exist then create a feature source to store address results
@@ -98,9 +98,9 @@
                 CreateAddressMarkerFeatureSource(featureService, addressMarkerDataResId);
                 addressLayer = CreateAddressMarkerLayer(resourceService, addressMarkerDataResId, mgSessionId);
 
-                map.GetLayers().Insert(0, addressLayer);
+                map.getLayers().insert(0, addressLayer);
             }
-            else if (addressLayer.GetVisible())
+            else if (addressLayer.getVisible())
             {
                 // If the layer exists and is visible, then display the
                 // previous results.
@@ -114,21 +114,21 @@
 
             MgAgfReaderWriter geometryReaderWriter = new MgAgfReaderWriter();
             MgGeometryFactory geometryFactory = new MgGeometryFactory();
-            MgPoint addrPoint = geometryFactory.CreatePoint(geometryFactory.CreateCoordinateXY(Double.parseDouble(addr.lon), Double.parseDouble(addr.lat)));
+            MgPoint addrPoint = geometryFactory.createPoint(geometryFactory.createCoordinateXY(Double.parseDouble(addr.lon), Double.parseDouble(addr.lat)));
 
             MgPropertyCollection properties = new MgPropertyCollection();
-            properties.Add(new MgStringProperty("Address", addr.address1));
-            properties.Add(new MgGeometryProperty("Location", geometryReaderWriter.Write(addrPoint)));
+            properties.add(new MgStringProperty("Address", addr.address1));
+            properties.add(new MgGeometryProperty("Location", geometryReaderWriter.write(addrPoint)));
 
             MgFeatureCommandCollection commands = new MgFeatureCommandCollection();
-            commands.Add(new MgInsertFeatures("AddressMarker", properties));
+            commands.add(new MgInsertFeatures("AddressMarker", properties));
 
-            featureService.UpdateFeatures(addressMarkerDataResId, commands, false);
+            featureService.updateFeatures(addressMarkerDataResId, commands, false);
 
-            addressLayer.SetVisible(true);
-            addressLayer.ForceRefresh();
+            addressLayer.setVisible(true);
+            addressLayer.forceRefresh();
 
-            map.Save();
+            map.save();
 
             success = true;
         }
@@ -139,9 +139,9 @@
     }
     catch (MgException e)
     {
-        out.write("<tr><td>" + e.GetExceptionMessage()+ "</td></tr>");
+        out.write("<tr><td>" + e.getExceptionMessage()+ "</td></tr>");
         out.write("<tr><td class=\"Spacer\"></td></tr>");
-        out.write("<tr><td>" + e.GetDetails() + "</td></tr>");
+        out.write("<tr><td>" + e.getDetails() + "</td></tr>");
     }
 %>
 

Modified: trunk/MgDev/Doc/samples/javaviewersample/plot/plot.jsp
===================================================================
--- trunk/MgDev/Doc/samples/javaviewersample/plot/plot.jsp	2021-06-17 15:59:09 UTC (rev 9855)
+++ trunk/MgDev/Doc/samples/javaviewersample/plot/plot.jsp	2021-06-17 16:49:08 UTC (rev 9856)
@@ -37,10 +37,10 @@
 
         MgUserInformation userInfo = new MgUserInformation(mgSessionId);
         MgSiteConnection siteConnection = new MgSiteConnection();
-        siteConnection.Open(userInfo);
+        siteConnection.open(userInfo);
 
         MgMap map = new MgMap(siteConnection);
-        map.Open("Sheboygan");
+        map.open("Sheboygan");
 
         // Now create an instance of MappingService and use it to plot the
         // current view of the map.
@@ -47,9 +47,9 @@
 
         MgDwfVersion dwfVersion = new MgDwfVersion("6.01", "1.2");
         MgPlotSpecification plotSpec = new MgPlotSpecification(8.5f, 11.0f, MgPageUnitsType.Inches, 0f, 0f, 0f, 0f);
-        plotSpec.SetMargins(0.5f, 0.5f, 0.5f, 0.5f);
+        plotSpec.setMargins(0.5f, 0.5f, 0.5f, 0.5f);
 
-        MgMappingService mappingService = (MgMappingService)siteConnection.CreateService(MgServiceType.MappingService);
+        MgMappingService mappingService = (MgMappingService)siteConnection.createService(MgServiceType.MappingService);
 
         MgLayout layout = null;
         String useLayout = request.getParameter("UseLayout");
@@ -63,12 +63,12 @@
         MgByteReader byteReader = null;
         if (scale <= 0)
         {
-            byteReader = mappingService.GeneratePlot(map, plotSpec, layout, dwfVersion);
+            byteReader = mappingService.generatePlot(map, plotSpec, layout, dwfVersion);
         }
         else
         {
-            MgCoordinate mapCenter = map.GetViewCenter().GetCoordinate();
-            byteReader = mappingService.GeneratePlot(map, mapCenter, scale, plotSpec, layout, dwfVersion);
+            MgCoordinate mapCenter = map.getViewCenter().getCoordinate();
+            byteReader = mappingService.generatePlot(map, mapCenter, scale, plotSpec, layout, dwfVersion);
         }
 
         // Now output the resulting DWF.
@@ -77,7 +77,7 @@
     }
     catch (MgException e)
     {
-        String result = e.GetExceptionMessage() + "<br><br>" + e.GetDetails();
+        String result = e.getExceptionMessage() + "<br><br>" + e.getDetails();
 
         response.setContentType("text/html");
         response.setContentLength(result.length());

Modified: trunk/MgDev/Doc/samples/javaviewersample/plot/plotmain.jsp
===================================================================
--- trunk/MgDev/Doc/samples/javaviewersample/plot/plotmain.jsp	2021-06-17 15:59:09 UTC (rev 9855)
+++ trunk/MgDev/Doc/samples/javaviewersample/plot/plotmain.jsp	2021-06-17 16:49:08 UTC (rev 9856)
@@ -88,7 +88,7 @@
 
         MgUserInformation userInfo = new MgUserInformation(mgSessionId);
         MgSiteConnection siteConnection = new MgSiteConnection();
-        siteConnection.Open(userInfo);
+        siteConnection.open(userInfo);
 
         // Create a ResourcService object and use it to open the Map
         // object from the sessions repository. Use the Map object to
@@ -96,15 +96,15 @@
         // page.
 
         MgMap map = new MgMap(siteConnection);
-        map.Open("Sheboygan");
+        map.open("Sheboygan");
 
-        viewCenter = map.GetViewCenter();
-        viewScale = map.GetViewScale();
+        viewCenter = map.getViewCenter();
+        viewScale = map.getViewScale();
     }
     catch (MgException e)
     {
-        out.write(e.GetExceptionMessage());
-        out.write(e.GetDetails());
+        out.write(e.getExceptionMessage());
+        out.write(e.getDetails());
         return;
     }
 %>
@@ -118,8 +118,8 @@
 <table class="RegText" border="0" cellspacing="0" width="100%">
     <tr><td class="Title"> Plot as DWF<hr></td></tr>
     <tr><td class="SubTitle">Plot a View of the Map</td></tr>
-    <tr><td>View Center X:  <%= nf.format(viewCenter.GetCoordinate().GetX()) %></td></tr>
-    <tr><td>View Center Y:  <%= nf.format(viewCenter.GetCoordinate().GetY()) %></td></tr>
+    <tr><td>View Center X:  <%= nf.format(viewCenter.getCoordinate().getX()) %></td></tr>
+    <tr><td>View Center Y:  <%= nf.format(viewCenter.getCoordinate().getY()) %></td></tr>
     <tr><td class=\"Spacer\"></td></tr>
     <tr><td class=\"Spacer\"></td></tr>
     <tr><td>View Scale:     1:<%= nf.format((int)viewScale) %><hr></td></tr>

Modified: trunk/MgDev/Doc/samples/javaviewersample/query/classes/feature.jsp
===================================================================
--- trunk/MgDev/Doc/samples/javaviewersample/query/classes/feature.jsp	2021-06-17 15:59:09 UTC (rev 9855)
+++ trunk/MgDev/Doc/samples/javaviewersample/query/classes/feature.jsp	2021-06-17 16:49:08 UTC (rev 9856)
@@ -34,8 +34,8 @@
             this.displayValue = displayValue;
             if (centerPoint != null)
             {
-                this.centerX = centerPoint.GetCoordinate().GetX();
-                this.centerY = centerPoint.GetCoordinate().GetY();
+                this.centerX = centerPoint.getCoordinate().getX();
+                this.centerY = centerPoint.getCoordinate().getY();
             }
             this.idList = new HashMap(idList);
         }

Modified: trunk/MgDev/Doc/samples/javaviewersample/query/classes/query.jsp
===================================================================
--- trunk/MgDev/Doc/samples/javaviewersample/query/classes/query.jsp	2021-06-17 15:59:09 UTC (rev 9855)
+++ trunk/MgDev/Doc/samples/javaviewersample/query/classes/query.jsp	2021-06-17 16:49:08 UTC (rev 9856)
@@ -38,7 +38,7 @@
         {
             this.args = incomingArgs;
             this.site = new MgSiteConnection();
-            this.site.Open(new MgUserInformation(this.args.get("SESSION")));
+            this.site.open(new MgUserInformation(this.args.get("SESSION")));
             this.numOperators = new String[] {"Equal to", "Not equal to", "Greater than", "Greater than or equal to", "Less than", "Less than or equal to"};
             this.numExpressions = new String[] {" = %s", " != %s", " > %s", " >= %s", " < %s", " <= %s"};
             this.strOperators = new String[] {"Begins with", "Contains", "Equal to"};
@@ -65,21 +65,21 @@
             return jsonArray.toString();
         }
         
-        public ArrayList<String> GetMapLayerNames() throws MgException
+        public ArrayList<String> getMapLayerNames() throws MgException
         {
             MgMap map = new MgMap(this.site);
-            map.Open(this.args.get("MAPNAME"));
-            MgLayerCollection layers = map.GetLayers();
+            map.open(this.args.get("MAPNAME"));
+            MgLayerCollection layers = map.getLayers();
             ArrayList<String> layerNames = new ArrayList<String>();
 
-            for(int i=0; i<layers.GetCount(); i++)
+            for(int i=0; i<layers.getCount(); i++)
             {
-                MgLayer layer = (MgLayer) layers.GetItem(i);
+                MgLayer layer = (MgLayer) layers.getItem(i);
 
                 //TODO: Exclue Raster and Drawing Layers???
                 
-                if(!layer.GetName().startsWith("_") && !layer.GetFeatureSourceId().toUpperCase().startsWith("SESSION"))
-                    layerNames.add(layer.GetLegendLabel());
+                if(!layer.getName().startsWith("_") && !layer.getFeatureSourceId().toUpperCase().startsWith("SESSION"))
+                    layerNames.add(layer.getLegendLabel());
             }
             Collections.sort(layerNames);
 
@@ -86,26 +86,26 @@
             return layerNames;
         }
         
-        public ArrayList<Property> GetLayerProperties() throws MgException
+        public ArrayList<Property> getLayerProperties() throws MgException
         {
             ArrayList<Property> properties = new ArrayList<Property>();
             MgMap map = new MgMap(this.site);
-            map.Open(this.args.get("MAPNAME"));
-            MgLayer layer = (MgLayer) map.GetLayers().GetItem(this.args.get("LAYERNAME"));
+            map.open(this.args.get("MAPNAME"));
+            MgLayer layer = (MgLayer) map.getLayers().getItem(this.args.get("LAYERNAME"));
 
-            MgClassDefinition classDef = layer.GetClassDefinition();
+            MgClassDefinition classDef = layer.getClassDefinition();
 
-            for(int i=0; i<classDef.GetProperties().GetCount(); i++)
+            for(int i=0; i<classDef.getProperties().getCount(); i++)
             {
-                MgPropertyDefinition propertyDef = classDef.GetProperties().GetItem(i);
+                MgPropertyDefinition propertyDef = classDef.getProperties().getItem(i);
 
-                if(propertyDef.GetPropertyType() == MgFeaturePropertyType.DataProperty)
+                if(propertyDef.getPropertyType() == MgFeaturePropertyType.DataProperty)
                 {
                     MgDataPropertyDefinition propertyDataDef = (MgDataPropertyDefinition) propertyDef;
-                    int dataType = propertyDataDef.GetDataType();
-                    if(this.IsValidDataType(dataType))
+                    int dataType = propertyDataDef.getDataType();
+                    if(this.isValidDataType(dataType))
                     {
-                        properties.add(new Property(propertyDataDef.GetName(), dataType == MgPropertyType.String));
+                        properties.add(new Property(propertyDataDef.getName(), dataType == MgPropertyType.String));
                     }
                 }
             }
@@ -112,54 +112,54 @@
             return properties;
         }
         
-        public boolean ToggleSpatialFilter() throws MgException
+        public boolean toggleSpatialFilter() throws MgException
         {
             boolean result = true;
             MgMap map = new MgMap(this.site);
-            map.Open(this.args.get("MAPNAME"));
+            map.open(this.args.get("MAPNAME"));
 
-            MgLayerCollection layers = map.GetLayers();
-            if(layers.Contains("_QuerySpatialFilter"))
+            MgLayerCollection layers = map.getLayers();
+            if(layers.contains("_QuerySpatialFilter"))
             {
-                MgLayer layer = (MgLayer) layers.GetItem("_QuerySpatialFilter");
+                MgLayer layer = (MgLayer) layers.getItem("_QuerySpatialFilter");
                 if(this.args.get("VISIBLE").equals("true"))
-                    layer.SetVisible(true);
+                    layer.setVisible(true);
                 else
-                    layer.SetVisible(false);
+                    layer.setVisible(false);
 
-                map.Save();
+                map.save();
             }
 
             return result;
         }
 
-        public boolean ShowSpatialFilter() throws MgException, FileNotFoundException, IOException
+        public boolean showSpatialFilter() throws MgException, FileNotFoundException, IOException
         {
             boolean result = true;
             MgResourceIdentifier sdfResId = new MgResourceIdentifier("Session:"+this.args.get("SESSION")+"//Filter.FeatureSource");
 
-            MgResourceService resourceService = (MgResourceService)this.site.CreateService(MgServiceType.ResourceService);
-            MgFeatureService featureService = (MgFeatureService)this.site.CreateService(MgServiceType.FeatureService);
+            MgResourceService resourceService = (MgResourceService)this.site.createService(MgServiceType.ResourceService);
+            MgFeatureService featureService = (MgFeatureService)this.site.createService(MgServiceType.FeatureService);
 
             MgFeatureCommandCollection updateCommands = new MgFeatureCommandCollection();
 
             MgMap map = new MgMap(this.site);
-            map.Open(this.args.get("MAPNAME"));
+            map.open(this.args.get("MAPNAME"));
 
             MgLayer layer = null;
-            MgLayerCollection layers = map.GetLayers();
-            if(layers.Contains("_QuerySpatialFilter"))
+            MgLayerCollection layers = map.getLayers();
+            if(layers.contains("_QuerySpatialFilter"))
             {
-                layer = (MgLayer) layers.GetItem("_QuerySpatialFilter");
-                updateCommands.Add(new MgDeleteFeatures("Filter", "ID like '%'"));
+                layer = (MgLayer) layers.getItem("_QuerySpatialFilter");
+                updateCommands.add(new MgDeleteFeatures("Filter", "ID like '%'"));
             }
             else
             {
                 // Create the Feature Source (SDF)
 
-                MgFeatureSchema sdfSchema = this.CreateFilterSchema();
-                MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "MAPCS", map.GetMapSRS(), sdfSchema);
-                featureService.CreateFeatureSource(sdfResId, sdfParams);
+                MgFeatureSchema sdfSchema = this.createFilterSchema();
+                MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "MAPCS", map.getMapSRS(), sdfSchema);
+                featureService.createFeatureSource(sdfResId, sdfParams);
 
                 // Create the Layer
 
@@ -175,76 +175,76 @@
                     strBuffer.append(lineSep);
                 }
                 String layerDefinition = strBuffer.toString();
-                layerDefinition = layerDefinition.replaceAll("%s", sdfResId.ToString());
+                layerDefinition = layerDefinition.replaceAll("%s", sdfResId.toString());
 
                 MgByteSource byteSource = new MgByteSource(layerDefinition.getBytes(), layerDefinition.length());
-                resourceService.SetResource(layerResId, byteSource.GetReader(), null);
+                resourceService.setResource(layerResId, byteSource.getReader(), null);
 
                 layer = new MgLayer(layerResId, resourceService);
 
-                layer.SetName("_QuerySpatialFilter");
-                layer.SetLegendLabel("_QuerySpatialFilter");
-                layer.SetDisplayInLegend(false);
-                layer.SetSelectable(false);
+                layer.setName("_QuerySpatialFilter");
+                layer.setLegendLabel("_QuerySpatialFilter");
+                layer.setDisplayInLegend(false);
+                layer.setSelectable(false);
 
-                layers.Insert(0, layer);
+                layers.insert(0, layer);
             }
 
             // Make the layer visible
 
-            layer.SetVisible(true);
-            map.Save();
+            layer.setVisible(true);
+            map.save();
 
             // Add the geometry to the filter feature source
 
-            MgPolygon polygon = this.CreatePolygonFromGeomText(this.args.get("GEOMTEXT"));
+            MgPolygon polygon = this.createPolygonFromGeomText(this.args.get("GEOMTEXT"));
             MgAgfReaderWriter agfWriter = new MgAgfReaderWriter();
-            MgByteReader byteReader = agfWriter.Write(polygon);
+            MgByteReader byteReader = agfWriter.write(polygon);
 
             MgPropertyCollection propertyValues = new MgPropertyCollection();
-            propertyValues.Add(new MgGeometryProperty("Geometry", byteReader));
+            propertyValues.add(new MgGeometryProperty("Geometry", byteReader));
 
-            updateCommands.Add(new MgInsertFeatures("Filter", propertyValues));
+            updateCommands.add(new MgInsertFeatures("Filter", propertyValues));
 
-            featureService.UpdateFeatures(sdfResId, updateCommands, false);
+            featureService.updateFeatures(sdfResId, updateCommands, false);
 
             return result;
         }
             
-        public ArrayList<Feature> Execute() throws MgException
+        public ArrayList<Feature> execute() throws MgException
         {
             ArrayList<Feature> result = new ArrayList<Feature>();
 
             MgMap map = new MgMap(this.site);
-            map.Open(this.args.get("MAPNAME"));
-            MgLayer layer = (MgLayer) map.GetLayers().GetItem(this.args.get("LAYERNAME"));
+            map.open(this.args.get("MAPNAME"));
+            MgLayer layer = (MgLayer) map.getLayers().getItem(this.args.get("LAYERNAME"));
 
-            MgFeatureService featureService = (MgFeatureService)this.site.CreateService(MgServiceType.FeatureService);
-            MgResourceIdentifier resId = new MgResourceIdentifier(layer.GetFeatureSourceId());
-            String featureGeometry = layer.GetFeatureGeometryName();
+            MgFeatureService featureService = (MgFeatureService)this.site.createService(MgServiceType.FeatureService);
+            MgResourceIdentifier resId = new MgResourceIdentifier(layer.getFeatureSourceId());
+            String featureGeometry = layer.getFeatureGeometryName();
 
             // Initialize the coordinate system transform
 
-            MgClassDefinition classDef = layer.GetClassDefinition();
-            MgGeometricPropertyDefinition geomProp = (MgGeometricPropertyDefinition) classDef.GetProperties().GetItem(featureGeometry);
-            String spatialContext = geomProp.GetSpatialContextAssociation();
+            MgClassDefinition classDef = layer.getClassDefinition();
+            MgGeometricPropertyDefinition geomProp = (MgGeometricPropertyDefinition) classDef.getProperties().getItem(featureGeometry);
+            String spatialContext = geomProp.getSpatialContextAssociation();
 
             MgCoordinateSystemTransform csTransform = null;
             MgCoordinateSystemTransform csInverseTransform = null;
             MgCoordinateSystemFactory coordSysFactory = new MgCoordinateSystemFactory();
 
-            MgSpatialContextReader scReader = featureService.GetSpatialContexts(resId, false);
-            while(scReader.ReadNext() && csTransform==null)
+            MgSpatialContextReader scReader = featureService.getSpatialContexts(resId, false);
+            while(scReader.readNext() && csTransform==null)
             {
-                if(spatialContext.equals(scReader.GetName()))
+                if(spatialContext.equals(scReader.getName()))
                 {
-                    MgCoordinateSystem source = coordSysFactory.Create(scReader.GetCoordinateSystemWkt());
-                    MgCoordinateSystem target = coordSysFactory.Create(map.GetMapSRS());
-                    csTransform = coordSysFactory.GetTransform(source, target);
-                    csInverseTransform = coordSysFactory.GetTransform(target, source);
+                    MgCoordinateSystem source = coordSysFactory.create(scReader.getCoordinateSystemWkt());
+                    MgCoordinateSystem target = coordSysFactory.create(map.getMapSRS());
+                    csTransform = coordSysFactory.getTransform(source, target);
+                    csInverseTransform = coordSysFactory.getTransform(target, source);
                 }
             }
-            scReader.Close();
+            scReader.close();
 
             // Execute the query
 
@@ -264,29 +264,29 @@
                 {
                     propertyFilter = propertyFilter + this.numExpressions[operator].replaceAll("%s", this.args.get("VALUE"));
                 }
-                queryOptions.SetFilter(propertyFilter);
+                queryOptions.setFilter(propertyFilter);
             }
 
             if(this.args.get("USESPATIALFILTER").equals("true"))
             {
-                MgPolygon polygon = this.CreatePolygonFromGeomText(this.args.get("GEOMTEXT"));
-                MgGeometry geometry = (MgGeometry) polygon.Transform(csInverseTransform);
-                queryOptions.SetSpatialFilter(featureGeometry, geometry, MgFeatureSpatialOperations.Intersects);
+                MgPolygon polygon = this.createPolygonFromGeomText(this.args.get("GEOMTEXT"));
+                MgGeometry geometry = (MgGeometry) polygon.transform(csInverseTransform);
+                queryOptions.setSpatialFilter(featureGeometry, geometry, MgFeatureSpatialOperations.Intersects);
             }
 
             int count = 0;
             MgAgfReaderWriter geometryReaderWriter = new MgAgfReaderWriter();
-            MgFeatureReader featureReader = layer.SelectFeatures(queryOptions);
+            MgFeatureReader featureReader = layer.selectFeatures(queryOptions);
             String displayValue = null;
-            while(featureReader.ReadNext() && (queryMax <= 0 || count < queryMax))
+            while(featureReader.readNext() && (queryMax <= 0 || count < queryMax))
             {
-                MgByteReader byteReader = featureReader.GetGeometry(featureGeometry);
+                MgByteReader byteReader = featureReader.getGeometry(featureGeometry);
                 MgPoint centerPoint = null;
                 try 
                 {
-                    MgGeometry geometry = geometryReaderWriter.Read(byteReader);
-                    centerPoint = geometry.GetCentroid();
-                    centerPoint = (MgPoint) centerPoint.Transform(csTransform);
+                    MgGeometry geometry = geometryReaderWriter.read(byteReader);
+                    centerPoint = geometry.getCentroid();
+                    centerPoint = (MgPoint) centerPoint.transform(csTransform);
                 }
                 catch (MgException ex) //Maybe because of bad geometry
                 {
@@ -293,34 +293,34 @@
                     centerPoint = null;
                 }
 
-                Map idList = new HashMap(this.GetFeatureIdList(featureReader));
+                Map idList = new HashMap(this.getFeatureIdList(featureReader));
                 
-                int propertyType = featureReader.GetPropertyType(this.args.get("OUTPUTPROPERTY"));
+                int propertyType = featureReader.getPropertyType(this.args.get("OUTPUTPROPERTY"));
                 switch(propertyType)
                 {
                     case MgPropertyType.Boolean :
-                        displayValue = String.valueOf(featureReader.GetBoolean(this.args.get("OUTPUTPROPERTY")));
+                        displayValue = String.valueOf(featureReader.getBoolean(this.args.get("OUTPUTPROPERTY")));
                         break;
                     case MgPropertyType.Byte :
-                        displayValue = String.valueOf(featureReader.GetByte(this.args.get("OUTPUTPROPERTY")));
+                        displayValue = String.valueOf(featureReader.getByte(this.args.get("OUTPUTPROPERTY")));
                         break;
                     case MgPropertyType.Single :
-                        displayValue = String.valueOf(featureReader.GetSingle(this.args.get("OUTPUTPROPERTY")));
+                        displayValue = String.valueOf(featureReader.getSingle(this.args.get("OUTPUTPROPERTY")));
                         break;
                     case MgPropertyType.Double :
-                        displayValue = String.valueOf(featureReader.GetDouble(this.args.get("OUTPUTPROPERTY")));
+                        displayValue = String.valueOf(featureReader.getDouble(this.args.get("OUTPUTPROPERTY")));
                         break;
                     case MgPropertyType.Int16 :
-                        displayValue = String.valueOf(featureReader.GetInt16(this.args.get("OUTPUTPROPERTY")));
+                        displayValue = String.valueOf(featureReader.getInt16(this.args.get("OUTPUTPROPERTY")));
                         break;
                     case MgPropertyType.Int32 :
-                        displayValue = String.valueOf(featureReader.GetInt32(this.args.get("OUTPUTPROPERTY")));
+                        displayValue = String.valueOf(featureReader.getInt32(this.args.get("OUTPUTPROPERTY")));
                         break;
                     case MgPropertyType.Int64 :
-                        displayValue = String.valueOf(featureReader.GetInt64(this.args.get("OUTPUTPROPERTY")));
+                        displayValue = String.valueOf(featureReader.getInt64(this.args.get("OUTPUTPROPERTY")));
                         break;
                     case MgPropertyType.String :
-                        displayValue = featureReader.GetString(this.args.get("OUTPUTPROPERTY"));
+                        displayValue = featureReader.getString(this.args.get("OUTPUTPROPERTY"));
                         break;
                     case MgPropertyType.DateTime :
                     case MgPropertyType.Null :
@@ -339,15 +339,15 @@
             return result;
         }
 
-        public String GetSelectionXML() throws MgException, JSONException
+        public String getSelectionXML() throws MgException, JSONException
         {
-            MgFeatureService featureService = (MgFeatureService)this.site.CreateService(MgServiceType.FeatureService);
+            MgFeatureService featureService = (MgFeatureService)this.site.createService(MgServiceType.FeatureService);
 
             MgMap map = new MgMap(this.site);
-            map.Open(this.args.get("MAPNAME"));
-            MgLayer layer = (MgLayer) map.GetLayers().GetItem(this.args.get("LAYERNAME"));
-            String featureClass = layer.GetFeatureClassName();
-            MgClassDefinition classDef = layer.GetClassDefinition();
+            map.open(this.args.get("MAPNAME"));
+            MgLayer layer = (MgLayer) map.getLayers().getItem(this.args.get("LAYERNAME"));
+            String featureClass = layer.getFeatureClassName();
+            MgClassDefinition classDef = layer.getClassDefinition();
 
             MgPropertyCollection properties = new MgPropertyCollection();
             MgDataPropertyDefinition dataPropDef = null;
@@ -358,32 +358,32 @@
             {
                 String key = (String) it.next();
                 Object value = json.get(key);
-                dataPropDef = (MgDataPropertyDefinition) classDef.GetProperties().GetItem(key);
-                switch(dataPropDef.GetDataType())
+                dataPropDef = (MgDataPropertyDefinition) classDef.getProperties().getItem(key);
+                switch(dataPropDef.getDataType())
                 {
                     case MgPropertyType.Boolean :
-                        properties.Add(new MgBooleanProperty(key, Boolean.valueOf(value.toString())));
+                        properties.add(new MgBooleanProperty(key, Boolean.valueOf(value.toString())));
                         break;
                     case MgPropertyType.Byte :
-                        properties.Add(new MgByteProperty(key, Byte.valueOf(value.toString())));
+                        properties.add(new MgByteProperty(key, Byte.valueOf(value.toString())));
                         break;
                     case MgPropertyType.Single :
-                        properties.Add(new MgSingleProperty(key, Float.valueOf(value.toString())));
+                        properties.add(new MgSingleProperty(key, Float.valueOf(value.toString())));
                         break;
                     case MgPropertyType.Double :
-                        properties.Add(new MgDoubleProperty(key, Double.valueOf(value.toString())));
+                        properties.add(new MgDoubleProperty(key, Double.valueOf(value.toString())));
                         break;
                     case MgPropertyType.Int16 :
-                        properties.Add(new MgInt16Property(key, Short.valueOf(value.toString())));
+                        properties.add(new MgInt16Property(key, Short.valueOf(value.toString())));
                         break;
                     case MgPropertyType.Int32 :
-                        properties.Add(new MgInt32Property(key, Integer.valueOf(value.toString())));
+                        properties.add(new MgInt32Property(key, Integer.valueOf(value.toString())));
                         break;
                     case MgPropertyType.Int64 :
-                        properties.Add(new MgInt64Property(key, Long.valueOf(value.toString())));
+                        properties.add(new MgInt64Property(key, Long.valueOf(value.toString())));
                         break;
                     case MgPropertyType.String :
-                        properties.Add(new MgStringProperty(key, value.toString()));
+                        properties.add(new MgStringProperty(key, value.toString()));
                         break;
                     case MgPropertyType.DateTime :
                     case MgPropertyType.Null :
@@ -397,49 +397,49 @@
             }
 
             MgSelection selection = new MgSelection(map);
-            selection.AddFeatureIds(layer, featureClass, properties);
+            selection.addFeatureIds(layer, featureClass, properties);
 
-            return selection.ToXml();
+            return selection.toXml();
         }
             
-        private Map GetFeatureIdList(MgFeatureReader featureReader) throws MgException
+        private Map getFeatureIdList(MgFeatureReader featureReader) throws MgException
         {
-            MgClassDefinition classDef = featureReader.GetClassDefinition();
-            MgPropertyDefinitionCollection idProps = classDef.GetIdentityProperties();
+            MgClassDefinition classDef = featureReader.getClassDefinition();
+            MgPropertyDefinitionCollection idProps = classDef.getIdentityProperties();
             Map idList = new HashMap();
 
-            for(int i=0; i<idProps.GetCount(); i++)
+            for(int i=0; i<idProps.getCount(); i++)
             {
-                MgDataPropertyDefinition idProp = (MgDataPropertyDefinition) idProps.GetItem(i);
+                MgDataPropertyDefinition idProp = (MgDataPropertyDefinition) idProps.getItem(i);
 
-                switch(idProp.GetDataType())
+                switch(idProp.getDataType())
                 {
                     case MgPropertyType.Boolean :
-                        idList.put(idProp.GetName(), featureReader.GetBoolean(idProp.GetName()));
+                        idList.put(idProp.getName(), featureReader.getBoolean(idProp.getName()));
                         break;
                     case MgPropertyType.Byte :
-                        idList.put(idProp.GetName(), featureReader.GetByte(idProp.GetName()));
+                        idList.put(idProp.getName(), featureReader.getByte(idProp.getName()));
                         break;
                     case MgPropertyType.Single :
-                        idList.put(idProp.GetName(), featureReader.GetSingle(idProp.GetName()));
+                        idList.put(idProp.getName(), featureReader.getSingle(idProp.getName()));
                         break;
                     case MgPropertyType.Double :
-                        idList.put(idProp.GetName(), featureReader.GetDouble(idProp.GetName()));
+                        idList.put(idProp.getName(), featureReader.getDouble(idProp.getName()));
                         break;
                     case MgPropertyType.Int16 :
-                        idList.put(idProp.GetName(), featureReader.GetInt16(idProp.GetName()));
+                        idList.put(idProp.getName(), featureReader.getInt16(idProp.getName()));
                         break;
                     case MgPropertyType.Int32 :
-                        idList.put(idProp.GetName(), featureReader.GetInt32(idProp.GetName()));
+                        idList.put(idProp.getName(), featureReader.getInt32(idProp.getName()));
                         break;
                     case MgPropertyType.Int64 :
-                        idList.put(idProp.GetName(), featureReader.GetInt64(idProp.GetName()));
+                        idList.put(idProp.getName(), featureReader.getInt64(idProp.getName()));
                         break;
                     case MgPropertyType.String :
-                        idList.put(idProp.GetName(), featureReader.GetString(idProp.GetName()));
+                        idList.put(idProp.getName(), featureReader.getString(idProp.getName()));
                         break;
                     case MgPropertyType.DateTime :
-                        idList.put(idProp.GetName(), featureReader.GetDateTime(idProp.GetName()));
+                        idList.put(idProp.getName(), featureReader.getDateTime(idProp.getName()));
                         break;
                     case MgPropertyType.Null :
                     case MgPropertyType.Blob :
@@ -454,7 +454,7 @@
             return idList;
         }
             
-        private boolean IsValidDataType(int type)
+        private boolean isValidDataType(int type)
         {
             boolean valid = true;
 
@@ -473,39 +473,39 @@
             return valid;
         }
             
-        private MgFeatureSchema CreateFilterSchema() throws MgException
+        private MgFeatureSchema createFilterSchema() throws MgException
         {
             MgFeatureSchema filterSchema = new MgFeatureSchema();
-            filterSchema.SetName("FilterSchema");
+            filterSchema.setName("FilterSchema");
 
             MgClassDefinition filterClass = new MgClassDefinition();
-            filterClass.SetName("Filter");
-            MgPropertyDefinitionCollection properties = filterClass.GetProperties();
+            filterClass.setName("Filter");
+            MgPropertyDefinitionCollection properties = filterClass.getProperties();
 
             MgDataPropertyDefinition idProperty = new MgDataPropertyDefinition("ID");
-            idProperty.SetDataType(MgPropertyType.Int32);
-            idProperty.SetReadOnly(true);
-            idProperty.SetNullable(false);
-            idProperty.SetAutoGeneration(true);
-            properties.Add(idProperty);
+            idProperty.setDataType(MgPropertyType.Int32);
+            idProperty.setReadOnly(true);
+            idProperty.setNullable(false);
+            idProperty.setAutoGeneration(true);
+            properties.add(idProperty);
 
             MgGeometricPropertyDefinition geometryProperty = new MgGeometricPropertyDefinition("Geometry");
-            geometryProperty.SetGeometryTypes(MgFeatureGeometricType.Surface);
-            geometryProperty.SetHasElevation(false);
-            geometryProperty.SetHasMeasure(false);
-            geometryProperty.SetReadOnly(false);
-            geometryProperty.SetSpatialContextAssociation("MAPCS");
-            properties.Add(geometryProperty);
+            geometryProperty.setGeometryTypes(MgFeatureGeometricType.Surface);
+            geometryProperty.setHasElevation(false);
+            geometryProperty.setHasMeasure(false);
+            geometryProperty.setReadOnly(false);
+            geometryProperty.setSpatialContextAssociation("MAPCS");
+            properties.add(geometryProperty);
 
-            filterClass.GetIdentityProperties().Add(idProperty);
-            filterClass.SetDefaultGeometryPropertyName("Geometry");
+            filterClass.getIdentityProperties().add(idProperty);
+            filterClass.setDefaultGeometryPropertyName("Geometry");
 
-            filterSchema.GetClasses().Add(filterClass);
+            filterSchema.getClasses().add(filterClass);
 
             return filterSchema;
         }
         
-        private MgPolygon CreatePolygonFromGeomText(String geomText) throws MgException
+        private MgPolygon createPolygonFromGeomText(String geomText) throws MgException
         {
             MgGeometryFactory geometryFactory = new MgGeometryFactory();
 
@@ -515,12 +515,12 @@
             MgCoordinateCollection coords = new MgCoordinateCollection();
             for(int i=0; i<count; i++)
             {
-                MgCoordinate coord = geometryFactory.CreateCoordinateXY(Double.valueOf(vertices[(i*2)+1]), Double.valueOf(vertices[(i*2)+2]));
-                coords.Add(coord);
+                MgCoordinate coord = geometryFactory.createCoordinateXY(Double.valueOf(vertices[(i*2)+1]), Double.valueOf(vertices[(i*2)+2]));
+                coords.add(coord);
             }
 
-            MgLinearRing linearRing = geometryFactory.CreateLinearRing(coords);
-            MgPolygon polygon = geometryFactory.CreatePolygon(linearRing, null);
+            MgLinearRing linearRing = geometryFactory.createLinearRing(coords);
+            MgPolygon polygon = geometryFactory.createPolygon(linearRing, null);
 
             return polygon;
         }

Modified: trunk/MgDev/Doc/samples/javaviewersample/query/querycontroller.jsp
===================================================================
--- trunk/MgDev/Doc/samples/javaviewersample/query/querycontroller.jsp	2021-06-17 15:59:09 UTC (rev 9855)
+++ trunk/MgDev/Doc/samples/javaviewersample/query/querycontroller.jsp	2021-06-17 16:49:08 UTC (rev 9856)
@@ -51,7 +51,7 @@
         {
             case Command.GETLAYERPROPERTIES:
                 responseType = "text/plain";
-                ArrayList<Property> arrayList = query.GetLayerProperties();
+                ArrayList<Property> arrayList = query.getLayerProperties();
                 for(int i=0;i<arrayList.size();i++)
                 {
                     jsonObj.put("name", arrayList.get(i).name);
@@ -62,15 +62,15 @@
                 break;
             case Command.TOGGLESPATIALFILTER:
                 responseType = "text/plain";
-                responseString = json.put(query.ToggleSpatialFilter()).toString();
+                responseString = json.put(query.toggleSpatialFilter()).toString();
                 break;
             case Command.SHOWSPATIALFILTER:
                 responseType = "text/plain";
-                responseString = json.put(query.ShowSpatialFilter()).toString();
+                responseString = json.put(query.showSpatialFilter()).toString();
                 break;
             case Command.EXECUTEQUERY:
                 responseType = "text/plain";
-                ArrayList<Feature> resultList = query.Execute();
+                ArrayList<Feature> resultList = query.execute();
                 for(int i=0;i<resultList.size();i++)
                 {
                     jsonObj.put("displayValue", resultList.get(i).displayValue);
@@ -83,7 +83,7 @@
                 break;
             case Command.GETSELECTIONXML:
                 responseType = "text/xml";
-                responseString = query.GetSelectionXML();
+                responseString = query.getSelectionXML();
                 break;
         }
     }

Modified: trunk/MgDev/Doc/samples/javaviewersample/query/querymain.jsp
===================================================================
--- trunk/MgDev/Doc/samples/javaviewersample/query/querymain.jsp	2021-06-17 15:59:09 UTC (rev 9855)
+++ trunk/MgDev/Doc/samples/javaviewersample/query/querymain.jsp	2021-06-17 16:49:08 UTC (rev 9856)
@@ -46,12 +46,12 @@
     
         query = new Query(args);
         
-        layerNames = query.GetMapLayerNames();
+        layerNames = query.getMapLayerNames();
     }
     catch (MgException e)
     {
-        errorMsg = e.GetExceptionMessage();
-        errorDetail = e.GetDetails();
+        errorMsg = e.getExceptionMessage();
+        errorDetail = e.getDetails();
     }
 %>
 <html>
@@ -202,10 +202,7 @@
             else
                 reqHandler = new XMLHttpRequest();
 
-            if (msie)
-                reqHandler.open("POST", "querycontroller.jsp", false);
-            else
-                reqHandler.open("POST", "../javaviewersample/query/querycontroller.jsp", false);
+            reqHandler.open("POST", "querycontroller.jsp", false);
             reqHandler.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
             reqHandler.send(reqParams);
 

Modified: trunk/MgDev/Doc/samples/javaviewersample/theme/themecontroller.jsp
===================================================================
--- trunk/MgDev/Doc/samples/javaviewersample/theme/themecontroller.jsp	2021-06-17 15:59:09 UTC (rev 9855)
+++ trunk/MgDev/Doc/samples/javaviewersample/theme/themecontroller.jsp	2021-06-17 16:49:08 UTC (rev 9856)
@@ -55,7 +55,7 @@
         {
             case Command.GETLAYERINFO:
                 responseType = "text/plain";
-                LayerInfo layerInfo = theme.GetLayerInfo();
+                LayerInfo layerInfo = theme.getLayerInfo();
                 ArrayList<Property> propArrayList = layerInfo.properties;
                 
                 for(int i=0; i<propArrayList.size(); i++)
@@ -83,7 +83,7 @@
                 break;
             case Command.GETPROPERTYMINMAXCOUNT:
                 responseType = "text/plain";
-                ArrayList<String> arrayList = theme.GetPropertyMinMaxCount();
+                ArrayList<String> arrayList = theme.getPropertyMinMaxCount();
                 for(int i=0;i<arrayList.size();i++)
                 {
                     jsonArr.put(arrayList.get(i));
@@ -92,7 +92,7 @@
                 break;
             case Command.APPLYTHEME:
                 responseType = "text/plain";
-		responseString = theme.ApplyTheme();
+                responseString = theme.applyTheme();
                 break;
         }
     }

Modified: trunk/MgDev/Doc/samples/javaviewersample/utilityfunctions.jsp
===================================================================
--- trunk/MgDev/Doc/samples/javaviewersample/utilityfunctions.jsp	2021-06-17 15:59:09 UTC (rev 9855)
+++ trunk/MgDev/Doc/samples/javaviewersample/utilityfunctions.jsp	2021-06-17 16:49:08 UTC (rev 9856)
@@ -34,7 +34,7 @@
     String realpath = getServletContext().getRealPath("/");
     // Initialize web tier with the site configuration file.  The config
     // file should be in the same folder as this script.
-    String xmlTemplatePath = realpath + "javaviewersample\\query\\templates\\filterlayerdefinition.xml";
+    String xmlTemplatePath = realpath + "javaviewersample/query/templates/filterlayerdefinition.xml";
     return xmlTemplatePath;
 }
 
@@ -43,7 +43,7 @@
     String realpath = getServletContext().getRealPath("/");
     // Initialize web tier with the site configuration file.  The config
     // file should be in the same folder as this script.
-    String xmlTemplatePath = realpath + "javaviewersample\\theme\\templates\\arearuletemplate.xml";
+    String xmlTemplatePath = realpath + "javaviewersample/theme/templates/arearuletemplate.xml";
     return xmlTemplatePath;
 }
 



More information about the mapguide-commits mailing list