[mapguide-commits] r8713 - in trunk/Tools/Maestro: Maestro.Base/UI Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor Maestro.Editors/LayerDefinition/Vector Maestro.Editors/LayerDefinition/Vector/GridEditor Maestro.Editors/WebLayout Maestro.MapViewer OSGeo.MapGuide.MaestroAPI.Local OSGeo.MapGuide.ObjectModels/ApplicationDefinition/v1_0_0 OSGeo.MapGuide.ObjectModels/Common OSGeo.MapGuide.ObjectModels/DrawingSource/v1_0_0 OSGeo.MapGuide.ObjectModels/FeatureSource/v1_0_0 OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0 OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0 OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0 OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0 OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0 OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0 OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_0_0 OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0 OSGeo.MapGuide.ObjectModels/LoadProcedure/v2_4_0 OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0 OSGeo.MapGuide.ObjectMod els/MapDefinition/v2_3_0 OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0 OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0 OSGeo.MapGuide.ObjectModels/PrintLayout/v1.0.0 OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_0_0 OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_1_0 OSGeo.MapGuide.ObjectModels/SymbolDefinition/v2_4_0 OSGeo.MapGuide.ObjectModels/SymbolLibrary/v1.0.0 OSGeo.MapGuide.ObjectModels/TileSetDefinition/v3_0_0 OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_3_0 OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_4_0 OSGeo.MapGuide.ObjectModels/WebLayout/v1_0_0 OSGeo.MapGuide.ObjectModels/WebLayout/v1_1_0 OSGeo.MapGuide.ObjectModels/WebLayout/v2_4_0 OSGeo.MapGuide.ObjectModels/WebLayout/v2_6_0
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Jul 21 10:03:21 PDT 2015
Author: jng
Date: 2015-07-21 10:03:20 -0700 (Tue, 21 Jul 2015)
New Revision: 8713
Modified:
trunk/Tools/Maestro/Maestro.Base/UI/LabelLocalizationDialog.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableOverrideItem.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/RuleModel.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutCommandsCtrl.cs
trunk/Tools/Maestro/Maestro.MapViewer/Legend.cs
trunk/Tools/Maestro/Maestro.MapViewer/MapViewer.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalRuntimeMap.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/v1_0_0/ApplicationDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ExtendedDataType.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IEnvelope.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/DrawingSource/v1_0_0/DrawingSourceImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/v1_0_0/FeatureSourceImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/VectorLayerDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/VectorLayerDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/VectorLayerDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/VectorLayerDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/VectorLayerDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/VectorLayerDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_0_0/LoadProcedureImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v2_4_0/LoadProcedureImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0/MapDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_3_0/MapDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0/MapDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0/MapDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/PrintLayout/v1.0.0/PrintLayoutImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_0_0/SymbolDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_1_0/SymbolDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v2_4_0/SymbolDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolLibrary/v1.0.0/SymbolLibraryImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/TileSetDefinition/v3_0_0/TileSetImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_3_0/WatermarkDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_4_0/WatermarkDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_0_0/WebLayoutImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_1_0/WebLayoutImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_4_0/WebLayoutImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_6_0/WebLayoutImpl.cs
Log:
#2565: The second great nameof() replacement: All event raisings of INotifyPropertyChanged
Modified: trunk/Tools/Maestro/Maestro.Base/UI/LabelLocalizationDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/LabelLocalizationDialog.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/Maestro.Base/UI/LabelLocalizationDialog.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -115,7 +115,7 @@
return;
_translate = value;
- OnPropertyChanged("Translate"); //NOXLATE
+ OnPropertyChanged(nameof(Translate));
}
}
@@ -132,7 +132,7 @@
return;
_translation = value;
- OnPropertyChanged("Translation"); //NOXLATE
+ OnPropertyChanged(nameof(Translation));
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableOverrideItem.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableOverrideItem.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableOverrideItem.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -25,7 +25,7 @@
set
{
_override = value;
- OnPropertyChanged("Override"); //NOXLATE
+ OnPropertyChanged(nameof(Override));
}
}
@@ -42,7 +42,7 @@
if (prop != null)
prop.SpatialContextAssociation = value;
}
- OnPropertyChanged("SpatialContext"); //NOXLATE
+ OnPropertyChanged(nameof(SpatialContext));
}
}
@@ -53,7 +53,7 @@
set
{
_key = value;
- OnPropertyChanged("Key"); //NOXLATE
+ OnPropertyChanged(nameof(Key));
}
}
@@ -66,7 +66,7 @@
set
{
_geom = value;
- OnPropertyChanged("Geometry"); //NOXLATE
+ OnPropertyChanged(nameof(Geometry));
}
}
@@ -77,7 +77,7 @@
set
{
_x = value;
- OnPropertyChanged("X"); //NOXLATE
+ OnPropertyChanged(nameof(X));
}
}
@@ -88,7 +88,7 @@
set
{
_y = value;
- OnPropertyChanged("Y"); //NOXLATE
+ OnPropertyChanged(nameof(Y));
}
}
@@ -99,7 +99,7 @@
set
{
_z = value;
- OnPropertyChanged("Z"); //NOXLATE
+ OnPropertyChanged(nameof(Z));
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/RuleModel.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/RuleModel.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/RuleModel.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -147,7 +147,7 @@
if (value != _rule.Filter)
{
_rule.Filter = value;
- OnPropertyChanged("Filter");
+ OnPropertyChanged(nameof(Filter));
}
}
}
@@ -163,7 +163,7 @@
if (value != _rule.LegendLabel)
{
_rule.LegendLabel = value;
- OnPropertyChanged("LegendLabel");
+ OnPropertyChanged(nameof(LegendLabel));
}
}
}
@@ -181,7 +181,7 @@
if (value != _style)
{
_style = value;
- OnPropertyChanged("Style");
+ OnPropertyChanged(nameof(Style));
}
}
}
@@ -220,7 +220,7 @@
if (value != _label)
{
_label = value;
- OnPropertyChanged("Label");
+ OnPropertyChanged(nameof(Label));
}
}
}
@@ -479,7 +479,7 @@
if (value != _rule.Filter)
{
_rule.Filter = value;
- OnPropertyChanged("Filter");
+ OnPropertyChanged(nameof(Filter));
}
}
}
@@ -495,7 +495,7 @@
if (value != _rule.LegendLabel)
{
_rule.LegendLabel = value;
- OnPropertyChanged("LegendLabel");
+ OnPropertyChanged(nameof(LegendLabel));
}
}
}
@@ -513,7 +513,7 @@
if (value != _style)
{
_style = value;
- OnPropertyChanged("Style");
+ OnPropertyChanged(nameof(Style));
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -162,7 +162,7 @@
set
{
this.Item.MinScale = value;
- OnPropertyChanged("ScaleDisplayString");
+ OnPropertyChanged(nameof(ScaleDisplayString));
}
}
@@ -175,7 +175,7 @@
set
{
this.Item.MaxScale = value;
- OnPropertyChanged("ScaleDisplayString");
+ OnPropertyChanged(nameof(ScaleDisplayString));
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutCommandsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutCommandsCtrl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutCommandsCtrl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -416,7 +416,7 @@
if (value != _cmd.Name)
{
_cmd.Name = value;
- OnPropertyChanged("Name");
+ OnPropertyChanged(nameof(Name));
}
}
}
@@ -432,7 +432,7 @@
if (value != _cmd.Label)
{
_cmd.Label = value;
- OnPropertyChanged("Label");
+ OnPropertyChanged(nameof(Label));
}
}
}
@@ -448,7 +448,7 @@
if (value != _cmd.TargetViewer)
{
_cmd.TargetViewer = value;
- OnPropertyChanged("TargetViewer");
+ OnPropertyChanged(nameof(TargetViewer));
}
}
}
@@ -464,7 +464,7 @@
if (value != _cmd.Tooltip)
{
_cmd.Tooltip = value;
- OnPropertyChanged("Tooltip");
+ OnPropertyChanged(nameof(Tooltip));
}
}
}
@@ -480,7 +480,7 @@
if (value != _cmd.Description)
{
_cmd.Description = value;
- OnPropertyChanged("Description");
+ OnPropertyChanged(nameof(Description));
}
}
}
@@ -496,7 +496,7 @@
if (value != _cmd.ImageURL)
{
_cmd.ImageURL = value;
- OnPropertyChanged("ImageURL");
+ OnPropertyChanged(nameof(ImageURL));
}
}
}
@@ -512,7 +512,7 @@
if (value != _cmd.DisabledImageURL)
{
_cmd.DisabledImageURL = value;
- OnPropertyChanged("DisabledImageURL");
+ OnPropertyChanged(nameof(DisabledImageURL));
}
}
}
Modified: trunk/Tools/Maestro/Maestro.MapViewer/Legend.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.MapViewer/Legend.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/Maestro.MapViewer/Legend.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -174,7 +174,7 @@
_busy = value;
Trace.TraceInformation("Legend IsBusy: {0}", this.IsBusy);
- OnPropertyChanged("IsBusy");
+ OnPropertyChanged(nameof(IsBusy));
}
}
Modified: trunk/Tools/Maestro/Maestro.MapViewer/MapViewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.MapViewer/MapViewer.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/Maestro.MapViewer/MapViewer.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -355,7 +355,7 @@
set
{
_selColor = value;
- OnPropertyChanged("SelectionColor");
+ OnPropertyChanged(nameof(SelectionColor));
}
}
@@ -377,7 +377,7 @@
if (!value.Equals(_tooltipFillColor))
{
_tooltipFillColor = value;
- OnPropertyChanged("TooltipFillColor");
+ OnPropertyChanged(nameof(TooltipFillColor));
}
}
}
@@ -395,7 +395,7 @@
if (!value.Equals(_tooltipFillTransparency))
{
_tooltipFillTransparency = value;
- OnPropertyChanged("TooltipFillTransparency");
+ OnPropertyChanged(nameof(TooltipFillTransparency));
}
}
}
@@ -435,7 +435,7 @@
if (!value.Equals(_showVertexCoords))
{
_showVertexCoords = value;
- OnPropertyChanged("ShowVertexCoordinatesWhenDigitizing");
+ OnPropertyChanged(nameof(ShowVertexCoordinatesWhenDigitizing));
}
}
}
@@ -572,7 +572,7 @@
set
{
_digitizingOutline = value;
- OnPropertyChanged("DigitizingOutline");
+ OnPropertyChanged(nameof(DigitizingOutline));
}
}
@@ -589,7 +589,7 @@
if (!value.Equals(_digitizingFillTransparency))
{
_digitizingFillTransparency = value;
- OnPropertyChanged("DigitizingFillTransparency");
+ OnPropertyChanged(nameof(DigitizingFillTransparency));
}
}
}
@@ -611,7 +611,8 @@
set
{
_digitizingFillColor = value;
- OnPropertyChanged("DigitzingFillColor");
+ var _this = this;
+ OnPropertyChanged("DigitzingFillColor"); //NOXLATE
}
}
@@ -799,7 +800,7 @@
Invalidate();
}
- OnPropertyChanged("FeatureTooltipsEnabled");
+ OnPropertyChanged(nameof(FeatureTooltipsEnabled));
}
}
@@ -1196,9 +1197,9 @@
//Reset history stack
_viewHistory.Clear();
- OnPropertyChanged("ViewHistory");
+ OnPropertyChanged(nameof(ViewHistory));
_viewHistoryIndex = -1;
- OnPropertyChanged("ViewHistoryIndex");
+ OnPropertyChanged(nameof(ViewHistoryIndex));
var handler = this.MapLoaded;
if (handler != null)
@@ -1386,7 +1387,7 @@
_digitizingType = value;
- OnPropertyChanged("DigitizingType");
+ OnPropertyChanged(nameof(DigitizingType));
}
}
@@ -1585,7 +1586,7 @@
Trace.TraceInformation("Rendering operation took {0}ms", _renderSw.ElapsedMilliseconds);
}
#endif
- OnPropertyChanged("IsBusy");
+ OnPropertyChanged(nameof(IsBusy));
}
}
@@ -1738,7 +1739,7 @@
var view = _viewHistory[newIndex];
ZoomToView(view.X, view.Y, view.Scale, true, true, false);
_viewHistoryIndex = newIndex;
- OnPropertyChanged("ViewHistoryIndex");
+ OnPropertyChanged(nameof(ViewHistoryIndex));
}
/// <summary>
@@ -1757,7 +1758,7 @@
var view = _viewHistory[newIndex];
ZoomToView(view.X, view.Y, view.Scale, true, true, false);
_viewHistoryIndex = newIndex;
- OnPropertyChanged("ViewHistoryIndex");
+ OnPropertyChanged(nameof(ViewHistoryIndex));
}
/// <summary>
@@ -1788,9 +1789,9 @@
PruneHistoryEntriesFromCurrentView();
_viewHistory.Add(new MapViewHistoryEntry(x, y, newScale));
- OnPropertyChanged("ViewHistory");
+ OnPropertyChanged(nameof(ViewHistory));
_viewHistoryIndex = _viewHistory.Count - 1;
- OnPropertyChanged("ViewHistoryIndex");
+ OnPropertyChanged(nameof(ViewHistoryIndex));
}
_map.SetViewCenter(x, y);
@@ -2060,7 +2061,7 @@
if (value.Equals(_zoomInFactor))
return;
_zoomInFactor = value;
- OnPropertyChanged("ZoomInFactor");
+ OnPropertyChanged(nameof(ZoomInFactor));
}
}
@@ -2077,7 +2078,7 @@
if (value.Equals(_zoomOutFactor))
return;
_zoomOutFactor = value;
- OnPropertyChanged("ZoomOutFactor");
+ OnPropertyChanged(nameof(ZoomOutFactor));
}
}
@@ -2846,7 +2847,7 @@
if (value != MapActiveTool.None)
this.DigitizingType = MapDigitizationType.None;
- OnPropertyChanged("ActiveTool");
+ OnPropertyChanged(nameof(ActiveTool));
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalRuntimeMap.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalRuntimeMap.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalRuntimeMap.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -251,7 +251,7 @@
if (center.X != x || center.Y != y)
{
_impl.SetViewCenterXY(x, y);
- OnPropertyChanged("ViewCenter");
+ OnPropertyChanged(nameof(ViewCenter));
}
}
@@ -381,7 +381,7 @@
if (grp != _impl.Group)
{
_impl.Group = grp;
- OnPropertyChanged("Group");
+ OnPropertyChanged(nameof(Group));
}
}
else
@@ -552,7 +552,7 @@
if (implGroup != _impl.Group)
{
_impl.Group = implGroup;
- OnPropertyChanged("Group");
+ OnPropertyChanged(nameof(Group));
_parent.MakeDirty();
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/v1_0_0/ApplicationDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/v1_0_0/ApplicationDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/v1_0_0/ApplicationDefinitionImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -142,7 +142,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.ApplicationDefinition));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -296,7 +296,7 @@
if (grp != null)
{
this.MapSet.Add(grp);
- OnPropertyChanged("MapSet"); //NOXLATE
+ OnPropertyChanged(nameof(MapSet));
}
}
@@ -306,7 +306,7 @@
if (grp != null)
{
this.MapSet.Remove(grp);
- OnPropertyChanged("MapSet"); //NOXLATE
+ OnPropertyChanged(nameof(MapSet));
}
}
@@ -328,7 +328,7 @@
if (wset != null)
{
this.WidgetSet.Add(wset);
- OnPropertyChanged("WidgetSet"); //NOXLATE
+ OnPropertyChanged(nameof(WidgetSet));
}
}
@@ -338,7 +338,7 @@
if (wset != null)
{
this.WidgetSet.Remove(wset);
- OnPropertyChanged("WidgetSet"); //NOXLATE
+ OnPropertyChanged(nameof(WidgetSet));
}
}
@@ -413,7 +413,7 @@
{
this.Item.Insert(index, it);
it.Parent = this;
- OnPropertyChanged("Item"); //NOXLATE
+ OnPropertyChanged(nameof(Item));
}
}
@@ -424,7 +424,7 @@
{
this.Item.Add(it);
it.Parent = this;
- OnPropertyChanged("Item"); //NOXLATE
+ OnPropertyChanged(nameof(Item));
}
}
@@ -435,7 +435,7 @@
{
this.Item.Remove(it);
it.Parent = null;
- OnPropertyChanged("Item"); //NOXLATE
+ OnPropertyChanged(nameof(Item));
}
}
}
@@ -501,7 +501,7 @@
{
this.Item.Insert(index, it);
it.Parent = this;
- OnPropertyChanged("Item"); //NOXLATE
+ OnPropertyChanged(nameof(Item));
}
}
@@ -512,7 +512,7 @@
{
this.Item.Add(it);
it.Parent = this;
- OnPropertyChanged("Item"); //NOXLATE
+ OnPropertyChanged(nameof(Item));
}
}
@@ -523,7 +523,7 @@
{
this.Item.Remove(it);
it.Parent = null;
- OnPropertyChanged("Item"); //NOXLATE
+ OnPropertyChanged(nameof(Item));
}
}
}
@@ -564,7 +564,7 @@
if (cnt != null)
{
this.Container.Add(cnt);
- OnPropertyChanged("Container"); //NOXLATE
+ OnPropertyChanged(nameof(Container));
}
}
@@ -574,7 +574,7 @@
if (cnt != null)
{
this.Container.Remove(cnt);
- OnPropertyChanged("Container"); //NOXLATE
+ OnPropertyChanged(nameof(Container));
}
}
@@ -842,7 +842,7 @@
if (m != null)
{
this.Map.Add(m);
- OnPropertyChanged("Map"); //NOXLATE
+ OnPropertyChanged(nameof(Map));
}
}
@@ -852,7 +852,7 @@
if (m != null)
{
this.Map.Remove(m);
- OnPropertyChanged("Map"); //NOXLATE
+ OnPropertyChanged(nameof(Map));
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ExtendedDataType.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ExtendedDataType.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ExtendedDataType.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -55,13 +55,13 @@
if ((anyField.Equals(value) != true))
{
this.anyField = value;
- this.OnPropertyChanged("Any"); //NOXLATE
+ this.OnPropertyChanged(nameof(Any));
}
}
else
{
this.anyField = value;
- this.OnPropertyChanged("Any"); //NOXLATE
+ this.OnPropertyChanged(nameof(Any));
}
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IEnvelope.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IEnvelope.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IEnvelope.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -169,7 +169,7 @@
set
{
this.lowerLeftCoordinateField.X = value;
- OnPropertyChanged("MinX"); //NOXLATE
+ OnPropertyChanged(nameof(MinX));
}
}
@@ -182,7 +182,7 @@
set
{
this.lowerLeftCoordinateField.Y = value;
- OnPropertyChanged("MinY"); //NOXLATE
+ OnPropertyChanged(nameof(MinY));
}
}
@@ -195,7 +195,7 @@
set
{
this.upperRightCoordinateField.X = value;
- OnPropertyChanged("MaxX");
+ OnPropertyChanged(nameof(MaxX));
}
}
@@ -208,7 +208,7 @@
set
{
this.upperRightCoordinateField.Y = value;
- OnPropertyChanged("MaxY"); //NOXLATE
+ OnPropertyChanged(nameof(MaxY));
}
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/DrawingSource/v1_0_0/DrawingSourceImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/DrawingSource/v1_0_0/DrawingSourceImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/DrawingSource/v1_0_0/DrawingSourceImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -52,14 +52,14 @@
set
{
if (!ResourceIdentifier.Validate(value))
- throw new InvalidOperationException(Strings.ErrorInvalidResourceIdentifier); //LOCALIZE
+ throw new InvalidOperationException(Strings.ErrorInvalidResourceIdentifier);
var res = new ResourceIdentifier(value);
if (res.Extension != ResourceTypes.DrawingSource.ToString())
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.DrawingSource)); //LOCALIZE
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/v1_0_0/FeatureSourceImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/v1_0_0/FeatureSourceImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/v1_0_0/FeatureSourceImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -56,7 +56,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.FeatureSource));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -159,7 +159,7 @@
}
if (bRaise)
- OnPropertyChanged("Parameter"); //NOXLATE
+ OnPropertyChanged(nameof(Parameter));
}
protected void DetachChangeListeners()
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/VectorLayerDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/VectorLayerDefinitionImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -142,7 +142,7 @@
if ((minScaleFieldSpecified.Equals(value) != true))
{
this.minScaleFieldSpecified = value;
- this.OnPropertyChanged("MinScaleSpecified"); //NOXLATE
+ this.OnPropertyChanged(nameof(MinScaleSpecified));
}
}
}
@@ -1703,7 +1703,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.LayerDefinition));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -1833,14 +1833,14 @@
if (this.urlDataField == null)
this.urlDataField = new URLDataType();
this.urlDataField.Content = value;
- OnPropertyChanged("Url"); //NOXLATE
+ OnPropertyChanged(nameof(Url));
}
else
{
//NOTE: None of the other URLData properties seem to be used atm
//hence why we are nulling this
this.urlDataField = null;
- OnPropertyChanged("Url"); //NOXLATE
+ OnPropertyChanged(nameof(Url));
}
}
#else
@@ -2239,7 +2239,7 @@
{
if (_resId == value) return;
_resId = value;
- OnPropertyChanged("ResourceId"); //NOXLATE
+ OnPropertyChanged(nameof(ResourceId));
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/VectorLayerDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/VectorLayerDefinitionImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -142,7 +142,7 @@
if ((minScaleFieldSpecified.Equals(value) != true))
{
this.minScaleFieldSpecified = value;
- this.OnPropertyChanged("MinScaleSpecified"); //NOXLATE
+ this.OnPropertyChanged(nameof(MinScaleSpecified));
}
}
}
@@ -1703,7 +1703,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.LayerDefinition));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -1833,14 +1833,14 @@
if (this.urlDataField == null)
this.urlDataField = new URLDataType();
this.urlDataField.Content = value;
- OnPropertyChanged("Url"); //NOXLATE
+ OnPropertyChanged(nameof(Url));
}
else
{
//NOTE: None of the other URLData properties seem to be used atm
//hence why we are nulling this
this.urlDataField = null;
- OnPropertyChanged("Url"); //NOXLATE
+ OnPropertyChanged(nameof(Url));
}
}
#else
@@ -2279,7 +2279,7 @@
{
if (_resId == value) return;
_resId = value;
- OnPropertyChanged("ResourceId"); //NOXLATE
+ OnPropertyChanged(nameof(ResourceId));
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/VectorLayerDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/VectorLayerDefinitionImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -142,7 +142,7 @@
if ((minScaleFieldSpecified.Equals(value) != true))
{
this.minScaleFieldSpecified = value;
- this.OnPropertyChanged("MinScaleSpecified"); //NOXLATE
+ this.OnPropertyChanged(nameof(MinScaleSpecified));
}
}
}
@@ -1703,7 +1703,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.LayerDefinition));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -1833,14 +1833,14 @@
if (this.urlDataField == null)
this.urlDataField = new URLDataType();
this.urlDataField.Content = value;
- OnPropertyChanged("Url"); //NOXLATE
+ OnPropertyChanged(nameof(Url));
}
else
{
//NOTE: None of the other URLData properties seem to be used atm
//hence why we are nulling this
this.urlDataField = null;
- OnPropertyChanged("Url"); //NOXLATE
+ OnPropertyChanged(nameof(Url));
}
}
#else
@@ -2279,7 +2279,7 @@
{
if (_resId == value) return;
_resId = value;
- OnPropertyChanged("ResourceId"); //NOXLATE
+ OnPropertyChanged(nameof(ResourceId));
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/VectorLayerDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/VectorLayerDefinitionImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -143,7 +143,7 @@
if ((minScaleFieldSpecified.Equals(value) != true))
{
this.minScaleFieldSpecified = value;
- this.OnPropertyChanged("MinScaleSpecified"); //NOXLATE
+ this.OnPropertyChanged(nameof(MinScaleSpecified));
}
}
}
@@ -1704,7 +1704,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.LayerDefinition));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -1834,14 +1834,14 @@
if (this.urlDataField == null)
this.urlDataField = new URLDataType();
this.urlDataField.Content = value;
- OnPropertyChanged("Url"); //NOXLATE
+ OnPropertyChanged(nameof(Url));
}
else
{
//NOTE: None of the other URLData properties seem to be used atm
//hence why we are nulling this
this.urlDataField = null;
- OnPropertyChanged("Url"); //NOXLATE
+ OnPropertyChanged(nameof(Url));
}
}
#else
@@ -2280,7 +2280,7 @@
{
if (_resId == value) return;
_resId = value;
- OnPropertyChanged("ResourceId"); //NOXLATE
+ OnPropertyChanged(nameof(ResourceId));
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/VectorLayerDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/VectorLayerDefinitionImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -145,7 +145,7 @@
if ((minScaleFieldSpecified.Equals(value) != true))
{
this.minScaleFieldSpecified = value;
- this.OnPropertyChanged("MinScaleSpecified"); //NOXLATE
+ this.OnPropertyChanged(nameof(MinScaleSpecified));
}
}
}
@@ -1706,7 +1706,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.LayerDefinition));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -1836,14 +1836,14 @@
if (this.urlDataField == null)
this.urlDataField = new URLDataType();
this.urlDataField.Content = value;
- OnPropertyChanged("Url"); //NOXLATE
+ OnPropertyChanged(nameof(Url));
}
else
{
//NOTE: None of the other URLData properties seem to be used atm
//hence why we are nulling this
this.urlDataField = null;
- OnPropertyChanged("Url"); //NOXLATE
+ OnPropertyChanged(nameof(Url));
}
}
#else
@@ -2282,7 +2282,7 @@
{
if (_resId == value) return;
_resId = value;
- OnPropertyChanged("ResourceId"); //NOXLATE
+ OnPropertyChanged(nameof(ResourceId));
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/VectorLayerDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/VectorLayerDefinitionImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -145,7 +145,7 @@
if ((minScaleFieldSpecified.Equals(value) != true))
{
this.minScaleFieldSpecified = value;
- this.OnPropertyChanged("MinScaleSpecified"); //NOXLATE
+ this.OnPropertyChanged(nameof(MinScaleSpecified));
}
}
}
@@ -1706,7 +1706,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.LayerDefinition));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -2282,7 +2282,7 @@
{
if (_resId == value) return;
_resId = value;
- OnPropertyChanged("ResourceId"); //NOXLATE
+ OnPropertyChanged(nameof(ResourceId));
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_0_0/LoadProcedureImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_0_0/LoadProcedureImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_0_0/LoadProcedureImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -67,7 +67,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.LoadProcedure));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -68,7 +68,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.LoadProcedure));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v2_4_0/LoadProcedureImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v2_4_0/LoadProcedureImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v2_4_0/LoadProcedureImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -68,7 +68,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.LoadProcedure));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0/MapDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0/MapDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0/MapDefinitionImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -61,7 +61,7 @@
set
{
this.backgroundColorField = value;
- OnPropertyChanged("BackgroundColor"); //NOXLATE
+ OnPropertyChanged(nameof(BackgroundColor));
}
}
@@ -155,7 +155,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.MapDefinition));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -214,7 +214,7 @@
/// <param name="layer"></param>
void IMapDefinition.InsertLayer(int idx, IMapLayer layer)
{
- Check.ThatArgumentIsBetweenRange(idx, 0, this.MapLayer.Count, true, nameof(idx) + " (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]"); //NOXLATE
+ Check.ThatArgumentIsBetweenRange(idx, 0, this.MapLayer.Count, true, nameof(idx) + " (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]");
Check.ArgumentNotNull(layer, nameof(layer));
var li = layer as MapLayerType;
if (li != null)
@@ -250,7 +250,7 @@
public IMapLayerGroup AddGroup(string groupName)
{
Check.ArgumentNotEmpty(groupName, nameof(groupName));
- Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) == null, $"<{nameof(groupName)}> does not already exist"); //NOXLATE
+ Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) == null, $"<{nameof(groupName)}> does not already exist");
if (this.MapLayerGroup == null)
this.MapLayerGroup = new System.ComponentModel.BindingList<MapLayerGroupType>();
@@ -265,7 +265,7 @@
Group = string.Empty
};
this.MapLayerGroup.Add(group);
- OnPropertyChanged("MapLayerGroup"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayerGroup));
return group;
}
@@ -273,11 +273,11 @@
{
Check.ArgumentNotEmpty(layerName, nameof(layerName));
Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})");
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()");
if (!string.IsNullOrEmpty(groupName))
{
- Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) != null, $"There should be an existing group for <{groupName}>"); //NOXLATE
+ Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) != null, $"There should be an existing group for <{groupName}>");
}
var layer = new MapLayerType()
{
@@ -293,7 +293,7 @@
layer.Group = string.IsNullOrEmpty(groupName) ? string.Empty : groupName;
this.MapLayer.Insert(0, layer);
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
this.AutoSetExtentsFromLayer(layer.ResourceId);
@@ -308,11 +308,11 @@
Check.ThatArgumentIsBetweenRange(index, 0, this.MapLayer.Count, true, nameof(index) + " (" + index + ") between [" + 0 + "," + this.MapLayer.Count + "]");
Check.ArgumentNotEmpty(layerName, nameof(layerName));
Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})");
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()");
if (!string.IsNullOrEmpty(groupName))
{
- Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>");
}
var layer = new MapLayerType()
{
@@ -334,11 +334,11 @@
{
Check.ArgumentNotEmpty(layerName, nameof(layerName));
Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})");
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()");
if (!string.IsNullOrEmpty(groupName))
{
- Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>");
}
var layer = new MapLayerType()
{
@@ -377,7 +377,7 @@
{
this.MapLayer.Add(layer);
}
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
this.AutoSetExtentsFromLayer(layer.ResourceId);
@@ -473,7 +473,7 @@
if (lyr != null)
{
this.MapLayer.Remove(lyr);
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
}
}
@@ -496,7 +496,7 @@
if (grp != null)
{
this.MapLayerGroup.Remove(grp);
- OnPropertyChanged("MapLayerGroup"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayerGroup));
}
}
@@ -534,7 +534,7 @@
this.MapLayer[isrc] = dst;
this.MapLayer[idst] = src;
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
return idst;
}
@@ -560,7 +560,7 @@
this.MapLayer[isrc] = dst;
this.MapLayer[idst] = src;
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
return idst;
}
@@ -589,7 +589,7 @@
this.MapLayerGroup[idx] = dst;
this.MapLayerGroup[idst] = src;
- OnPropertyChanged("MapLayerGroup"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayerGroup));
return idst;
}
@@ -619,7 +619,7 @@
this.MapLayerGroup[idx] = dst;
this.MapLayerGroup[idst] = src;
- OnPropertyChanged("MapLayerGroup"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayerGroup));
return idst;
}
@@ -657,7 +657,7 @@
}
this.MapLayer[0] = src;
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
}
}
@@ -676,7 +676,7 @@
}
this.MapLayer[this.MapLayer.Count - 1] = src;
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
}
}
@@ -773,13 +773,13 @@
{
this.FiniteDisplayScale.Add(scale);
}
- OnPropertyChanged("FiniteDisplayScale"); //NOXLATE
+ OnPropertyChanged(nameof(FiniteDisplayScale));
}
void ITileSetAbstract.RemoveAllScales()
{
this.FiniteDisplayScale.Clear();
- OnPropertyChanged("FiniteDisplayScale"); //NOXLATE
+ OnPropertyChanged(nameof(FiniteDisplayScale));
}
[XmlIgnore]
@@ -903,7 +903,7 @@
if (bl != null)
{
this.BaseMapLayer.Insert(index, bl);
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
this.Parent.AutoSetExtentsFromLayer(layer.ResourceId);
}
}
@@ -921,7 +921,7 @@
Selectable = true
};
this.BaseMapLayer.Add(layer);
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
this.Parent.AutoSetExtentsFromLayer(resourceId);
return layer;
}
@@ -932,7 +932,7 @@
if (lyr != null)
{
this.BaseMapLayer.Remove(lyr);
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
}
}
@@ -952,7 +952,7 @@
this.BaseMapLayer[isrc] = dst;
this.BaseMapLayer[idst] = src;
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
return idst;
}
@@ -977,7 +977,7 @@
this.BaseMapLayer[isrc] = dst;
this.BaseMapLayer[idst] = src;
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
return idst;
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_3_0/MapDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_3_0/MapDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_3_0/MapDefinitionImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -62,7 +62,7 @@
set
{
this.backgroundColorField = value;
- OnPropertyChanged("BackgroundColor"); //NOXLATE
+ OnPropertyChanged(nameof(BackgroundColor));
}
}
@@ -156,7 +156,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.MapDefinition));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -215,7 +215,7 @@
/// <param name="layer"></param>
void IMapDefinition.InsertLayer(int idx, IMapLayer layer)
{
- Check.ThatArgumentIsBetweenRange(idx, 0, this.MapLayer.Count, true, nameof(idx) + " (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]"); //NOXLATE
+ Check.ThatArgumentIsBetweenRange(idx, 0, this.MapLayer.Count, true, nameof(idx) + " (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]");
Check.ArgumentNotNull(layer, nameof(layer));
var li = layer as MapLayerType;
if (li != null)
@@ -244,14 +244,14 @@
this.Extents.MaxY = maxy;
this.Extents.MinX = minx;
this.Extents.MinY = miny;
- OnPropertyChanged("Extents"); //NOXLATE
+ OnPropertyChanged(nameof(Extents));
}
}
public IMapLayerGroup AddGroup(string groupName)
{
Check.ArgumentNotEmpty(groupName, nameof(groupName));
- Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) == null, $"<{nameof(groupName)}> does not already exist"); //NOXLATE
+ Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) == null, $"<{nameof(groupName)}> does not already exist");
if (this.MapLayerGroup == null)
this.MapLayerGroup = new System.ComponentModel.BindingList<MapLayerGroupType>();
@@ -266,7 +266,7 @@
Group = string.Empty
};
this.MapLayerGroup.Add(group);
- OnPropertyChanged("MapLayerGroup"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayerGroup));
return group;
}
@@ -274,11 +274,11 @@
{
Check.ArgumentNotEmpty(layerName, nameof(layerName));
Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})");
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()");
if (!string.IsNullOrEmpty(groupName))
{
- Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) != null, $"There should be an existing group for <{nameof(groupName)}>"); //NOXLATE
+ Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) != null, $"There should be an existing group for <{nameof(groupName)}>");
}
var layer = new MapLayerType()
{
@@ -294,7 +294,7 @@
layer.Group = string.IsNullOrEmpty(groupName) ? string.Empty : groupName;
this.MapLayer.Insert(0, layer);
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
this.AutoSetExtentsFromLayer(layer.ResourceId);
@@ -309,11 +309,11 @@
Check.ThatArgumentIsBetweenRange(index, 0, this.MapLayer.Count, true, nameof(index) + " (" + index + ") between [" + 0 + "," + this.MapLayer.Count + "]");
Check.ArgumentNotEmpty(layerName, nameof(layerName));
Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})");
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()");
if (!string.IsNullOrEmpty(groupName))
{
- Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>");
}
var layer = new MapLayerType()
{
@@ -335,11 +335,11 @@
{
Check.ArgumentNotEmpty(layerName, nameof(layerName));
Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})");
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()");
if (!string.IsNullOrEmpty(groupName))
{
- Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>");
}
var layer = new MapLayerType()
{
@@ -378,7 +378,7 @@
{
this.MapLayer.Add(layer);
}
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
this.AutoSetExtentsFromLayer(layer.ResourceId);
@@ -474,7 +474,7 @@
if (lyr != null)
{
this.MapLayer.Remove(lyr);
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
}
}
@@ -497,7 +497,7 @@
if (grp != null)
{
this.MapLayerGroup.Remove(grp);
- OnPropertyChanged("MapLayerGroup"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayerGroup));
}
}
@@ -535,7 +535,7 @@
this.MapLayer[isrc] = dst;
this.MapLayer[idst] = src;
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
return idst;
}
@@ -561,7 +561,7 @@
this.MapLayer[isrc] = dst;
this.MapLayer[idst] = src;
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
return idst;
}
@@ -590,7 +590,7 @@
this.MapLayerGroup[idx] = dst;
this.MapLayerGroup[idst] = src;
- OnPropertyChanged("MapLayerGroup"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayerGroup));
return idst;
}
@@ -620,7 +620,7 @@
this.MapLayerGroup[idx] = dst;
this.MapLayerGroup[idst] = src;
- OnPropertyChanged("MapLayerGroup"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayerGroup));
return idst;
}
@@ -658,7 +658,7 @@
}
this.MapLayer[0] = src;
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
}
}
@@ -677,7 +677,7 @@
}
this.MapLayer[this.MapLayer.Count - 1] = src;
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
}
}
@@ -774,13 +774,13 @@
{
this.FiniteDisplayScale.Add(scale);
}
- OnPropertyChanged("FiniteDisplayScale"); //NOXLATE
+ OnPropertyChanged(nameof(FiniteDisplayScale));
}
void ITileSetAbstract.RemoveAllScales()
{
this.FiniteDisplayScale.Clear();
- OnPropertyChanged("FiniteDisplayScale"); //NOXLATE
+ OnPropertyChanged(nameof(FiniteDisplayScale));
}
[XmlIgnore]
@@ -920,7 +920,7 @@
Selectable = true
};
this.BaseMapLayer.Add(layer);
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
return layer;
}
@@ -930,7 +930,7 @@
if (lyr != null)
{
this.BaseMapLayer.Remove(lyr);
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
}
}
@@ -950,7 +950,7 @@
this.BaseMapLayer[isrc] = dst;
this.BaseMapLayer[idst] = src;
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
return idst;
}
@@ -975,7 +975,7 @@
this.BaseMapLayer[isrc] = dst;
this.BaseMapLayer[idst] = src;
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
return idst;
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0/MapDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0/MapDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0/MapDefinitionImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -63,7 +63,7 @@
set
{
this.backgroundColorField = value;
- OnPropertyChanged("BackgroundColor"); //NOXLATE
+ OnPropertyChanged(nameof(BackgroundColor));
}
}
@@ -157,7 +157,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.MapDefinition));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -216,7 +216,7 @@
/// <param name="layer"></param>
void IMapDefinition.InsertLayer(int idx, IMapLayer layer)
{
- Check.ThatArgumentIsBetweenRange(idx, 0, this.MapLayer.Count, true, nameof(idx) + " (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]"); //NOXLATE
+ Check.ThatArgumentIsBetweenRange(idx, 0, this.MapLayer.Count, true, nameof(idx) + " (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]");
Check.ArgumentNotNull(layer, nameof(layer));
var li = layer as MapLayerType;
if (li != null)
@@ -245,14 +245,14 @@
this.Extents.MaxY = maxy;
this.Extents.MinX = minx;
this.Extents.MinY = miny;
- OnPropertyChanged("Extents"); //NOXLATE
+ OnPropertyChanged(nameof(Extents));
}
}
public IMapLayerGroup AddGroup(string groupName)
{
Check.ArgumentNotEmpty(groupName, nameof(groupName));
- Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) == null, $"<{nameof(groupName)}> does not already exist"); //NOXLATE
+ Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) == null, $"<{nameof(groupName)}> does not already exist");
if (this.MapLayerGroup == null)
this.MapLayerGroup = new System.ComponentModel.BindingList<MapLayerGroupType>();
@@ -267,7 +267,7 @@
Group = string.Empty
};
this.MapLayerGroup.Add(group);
- OnPropertyChanged("MapLayerGroup"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayerGroup));
return group;
}
@@ -275,11 +275,11 @@
{
Check.ArgumentNotEmpty(layerName, nameof(layerName));
Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})");
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()");
if (!string.IsNullOrEmpty(groupName))
{
- Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) != null, $"There should be an existing group for <{nameof(groupName)}>"); //NOXLATE
+ Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) != null, $"There should be an existing group for <{nameof(groupName)}>");
}
var layer = new MapLayerType()
{
@@ -295,7 +295,7 @@
layer.Group = string.IsNullOrEmpty(groupName) ? string.Empty : groupName;
this.MapLayer.Insert(0, layer);
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
this.AutoSetExtentsFromLayer(layer.ResourceId);
@@ -310,11 +310,11 @@
Check.ThatArgumentIsBetweenRange(index, 0, this.MapLayer.Count, true, nameof(index) + " (" + index + ") between [" + 0 + "," + this.MapLayer.Count + "]");
Check.ArgumentNotEmpty(layerName, nameof(layerName));
Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})");
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()");
if (!string.IsNullOrEmpty(groupName))
{
- Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>");
}
var layer = new MapLayerType()
{
@@ -336,11 +336,11 @@
{
Check.ArgumentNotEmpty(layerName, nameof(layerName));
Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})");
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()");
if (!string.IsNullOrEmpty(groupName))
{
- Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>");
}
var layer = new MapLayerType()
{
@@ -379,7 +379,7 @@
{
this.MapLayer.Add(layer);
}
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
this.AutoSetExtentsFromLayer(layer.ResourceId);
@@ -475,7 +475,7 @@
if (lyr != null)
{
this.MapLayer.Remove(lyr);
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
}
}
@@ -498,7 +498,7 @@
if (grp != null)
{
this.MapLayerGroup.Remove(grp);
- OnPropertyChanged("MapLayerGroup"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayerGroup));
}
}
@@ -536,7 +536,7 @@
this.MapLayer[isrc] = dst;
this.MapLayer[idst] = src;
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
return idst;
}
@@ -562,7 +562,7 @@
this.MapLayer[isrc] = dst;
this.MapLayer[idst] = src;
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
return idst;
}
@@ -591,7 +591,7 @@
this.MapLayerGroup[idx] = dst;
this.MapLayerGroup[idst] = src;
- OnPropertyChanged("MapLayerGroup"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayerGroup));
return idst;
}
@@ -621,7 +621,7 @@
this.MapLayerGroup[idx] = dst;
this.MapLayerGroup[idst] = src;
- OnPropertyChanged("MapLayerGroup"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayerGroup));
return idst;
}
@@ -659,7 +659,7 @@
}
this.MapLayer[0] = src;
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
}
}
@@ -678,7 +678,7 @@
}
this.MapLayer[this.MapLayer.Count - 1] = src;
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
}
}
@@ -775,13 +775,13 @@
{
this.FiniteDisplayScale.Add(scale);
}
- OnPropertyChanged("FiniteDisplayScale"); //NOXLATE
+ OnPropertyChanged(nameof(FiniteDisplayScale));
}
void ITileSetAbstract.RemoveAllScales()
{
this.FiniteDisplayScale.Clear();
- OnPropertyChanged("FiniteDisplayScale"); //NOXLATE
+ OnPropertyChanged(nameof(FiniteDisplayScale));
}
[XmlIgnore]
@@ -921,7 +921,7 @@
Selectable = true
};
this.BaseMapLayer.Add(layer);
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
return layer;
}
@@ -931,7 +931,7 @@
if (lyr != null)
{
this.BaseMapLayer.Remove(lyr);
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
}
}
@@ -951,7 +951,7 @@
this.BaseMapLayer[isrc] = dst;
this.BaseMapLayer[idst] = src;
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
return idst;
}
@@ -976,7 +976,7 @@
this.BaseMapLayer[isrc] = dst;
this.BaseMapLayer[idst] = src;
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
return idst;
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0/MapDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0/MapDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0/MapDefinitionImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -54,7 +54,7 @@
set
{
this.backgroundColorField = value;
- OnPropertyChanged("BackgroundColor"); //NOXLATE
+ OnPropertyChanged(nameof(BackgroundColor));
}
}
@@ -174,7 +174,7 @@
break;
}
if (oldType != value)
- OnPropertyChanged("TileSourceType");
+ OnPropertyChanged(nameof(TileSourceType));
}
}
@@ -199,7 +199,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.MapDefinition));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -252,7 +252,7 @@
/// <param name="layer"></param>
void IMapDefinition.InsertLayer(int idx, IMapLayer layer)
{
- Check.ThatArgumentIsBetweenRange(idx, 0, this.MapLayer.Count, true, nameof(idx) + " (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]"); //NOXLATE
+ Check.ThatArgumentIsBetweenRange(idx, 0, this.MapLayer.Count, true, nameof(idx) + " (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]");
Check.ArgumentNotNull(layer, nameof(layer));
var li = layer as MapLayerType;
if (li != null)
@@ -281,14 +281,14 @@
this.Extents.MaxY = maxy;
this.Extents.MinX = minx;
this.Extents.MinY = miny;
- OnPropertyChanged("Extents"); //NOXLATE
+ OnPropertyChanged(nameof(Extents));
}
}
public IMapLayerGroup AddGroup(string groupName)
{
Check.ArgumentNotEmpty(groupName, nameof(groupName));
- Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) == null, $"<{nameof(groupName)}> does not already exist"); //NOXLATE
+ Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) == null, $"<{nameof(groupName)}> does not already exist");
if (this.MapLayerGroup == null)
this.MapLayerGroup = new System.ComponentModel.BindingList<MapLayerGroupType>();
@@ -303,7 +303,7 @@
Group = string.Empty
};
this.MapLayerGroup.Add(group);
- OnPropertyChanged("MapLayerGroup"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayerGroup));
return group;
}
@@ -311,11 +311,11 @@
{
Check.ArgumentNotEmpty(layerName, nameof(layerName));
Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})");
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()");
if (!string.IsNullOrEmpty(groupName))
{
- Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) != null, $"There should be an existing group for <{nameof(groupName)}>"); //NOXLATE
+ Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) != null, $"There should be an existing group for <{nameof(groupName)}>");
}
var layer = new MapLayerType()
{
@@ -331,7 +331,7 @@
layer.Group = string.IsNullOrEmpty(groupName) ? string.Empty : groupName;
this.MapLayer.Insert(0, layer);
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
this.AutoSetExtentsFromLayer(layer.ResourceId);
@@ -346,11 +346,11 @@
Check.ThatArgumentIsBetweenRange(index, 0, this.MapLayer.Count, true, nameof(index) + " (" + index + ") between [" + 0 + "," + this.MapLayer.Count + "]");
Check.ArgumentNotEmpty(layerName, nameof(layerName));
Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})");
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()");
if (!string.IsNullOrEmpty(groupName))
{
- Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>");
}
var layer = new MapLayerType()
{
@@ -372,11 +372,11 @@
{
Check.ArgumentNotEmpty(layerName, nameof(layerName));
Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})");
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()");
if (!string.IsNullOrEmpty(groupName))
{
- Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>");
}
var layer = new MapLayerType()
{
@@ -415,7 +415,7 @@
{
this.MapLayer.Add(layer);
}
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
this.AutoSetExtentsFromLayer(layer.ResourceId);
@@ -514,7 +514,7 @@
if (lyr != null)
{
this.MapLayer.Remove(lyr);
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
}
}
@@ -537,7 +537,7 @@
if (grp != null)
{
this.MapLayerGroup.Remove(grp);
- OnPropertyChanged("MapLayerGroup"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayerGroup));
}
}
@@ -575,7 +575,7 @@
this.MapLayer[isrc] = dst;
this.MapLayer[idst] = src;
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
return idst;
}
@@ -601,7 +601,7 @@
this.MapLayer[isrc] = dst;
this.MapLayer[idst] = src;
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
return idst;
}
@@ -630,7 +630,7 @@
this.MapLayerGroup[idx] = dst;
this.MapLayerGroup[idst] = src;
- OnPropertyChanged("MapLayerGroup"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayerGroup));
return idst;
}
@@ -660,7 +660,7 @@
this.MapLayerGroup[idx] = dst;
this.MapLayerGroup[idst] = src;
- OnPropertyChanged("MapLayerGroup"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayerGroup));
return idst;
}
@@ -698,7 +698,7 @@
}
this.MapLayer[0] = src;
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
}
}
@@ -717,7 +717,7 @@
}
this.MapLayer[this.MapLayer.Count - 1] = src;
- OnPropertyChanged("MapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(MapLayer));
}
}
@@ -810,13 +810,13 @@
}
fds.Insert(index, value);
}
- OnPropertyChanged("FiniteDisplayScale"); //NOXLATE
+ OnPropertyChanged(nameof(FiniteDisplayScale));
}
public void RemoveFiniteDisplayScale(double value)
{
this.FiniteDisplayScale.Remove(value);
- OnPropertyChanged("FiniteDisplayScale"); //NOXLATE
+ OnPropertyChanged(nameof(FiniteDisplayScale));
}
void ITileSetAbstract.SetFiniteDisplayScales(IEnumerable<double> scales)
@@ -826,13 +826,13 @@
{
this.FiniteDisplayScale.Add(scale);
}
- OnPropertyChanged("FiniteDisplayScale"); //NOXLATE
+ OnPropertyChanged(nameof(FiniteDisplayScale));
}
void ITileSetAbstract.RemoveAllScales()
{
this.FiniteDisplayScale.Clear();
- OnPropertyChanged("FiniteDisplayScale"); //NOXLATE
+ OnPropertyChanged(nameof(FiniteDisplayScale));
}
[XmlIgnore]
@@ -972,7 +972,7 @@
Selectable = true
};
this.BaseMapLayer.Add(layer);
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
return layer;
}
@@ -982,7 +982,7 @@
if (lyr != null)
{
this.BaseMapLayer.Remove(lyr);
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
}
}
@@ -1002,7 +1002,7 @@
this.BaseMapLayer[isrc] = dst;
this.BaseMapLayer[idst] = src;
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
return idst;
}
@@ -1027,7 +1027,7 @@
this.BaseMapLayer[isrc] = dst;
this.BaseMapLayer[idst] = src;
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
return idst;
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/PrintLayout/v1.0.0/PrintLayoutImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/PrintLayout/v1.0.0/PrintLayoutImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/PrintLayout/v1.0.0/PrintLayoutImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -57,7 +57,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.PrintLayout));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -127,7 +127,7 @@
if (l != null)
{
this.CustomLogos.Remove(l);
- OnPropertyChanged("CustomLogos"); //NOXLATE
+ OnPropertyChanged(nameof(CustomLogos));
}
}
@@ -149,7 +149,7 @@
if (t != null)
{
this.CustomText.Add(t);
- OnPropertyChanged("CustomText"); //NOXLATE
+ OnPropertyChanged(nameof(CustomText));
}
}
@@ -159,7 +159,7 @@
if (t != null)
{
this.CustomText.Remove(t);
- OnPropertyChanged("CustomText"); //NOXLATE
+ OnPropertyChanged(nameof(CustomText));
}
}
@@ -202,7 +202,7 @@
if (l != null)
{
this.CustomLogos.Add(l);
- OnPropertyChanged("CustomLogos"); //NOXLATE
+ OnPropertyChanged(nameof(CustomLogos));
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_0_0/SymbolDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_0_0/SymbolDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_0_0/SymbolDefinitionImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -75,7 +75,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.SymbolDefinition));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -865,7 +865,8 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.SymbolDefinition));
this.Item = value;
- OnPropertyChanged("ResourceId"); //NOXLATE
+ IResourceIdReference idref = this;
+ OnPropertyChanged(nameof(idref.ResourceId));
}
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_1_0/SymbolDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_1_0/SymbolDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_1_0/SymbolDefinitionImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -77,7 +77,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.SymbolDefinition));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -870,7 +870,8 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.SymbolDefinition));
this.Item = value;
- OnPropertyChanged("ResourceId"); //NOXLATE
+ IResourceIdReference idref = this;
+ OnPropertyChanged(nameof(idref.ResourceId));
}
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v2_4_0/SymbolDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v2_4_0/SymbolDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v2_4_0/SymbolDefinitionImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -78,7 +78,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.SymbolDefinition));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -871,7 +871,8 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.SymbolDefinition));
this.Item = value;
- OnPropertyChanged("ResourceId"); //NOXLATE
+ IResourceIdReference idref = this;
+ OnPropertyChanged(nameof(idref.ResourceId));
}
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolLibrary/v1.0.0/SymbolLibraryImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolLibrary/v1.0.0/SymbolLibraryImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolLibrary/v1.0.0/SymbolLibraryImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -57,7 +57,7 @@
throw new InvalidOperationException("Invalid resource identifier for this type of object: " + res.Extension); //LOCALIZE
_resId = value;
- this.OnPropertyChanged("ResourceID");
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/TileSetDefinition/v3_0_0/TileSetImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/TileSetDefinition/v3_0_0/TileSetImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/TileSetDefinition/v3_0_0/TileSetImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -1,23 +1,23 @@
-#region Disclaimer / License
-
-// Copyright (C) 2014, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
+#region Disclaimer / License
+
+// Copyright (C) 2014, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
#endregion Disclaimer / License
using OSGeo.MapGuide.ObjectModels.Common;
@@ -85,7 +85,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.SymbolDefinition));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -149,7 +149,7 @@
this.Extents.MaxY = value.MaxY;
this.Extents.MinX = value.MinX;
this.Extents.MinY = value.MinY;
- OnPropertyChanged("Extents"); //NOXLATE
+ OnPropertyChanged(nameof(Extents));
}
}
}
@@ -447,7 +447,7 @@
Selectable = true
};
this.BaseMapLayer.Add(layer);
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
return layer;
}
@@ -457,7 +457,7 @@
if (lyr != null)
{
this.BaseMapLayer.Remove(lyr);
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
}
}
@@ -477,7 +477,7 @@
this.BaseMapLayer[isrc] = dst;
this.BaseMapLayer[idst] = src;
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
return idst;
}
@@ -502,7 +502,7 @@
this.BaseMapLayer[isrc] = dst;
this.BaseMapLayer[idst] = src;
- OnPropertyChanged("BaseMapLayer"); //NOXLATE
+ OnPropertyChanged(nameof(BaseMapLayer));
return idst;
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_3_0/WatermarkDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_3_0/WatermarkDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_3_0/WatermarkDefinitionImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -201,7 +201,7 @@
throw new InvalidOperationException("Invalid resource identifier for this type of object: " + res.Extension); //LOCALIZE
_resId = value;
- this.OnPropertyChanged("ResourceID");
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_4_0/WatermarkDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_4_0/WatermarkDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_4_0/WatermarkDefinitionImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -201,7 +201,7 @@
throw new InvalidOperationException("Invalid resource identifier for this type of object: " + res.Extension); //LOCALIZE
_resId = value;
- this.OnPropertyChanged("ResourceID");
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_0_0/WebLayoutImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_0_0/WebLayoutImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_0_0/WebLayoutImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -121,7 +121,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.WebLayout));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -901,7 +901,7 @@
if (c != null)
{
this.CommandSet.Add(c);
- OnPropertyChanged("CommandSet"); //NOXLATE
+ OnPropertyChanged(nameof(CommandSet));
if (cmd is IInvokeUrlCommand || cmd is IInvokeScriptCommand || cmd is ISearchCommand)
{
var handler = this.CustomCommandAdded;
@@ -917,7 +917,7 @@
if (c != null)
{
this.CommandSet.Remove(c);
- OnPropertyChanged("CommandSet"); //NOXLATE
+ OnPropertyChanged(nameof(CommandSet));
if (cmd is IInvokeUrlCommand || cmd is IInvokeScriptCommand || cmd is ISearchCommand)
{
var handler = this.CustomCommandRemoved;
@@ -1042,7 +1042,7 @@
{
this.Button.Add(it);
it.Parent = this;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(Button));
}
}
@@ -1053,7 +1053,7 @@
{
this.Button.Remove(it);
it.Parent = null;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(Button));
}
}
@@ -1072,7 +1072,7 @@
this.Button[isrc] = dst;
this.Button[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(Button));
return true;
}
}
@@ -1095,7 +1095,7 @@
this.Button[isrc] = dst;
this.Button[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(Button));
return true;
}
}
@@ -1154,7 +1154,7 @@
{
this.MenuItem.Add(it);
it.Parent = this;
- OnPropertyChanged("MenuItem"); //NOXLATE
+ OnPropertyChanged(nameof(MenuItem));
}
}
@@ -1165,7 +1165,7 @@
{
this.MenuItem.Remove(it);
it.Parent = null;
- OnPropertyChanged("MenuItem"); //NOXLATE
+ OnPropertyChanged(nameof(MenuItem));
}
}
@@ -1184,7 +1184,7 @@
this.MenuItem[isrc] = dst;
this.MenuItem[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(MenuItem));
return true;
}
}
@@ -1206,7 +1206,7 @@
this.MenuItem[isrc] = dst;
this.MenuItem[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(MenuItem));
return true;
}
}
@@ -1261,7 +1261,7 @@
{
this.MenuButton.Add(it);
it.Parent = this;
- OnPropertyChanged("MenuButton"); //NOXLATE
+ OnPropertyChanged(nameof(MenuButton));
}
}
@@ -1272,7 +1272,7 @@
{
this.MenuButton.Remove(it);
it.Parent = null;
- OnPropertyChanged("MenuButton"); //NOXLATE
+ OnPropertyChanged(nameof(MenuButton));
}
}
@@ -1291,7 +1291,7 @@
this.MenuButton[isrc] = dst;
this.MenuButton[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(MenuButton));
return true;
}
}
@@ -1313,7 +1313,7 @@
this.MenuButton[isrc] = dst;
this.MenuButton[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(MenuButton));
return true;
}
}
@@ -1415,7 +1415,7 @@
if (r != null)
{
this.PrintLayout.Add(r);
- OnPropertyChanged("PrintLayout"); //NOXLATE
+ OnPropertyChanged(nameof(PrintLayout));
}
}
@@ -1425,7 +1425,7 @@
if (r != null)
{
this.PrintLayout.Remove(r);
- OnPropertyChanged("PrintLayout"); //NOXLATE
+ OnPropertyChanged(nameof(PrintLayout));
}
}
}
@@ -1469,7 +1469,7 @@
{
this.SubItem.Add(i);
i.Parent = this;
- OnPropertyChanged("SubItem"); //NOXLATE
+ OnPropertyChanged(nameof(SubItem));
}
}
@@ -1480,7 +1480,7 @@
{
this.SubItem.Remove(i);
i.Parent = null;
- OnPropertyChanged("SubItem"); //NOXLATE
+ OnPropertyChanged(nameof(SubItem));
};
}
@@ -1499,7 +1499,7 @@
this.SubItem[isrc] = dst;
this.SubItem[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(SubItem));
return true;
}
}
@@ -1521,7 +1521,7 @@
this.SubItem[isrc] = dst;
this.SubItem[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(SubItem));
return true;
}
}
@@ -1597,7 +1597,7 @@
if (p != null)
{
this.AdditionalParameter.Add(p);
- OnPropertyChanged("AdditionalParameter"); //NOXLATE
+ OnPropertyChanged(nameof(AdditionalParameter));
}
}
@@ -1607,7 +1607,7 @@
if (p != null)
{
this.AdditionalParameter.Remove(p);
- OnPropertyChanged("AdditionalParameter"); //NOXLATE
+ OnPropertyChanged(nameof(AdditionalParameter));
}
}
@@ -1683,7 +1683,7 @@
if (c != null)
{
this.ResultColumns.Add(c);
- OnPropertyChanged("ResultColumns"); //NOXLATE
+ OnPropertyChanged(nameof(ResultColumns));
}
}
@@ -1693,7 +1693,7 @@
if (c != null)
{
this.ResultColumns.Remove(c);
- OnPropertyChanged("ResultColumns"); //NOXLATE
+ OnPropertyChanged(nameof(ResultColumns));
}
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_1_0/WebLayoutImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_1_0/WebLayoutImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_1_0/WebLayoutImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -122,7 +122,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.WebLayout));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -902,7 +902,7 @@
if (c != null)
{
this.CommandSet.Add(c);
- OnPropertyChanged("CommandSet"); //NOXLATE
+ OnPropertyChanged(nameof(CommandSet));
if (cmd is IInvokeUrlCommand || cmd is IInvokeScriptCommand || cmd is ISearchCommand)
{
var handler = this.CustomCommandAdded;
@@ -918,7 +918,7 @@
if (c != null)
{
this.CommandSet.Remove(c);
- OnPropertyChanged("CommandSet"); //NOXLATE
+ OnPropertyChanged(nameof(CommandSet));
if (cmd is IInvokeUrlCommand || cmd is IInvokeScriptCommand || cmd is ISearchCommand)
{
var handler = this.CustomCommandRemoved;
@@ -1043,7 +1043,7 @@
{
this.Button.Add(it);
it.Parent = this;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(Button));
}
}
@@ -1054,7 +1054,7 @@
{
this.Button.Remove(it);
it.Parent = null;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(Button));
}
}
@@ -1073,7 +1073,7 @@
this.Button[isrc] = dst;
this.Button[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(Button));
return true;
}
}
@@ -1096,7 +1096,7 @@
this.Button[isrc] = dst;
this.Button[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(Button));
return true;
}
}
@@ -1155,7 +1155,7 @@
{
this.MenuItem.Add(it);
it.Parent = this;
- OnPropertyChanged("MenuItem"); //NOXLATE
+ OnPropertyChanged(nameof(MenuItem));
}
}
@@ -1166,7 +1166,7 @@
{
this.MenuItem.Remove(it);
it.Parent = null;
- OnPropertyChanged("MenuItem"); //NOXLATE
+ OnPropertyChanged(nameof(MenuItem));
}
}
@@ -1185,7 +1185,7 @@
this.MenuItem[isrc] = dst;
this.MenuItem[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(MenuItem));
return true;
}
}
@@ -1207,7 +1207,7 @@
this.MenuItem[isrc] = dst;
this.MenuItem[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(MenuItem));
return true;
}
}
@@ -1262,7 +1262,7 @@
{
this.MenuButton.Add(it);
it.Parent = this;
- OnPropertyChanged("MenuButton"); //NOXLATE
+ OnPropertyChanged(nameof(MenuButton));
}
}
@@ -1273,7 +1273,7 @@
{
this.MenuButton.Remove(it);
it.Parent = null;
- OnPropertyChanged("MenuButton"); //NOXLATE
+ OnPropertyChanged(nameof(MenuButton));
}
}
@@ -1292,7 +1292,7 @@
this.MenuButton[isrc] = dst;
this.MenuButton[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(MenuButton));
return true;
}
}
@@ -1314,7 +1314,7 @@
this.MenuButton[isrc] = dst;
this.MenuButton[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(MenuButton));
return true;
}
}
@@ -1416,7 +1416,7 @@
if (r != null)
{
this.PrintLayout.Add(r);
- OnPropertyChanged("PrintLayout"); //NOXLATE
+ OnPropertyChanged(nameof(PrintLayout));
}
}
@@ -1426,7 +1426,7 @@
if (r != null)
{
this.PrintLayout.Remove(r);
- OnPropertyChanged("PrintLayout"); //NOXLATE
+ OnPropertyChanged(nameof(PrintLayout));
}
}
}
@@ -1470,7 +1470,7 @@
{
this.SubItem.Add(i);
i.Parent = this;
- OnPropertyChanged("SubItem"); //NOXLATE
+ OnPropertyChanged(nameof(SubItem));
}
}
@@ -1481,7 +1481,7 @@
{
this.SubItem.Remove(i);
i.Parent = null;
- OnPropertyChanged("SubItem"); //NOXLATE
+ OnPropertyChanged(nameof(SubItem));
};
}
@@ -1500,7 +1500,7 @@
this.SubItem[isrc] = dst;
this.SubItem[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(SubItem));
return true;
}
}
@@ -1522,7 +1522,7 @@
this.SubItem[isrc] = dst;
this.SubItem[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(SubItem));
return true;
}
}
@@ -1598,7 +1598,7 @@
if (p != null)
{
this.AdditionalParameter.Add(p);
- OnPropertyChanged("AdditionalParameter"); //NOXLATE
+ OnPropertyChanged(nameof(AdditionalParameter));
}
}
@@ -1608,7 +1608,7 @@
if (p != null)
{
this.AdditionalParameter.Remove(p);
- OnPropertyChanged("AdditionalParameter"); //NOXLATE
+ OnPropertyChanged(nameof(AdditionalParameter));
}
}
@@ -1684,7 +1684,7 @@
if (c != null)
{
this.ResultColumns.Add(c);
- OnPropertyChanged("ResultColumns"); //NOXLATE
+ OnPropertyChanged(nameof(ResultColumns));
}
}
@@ -1694,7 +1694,7 @@
if (c != null)
{
this.ResultColumns.Remove(c);
- OnPropertyChanged("ResultColumns"); //NOXLATE
+ OnPropertyChanged(nameof(ResultColumns));
}
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_4_0/WebLayoutImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_4_0/WebLayoutImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_4_0/WebLayoutImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -123,7 +123,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.WebLayout));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -903,7 +903,7 @@
if (c != null)
{
this.CommandSet.Add(c);
- OnPropertyChanged("CommandSet"); //NOXLATE
+ OnPropertyChanged(nameof(CommandSet));
if (cmd is IInvokeUrlCommand || cmd is IInvokeScriptCommand || cmd is ISearchCommand)
{
var handler = this.CustomCommandAdded;
@@ -919,7 +919,7 @@
if (c != null)
{
this.CommandSet.Remove(c);
- OnPropertyChanged("CommandSet"); //NOXLATE
+ OnPropertyChanged(nameof(CommandSet));
if (cmd is IInvokeUrlCommand || cmd is IInvokeScriptCommand || cmd is ISearchCommand)
{
var handler = this.CustomCommandRemoved;
@@ -1044,7 +1044,7 @@
{
this.Button.Add(it);
it.Parent = this;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(Button));
}
}
@@ -1055,7 +1055,7 @@
{
this.Button.Remove(it);
it.Parent = null;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(Button));
}
}
@@ -1074,7 +1074,7 @@
this.Button[isrc] = dst;
this.Button[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(Button));
return true;
}
}
@@ -1097,7 +1097,7 @@
this.Button[isrc] = dst;
this.Button[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(Button));
return true;
}
}
@@ -1156,7 +1156,7 @@
{
this.MenuItem.Add(it);
it.Parent = this;
- OnPropertyChanged("MenuItem"); //NOXLATE
+ OnPropertyChanged(nameof(MenuItem));
}
}
@@ -1167,7 +1167,7 @@
{
this.MenuItem.Remove(it);
it.Parent = null;
- OnPropertyChanged("MenuItem"); //NOXLATE
+ OnPropertyChanged(nameof(MenuItem));
}
}
@@ -1186,7 +1186,7 @@
this.MenuItem[isrc] = dst;
this.MenuItem[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(MenuItem));
return true;
}
}
@@ -1208,7 +1208,7 @@
this.MenuItem[isrc] = dst;
this.MenuItem[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(MenuItem));
return true;
}
}
@@ -1263,7 +1263,7 @@
{
this.MenuButton.Add(it);
it.Parent = this;
- OnPropertyChanged("MenuButton"); //NOXLATE
+ OnPropertyChanged(nameof(MenuButton));
}
}
@@ -1274,7 +1274,7 @@
{
this.MenuButton.Remove(it);
it.Parent = null;
- OnPropertyChanged("MenuButton"); //NOXLATE
+ OnPropertyChanged(nameof(MenuButton));
}
}
@@ -1293,7 +1293,7 @@
this.MenuButton[isrc] = dst;
this.MenuButton[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(MenuButton));
return true;
}
}
@@ -1315,7 +1315,7 @@
this.MenuButton[isrc] = dst;
this.MenuButton[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(MenuButton));
return true;
}
}
@@ -1417,7 +1417,7 @@
if (r != null)
{
this.PrintLayout.Add(r);
- OnPropertyChanged("PrintLayout"); //NOXLATE
+ OnPropertyChanged(nameof(PrintLayout));
}
}
@@ -1427,7 +1427,7 @@
if (r != null)
{
this.PrintLayout.Remove(r);
- OnPropertyChanged("PrintLayout"); //NOXLATE
+ OnPropertyChanged(nameof(PrintLayout));
}
}
}
@@ -1471,7 +1471,7 @@
{
this.SubItem.Add(i);
i.Parent = this;
- OnPropertyChanged("SubItem"); //NOXLATE
+ OnPropertyChanged(nameof(SubItem));
}
}
@@ -1482,7 +1482,7 @@
{
this.SubItem.Remove(i);
i.Parent = null;
- OnPropertyChanged("SubItem"); //NOXLATE
+ OnPropertyChanged(nameof(SubItem));
};
}
@@ -1501,7 +1501,7 @@
this.SubItem[isrc] = dst;
this.SubItem[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(SubItem));
return true;
}
}
@@ -1523,7 +1523,7 @@
this.SubItem[isrc] = dst;
this.SubItem[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(SubItem));
return true;
}
}
@@ -1599,7 +1599,7 @@
if (p != null)
{
this.AdditionalParameter.Add(p);
- OnPropertyChanged("AdditionalParameter"); //NOXLATE
+ OnPropertyChanged(nameof(AdditionalParameter));
}
}
@@ -1609,7 +1609,7 @@
if (p != null)
{
this.AdditionalParameter.Remove(p);
- OnPropertyChanged("AdditionalParameter"); //NOXLATE
+ OnPropertyChanged(nameof(AdditionalParameter));
}
}
@@ -1685,7 +1685,7 @@
if (c != null)
{
this.ResultColumns.Add(c);
- OnPropertyChanged("ResultColumns"); //NOXLATE
+ OnPropertyChanged(nameof(ResultColumns));
}
}
@@ -1695,7 +1695,7 @@
if (c != null)
{
this.ResultColumns.Remove(c);
- OnPropertyChanged("ResultColumns"); //NOXLATE
+ OnPropertyChanged(nameof(ResultColumns));
}
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_6_0/WebLayoutImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_6_0/WebLayoutImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_6_0/WebLayoutImpl.cs 2015-07-21 17:03:20 UTC (rev 8713)
@@ -124,7 +124,7 @@
throw new InvalidOperationException(string.Format(Strings.ErrorUnexpectedResourceType, res.ToString(), ResourceTypes.WebLayout));
_resId = value;
- this.OnPropertyChanged("ResourceID"); //NOXLATE
+ this.OnPropertyChanged(nameof(ResourceID));
}
}
@@ -904,7 +904,7 @@
if (c != null)
{
this.CommandSet.Add(c);
- OnPropertyChanged("CommandSet"); //NOXLATE
+ OnPropertyChanged(nameof(CommandSet));
if (cmd is IInvokeUrlCommand || cmd is IInvokeScriptCommand || cmd is ISearchCommand)
{
var handler = this.CustomCommandAdded;
@@ -920,7 +920,7 @@
if (c != null)
{
this.CommandSet.Remove(c);
- OnPropertyChanged("CommandSet"); //NOXLATE
+ OnPropertyChanged(nameof(CommandSet));
if (cmd is IInvokeUrlCommand || cmd is IInvokeScriptCommand || cmd is ISearchCommand)
{
var handler = this.CustomCommandRemoved;
@@ -1045,7 +1045,7 @@
{
this.Button.Add(it);
it.Parent = this;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(Button));
}
}
@@ -1056,7 +1056,7 @@
{
this.Button.Remove(it);
it.Parent = null;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(Button));
}
}
@@ -1075,7 +1075,7 @@
this.Button[isrc] = dst;
this.Button[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(Button));
return true;
}
}
@@ -1098,7 +1098,7 @@
this.Button[isrc] = dst;
this.Button[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(Button));
return true;
}
}
@@ -1157,7 +1157,7 @@
{
this.MenuItem.Add(it);
it.Parent = this;
- OnPropertyChanged("MenuItem"); //NOXLATE
+ OnPropertyChanged(nameof(MenuItem));
}
}
@@ -1168,7 +1168,7 @@
{
this.MenuItem.Remove(it);
it.Parent = null;
- OnPropertyChanged("MenuItem"); //NOXLATE
+ OnPropertyChanged(nameof(MenuItem));
}
}
@@ -1187,7 +1187,7 @@
this.MenuItem[isrc] = dst;
this.MenuItem[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(MenuItem));
return true;
}
}
@@ -1209,7 +1209,7 @@
this.MenuItem[isrc] = dst;
this.MenuItem[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(MenuItem));
return true;
}
}
@@ -1264,7 +1264,7 @@
{
this.MenuButton.Add(it);
it.Parent = this;
- OnPropertyChanged("MenuButton"); //NOXLATE
+ OnPropertyChanged(nameof(MenuButton));
}
}
@@ -1275,7 +1275,7 @@
{
this.MenuButton.Remove(it);
it.Parent = null;
- OnPropertyChanged("MenuButton"); //NOXLATE
+ OnPropertyChanged(nameof(MenuButton));
}
}
@@ -1294,7 +1294,7 @@
this.MenuButton[isrc] = dst;
this.MenuButton[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(MenuButton));
return true;
}
}
@@ -1316,7 +1316,7 @@
this.MenuButton[isrc] = dst;
this.MenuButton[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(MenuButton));
return true;
}
}
@@ -1418,7 +1418,7 @@
if (r != null)
{
this.PrintLayout.Add(r);
- OnPropertyChanged("PrintLayout"); //NOXLATE
+ OnPropertyChanged(nameof(PrintLayout));
}
}
@@ -1428,7 +1428,7 @@
if (r != null)
{
this.PrintLayout.Remove(r);
- OnPropertyChanged("PrintLayout"); //NOXLATE
+ OnPropertyChanged(nameof(PrintLayout));
}
}
}
@@ -1472,7 +1472,7 @@
{
this.SubItem.Add(i);
i.Parent = this;
- OnPropertyChanged("SubItem"); //NOXLATE
+ OnPropertyChanged(nameof(SubItem));
}
}
@@ -1483,7 +1483,7 @@
{
this.SubItem.Remove(i);
i.Parent = null;
- OnPropertyChanged("SubItem"); //NOXLATE
+ OnPropertyChanged(nameof(SubItem));
};
}
@@ -1502,7 +1502,7 @@
this.SubItem[isrc] = dst;
this.SubItem[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(SubItem));
return true;
}
}
@@ -1524,7 +1524,7 @@
this.SubItem[isrc] = dst;
this.SubItem[idst] = src;
- OnPropertyChanged("Button"); //NOXLATE
+ OnPropertyChanged(nameof(SubItem));
return true;
}
}
@@ -1600,7 +1600,7 @@
if (p != null)
{
this.AdditionalParameter.Add(p);
- OnPropertyChanged("AdditionalParameter"); //NOXLATE
+ OnPropertyChanged(nameof(AdditionalParameter));
}
}
@@ -1610,7 +1610,7 @@
if (p != null)
{
this.AdditionalParameter.Remove(p);
- OnPropertyChanged("AdditionalParameter"); //NOXLATE
+ OnPropertyChanged(nameof(AdditionalParameter));
}
}
@@ -1686,7 +1686,7 @@
if (c != null)
{
this.ResultColumns.Add(c);
- OnPropertyChanged("ResultColumns"); //NOXLATE
+ OnPropertyChanged(nameof(ResultColumns));
}
}
@@ -1696,7 +1696,7 @@
if (c != null)
{
this.ResultColumns.Remove(c);
- OnPropertyChanged("ResultColumns"); //NOXLATE
+ OnPropertyChanged(nameof(ResultColumns));
}
}
}
More information about the mapguide-commits
mailing list