Update samples.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3514 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

samples/ICSharpCode.Core.Demo/AddInManager/AddInManager.csproj

@@ -71,5 +71,12 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">
+      <Project>{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}</Project>
+      <Name>ICSharpCode.Core.WinForms</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>

samples/ICSharpCode.Core.Demo/AddInManager/Src/AddInControl.cs

@@ -6,11 +6,12 @@
 // </file>
 
 using System;
-using System.ComponentModel;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Windows.Forms;
+
 using ICSharpCode.Core;
+using ICSharpCode.Core.WinForms;
 
 namespace ICSharpCode.AddInManager
 {

samples/ICSharpCode.Core.Demo/AddInManager/Src/ManagerForm.cs

@@ -11,7 +11,9 @@ using System.Drawing;
 using System.IO;
 using System.Text;
 using System.Windows.Forms;
+
 using ICSharpCode.Core;
+using ICSharpCode.Core.WinForms;
 
 namespace ICSharpCode.AddInManager
 {
@@ -383,7 +385,7 @@ namespace ICSharpCode.AddInManager
 			box.Size = new Size(16, 16);
 			bool isOK = dep.Check(addInDict, out versionFound);
 			box.SizeMode = PictureBoxSizeMode.CenterImage;
-			box.Image = isOK ? ResourceService.GetBitmap("Icons.16x16.OK") : ResourceService.GetBitmap("Icons.16x16.DeleteIcon");
+			box.Image = WinFormsResourceService.GetBitmap(isOK ? "Icons.16x16.OK" : "Icons.16x16.DeleteIcon");
 			dependencyTable.Controls.Add(label, 1, rowIndex);
 			dependencyTable.Controls.Add(box,   0, rowIndex);
 			return isOK;

samples/ICSharpCode.Core.Demo/Base/Base.csproj

@@ -63,5 +63,11 @@
       <Name>ICSharpCode.Core</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">
+      <Project>{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}</Project>
+      <Name>ICSharpCode.Core.WinForms</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>

samples/ICSharpCode.Core.Demo/Base/FileViewContent.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Text;
 using System.Windows.Forms;
+
 using ICSharpCode.Core;
 
 namespace Base
@@ -99,11 +100,11 @@ namespace Base
 		{
 			StringBuilder b = new StringBuilder();
 			b.Append("All known file types|");
-			foreach (string filter in AddInTree.BuildItems(addInTreePath, null, true)) {
+			foreach (string filter in AddInTree.BuildItems<string>(addInTreePath, null, true)) {
 				b.Append(filter.Substring(filter.IndexOf('|') + 1));
 				b.Append(';');
 			}
-			foreach (string filter in AddInTree.BuildItems(addInTreePath, null, true)) {
+			foreach (string filter in AddInTree.BuildItems<string>(addInTreePath, null, true)) {
 				b.Append('|');
 				b.Append(filter);
 			}

samples/ICSharpCode.Core.Demo/Base/IDisplayBinding.cs

@@ -2,7 +2,7 @@
 // Licensed under the terms of the "BSD License", see doc/license.txt
 
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using ICSharpCode.Core;
 
 namespace Base
@@ -21,12 +21,12 @@ namespace Base
 	
 	public static class DisplayBindingManager
 	{
-		static ArrayList items;
+		static List<IDisplayBinding> items;
 		
 		public static IViewContent CreateViewContent(string fileName)
 		{
 			if (items == null) {
-				items = AddInTree.BuildItems("/Workspace/DisplayBindings", null, true);
+				items = AddInTree.BuildItems<IDisplayBinding>("/Workspace/DisplayBindings", null, true);
 			}
 			foreach (IDisplayBinding binding in items) {
 				IViewContent content = binding.OpenFile(fileName);

samples/ICSharpCode.Core.Demo/Base/Workbench.cs

@@ -3,9 +3,9 @@
 
 using System;
 using System.ComponentModel;
-using System.Drawing;
 using System.Windows.Forms;
-using ICSharpCode.Core;
+
+using ICSharpCode.Core.WinForms;
 
 namespace Base
 {

samples/ICSharpCode.Core.Demo/ICSharpCode.Core.Demo.sln

@@ -1,5 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# SharpDevelop 2.0.0.1128
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+# SharpDevelop 3.0.0.3507
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Base", "Base\Base.csproj", "{C9A2B6BC-5260-4DE3-8082-DCE8B391F7BB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Startup", "Startup\Startup.csproj", "{0AF8FEF6-32B9-46BD-A270-AB3B20EB39A3}"
@@ -16,6 +18,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RichTextEditor", "RichTextE
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "..\..\src\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.WinForms", "..\..\src\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj", "{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -42,5 +46,9 @@ Global
 		{C663289E-DD00-463F-8988-9913DDDAEEE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C663289E-DD00-463F-8988-9913DDDAEEE1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C663289E-DD00-463F-8988-9913DDDAEEE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Release|Any CPU.Build.0 = Release|Any CPU
+		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Release|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 EndGlobal

samples/Mono/Mono.AddIn.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-# SharpDevelop 3.0.0.2745
+# SharpDevelop 3.0.0.3507
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.AddIn", "Mono.AddIn\Mono.AddIn.csproj", "{082DCD64-EE32-4151-A50F-E139CF754CC0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Build.Tasks", "Mono.Build.Tasks\Mono.Build.Tasks.csproj", "{BF6F814C-B89F-475E-ADC4-AEE81D10CB94}"
@@ -18,34 +18,6 @@ Global
 		{082DCD64-EE32-4151-A50F-E139CF754CC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{082DCD64-EE32-4151-A50F-E139CF754CC0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{082DCD64-EE32-4151-A50F-E139CF754CC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8C52FFA5-35AF-4E28-8498-2DC2F168A241}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C52FFA5-35AF-4E28-8498-2DC2F168A241}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C52FFA5-35AF-4E28-8498-2DC2F168A241}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8C52FFA5-35AF-4E28-8498-2DC2F168A241}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF6F814C-B89F-475E-ADC4-AEE81D10CB94}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BF6F814C-B89F-475E-ADC4-AEE81D10CB94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF6F814C-B89F-475E-ADC4-AEE81D10CB94}.Release|Any CPU.Build.0 = Release|Any CPU

samples/NAnt/NAnt.AddIn/NAnt.AddIn.csproj

@@ -38,6 +38,10 @@
       <HintPath>..\..\..\bin\ICSharpCode.Core.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="ICSharpCode.Core.WinForms">
+      <HintPath>..\..\..\bin\ICSharpCode.Core.WinForms.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="ICSharpCode.SharpDevelop">
       <HintPath>..\..\..\bin\ICSharpCode.SharpDevelop.dll</HintPath>
       <Private>False</Private>

samples/NAnt/NAnt.AddIn/Src/Gui/NAntPadContent.cs

@@ -28,6 +28,7 @@
 using System;
 using System.Windows.Forms;
 using ICSharpCode.Core;
+using ICSharpCode.Core.WinForms;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Project;

samples/NAnt/NAnt.AddIn/Src/Gui/NAntPadTreeView.cs

@@ -31,8 +31,8 @@ using System.IO;
 using System.Windows.Forms;
 
 using ICSharpCode.Core;
+using ICSharpCode.Core.WinForms;
 using ICSharpCode.SharpDevelop;
-using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Project;
 
 namespace ICSharpCode.NAnt.Gui

samples/SharpSnippetCompiler/SharpSnippetCompiler/MainForm.cs

@@ -28,7 +28,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
 
@@ -36,8 +35,8 @@ using ICSharpCode.SharpDevelop.Commands;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Project;
 using ICSharpCode.SharpDevelop.Project.Commands;
-using ICSharpCode.TextEditor;
 using ICSharpCode.SharpSnippetCompiler.Core;
+using ICSharpCode.TextEditor;
 
 namespace ICSharpCode.SharpSnippetCompiler
 {
@@ -238,9 +237,7 @@ namespace ICSharpCode.SharpSnippetCompiler
 					
 					// Add new references.
 					foreach (ReferenceProjectItem reference in referenceDialog.ReferenceInformations) {
-						if (!reference.IsAddedToProject) {
-							ProjectService.AddProjectItem(project, reference);
-						}
+						ProjectService.AddProjectItem(project, reference);
 					}
 					project.Save();
 				}

src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/CodeGenerator.cs

@@ -717,14 +717,5 @@ namespace ICSharpCode.SharpDevelop.Dom.Refactoring
 			document.EndUndoableAction();
 		}
 		#endregion
-		
-		public static NR.Expression CreateDefaultValueForType(IReturnType type)
-		{
-			if (type.IsReferenceType != null && type.IsReferenceType != false) {
-				return null; 
-			}
-			
-			return null;
-		}
 	}
 }