From 7aed280b1f3d495bcffc67182ebab58fad086dc2 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Thu, 12 Jan 2006 15:39:37 +0000 Subject: [PATCH] Applied patch by Alex Prudkiy: fixes loading the forms designer when the file contains multiple classes. Adjusted AssemblyInfo for 2006. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@987 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../BooBinding/Project/Src/AssemblyInfo.cs | 2 +- .../Project/AssemblyInfo.cs | 2 +- .../Project/Configuration/AssemblyInfo.cs | 2 +- .../ILAsmBinding/Project/Src/AssemblyInfo.cs | 2 +- .../Project/Configuration/AssemblyInfo.cs | 2 +- .../Project/Configuration/AssemblyInfo.cs | 2 +- .../Project/Src/SecondaryDisplayBinding.cs | 5 ++--- .../Project/Configuration/AssemblyInfo.cs | 2 +- .../Project/Configuration/AssemblyInfo.cs | 2 +- .../Project/Configuration/AssemblyInfo.cs | 2 +- .../AddinScout/Project/Src/AssemblyInfo.cs | 2 +- .../Project/Configuration/AssemblyInfo.cs | 2 +- .../Project/Configuration/AssemblyInfo.cs | 2 +- .../Project/Configuration/AssemblyInfo.cs | 2 +- .../Project/Configuration/AssemblyInfo.cs | 2 +- .../Project/Configuration/AssemblyInfo.cs | 15 +++++++-------- .../Project/HtmlHelp2.DynamicHelp.addin | 1 - .../Misc/HtmlHelp2/Project/HtmlHelp2.addin | 1 - .../src/BaseControls/DynamicHelpPad.cs | 14 +++++++------- .../Project/src/BaseControls/FavoritesPad.cs | 14 +++++++------- .../Project/src/BaseControls/IndexPad.cs | 14 +++++++------- .../src/BaseControls/IndexResultsPad.cs | 14 +++++++------- .../Project/src/BaseControls/SearchPad.cs | 14 +++++++------- .../src/BaseControls/SearchResultsPad.cs | 14 +++++++------- .../Project/src/BaseControls/TocPad.cs | 13 ++++++------- .../src/BrowserControl/ShowHelpBrowser.cs | 18 +++++++++--------- .../src/Service/Help2ControlsValidation.cs | 14 +++++++------- .../src/Service/Help2RegistryWalker.cs | 14 +++++++------- .../Project/src/Service/HtmlHelp2Dialog.cs | 14 +++++++------- .../Project/src/Service/HtmlHelp2Options.cs | 14 +++++++------- .../Project/src/Service/HtmlHelp2Service.cs | 14 +++++++------- .../Project/src/Service/ResourcesHelper.cs | 14 +++++++------- .../src/Service/SharpDevLanguageClass.cs | 15 +++++++-------- .../Project/Configuration/AssemblyInfo.cs | 2 +- .../Project/Configuration/AssemblyInfo.cs | 2 +- .../Project/Configuration/AssemblyInfo.cs | 2 +- .../Project/Configuration/AssemblyInfo.cs | 2 +- .../Project/Configuration/AssemblyInfo.cs | 2 +- .../Project/Configuration/AssemblyInfo.cs | 2 +- .../Project/Configuration/AssemblyInfo.cs | 2 +- .../StartPage/Project/Src/ICSharpCodePage.cs | 4 ++-- .../Project/AssemblyInfo.cs | 2 +- .../Project/Configuration/AssemblyInfo.cs | 2 +- .../Project/Configuration/AssemblyInfo.cs | 2 +- .../Project/Resources/CommonAboutDialog.xfrm | 2 +- .../Project/Configuration/AssemblyInfo.cs | 2 +- .../Configuration/AssemblyInfo.template | 4 ++-- src/Tools/CheckFileHeaders/Main.cs | 19 ++++--------------- 48 files changed, 149 insertions(+), 166 deletions(-) diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/AssemblyInfo.cs b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/AssemblyInfo.cs index b58c325882..7983a20a2e 100644 --- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/AssemblyInfo.cs +++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2005-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/AssemblyInfo.cs b/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/AssemblyInfo.cs index 38d4b5b744..798a5a7eba 100644 --- a/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/AssemblyInfo.cs +++ b/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2005-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Configuration/AssemblyInfo.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Configuration/AssemblyInfo.cs index a55c472b34..651d13d7d8 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Configuration/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2004-2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2004-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/AssemblyInfo.cs b/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/AssemblyInfo.cs index 0949e98b6a..c2cd438541 100644 --- a/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/AssemblyInfo.cs +++ b/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/AssemblyInfo.cs @@ -12,7 +12,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2004-2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2004-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Configuration/AssemblyInfo.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Configuration/AssemblyInfo.cs index 46f5f23799..2b174ae1e7 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Configuration/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2004-2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2004-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Configuration/AssemblyInfo.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Configuration/AssemblyInfo.cs index a791b82d4c..a5e2b165f9 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Configuration/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2002-2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2002-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/SecondaryDisplayBinding.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/SecondaryDisplayBinding.cs index 411143ad82..3e8d70990e 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/SecondaryDisplayBinding.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/SecondaryDisplayBinding.cs @@ -63,10 +63,9 @@ namespace ICSharpCode.FormsDesigner ICompilationUnit cu = (ICompilationUnit)info.BestCompilationUnit; foreach (IClass c in cu.Classes) { IMethod method = GetInitializeComponents(c); - if (method == null) { - return false; + if (method != null) { + return BaseClassIsFormOrControl(c); } - return BaseClassIsFormOrControl(c); } } return false; diff --git a/src/AddIns/DisplayBindings/ResourceEditor/Project/Configuration/AssemblyInfo.cs b/src/AddIns/DisplayBindings/ResourceEditor/Project/Configuration/AssemblyInfo.cs index 9aaa66cc2a..38c2eadbc6 100644 --- a/src/AddIns/DisplayBindings/ResourceEditor/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/DisplayBindings/ResourceEditor/Project/Configuration/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2002-2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2002-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Configuration/AssemblyInfo.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Configuration/AssemblyInfo.cs index 6a55c44982..bf303b547c 100644 --- a/src/AddIns/DisplayBindings/XmlEditor/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/DisplayBindings/XmlEditor/Project/Configuration/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2005-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/Misc/AddInManager/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/AddInManager/Project/Configuration/AssemblyInfo.cs index 34b17aa3a2..402721e8e2 100644 --- a/src/AddIns/Misc/AddInManager/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/AddInManager/Project/Configuration/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2005-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/Misc/AddinScout/Project/Src/AssemblyInfo.cs b/src/AddIns/Misc/AddinScout/Project/Src/AssemblyInfo.cs index 84bd67a7bb..81f91836aa 100644 --- a/src/AddIns/Misc/AddinScout/Project/Src/AssemblyInfo.cs +++ b/src/AddIns/Misc/AddinScout/Project/Src/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2004-2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2004-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Configuration/AssemblyInfo.cs index 8d9146de58..8852a1956a 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Configuration/AssemblyInfo.cs @@ -18,7 +18,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2005-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Configuration/AssemblyInfo.cs index 23ca3c44f4..891ca486a3 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Configuration/AssemblyInfo.cs @@ -18,7 +18,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2005-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/Misc/FiletypeRegisterer/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/FiletypeRegisterer/Project/Configuration/AssemblyInfo.cs index 00bf05c6d2..459b8bbe24 100644 --- a/src/AddIns/Misc/FiletypeRegisterer/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/FiletypeRegisterer/Project/Configuration/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2002-2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2002-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/Misc/HighlightingEditor/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/HighlightingEditor/Project/Configuration/AssemblyInfo.cs index c7928bbb68..4fbc96623c 100644 --- a/src/AddIns/Misc/HighlightingEditor/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/HighlightingEditor/Project/Configuration/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2003-2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2003-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/Misc/HtmlHelp2/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/HtmlHelp2/Project/Configuration/AssemblyInfo.cs index a19839cdf5..66fc44afe7 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/Configuration/AssemblyInfo.cs @@ -1,10 +1,9 @@ -/* *********************************************************** - * - * Help 2.0 Environment for SharpDevelop - * Dynamic Help Pad - * Copyright (c) 2005, Mathias Simmack. All rights reserved. - * - * ********************************************************* */ +// +// +// +// +// $Revision$ +// using System.Reflection; using System.Runtime.CompilerServices; @@ -20,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2005-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.DynamicHelp.addin b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.DynamicHelp.addin index 88e1700db4..dde35a438f 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.DynamicHelp.addin +++ b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.DynamicHelp.addin @@ -1,6 +1,5 @@ diff --git a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin index b5a010e229..14c14e5d93 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin +++ b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin @@ -1,6 +1,5 @@ diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs index 8c4f8d5b85..3656ca38b8 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs @@ -1,10 +1,10 @@ -/* *********************************************************** - * - * Help 2.0 Environment for SharpDevelop - * Dynamic Help Pad - * Copyright (c) 2005, Mathias Simmack. All rights reserved. - * - * ********************************************************* */ +// +// +// +// +// $Revision$ +// + namespace HtmlHelp2 { using System; diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/FavoritesPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/FavoritesPad.cs index 90087ff31f..479613d60e 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/FavoritesPad.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/FavoritesPad.cs @@ -1,10 +1,10 @@ -/* *********************************************************** - * - * Help 2.0 Environment for SharpDevelop - * Favorites Pad - * Copyright (c) 2005, Mathias Simmack. All rights reserved. - * - * ********************************************************* */ +// +// +// +// +// $Revision$ +// + namespace HtmlHelp2 { using System; diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexPad.cs index 6cac8908f2..3ccbb84693 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexPad.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexPad.cs @@ -1,10 +1,10 @@ -/* *********************************************************** - * - * Help 2.0 Environment for SharpDevelop - * Index Pad - * Copyright (c) 2005, Mathias Simmack. All rights reserved. - * - * ********************************************************* */ +// +// +// +// +// $Revision$ +// + namespace HtmlHelp2 { using System; diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexResultsPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexResultsPad.cs index 8d2bcb0055..24aaeb53b8 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexResultsPad.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexResultsPad.cs @@ -1,10 +1,10 @@ -/* *********************************************************** - * - * Help 2.0 Environment for SharpDevelop - * Index results Pad - * Copyright (c) 2005, Mathias Simmack. All rights reserved. - * - * ********************************************************* */ +// +// +// +// +// $Revision$ +// + namespace HtmlHelp2 { using System; diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs index 44bf850332..3b12cb6a6e 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs @@ -1,10 +1,10 @@ -/* *********************************************************** - * - * Help 2.0 Environment for SharpDevelop - * Search Pad - * Copyright (c) 2005, Mathias Simmack. All rights reserved. - * - * ********************************************************* */ +// +// +// +// +// $Revision$ +// + namespace HtmlHelp2 { using System; diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchResultsPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchResultsPad.cs index cf6bc3d34a..84e009e0ea 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchResultsPad.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchResultsPad.cs @@ -1,10 +1,10 @@ -/* *********************************************************** - * - * Help 2.0 Environment for SharpDevelop - * Search results Pad - * Copyright (c) 2005, Mathias Simmack. All rights reserved. - * - * ********************************************************* */ +// +// +// +// +// $Revision$ +// + namespace HtmlHelp2 { using System; diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs index 8de0136778..42f58e0546 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs @@ -1,10 +1,9 @@ -/* *********************************************************** - * - * Help 2.0 Environment for SharpDevelop - * Table of Contents Pad - * Copyright (c) 2005, Mathias Simmack. All rights reserved. - * - * ********************************************************* */ +// +// +// +// +// $Revision$ +// //#define DExplore8Style_NoTOCPictures diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BrowserControl/ShowHelpBrowser.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BrowserControl/ShowHelpBrowser.cs index 74b5d06297..516046cff6 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/BrowserControl/ShowHelpBrowser.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BrowserControl/ShowHelpBrowser.cs @@ -1,14 +1,14 @@ -/* *********************************************************** - * - * Help 2.0 Environment for SharpDevelop - * ShowHelpBrowser Class - * Copyright (c) 2005, Mathias Simmack. All rights reserved. - * - * With a big "Thank you" to Robert_G (Delphi-PRAXiS) - * - * ********************************************************* */ +// +// +// +// +// $Revision$ +// + namespace HtmlHelp2 { + // With a big "Thank you" to Robert_G (Delphi-PRAXiS) + using System; using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.BrowserDisplayBinding; diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/Help2ControlsValidation.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/Help2ControlsValidation.cs index bf3b4daf4d..9a4c34d13c 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/Help2ControlsValidation.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/Help2ControlsValidation.cs @@ -1,10 +1,10 @@ -/* *********************************************************** - * - * Help 2.0 Environment for SharpDevelop - * Base Help 2.0 Services (Help 2.0 Controls Validation) - * Copyright (c) 2005, Mathias Simmack. All rights reserved. - * - * ********************************************************* */ +// +// +// +// +// $Revision$ +// + namespace HtmlHelp2.ControlsValidation { using System; diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/Help2RegistryWalker.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/Help2RegistryWalker.cs index 375ce3c503..4ac8e42c21 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/Help2RegistryWalker.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/Help2RegistryWalker.cs @@ -1,10 +1,10 @@ -/* *********************************************************** - * - * Help 2.0 Environment for SharpDevelop - * Base Help 2.0 Services - * Copyright (c) 2005, Mathias Simmack. All rights reserved. - * - * ********************************************************* */ +// +// +// +// +// $Revision$ +// + namespace HtmlHelp2.RegistryWalker { using System; diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Dialog.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Dialog.cs index 75b16febb7..e729f8882d 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Dialog.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Dialog.cs @@ -1,10 +1,10 @@ -/* *********************************************************** - * - * Help 2.0 Environment for SharpDevelop - * Help 2.0 Helper Dialog - * Copyright (c) 2005, Mathias Simmack. All rights reserved. - * - * ********************************************************* */ +// +// +// +// +// $Revision$ +// + namespace HtmlHelp2.HelperDialog { using System; diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs index 3ca6380f9a..feee390815 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs @@ -1,10 +1,10 @@ -/* *********************************************************** - * - * Help 2.0 Environment for SharpDevelop - * Base Help 2.0 Services (Options Panel) - * Copyright (c) 2005, Mathias Simmack. All rights reserved. - * - * ********************************************************* */ +// +// +// +// +// $Revision$ +// + namespace HtmlHelp2.OptionsPanel { using System; diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs index a0be2d95f1..cc8781df43 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs @@ -1,10 +1,10 @@ -/* *********************************************************** - * - * Help 2.0 Environment for SharpDevelop - * Base Help 2.0 Services - * Copyright (c) 2005, Mathias Simmack. All rights reserved. - * - * ********************************************************* */ +// +// +// +// +// $Revision$ +// + namespace HtmlHelp2.Environment { using System; diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/ResourcesHelper.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/ResourcesHelper.cs index 5c2f269735..e6e8e58e1a 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/ResourcesHelper.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/ResourcesHelper.cs @@ -1,10 +1,10 @@ -/* *********************************************************** - * - * Help 2.0 Environment for SharpDevelop - * Base Help 2.0 Services - * Copyright (c) 2005, Mathias Simmack. All rights reserved. - * - * ********************************************************* */ +// +// +// +// +// $Revision$ +// + namespace HtmlHelp2.ResourcesHelperClass { using System; diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/SharpDevLanguageClass.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/SharpDevLanguageClass.cs index 9855a0831e..f552fc1559 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/SharpDevLanguageClass.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/SharpDevLanguageClass.cs @@ -1,10 +1,10 @@ -/* *********************************************************** - * - * Help 2.0 Environment for SharpDevelop - * SharpDevLanguage Class - * Copyright (c) 2005, Mathias Simmack. All rights reserved. - * - * ********************************************************* */ +// +// +// +// +// $Revision$ +// + namespace HtmlHelp2.SharpDevLanguageClass { using System; @@ -103,4 +103,3 @@ namespace HtmlHelp2.SharpDevLanguageClass } } } - diff --git a/src/AddIns/Misc/MbUnitPad/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/MbUnitPad/Project/Configuration/AssemblyInfo.cs index a4f2e24bbe..0b75ed8cb4 100644 --- a/src/AddIns/Misc/MbUnitPad/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/MbUnitPad/Project/Configuration/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2005-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/Misc/MonoAddIn/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/MonoAddIn/Project/Configuration/AssemblyInfo.cs index 84f8666cc3..59d4ca63a9 100644 --- a/src/AddIns/Misc/MonoAddIn/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/MonoAddIn/Project/Configuration/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2004-2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/Misc/MonoReflectionLoader/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/MonoReflectionLoader/Project/Configuration/AssemblyInfo.cs index f0bb8378aa..500c007ea5 100644 --- a/src/AddIns/Misc/MonoReflectionLoader/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/MonoReflectionLoader/Project/Configuration/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2004-2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/Misc/NAntAddIn/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/NAntAddIn/Project/Configuration/AssemblyInfo.cs index 8ce40d5f1c..097a89396b 100644 --- a/src/AddIns/Misc/NAntAddIn/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/NAntAddIn/Project/Configuration/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2004-2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2004-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/Misc/PInvokeAddIn/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/PInvokeAddIn/Project/Configuration/AssemblyInfo.cs index 4564271684..c4c71ce356 100644 --- a/src/AddIns/Misc/PInvokeAddIn/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/PInvokeAddIn/Project/Configuration/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2004-2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2004-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/Misc/RegExpTk/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/RegExpTk/Project/Configuration/AssemblyInfo.cs index 5f71f8f10f..fd52fe46fb 100644 --- a/src/AddIns/Misc/RegExpTk/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/RegExpTk/Project/Configuration/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2004-2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2004-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/Misc/StartPage/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/StartPage/Project/Configuration/AssemblyInfo.cs index 7d5354c6f0..c5b866d545 100644 --- a/src/AddIns/Misc/StartPage/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/StartPage/Project/Configuration/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2002-2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2002-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/AddIns/Misc/StartPage/Project/Src/ICSharpCodePage.cs b/src/AddIns/Misc/StartPage/Project/Src/ICSharpCodePage.cs index 1c3f699901..316ffaf849 100644 --- a/src/AddIns/Misc/StartPage/Project/Src/ICSharpCodePage.cs +++ b/src/AddIns/Misc/StartPage/Project/Src/ICSharpCodePage.cs @@ -210,7 +210,7 @@ namespace ICSharpCode.StartPage StaticStyleSheet = startPageLocation + "/Layout/default.css"; MetaAuthor = "Christoph Wille - christophw@alphasierrapapa.com"; - MetaCopyright = "(c) 2001-2005 AlphaSierraPapa"; + MetaCopyright = "(c) 2001-2006 AlphaSierraPapa"; ShowLeftMenu = false; ShowRightBox = false; @@ -483,7 +483,7 @@ namespace ICSharpCode.StartPage builder.Append(m_strMainColColor); builder.Append("\" class=\"copy\">"); builder.Append(""); - builder.Append("Copyright ©2000-2005 IC#SharpCode. Released under the terms of the GNU Lesser General Public License. \r\n"); + builder.Append("Copyright ©2000-2006 IC#SharpCode. Released under the terms of the GNU Lesser General Public License. \r\n"); if (ShowRightBox) { diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/AssemblyInfo.cs b/src/Libraries/ICSharpCode.Build.Tasks/Project/AssemblyInfo.cs index 7d954c24b6..2563efb77e 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/AssemblyInfo.cs +++ b/src/Libraries/ICSharpCode.Build.Tasks/Project/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2005-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/Libraries/ICSharpCode.TextEditor/Project/Configuration/AssemblyInfo.cs b/src/Libraries/ICSharpCode.TextEditor/Project/Configuration/AssemblyInfo.cs index 2309a4b10b..9dd68e6c63 100644 --- a/src/Libraries/ICSharpCode.TextEditor/Project/Configuration/AssemblyInfo.cs +++ b/src/Libraries/ICSharpCode.TextEditor/Project/Configuration/AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2002-2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2002-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/Main/Base/Project/Configuration/AssemblyInfo.cs b/src/Main/Base/Project/Configuration/AssemblyInfo.cs index a5784289ea..2a1fd723de 100644 --- a/src/Main/Base/Project/Configuration/AssemblyInfo.cs +++ b/src/Main/Base/Project/Configuration/AssemblyInfo.cs @@ -15,7 +15,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2000-2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2000-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/Main/Base/Project/Resources/CommonAboutDialog.xfrm b/src/Main/Base/Project/Resources/CommonAboutDialog.xfrm index 2f98363414..597b64bb70 100644 --- a/src/Main/Base/Project/Resources/CommonAboutDialog.xfrm +++ b/src/Main/Base/Project/Resources/CommonAboutDialog.xfrm @@ -26,7 +26,7 @@ - + diff --git a/src/Main/Core/Project/Configuration/AssemblyInfo.cs b/src/Main/Core/Project/Configuration/AssemblyInfo.cs index 2ddd1d72fd..4817e2d68d 100644 --- a/src/Main/Core/Project/Configuration/AssemblyInfo.cs +++ b/src/Main/Core/Project/Configuration/AssemblyInfo.cs @@ -16,7 +16,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2000-2005 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2000-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/Main/StartUp/Project/Configuration/AssemblyInfo.template b/src/Main/StartUp/Project/Configuration/AssemblyInfo.template index 6e5f92ef71..6876d420a6 100644 --- a/src/Main/StartUp/Project/Configuration/AssemblyInfo.template +++ b/src/Main/StartUp/Project/Configuration/AssemblyInfo.template @@ -1,7 +1,7 @@ // // // -// +// // $Revision$ // @@ -19,7 +19,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("www.icsharpcode.net")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("Mike Krüger 2000-2005")] +[assembly: AssemblyCopyright("2000-2006 AlphaSierraPapa")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/Tools/CheckFileHeaders/Main.cs b/src/Tools/CheckFileHeaders/Main.cs index 7de616d0ea..02cfd916bf 100644 --- a/src/Tools/CheckFileHeaders/Main.cs +++ b/src/Tools/CheckFileHeaders/Main.cs @@ -66,8 +66,6 @@ namespace CheckFileHeaders continue; if (subdir.EndsWith("AddIns\\Misc\\Debugger\\TreeListView\\Project")) continue; - if (subdir.EndsWith("AddIns\\Misc\\ProjectImporterExporter\\Project")) - continue; count += Run(subdir); } return count; @@ -85,6 +83,7 @@ namespace CheckFileHeaders int lastLine; int headerType = AnalyzeHeader(content, out author, out email, out lastLine); if (headerType == 5) { + //Console.WriteLine("unknown file: " + file); ignoreCount++; return; } @@ -177,6 +176,8 @@ namespace CheckFileHeaders return "andrea@icsharpcode.net"; case "Matthew Ward": return "mrward@users.sourceforge.net"; + case "Mathias Simmack": + return "mathias@simmack.de"; case "Poul Staugaard": return "poul@staugaard.dk"; case "Roman Taranchenko": @@ -227,7 +228,6 @@ namespace CheckFileHeaders } #region AnalyzeHeader - Regex gplRegex = new Regex(@"// Copyright \(C\) 200\d(?:\s?-\s?200\d)?(?:\s?,\s?200\d)*\s+(\w+ \w+)( \(\w+@\w+\.\w+\))?", RegexOptions.IgnoreCase); Regex xmlRegex = new Regex(@""); Regex sdRegex = new Regex(@"\* User: (.*)"); @@ -235,7 +235,7 @@ namespace CheckFileHeaders // 0 = no header // 1 = XML header // 2 = SharpDevelop header - // 3 = GPL header + // 3 = GPL header (unused) // 4 = unknown header // 5 = outcommented file int AnalyzeHeader(string content, out string author, out string email, out int lastLine) @@ -271,19 +271,10 @@ namespace CheckFileHeaders return 5; } else if (line == "/*") { state = 4; - } else if (line == "/* ***********************************************************") { - // Mathias' style (preserve) - lastLine = -1; - return 5; } else if (line == "//------------------------------------------------------------------------------") { // TlbImp auto-generated style (preserve) lastLine = -1; return 5; - } else if (gplRegex.IsMatch(line)) { - Match m = gplRegex.Match(line); - author = m.Groups[1].Value; - email = m.Groups[2].Value; - state = 3; } else if (line.StartsWith("//")) { // ignore } else { @@ -297,8 +288,6 @@ namespace CheckFileHeaders Match m = xmlRegex.Match(line); author = m.Groups[1].Value; email = m.Groups[2].Value; - } else if (line == @"// ") { - author = "Mike Krueger"; } } else if (state == 2) { if (line == "*/") {