Use MatcherType instead of Type to remove shadowing from C# Type

karimnaaji · karimnaaji · commit 0218da9014c8 · 2017-11-02T18:03:27.000-04:00
diff --git a/Assets/Editor/FilterStyleEditor.cs b/Assets/Editor/FilterStyleEditor.cs
@@ -30,7 +30,7 @@ public class FilterStyleEditor : EditorBase
     private int selectedLayer;
 
     [SerializeField]
-    private FeatureStyle.Matcher.Type selectedMatcherType;
+    private FeatureStyle.Matcher.MatcherType selectedMatcherType;
 
     [SerializeField]
     private List<LayerStyleEditor> layerStyleEditors;
@@ -59,7 +59,7 @@ public FilterStyleEditor(FeatureStyle.FilterStyle filterStyle)
 
         if (filterStyle.Matcher != null)
         {
-            selectedMatcherType = filterStyle.Matcher.MatcherType;
+            selectedMatcherType = filterStyle.Matcher.Type;
             this.matcherEditor = new MatcherEditor(filterStyle.Matcher);
         }
     }
@@ -142,20 +142,17 @@ public void OnInspectorGUI()
 
         EditorGUI.indentLevel--;
 
-        var matcherTypeList = Enum.GetValues(typeof(FeatureStyle.Matcher.Type)).Cast<FeatureStyle.Matcher.Type>();
-        var matcherTypeStringList = matcherTypeList.Select(type => type.ToString());
         var oldType = selectedMatcherType;
 
-        selectedMatcherType = (FeatureStyle.Matcher.Type)EditorGUILayout.Popup("Matcher:",
-            (int)selectedMatcherType, matcherTypeStringList.ToArray());
+        selectedMatcherType = (FeatureStyle.Matcher.MatcherType)EditorGUILayout.EnumPopup("Matcher:", selectedMatcherType);
 
         if (selectedMatcherType != oldType)
         {
             matcherEditor = new MatcherEditor(new FeatureStyle.Matcher(selectedMatcherType));
         }
         else
         {
-            if (selectedMatcherType == FeatureStyle.Matcher.Type.None)
+            if (selectedMatcherType == FeatureStyle.Matcher.MatcherType.None)
             {
                 matcherEditor = null;
             }
diff --git a/Assets/Editor/MatcherEditor.cs b/Assets/Editor/MatcherEditor.cs
@@ -11,7 +11,7 @@
 public class MatcherEditor : EditorBase
 {
     [SerializeField]
-    private FeatureStyle.Matcher.Type selectedMatcherType;
+    private FeatureStyle.Matcher.MatcherType selectedMatcherType;
 
     [SerializeField]
     private FeatureStyle.Matcher matcher;
@@ -42,17 +42,13 @@ private MatcherEditor AddMatcherLayout()
 
         EditorGUILayout.BeginHorizontal();
         {
-            var matcherTypeList = Enum.GetValues(typeof(FeatureStyle.Matcher.Type)).Cast<FeatureStyle.Matcher.Type>();
-            var matcherTypeStringList = matcherTypeList.Select(type => type.ToString());
-
-            selectedMatcherType = (FeatureStyle.Matcher.Type)EditorGUILayout.Popup("Matcher:",
-                (int)selectedMatcherType, matcherTypeStringList.ToArray());
+            selectedMatcherType = (FeatureStyle.Matcher.MatcherType)EditorGUILayout.EnumPopup("Matcher:", selectedMatcherType);
 
             EditorConfig.SetColor(EditorConfig.AddButtonColor);
             if (GUILayout.Button(EditorConfig.AddButtonContent, EditorConfig.SmallButtonWidth)
-                && selectedMatcherType != FeatureStyle.Matcher.Type.None)
+                && selectedMatcherType != FeatureStyle.Matcher.MatcherType.None)
             {
-                var matcherType = (FeatureStyle.Matcher.Type)selectedMatcherType;
+                var matcherType = (FeatureStyle.Matcher.MatcherType)selectedMatcherType;
                 var newMatcher = new FeatureStyle.Matcher(matcherType);
 
                 editor = new MatcherEditor(newMatcher);
@@ -79,13 +75,13 @@ public void OnInspectorGUI()
         }
         else
         {
-            switch (matcher.MatcherType)
+            switch (matcher.Type)
             {
-                case FeatureStyle.Matcher.Type.Property:
+                case FeatureStyle.Matcher.MatcherType.Property:
                     matcher.HasProperty = EditorGUILayout.TextField("Has property:", matcher.HasProperty);
                     break;
 
-                case FeatureStyle.Matcher.Type.PropertyRange:
+                case FeatureStyle.Matcher.MatcherType.PropertyRange:
                     matcher.HasProperty = EditorGUILayout.TextField("Property:", matcher.HasProperty);
                     EditorGUILayout.BeginHorizontal();
                     matcher.MinRange = EditorGUILayout.FloatField("min:", matcher.MinRange);
@@ -97,12 +93,12 @@ public void OnInspectorGUI()
                     EditorGUILayout.EndHorizontal();
                     break;
 
-                case FeatureStyle.Matcher.Type.PropertyValue:
+                case FeatureStyle.Matcher.MatcherType.PropertyValue:
                     matcher.HasProperty = EditorGUILayout.TextField("Property:", matcher.HasProperty);
                     matcher.PropertyValue = EditorGUILayout.TextField("Property value:", matcher.PropertyValue);
                     break;
 
-                case FeatureStyle.Matcher.Type.PropertyRegex:
+                case FeatureStyle.Matcher.MatcherType.PropertyRegex:
                     matcher.HasProperty = EditorGUILayout.TextField("Property:", matcher.HasProperty);
                     matcher.RegexPattern = EditorGUILayout.TextField("Regex:", matcher.RegexPattern);
                     break;
@@ -113,7 +109,7 @@ public void OnInspectorGUI()
         {
             var editor = matcherEditors[i];
 
-            var state = FoldoutEditor.OnInspectorGUI(editor.GUID.ToString(), editor.Matcher.MatcherType.ToString());
+            var state = FoldoutEditor.OnInspectorGUI(editor.GUID.ToString(), editor.Matcher.Type.ToString());
 
             if (state.show)
             {
diff --git a/Assets/Mapzen/Unity/FeatureStyle.cs b/Assets/Mapzen/Unity/FeatureStyle.cs
@@ -68,7 +68,7 @@ public PolylineBuilder.Options GetPolylineOptions(Feature feature, float inverse
         [Serializable]
         public class Matcher
         {
-            public enum Type
+            public enum MatcherType
             {
                 None,
                 AllOf,
@@ -81,7 +81,7 @@ public enum Type
             }
 
             [SerializeField]
-            private Type type;
+            private MatcherType type;
 
             [SerializeField]
             private List<Matcher> matchers;
@@ -96,7 +96,7 @@ public enum Type
 
             public bool IsCompound()
             {
-                return type == Type.AllOf || type == Type.NoneOf || type == Type.AnyOf;
+                return type == MatcherType.AllOf || type == MatcherType.NoneOf || type == MatcherType.AnyOf;
             }
 
             public List<Matcher> Matchers
@@ -123,13 +123,13 @@ public IFeatureMatcher GetFeatureMatcher()
 
                     switch (type)
                     {
-                        case FeatureStyle.Matcher.Type.AllOf:
+                        case MatcherType.AllOf:
                             matcher = FeatureMatcher.AllOf(predicates.ToArray());
                             break;
-                        case FeatureStyle.Matcher.Type.NoneOf:
+                        case FeatureStyle.Matcher.MatcherType.NoneOf:
                             matcher = FeatureMatcher.NoneOf(predicates.ToArray());
                             break;
-                        case FeatureStyle.Matcher.Type.AnyOf:
+                        case FeatureStyle.Matcher.MatcherType.AnyOf:
                             matcher = FeatureMatcher.AnyOf(predicates.ToArray());
                             break;
                     }
@@ -138,19 +138,19 @@ public IFeatureMatcher GetFeatureMatcher()
                 {
                     switch (type)
                     {
-                        case FeatureStyle.Matcher.Type.PropertyRange:
+                        case MatcherType.PropertyRange:
                             double? min = MinRangeEnabled ? (double)MinRange : (double?)null;
                             double? max = MaxRangeEnabled ? (double)MaxRange : (double?)null;
 
                             matcher = FeatureMatcher.HasPropertyInRange(HasProperty, min, max);
                             break;
-                        case FeatureStyle.Matcher.Type.Property:
+                        case MatcherType.Property:
                             matcher = FeatureMatcher.HasProperty(HasProperty);
                             break;
-                        case FeatureStyle.Matcher.Type.PropertyValue:
+                        case MatcherType.PropertyValue:
                             matcher = FeatureMatcher.HasPropertyWithValue(HasProperty, PropertyValue);
                             break;
-                        case FeatureStyle.Matcher.Type.PropertyRegex:
+                        case MatcherType.PropertyRegex:
                             try
                             {
                                 matcher = FeatureMatcher.HasPropertyWithRegex(HasProperty, RegexPattern);
@@ -166,12 +166,12 @@ public IFeatureMatcher GetFeatureMatcher()
                 return matcher;
             }
 
-            public Type MatcherType
+            public MatcherType Type
             {
                 get { return type; }
             }
 
-            public Matcher(Type type)
+            public Matcher(MatcherType type)
             {
                 this.matchers = new List<Matcher>();
                 this.type = type;

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public class FilterStyleEditor : EditorBase`
`30`	`30`	`private int selectedLayer;`
`31`	`31`
`32`	`32`	`[SerializeField]`
`33`		`- private FeatureStyle.Matcher.Type selectedMatcherType;`
	`33`	`+ private FeatureStyle.Matcher.MatcherType selectedMatcherType;`
`34`	`34`
`35`	`35`	`[SerializeField]`
`36`	`36`	`private List<LayerStyleEditor> layerStyleEditors;`
`@@ -59,7 +59,7 @@ public FilterStyleEditor(FeatureStyle.FilterStyle filterStyle)`
`59`	`59`
`60`	`60`	`if (filterStyle.Matcher != null)`
`61`	`61`	`{`
`62`		`- selectedMatcherType = filterStyle.Matcher.MatcherType;`
	`62`	`+ selectedMatcherType = filterStyle.Matcher.Type;`
`63`	`63`	`this.matcherEditor = new MatcherEditor(filterStyle.Matcher);`
`64`	`64`	`}`
`65`	`65`	`}`
`@@ -142,20 +142,17 @@ public void OnInspectorGUI()`
`142`	`142`
`143`	`143`	`EditorGUI.indentLevel--;`
`144`	`144`
`145`		`- var matcherTypeList = Enum.GetValues(typeof(FeatureStyle.Matcher.Type)).Cast<FeatureStyle.Matcher.Type>();`
`146`		`- var matcherTypeStringList = matcherTypeList.Select(type => type.ToString());`
`147`	`145`	`var oldType = selectedMatcherType;`
`148`	`146`
`149`		`- selectedMatcherType = (FeatureStyle.Matcher.Type)EditorGUILayout.Popup("Matcher:",`
`150`		`- (int)selectedMatcherType, matcherTypeStringList.ToArray());`
	`147`	`+ selectedMatcherType = (FeatureStyle.Matcher.MatcherType)EditorGUILayout.EnumPopup("Matcher:", selectedMatcherType);`
`151`	`148`
`152`	`149`	`if (selectedMatcherType != oldType)`
`153`	`150`	`{`
`154`	`151`	`matcherEditor = new MatcherEditor(new FeatureStyle.Matcher(selectedMatcherType));`
`155`	`152`	`}`
`156`	`153`	`else`
`157`	`154`	`{`
`158`		`- if (selectedMatcherType == FeatureStyle.Matcher.Type.None)`
	`155`	`+ if (selectedMatcherType == FeatureStyle.Matcher.MatcherType.None)`
`159`	`156`	`{`
`160`	`157`	`matcherEditor = null;`
`161`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public PolylineBuilder.Options GetPolylineOptions(Feature feature, float inverse`
`68`	`68`	`[Serializable]`
`69`	`69`	`public class Matcher`
`70`	`70`	`{`
`71`		`- public enum Type`
	`71`	`+ public enum MatcherType`
`72`	`72`	`{`
`73`	`73`	`None,`
`74`	`74`	`AllOf,`
`@@ -81,7 +81,7 @@ public enum Type`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`[SerializeField]`
`84`		`- private Type type;`
	`84`	`+ private MatcherType type;`
`85`	`85`
`86`	`86`	`[SerializeField]`
`87`	`87`	`private List<Matcher> matchers;`
`@@ -96,7 +96,7 @@ public enum Type`
`96`	`96`
`97`	`97`	`public bool IsCompound()`
`98`	`98`	`{`
`99`		`- return type == Type.AllOf \|\| type == Type.NoneOf \|\| type == Type.AnyOf;`
	`99`	`+ return type == MatcherType.AllOf \|\| type == MatcherType.NoneOf \|\| type == MatcherType.AnyOf;`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`public List<Matcher> Matchers`
`@@ -123,13 +123,13 @@ public IFeatureMatcher GetFeatureMatcher()`
`123`	`123`
`124`	`124`	`switch (type)`
`125`	`125`	`{`
`126`		`- case FeatureStyle.Matcher.Type.AllOf:`
	`126`	`+ case MatcherType.AllOf:`
`127`	`127`	`matcher = FeatureMatcher.AllOf(predicates.ToArray());`
`128`	`128`	`break;`
`129`		`- case FeatureStyle.Matcher.Type.NoneOf:`
	`129`	`+ case FeatureStyle.Matcher.MatcherType.NoneOf:`
`130`	`130`	`matcher = FeatureMatcher.NoneOf(predicates.ToArray());`
`131`	`131`	`break;`
`132`		`- case FeatureStyle.Matcher.Type.AnyOf:`
	`132`	`+ case FeatureStyle.Matcher.MatcherType.AnyOf:`
`133`	`133`	`matcher = FeatureMatcher.AnyOf(predicates.ToArray());`
`134`	`134`	`break;`
`135`	`135`	`}`
`@@ -138,19 +138,19 @@ public IFeatureMatcher GetFeatureMatcher()`
`138`	`138`	`{`
`139`	`139`	`switch (type)`
`140`	`140`	`{`
`141`		`- case FeatureStyle.Matcher.Type.PropertyRange:`
	`141`	`+ case MatcherType.PropertyRange:`
`142`	`142`	`double? min = MinRangeEnabled ? (double)MinRange : (double?)null;`
`143`	`143`	`double? max = MaxRangeEnabled ? (double)MaxRange : (double?)null;`
`144`	`144`
`145`	`145`	`matcher = FeatureMatcher.HasPropertyInRange(HasProperty, min, max);`
`146`	`146`	`break;`
`147`		`- case FeatureStyle.Matcher.Type.Property:`
	`147`	`+ case MatcherType.Property:`
`148`	`148`	`matcher = FeatureMatcher.HasProperty(HasProperty);`
`149`	`149`	`break;`
`150`		`- case FeatureStyle.Matcher.Type.PropertyValue:`
	`150`	`+ case MatcherType.PropertyValue:`
`151`	`151`	`matcher = FeatureMatcher.HasPropertyWithValue(HasProperty, PropertyValue);`
`152`	`152`	`break;`
`153`		`- case FeatureStyle.Matcher.Type.PropertyRegex:`
	`153`	`+ case MatcherType.PropertyRegex:`
`154`	`154`	`try`
`155`	`155`	`{`
`156`	`156`	`matcher = FeatureMatcher.HasPropertyWithRegex(HasProperty, RegexPattern);`
`@@ -166,12 +166,12 @@ public IFeatureMatcher GetFeatureMatcher()`
`166`	`166`	`return matcher;`
`167`	`167`	`}`
`168`	`168`
`169`		`- public Type MatcherType`
	`169`	`+ public MatcherType Type`
`170`	`170`	`{`
`171`	`171`	`get { return type; }`
`172`	`172`	`}`
`173`	`173`
`174`		`- public Matcher(Type type)`
	`174`	`+ public Matcher(MatcherType type)`
`175`	`175`	`{`
`176`	`176`	`this.matchers = new List<Matcher>();`
`177`	`177`	`this.type = type;`