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
1=== modified file 'WadlConsole/Program.cs'
2--- WadlConsole/Program.cs 2010-09-21 10:27:45 +0000
3+++ WadlConsole/Program.cs 2010-09-21 10:27:45 +0000
4@@ -91,6 +91,10 @@
5 converter = new WadlConverter();
6 }
7 converter.CodeSerializer = new SingleFileCodeSerializer(outputFileName);
8+ converter.CodeSerializer.Options.BracingStyle = "C";
9+ converter.CodeSerializer.Options.IndentString = " ";
10+ converter.CodeSerializer.AutoGeneratedMessage = String.Format(Resources.AutogeneratedComment,
11+ Environment.Version);
12 converter.Convert(inputFileName, rootNamespace);
13 }
14
15
16=== modified file 'WadlConsole/Resources.Designer.cs'
17--- WadlConsole/Resources.Designer.cs 2010-09-17 15:26:59 +0000
18+++ WadlConsole/Resources.Designer.cs 2010-09-21 10:27:45 +0000
19@@ -61,6 +61,23 @@
20 }
21
22 /// <summary>
23+ /// Looks up a localized string similar to //------------------------------------------------------------------------------
24+ ///// &lt;auto-generated&gt;
25+ ///// This code was generated by a tool.
26+ ///// Runtime Version: {0}
27+ /////
28+ ///// Changes to this file may cause incorrect behavior and will be lost if
29+ ///// the code is regenerated.
30+ ///// &lt;/auto-generated&gt;
31+ /////------------------------------------------------------------------------------.
32+ /// </summary>
33+ internal static string AutogeneratedComment {
34+ get {
35+ return ResourceManager.GetString("AutogeneratedComment", resourceCulture);
36+ }
37+ }
38+
39+ /// <summary>
40 /// Looks up a localized string similar to Generation completed..
41 /// </summary>
42 internal static string Completed {
43
44=== modified file 'WadlConsole/Resources.resx'
45--- WadlConsole/Resources.resx 2010-09-17 15:26:59 +0000
46+++ WadlConsole/Resources.resx 2010-09-21 10:27:45 +0000
47@@ -117,6 +117,17 @@
48 <resheader name="writer">
49 <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
50 </resheader>
51+ <data name="AutogeneratedComment" xml:space="preserve">
52+ <value>//------------------------------------------------------------------------------
53+// &lt;auto-generated&gt;
54+// This code was generated by a tool.
55+// Runtime Version: {0}
56+//
57+// Changes to this file may cause incorrect behavior and will be lost if
58+// the code is regenerated.
59+// &lt;/auto-generated&gt;
60+//------------------------------------------------------------------------------</value>
61+ </data>
62 <data name="Completed" xml:space="preserve">
63 <value>Generation completed.</value>
64 </data>

Subscribers

People subscribed via source and target branches