Merge lp:~mandel/wadlsharp/fix_643401 into lp:wadlsharp/trunk

Proposed by Manuel de la Peña
Status: Merged
Merged at revision: 33
Proposed branch: lp:~mandel/wadlsharp/fix_643401
Merge into: lp:wadlsharp/trunk
Prerequisite: lp:~mandel/wadlsharp/refactor_code_serialization
Diff against target: 64 lines (+32/-0)
3 files modified
WadlConsole/Program.cs (+4/-0)
WadlConsole/Resources.Designer.cs (+17/-0)
WadlConsole/Resources.resx (+11/-0)
To merge this branch: bzr merge lp:~mandel/wadlsharp/fix_643401
Reviewer Review Type Date Requested Status
Manish Sinha (मनीष सिन्हा) Approve
Review via email: mp+36121@code.launchpad.net

Description of the change

Fix lp:643401 by passing the autogenerated comment to the refactored code serializer.

To post a comment you must log in.
Revision history for this message
Manish Sinha (मनीष सिन्हा) (manishsinha) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'WadlConsole/Program.cs'
--- WadlConsole/Program.cs 2010-09-21 10:27:45 +0000
+++ WadlConsole/Program.cs 2010-09-21 10:27:45 +0000
@@ -91,6 +91,10 @@
91 converter = new WadlConverter();91 converter = new WadlConverter();
92 }92 }
93 converter.CodeSerializer = new SingleFileCodeSerializer(outputFileName);93 converter.CodeSerializer = new SingleFileCodeSerializer(outputFileName);
94 converter.CodeSerializer.Options.BracingStyle = "C";
95 converter.CodeSerializer.Options.IndentString = " ";
96 converter.CodeSerializer.AutoGeneratedMessage = String.Format(Resources.AutogeneratedComment,
97 Environment.Version);
94 converter.Convert(inputFileName, rootNamespace);98 converter.Convert(inputFileName, rootNamespace);
95 }99 }
96100
97101
=== modified file 'WadlConsole/Resources.Designer.cs'
--- WadlConsole/Resources.Designer.cs 2010-09-17 15:26:59 +0000
+++ WadlConsole/Resources.Designer.cs 2010-09-21 10:27:45 +0000
@@ -61,6 +61,23 @@
61 }61 }
62 62
63 /// <summary>63 /// <summary>
64 /// Looks up a localized string similar to //------------------------------------------------------------------------------
65 ///// &lt;auto-generated&gt;
66 ///// This code was generated by a tool.
67 ///// Runtime Version: {0}
68 /////
69 ///// Changes to this file may cause incorrect behavior and will be lost if
70 ///// the code is regenerated.
71 ///// &lt;/auto-generated&gt;
72 /////------------------------------------------------------------------------------.
73 /// </summary>
74 internal static string AutogeneratedComment {
75 get {
76 return ResourceManager.GetString("AutogeneratedComment", resourceCulture);
77 }
78 }
79
80 /// <summary>
64 /// Looks up a localized string similar to Generation completed..81 /// Looks up a localized string similar to Generation completed..
65 /// </summary>82 /// </summary>
66 internal static string Completed {83 internal static string Completed {
6784
=== modified file 'WadlConsole/Resources.resx'
--- WadlConsole/Resources.resx 2010-09-17 15:26:59 +0000
+++ WadlConsole/Resources.resx 2010-09-21 10:27:45 +0000
@@ -117,6 +117,17 @@
117 <resheader name="writer">117 <resheader name="writer">
118 <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>118 <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119 </resheader>119 </resheader>
120 <data name="AutogeneratedComment" xml:space="preserve">
121 <value>//------------------------------------------------------------------------------
122// &lt;auto-generated&gt;
123// This code was generated by a tool.
124// Runtime Version: {0}
125//
126// Changes to this file may cause incorrect behavior and will be lost if
127// the code is regenerated.
128// &lt;/auto-generated&gt;
129//------------------------------------------------------------------------------</value>
130 </data>
120 <data name="Completed" xml:space="preserve">131 <data name="Completed" xml:space="preserve">
121 <value>Generation completed.</value>132 <value>Generation completed.</value>
122 </data>133 </data>

Subscribers

People subscribed via source and target branches