Skip to content

Commit a699f25

Browse files
jpobstjpobst
committed
[generator] Use tabs for enums and thread-safety fix.
1 parent a1e7971 commit a699f25

File tree

8 files changed

+47
-43
lines changed

8 files changed

+47
-43
lines changed

‎tools/generator/Java.Interop.Tools.Generator.CodeGeneration/EnumGenerator.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ public void WriteEnumeration (KeyValuePair<string, EnumDescription> enu, GenBase
2222

2323
sw.WriteLine ("namespace {0} {{", ns);
2424
if (enu.Value.BitField)
25-
sw.WriteLine (" [System.Flags]");
26-
sw.WriteLine (" public enum {0} {{", enoom);
25+
sw.WriteLine ("\t[System.Flags]");
26+
sw.WriteLine ("\tpublic enum {0} {{", enoom);
2727

2828
foreach (var member in enu.Value.Members) {
2929
var managedMember = FindManagedMember (enu.Value, member.Key, gens);
30-
sw.WriteLine (" [global::Android.Runtime.IntDefinition (" + (managedMember != null ? "\"" + managedMember + "\"" : "null") + ", JniField = \"" + StripExtraInterfaceSpec (enu.Value.JniNames [member.Key]) + "\")]");
31-
sw.WriteLine (" {0} = {1},", member.Key.Trim (), member.Value.Trim ());
30+
sw.WriteLine ("\t\t[global::Android.Runtime.IntDefinition (" + (managedMember != null ? "\"" + managedMember + "\"" : "null") + ", JniField = \"" + StripExtraInterfaceSpec (enu.Value.JniNames [member.Key]) + "\")]");
31+
sw.WriteLine ("\t\t{0} = {1},", member.Key.Trim (), member.Value.Trim ());
3232
}
33-
sw.WriteLine (" }");
33+
sw.WriteLine ("\t}");
3434
sw.WriteLine ("}");
3535
}
3636

‎tools/generator/Java.Interop.Tools.Generator.Transformation/EnumMappings.cs‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,21 @@ internal List<string> WriteEnumerations (string output_dir, Dictionary<string, E
156156
return files.ToList ();
157157
}
158158

159-
ConcurrentDictionary<string,string> file_name_map = new ConcurrentDictionary<string, string> ();
159+
readonly Dictionary<string,string> file_name_map = new Dictionary<string, string> ();
160160

161161
string GetFileName (string file, bool useShortFileNames)
162162
{
163163
if (!useShortFileNames)
164164
return file;
165165
string s;
166-
if (file_name_map.TryGetValue (file, out s))
167-
return s;
168-
s = file_name_map.Count.ToString ();
169-
file_name_map [file] = s;
166+
167+
lock (file_name_map) {
168+
if (file_name_map.TryGetValue (file, out s))
169+
return s;
170+
s = file_name_map.Count.ToString ();
171+
file_name_map [file] = s;
172+
}
173+
170174
return s;
171175
}
172176

‎tools/generator/Tests-Core/expected.ji/Android.Text.SpanTypes.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace Android.Text {
2-
public enum SpanTypes {
3-
[global::Android.Runtime.IntDefinition (null, JniField = "android/text/Spanned.SPAN_COMPOSING")]
4-
Composing = 256,
5-
}
2+
public enum SpanTypes {
3+
[global::Android.Runtime.IntDefinition (null, JniField = "android/text/Spanned.SPAN_COMPOSING")]
4+
Composing = 256,
5+
}
66
}

‎tools/generator/Tests-Core/expected/Android.Text.SpanTypes.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace Android.Text {
2-
public enum SpanTypes {
3-
[global::Android.Runtime.IntDefinition (null, JniField = "android/text/Spanned.SPAN_COMPOSING")]
4-
Composing = 256,
5-
}
2+
public enum SpanTypes {
3+
[global::Android.Runtime.IntDefinition (null, JniField = "android/text/Spanned.SPAN_COMPOSING")]
4+
Composing = 256,
5+
}
66
}

‎tools/generator/Tests/Unit-Tests/EnumGeneratorExpectedResults/WriteBasicEnum.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
namespace Android.App {
2-
public enum RecentTaskFlags {
3-
[global::Android.Runtime.IntDefinition (null, JniField = "android/app/ActivityManager.RECENT_IGNORE_UNAVAILABLE")]
4-
WithExcluded = 1,
5-
[global::Android.Runtime.IntDefinition (null, JniField = "android/app/ActivityManager.RECENT_WITH_EXCLUDED")]
6-
IgnoreUnavailable = 2,
7-
}
2+
public enum RecentTaskFlags {
3+
[global::Android.Runtime.IntDefinition (null, JniField = "android/app/ActivityManager.RECENT_IGNORE_UNAVAILABLE")]
4+
WithExcluded = 1,
5+
[global::Android.Runtime.IntDefinition (null, JniField = "android/app/ActivityManager.RECENT_WITH_EXCLUDED")]
6+
IgnoreUnavailable = 2,
7+
}
88
}

‎tools/generator/Tests/Unit-Tests/EnumGeneratorExpectedResults/WriteEnumWithGens.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
namespace Android.App {
2-
public enum RecentTaskFlags {
3-
[global::Android.Runtime.IntDefinition ("android.app.ActivityManager.RECENT_IGNORE_UNAVAILABLE", JniField = "android/app/ActivityManager.RECENT_IGNORE_UNAVAILABLE")]
4-
WithExcluded = 1,
5-
[global::Android.Runtime.IntDefinition (null, JniField = "android/app/ActivityManager.RECENT_WITH_EXCLUDED")]
6-
IgnoreUnavailable = 2,
7-
}
2+
public enum RecentTaskFlags {
3+
[global::Android.Runtime.IntDefinition ("android.app.ActivityManager.RECENT_IGNORE_UNAVAILABLE", JniField = "android/app/ActivityManager.RECENT_IGNORE_UNAVAILABLE")]
4+
WithExcluded = 1,
5+
[global::Android.Runtime.IntDefinition (null, JniField = "android/app/ActivityManager.RECENT_WITH_EXCLUDED")]
6+
IgnoreUnavailable = 2,
7+
}
88
}

‎tools/generator/Tests/Unit-Tests/EnumGeneratorExpectedResults/WriteFlagsEnum.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
namespace Android.App {
2-
[System.Flags]
3-
public enum RecentTaskFlags {
4-
[global::Android.Runtime.IntDefinition (null, JniField = "android/app/ActivityManager.RECENT_IGNORE_UNAVAILABLE")]
5-
WithExcluded = 1,
6-
[global::Android.Runtime.IntDefinition (null, JniField = "android/app/ActivityManager.RECENT_WITH_EXCLUDED")]
7-
IgnoreUnavailable = 2,
8-
}
2+
[System.Flags]
3+
public enum RecentTaskFlags {
4+
[global::Android.Runtime.IntDefinition (null, JniField = "android/app/ActivityManager.RECENT_IGNORE_UNAVAILABLE")]
5+
WithExcluded = 1,
6+
[global::Android.Runtime.IntDefinition (null, JniField = "android/app/ActivityManager.RECENT_WITH_EXCLUDED")]
7+
IgnoreUnavailable = 2,
8+
}
99
}

‎tools/generator/Tests/expected/EnumerationFixup/Xamarin.Test.SomeValues.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
namespace Xamarin.Test {
2-
public enum SomeValues {
3-
[global::Android.Runtime.IntDefinition (null, JniField = "xamarin/test/SomeObject.SOME_VALUE")]
4-
SomeValue = 0,
5-
[global::Android.Runtime.IntDefinition (null, JniField = "xamarin/test/SomeObject.SOME_VALUE2")]
6-
SomeValue2 = 1,
7-
}
2+
public enum SomeValues {
3+
[global::Android.Runtime.IntDefinition (null, JniField = "xamarin/test/SomeObject.SOME_VALUE")]
4+
SomeValue = 0,
5+
[global::Android.Runtime.IntDefinition (null, JniField = "xamarin/test/SomeObject.SOME_VALUE2")]
6+
SomeValue2 = 1,
7+
}
88
}

0 commit comments

Comments
 (0)