pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Update samples. 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3514 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
bb010887f8
commit
61c15ff222
14 changed files with 79 additions and 89 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      samples/ICSharpCode.Core.Demo/AddInManager/AddInManager.csproj
  2. 3
      samples/ICSharpCode.Core.Demo/AddInManager/Src/AddInControl.cs
  3. 4
      samples/ICSharpCode.Core.Demo/AddInManager/Src/ManagerForm.cs
  4. 6
      samples/ICSharpCode.Core.Demo/Base/Base.csproj
  5. 5
      samples/ICSharpCode.Core.Demo/Base/FileViewContent.cs
  6. 6
      samples/ICSharpCode.Core.Demo/Base/IDisplayBinding.cs
  7. 4
      samples/ICSharpCode.Core.Demo/Base/Workbench.cs
  8. 12
      samples/ICSharpCode.Core.Demo/ICSharpCode.Core.Demo.sln
  9. 30
      samples/Mono/Mono.AddIn.sln
  10. 4
      samples/NAnt/NAnt.AddIn/NAnt.AddIn.csproj
  11. 15
      samples/NAnt/NAnt.AddIn/Src/Gui/NAntPadContent.cs
  12. 36
      samples/NAnt/NAnt.AddIn/Src/Gui/NAntPadTreeView.cs
  13. 27
      samples/SharpSnippetCompiler/SharpSnippetCompiler/MainForm.cs
  14. 9
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/CodeGenerator.cs

7
samples/ICSharpCode.Core.Demo/AddInManager/AddInManager.csproj
Unescape View File

@ -71,5 +71,12 @@ @@ -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>

3
samples/ICSharpCode.Core.Demo/AddInManager/Src/AddInControl.cs
Unescape View File

@ -6,11 +6,12 @@ @@ -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
{

4
samples/ICSharpCode.Core.Demo/AddInManager/Src/ManagerForm.cs
Unescape View File

@ -11,7 +11,9 @@ using System.Drawing; @@ -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 @@ -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;

6
samples/ICSharpCode.Core.Demo/Base/Base.csproj
Unescape View File

@ -63,5 +63,11 @@ @@ -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>

5
samples/ICSharpCode.Core.Demo/Base/FileViewContent.cs
Unescape View File

@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
using System;
using System.Text;
using System.Windows.Forms;
using ICSharpCode.Core;
namespace Base
@ -99,11 +100,11 @@ 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);
}

6
samples/ICSharpCode.Core.Demo/Base/IDisplayBinding.cs
Unescape View File

@ -2,7 +2,7 @@ @@ -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 @@ -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);

4
samples/ICSharpCode.Core.Demo/Base/Workbench.cs
Unescape View File

@ -3,9 +3,9 @@ @@ -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
{

12
samples/ICSharpCode.Core.Demo/ICSharpCode.Core.Demo.sln
Unescape View File

@ -1,5 +1,7 @@ @@ -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 @@ -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 @@ -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

30
samples/Mono/Mono.AddIn.sln
Unescape View File

@ -1,7 +1,7 @@ @@ -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 @@ -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

4
samples/NAnt/NAnt.AddIn/NAnt.AddIn.csproj
Unescape View File

@ -38,6 +38,10 @@ @@ -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>

15
samples/NAnt/NAnt.AddIn/Src/Gui/NAntPadContent.cs
Unescape View File

@ -28,6 +28,7 @@ @@ -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;
@ -46,7 +47,7 @@ namespace ICSharpCode.NAnt.Gui @@ -46,7 +47,7 @@ namespace ICSharpCode.NAnt.Gui
bool disposed;
public NAntPadContent()
{
{
LoggingService.Debug("NAntPadContent.ctor");
// Create main panel.
contentPanel = new Panel();
@ -66,7 +67,7 @@ namespace ICSharpCode.NAnt.Gui @@ -66,7 +67,7 @@ namespace ICSharpCode.NAnt.Gui
// Tooltip.
ToolTip toolTip = new ToolTip();
toolTip.SetToolTip(textBox, StringParser.Parse("Enter NAnt properties."));
toolTip.SetToolTip(textBox, StringParser.Parse("Enter NAnt properties."));
contentPanel.Controls.Add(treeView);
contentPanel.Controls.Add(toolStrip);
@ -105,7 +106,7 @@ namespace ICSharpCode.NAnt.Gui @@ -105,7 +106,7 @@ namespace ICSharpCode.NAnt.Gui
PadDescriptor descriptor = WorkbenchSingleton.Workbench.GetPad(typeof(NAntPadContent));
return (NAntPadContent)descriptor.PadContent;
}
}
}
/// <summary>
/// Refreshes the contents NAnt pad.
@ -172,7 +173,7 @@ namespace ICSharpCode.NAnt.Gui @@ -172,7 +173,7 @@ namespace ICSharpCode.NAnt.Gui
disposed = true;
treeView.Dispose();
contentPanel.Dispose();
contentPanel.Dispose();
ProjectService.SolutionLoaded -= SolutionLoaded;
ProjectService.SolutionClosed -= SolutionClosed;
@ -192,7 +193,7 @@ namespace ICSharpCode.NAnt.Gui @@ -192,7 +193,7 @@ namespace ICSharpCode.NAnt.Gui
}
}
#endregion
#endregion
void SolutionClosed(object sender, EventArgs e)
{
@ -204,7 +205,7 @@ namespace ICSharpCode.NAnt.Gui @@ -204,7 +205,7 @@ namespace ICSharpCode.NAnt.Gui
{
LoggingService.Debug("SolutionLoaded.");
AddSolutionToPad(e.Solution);
}
}
void AddSolutionToPad(Solution solution)
{
@ -251,7 +252,7 @@ namespace ICSharpCode.NAnt.Gui @@ -251,7 +252,7 @@ namespace ICSharpCode.NAnt.Gui
}
}
}
void ProjectItemRemoved(object sender, ProjectItemEventArgs e)
{
LoggingService.Debug("ProjectItemRemoved.");

36
samples/NAnt/NAnt.AddIn/Src/Gui/NAntPadTreeView.cs
Unescape View File

@ -31,8 +31,8 @@ using System.IO; @@ -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
@ -62,7 +62,7 @@ namespace ICSharpCode.NAnt.Gui @@ -62,7 +62,7 @@ namespace ICSharpCode.NAnt.Gui
NAntPadTreeViewState state = NAntPadTreeViewState.Nothing;
delegate void AddSolutionInvoker(Solution solution);
public NAntPadTreeView()
{
//
@ -95,7 +95,7 @@ namespace ICSharpCode.NAnt.Gui @@ -95,7 +95,7 @@ namespace ICSharpCode.NAnt.Gui
MethodInvoker invoker = new MethodInvoker(Clear);
Invoke(invoker);
} else {
treeView.Nodes.Clear();
treeView.Nodes.Clear();
}
}
@ -126,7 +126,7 @@ namespace ICSharpCode.NAnt.Gui @@ -126,7 +126,7 @@ namespace ICSharpCode.NAnt.Gui
Debug.Assert(!InvokeRequired, "AddProject InvokeRequired");
foreach (ProjectItem projectItem in project.Items) {
if (NAntBuildFile.IsBuildFile(projectItem.FileName)) {
if (NAntBuildFile.IsBuildFile(projectItem.FileName)) {
AddBuildFile(project.Name, projectItem.FileName);
}
}
@ -177,15 +177,15 @@ namespace ICSharpCode.NAnt.Gui @@ -177,15 +177,15 @@ namespace ICSharpCode.NAnt.Gui
} else {
AddBuildFile(String.Empty, fileName);
}
}
}
/// <summary>
/// Adds a build file to the tree.
/// </summary>
/// <param name="projectName">The name of the project.</param>
/// <param name="fileName">The build file name.</param>
/// <param name="debug"><see langword="true"/> if the project's
/// active configuration is debug; <see langword="false"/>
/// <param name="debug"><see langword="true"/> if the project's
/// active configuration is debug; <see langword="false"/>
/// otherwise.</param>
public void AddBuildFile(string projectName, string fileName)
{
@ -196,7 +196,7 @@ namespace ICSharpCode.NAnt.Gui @@ -196,7 +196,7 @@ namespace ICSharpCode.NAnt.Gui
NAntBuildFileTreeNode node = new NAntBuildFileTreeNode(projectName, buildFile);
treeView.Nodes.Add(node);
}
}
}
/// <summary>
/// Gets the currently selected <see cref="NAntBuildFile"/>.
@ -218,7 +218,7 @@ namespace ICSharpCode.NAnt.Gui @@ -218,7 +218,7 @@ namespace ICSharpCode.NAnt.Gui
} else if(selectedNode is NAntBuildFileErrorTreeNode) {
NAntBuildFileErrorTreeNode errorNode = (NAntBuildFileErrorTreeNode)selectedNode;
NAntBuildFileTreeNode buildNode = (NAntBuildFileTreeNode)errorNode.Parent;
buildFile = buildNode.BuildFile;
buildFile = buildNode.BuildFile;
}
return buildFile;
@ -240,7 +240,7 @@ namespace ICSharpCode.NAnt.Gui @@ -240,7 +240,7 @@ namespace ICSharpCode.NAnt.Gui
return target;
}
}
}
/// <summary>
/// Gets the current selected <see cref="NAntBuildFileError"/>
@ -255,7 +255,7 @@ namespace ICSharpCode.NAnt.Gui @@ -255,7 +255,7 @@ namespace ICSharpCode.NAnt.Gui
error = errorNode.Error;
}
return error;
return error;
}
}
@ -318,11 +318,11 @@ namespace ICSharpCode.NAnt.Gui @@ -318,11 +318,11 @@ namespace ICSharpCode.NAnt.Gui
state = NAntPadTreeViewState.Nothing;
if (IsBuildFileNodeSelected) {
state = NAntPadTreeViewState.BuildFileSelected;
}
}
if (IsBuildTargetNodeSelected) {
state = NAntPadTreeViewState.TargetSelected;
}
}
if (IsBuildFileErrorNodeSelected) {
state = NAntPadTreeViewState.ErrorSelected;
@ -345,7 +345,7 @@ namespace ICSharpCode.NAnt.Gui @@ -345,7 +345,7 @@ namespace ICSharpCode.NAnt.Gui
get {
return treeView.SelectedNode is NAntBuildTargetTreeNode;
}
}
}
/// <summary>
/// Gets whether a build file error is selected.
@ -354,7 +354,7 @@ namespace ICSharpCode.NAnt.Gui @@ -354,7 +354,7 @@ namespace ICSharpCode.NAnt.Gui
get {
return treeView.SelectedNode is NAntBuildFileErrorTreeNode;
}
}
}
/// <summary>
/// Double clicking a node on the tree view opens the corresponding
@ -372,8 +372,8 @@ namespace ICSharpCode.NAnt.Gui @@ -372,8 +372,8 @@ namespace ICSharpCode.NAnt.Gui
if (IsBuildTargetNodeSelected) {
FileService.JumpToFilePosition(fileName, SelectedTarget.Line, SelectedTarget.Column);
} else if (IsBuildFileErrorNodeSelected) {
FileService.JumpToFilePosition(fileName, SelectedError.Line, SelectedError.Column);
} else {
FileService.JumpToFilePosition(fileName, SelectedError.Line, SelectedError.Column);
} else {
FileService.OpenFile(fileName);
}
}
@ -390,7 +390,7 @@ namespace ICSharpCode.NAnt.Gui @@ -390,7 +390,7 @@ namespace ICSharpCode.NAnt.Gui
{
foreach (NAntBuildFileTreeNode node in treeView.Nodes) {
string nodeFileName = Path.Combine(node.BuildFile.Directory, node.BuildFile.FileName);
if (String.Compare(Path.GetFullPath(fileName), Path.GetFullPath(nodeFileName), true) == 0) {
if (String.Compare(Path.GetFullPath(fileName), Path.GetFullPath(nodeFileName), true) == 0) {
return node;
}
}

27
samples/SharpSnippetCompiler/SharpSnippetCompiler/MainForm.cs
Unescape View File

@ -28,7 +28,6 @@ @@ -28,7 +28,6 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Windows.Forms;
@ -36,20 +35,20 @@ using ICSharpCode.SharpDevelop.Commands; @@ -36,20 +35,20 @@ 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
{
public partial class MainForm : Form
{
{
public MainForm()
{
{
//
// The InitializeComponent() call is required for Windows Forms designer support.
//
InitializeComponent();
}
InitializeComponent();
}
public Control ErrorList {
get {
@ -58,7 +57,7 @@ namespace ICSharpCode.SharpSnippetCompiler @@ -58,7 +57,7 @@ namespace ICSharpCode.SharpSnippetCompiler
}
return null;
}
set {
set {
errorsTabPage.Controls.Clear();
value.Dock = DockStyle.Fill;
errorsTabPage.Controls.Add(value);
@ -72,7 +71,7 @@ namespace ICSharpCode.SharpSnippetCompiler @@ -72,7 +71,7 @@ namespace ICSharpCode.SharpSnippetCompiler
}
return null;
}
set {
set {
outputTabPage.Controls.Clear();
value.Dock = DockStyle.Fill;
outputTabPage.Controls.Add(value);
@ -94,7 +93,7 @@ namespace ICSharpCode.SharpSnippetCompiler @@ -94,7 +93,7 @@ namespace ICSharpCode.SharpSnippetCompiler
public void LoadFile(string fileName)
{
// Create a new tab page.
// Create a new tab page.
SharpSnippetCompilerControl snippetControl = new SharpSnippetCompilerControl();
snippetControl.Dock = DockStyle.Fill;
SnippetTabPage tabPage = new SnippetTabPage(snippetControl);
@ -128,7 +127,7 @@ namespace ICSharpCode.SharpSnippetCompiler @@ -128,7 +127,7 @@ namespace ICSharpCode.SharpSnippetCompiler
SaveAll();
Close();
}
void BuildCurrentToolStripMenuItemClick(object sender, EventArgs e)
{
SaveAll();
@ -219,7 +218,7 @@ namespace ICSharpCode.SharpSnippetCompiler @@ -219,7 +218,7 @@ namespace ICSharpCode.SharpSnippetCompiler
{
IProject project = ProjectService.CurrentProject;
using (SelectReferenceDialog referenceDialog = new SelectReferenceDialog(project)) {
// Add existing project references to dialog.
List<ReferenceProjectItem> references = GetReferences(project);
AddReferences(referenceDialog as ISelectReferenceDialog, references);
@ -238,11 +237,9 @@ namespace ICSharpCode.SharpSnippetCompiler @@ -238,11 +237,9 @@ 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();
project.Save();
}
}
}

9
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/CodeGenerator.cs
Unescape View File

@ -717,14 +717,5 @@ namespace ICSharpCode.SharpDevelop.Dom.Refactoring @@ -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;
}
}
}

Write Preview
Loading…
Cancel
Save