[mapguide-commits] r9854 - trunk/MgDev/Web/src/mapviewerjava
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Jun 17 08:58:40 PDT 2021
Author: jng
Date: 2021-06-17 08:58:40 -0700 (Thu, 17 Jun 2021)
New Revision: 9854
Modified:
trunk/MgDev/Web/src/mapviewerjava/ajaxviewerabout.jsp
trunk/MgDev/Web/src/mapviewerjava/buffer.jsp
trunk/MgDev/Web/src/mapviewerjava/common.jsp
trunk/MgDev/Web/src/mapviewerjava/gettingstarted.jsp
trunk/MgDev/Web/src/mapviewerjava/init.jsp
trunk/MgDev/Web/src/mapviewerjava/legend.jsp
trunk/MgDev/Web/src/mapviewerjava/mainframe.jsp
trunk/MgDev/Web/src/mapviewerjava/mapframe.jsp
trunk/MgDev/Web/src/mapviewerjava/measure.jsp
trunk/MgDev/Web/src/mapviewerjava/quickplotgeneratepicture.jsp
trunk/MgDev/Web/src/mapviewerjava/search.jsp
trunk/MgDev/Web/src/mapviewerjava/selectwithin.jsp
trunk/MgDev/Web/src/mapviewerjava/serveradminhelper.jsp
trunk/MgDev/Web/src/mapviewerjava/taskframe.jsp
Log:
#2839: Migrate Java AJAX viewer over to use MapGuideApiEx.jar
Modified: trunk/MgDev/Web/src/mapviewerjava/ajaxviewerabout.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/ajaxviewerabout.jsp 2021-06-12 09:03:31 UTC (rev 9853)
+++ trunk/MgDev/Web/src/mapviewerjava/ajaxviewerabout.jsp 2021-06-17 15:58:40 UTC (rev 9854)
@@ -57,17 +57,17 @@
// Obtain server version info
//
MgUserInformation userInfo = new MgUserInformation();
- userInfo.SetMgSessionId(sessionId);
- userInfo.SetClientIp(GetClientIp(request));
- userInfo.SetClientAgent(GetClientAgent());
+ userInfo.setMgSessionId(sessionId);
+ userInfo.setClientIp(GetClientIp(request));
+ userInfo.setClientAgent(GetClientAgent());
MgSite site = new MgSite();
- site.Open(userInfo);
+ site.open(userInfo);
MgServerAdmin serverAdmin = new MgServerAdmin();
- serverAdmin.Open(userInfo);
- MgPropertyCollection infoProps = serverAdmin.GetInformationProperties();
- MgStringProperty versionProp = (MgStringProperty)infoProps.GetItem(MgServerInformationProperties.ServerVersion);
- serverVersion = versionProp.GetValue();
+ serverAdmin.open(userInfo);
+ MgPropertyCollection infoProps = serverAdmin.getInformationProperties();
+ MgStringProperty versionProp = (MgStringProperty)infoProps.getItem(MgServerInformationProperties.ServerVersion);
+ serverVersion = versionProp.getValue();
String vals[] = { titleBar,
titleBar,
Modified: trunk/MgDev/Web/src/mapviewerjava/buffer.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/buffer.jsp 2021-06-12 09:03:31 UTC (rev 9853)
+++ trunk/MgDev/Web/src/mapviewerjava/buffer.jsp 2021-06-17 15:58:40 UTC (rev 9854)
@@ -87,14 +87,14 @@
InitializeWebTier();
MgUserInformation cred = new MgUserInformation(sessionId);
- cred.SetClientIp(GetClientIp(request));
- cred.SetClientAgent(GetClientAgent());
+ cred.setClientIp(GetClientIp(request));
+ cred.setClientAgent(GetClientAgent());
//connect to the site and get a feature service and a resource service instances
MgSiteConnection site = new MgSiteConnection();
- site.Open(cred);
- MgFeatureService featureSrvc = (MgFeatureService)site.CreateService(MgServiceType.FeatureService);
- MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
+ site.open(cred);
+ MgFeatureService featureSrvc = (MgFeatureService)site.createService(MgServiceType.FeatureService);
+ MgResourceService resourceSrvc = (MgResourceService)site.createService(MgServiceType.ResourceService);
MgResourceIdentifier dataSourceId = new MgResourceIdentifier(dataSource);
MgResourceIdentifier layerDefId = new MgResourceIdentifier(layerDef);
@@ -102,11 +102,11 @@
//load the map runtime state
//
MgMap map = new MgMap(site);
- map.Open(mapName);
+ map.open(mapName);
//locate the buffer layer in the map. It might or might not already exist
//
- MgLayerCollection layers = map.GetLayers();
+ MgLayerCollection layers = map.getLayers();
MgLayer layer = FindLayer(layers, bufferName);
String[] layerNames = layersParam.split(",");
@@ -124,14 +124,14 @@
MgCoordinateSystemFactory srsFactory = new MgCoordinateSystemFactory();
String srsDefMap = GetMapSrs(map);
String mapSrsUnits = "";
- MgCoordinateSystem srsMap = srsFactory.Create(srsDefMap);
- boolean arbitraryMapSrs = (srsMap.GetType() == MgCoordinateSystemType.Arbitrary);
+ MgCoordinateSystem srsMap = srsFactory.create(srsDefMap);
+ boolean arbitraryMapSrs = (srsMap.getType() == MgCoordinateSystemType.Arbitrary);
if(arbitraryMapSrs)
- mapSrsUnits = srsMap.GetUnits();
+ mapSrsUnits = srsMap.getUnits();
//Create/Modify layer definition
MgByteReader layerDefContent = BuildLayerDefinitionContent();
- resourceSrvc.SetResource(layerDefId, layerDefContent, null);
+ resourceSrvc.setResource(layerDefId, layerDefContent, null);
if(layer == null)
{
@@ -140,44 +140,44 @@
//
MgClassDefinition classDef = new MgClassDefinition();
- classDef.SetName(featureName);
- classDef.SetDescription(MgLocalizer.GetString("BUFFERCLASSDESCR", locale));
- classDef.SetDefaultGeometryPropertyName("GEOM");
+ classDef.setName(featureName);
+ classDef.setDescription(MgLocalizer.GetString("BUFFERCLASSDESCR", locale));
+ classDef.setDefaultGeometryPropertyName("GEOM");
//Set KEY property
MgDataPropertyDefinition propKey = new MgDataPropertyDefinition("KEY");
- propKey.SetDataType(MgPropertyType.Int32);
- propKey.SetAutoGeneration(true);
- propKey.SetReadOnly(true);
- classDef.GetIdentityProperties().Add(propKey);
- classDef.GetProperties().Add(propKey);
+ propKey.setDataType(MgPropertyType.Int32);
+ propKey.setAutoGeneration(true);
+ propKey.setReadOnly(true);
+ classDef.getIdentityProperties().add(propKey);
+ classDef.getProperties().add(propKey);
//Set ID property. Hold this segment ID
MgDataPropertyDefinition propID = new MgDataPropertyDefinition("ID");
- propID.SetDataType(MgPropertyType.Int32);
- classDef.GetProperties().Add(propID);
+ propID.setDataType(MgPropertyType.Int32);
+ classDef.getProperties().add(propID);
//Set geometry property
MgGeometricPropertyDefinition geomProp = new MgGeometricPropertyDefinition("GEOM");
- //geomProp.SetGeometryTypes(MgFeatureGeometricType.mfgtSurface); //TODO use the constant when exposed
- geomProp.SetGeometryTypes(4);
- classDef.GetProperties().Add(geomProp);
+ //geomProp.setGeometryTypes(MgFeatureGeometricType.mfgtSurface); //TODO use the constant when exposed
+ geomProp.setGeometryTypes(4);
+ classDef.getProperties().add(geomProp);
//Create the schema
MgFeatureSchema schema = new MgFeatureSchema("BufferSchema", MgLocalizer.GetString("BUFFERSCHEMADESCR", locale));
- schema.GetClasses().Add(classDef);
+ schema.getClasses().add(classDef);
//finally, creation of the feature source
MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "LatLong", srsDefMap, schema);
- featureSrvc.CreateFeatureSource(dataSourceId, sdfParams);
+ featureSrvc.createFeatureSource(dataSourceId, sdfParams);
//Add layer to map
layer = new MgLayer(layerDefId, resourceSrvc);
- layer.SetName(bufferName);
- layer.SetLegendLabel(bufferName);
- layer.SetDisplayInLegend(true);
- layer.SetSelectable(true);
- layers.Insert(0, layer);
+ layer.setName(bufferName);
+ layer.setLegendLabel(bufferName);
+ layer.setDisplayInLegend(true);
+ layer.setSelectable(true);
+ layers.insert(0, layer);
}
else
{
@@ -187,7 +187,7 @@
}
MgSelection sel = new MgSelection(map, selText);
- MgReadOnlyLayerCollection selLayers = sel.GetLayers();
+ MgReadOnlyLayerCollection selLayers = sel.getLayers();
MgAgfReaderWriter agfRW = new MgAgfReaderWriter();
MgGeometryCollection bufferGeometries = new MgGeometryCollection();
@@ -203,11 +203,11 @@
MgGeometryCollection inputGeometries = new MgGeometryCollection();
int bufferFeatures = 0;
- for(int li =0; li < selLayers.GetCount(); li++)
+ for(int li =0; li < selLayers.getCount(); li++)
{
- MgLayer selLayer = (MgLayer) selLayers.GetItem(li);
+ MgLayer selLayer = (MgLayer) selLayers.getItem(li);
boolean inputLayer = false;
- String selLayerName = selLayer.GetName();
+ String selLayerName = selLayer.getName();
for(int il = 0; il < layerNames.length; il++)
{
if(layerNames[il].equals(selLayerName))
@@ -221,11 +221,11 @@
// get the data source SRS
//
- MgResourceIdentifier featSourceId = new MgResourceIdentifier(selLayer.GetFeatureSourceId());
- MgSpatialContextReader ctxs = featureSrvc.GetSpatialContexts(featSourceId, false);
+ MgResourceIdentifier featSourceId = new MgResourceIdentifier(selLayer.getFeatureSourceId());
+ MgSpatialContextReader ctxs = featureSrvc.getSpatialContexts(featSourceId, false);
String srsDefDs = "";
- if(ctxs != null && ctxs.ReadNext())
- srsDefDs = ctxs.GetCoordinateSystemWkt();
+ if(ctxs != null && ctxs.readNext())
+ srsDefDs = ctxs.getCoordinateSystemWkt();
if(srsDefDs == null || srsDefDs.length() == 0)
{
@@ -233,12 +233,12 @@
continue;
}
- srsDs = srsFactory.Create(srsDefDs);
- boolean arbitraryDsSrs = (srsDs.GetType() == MgCoordinateSystemType.Arbitrary);
+ srsDs = srsFactory.create(srsDefDs);
+ boolean arbitraryDsSrs = (srsDs.getType() == MgCoordinateSystemType.Arbitrary);
String dsSrsUnits = "";
if(arbitraryDsSrs)
- dsSrsUnits = srsDs.GetUnits();
+ dsSrsUnits = srsDs.getUnits();
// exclude layer if:
// the map is non-arbitrary and the layer is arbitrary or vice-versa
@@ -253,12 +253,12 @@
// calculate distance in the data source SRS units
//
- double dist = srsDs.ConvertMetersToCoordinateSystemUnits(distance);
+ double dist = srsDs.convertMetersToCoordinateSystemUnits(distance);
// calculate great circle unless data source srs is arbitrary
MgCoordinateSystemMeasure measure;
if(!arbitraryDsSrs)
- measure = srsDs.GetMeasure();
+ measure = srsDs.getMeasure();
else
measure = null;
@@ -265,43 +265,43 @@
// create a SRS transformer if necessary
MgCoordinateSystemTransform srsXform;
if(!srsDefDs.equals(srsDefMap))
- srsXform = srsFactory.GetTransform(srsDs, srsMap);
+ srsXform = srsFactory.getTransform(srsDs, srsMap);
else
srsXform = null;
- String featureClassName = selLayer.GetFeatureClassName();
- String filter = sel.GenerateFilter(selLayer, featureClassName);
+ String featureClassName = selLayer.getFeatureClassName();
+ String filter = sel.generateFilter(selLayer, featureClassName);
if(filter == null || filter.length() == 0)
continue;
- MgClassDefinition clsDef = selLayer.GetClassDefinition();
+ MgClassDefinition clsDef = selLayer.getClassDefinition();
MgFeatureQueryOptions query = BuildFeatureQueryOptions(clsDef);
- query.SetFilter(filter);
+ query.setFilter(filter);
- MgResourceIdentifier featureSource = new MgResourceIdentifier(selLayer.GetFeatureSourceId());
+ MgResourceIdentifier featureSource = new MgResourceIdentifier(selLayer.getFeatureSourceId());
- MgFeatureReader features = featureSrvc.SelectFeatures(featureSource, featureClassName, query);
+ MgFeatureReader features = featureSrvc.selectFeatures(featureSource, featureClassName, query);
- if(features.ReadNext())
+ if(features.readNext())
{
- MgClassDefinition classDef = features.GetClassDefinition();
- String geomPropName = classDef.GetDefaultGeometryPropertyName();
+ MgClassDefinition classDef = features.getClassDefinition();
+ String geomPropName = classDef.getDefaultGeometryPropertyName();
do
{
if (geomPropName == null || geomPropName.equals("")) {
- geomPropName = selLayer.GetFeatureGeometryName();
+ geomPropName = selLayer.getFeatureGeometryName();
}
- MgByteReader geomReader = features.GetGeometry(geomPropName);
- MgGeometry geom = agfRW.Read(geomReader);
+ MgByteReader geomReader = features.getGeometry(geomPropName);
+ MgGeometry geom = agfRW.read(geomReader);
if(merge == 0)
{
- geomBuffer = geom.Buffer(dist, measure);
+ geomBuffer = geom.buffer(dist, measure);
if (geomBuffer != null)
{
if(srsXform != null)
- geomBuffer = (MgGeometry)geomBuffer.Transform(srsXform);
+ geomBuffer = (MgGeometry)geomBuffer.transform(srsXform);
AddFeatureToCollection(propCollection, agfRW, featId++, geomBuffer);
bufferFeatures++;
}
@@ -309,29 +309,29 @@
else
{
if(srsXform != null)
- geom = (MgGeometry)geom.Transform(srsXform);
- inputGeometries.Add(geom);
+ geom = (MgGeometry)geom.transform(srsXform);
+ inputGeometries.add(geom);
}
}
- while(features.ReadNext());
+ while(features.readNext());
- features.Close();
+ features.close();
}
}
if(merge == 1)
{
- if(inputGeometries.GetCount() > 0)
+ if(inputGeometries.getCount() > 0)
{
- double dist = srsMap.ConvertMetersToCoordinateSystemUnits(distance);
+ double dist = srsMap.convertMetersToCoordinateSystemUnits(distance);
MgCoordinateSystemMeasure measure;
if(!arbitraryMapSrs)
- measure = srsMap.GetMeasure();
+ measure = srsMap.getMeasure();
else
measure = null;
MgGeometryFactory geomFactory = new MgGeometryFactory();
- geomBuffer = geomFactory.CreateMultiGeometry(inputGeometries).Buffer(dist, measure);
+ geomBuffer = geomFactory.createMultiGeometry(inputGeometries).buffer(dist, measure);
if (geomBuffer != null)
{
AddFeatureToCollection(propCollection, agfRW, featId, geomBuffer);
@@ -340,19 +340,19 @@
}
}
- if(propCollection.GetCount() > 0)
+ if(propCollection.getCount() > 0)
{
- commands.Add(new MgInsertFeatures(featureName, propCollection));
+ commands.add(new MgInsertFeatures(featureName, propCollection));
//Insert the features in the temporary data source
//
- ReleaseReader(featureSrvc.UpdateFeatures(dataSourceId, commands, false), commands);
+ ReleaseReader(featureSrvc.updateFeatures(dataSourceId, commands, false), commands);
}
// Save the new map state
//
- layer.ForceRefresh();
- map.Save();
+ layer.forceRefresh();
+ map.save();
//build report message
String title = MgLocalizer.GetString("BUFFERREPORTTITLE", locale);
@@ -378,7 +378,7 @@
}
catch(MgException exc)
{
- OnError(MgLocalizer.GetString("BUFFERREPORTERRORTITLE", locale), exc.GetDetails(), outStream, request);
+ OnError(MgLocalizer.GetString("BUFFERREPORTERRORTITLE", locale), exc.getDetails(), outStream, request);
return;
}
catch(Exception ne)
@@ -423,10 +423,10 @@
{
MgLayer layer = null;
int i;
- for(i = 0; i < layers.GetCount(); i++)
+ for(i = 0; i < layers.getCount(); i++)
{
- MgLayer layer1 = (MgLayer) layers.GetItem(i);
- if(layer1.GetName().equals(layerName))
+ MgLayer layer1 = (MgLayer) layers.getItem(i);
+ if(layer1.getName().equals(layerName))
{
layer = layer1;
break;
@@ -453,7 +453,7 @@
byte[] bytes = layerTempl.getBytes("UTF-8");
MgByteSource src = new MgByteSource(bytes, bytes.length);
- return src.GetReader();
+ return src.getReader();
}
void ClearDataSource(MgFeatureService featureSrvc, MgResourceIdentifier dataSourceId, String featureName) throws MgException
@@ -460,8 +460,8 @@
{
MgDeleteFeatures deleteCmd = new MgDeleteFeatures(featureName, "ID >= 0");
MgFeatureCommandCollection commands = new MgFeatureCommandCollection();
- commands.Add(deleteCmd);
- featureSrvc.UpdateFeatures(dataSourceId, commands, false);
+ commands.add(deleteCmd);
+ featureSrvc.updateFeatures(dataSourceId, commands, false);
}
void OnError(String title, String msg, PrintWriter outStream, HttpServletRequest request) throws FileNotFoundException, IOException
@@ -476,18 +476,18 @@
if(res == null)
return;
- for(int i = 0; i < res.GetCount(); i++)
+ for(int i = 0; i < res.getCount(); i++)
{
- MgFeatureCommand cmd = commands.GetItem(i);
+ MgFeatureCommand cmd = commands.getItem(i);
if(cmd instanceof MgInsertFeatures)
{
- MgFeatureProperty resProp = (MgFeatureProperty)res.GetItem(i);
+ MgFeatureProperty resProp = (MgFeatureProperty)res.getItem(i);
if(resProp != null)
{
- MgFeatureReader reader = (MgFeatureReader)resProp.GetValue();
+ MgFeatureReader reader = (MgFeatureReader)resProp.getValue();
if(reader == null)
return;
- reader.Close();
+ reader.close();
}
}
}
@@ -497,11 +497,11 @@
{
MgPropertyCollection bufferProps = new MgPropertyCollection();
MgInt32Property idProp = new MgInt32Property("ID", featureId);
- bufferProps.Add(idProp);
- MgByteReader geomReader = agfRW.Write(featureGeom);
+ bufferProps.add(idProp);
+ MgByteReader geomReader = agfRW.write(featureGeom);
MgGeometryProperty geomProp = new MgGeometryProperty("GEOM", geomReader);
- bufferProps.Add(geomProp);
- propCollection.Add(bufferProps);
+ bufferProps.add(geomProp);
+ propCollection.addItem(bufferProps);
}
String GetMapSrs(MgMap map)
@@ -508,7 +508,7 @@
{
try
{
- String srs = map.GetMapSRS();
+ String srs = map.getMapSRS();
if(!srs.equals(""))
return srs;
}
Modified: trunk/MgDev/Web/src/mapviewerjava/common.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/common.jsp 2021-06-12 09:03:31 UTC (rev 9853)
+++ trunk/MgDev/Web/src/mapviewerjava/common.jsp 2021-06-17 15:58:40 UTC (rev 9854)
@@ -32,7 +32,7 @@
//
String realpath = getServletContext().getRealPath("/");
String configPath = realpath + "webconfig.ini";
- MapGuideJavaApi.MgInitializeWebTier(configPath);
+ MapGuideJavaApiEx.MgInitializeWebTier(configPath);
}
String GetDefaultLocale()
@@ -265,7 +265,7 @@
try
{
MgResourceIdentifier resId = new MgResourceIdentifier(proposedResourceId);
- validResourceId = resId.ToString();
+ validResourceId = resId.toString();
}
catch(MgException e)
{
@@ -303,48 +303,48 @@
MgFeatureQueryOptions BuildFeatureQueryOptions(MgClassDefinition classDef) throws MgException
{
MgFeatureQueryOptions query = new MgFeatureQueryOptions();
- String geomPropName = classDef.GetDefaultGeometryPropertyName();
- MgPropertyDefinitionCollection propertyList = classDef.GetProperties();
- for (int i = 0; i < propertyList.GetCount(); i++)
+ String geomPropName = classDef.getDefaultGeometryPropertyName();
+ MgPropertyDefinitionCollection propertyList = classDef.getProperties();
+ for (int i = 0; i < propertyList.getCount(); i++)
{
- MgPropertyDefinition propertyDef = propertyList.GetItem(i);
- String property = propertyDef.GetName();
+ MgPropertyDefinition propertyDef = propertyList.getItem(i);
+ String property = propertyDef.getName();
- if ((!property.equals(geomPropName)) && (propertyDef.GetPropertyType() == MgFeaturePropertyType.DataProperty))
+ if ((!property.equals(geomPropName)) && (propertyDef.getPropertyType() == MgFeaturePropertyType.DataProperty))
{
MgDataPropertyDefinition dp = (MgDataPropertyDefinition)propertyDef;
- int propertyType = dp.GetDataType();
+ int propertyType = dp.getDataType();
switch (propertyType) {
case MgPropertyType.Boolean:
- query.AddFeatureProperty(property);
+ query.addFeatureProperty(property);
break;
case MgPropertyType.Byte:
- query.AddFeatureProperty(property);
+ query.addFeatureProperty(property);
break;
case MgPropertyType.DateTime:
- query.AddFeatureProperty(property);
+ query.addFeatureProperty(property);
break;
case MgPropertyType.Single:
- query.AddFeatureProperty(property);
+ query.addFeatureProperty(property);
break;
case MgPropertyType.Double:
- query.AddFeatureProperty(property);
+ query.addFeatureProperty(property);
break;
case MgPropertyType.Int16:
- query.AddFeatureProperty(property);
+ query.addFeatureProperty(property);
break;
case MgPropertyType.Int32:
- query.AddFeatureProperty(property);
+ query.addFeatureProperty(property);
break;
case MgPropertyType.Int64:
- query.AddFeatureProperty(property);
+ query.addFeatureProperty(property);
break;
case MgPropertyType.String:
- query.AddFeatureProperty(property);
+ query.addFeatureProperty(property);
break;
}
} else if (property.equals(geomPropName)) {
- query.AddFeatureProperty(property);
+ query.addFeatureProperty(property);
}
}
return query;
Modified: trunk/MgDev/Web/src/mapviewerjava/gettingstarted.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/gettingstarted.jsp 2021-06-12 09:03:31 UTC (rev 9853)
+++ trunk/MgDev/Web/src/mapviewerjava/gettingstarted.jsp 2021-06-17 15:58:40 UTC (rev 9854)
@@ -61,27 +61,27 @@
//
InitializeWebTier();
MgUserInformation cred = new MgUserInformation(sessionId);
- cred.SetClientIp(GetClientIp(request));
- cred.SetClientAgent(GetClientAgent());
+ cred.setClientIp(GetClientIp(request));
+ cred.setClientAgent(GetClientAgent());
MgSiteConnection site = new MgSiteConnection();
- site.Open(cred);
- MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
+ site.open(cred);
+ MgResourceService resourceSrvc = (MgResourceService)site.createService(MgServiceType.ResourceService);
MgResourceIdentifier wli = new MgResourceIdentifier(webLayout);
byte[] hb = fixedupHtml.getBytes("UTF-8");
MgByteSource src = new MgByteSource(hb, hb.length);
MgWebLayout wl = new MgWebLayout(resourceSrvc, wli);
- MgByteReader pagestream = wl.ProcessGettingStartedPage(src.GetReader(), dwf);
+ MgByteReader pagestream = wl.processGettingStartedPage(src.getReader(), dwf);
if(pagestream == null)
outStream.write(fixedupHtml);
else
- outStream.write(pagestream.ToString());
+ outStream.write(pagestream.toString());
}
else
outStream.write(fixedupHtml);
}
catch(MgException mge) {
- String errorMsg = EscapeForHtml(mge.GetDetails());
+ String errorMsg = EscapeForHtml(mge.getDetails());
outStream.write(errorMsg);
}
catch(Exception e) {
Modified: trunk/MgDev/Web/src/mapviewerjava/init.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/init.jsp 2021-06-12 09:03:31 UTC (rev 9853)
+++ trunk/MgDev/Web/src/mapviewerjava/init.jsp 2021-06-17 15:58:40 UTC (rev 9854)
@@ -24,7 +24,7 @@
// Initialize web tier with the site configuration file. The config
// file should be in the same folder as this script.
String configPath = realpath + "webconfig.ini";
- MapGuideJavaApi.MgInitializeWebTier( configPath );
+ MapGuideJavaApiEx.MgInitializeWebTier( configPath );
}
%>
Modified: trunk/MgDev/Web/src/mapviewerjava/legend.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/legend.jsp 2021-06-12 09:03:31 UTC (rev 9853)
+++ trunk/MgDev/Web/src/mapviewerjava/legend.jsp 2021-06-17 15:58:40 UTC (rev 9854)
@@ -89,19 +89,19 @@
// Connect to the site and get a resource service instance
//
MgUserInformation userInfo = new MgUserInformation();
- userInfo.SetMgSessionId(sessionId);
- userInfo.SetClientIp(GetClientIp(request));
- userInfo.SetClientAgent(GetClientAgent());
+ userInfo.setMgSessionId(sessionId);
+ userInfo.setClientIp(GetClientIp(request));
+ userInfo.setClientAgent(GetClientAgent());
MgSiteConnection site = new MgSiteConnection();
- site.Open(userInfo);
- MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
+ site.open(userInfo);
+ MgResourceService resourceSrvc = (MgResourceService)site.createService(MgServiceType.ResourceService);
//Load the map runtime state.
//
MgMap map = new MgMap(site);
- map.Open(mapName);
+ map.open(mapName);
int updateType = -1;
@@ -136,7 +136,7 @@
}
catch(MgException e)
{
- String details = EscapeForHtml(e.GetDetails());
+ String details = EscapeForHtml(e.getDetails());
writer = response.getWriter();
writer.write(details);
response.setContentLength(details.length());
@@ -177,14 +177,14 @@
ArrayList tree = new ArrayList();
HashMap knownGroups = new HashMap();
ArrayList unresolved = new ArrayList();
- MgLayerGroupCollection groups = map.GetLayerGroups();
+ MgLayerGroupCollection groups = map.getLayerGroups();
- for(int i = 0; i < groups.GetCount(); i++)
+ for(int i = 0; i < groups.getCount(); i++)
{
- MgLayerGroup rtGroup = (MgLayerGroup)groups.GetItem(i);
- TreeItem node = new TreeItem(rtGroup.GetName(), true, rtGroup, "null");
+ MgLayerGroup rtGroup = (MgLayerGroup)groups.getItem(i);
+ TreeItem node = new TreeItem(rtGroup.getName(), true, rtGroup, "null");
knownGroups.put(node.name, node);
- MgLayerGroup parentGroup = rtGroup.GetGroup();
+ MgLayerGroup parentGroup = rtGroup.getGroup();
if(parentGroup == null)
{
tree.add(node);
@@ -191,7 +191,7 @@
}
else
{
- String parentName = parentGroup.GetName();
+ String parentName = parentGroup.getName();
TreeItem parentNode = (TreeItem)knownGroups.get(parentName);
if(parentNode != null)
parentNode.Attach(node);
@@ -215,28 +215,28 @@
}
}
// Get the layers
- MgLayerCollection layers = map.GetLayers();
+ MgLayerCollection layers = map.getLayers();
// Get the resource Ids of the layers
MgStringCollection resIds = new MgStringCollection();
- for(int i = 0; i < layers.GetCount(); i++)
+ for(int i = 0; i < layers.getCount(); i++)
{
- MgLayer rtLayer = (MgLayer) layers.GetItem(i);
- MgResourceIdentifier resId = rtLayer.GetLayerDefinition();
- resIds.Add(resId.ToString());
+ MgLayer rtLayer = (MgLayer) layers.getItem(i);
+ MgResourceIdentifier resId = rtLayer.getLayerDefinition();
+ resIds.add(resId.toString());
}
- MgStringCollection layersData = resSrvc.GetResourceContents(resIds, null);
+ MgStringCollection layersData = resSrvc.getResourceContents(resIds, null);
- for(int i = 0; i < layers.GetCount(); i++)
+ for(int i = 0; i < layers.getCount(); i++)
{
- MgLayer rtLayer = (MgLayer) layers.GetItem(i);
- TreeItem node = new TreeItem(rtLayer.GetName(), false, rtLayer, (String)layersData.GetItem(i));
- MgLayerGroup parentGroup = rtLayer.GetGroup();
+ MgLayer rtLayer = (MgLayer) layers.getItem(i);
+ TreeItem node = new TreeItem(rtLayer.getName(), false, rtLayer, (String)layersData.getItem(i));
+ MgLayerGroup parentGroup = rtLayer.getGroup();
if(parentGroup == null)
tree.add(node);
else
{
- TreeItem parentNode = (TreeItem)knownGroups.get(parentGroup.GetName());
+ TreeItem parentNode = (TreeItem)knownGroups.get(parentGroup.getName());
if(parentNode != null)
parentNode.Attach(node);
else
@@ -252,11 +252,11 @@
HashMap BuildLayerMap(MgMap map) throws MgException
{
HashMap layerMap = new HashMap();
- MgLayerCollection layers = map.GetLayers();
- for(int i = 0; i < layers.GetCount(); i++)
+ MgLayerCollection layers = map.getLayers();
+ for(int i = 0; i < layers.getCount(); i++)
{
- MgLayer rtLayer = (MgLayer) layers.GetItem(i);
- layerMap.put(rtLayer.GetObjectId(), rtLayer);
+ MgLayer rtLayer = (MgLayer) layers.getItem(i);
+ layerMap.put(rtLayer.getObjectId(), rtLayer);
}
return layerMap;
}
@@ -292,21 +292,21 @@
{
output.append(String.format("var %s = new GroupItem(\"%s\", %s, %s, %s, %s, \"%s\", \"%s\", %s);\n",
new Object[] {groupName,
- StrEscape(rtLayerGroup.GetLegendLabel()),
- rtLayerGroup.GetExpandInLegend()? "true": "false",
+ StrEscape(rtLayerGroup.getLegendLabel()),
+ rtLayerGroup.getExpandInLegend()? "true": "false",
parentName,
- rtLayerGroup.GetVisible()? "true": "false",
- rtLayerGroup.GetDisplayInLegend()? "true": "false",
- rtLayerGroup.GetObjectId(),
- StrEscape(rtLayerGroup.GetName()),
- (rtLayerGroup.GetLayerGroupType() == MgLayerGroupType.BaseMap || rtLayerGroup.GetLayerGroupType() == MgLayerGroupType.BaseMapFromTileSet)? "true": "false"}));
+ rtLayerGroup.getVisible()? "true": "false",
+ rtLayerGroup.getDisplayInLegend()? "true": "false",
+ rtLayerGroup.getObjectId(),
+ StrEscape(rtLayerGroup.getName()),
+ (rtLayerGroup.getLayerGroupType() == MgLayerGroupType.BaseMap || rtLayerGroup.getLayerGroupType() == MgLayerGroupType.BaseMapFromTileSet)? "true": "false"}));
}
else
{
output.append(String.format("var %s = new GroupSummary(\"%s\", \"%s\", %s, %s);\n",
new Object[] {groupName,
- StrEscape(rtLayerGroup.GetName()),
- rtLayerGroup.GetObjectId(),
+ StrEscape(rtLayerGroup.getName()),
+ rtLayerGroup.getObjectId(),
arrChildName,
parentName}));
}
@@ -327,22 +327,22 @@
MgLayer rtLayer = (MgLayer)node.rtObject;
if(fulldata)
{
- MgResourceIdentifier resId = rtLayer.GetLayerDefinition();
+ MgResourceIdentifier resId = rtLayer.getLayerDefinition();
String layerData = node.layerData;
String layerName = "lyr" + (intermediateVar++);
- String objectId = rtLayer.GetObjectId();
+ String objectId = rtLayer.getObjectId();
output.append(String.format("var %s = new LayerItem(\"%s\", \"%s\", %s, %s, %s, %s, %s, \"%s\", \"%s\", %s);\n",
new Object[] {layerName,
- StrEscape(rtLayer.GetLegendLabel()),
- rtLayer.GetName(),
- rtLayer.GetExpandInLegend()? "true": "false",
+ StrEscape(rtLayer.getLegendLabel()),
+ rtLayer.getName(),
+ rtLayer.getExpandInLegend()? "true": "false",
parentName,
- rtLayer.GetVisible()? "true": "false",
- rtLayer.GetDisplayInLegend()? "true": "false",
- rtLayer.GetSelectable()? "true": "false",
- resId.ToString(),
+ rtLayer.getVisible()? "true": "false",
+ rtLayer.getDisplayInLegend()? "true": "false",
+ rtLayer.getSelectable()? "true": "false",
+ resId.toString(),
objectId,
- rtLayer.GetLayerType() == MgLayerType.BaseMap? "true": "false"}));
+ rtLayer.getLayerType() == MgLayerType.BaseMap? "true": "false"}));
output.append(String.format("%s[%d] = %s;\n",
new Object[] {container,
@@ -360,9 +360,9 @@
output.append(String.format("%s[%d] = new LayerSummary(\"%s\", \"%s\", \"%s\");\n",
new Object[] {container,
Integer.valueOf(i),
- StrEscape(rtLayer.GetName()),
- rtLayer.GetObjectId(),
- rtLayer.GetLayerDefinition().ToString()}));
+ StrEscape(rtLayer.getName()),
+ rtLayer.getObjectId(),
+ rtLayer.getLayerDefinition().toString()}));
}
}
}
@@ -485,11 +485,11 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream();
byte[] byteBuffer = new byte[1024];
- int numBytes = byteReader.Read(byteBuffer, 1024);
+ int numBytes = byteReader.read(byteBuffer, 1024);
while(numBytes > 0)
{
bos.write(byteBuffer, 0, numBytes);
- numBytes = byteReader.Read(byteBuffer, 1024);
+ numBytes = byteReader.read(byteBuffer, 1024);
}
stream = new ByteArrayInputStream(bos.toByteArray());
}
Modified: trunk/MgDev/Web/src/mapviewerjava/mainframe.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/mainframe.jsp 2021-06-12 09:03:31 UTC (rev 9853)
+++ trunk/MgDev/Web/src/mapviewerjava/mainframe.jsp 2021-06-17 15:58:40 UTC (rev 9854)
@@ -59,11 +59,11 @@
MgUserInformation cred = new MgUserInformation();
if(sessionId != null && sessionId != "")
{
- cred.SetMgSessionId(sessionId);
+ cred.setMgSessionId(sessionId);
createSession = false;
}
else if(username != null)
- cred.SetMgUsernamePassword(username, password);
+ cred.setMgUsernamePassword(username, password);
else
{
RequestAuthentication(response);
@@ -71,17 +71,17 @@
}
MgSiteConnection site = new MgSiteConnection();
- cred.SetLocale(locale);
+ cred.setLocale(locale);
- cred.SetClientIp(GetClientIp(request));
- cred.SetClientAgent(GetClientAgent());
+ cred.setClientIp(GetClientIp(request));
+ cred.setClientAgent(GetClientAgent());
- site.Open(cred);
+ site.open(cred);
if(createSession)
{
- MgSite site1 = site.GetSite();
- sessionId = site1.CreateSession();
+ MgSite site1 = site.getSite();
+ sessionId = site1.createSession();
if(forDwf == 0)
{
orgSessionId = sessionId;
@@ -91,42 +91,42 @@
//Get a MgWebLayout object initialized with the specified web layout definition
//
MgWebLayout webLayout = null;
- MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
+ MgResourceService resourceSrvc = (MgResourceService)site.createService(MgServiceType.ResourceService);
MgResourceIdentifier webLayoutId = new MgResourceIdentifier(webLayoutDefinition);
webLayout = new MgWebLayout(resourceSrvc, webLayoutId);
//calculate the size of the variable elements of the viewer
//
- MgWebToolBar toolBar = webLayout.GetToolBar();
- MgWebUiPane statusBar = webLayout.GetStatusBar();
- MgWebTaskPane taskPane = webLayout.GetTaskPane();
- MgWebInformationPane infoPane = webLayout.GetInformationPane();
- MgWebTaskBar taskBar = taskPane.GetTaskBar();
- String mapDef = webLayout.GetMapDefinition();
+ MgWebToolBar toolBar = webLayout.getToolBar();
+ MgWebUiPane statusBar = webLayout.getStatusBar();
+ MgWebTaskPane taskPane = webLayout.getTaskPane();
+ MgWebInformationPane infoPane = webLayout.getInformationPane();
+ 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();
+ 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();
- boolean showToolbar = toolBar.IsVisible();
+ boolean showTaskPane = taskPane.isVisible();
+ boolean showTaskBar = taskBar.isVisible();
+ boolean showStatusbar = statusBar.isVisible();
+ boolean showToolbar = toolBar.isVisible();
- int taskPaneWidth = taskPane.GetWidth();
+ int taskPaneWidth = taskPane.getWidth();
int toolbarHeight = 30;
int taskBarHeight = 30;
int statusbarHeight = 26;
- taskPaneWidth = showTaskPane? taskPaneWidth: 0;
- toolbarHeight = showToolbar? toolbarHeight: 0;
+ taskPaneWidth = showTaskPane ? taskPaneWidth: 0;
+ toolbarHeight = showToolbar ? toolbarHeight: 0;
taskBarHeight = showTaskBar ? taskBarHeight : 0;
- statusbarHeight = showStatusbar? statusbarHeight: 0;
+ statusbarHeight = showStatusbar ? statusbarHeight: 0;
//Encode the initial url so that it does not trip any sub-frames (especially if this url has parameters)
- String taskPaneUrl = URLEncoder.encode(taskPane.GetInitialTaskUrl(), "UTF-8");
+ String taskPaneUrl = URLEncoder.encode(taskPane.getInitialTaskUrl(), "UTF-8");
String vpath = GetSurroundVirtualPath(request);
boolean defHome = false;
if(taskPaneUrl == null || taskPaneUrl.length() == 0) {
@@ -141,19 +141,19 @@
// as this script is running. However the naming convention is fixed enough that we can figure out
// what to pass to the Task Pane
MgResourceIdentifier resId = new MgResourceIdentifier(mapDef);
- mapName = resId.GetName();
+ mapName = resId.getName();
- String title = webLayout.GetTitle();
+ String title = webLayout.getTitle();
- boolean showLegend = infoPane.IsLegendBandVisible();
- boolean showProperties = infoPane.IsPropertiesBandVisible();
+ boolean showLegend = infoPane.isLegendBandVisible();
+ boolean showProperties = infoPane.isPropertiesBandVisible();
int infoWidth = 0;
if(showLegend || showProperties)
{
- if(infoPane.IsVisible())
+ if(infoPane.isVisible())
{
- infoWidth = infoPane.GetWidth();
+ infoWidth = infoPane.getWidth();
if(infoWidth < 5)
infoWidth = 5; //ensure visible
}
@@ -170,18 +170,18 @@
//view center
//
- MgPoint ptCenter = webLayout.GetCenter();
+ MgPoint ptCenter = webLayout.getCenter();
String center = "null";
if(ptCenter != null)
{
- MgCoordinate coord = ptCenter.GetCoordinate();
- Object[] formatArgs = { Double.toString(coord.GetX()), Double.toString(coord.GetY()) };
+ MgCoordinate coord = ptCenter.getCoordinate();
+ Object[] formatArgs = { Double.toString(coord.getX()), Double.toString(coord.getY()) };
center = MessageFormat.format("new Point({0}, {1})", formatArgs);
}
//Process commands and declare command objects
//
- MgWebCommandCollection commands = webLayout.GetCommands();
+ MgWebCommandCollection commands = webLayout.getCommands();
String cmdObjects = "";
String cmdObject = "";
int navCmdIndex = 0;
@@ -194,16 +194,16 @@
int selAwareCmdCount = 0;
String selAwareCmds = "";
- for(int i = 0; i < commands.GetCount(); i++)
+ for(int i = 0; i < commands.getCount(); i++)
{
- MgWebCommand cmd = commands.GetItem(i);
- if(!cmd.IsUsed())
+ MgWebCommand cmd = commands.getItem(i);
+ if(!cmd.isUsed())
continue;
- int tgtViewer = cmd.GetTargetViewerType();
+ int tgtViewer = cmd.getTargetViewerType();
if((tgtViewer == MgWebTargetViewerType.Dwf) != (forDwf == 1) && (tgtViewer != MgWebTargetViewerType.All))
continue;
- String name = cmd.GetName();
- int action = cmd.GetAction();
+ String name = cmd.getName();
+ int action = cmd.getAction();
if (action == MgWebActions.Search)
{
MgWebSearchCommand searchCmd = (MgWebSearchCommand)cmd;
@@ -210,11 +210,11 @@
// create the column objects
String cols = "var resCols" + searchCmdIndex + " = new Array();\n";
- if(searchCmd.GetResultColumnCount() > 0)
+ if(searchCmd.getResultColumnCount() > 0)
{
- for(int j = 0; j < searchCmd.GetResultColumnCount(); j++)
+ for(int j = 0; j < searchCmd.getResultColumnCount(); j++)
{
- Object[] formatArgs = { new Integer(searchCmdIndex), new Integer(j), StrEscape(searchCmd.GetColumnDisplayNameAt(j)), StrEscape(searchCmd.GetColumnPropertyNameAt(j)) };
+ Object[] formatArgs = { new Integer(searchCmdIndex), new Integer(j), StrEscape(searchCmd.getColumnDisplayNameAt(j)), StrEscape(searchCmd.getColumnPropertyNameAt(j)) };
String col = MessageFormat.format("resCols{0,number,integer}[{1,number,integer}] = new ResultColumn(\"{2}\", \"{3}\");\n", formatArgs);
cols += col;
}
@@ -224,19 +224,19 @@
// declare a new search command object
Object[] formatArgs = { new Integer(i),
StrEscape(name),
- StrEscape(searchCmd.GetLabel()),
+ StrEscape(searchCmd.getLabel()),
new Integer(action),
- searchCmd.GetIconUrl(),
- searchCmd.GetDisabledIconUrl(),
- StrEscape(searchCmd.GetTooltip()),
- StrEscape(searchCmd.GetDescription()),
- searchCmd.GetLayer(),
- StrEscape(searchCmd.GetPrompt()),
+ searchCmd.getIconUrl(),
+ searchCmd.getDisabledIconUrl(),
+ StrEscape(searchCmd.getTooltip()),
+ StrEscape(searchCmd.getDescription()),
+ searchCmd.getLayer(),
+ StrEscape(searchCmd.getPrompt()),
new Integer(searchCmdIndex),
- StrEscape(searchCmd.GetFilter()),
- new Integer(searchCmd.GetMatchLimit()),
- new Integer(searchCmd.GetTarget()),
- searchCmd.GetTargetName() };
+ StrEscape(searchCmd.getFilter()),
+ new Integer(searchCmd.getMatchLimit()),
+ new Integer(searchCmd.getTarget()),
+ searchCmd.getTargetName() };
cmdObject = MessageFormat.format("commands[{0,number,integer}] = new SearchCommand(\"{1}\", \"{2}\", {3,number,integer}, \"{4}\", \"{5}\", \"{6}\", \"{7}\", \"{8}\", \"{9}\", resCols{10}, \"{11}\", {12,number,integer}, {13,number,integer}, \"{14}\");\n", formatArgs);
searchCmdIndex++;
@@ -248,24 +248,24 @@
// create the parameter objects
String paramObjs = "var navParams" + navCmdIndex + " = new Array();\n";
String layers = "var layers" + navCmdIndex + " = new Array();\n";
- if(invokeUrlCmd.GetParameterCount() > 0)
+ if(invokeUrlCmd.getParameterCount() > 0)
{
- for(int j = 0; j < invokeUrlCmd.GetParameterCount(); j++)
+ for(int j = 0; j < invokeUrlCmd.getParameterCount(); j++)
{
- Object[] formatArgs = { new Integer(navCmdIndex), new Integer(j), invokeUrlCmd.GetParameterNameAt(j), invokeUrlCmd.GetParameterValueAt(j) };
+ Object[] formatArgs = { new Integer(navCmdIndex), new Integer(j), invokeUrlCmd.getParameterNameAt(j), invokeUrlCmd.getParameterValueAt(j) };
String param = MessageFormat.format("navParams{0,number,integer}[{1,number,integer}] = new NavParam(\"{2}\", \"{3}\");\n", formatArgs);
paramObjs = paramObjs + param;
}
}
- for( int j = 0; j < invokeUrlCmd.GetLayerCount(); j++ )
+ for( int j = 0; j < invokeUrlCmd.getLayerCount(); j++ )
{
- Object[] formatArgs = { new Integer(navCmdIndex), new Integer(j), invokeUrlCmd.GetLayerNameAt(j) };
+ Object[] formatArgs = { new Integer(navCmdIndex), new Integer(j), invokeUrlCmd.getLayerNameAt(j) };
String layer = MessageFormat.format("layers{0,number,integer}[{1,number,integer}] = \"{2}\";\n", formatArgs);
layers = layers + layer;
}
cmdObjects = cmdObjects + paramObjs + layers;
- if(invokeUrlCmd.DisabledIfSelectionEmpty() || invokeUrlCmd.GetLayerCount() > 0)
+ if(invokeUrlCmd.disabledIfSelectionEmpty() || invokeUrlCmd.getLayerCount() > 0)
{
Object[] formatArgs = { new Integer(selAwareCmdCount), new Integer(i) };
selAwareCmds = selAwareCmds + MessageFormat.format("selectionAwareCmds[{0,number,integer}] = {1,number,integer};\n", formatArgs);
@@ -276,16 +276,16 @@
Object[] formatArgs = { new Integer(i),
StrEscape(name),
new Integer(action),
- invokeUrlCmd.GetIconUrl(),
- invokeUrlCmd.GetDisabledIconUrl(),
- StrEscape( invokeUrlCmd.GetTooltip()),
- StrEscape( invokeUrlCmd.GetDescription()),
- invokeUrlCmd.GetUrl(),
+ invokeUrlCmd.getIconUrl(),
+ invokeUrlCmd.getDisabledIconUrl(),
+ StrEscape( invokeUrlCmd.getTooltip()),
+ StrEscape( invokeUrlCmd.getDescription()),
+ invokeUrlCmd.getUrl(),
new Integer(navCmdIndex),
- invokeUrlCmd.DisabledIfSelectionEmpty() ? "true" : "false",
+ invokeUrlCmd.disabledIfSelectionEmpty() ? "true" : "false",
new Integer(navCmdIndex),
- new Integer(invokeUrlCmd.GetTarget()),
- invokeUrlCmd.GetTargetName() };
+ new Integer(invokeUrlCmd.getTarget()),
+ invokeUrlCmd.getTargetName() };
cmdObject = MessageFormat.format("commands[{0,number,integer}] = new InvokeUrlCommand(\"{1}\", {2,number,integer}, \"{3}\", \"{4}\", \"{5}\", \"{6}\", \"{7}\", navParams{8,number,integer}, {9}, layers{10,number,integer}, {11,number,integer}, \"{12}\");\n", formatArgs);
navCmdIndex++;
}
@@ -305,12 +305,12 @@
Object[] formatArgs = { new Integer(i),
StrEscape( name ),
new Integer( action ),
- targetCmd.GetIconUrl(),
- targetCmd.GetDisabledIconUrl(),
- StrEscape(targetCmd.GetTooltip()),
- StrEscape(targetCmd.GetDescription()),
- new Integer( targetCmd.GetTarget()),
- targetCmd.GetTargetName() };
+ targetCmd.getIconUrl(),
+ targetCmd.getDisabledIconUrl(),
+ StrEscape(targetCmd.getTooltip()),
+ StrEscape(targetCmd.getDescription()),
+ new Integer( targetCmd.getTarget()),
+ targetCmd.getTargetName() };
cmdObject = MessageFormat.format("commands[{0,number,integer}] = new UiTargetCommand(\"{1}\", {2,number,integer}, \"{3}\", \"{4}\", \"{5}\", \"{6}\", {7,number,integer}, \"{8}\");\n", formatArgs);
}
else if(action == MgWebActions.Help)
@@ -321,13 +321,13 @@
Object[] formatArgs = { new Integer(i),
StrEscape(name),
new Integer(action),
- helpCmd.GetIconUrl(),
- helpCmd.GetDisabledIconUrl(),
- StrEscape(helpCmd.GetTooltip()),
- StrEscape(helpCmd.GetDescription()),
- helpCmd.GetUrl(),
- new Integer(helpCmd.GetTarget()),
- helpCmd.GetTargetName() };
+ helpCmd.getIconUrl(),
+ helpCmd.getDisabledIconUrl(),
+ StrEscape(helpCmd.getTooltip()),
+ StrEscape(helpCmd.getDescription()),
+ helpCmd.getUrl(),
+ new Integer(helpCmd.getTarget()),
+ helpCmd.getTargetName() };
cmdObject = MessageFormat.format("commands[{0,number,integer}] = new HelpCommand(\"{1}\", {2,number,integer}, \"{3}\", \"{4}\", \"{5}\", \"{6}\", \"{7}\", {8,number,integer}, \"{9}\");\n", formatArgs);
}
else if(action == MgWebActions.PrintMap)
@@ -336,10 +336,10 @@
// declare the print layouts
String layouts = "var layouts" + printCmdIndex + " = new Array();\n";
- for(int j = 0; j < printCmd.GetPrintLayoutCount(); j++)
+ for(int j = 0; j < printCmd.getPrintLayoutCount(); j++)
{
String layout = "";
- Object[] formatArgs = { new Integer(printCmdIndex), new Integer(j), printCmd.GetPrintLayoutAt(j) };
+ Object[] formatArgs = { new Integer(printCmdIndex), new Integer(j), printCmd.getPrintLayoutAt(j) };
layout = MessageFormat.format("layouts{0,number,integer}[{1,number,integer}] = \"{2}\";\n", formatArgs);
layouts = layouts + layout;
}
@@ -349,10 +349,10 @@
Object[] formatArgs = { new Integer(i),
StrEscape( name ),
new Integer(action),
- printCmd.GetIconUrl(),
- printCmd.GetDisabledIconUrl(),
- StrEscape( printCmd.GetTooltip()),
- StrEscape( printCmd.GetDescription()),
+ printCmd.getIconUrl(),
+ printCmd.getDisabledIconUrl(),
+ StrEscape( printCmd.getTooltip()),
+ StrEscape( printCmd.getDescription()),
new Integer(printCmdIndex) };
cmdObject = MessageFormat.format("commands[{0,number,integer}] = new PrintCommand(\"{1}\", {2,number,integer}, \"{3}\", \"{4}\", \"{5}\", \"{6}\", layouts{7,number,integer});\n", formatArgs );
printCmdIndex++;
@@ -365,14 +365,14 @@
Object[] formatArgs = { new Integer(i),
StrEscape(name),
new Integer(action),
- invokeScriptCmd.GetIconUrl(),
- invokeScriptCmd.GetDisabledIconUrl(),
- StrEscape( invokeScriptCmd.GetTooltip()),
- StrEscape( invokeScriptCmd.GetDescription()),
+ invokeScriptCmd.getIconUrl(),
+ invokeScriptCmd.getDisabledIconUrl(),
+ StrEscape( invokeScriptCmd.getTooltip()),
+ StrEscape( invokeScriptCmd.getDescription()),
new Integer( scriptCmdIndex ) };
cmdObject = MessageFormat.format("commands[{0,number,integer}] = new InvokeScriptCommand(\"{1}\", {2,number,integer}, \"{3}\", \"{4}\", \"{5}\", \"{6}\", {7,number,integer});\n", formatArgs);
- userCode = userCode + "\nfunction UserFunc" + scriptCmdIndex + "()\n{\n" + invokeScriptCmd.GetScriptCode() + "\n}\n";
+ userCode = userCode + "\nfunction UserFunc" + scriptCmdIndex + "()\n{\n" + invokeScriptCmd.getScriptCode() + "\n}\n";
Object[] formatArgs2 = { new Integer(scriptCmdIndex), new Integer(scriptCmdIndex) };
userCodeCalls = userCodeCalls + MessageFormat.format("case {0,number,integer}: UserFunc{0,number,integer}(); break;\n", formatArgs2);
@@ -384,10 +384,10 @@
Object[] formatArgs = { new Integer(i),
name,
new Integer(action),
- cmd.GetIconUrl(),
- cmd.GetDisabledIconUrl(),
- StrEscape(cmd.GetTooltip()),
- StrEscape(cmd.GetDescription()) };
+ cmd.getIconUrl(),
+ cmd.getDisabledIconUrl(),
+ StrEscape(cmd.getTooltip()),
+ StrEscape(cmd.getDescription()) };
cmdObject = MessageFormat.format("commands[{0,number,integer}] = new BasicCommand(\"{1}\", {2,number,integer}, \"{3}\", \"{4}\", \"{5}\", \"{6}\");\n", formatArgs);
}
cmdObjects = cmdObjects + cmdObject;
@@ -397,15 +397,15 @@
//Declare toolbar items
//
- String toolbarDef = DeclareUiItems(toolBar.GetWidgets(), "toolbarItems");
+ String toolbarDef = DeclareUiItems(toolBar.getWidgets(), "toolbarItems");
//Declare task items
- String taskListDef = DeclareUiItems(taskBar.GetTaskList(), "taskItems");
+ String taskListDef = DeclareUiItems(taskBar.getTaskList(), "taskItems");
//Declare context menu items
- MgWebContextMenu ctxMenu = webLayout.GetContextMenu();
+ MgWebContextMenu ctxMenu = webLayout.getContextMenu();
String ctxMenuDef;
- if(ctxMenu.IsVisible())
+ if(ctxMenu.isVisible())
ctxMenuDef = DeclareUiItems(ctxMenu, "ctxMenuItems");
else
ctxMenuDef = "";
@@ -412,17 +412,17 @@
//task items texts
String taskItemTexts = "";
- MgWebWidgetCollection taskButtons = taskBar.GetTaskButtons();
+ MgWebWidgetCollection taskButtons = taskBar.getTaskButtons();
for(int i = 0; i < 4; i ++)
{
- MgWebTaskBarWidget btn = (MgWebTaskBarWidget)taskButtons.GetWidget(i);
+ MgWebTaskBarWidget btn = (MgWebTaskBarWidget)taskButtons.getWidget(i);
if(i > 0)
taskItemTexts += ",";
- taskItemTexts += "\"" + StrEscape(btn.GetName()) + "\"," +
- "\"" + StrEscape(btn.GetTooltip()) + "\"," +
- "\"" + StrEscape(btn.GetDescription()) + "\"," +
- "\"" + StrEscape(btn.GetIconUrl()) + "\"," +
- "\"" + StrEscape(btn.GetDisabledIconUrl()) + "\"";
+ taskItemTexts += "\"" + StrEscape(btn.getName()) + "\"," +
+ "\"" + StrEscape(btn.getTooltip()) + "\"," +
+ "\"" + StrEscape(btn.getDescription()) + "\"," +
+ "\"" + StrEscape(btn.getIconUrl()) + "\"," +
+ "\"" + StrEscape(btn.getDisabledIconUrl()) + "\"";
}
//transmit the session to the map pane if one was specified to this request
@@ -449,9 +449,9 @@
showProperties? "1": "0",
String.valueOf(infoWidth),
locale,
- String.valueOf(webLayout.GetHyperlinkTarget()),
- webLayout.GetHyperlinkTargetFrame(),
- webLayout.IsZoomControlVisible()? "1": "0",
+ String.valueOf(webLayout.getHyperlinkTarget()),
+ webLayout.getHyperlinkTargetFrame(),
+ webLayout.isZoomControlVisible()? "1": "0",
selectionColor,
mapImgFormat,
selImgFormat,
@@ -481,9 +481,9 @@
showProperties? "1": "0",
String.valueOf(infoWidth),
locale,
- String.valueOf(webLayout.GetHyperlinkTarget()),
- webLayout.GetHyperlinkTargetFrame(),
- webLayout.IsZoomControlVisible()? "1": "0",
+ String.valueOf(webLayout.getHyperlinkTarget()),
+ webLayout.getHyperlinkTargetFrame(),
+ webLayout.isZoomControlVisible()? "1": "0",
selectionColor,
mapImgFormat,
selImgFormat,
@@ -508,10 +508,10 @@
String int0 = "0";
String int1 = "1";
String[] vals = {
- webLayout.GetTitle(),
+ webLayout.getTitle(),
GetRootVirtualFolder(request) + "/mapagent/mapagent.fcgi",
- webLayout.GetEnablePingServer()? int1 : int0,
- String.valueOf(site.GetSite().GetSessionTimeout()),
+ webLayout.getEnablePingServer()? int1 : int0,
+ String.valueOf(site.getSite().getSessionTimeout()),
locale,
showToolbar ? int1 : int0,
showStatusbar ? int1 : int0,
@@ -523,7 +523,7 @@
mapDef,
String.valueOf(taskPaneWidth),
center,
- String.valueOf(webLayout.GetScale()),
+ String.valueOf(webLayout.getScale()),
StrEscape(title),
(forDwf == 1)? "1" : "0",
cmdObjects,
@@ -566,7 +566,7 @@
}
catch(MgException e)
{
- String msg = EscapeForHtml(e.GetExceptionMessage());
+ String msg = EscapeForHtml(e.getExceptionMessage());
response.getWriter().write(msg);
response.setContentLength(msg.length());
}
@@ -596,10 +596,10 @@
if(coll != null)
{
- for(int i = 0, j = 0; i < coll.GetCount(); i++)
+ for(int i = 0, j = 0; i < coll.getCount(); i++)
{
- MgWebWidget item = coll.GetWidget(i);
- int it = item.GetType();
+ MgWebWidget item = coll.getWidget(i);
+ int it = item.getType();
if (it == MgWebWidgetType.Separator)
{
Object[] formatArgs = { varname, new Integer(j++) };
@@ -607,11 +607,11 @@
}
else if ( it == MgWebWidgetType.Command && item instanceof MgWebCommandWidget )
{
- MgWebCommand cmd = ((MgWebCommandWidget)item).GetCommand();
- Integer cmdIndex = (Integer)cmds.get(cmd.GetName());
+ MgWebCommand cmd = ((MgWebCommandWidget)item).getCommand();
+ Integer cmdIndex = (Integer)cmds.get(cmd.getName());
if(cmdIndex == null)
continue;
- Object[] formatArgs = { varname, new Integer(j++), StrEscape(cmd.GetLabel()), cmdIndex };
+ Object[] formatArgs = { varname, new Integer(j++), StrEscape(cmd.getLabel()), cmdIndex };
def = def + MessageFormat.format("{0}[{1,number,integer}] = new CommandItem(\"{2}\", {3,number,integer});\n", formatArgs);
}
else
@@ -621,8 +621,8 @@
String htmlName = "FlyoutDiv" + curFlyout;
Object[] formatArgs1 = { subVarname };
def = def + MessageFormat.format("var {0} = new Array()\n", formatArgs1);
- def = def + DeclareUiItems(((MgWebFlyoutWidget) item).GetSubItems(), subVarname);
- Object[] formatArgs2 = { varname, new Integer(j++), StrEscape( ((MgWebFlyoutWidget) item).GetLabel() ), subVarname, StrEscape( htmlName ), ((MgWebFlyoutWidget) item).GetIconUrl() };
+ def = def + DeclareUiItems(((MgWebFlyoutWidget) item).getSubItems(), subVarname);
+ Object[] formatArgs2 = { varname, new Integer(j++), StrEscape( ((MgWebFlyoutWidget) item).getLabel() ), subVarname, StrEscape( htmlName ), ((MgWebFlyoutWidget) item).getIconUrl() };
def = def + MessageFormat.format("{0}[{1,number,integer}] = new FlyoutItem(\"{2}\", {3}, \"{4}\", \"{5}\");\n", formatArgs2);
}
}
Modified: trunk/MgDev/Web/src/mapviewerjava/mapframe.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/mapframe.jsp 2021-06-12 09:03:31 UTC (rev 9853)
+++ trunk/MgDev/Web/src/mapviewerjava/mapframe.jsp 2021-06-17 15:58:40 UTC (rev 9854)
@@ -54,55 +54,55 @@
// create the map instance and store it with the session
//
MgUserInformation userInfo = new MgUserInformation();
- userInfo.SetMgSessionId(sessionId);
- userInfo.SetClientIp(GetClientIp(request));
- userInfo.SetClientAgent(GetClientAgent());
+ userInfo.setMgSessionId(sessionId);
+ userInfo.setClientIp(GetClientIp(request));
+ userInfo.setClientAgent(GetClientAgent());
MgSiteConnection site = new MgSiteConnection();
- site.Open(userInfo);
+ site.open(userInfo);
- MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
+ MgResourceService resourceSrvc = (MgResourceService)site.createService(MgServiceType.ResourceService);
MgMap map = new MgMap(site);
MgResourceIdentifier resId = new MgResourceIdentifier(mapDefinition);
- String mapName = resId.GetName();
- map.Create(resId, mapName);
+ String mapName = resId.getName();
+ map.create(resId, mapName);
- MgResourceIdentifier tileSetId = map.GetTileSetDefinition();
+ MgResourceIdentifier tileSetId = map.getTileSetDefinition();
- MgTileService tileSrvc = (MgTileService)site.CreateService(MgServiceType.TileService);
- int tileSizeX = tileSrvc.GetDefaultTileSizeX();
- int tileSizeY = tileSrvc.GetDefaultTileSizeY();
+ MgTileService tileSrvc = (MgTileService)site.createService(MgServiceType.TileService);
+ int tileSizeX = tileSrvc.getDefaultTileSizeX();
+ int tileSizeY = tileSrvc.getDefaultTileSizeY();
if (null != tileSetId)
{
//Can't load map if it points to a non-default tile set provider
- if (map.GetTileSetProvider() != "Default")
+ if (map.getTileSetProvider() != "Default")
{
- throw new RuntimeException(MessageFormat.format(MgLocalizer.GetString("ERR_UNSUPPORTED_TILESET", locale), new Object[] { map.GetTileSetProvider() }));
+ throw new RuntimeException(MessageFormat.format(MgLocalizer.GetString("ERR_UNSUPPORTED_TILESET", locale), new Object[] { map.getTileSetProvider() }));
}
//Overwrite the map definition with tile set id (this is for GETTILE requests) and
//use size settings from that tile set
- mapDefinition = tileSetId.ToString();
- tileSizeX = tileSrvc.GetDefaultTileSizeX(tileSetId);
- tileSizeY = tileSrvc.GetDefaultTileSizeY(tileSetId);
+ mapDefinition = tileSetId.toString();
+ tileSizeX = tileSrvc.getDefaultTileSizeX(tileSetId);
+ tileSizeY = tileSrvc.getDefaultTileSizeY(tileSetId);
}
//create an empty selection object and store it in the session repository
MgSelection sel = new MgSelection(map);
- sel.Save(resourceSrvc, mapName);
+ sel.save(resourceSrvc, mapName);
//get the map extent and calculate the scale factor
//
- MgEnvelope mapExtent = map.GetMapExtent();
- String srs = map.GetMapSRS();
+ MgEnvelope mapExtent = map.getMapExtent();
+ String srs = map.getMapSRS();
double metersPerUnit;
String unitsType;
if(srs != null && srs.length() > 0)
{
MgCoordinateSystemFactory csFactory = new MgCoordinateSystemFactory();
- MgCoordinateSystem cs = csFactory.Create(srs);
- metersPerUnit = cs.ConvertCoordinateSystemUnitsToMeters(1.0);
- unitsType = cs.GetUnits();
+ MgCoordinateSystem cs = csFactory.create(srs);
+ metersPerUnit = cs.convertCoordinateSystemUnitsToMeters(1.0);
+ unitsType = cs.getUnits();
}
else
{
@@ -110,9 +110,9 @@
unitsType = MgLocalizer.GetString("DISTANCEMETERS", locale);
}
- MgCoordinate llExtent = mapExtent.GetLowerLeftCoordinate();
- MgCoordinate urExtent = mapExtent.GetUpperRightCoordinate();
- String bgColor = map.GetBackgroundColor();
+ MgCoordinate llExtent = mapExtent.getLowerLeftCoordinate();
+ MgCoordinate urExtent = mapExtent.getUpperRightCoordinate();
+ String bgColor = map.getBackgroundColor();
if(bgColor.length() == 8)
{
bgColor = "#" + bgColor.substring(2);
@@ -126,9 +126,9 @@
// Create a sorted set of display scales
TreeSet scales = new TreeSet();
- for(int i = 0; i < map.GetFiniteDisplayScaleCount(); i++)
+ for(int i = 0; i < map.getFiniteDisplayScaleCount(); i++)
{
- scales.add(new Double(map.GetFiniteDisplayScaleAt(i)));
+ scales.add(new Double(map.getFiniteDisplayScaleAt(i)));
}
Iterator iter = scales.iterator();
int i = 0;
@@ -138,7 +138,7 @@
i++;
}
MgResourceIdentifier mapStateId = new MgResourceIdentifier("Session:" + sessionId + "//" + mapName + "." + MgResourceType.Map);
- map.Save(resourceSrvc, mapStateId);
+ map.save(resourceSrvc, mapStateId);
//load html template code and format it
//
@@ -154,8 +154,8 @@
showLegend != 0 ? "true": "false",
showProperties != 0 ? "true": "false",
sessionId,
- String.valueOf(llExtent.GetX()), String.valueOf(llExtent.GetY()),
- String.valueOf(urExtent.GetX()), String.valueOf(urExtent.GetY()),
+ String.valueOf(llExtent.getX()), String.valueOf(llExtent.getY()),
+ String.valueOf(urExtent.getX()), String.valueOf(urExtent.getY()),
String.valueOf(metersPerUnit),
unitsType,
bgColor,
Modified: trunk/MgDev/Web/src/mapviewerjava/measure.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/measure.jsp 2021-06-12 09:03:31 UTC (rev 9853)
+++ trunk/MgDev/Web/src/mapviewerjava/measure.jsp 2021-06-17 15:58:40 UTC (rev 9854)
@@ -82,14 +82,14 @@
InitializeWebTier();
MgUserInformation cred = new MgUserInformation(sessionId);
- cred.SetClientIp(GetClientIp(request));
- cred.SetClientAgent(GetClientAgent());
+ cred.setClientIp(GetClientIp(request));
+ cred.setClientAgent(GetClientAgent());
//connect to the site and get a feature service and a resource service instances
MgSiteConnection site = new MgSiteConnection();
- site.Open(cred);
- MgFeatureService featureSrvc = (MgFeatureService)site.CreateService(MgServiceType.FeatureService);
- MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
+ site.open(cred);
+ MgFeatureService featureSrvc = (MgFeatureService)site.createService(MgServiceType.FeatureService);
+ MgResourceService resourceSrvc = (MgResourceService)site.createService(MgServiceType.ResourceService);
MgResourceIdentifier dataSourceId = new MgResourceIdentifier(dataSource);
MgResourceIdentifier layerDefId = new MgResourceIdentifier(layerDef);
@@ -97,8 +97,8 @@
//load the map runtime state and locate the measure layer
//
MgMap map = new MgMap(site);
- map.Open(mapName);
- MgLayerCollection layers = map.GetLayers();
+ map.open(mapName);
+ MgLayerCollection layers = map.getLayers();
srs = GetMapSrs(map);
MgLayer layer = FindLayer(layers, layerDef);
@@ -107,7 +107,7 @@
{
total = 0;
if(layer != null)
- layers.Remove(layer);
+ layers.remove(layer);
if(DataSourceExists(resourceSrvc, dataSourceId))
ClearDataSource(featureSrvc, dataSourceId, featureName);
}
@@ -114,15 +114,15 @@
else
{
MgCoordinateSystemFactory srsFactory = new MgCoordinateSystemFactory();
- MgCoordinateSystem srsMap = srsFactory.Create(srs);
+ MgCoordinateSystem srsMap = srsFactory.create(srs);
- int srsType = srsMap.GetType();
+ int srsType = srsMap.getType();
if(srsType == MgCoordinateSystemType.Geographic)
- distance = srsMap.MeasureGreatCircleDistance(x1, y1, x2, y2);
+ distance = srsMap.measureGreatCircleDistance(x1, y1, x2, y2);
else
- distance = srsMap.MeasureEuclideanDistance(x1, y1, x2, y2);
+ distance = srsMap.measureEuclideanDistance(x1, y1, x2, y2);
- distance = srsMap.ConvertCoordinateSystemUnitsToMeters(distance);
+ distance = srsMap.convertCoordinateSystemUnitsToMeters(distance);
if (units.equals("mi")) distance *= 0.000621371192; //get miles
if (units.equals("km")) distance *= 0.001; //get kilometers
@@ -135,9 +135,9 @@
//
MgGeometryFactory geomFactory = new MgGeometryFactory();
MgCoordinateCollection coordinates = new MgCoordinateCollection();
- coordinates.Add(geomFactory.CreateCoordinateXY(x1, y1));
- coordinates.Add(geomFactory.CreateCoordinateXY(x2, y2));
- MgLineString geom = geomFactory.CreateLineString(coordinates);
+ coordinates.add(geomFactory.createCoordinateXY(x1, y1));
+ coordinates.add(geomFactory.createCoordinateXY(x2, y2));
+ MgLineString geom = geomFactory.createLineString(coordinates);
if(segId == 1)
{
@@ -149,41 +149,41 @@
//
MgClassDefinition classDef = new MgClassDefinition();
- classDef.SetName(featureName);
- classDef.SetDescription(MgLocalizer.GetString("MEASUREFEATURECLASS", locale));
- classDef.SetDefaultGeometryPropertyName("GEOM");
+ classDef.setName(featureName);
+ classDef.setDescription(MgLocalizer.GetString("MEASUREFEATURECLASS", locale));
+ classDef.setDefaultGeometryPropertyName("GEOM");
//Set KEY property
MgDataPropertyDefinition prop = new MgDataPropertyDefinition("KEY");
- prop.SetDataType(MgPropertyType.Int32);
- prop.SetAutoGeneration(true);
- prop.SetReadOnly(true);
- classDef.GetIdentityProperties().Add(prop);
- classDef.GetProperties().Add(prop);
+ prop.setDataType(MgPropertyType.Int32);
+ prop.setAutoGeneration(true);
+ prop.setReadOnly(true);
+ classDef.getIdentityProperties().add(prop);
+ classDef.getProperties().add(prop);
//Set PARTIAL property. Hold the distance for this segment
prop = new MgDataPropertyDefinition("PARTIAL");
- prop.SetDataType(MgPropertyType.Double);
- classDef.GetProperties().Add(prop);
+ prop.setDataType(MgPropertyType.Double);
+ classDef.getProperties().add(prop);
//Set TOTAL property. Hold the total distance up to this segment, including it
prop = new MgDataPropertyDefinition("TOTAL");
- prop.SetDataType(MgPropertyType.Double);
- classDef.GetProperties().Add(prop);
+ prop.setDataType(MgPropertyType.Double);
+ classDef.getProperties().add(prop);
//Set geometry property
MgGeometricPropertyDefinition geomProp = new MgGeometricPropertyDefinition("GEOM");
- //geomProp.SetGeometryTypes(MgFeatureGeometricType.mfgtSurface); //TODO use the constant when exposed
- geomProp.SetGeometryTypes(4);
- classDef.GetProperties().Add(geomProp);
+ //geomProp.setGeometryTypes(MgFeatureGeometricType.mfgtSurface); //TODO use the constant when exposed
+ geomProp.setGeometryTypes(4);
+ classDef.getProperties().add(geomProp);
//Create the schema
MgFeatureSchema schema = new MgFeatureSchema("MeasureSchema", MgLocalizer.GetString("MEASURESCHEMADESCR", locale));
- schema.GetClasses().Add(classDef);
+ schema.getClasses().add(classDef);
//finally, creation of the feature source
MgFileFeatureSourceParams parameters = new MgFileFeatureSourceParams("OSGeo.SDF", "MapSrs", srs, schema);
- featureSrvc.CreateFeatureSource(dataSourceId, parameters);
+ featureSrvc.createFeatureSource(dataSourceId, parameters);
//build map tip
String unitText = "";
@@ -198,7 +198,7 @@
//Create the layer definition
MgByteReader layerDefContent = BuildLayerDefinitionContent(dataSource, featureName, tip);
- resourceSrvc.SetResource(layerDefId, layerDefContent, null);
+ resourceSrvc.setResource(layerDefId, layerDefContent, null);
}
else
{
@@ -211,9 +211,9 @@
{
legendName = MgLocalizer.GetString("MEASURELAYER", locale);
layer = new MgLayer(layerDefId, resourceSrvc);
- layer.SetDisplayInLegend(true);
- layer.SetLegendLabel(legendName);
- layers.Insert(0, layer);
+ layer.setDisplayInLegend(true);
+ layer.setLegendLabel(legendName);
+ layers.insert(0, layer);
}
}
// create a feature representing this segment and insert it into the data source
@@ -221,32 +221,32 @@
MgPropertyCollection measureProps = new MgPropertyCollection();
MgDoubleProperty partialProp = new MgDoubleProperty("PARTIAL", distance);
- measureProps.Add(partialProp);
+ measureProps.add(partialProp);
MgDoubleProperty totalProp = new MgDoubleProperty("TOTAL", total);
- measureProps.Add(totalProp);
+ measureProps.add(totalProp);
MgAgfReaderWriter agf = new MgAgfReaderWriter();
- MgByteReader geomReader = agf.Write(geom);
+ MgByteReader geomReader = agf.write(geom);
MgGeometryProperty geometryProp = new MgGeometryProperty("GEOM", geomReader);
- measureProps.Add(geometryProp);
+ measureProps.add(geometryProp);
MgInsertFeatures cmd = new MgInsertFeatures(featureName, measureProps);
MgFeatureCommandCollection commands = new MgFeatureCommandCollection();
- commands.Add(cmd);
+ commands.add(cmd);
//Insert the distance feature in the temporary data source
//
- ReleaseReader(featureSrvc.UpdateFeatures(dataSourceId, commands, false));
+ ReleaseReader(featureSrvc.updateFeatures(dataSourceId, commands, false));
}
if(layer != null)
- layer.ForceRefresh();
- map.Save();
+ layer.forceRefresh();
+ map.save();
}
catch(MgException exc)
{
- OnError(MgLocalizer.GetString("MEASUREERROR", locale), exc.GetDetails(), outStream, request);
+ OnError(MgLocalizer.GetString("MEASUREERROR", locale), exc.getDetails(), outStream, request);
return;
}
catch(Exception ne)
@@ -303,7 +303,7 @@
String GetMapSrs(MgMap map) throws MgException
{
- srs = map.GetMapSRS();
+ srs = map.getMapSRS();
if(!srs.equals(""))
return srs;
@@ -316,10 +316,10 @@
{
MgLayer layer = null;
int i;
- for(i = 0; i < layers.GetCount(); i++)
+ for(i = 0; i < layers.getCount(); i++)
{
- MgLayer layer1 = (MgLayer) layers.GetItem(i);
- if(layer1.GetLayerDefinition().ToString().equals(layerDef))
+ MgLayer layer1 = (MgLayer) layers.getItem(i);
+ if(layer1.getLayerDefinition().toString().equals(layerDef))
{
layer = layer1;
break;
@@ -330,7 +330,7 @@
boolean DataSourceExists(MgResourceService resourceSrvc, MgResourceIdentifier resId) throws MgException
{
- return resourceSrvc.ResourceExists(resId);
+ return resourceSrvc.resourceExists(resId);
}
MgByteReader BuildLayerDefinitionContent(String dataSource, String featureName, String tip) throws MgException, Exception
@@ -347,7 +347,7 @@
byte[] bytes = layerTempl.getBytes("UTF-8");
MgByteSource src = new MgByteSource(bytes, bytes.length);
- return src.GetReader();
+ return src.getReader();
}
void ClearDataSource(MgFeatureService featureSrvc, MgResourceIdentifier dataSourceId, String featureName) throws MgException
@@ -354,8 +354,8 @@
{
MgDeleteFeatures deleteCmd = new MgDeleteFeatures(featureName, "KEY >= 0");
MgFeatureCommandCollection commands = new MgFeatureCommandCollection();
- commands.Add(deleteCmd);
- featureSrvc.UpdateFeatures(dataSourceId, commands, false);
+ commands.add(deleteCmd);
+ featureSrvc.updateFeatures(dataSourceId, commands, false);
}
void OnError(String title, String msg, PrintWriter outStream, HttpServletRequest request) throws FileNotFoundException, IOException
@@ -369,16 +369,16 @@
{
if(res == null)
return;
- MgProperty prop = res.GetItem(0);
+ MgProperty prop = res.getItem(0);
if(prop == null)
return;
if (prop instanceof MgStringProperty)
- throw new RuntimeException(((MgStringProperty)prop).GetValue());
+ throw new RuntimeException(((MgStringProperty)prop).getValue());
MgFeatureProperty resProp = (MgFeatureProperty)prop;
- MgFeatureReader reader = (MgFeatureReader)resProp.GetValue();
+ MgFeatureReader reader = (MgFeatureReader)resProp.getValue();
if(reader == null)
return;
- reader.Close();
+ reader.close();
}
%>
Modified: trunk/MgDev/Web/src/mapviewerjava/quickplotgeneratepicture.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/quickplotgeneratepicture.jsp 2021-06-12 09:03:31 UTC (rev 9853)
+++ trunk/MgDev/Web/src/mapviewerjava/quickplotgeneratepicture.jsp 2021-06-17 15:58:40 UTC (rev 9854)
@@ -55,8 +55,8 @@
catch (MgException e)
{
response.setContentType("text/html");
- out.write ("ERROR:" + e.GetExceptionMessage() + "<br />");
- out.write (e.GetStackTrace() + "<br />");
+ out.write ("ERROR:" + e.getExceptionMessage() + "<br />");
+ out.write (e.getStackTrace() + "<br />");
}
%>
@@ -94,13 +94,13 @@
for (int i = 0; i < coordinates.length; ++i)
{
- coordinateCollection.Add(geometryFactory.CreateCoordinateXY(numberFormat.parse(coordinates[i]).doubleValue(), numberFormat.parse(coordinates[++i]).doubleValue()));
+ coordinateCollection.add(geometryFactory.createCoordinateXY(numberFormat.parse(coordinates[i]).doubleValue(), numberFormat.parse(coordinates[++i]).doubleValue()));
}
- coordinateCollection.Add(geometryFactory.CreateCoordinateXY(numberFormat.parse(coordinates[0]).doubleValue(), numberFormat.parse(coordinates[1]).doubleValue()));
- MgLinearRing linearRing = geometryFactory.CreateLinearRing(coordinateCollection);
+ coordinateCollection.add(geometryFactory.createCoordinateXY(numberFormat.parse(coordinates[0]).doubleValue(), numberFormat.parse(coordinates[1]).doubleValue()));
+ MgLinearRing linearRing = geometryFactory.createLinearRing(coordinateCollection);
- return geometryFactory.CreatePolygon(linearRing, null);
+ return geometryFactory.createPolygon(linearRing, null);
}
BufferedImage GenerateMap(Size<Integer> size) throws MgException, IOException
@@ -109,30 +109,30 @@
MgUserInformation userInfo = new MgUserInformation(sessionId);
MgSiteConnection siteConnection = new MgSiteConnection();
- siteConnection.Open(userInfo);
- MgRenderingService renderingService = (MgRenderingService) siteConnection.CreateService(MgServiceType.RenderingService);
+ siteConnection.open(userInfo);
+ MgRenderingService renderingService = (MgRenderingService) siteConnection.createService(MgServiceType.RenderingService);
MgMap map = new MgMap(siteConnection);
- map.Open(mapName);
+ map.open(mapName);
MgSelection selection = new MgSelection(map);
// Caculate the generated picture size
- MgEnvelope envelope = captureBox.Envelope();
- MgEnvelope normalizedE = normalizedCapture.Envelope();
- Size<Double> size1 = new Size<Double>(envelope.GetWidth(), envelope.GetHeight());
- Size<Double> size2 = new Size<Double>(normalizedE.GetWidth(), normalizedE.GetHeight());
+ MgEnvelope envelope = captureBox.envelope();
+ MgEnvelope normalizedE = normalizedCapture.envelope();
+ Size<Double> size1 = new Size<Double>(envelope.getWidth(), envelope.getHeight());
+ Size<Double> size2 = new Size<Double>(normalizedE.getWidth(), normalizedE.getHeight());
Size<Double> toSize = new Size<Double>(size1.width / size2.width * size.width, size1.height / size2.height * size.height);
- MgCoordinate center = captureBox.GetCentroid().GetCoordinate();
+ MgCoordinate center = captureBox.getCentroid().getCoordinate();
- map.SetDisplayDpi(printDpi);
- String colorString = map.GetBackgroundColor();
+ map.setDisplayDpi(printDpi);
+ String colorString = map.getBackgroundColor();
// The returned color string is in AARRGGBB format. But the constructor of MgColor needs a string in RRGGBBAA format
colorString = colorString.substring(2, 8) + colorString.substring(0, 2);
MgColor color = new MgColor(colorString);
- MgByteReader mgReader = renderingService.RenderMap(map,
+ MgByteReader mgReader = renderingService.renderMap(map,
selection,
center,
scaleDenominator,
@@ -142,7 +142,7 @@
"PNG",
false);
File tempImage = File.createTempFile(UUID.randomUUID().toString(), "png");
- mgReader.ToFile(tempImage.getAbsolutePath());
+ mgReader.toFile(tempImage.getAbsolutePath());
BufferedImage image = ImageIO.read(tempImage);
tempImage.delete();
Modified: trunk/MgDev/Web/src/mapviewerjava/search.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/search.jsp 2021-06-12 09:03:31 UTC (rev 9853)
+++ trunk/MgDev/Web/src/mapviewerjava/search.jsp 2021-06-17 15:58:40 UTC (rev 9854)
@@ -81,24 +81,24 @@
InitializeWebTier();
MgUserInformation cred = new MgUserInformation(sessionId);
- cred.SetClientIp(GetClientIp(request));
- cred.SetClientAgent(GetClientAgent());
+ cred.setClientIp(GetClientIp(request));
+ cred.setClientAgent(GetClientAgent());
//connect to the site and get a feature service and a resource service instances
MgSiteConnection site = new MgSiteConnection();
- site.Open(cred);
+ site.open(cred);
//Create a temporary map runtime object, locate the layer
//
MgMap map = new MgMap(site);
- map.Open(mapName);
- MgLayerCollection layers = map.GetLayers();
+ map.open(mapName);
+ MgLayerCollection layers = map.getLayers();
int i, j;
MgLayer layer = null;
- for(i = 0; i < layers.GetCount(); i++)
+ for(i = 0; i < layers.getCount(); i++)
{
- layer = (MgLayer)layers.GetItem(i);
- if(layer.GetName().equals(layerName))
+ layer = (MgLayer)layers.getItem(i);
+ if(layer.getName().equals(layerName))
break;
}
@@ -116,16 +116,16 @@
boolean displayAll = (resProps.size() == 0);
//query the features
- MgClassDefinition clsDef = layer.GetClassDefinition();
+ MgClassDefinition clsDef = layer.getClassDefinition();
MgFeatureQueryOptions opts = BuildFeatureQueryOptions(clsDef);
- opts.SetFilter(filter);
- String featureClassName = layer.GetFeatureClassName();
- features = layer.SelectFeatures(opts);
- boolean hasResult = features.ReadNext();
+ opts.setFilter(filter);
+ String featureClassName = layer.getFeatureClassName();
+ features = layer.selectFeatures(opts);
+ boolean hasResult = features.readNext();
if(hasResult)
{
- int colCount = displayAll ? features.GetPropertyCount(): resProps.size();
+ int colCount = displayAll ? features.getPropertyCount(): resProps.size();
//output the beginning of the document (head section and beginning of body section)
String templ = MgLocalizer.Localize(LoadTemplate("/viewerfiles/search.templ"), locale, GetClientOS(request));
@@ -136,13 +136,13 @@
};
outStream.write(Substitute(templ, vals));
- MgClassDefinition classDef = features.GetClassDefinition();
- MgPropertyDefinitionCollection classDefProps = classDef.GetIdentityProperties();
- ArrayList idPropNames = new ArrayList(classDefProps.GetCount());
- for(j = 0; j < classDefProps.GetCount(); j++)
+ MgClassDefinition classDef = features.getClassDefinition();
+ MgPropertyDefinitionCollection classDefProps = classDef.getIdentityProperties();
+ ArrayList idPropNames = new ArrayList(classDefProps.getCount());
+ for(j = 0; j < classDefProps.getCount(); j++)
{
- MgPropertyDefinition idProp = classDefProps.GetItem(j);
- idPropNames.add(idProp.GetName());
+ MgPropertyDefinition idProp = classDefProps.getItem(j);
+ idPropNames.add(idProp.getName());
}
//table headings
@@ -151,7 +151,7 @@
{
for(i = 0; i < colCount; i++)
{
- resProps.add(features.GetPropertyName(i));
+ resProps.add(features.getPropertyName(i));
outStream.write("<td class=\"SearchHeading\"> " + (String)resProps.get(i) + "</td>");
}
}
@@ -171,35 +171,35 @@
for(i = 0; i < colCount; i++)
{
String prop = (String)resProps.get(i);
- int propType = features.GetPropertyType(prop);
+ int propType = features.getPropertyType(prop);
String val = "";
- if (!features.IsNull(prop))
+ if (!features.isNull(prop))
{
switch(propType)
{
case MgPropertyType.Boolean:
- val = features.GetBoolean(prop)? "True": "False";
+ val = features.getBoolean(prop)? "True": "False";
break;
case MgPropertyType.Single:
- val = String.valueOf(features.GetSingle(prop));
+ val = String.valueOf(features.getSingle(prop));
break;
case MgPropertyType.Double:
- val = String.valueOf(features.GetDouble(prop));
+ val = String.valueOf(features.getDouble(prop));
break;
case MgPropertyType.Int16:
- val = String.valueOf(features.GetInt16(prop));
+ val = String.valueOf(features.getInt16(prop));
break;
case MgPropertyType.Int32:
- val = String.valueOf(features.GetInt32(prop));
+ val = String.valueOf(features.getInt32(prop));
break;
case MgPropertyType.Int64:
- val = String.valueOf(features.GetInt64(prop));
+ val = String.valueOf(features.getInt64(prop));
break;
case MgPropertyType.String:
- val = features.GetString(prop);
+ val = features.getString(prop);
break;
case MgPropertyType.DateTime:
- val = features.GetDateTime(prop).ToString();
+ val = features.getDateTime(prop).toString();
break;
}
}
@@ -211,33 +211,33 @@
for (Iterator it = idPropNames.iterator(); it.hasNext(); )
{
String id = (String) it.next();
- idPropType = features.GetPropertyType(id);
+ idPropType = features.getPropertyType(id);
switch (idPropType)
{
case MgPropertyType.Int32:
- idProps.Add(new MgInt32Property(id, features.GetInt32(id)));
+ idProps.add(new MgInt32Property(id, features.getInt32(id)));
break;
case MgPropertyType.String:
- idProps.Add(new MgStringProperty(id, features.GetString(id)));
+ idProps.add(new MgStringProperty(id, features.getString(id)));
break;
case MgPropertyType.Int64:
- idProps.Add(new MgInt64Property(id, features.GetInt64(id)));
+ idProps.add(new MgInt64Property(id, features.getInt64(id)));
break;
case MgPropertyType.Double:
- idProps.Add(new MgDoubleProperty(id, features.GetDouble(id)));
+ idProps.add(new MgDoubleProperty(id, features.getDouble(id)));
break;
case MgPropertyType.Single:
- idProps.Add(new MgSingleProperty(id, features.GetSingle(id)));
+ idProps.add(new MgSingleProperty(id, features.getSingle(id)));
break;
case MgPropertyType.DateTime:
- idProps.Add(new MgDateTimeProperty(id, features.GetDateTime(id)));
+ idProps.add(new MgDateTimeProperty(id, features.getDateTime(id)));
break;
default:
throw new SearchError(MessageFormat.format(MgLocalizer.GetString("SEARCHTYYPENOTSUP", locale), new Object[] {String.valueOf(idPropType)}), searchError);
}
}
- sel.AddFeatureIds(layer, featureClassName, idProps);
- String selText = EscapeForHtml(sel.ToXml());
+ sel.addFeatureIds(layer, featureClassName, idProps);
+ String selText = EscapeForHtml(sel.toXml());
outStream.write("<td class=\"" + ((row%2)==0 ? "Search" : "Search2") + "\" id=\"" + row + ":" + i + "\" onmousemove=\"SelectRow(" + row + ")\" onclick=\"CellClicked('" + selText + "')\"> " + val + "</td>\n");
}
@@ -244,7 +244,7 @@
outStream.write("</tr>");
if(++ row == matchLimit)
break;
- } while(features.ReadNext());
+ } while(features.readNext());
}
else
{
@@ -256,9 +256,9 @@
if(features != null)
{
// Close the feature reader
- features.Close();
+ features.close();
}
- OnError(searchError, ae.GetExceptionMessage() + "<br>" + ae.GetStackTrace(), outStream, request);
+ OnError(searchError, ae.getExceptionMessage() + "<br>" + ae.getStackTrace(), outStream, request);
}
catch(SearchError exc)
{
@@ -265,7 +265,7 @@
if(features != null)
{
// Close the feature reader
- features.Close();
+ features.close();
}
OnError(exc.title, exc.getMessage(), outStream, request);
}
Modified: trunk/MgDev/Web/src/mapviewerjava/selectwithin.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/selectwithin.jsp 2021-06-12 09:03:31 UTC (rev 9853)
+++ trunk/MgDev/Web/src/mapviewerjava/selectwithin.jsp 2021-06-17 15:58:40 UTC (rev 9854)
@@ -43,21 +43,21 @@
InitializeWebTier();
MgUserInformation cred = new MgUserInformation(sessionId);
- cred.SetClientIp(GetClientIp(request));
- cred.SetClientAgent(GetClientAgent());
+ cred.setClientIp(GetClientIp(request));
+ cred.setClientAgent(GetClientAgent());
//connect to the site and get an instance of each service used in this script
//
MgSiteConnection site = new MgSiteConnection();
- site.Open(cred);
- MgFeatureService featureSrvc = (MgFeatureService)site.CreateService(MgServiceType.FeatureService);
- MgRenderingService renderingSrvc = (MgRenderingService)site.CreateService(MgServiceType.RenderingService);
- MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
+ site.open(cred);
+ MgFeatureService featureSrvc = (MgFeatureService)site.createService(MgServiceType.FeatureService);
+ MgRenderingService renderingSrvc = (MgRenderingService)site.createService(MgServiceType.RenderingService);
+ MgResourceService resourceSrvc = (MgResourceService)site.createService(MgServiceType.ResourceService);
//load the map runtime state
//
MgMap map = new MgMap(site);
- map.Open(mapName);
+ map.open(mapName);
String[] layersList = layers.split(",");
if(layersList.length > 0)
@@ -65,7 +65,7 @@
MgStringCollection layerNames = new MgStringCollection();
for(int i = 0; i < layersList.length; i++)
{
- layerNames.Add(layersList[i]);
+ layerNames.add(layersList[i]);
}
// create a multi-polygon or a multi-geometry containing the input selected features
@@ -75,22 +75,22 @@
{
// Query all the features belonging the the layer list that intersects with the input geometries
//
- MgFeatureInformation fi = renderingSrvc.QueryFeatures(map, layerNames, inputGeom, MgFeatureSpatialOperations.Intersects, -1);
+ MgFeatureInformation fi = renderingSrvc.queryFeatures(map, layerNames, inputGeom, MgFeatureSpatialOperations.Intersects, -1);
if(fi != null)
{
- MgSelection resultSel = fi.GetSelection();
+ MgSelection resultSel = fi.getSelection();
if(resultSel != null)
{
// Return XML
- resultSel.Save(resourceSrvc, mapName);
+ resultSel.save(resourceSrvc, mapName);
//this needs to be re-opened for some reason
resultSel = new MgSelection(map);
- resultSel.Open(resourceSrvc, mapName);
- MgReadOnlyLayerCollection resLayers = resultSel.GetLayers();
- if (resLayers != null && resLayers.GetCount() >= 0)
+ resultSel.open(resourceSrvc, mapName);
+ MgReadOnlyLayerCollection resLayers = resultSel.getLayers();
+ if (resLayers != null && resLayers.getCount() >= 0)
{
response.addHeader("Content-type", "text/xml");
- outStream.write(resultSel.ToXml());
+ outStream.write(resultSel.toXml());
}
}
}
@@ -99,7 +99,7 @@
}
catch(MgException exc)
{
- outStream.write("\nException: " + exc.GetDetails());
+ outStream.write("\nException: " + exc.getDetails());
return;
}
catch(Exception ne)
@@ -113,7 +113,7 @@
MgGeometry MultiGeometryFromSelection(MgFeatureService featureSrvc, MgMap map, String selText) throws MgException
{
MgSelection sel = new MgSelection(map, selText);
- MgReadOnlyLayerCollection selLayers = sel.GetLayers();
+ MgReadOnlyLayerCollection selLayers = sel.getLayers();
if(selLayers == null)
return null;
MgGeometryCollection geomColl = new MgGeometryCollection();
@@ -120,26 +120,26 @@
MgAgfReaderWriter agfRW = new MgAgfReaderWriter();
boolean simplyPolygonOnly = true;
- for(int i = 0; i < selLayers.GetCount(); i++)
+ for(int i = 0; i < selLayers.getCount(); i++)
{
- MgLayer layer = (MgLayer) selLayers.GetItem(i);
- String filter = sel.GenerateFilter(layer, layer.GetFeatureClassName());
+ MgLayer layer = (MgLayer) selLayers.getItem(i);
+ String filter = sel.generateFilter(layer, layer.getFeatureClassName());
- MgClassDefinition clsDef = layer.GetClassDefinition();
+ MgClassDefinition clsDef = layer.getClassDefinition();
MgFeatureQueryOptions query = BuildFeatureQueryOptions(clsDef);
- query.SetFilter(filter);
- MgResourceIdentifier featureSource = new MgResourceIdentifier(layer.GetFeatureSourceId());
- MgFeatureReader features = featureSrvc.SelectFeatures(featureSource, layer.GetFeatureClassName(), query);
+ query.setFilter(filter);
+ MgResourceIdentifier featureSource = new MgResourceIdentifier(layer.getFeatureSourceId());
+ MgFeatureReader features = featureSrvc.selectFeatures(featureSource, layer.getFeatureClassName(), query);
if(features != null)
{
- MgClassDefinition classDef = features.GetClassDefinition();
- String geomPropName = classDef.GetDefaultGeometryPropertyName();
- while(features.ReadNext())
+ MgClassDefinition classDef = features.getClassDefinition();
+ String geomPropName = classDef.getDefaultGeometryPropertyName();
+ while(features.readNext())
{
- MgByteReader geomReader = features.GetGeometry(geomPropName);
- MgGeometry geom = agfRW.Read(geomReader);
- int type = geom.GetGeometryType();
+ MgByteReader geomReader = features.getGeometry(geomPropName);
+ MgGeometry geom = agfRW.read(geomReader);
+ int type = geom.getGeometryType();
if(type == MgGeometryType.MultiPolygon || type == MgGeometryType.CurvePolygon || type == MgGeometryType.MultiCurvePolygon)
{
simplyPolygonOnly = false;
@@ -148,13 +148,13 @@
{
continue;
}
- geomColl.Add(geom);
+ geomColl.add(geom);
}
- features.Close();
+ features.close();
}
}
- if(geomColl.GetCount() == 0)
+ if(geomColl.getCount() == 0)
{
return null;
}
@@ -163,15 +163,15 @@
if(simplyPolygonOnly)
{
MgPolygonCollection polyColl = new MgPolygonCollection();
- for(int j = 0; j < geomColl.GetCount(); j++)
+ for(int j = 0; j < geomColl.getCount(); j++)
{
- polyColl.Add((MgPolygon)geomColl.GetItem(j));
+ polyColl.add((MgPolygon)geomColl.getItem(j));
}
- return gf.CreateMultiPolygon(polyColl);
+ return gf.createMultiPolygon(polyColl);
}
else
{
- return gf.CreateMultiGeometry(geomColl);
+ return gf.createMultiGeometry(geomColl);
}
}
Modified: trunk/MgDev/Web/src/mapviewerjava/serveradminhelper.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/serveradminhelper.jsp 2021-06-12 09:03:31 UTC (rev 9853)
+++ trunk/MgDev/Web/src/mapviewerjava/serveradminhelper.jsp 2021-06-17 15:58:40 UTC (rev 9854)
@@ -38,23 +38,23 @@
InitializeWebTier();
MgUserInformation cred = new MgUserInformation();
- cred.SetMgUsernamePassword("Administrator", "admin");
- cred.SetLocale(GetDefaultLocale());
- cred.SetClientIp(GetClientIp(request));
- cred.SetClientAgent(GetClientAgent());
+ cred.setMgUsernamePassword("Administrator", "admin");
+ cred.setLocale(GetDefaultLocale());
+ cred.setClientIp(GetClientIp(request));
+ cred.setClientAgent(GetClientAgent());
MgServerAdmin serverAdmin = new MgServerAdmin();
- serverAdmin.Open("localhost", cred);
+ serverAdmin.open("localhost", cred);
String operation = request.getParameter("OPERATION");
// Get all information properties
- MgPropertyCollection infoProp = serverAdmin.GetInformationProperties();
+ MgPropertyCollection infoProp = serverAdmin.getInformationProperties();
if (operation.equals("ONLINE"))
{
- serverAdmin.BringOnline();
- if (serverAdmin.IsOnline())
+ serverAdmin.bringOnline();
+ if (serverAdmin.isOnline())
{
outStream.write("Server online<p>");
}
@@ -65,8 +65,8 @@
}
else if (operation.equals("OFFLINE"))
{
- serverAdmin.TakeOffline();
- if (serverAdmin.IsOnline())
+ serverAdmin.takeOffline();
+ if (serverAdmin.isOnline())
{
outStream.write("Server online<p>");
}
@@ -77,63 +77,63 @@
}
else if (operation.equals("GETTOTALPHYSICALMEMORY"))
{
- MgInt64Property nMemory = (MgInt64Property)infoProp.GetItem("TotalPhysicalMemory");
- outStream.write("Total Physical Memory: " + nMemory.GetValue() + " bytes");
+ MgInt64Property nMemory = (MgInt64Property)infoProp.getItem("TotalPhysicalMemory");
+ outStream.write("Total Physical Memory: " + nMemory.getValue() + " bytes");
}
else if (operation.equals("GETAVAILABLEPHYSICALMEMORY"))
{
- MgInt64Property nMemory = (MgInt64Property)infoProp.GetItem("AvailablePhysicalMemory");
- outStream.write("Available Physical Memory: " + nMemory.GetValue() + " bytes");
+ MgInt64Property nMemory = (MgInt64Property)infoProp.getItem("AvailablePhysicalMemory");
+ outStream.write("Available Physical Memory: " + nMemory.getValue() + " bytes");
}
else if (operation.equals("GETTOTALVIRTUALMEMORY"))
{
- MgInt64Property nMemory = (MgInt64Property)infoProp.GetItem("TotalVirtualMemory");
- outStream.write("Total Virtual Memory: " + nMemory.GetValue() + " bytes");
+ MgInt64Property nMemory = (MgInt64Property)infoProp.getItem("TotalVirtualMemory");
+ outStream.write("Total Virtual Memory: " + nMemory.getValue() + " bytes");
}
else if (operation.equals("GETAVAILABLEVIRTUALMEMORY"))
{
- MgInt64Property nMemory = (MgInt64Property)infoProp.GetItem("AvailableVirtualMemory");
- outStream.write("Available Virtual Memory: " + nMemory.GetValue() + " bytes");
+ MgInt64Property nMemory = (MgInt64Property)infoProp.getItem("AvailableVirtualMemory");
+ outStream.write("Available Virtual Memory: " + nMemory.getValue() + " bytes");
}
else if (operation.equals("GETCPUUTILIZATION"))
{
- MgInt32Property nCpuLoad = (MgInt32Property)infoProp.GetItem("CpuUtilization");
- outStream.write("Current CPU Utilization: " + nCpuLoad.GetValue() + "%");
+ MgInt32Property nCpuLoad = (MgInt32Property)infoProp.getItem("CpuUtilization");
+ outStream.write("Current CPU Utilization: " + nCpuLoad.getValue() + "%");
}
else if (operation.equals("GETUPTIME"))
{
- MgInt32Property nUptime = (MgInt32Property)infoProp.GetItem("Uptime");
- outStream.write("Server uptime: " + nUptime.GetValue() + " seconds");
+ MgInt32Property nUptime = (MgInt32Property)infoProp.getItem("Uptime");
+ outStream.write("Server uptime: " + nUptime.getValue() + " seconds");
}
else if (operation.equals("GETAVERAGEOPERATIONTIME"))
{
- MgInt32Property nTime = (MgInt32Property)infoProp.GetItem("AverageOperationTime");
- outStream.write("Average Operation Time: " + nTime.GetValue() + " milliseconds");
+ MgInt32Property nTime = (MgInt32Property)infoProp.getItem("AverageOperationTime");
+ outStream.write("Average Operation Time: " + nTime.getValue() + " milliseconds");
}
else if (operation.equals("GETTOTALOPERATIONTIME"))
{
- MgInt32Property nTime = (MgInt32Property)infoProp.GetItem("TotalOperationTime");
- outStream.write("Total Operation Time: " + nTime.GetValue() + " seconds");
+ MgInt32Property nTime = (MgInt32Property)infoProp.getItem("TotalOperationTime");
+ outStream.write("Total Operation Time: " + nTime.getValue() + " seconds");
}
else if (operation.equals("GETADMINQUEUECOUNT"))
{
- MgInt32Property nCount = (MgInt32Property)infoProp.GetItem("AdminOperationsQueueCount");
- outStream.write("Admin queue count: " + nCount.GetValue());
+ MgInt32Property nCount = (MgInt32Property)infoProp.getItem("AdminOperationsQueueCount");
+ outStream.write("Admin queue count: " + nCount.getValue());
}
else if (operation.equals("GETCLIENTQUEUECOUNT"))
{
- MgInt32Property nCount = (MgInt32Property)infoProp.GetItem("ClientOperationsQueueCount");
- outStream.write("Client queue count: " + nCount.GetValue());
+ MgInt32Property nCount = (MgInt32Property)infoProp.getItem("ClientOperationsQueueCount");
+ outStream.write("Client queue count: " + nCount.getValue());
}
else if (operation.equals("GETSITEQUEUECOUNT"))
{
- MgInt32Property nCount = (MgInt32Property)infoProp.GetItem("SiteOperationsQueueCount");
- outStream.write("Site queue count: " + nCount.GetValue());
+ MgInt32Property nCount = (MgInt32Property)infoProp.getItem("SiteOperationsQueueCount");
+ outStream.write("Site queue count: " + nCount.getValue());
}
else if (operation.equals("SERVERVERSION"))
{
- MgStringProperty version = (MgStringProperty)infoProp.GetItem("ServerVersion");
- outStream.write("Server version: " + version.GetValue());
+ MgStringProperty version = (MgStringProperty)infoProp.getItem("ServerVersion");
+ outStream.write("Server version: " + version.getValue());
}
else
{
@@ -142,7 +142,7 @@
}
catch (MgException mge)
{
- outStream.write(mge.GetDetails());
+ outStream.write(mge.getDetails());
}
%>
Modified: trunk/MgDev/Web/src/mapviewerjava/taskframe.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/taskframe.jsp 2021-06-12 09:03:31 UTC (rev 9853)
+++ trunk/MgDev/Web/src/mapviewerjava/taskframe.jsp 2021-06-17 15:58:40 UTC (rev 9854)
@@ -42,19 +42,19 @@
InitializeWebTier();
MgUserInformation cred = new MgUserInformation(sessionId);
- cred.SetClientIp(GetClientIp(request));
- cred.SetClientAgent(GetClientAgent());
+ cred.setClientIp(GetClientIp(request));
+ cred.setClientAgent(GetClientAgent());
//connect to the site and get a feature service and a resource service instances
MgSiteConnection site = new MgSiteConnection();
- site.Open(cred);
+ site.open(cred);
//Get the MgWebLayout object
- MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
+ MgResourceService resourceSrvc = (MgResourceService)site.createService(MgServiceType.ResourceService);
MgResourceIdentifier webLayoutResId = new MgResourceIdentifier(webLayoutId);
MgWebLayout webLayout = new MgWebLayout(resourceSrvc, webLayoutResId);
- MgWebTaskPane taskPane = webLayout.GetTaskPane();
- String taskPaneUrl = taskPane.GetInitialTaskUrl();
+ MgWebTaskPane taskPane = webLayout.getTaskPane();
+ String taskPaneUrl = taskPane.getInitialTaskUrl();
String vpath = GetSurroundVirtualPath(request);
if (taskPaneUrl == null || taskPaneUrl.length() == 0)
{
@@ -86,7 +86,7 @@
}
catch (MgException exc)
{
- OnError(MgLocalizer.GetString("TASKS", locale), exc.GetExceptionMessage(), response.getWriter(), request);
+ OnError(MgLocalizer.GetString("TASKS", locale), exc.getExceptionMessage(), response.getWriter(), request);
return;
}
catch (Exception ne)
More information about the mapguide-commits
mailing list