[Monodevelop-patches-list] r1615 - in trunk/MonoDevelop: . build/data/templates/project build/data/templates/project/CSharp src/Main/Base src/Main/Base/Services/ParserService

commit-watcher at mono-cvs.ximian.com commit-watcher at mono-cvs.ximian.com
Wed May 19 23:34:33 EDT 2004


Author: tberman
Date: 2004-05-19 23:34:32 -0400 (Wed, 19 May 2004)
New Revision: 1615

Removed:
   trunk/MonoDevelop/build/data/templates/project/CSharp/Service.xpt
   trunk/MonoDevelop/build/data/templates/project/VBNet/
Modified:
   trunk/MonoDevelop/build/data/templates/project/CSharp/Makefile.am
   trunk/MonoDevelop/build/data/templates/project/Makefile.am
   trunk/MonoDevelop/configure.in
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs
Log:
removing useless templates and adding some debugging info


Modified: trunk/MonoDevelop/build/data/templates/project/CSharp/Makefile.am
===================================================================
--- trunk/MonoDevelop/build/data/templates/project/CSharp/Makefile.am	2004-05-20 01:43:58 UTC (rev 1614)
+++ trunk/MonoDevelop/build/data/templates/project/CSharp/Makefile.am	2004-05-20 03:34:32 UTC (rev 1615)
@@ -7,8 +7,7 @@
 	Library.xpt \
 	EmptyProject.xpt \
 	GtkSharpProject.xpt \
-	GladeSharpProject.xpt \
-	Service.xpt
+	GladeSharpProject.xpt
 
 all:
 	

Deleted: trunk/MonoDevelop/build/data/templates/project/CSharp/Service.xpt
===================================================================
--- trunk/MonoDevelop/build/data/templates/project/CSharp/Service.xpt	2004-05-20 01:43:58 UTC (rev 1614)
+++ trunk/MonoDevelop/build/data/templates/project/CSharp/Service.xpt	2004-05-20 03:34:32 UTC (rev 1615)
@@ -1,148 +0,0 @@
-<?xml version="1.0"?>
-<Template originator   = "Mike Krueger"
-          created      = "02/01/2003"
-          lastModified = "02/01/2003">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<Name>C# Service</Name>
-		<Category>C#</Category>
-		<Icon>C#.Project.ServiceProject</Icon>
-		<LanguageName>C#</LanguageName>
-		<Description>Creates an empty C# service</Description>
-	</TemplateConfiguration>
-	
-	<!-- Actions -->
-	<Actions>
-		<Open filename = "MyService.cs"/>
-	</Actions>
-
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Options>
-			<StartupProject>${ProjectName}</StartupProject>
-		</Options>
-		
-		<Project name = "${ProjectName}" directory = ".">
-			
-			<Options Target = "Library" PauseConsoleOutput = "False" />
-	
-			<Files>
-				<File name="MyService.cs"><![CDATA[using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Diagnostics;
-using System.ServiceProcess;
-using System.Configuration.Install;
-
-namespace WindowsService
-{
-	/// <summary>
-	/// This is the class for my Service
-	/// </summary>
-	public class MyService : System.ServiceProcess.ServiceBase
-	{
-		public MyService()
-		{
-			InitializeComponents();
-
-			// TODO: Add any further initialization code
-		}
-
-		private void InitializeComponents()
-		{
-			this.ServiceName = "MyService";
-		}
-		
-		/// <summary>
-		/// This method starts the service.
-		/// </summary>
-		public static void Main()
-		{
-			System.ServiceProcess.ServiceBase.Run(new System.ServiceProcess.ServiceBase[] {
-				new MyService() // To run more than one service you have to add them here
-			});
-		}
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		protected override void Dispose(bool disposing)
-		{
-			// TODO: Add cleanup code here (if required)
-			base.Dispose(disposing);
-		}
-
-		/// <summary>
-		/// Start this service.
-		/// </summary>
-		protected override void OnStart(string[] args)
-		{
-			// TODO: Add start code here (if required)
-			//       to start your service.
-		}
- 
-		/// <summary>
-		/// Stop this service.
-		/// </summary>
-		protected override void OnStop()
-		{
-			// TODO: Add tear-down code here (if required) 
-			//       to stop your service.
-		}
-	}
-}
-
-[RunInstaller(true)]
-public class ProjectInstaller : Installer
-{
-	public ProjectInstaller()
-	{
-		ServiceProcessInstaller spi = new ServiceProcessInstaller();
-		spi.Account = ServiceAccount.LocalSystem;
-		
-		ServiceInstaller si = new ServiceInstaller();
-		si.ServiceName = "Hello Service Template";
-		si.StartType = ServiceStartMode.Automatic;
-		Installers.AddRange(new Installer[] {spi, si});
-	}
-}
-]]></File>
-			<File name="AssemblyInfo.cs"><![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes specify the key for the sign of your assembly. See the
-// .NET Framework documentation for more information about signing.
-// This is not required, if you don't want signing let these attributes like they're.
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
-]]></File>
-			</Files>
-		</Project>
-	</Combine>
-</Template>

Modified: trunk/MonoDevelop/build/data/templates/project/Makefile.am
===================================================================
--- trunk/MonoDevelop/build/data/templates/project/Makefile.am	2004-05-20 01:43:58 UTC (rev 1614)
+++ trunk/MonoDevelop/build/data/templates/project/Makefile.am	2004-05-20 03:34:32 UTC (rev 1615)
@@ -1,4 +1,4 @@
-SUBDIRS = Java CSharp Misc VBNet Nemerle ILAsm
+SUBDIRS = Java CSharp Misc Nemerle ILAsm
 
 all:
 	

Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in	2004-05-20 01:43:58 UTC (rev 1614)
+++ trunk/MonoDevelop/configure.in	2004-05-20 03:34:32 UTC (rev 1615)
@@ -152,7 +152,6 @@
 build/data/templates/project/ILAsm/Makefile
 build/data/templates/project/Misc/Makefile
 build/data/templates/project/Nemerle/Makefile
-build/data/templates/project/VBNet/Makefile
 build/doc/Makefile
 build/AddIns/Makefile
 build/AddIns/AddIns/Makefile

Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-05-20 01:43:58 UTC (rev 1614)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-05-20 03:34:32 UTC (rev 1615)
@@ -1,3 +1,8 @@
+2004-05-19  Todd Berman  <tberman at sevenl.net>
+
+	* Services/ParserService/DefaultParserService.cs: potential nullref
+	removed.
+
 2004-05-20  Pawel Rozanski  <tokugawa at afn.no-ip.org>
 
 	* Services/Tasks/Task.cs: add a "COMMENT" ErrorNumber in order to

Modified: trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs	2004-05-20 01:43:58 UTC (rev 1614)
+++ trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs	2004-05-20 03:34:32 UTC (rev 1615)
@@ -445,6 +445,11 @@
 		
 		Hashtable AddClassToNamespaceList(IClass addClass)
 		{
+			if (addClass.Name == null) {
+				Console.WriteLine (addClass.FullyQualifiedName);
+				return null;
+			}
+
 			string nSpace = addClass.Namespace;
 			if (nSpace == null) {
 				nSpace = String.Empty;




More information about the Monodevelop-patches-list mailing list