diff options
Diffstat (limited to 'main/src/addins/ChangeLogAddIn')
4 files changed, 9 insertions, 9 deletions
diff --git a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.addin.xml b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.addin.xml index 226b186130..1af14056ce 100644 --- a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.addin.xml +++ b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.addin.xml @@ -17,7 +17,7 @@ <Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels/VersionControl">
<ComplexCondition>
<Or>
- <Condition id="ItemType" value="SolutionItem" />
+ <Condition id="ItemType" value="SolutionFolderItem" />
<Condition id="ItemType" value="Solution" />
</Or>
<Section id = "ChangeLogIntegration" _label = "ChangeLog Integration" fill="true" class="MonoDevelop.ChangeLogAddIn.ProjectOptionPanel" />
diff --git a/main/src/addins/ChangeLogAddIn/ChangeLogService.cs b/main/src/addins/ChangeLogAddIn/ChangeLogService.cs index 587bb5db7c..25581a2cf2 100644 --- a/main/src/addins/ChangeLogAddIn/ChangeLogService.cs +++ b/main/src/addins/ChangeLogAddIn/ChangeLogService.cs @@ -38,7 +38,7 @@ namespace MonoDevelop.ChangeLogAddIn // Returns the path of the ChangeLog where changes of the provided file have to be logged. // Returns null if no ChangeLog could be found. // Returns an empty string if changes don't have to be logged. - public static string GetChangeLogForFile (string baseCommitPath, FilePath file, out SolutionItem parentEntry, out ChangeLogPolicy policy) + public static string GetChangeLogForFile (string baseCommitPath, FilePath file, out SolutionFolderItem parentEntry, out ChangeLogPolicy policy) { parentEntry = null; policy = null; @@ -50,7 +50,7 @@ namespace MonoDevelop.ChangeLogAddIn string bestPath = null; file = file.CanonicalPath; - foreach (SolutionItem e in IdeApp.Workspace.GetAllSolutionItems ()) { + foreach (SolutionFolderItem e in IdeApp.Workspace.GetAllSolutionItems ()) { if (e is Project && ((Project)e).Files.GetFile (file) != null) { parentEntry = e; break; @@ -108,18 +108,18 @@ namespace MonoDevelop.ChangeLogAddIn public static string GetChangeLogForFile (string baseCommitPath, string file) { - SolutionItem parentEntry; + SolutionFolderItem parentEntry; ChangeLogPolicy policy; return GetChangeLogForFile (baseCommitPath, file, out parentEntry, out policy); } - public static CommitMessageStyle GetMessageStyle (SolutionItem item) + public static CommitMessageStyle GetMessageStyle (SolutionFolderItem item) { ChangeLogPolicy policy = item != null ? GetPolicy (item) : new ChangeLogPolicy (); return policy.MessageStyle; } - static ChangeLogPolicy GetPolicy (SolutionItem item) + static ChangeLogPolicy GetPolicy (SolutionFolderItem item) { return item.Policies.Get<ChangeLogPolicy> (); } diff --git a/main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs b/main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs index e5e8b5b266..3b7d78f0b9 100644 --- a/main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs +++ b/main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs @@ -156,7 +156,7 @@ namespace MonoDevelop.ChangeLogAddIn } if (!cset.ContainsFile (ce.File)) { if (!cset.Repository.GetVersionInfo (ce.File).IsVersioned) - cset.Repository.Add (ce.File, false, new MonoDevelop.Core.ProgressMonitoring.NullProgressMonitor ()); + cset.Repository.Add (ce.File, false, new MonoDevelop.Core.ProgressMonitor ()); cset.AddFile (ce.File); } } @@ -226,7 +226,7 @@ namespace MonoDevelop.ChangeLogAddIn requireComment = false; foreach (ChangeSetItem item in cset.Items) { - SolutionItem parentItem; + SolutionFolderItem parentItem; ChangeLogPolicy policy; string logf = ChangeLogService.GetChangeLogForFile (cset.BaseLocalPath, item.LocalPath, out parentItem, out policy); diff --git a/main/src/addins/ChangeLogAddIn/ProjectOptionPanelWidget.cs b/main/src/addins/ChangeLogAddIn/ProjectOptionPanelWidget.cs index 1492307f2b..777de0e1e4 100644 --- a/main/src/addins/ChangeLogAddIn/ProjectOptionPanelWidget.cs +++ b/main/src/addins/ChangeLogAddIn/ProjectOptionPanelWidget.cs @@ -68,7 +68,7 @@ namespace MonoDevelop.ChangeLogAddIn format.MaxColumns = 70; format.Style = style; - SolutionItem item = null; + SolutionFolderItem item = null; if (parent.ConfiguredSolutionItem != null) item = parent.ConfiguredSolutionItem; else if (parent.ConfiguredSolution != null) |