re-structure files

IvoKrugers · IvoKrugers · commit 3c453280feed · 2022-04-08T16:27:26.000+02:00
diff --git a/VisualStudioMac.OneClickToOpenFile/CommandHandlers/Node/OneClickNodeCommandHandler.cs b/VisualStudioMac.OneClickToOpenFile/CommandHandlers/Node/OneClickNodeCommandHandler.cs
@@ -4,7 +4,7 @@
 using MonoDevelop.Ide.Gui.Components;
 using MonoDevelop.Projects;
 
-namespace VisualStudioMac.OneClickToOpenFile
+namespace VisualStudioMac.OneClickToOpenFile.CommandHandlers.Node
 {
     public class OneClickNodeCommandHandler : NodeCommandHandler
     {
diff --git a/VisualStudioMac.OneClickToOpenFile/NodeBuilderExtensions/OneClickFileNodeBuilderExt.cs b/VisualStudioMac.OneClickToOpenFile/NodeBuilderExtensions/OneClickFileNodeBuilderExt.cs
@@ -1,19 +1,15 @@
 ﻿using System;
 using System.IO;
 using MonoDevelop.Ide.Gui.Components;
-using MonoDevelop.Ide.Gui.Pads.ProjectPad;
 using MonoDevelop.Projects;
+using VisualStudioMac.OneClickToOpenFile.CommandHandlers.Node;
 
-namespace VisualStudioMac.OneClickToOpenFile
+namespace VisualStudioMac.OneClickToOpenFile.NodeBuilderExtensions
 {
     public class OneClickFileNodeBuilderExt : NodeBuilderExtension
     {
         public override bool CanBuildNode(Type dataType)
-        {
-            var canBuild = typeof(ProjectFile).IsAssignableFrom(dataType);
-
-            return canBuild;
-        }
+            => typeof(ProjectFile).IsAssignableFrom(dataType);
 
         public override void BuildNode(ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
         {
@@ -22,12 +18,15 @@ public override void BuildNode(ITreeBuilder treeBuilder, object dataObject, Node
                 var ext = Path.GetExtension(file.FilePath);
                 if (Constants.ExcludedExtensionsFromOneClick.FindIndex((s) => s == ext) == -1)
                 {
-                    nodeInfo.Label = $"{nodeInfo.Label} {Constants.OneClickChar}";
+                    if (!nodeInfo.Label.Contains(Constants.OneClickChar))
+                    {
+                        nodeInfo.Label = $"{nodeInfo.Label} {Constants.OneClickChar}";
+                    }
                 }
             }
         }
 
         public override Type CommandHandlerType
             => typeof(OneClickNodeCommandHandler);
     }
-}
+}
diff --git a/VisualStudioMac.OneClickToOpenFile/Properties/AddinInfo.cs b/VisualStudioMac.OneClickToOpenFile/Properties/AddinInfo.cs
@@ -9,7 +9,7 @@
     Category = "IDE extensions"
 )]
 
-[assembly: AddinName("_Ivo: One Click To Open File")]
+[assembly: AddinName("_One Click To Open File")]
 [assembly: AddinDescription("This extension opens a file with only one click on the solutiontree.\n\nby Ivo Krugers")]
 [assembly: AddinAuthor("Ivo Krugers")]
 [assembly: AddinUrl("https://github.com/IvoKrugers/EssentialsAddin")]
diff --git a/VisualStudioMac.OneClickToOpenFile/Properties/VisualStudioMac.OneClickToOpenFile.addin.xml b/VisualStudioMac.OneClickToOpenFile/Properties/VisualStudioMac.OneClickToOpenFile.addin.xml
@@ -6,6 +6,6 @@
 
 	<!-- ProjectPad NodeBuilders -->
 	<Extension path="/MonoDevelop/Ide/Pads/ProjectPad">
-		<NodeBuilder class="VisualStudioMac.OneClickToOpenFile.OneClickFileNodeBuilderExt" />
+		<NodeBuilder class="VisualStudioMac.OneClickToOpenFile.NodeBuilderExtensions.OneClickFileNodeBuilderExt" />
 	</Extension>
 </ExtensionModel>

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using MonoDevelop.Ide.Gui.Components;`
`5`	`5`	`using MonoDevelop.Projects;`
`6`	`6`
`7`		`-namespace VisualStudioMac.OneClickToOpenFile`
	`7`	`+namespace VisualStudioMac.OneClickToOpenFile.CommandHandlers.Node`
`8`	`8`	`{`
`9`	`9`	`public class OneClickNodeCommandHandler : NodeCommandHandler`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,15 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.IO;`
`3`	`3`	`using MonoDevelop.Ide.Gui.Components;`
`4`		`-using MonoDevelop.Ide.Gui.Pads.ProjectPad;`
`5`	`4`	`using MonoDevelop.Projects;`
	`5`	`+using VisualStudioMac.OneClickToOpenFile.CommandHandlers.Node;`
`6`	`6`
`7`		`-namespace VisualStudioMac.OneClickToOpenFile`
	`7`	`+namespace VisualStudioMac.OneClickToOpenFile.NodeBuilderExtensions`
`8`	`8`	`{`
`9`	`9`	`public class OneClickFileNodeBuilderExt : NodeBuilderExtension`
`10`	`10`	`{`
`11`	`11`	`public override bool CanBuildNode(Type dataType)`
`12`		`- {`
`13`		`- var canBuild = typeof(ProjectFile).IsAssignableFrom(dataType);`
`14`		`-`
`15`		`- return canBuild;`
`16`		`- }`
	`12`	`+ => typeof(ProjectFile).IsAssignableFrom(dataType);`
`17`	`13`
`18`	`14`	`public override void BuildNode(ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)`
`19`	`15`	`{`
`@@ -22,12 +18,15 @@ public override void BuildNode(ITreeBuilder treeBuilder, object dataObject, Node`
`22`	`18`	`var ext = Path.GetExtension(file.FilePath);`
`23`	`19`	`if (Constants.ExcludedExtensionsFromOneClick.FindIndex((s) => s == ext) == -1)`
`24`	`20`	`{`
`25`		`- nodeInfo.Label = $"{nodeInfo.Label} {Constants.OneClickChar}";`
	`21`	`+ if (!nodeInfo.Label.Contains(Constants.OneClickChar))`
	`22`	`+ {`
	`23`	`+ nodeInfo.Label = $"{nodeInfo.Label} {Constants.OneClickChar}";`
	`24`	`+ }`
`26`	`25`	`}`
`27`	`26`	`}`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`public override Type CommandHandlerType`
`31`	`30`	`=> typeof(OneClickNodeCommandHandler);`
`32`	`31`	`}`
`33`		`-}`
	`32`	`+}`