Merge branch 'master' of git@github.com:jskeet/dotnet-protobufs

3 files changed, 1 insertions, 35 deletions

diff --git a/src/ProtoGen/Generator.cs b/src/ProtoGen/Generator.cs
index 828b610c..613136e9 100644
--- a/src/ProtoGen/Generator.cs
+++ b/src/ProtoGen/Generator.cs
@@ -52,17 +52,9 @@ namespace Google.ProtocolBuffers.ProtoGen {
       using (TextWriter textWriter = File.CreateText(Path.Combine(options.OutputDirectory, descriptor.CSharpOptions.UmbrellaClassname + ".cs"))) {
         TextGenerator writer = new TextGenerator(textWriter);        
         ucg.Generate(writer);
-        /*
-        GenerateSiblings(umbrellaSource, descriptor, descriptor.MessageTypes);
-        GenerateSiblings(umbrellaSource, descriptor, descriptor.EnumTypes);
-        GenerateSiblings(umbrellaSource, descriptor, descriptor.Services);*/
       }
     }
 
-    private static void GenerateSiblings<T>(SourceFileGenerator parentSourceGenerator, FileDescriptor file, IEnumerable<T> siblings)
-        where T : IDescriptor {
-    }
-
     /// <summary>
     /// Resolves any dependencies and converts FileDescriptorProtos into FileDescriptors.
     /// The list returned is in the same order as the protos are listed in the descriptor set.
diff --git a/src/ProtoGen/ProtoGen.csproj b/src/ProtoGen/ProtoGen.csproj
index 126c1d04..cd0513bd 100644
--- a/src/ProtoGen/ProtoGen.csproj
+++ b/src/ProtoGen/ProtoGen.csproj
@@ -54,7 +54,6 @@
     <Compile Include="RepeatedMessageFieldGenerator.cs" />
     <Compile Include="RepeatedPrimitiveFieldGenerator.cs" />
     <Compile Include="ServiceGenerator.cs" />
-    <Compile Include="SourceFileGenerator.cs" />
     <Compile Include="DependencyResolutionException.cs" />
     <Compile Include="Generator.cs" />
     <Compile Include="GeneratorOptions.cs" />
@@ -84,4 +83,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/ProtoGen/SourceFileGenerator.cs b/src/ProtoGen/SourceFileGenerator.cs
deleted file mode 100644
index b5bd5efb..00000000
--- a/src/ProtoGen/SourceFileGenerator.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.IO;
-
-namespace Google.ProtocolBuffers.ProtoGen {
-  /// <summary>
-  /// Generator to hold a TextGenerator, generate namespace aliases etc.
-  /// Each source file created uses one of these, and it can be used to create
-  /// multiple classes within the same file.
-  /// </summary>
-  internal class SourceFileGenerator  {
-
-    private readonly TextGenerator output;
-
-    private SourceFileGenerator(TextWriter writer) {
-      output = new TextGenerator(writer);
-    }
-
-    /// <summary>
-    /// Creates a ClassFileGenerator for the given writer, which will be closed
-    /// when the instance is disposed. The specified namespace is created, if it's non-null.
-    /// </summary>
-    internal static SourceFileGenerator ForWriter(TextWriter writer) {
-      return new SourceFileGenerator(writer);
-    }
-  }
-}