[mapguide-commits] r7075 - in branches/maestro-4.0.x: . Maestro.Editors/FeatureSource/Providers/Wms MaestroAPITests OSGeo.MapGuide.MaestroAPI
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Oct 4 05:47:10 PDT 2012
Author: jng
Date: 2012-10-04 05:47:09 -0700 (Thu, 04 Oct 2012)
New Revision: 7075
Modified:
branches/maestro-4.0.x/
branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.Designer.cs
branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.cs
branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.resx
branches/maestro-4.0.x/MaestroAPITests/SchemaTests.cs
branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI/Utility.cs
Log:
#2136, #2137: Backport r7073 and r7074 to 4.0.x
Property changes on: branches/maestro-4.0.x
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Tools/Maestro:6490-6494,6923-6924,6926,6928,7026,7034,7056,7058,7060-7061
+ /trunk/Tools/Maestro:6490-6494,6923-6924,6926,6928,7026,7034,7056,7058,7060-7061,7073-7074
Modified: branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.Designer.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.Designer.cs 2012-10-04 12:36:40 UTC (rev 7074)
+++ branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.Designer.cs 2012-10-04 12:47:09 UTC (rev 7075)
@@ -83,9 +83,9 @@
//
// groupBox2
//
+ resources.ApplyResources(this.groupBox2, "groupBox2");
this.groupBox2.Controls.Add(this.lstFeatureClasses);
this.groupBox2.Controls.Add(this.toolStrip1);
- resources.ApplyResources(this.groupBox2, "groupBox2");
this.groupBox2.Name = "groupBox2";
this.groupBox2.TabStop = false;
//
@@ -128,8 +128,8 @@
//
// groupBox1
//
+ resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Controls.Add(this.grdSpatialContexts);
- resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Name = "groupBox1";
this.groupBox1.TabStop = false;
//
Modified: branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.cs 2012-10-04 12:36:40 UTC (rev 7074)
+++ branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.cs 2012-10-04 12:47:09 UTC (rev 7075)
@@ -122,7 +122,7 @@
item.BackgroundColor = Color.White;
item.SpatialContextName = defaultSc.Name;
item.UseTileCache = false;
- item.AddLayer(new WmsLayerDefinition(schemaName + ":" + clsName) { Style = "default" });
+ item.AddLayer(new WmsLayerDefinition(clsName) { Style = "default" }); //NOXLATE
return item;
}
Modified: branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.resx
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.resx 2012-10-04 12:36:40 UTC (rev 7074)
+++ branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.resx 2012-10-04 12:47:09 UTC (rev 7075)
@@ -154,7 +154,7 @@
<value>113, 13</value>
</data>
<data name="txtFeatureServer.Size" type="System.Drawing.Size, System.Drawing">
- <value>493, 20</value>
+ <value>538, 20</value>
</data>
<data name="txtFeatureServer.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -171,11 +171,14 @@
<data name=">>txtFeatureServer.ZOrder" xml:space="preserve">
<value>6</value>
</data>
+ <data name="grpRaster.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Bottom, Left, Right</value>
+ </data>
<data name="grpRaster.Location" type="System.Drawing.Point, System.Drawing">
<value>294, 134</value>
</data>
<data name="grpRaster.Size" type="System.Drawing.Size, System.Drawing">
- <value>312, 259</value>
+ <value>357, 352</value>
</data>
<data name="grpRaster.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -199,7 +202,7 @@
<value>Bottom, Right</value>
</data>
<data name="btnSave.Location" type="System.Drawing.Point, System.Drawing">
- <value>450, 399</value>
+ <value>495, 492</value>
</data>
<data name="btnSave.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
@@ -226,7 +229,7 @@
<value>Bottom, Right</value>
</data>
<data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
- <value>531, 399</value>
+ <value>576, 492</value>
</data>
<data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
@@ -249,6 +252,9 @@
<data name=">>btnCancel.ZOrder" xml:space="preserve">
<value>3</value>
</data>
+ <data name="groupBox2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Bottom, Left</value>
+ </data>
<data name="lstFeatureClasses.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
@@ -256,7 +262,7 @@
<value>3, 16</value>
</data>
<data name="lstFeatureClasses.Size" type="System.Drawing.Size, System.Drawing">
- <value>270, 238</value>
+ <value>270, 333</value>
</data>
<data name="lstFeatureClasses.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -276,27 +282,6 @@
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <data name="btnAdd.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
- <value>Magenta</value>
- </data>
- <data name="btnAdd.Size" type="System.Drawing.Size, System.Drawing">
- <value>49, 22</value>
- </data>
- <data name="btnAdd.Text" xml:space="preserve">
- <value>Add</value>
- </data>
- <data name="btnRemove.Enabled" type="System.Boolean, mscorlib">
- <value>False</value>
- </data>
- <data name="btnRemove.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
- <value>Magenta</value>
- </data>
- <data name="btnRemove.Size" type="System.Drawing.Size, System.Drawing">
- <value>70, 22</value>
- </data>
- <data name="btnRemove.Text" xml:space="preserve">
- <value>Remove</value>
- </data>
<data name="toolStrip1.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 16</value>
</data>
@@ -328,7 +313,7 @@
<value>12, 134</value>
</data>
<data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
- <value>276, 259</value>
+ <value>276, 352</value>
</data>
<data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@@ -348,11 +333,32 @@
<data name=">>groupBox2.ZOrder" xml:space="preserve">
<value>2</value>
</data>
+ <data name="btnAdd.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+ <value>Magenta</value>
+ </data>
+ <data name="btnAdd.Size" type="System.Drawing.Size, System.Drawing">
+ <value>49, 22</value>
+ </data>
+ <data name="btnAdd.Text" xml:space="preserve">
+ <value>Add</value>
+ </data>
+ <data name="btnRemove.Enabled" type="System.Boolean, mscorlib">
+ <value>False</value>
+ </data>
+ <data name="btnRemove.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+ <value>Magenta</value>
+ </data>
+ <data name="btnRemove.Size" type="System.Drawing.Size, System.Drawing">
+ <value>70, 22</value>
+ </data>
+ <data name="btnRemove.Text" xml:space="preserve">
+ <value>Remove</value>
+ </data>
<data name="btnReset.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
</data>
<data name="btnReset.Location" type="System.Drawing.Point, System.Drawing">
- <value>12, 399</value>
+ <value>12, 492</value>
</data>
<data name="btnReset.Size" type="System.Drawing.Size, System.Drawing">
<value>107, 23</value>
@@ -375,7 +381,10 @@
<data name=">>btnReset.ZOrder" xml:space="preserve">
<value>1</value>
</data>
- <metadata name="COL_NAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <data name="groupBox1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
+ </data>
+ <metadata name="COL_NAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="COL_NAME.HeaderText" xml:space="preserve">
@@ -394,7 +403,7 @@
<value>3, 16</value>
</data>
<data name="grdSpatialContexts.Size" type="System.Drawing.Size, System.Drawing">
- <value>588, 70</value>
+ <value>633, 70</value>
</data>
<data name="grdSpatialContexts.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -415,7 +424,7 @@
<value>12, 39</value>
</data>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
- <value>594, 89</value>
+ <value>639, 89</value>
</data>
<data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
@@ -439,7 +448,7 @@
<value>True</value>
</metadata>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
- <value>618, 434</value>
+ <value>663, 527</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterParent</value>
Modified: branches/maestro-4.0.x/MaestroAPITests/SchemaTests.cs
===================================================================
--- branches/maestro-4.0.x/MaestroAPITests/SchemaTests.cs 2012-10-04 12:36:40 UTC (rev 7074)
+++ branches/maestro-4.0.x/MaestroAPITests/SchemaTests.cs 2012-10-04 12:47:09 UTC (rev 7075)
@@ -413,6 +413,11 @@
Assert.AreEqual( name2, "_x2d-_x2f-Class" );
Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
+ name1 = "Foo/Bar - snafu";
+ name2 = Utility.EncodeFDOName(name1);
+ Assert.AreEqual(name2, "Foo-x2f-Bar-x20---x20-snafu");
+ Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
+
// Backward compatibility check. Make sure old-style 1st character encodings get decoded.
name2 = "-x40-A";
Assert.AreEqual( Utility.DecodeFDOName(name2), "@A" );
Modified: branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI/Utility.cs
===================================================================
--- branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI/Utility.cs 2012-10-04 12:36:40 UTC (rev 7074)
+++ branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI/Utility.cs 2012-10-04 12:47:09 UTC (rev 7075)
@@ -665,7 +665,7 @@
outName.Append("-");
}
}
- outName.Append(bMatchedToken ? token : ReplaceBadChars(token));
+ outName.Append(bMatchedToken ? token : ReplaceBadChars(token, outName.Length == 0));
}
@@ -698,16 +698,16 @@
return result;
}
- private static string ReplaceBadChars(string token)
+ private static string ReplaceBadChars(string token, bool bFirstInString)
{
StringBuilder sb = new StringBuilder();
- bool bFirstChar = true;
+ bool bFirstChar = bFirstInString;
foreach (char c in token)
{
if (Char.IsDigit(c) || IsValidXmlChar(c))
sb.Append(c);
else
- sb.AppendFormat("{0}x{1:X}-", bFirstChar ? "_" : "-", Convert.ToInt32(c));
+ sb.Append(string.Format("{0}x{1:X}-", bFirstChar ? "_" : "-", Convert.ToInt32(c)).ToLower());
bFirstChar = false;
}
More information about the mapguide-commits
mailing list