Branch: refs/heads/master
Home: https://github.com/mono/monodevelop
Compare: https://github.com/mono/monodevelop/compare/dc227b8c6495...fe0d6f373afb
Commit: 50ed6f3ee1b014bc676a2c5c7575a3e763e27b71
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-21 22:59:54 GMT
URL: https://github.com/mono/monodevelop/commit/50ed6f3ee1b014bc676a2c5c7575a3e763e27b71
[Version Control] Hide what's not API and seal most stuff.
The only thing left to do is sealing a demon. Or keeping me aaway from this.
Changed paths:
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/FilteredStatus.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanel.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSelectRevisionDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSupportFeature.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitUtil.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MyersDiff.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Stash.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient0.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient1.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnRevision.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlGeneralOptionsPanel.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffParser.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/SubviewAttachmentHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BaseView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BlameCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeLogWriter.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Commands.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CreatePatchCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultBlameViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultDiffViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultLogViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultMergeViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DiffCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LogCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/MergeCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ResolveConflictsCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnknownRepository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlConfiguration.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItem.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItemList.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlPolicy.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfo.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfoCache.cs
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs
===================================================================
@@ -65,7 +65,7 @@ protected override void Update (CommandInfo info)
}
}
- class PushCommandHandler: GitCommandHandler
+ sealed class PushCommandHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -73,7 +73,7 @@ protected override void Run ()
}
}
- class SwitchToBranchHandler: GitCommandHandler
+ sealed class SwitchToBranchHandler: GitCommandHandler
{
protected override void Run (object dataItem)
{
@@ -102,7 +102,7 @@ protected override void Update (CommandArrayInfo info)
}
}
- class ManageBranchesHandler: GitCommandHandler
+ sealed class ManageBranchesHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -110,7 +110,7 @@ protected override void Run ()
}
}
- class MergeBranchHandler: GitCommandHandler
+ sealed class MergeBranchHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -118,7 +118,7 @@ protected override void Run ()
}
}
- class RebaseBranchHandler: GitCommandHandler
+ sealed class RebaseBranchHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -126,7 +126,7 @@ protected override void Run ()
}
}
- class StashHandler: GitCommandHandler
+ sealed class StashHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -153,7 +153,7 @@ protected override void Run ()
}
}
- class StashPopHandler: GitCommandHandler
+ sealed class StashPopHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -187,7 +187,7 @@ protected override void Update (CommandInfo info)
}
}
- class ManageStashesHandler: GitCommandHandler
+ sealed class ManageStashesHandler: GitCommandHandler
{
protected override void Run ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/FilteredStatus.cs
===================================================================
@@ -34,7 +34,7 @@
namespace MonoDevelop.VersionControl.Git
{
- class FilteredStatus : NGit.Api.StatusCommand
+ sealed class FilteredStatus : NGit.Api.StatusCommand
{
WorkingTreeIterator iter;
IndexDiff diff;
@@ -76,7 +76,7 @@ public override NGit.Api.Status Call ()
return new NGit.Api.Status (diff);
}
- public virtual ICollection<string> GetIgnoredNotInIndex ()
+ public ICollection<string> GetIgnoredNotInIndex ()
{
return diff.GetIgnoredNotInIndex ();
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitCommitDialogExtension: CommitDialogExtension
+ public sealed class GitCommitDialogExtension: CommitDialogExtension
{
GitCommitDialogExtensionWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitCredentials: CredentialsProvider
+ public sealed class GitCredentials: CredentialsProvider
{
bool HasReset {
get; set;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs
===================================================================
@@ -33,7 +33,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitNodeBuilderExtension: NodeBuilderExtension
+ public sealed class GitNodeBuilderExtension: NodeBuilderExtension
{
readonly Dictionary<FilePath,IWorkspaceObject> repos = new Dictionary<FilePath, IWorkspaceObject> ();
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanel.cs
===================================================================
@@ -27,7 +27,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitOptionsPanel : OptionsPanel
+ public sealed class GitOptionsPanel : OptionsPanel
{
GitOptionsPanelWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
===================================================================
@@ -1713,7 +1713,7 @@ protected override void OnUnignore (FilePath[] localPath)
}
}
- public class GitRevision: Revision
+ public sealed class GitRevision: Revision
{
readonly string rev;
@@ -1753,13 +1753,13 @@ public override Revision GetPrevious ()
}
}
- public class Branch
+ public sealed class Branch
{
public string Name { get; internal set; }
public string Tracking { get; internal set; }
}
- public class RemoteSource
+ public sealed class RemoteSource
{
internal RemoteConfig RepoRemote;
internal StoredConfig cfg;
@@ -1800,7 +1800,7 @@ internal void Update ()
public string PushUrl { get; internal set; }
}
- class GitMonitor: ProgressMonitor, IDisposable
+ sealed class GitMonitor: ProgressMonitor, IDisposable
{
readonly IProgressMonitor monitor;
int currentWork;
@@ -1872,7 +1872,7 @@ public void Dispose ()
}
}
- class LocalGitRepository: FileRepository
+ sealed class LocalGitRepository: FileRepository
{
WeakReference dirCacheRef;
DateTime dirCacheTimestamp;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSelectRevisionDialog.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl.Git
{
- class GitSelectRevisionDialog : Xwt.Dialog
+ sealed class GitSelectRevisionDialog : Xwt.Dialog
{
readonly Xwt.TextEntry tagNameEntry;
readonly Xwt.TextEntry tagMessageEntry;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSupportFeature.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitSupportFeature: ISolutionItemFeature
+ public sealed class GitSupportFeature: ISolutionItemFeature
{
public FeatureSupportLevel GetSupportLevel (SolutionFolder parentFolder, SolutionItem entry)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitUtil.cs
===================================================================
@@ -41,7 +41,7 @@
namespace MonoDevelop.VersionControl.Git
{
- internal static class GitUtil
+ static class GitUtil
{
public static string ToGitPath (this NGit.Repository repo, FilePath filePath)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MyersDiff.cs
===================================================================
@@ -39,7 +39,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class MyersDiff : GitCommand<IList<DiffEntry>>
+ public sealed class MyersDiff : GitCommand<IList<DiffEntry>>
{
AbstractTreeIterator oldTree;
@@ -171,7 +171,7 @@ public override IList<DiffEntry> Call()
/// <param name="cached">whether to view the changes you staged for the next commit</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetCached(bool cached)
+ public MyersDiff SetCached(bool cached)
{
this.cached = cached;
return this;
@@ -179,7 +179,7 @@ public virtual MyersDiff SetCached(bool cached)
/// <param name="pathFilter">parameter, used to limit the diff to the named path</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetPathFilter(TreeFilter pathFilter)
+ public MyersDiff SetPathFilter(TreeFilter pathFilter)
{
this.pathFilter = pathFilter;
return this;
@@ -187,7 +187,7 @@ public virtual MyersDiff SetPathFilter(TreeFilter pathFilter)
/// <param name="oldTree">the previous state</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetOldTree(AbstractTreeIterator oldTree)
+ public MyersDiff SetOldTree(AbstractTreeIterator oldTree)
{
this.oldTree = oldTree;
return this;
@@ -195,7 +195,7 @@ public virtual MyersDiff SetOldTree(AbstractTreeIterator oldTree)
/// <param name="newTree">the updated state</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetNewTree(AbstractTreeIterator newTree)
+ public MyersDiff SetNewTree(AbstractTreeIterator newTree)
{
this.newTree = newTree;
return this;
@@ -204,7 +204,7 @@ public virtual MyersDiff SetNewTree(AbstractTreeIterator newTree)
/// <param name="showNameAndStatusOnly">whether to return only names and status of changed files
/// </param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetShowNameAndStatusOnly(bool showNameAndStatusOnly
+ public MyersDiff SetShowNameAndStatusOnly(bool showNameAndStatusOnly
)
{
this.showNameAndStatusOnly = showNameAndStatusOnly;
@@ -213,7 +213,7 @@ public virtual MyersDiff SetNewTree(AbstractTreeIterator newTree)
/// <param name="out">the stream to write line data</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetOutputStream(OutputStream @out)
+ public MyersDiff SetOutputStream(OutputStream @out)
{
this.@out = @out;
return this;
@@ -223,7 +223,7 @@ public virtual MyersDiff SetOutputStream(OutputStream @out)
/// <remarks>Set number of context lines instead of the usual three.</remarks>
/// <param name="contextLines">the number of context lines</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetContextLines(int contextLines)
+ public MyersDiff SetContextLines(int contextLines)
{
this.contextLines = contextLines;
return this;
@@ -233,7 +233,7 @@ public virtual MyersDiff SetContextLines(int contextLines)
/// <remarks>Set the given source prefix instead of "a/".</remarks>
/// <param name="sourcePrefix">the prefix</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetSourcePrefix(string sourcePrefix)
+ public MyersDiff SetSourcePrefix(string sourcePrefix)
{
this.sourcePrefix = sourcePrefix;
return this;
@@ -243,7 +243,7 @@ public virtual MyersDiff SetSourcePrefix(string sourcePrefix)
/// <remarks>Set the given destination prefix instead of "b/".</remarks>
/// <param name="destinationPrefix">the prefix</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetDestinationPrefix(string destinationPrefix
+ public MyersDiff SetDestinationPrefix(string destinationPrefix
)
{
this.destinationPrefix = destinationPrefix;
@@ -258,7 +258,7 @@ public virtual MyersDiff SetSourcePrefix(string sourcePrefix)
/// <seealso cref="NGit.NullProgressMonitor">NGit.NullProgressMonitor</seealso>
/// <param name="monitor">a progress monitor</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetProgressMonitor(ProgressMonitor monitor)
+ public MyersDiff SetProgressMonitor(ProgressMonitor monitor)
{
this.monitor = monitor;
return this;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Stash.cs
===================================================================
@@ -38,7 +38,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class Stash
+ public sealed class Stash
{
internal string CommitId { get; private set; }
internal string FullLine { get; private set; }
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs
===================================================================
@@ -64,7 +64,7 @@ public IntPtr pcalloc (IntPtr pool, object structure)
public const int APR_OS_START_USEERR = APR_OS_START_USERERR;
}
- public class LibApr0: LibApr
+ public sealed class LibApr0: LibApr
{
private const string aprlib = "libapr-0.so.0";
@@ -97,7 +97,7 @@ public class LibApr0: LibApr
[DllImport(aprlib)] static extern int apr_file_close (IntPtr file);
}
- public class LibApr1: LibApr
+ public sealed class LibApr1: LibApr
{
private const string aprlib = "libapr-1.so.0";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient0.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Subversion.Unix {
- public class LibSvnClient0 : LibSvnClient {
+ public sealed class LibSvnClient0 : LibSvnClient {
private const string svnclientlib = "libsvn_client-1.so.0";
public override IntPtr client_root_url_from_path (ref IntPtr url, string path_or_url, IntPtr ctx, IntPtr pool)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient1.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Subversion.Unix {
- public class LibSvnClient1 : LibSvnClient {
+ public sealed class LibSvnClient1 : LibSvnClient {
private const string svnclientlib = "libsvn_client-1.so.1";
public override IntPtr client_root_url_from_path (ref IntPtr url, string path_or_url, IntPtr ctx, IntPtr pool)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnRevision.cs
===================================================================
@@ -28,7 +28,7 @@
namespace MonoDevelop.VersionControl.Subversion
{
- public class SvnRevision : Revision
+ public sealed class SvnRevision : Revision
{
public readonly int Rev;
public readonly int Kind;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlGeneralOptionsPanel.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionControlGeneralOptionsPanel : OptionsPanel
+ public sealed class VersionControlGeneralOptionsPanel : OptionsPanel
{
Xwt.CheckBox disableVersionControl;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionControlPolicyPanel: PolicyOptionsPanel<VersionControlPolicy>
+ public sealed class VersionControlPolicyPanel: PolicyOptionsPanel<VersionControlPolicy>
{
CommitMessageStylePanelWidget widget;
CommitMessageFormat format;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs
===================================================================
@@ -34,7 +34,7 @@ public interface IBlameView : IAttachableViewContent
{
}
- internal class BlameView : BaseView, IBlameView, IUndoHandler, IClipboardHandler
+ sealed class BlameView : BaseView, IBlameView, IUndoHandler, IClipboardHandler
{
BlameWidget widget;
VersionControlDocumentInfo info;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
===================================================================
@@ -44,7 +44,7 @@ public enum BlameCommands {
ShowLog
}
- public class BlameWidget : Bin
+ public sealed class BlameWidget : Bin
{
Adjustment vAdjustment;
Gtk.VScrollbar vScrollBar;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
===================================================================
@@ -10,7 +10,7 @@
namespace MonoDevelop.VersionControl.Views
{
[System.ComponentModel.ToolboxItem (true)]
- public class ChangeSetView: ScrolledWindow
+ public sealed class ChangeSetView: ScrolledWindow
{
bool disposed;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
===================================================================
@@ -39,7 +39,7 @@
namespace MonoDevelop.VersionControl.Views
{
[ToolboxItem (true)]
- public class ComparisonWidget : EditorCompareWidgetBase
+ public sealed class ComparisonWidget : EditorCompareWidgetBase
{
internal DropDownBox originalComboBox, diffComboBox;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffParser.cs
===================================================================
@@ -38,7 +38,7 @@ namespace MonoDevelop.VersionControl.Views
/// <summary>
/// Parser for unified diffs
/// </summary>
- public class DiffParser : TypeSystemParser
+ public sealed class DiffParser : TypeSystemParser
{
// Match the original file and time/revstamp line, capturing the filepath and the stamp
static Regex fileHeaderExpression = new Regex (@"^---\s+(?<filepath>[^\t]+)\t(?<stamp>.*)$", RegexOptions.Compiled);
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
===================================================================
@@ -35,7 +35,7 @@ public interface IDiffView : IAttachableViewContent
{
}
- public class DiffView : BaseView, IDiffView, IUndoHandler, IClipboardHandler
+ sealed class DiffView : BaseView, IDiffView, IUndoHandler, IClipboardHandler
{
DiffWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
===================================================================
@@ -35,7 +35,7 @@ namespace MonoDevelop.VersionControl.Views
//FIXME: re-merge this with MonoDevelop.Components.DropDownBox
[Category ("Widgets")]
[ToolboxItem (true)]
- public class DropDownBox : Gtk.Button
+ public sealed class DropDownBox : Gtk.Button
{
Pango.Layout layout;
const int pixbufSpacing = 2;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
===================================================================
@@ -13,7 +13,7 @@ public interface ILogView : IAttachableViewContent
{
}
- public class LogView : BaseView, ILogView
+ sealed class LogView : BaseView, ILogView
{
LogWidget widget;
VersionInfo vinfo;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs
===================================================================
@@ -32,7 +32,7 @@ public interface IMergeView : IAttachableViewContent
{
}
- class MergeView : BaseView, IMergeView
+ sealed class MergeView : BaseView, IMergeView
{
VersionControlDocumentInfo info;
MergeWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
===================================================================
@@ -36,7 +36,7 @@
namespace MonoDevelop.VersionControl.Views
{
- public class MergeWidget : EditorCompareWidgetBase
+ public sealed class MergeWidget : EditorCompareWidgetBase
{
protected override TextEditor MainEditor {
get {
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
===================================================================
@@ -19,7 +19,7 @@
namespace MonoDevelop.VersionControl.Views
{
- internal class StatusView : BaseView
+ sealed class StatusView : BaseView
{
string filepath;
Repository vc;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/SubviewAttachmentHandler.cs
===================================================================
@@ -34,7 +34,7 @@
namespace MonoDevelop.VersionControl.Views
{
- class SubviewAttachmentHandler : CommandHandler
+ sealed class SubviewAttachmentHandler : CommandHandler
{
protected override void Run ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs
===================================================================
@@ -4,7 +4,7 @@
namespace MonoDevelop.VersionControl
{
- internal class AddCommand
+ sealed class AddCommand
{
public static bool Add (VersionControlItemList items, bool test)
{
@@ -17,7 +17,7 @@ public static bool Add (VersionControlItemList items, bool test)
return true;
}
- private class AddWorker : Task {
+ class AddWorker : Task {
VersionControlItemList items;
public AddWorker (VersionControlItemList items)
@@ -92,7 +92,7 @@ protected override void Run ()
//
// }
- internal class RemoveCommand
+ sealed class RemoveCommand
{
public static bool Remove (VersionControlItemList items, bool test)
{
@@ -108,7 +108,7 @@ public static bool Remove (VersionControlItemList items, bool test)
return true;
}
- private class RemoveWorker : Task {
+ class RemoveWorker : Task {
VersionControlItemList items;
public RemoveWorker (VersionControlItemList items) {
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BaseView.cs
===================================================================
@@ -4,11 +4,11 @@
namespace MonoDevelop.VersionControl
{
- public abstract class BaseView : AbstractBaseViewContent, IViewContent
+ abstract class BaseView : AbstractBaseViewContent, IViewContent
{
string name;
- public BaseView (string name)
+ protected BaseView (string name)
{
this.name = name;
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BlameCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public class BlameCommand
+ static class BlameCommand
{
internal static readonly string BlameViewHandlers = "/MonoDevelop/VersionControl/BlameViewHandler";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeLogWriter.cs
===================================================================
@@ -36,10 +36,10 @@
namespace MonoDevelop.VersionControl
{
- class ChangeLogWriter
+ sealed class ChangeLogWriter
{
- private Dictionary<string, List<string>> messages = new Dictionary<string, List<string>> ();
- private string changelog_path;
+ Dictionary<string, List<string>> messages = new Dictionary<string, List<string>> ();
+ string changelog_path;
AuthorInformation uinfo;
public ChangeLogWriter (string path, AuthorInformation uinfo)
@@ -69,7 +69,7 @@ public void AddFile (string message, string path)
}
}
- private string GetRelativeEntryPath (string path)
+ string GetRelativeEntryPath (string path)
{
if (!path.StartsWith (changelog_path, System.StringComparison.Ordinal)) {
return null;
@@ -85,13 +85,13 @@ public override string ToString ()
CommitMessageStyle message_style = MessageFormat.Style;
- TextFormatter formatter = new TextFormatter ();
+ var formatter = new TextFormatter ();
formatter.MaxColumns = MessageFormat.MaxColumns;
formatter.TabWidth = MessageFormat.TabWidth;
formatter.TabsAsSpaces = MessageFormat.TabsAsSpaces;
if (message_style.Header.Length > 0) {
- string [,] tags = new string[,] { {"AuthorName", uinfo.Name}, {"AuthorEmail", uinfo.Email} };
+ string [,] tags = { {"AuthorName", uinfo.Name}, {"AuthorEmail", uinfo.Email} };
formatter.Append (StringParserService.Parse (message_style.Header, tags));
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
===================================================================
@@ -5,7 +5,7 @@
namespace MonoDevelop.VersionControl
{
- internal class CheckoutCommand : CommandHandler
+ sealed class CheckoutCommand : CommandHandler
{
protected override void Update (CommandInfo info)
{
@@ -25,79 +25,79 @@ protected override void Run()
del.Destroy ();
}
}
- }
-
- class CheckoutWorker : Task
- {
- Repository vc;
- string path;
-
- public CheckoutWorker (Repository vc, string path)
- {
- this.vc = vc;
- this.path = path;
- OperationType = VersionControlOperationType.Pull;
- }
-
- protected override string GetDescription ()
- {
- return GettextCatalog.GetString ("Checking out {0}...", path);
- }
-
- protected override IProgressMonitor CreateProgressMonitor ()
- {
- return new MonoDevelop.Core.ProgressMonitoring.AggregatedProgressMonitor (
- base.CreateProgressMonitor (),
- new MonoDevelop.Ide.ProgressMonitoring.MessageDialogProgressMonitor (true, true, true, true)
- );
- }
-
- protected override void Run ()
+
+ class CheckoutWorker : Task
{
- vc.Checkout (path, null, true, Monitor);
- if (Monitor.IsCancelRequested) {
- Monitor.ReportSuccess (GettextCatalog.GetString ("Checkout operation cancelled"));
- return;
- }
+ Repository vc;
+ string path;
- if (!System.IO.Directory.Exists (path)) {
- Monitor.ReportError (GettextCatalog.GetString ("Checkout folder does not exist"), null);
- return;
+ public CheckoutWorker (Repository vc, string path)
+ {
+ this.vc = vc;
+ this.path = path;
+ OperationType = VersionControlOperationType.Pull;
}
- string projectFn = null;
-
- string[] list = System.IO.Directory.GetFiles(path);
- foreach (string str in list ) {
- if (str.EndsWith (".mds", System.StringComparison.Ordinal)) {
- projectFn = str;
- break;
- }
+ protected override string GetDescription ()
+ {
+ return GettextCatalog.GetString ("Checking out {0}...", path);
}
- if ( projectFn == null ) {
- foreach ( string str in list ) {
- if (str.EndsWith (".mdp", System.StringComparison.Ordinal)) {
- projectFn = str;
- break;
- }
- }
+
+ protected override IProgressMonitor CreateProgressMonitor ()
+ {
+ return new MonoDevelop.Core.ProgressMonitoring.AggregatedProgressMonitor (
+ base.CreateProgressMonitor (),
+ new MonoDevelop.Ide.ProgressMonitoring.MessageDialogProgressMonitor (true, true, true, true)
+ );
}
- if ( projectFn == null ) {
+
+ protected override void Run ()
+ {
+ vc.Checkout (path, null, true, Monitor);
+ if (Monitor.IsCancelRequested) {
+ Monitor.ReportSuccess (GettextCatalog.GetString ("Checkout operation cancelled"));
+ return;
+ }
+
+ if (!System.IO.Directory.Exists (path)) {
+ Monitor.ReportError (GettextCatalog.GetString ("Checkout folder does not exist"), null);
+ return;
+ }
+
+ string projectFn = null;
+
+ string[] list = System.IO.Directory.GetFiles(path);
foreach (string str in list ) {
- if (MonoDevelop.Projects.Services.ProjectService.IsWorkspaceItemFile (str)) {
+ if (str.EndsWith (".mds", System.StringComparison.Ordinal)) {
projectFn = str;
break;
}
- }
- }
-
- if (projectFn != null) {
- DispatchService.GuiDispatch (delegate {
- IdeApp.Workspace.OpenWorkspaceItem (projectFn);
- });
+ }
+ if ( projectFn == null ) {
+ foreach ( string str in list ) {
+ if (str.EndsWith (".mdp", System.StringComparison.Ordinal)) {
+ projectFn = str;
+ break;
+ }
+ }
+ }
+ if ( projectFn == null ) {
+ foreach (string str in list ) {
+ if (MonoDevelop.Projects.Services.ProjectService.IsWorkspaceItemFile (str)) {
+ projectFn = str;
+ break;
+ }
+ }
+ }
+
+ if (projectFn != null) {
+ DispatchService.GuiDispatch (delegate {
+ IdeApp.Workspace.OpenWorkspaceItem (projectFn);
+ });
+ }
+
+ Monitor.ReportSuccess (GettextCatalog.GetString ("Solution checked out"));
}
-
- Monitor.ReportSuccess (GettextCatalog.GetString ("Solution checked out"));
}
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Commands.cs
===================================================================
@@ -129,7 +129,7 @@ protected virtual bool RunCommand (VersionControlItemList items, bool test)
}
}
- class UpdateCommandHandler: SolutionVersionControlCommandHandler
+ sealed class UpdateCommandHandler: SolutionVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -137,7 +137,7 @@ protected override bool RunCommand (VersionControlItemList items, bool test)
}
}
- class StatusCommandHandler: SolutionVersionControlCommandHandler
+ sealed class StatusCommandHandler: SolutionVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -145,7 +145,7 @@ protected override bool RunCommand (VersionControlItemList items, bool test)
}
}
- class AddCommandHandler: FileVersionControlCommandHandler
+ sealed class AddCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -159,7 +159,7 @@ protected override void Update (CommandInfo info)
}
}
- class RemoveCommandHandler: FileVersionControlCommandHandler
+ sealed class RemoveCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -173,7 +173,7 @@ protected override void Update (CommandInfo info)
}
}
- class RevertCommandHandler: FileVersionControlCommandHandler
+ sealed class RevertCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -187,7 +187,7 @@ protected override void Update (CommandInfo info)
}
}
- class LockCommandHandler: FileVersionControlCommandHandler
+ sealed class LockCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -201,7 +201,7 @@ protected override void Update (CommandInfo info)
}
}
- class UnlockCommandHandler: FileVersionControlCommandHandler
+ sealed class UnlockCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -215,7 +215,7 @@ protected override void Update (CommandInfo info)
}
}
- class IgnoreCommandHandler : FileVersionControlCommandHandler
+ sealed class IgnoreCommandHandler : FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -229,7 +229,7 @@ protected override void Update (CommandInfo info)
}
}
- class UnignoreCommandHandler : FileVersionControlCommandHandler
+ sealed class UnignoreCommandHandler : FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -243,7 +243,7 @@ protected override void Update (CommandInfo info)
}
}
- class CurrentFileDiffHandler : FileVersionControlCommandHandler
+ sealed class CurrentFileDiffHandler : FileVersionControlCommandHandler
{
protected override void Run ()
{
@@ -252,7 +252,7 @@ protected override void Run ()
}
}
- class CurrentFileBlameHandler : FileVersionControlCommandHandler
+ sealed class CurrentFileBlameHandler : FileVersionControlCommandHandler
{
protected override void Run ()
{
@@ -261,7 +261,7 @@ protected override void Run ()
}
}
- class CurrentFileLogHandler : FileVersionControlCommandHandler
+ sealed class CurrentFileLogHandler : FileVersionControlCommandHandler
{
protected override void Run ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
===================================================================
@@ -7,7 +7,7 @@
namespace MonoDevelop.VersionControl
{
- class CommitCommand
+ static class CommitCommand
{
public static bool Commit (Repository vc, ChangeSet changeSet, bool test)
{
@@ -49,7 +49,7 @@ public static bool Commit (Repository vc, ChangeSet changeSet, bool test)
}
}
- private class CommitWorker : Task
+ class CommitWorker : Task
{
Repository vc;
ChangeSet changeSet;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CreatePatchCommand.cs
===================================================================
@@ -39,7 +39,7 @@ namespace MonoDevelop.VersionControl
/// <summary>
/// Class for creating patches from VersionControlItems
/// </summary>
- public class CreatePatchCommand
+ static class CreatePatchCommand
{
/// <summary>
/// Creates a patch from a VersionControlItemList
@@ -56,7 +56,8 @@ public class CreatePatchCommand
public static bool CreatePatch (VersionControlItemList items, bool test)
{
bool can = CanCreatePatch (items);
- if (test || !can){ return can; }
+ if (test || !can)
+ return can;
FilePath basePath = items.FindMostSpecificParent ();
if (FilePath.Null == basePath)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultBlameViewHandler.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- public class DefaultBlameViewHandler : IBlameViewHandler
+ sealed class DefaultBlameViewHandler : IBlameViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultDiffViewHandler.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- public class DefaultDiffViewHandler : IDiffViewHandler
+ sealed class DefaultDiffViewHandler : IDiffViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultLogViewHandler.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl
{
- public class DefaultLogViewHandler : ILogViewHandler
+ sealed class DefaultLogViewHandler : ILogViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultMergeViewHandler.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- public class DefaultMergeViewHandler : IMergeViewHandler
+ sealed class DefaultMergeViewHandler : IMergeViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DiffCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public class DiffCommand
+ static class DiffCommand
{
internal static readonly string DiffViewHandlers = "/MonoDevelop/VersionControl/DiffViewHandler";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- class IgnoreCommand
+ static class IgnoreCommand
{
public static bool Ignore (VersionControlItemList items, bool test)
{
@@ -62,7 +62,7 @@ static bool IgnoreInternal (VersionControlItemList items, bool test)
}
}
- private class IgnoreWorker : Task
+ class IgnoreWorker : Task
{
VersionControlItemList items;
@@ -93,7 +93,7 @@ protected override void Run ()
}
}
- class UnignoreCommand
+ static class UnignoreCommand
{
public static bool Unignore (VersionControlItemList items, bool test)
{
@@ -125,7 +125,7 @@ static bool UnignoreInternal (VersionControlItemList items, bool test)
}
}
- private class UnignoreWorker : Task
+ class UnignoreWorker : Task
{
VersionControlItemList items;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl
{
- public class LockCommand
+ static class LockCommand
{
public static bool Lock (VersionControlItemList items, bool test)
{
@@ -43,7 +43,7 @@ public static bool Lock (VersionControlItemList items, bool test)
return true;
}
- private class LockWorker : Task
+ class LockWorker : Task
{
VersionControlItemList items;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LogCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public class LogCommand
+ static class LogCommand
{
internal static readonly string LogViewHandlers = "/MonoDevelop/VersionControl/LogViewHandler";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/MergeCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public class MergeCommand
+ static class MergeCommand
{
internal static readonly string MergeViewHandlers = "/MonoDevelop/VersionControl/MergeViewHandler";
@@ -42,7 +42,7 @@ static bool CanShow (VersionControlItem item)
&& item.VersionInfo.IsVersioned
&& AddinManager.GetExtensionObjects<IMergeViewHandler> (MergeViewHandlers).Any (h => h.CanHandle (item, null));
}
-
+
public static bool Show (VersionControlItemList items, bool test)
{
if (test)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
===================================================================
@@ -8,7 +8,7 @@
namespace MonoDevelop.VersionControl
{
- internal class PublishCommand
+ static class PublishCommand
{
public static bool Publish (IWorkspaceObject entry, FilePath localPath, bool test)
{
@@ -67,38 +67,38 @@ static void GetFiles (List<FilePath> files, IWorkspaceObject entry)
return true;
return false;
}
- }
-
- internal class PublishWorker : Task {
- Repository vc;
- FilePath path;
- string moduleName;
- FilePath[] files;
- string message;
-
- public PublishWorker (Repository vc, string moduleName, FilePath localPath, FilePath[] files, string message)
- {
- this.vc = vc;
- this.path = localPath;
- this.moduleName = moduleName;
- this.files = files;
- this.message = message;
- OperationType = VersionControlOperationType.Push;
- }
- protected override string GetDescription ()
- {
- return GettextCatalog.GetString ("Publishing \"{0}\" Project...", moduleName);
- }
-
- protected override void Run ()
- {
- vc.Publish (moduleName, path, files, message, Monitor);
- Monitor.ReportSuccess (GettextCatalog.GetString ("Publish operation completed."));
-
- Gtk.Application.Invoke (delegate {
- VersionControlService.NotifyFileStatusChanged (new FileUpdateEventArgs (vc, path, true));
- });
+ class PublishWorker : Task {
+ Repository vc;
+ FilePath path;
+ string moduleName;
+ FilePath[] files;
+ string message;
+
+ public PublishWorker (Repository vc, string moduleName, FilePath localPath, FilePath[] files, string message)
+ {
+ this.vc = vc;
+ this.path = localPath;
+ this.moduleName = moduleName;
+ this.files = files;
+ this.message = message;
+ OperationType = VersionControlOperationType.Push;
+ }
+
+ protected override string GetDescription ()
+ {
+ return GettextCatalog.GetString ("Publishing \"{0}\" Project...", moduleName);
+ }
+
+ protected override void Run ()
+ {
+ vc.Publish (moduleName, path, files, message, Monitor);
+ Monitor.ReportSuccess (GettextCatalog.GetString ("Publish operation completed."));
+
+ Gtk.Application.Invoke (delegate {
+ VersionControlService.NotifyFileStatusChanged (new FileUpdateEventArgs (vc, path, true));
+ });
+ }
}
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
===================================================================
@@ -29,12 +29,12 @@ public FilePath RootPath
public event EventHandler NameChanged;
- public Repository ()
+ protected Repository ()
{
infoCache = new VersionInfoCache (this);
}
- public Repository (VersionControlSystem vcs): this ()
+ protected Repository (VersionControlSystem vcs): this ()
{
VersionControlSystem = vcs;
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ResolveConflictsCommand.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl
{
- public class ResolveConflictsCommand
+ static class ResolveConflictsCommand
{
public static bool ResolveConflicts (VersionControlItemList list, bool test)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs
===================================================================
@@ -7,9 +7,8 @@
namespace MonoDevelop.VersionControl
{
- internal class RevertCommand
+ static class RevertCommand
{
-
public static bool Revert (VersionControlItemList items, bool test)
{
if (RevertInternal (items, test)) {
@@ -20,7 +19,7 @@ public static bool Revert (VersionControlItemList items, bool test)
return false;
}
- private static bool RevertInternal (VersionControlItemList items, bool test)
+ static bool RevertInternal (VersionControlItemList items, bool test)
{
try {
if (test)
@@ -43,22 +42,22 @@ private static bool RevertInternal (VersionControlItemList items, bool test)
}
}
- private class RevertWorker : Task {
+ class RevertWorker : Task {
VersionControlItemList items;
-
+
public RevertWorker (VersionControlItemList items) {
this.items = items;
}
-
+
protected override string GetDescription() {
return GettextCatalog.GetString ("Reverting ...");
}
-
+
protected override void Run ()
{
foreach (VersionControlItemList list in items.SplitByRepository ())
list[0].Repository.Revert (list.Paths, true, Monitor);
-
+
Monitor.ReportSuccess (GettextCatalog.GetString ("Revert operation completed."));
Gtk.Application.Invoke (delegate {
foreach (VersionControlItem item in items) {
@@ -74,6 +73,5 @@ protected override void Run ()
});
}
}
-
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- internal class RevertRevisionsCommands
+ static class RevertRevisionsCommands
{
public static bool RevertRevision (Repository vc, string path, Revision revision, bool test)
{
@@ -75,7 +75,7 @@ private static bool RevertRevisions (Repository vc, string path, Revision revisi
}
}
- private class RevertWorker : Task {
+ class RevertWorker : Task {
Repository vc;
string path;
Revision revision;
@@ -130,6 +130,5 @@ protected override void Run ()
});
}
}
-
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs
===================================================================
@@ -6,7 +6,7 @@
namespace MonoDevelop.VersionControl
{
- internal abstract class Task
+ abstract class Task
{
IProgressMonitor tracker;
ThreadNotify threadnotify;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnknownRepository.cs
===================================================================
@@ -7,7 +7,7 @@
namespace MonoDevelop.VersionControl
{
- public class UnknownRepository: Repository, IExtendedDataItem
+ public sealed class UnknownRepository: Repository, IExtendedDataItem
{
Hashtable properties;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs
===================================================================
@@ -32,7 +32,7 @@ namespace MonoDevelop.VersionControl
{
- public class UnlockCommand
+ static class UnlockCommand
{
public static bool Unlock (VersionControlItemList items, bool test)
{
@@ -45,7 +45,7 @@ public static bool Unlock (VersionControlItemList items, bool test)
return true;
}
- private class UnlockWorker : Task
+ class UnlockWorker : Task
{
VersionControlItemList items;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs
===================================================================
@@ -3,7 +3,7 @@
namespace MonoDevelop.VersionControl
{
- internal class UpdateCommand
+ static class UpdateCommand
{
public static bool Update (VersionControlItemList items, bool test)
{
@@ -16,7 +16,7 @@ public static bool Update (VersionControlItemList items, bool test)
return true;
}
- private class UpdateWorker : Task {
+ class UpdateWorker : Task {
VersionControlItemList items;
public UpdateWorker (VersionControlItemList items) {
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepository.cs
===================================================================
@@ -9,11 +9,11 @@ public abstract class UrlBasedRepository: Repository, ICustomDataItem
string url;
Uri uri;
- public UrlBasedRepository ()
+ protected UrlBasedRepository ()
{
}
- public UrlBasedRepository (VersionControlSystem vcs): base (vcs)
+ protected UrlBasedRepository (VersionControlSystem vcs): base (vcs)
{
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlConfiguration.cs
===================================================================
@@ -4,7 +4,7 @@
namespace MonoDevelop.VersionControl
{
- class VersionControlConfiguration
+ sealed class VersionControlConfiguration
{
[ItemProperty ("Repositories")]
List<Repository> repositories = new List<Repository> ();
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs
===================================================================
@@ -10,7 +10,7 @@
namespace MonoDevelop.VersionControl
{
- internal class VersionControlFileSystemExtension: FileSystemExtension
+ class VersionControlFileSystemExtension: FileSystemExtension
{
public override bool CanHandlePath (FilePath path, bool isDirectory)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItem.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionControlItem
+ public sealed class VersionControlItem
{
FilePath path;
bool isDirectory;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItemList.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionControlItemList: List<VersionControlItem>
+ public sealed class VersionControlItemList: List<VersionControlItem>
{
public VersionControlItemList[] SplitByRepository ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
===================================================================
@@ -251,7 +251,7 @@ internal static string GetPath (object dataObject)
- class AddinCommandHandler : VersionControlCommandHandler
+ sealed class AddinCommandHandler : VersionControlCommandHandler
{
[AllowMultiSelection]
[CommandHandler (Commands.Update)]
@@ -428,7 +428,7 @@ protected void UpdateResolveConflicts (CommandInfo item)
TestCommand (Commands.ResolveConflicts, item, false);
}
- private void TestCommand(Commands cmd, CommandInfo item, bool projRecurse = true)
+ void TestCommand(Commands cmd, CommandInfo item, bool projRecurse = true)
{
TestResult res = RunCommand(cmd, true, projRecurse);
if (res == TestResult.NoVersionControl && cmd == Commands.Log) {
@@ -443,7 +443,7 @@ private void TestCommand(Commands cmd, CommandInfo item, bool projRecurse = true
item.Visible = res == TestResult.Enable;
}
- private TestResult RunCommand (Commands cmd, bool test, bool projRecurse = true)
+ TestResult RunCommand (Commands cmd, bool test, bool projRecurse = true)
{
VersionControlItemList items = GetItems (projRecurse);
@@ -530,7 +530,7 @@ public override void RefreshItem ()
}
}
- class OpenCommandHandler : VersionControlCommandHandler
+ sealed class OpenCommandHandler : VersionControlCommandHandler
{
[AllowMultiSelection]
[CommandHandler (ViewCommands.Open)]
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlPolicy.cs
===================================================================
@@ -33,7 +33,7 @@ namespace MonoDevelop.VersionControl
{
[PolicyType ("Version control commit message style")]
[DataItem ("VersionControlPolicy")]
- public class VersionControlPolicy: IEquatable<VersionControlPolicy>
+ public sealed class VersionControlPolicy: IEquatable<VersionControlPolicy>
{
public VersionControlPolicy()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
===================================================================
@@ -19,7 +19,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionControlService
+ public static class VersionControlService
{
static Gdk.Pixbuf overlay_modified;
static Gdk.Pixbuf overlay_removed;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfo.cs
===================================================================
@@ -3,7 +3,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionInfo
+ public sealed class VersionInfo
{
FilePath localPath;
string repositoryPath;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfoCache.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl
{
- class VersionInfoCache
+ sealed class VersionInfoCache
{
Dictionary<FilePath,VersionInfo> fileStatus = new Dictionary<FilePath, VersionInfo> ();
Dictionary<FilePath,DirectoryStatus> directoryStatus = new Dictionary<FilePath, DirectoryStatus> ();
@@ -137,7 +137,7 @@ public void SetDirectoryStatus (FilePath localDirectory, VersionInfo[] versionIn
}
}
- class DirectoryStatus
+ sealed class DirectoryStatus
{
public VersionInfo[] FileInfo { get; set; }
public bool HasRemoteStatus { get; set; }
Commit: fe0d6f373afb019f42ffc93cbd2c4e9cd2f4488a
Author: Ungureanu Marius <[email protected]> (Therzok)
Date: 2013-10-25 13:55:12 GMT
URL: https://github.com/mono/monodevelop/commit/fe0d6f373afb019f42ffc93cbd2c4e9cd2f4488a
Merge pull request #420 from mono/fixAPI
[Version Control] Hide what's not API and seal most stuff.
Changed paths:
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/FilteredStatus.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanel.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSelectRevisionDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSupportFeature.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitUtil.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MyersDiff.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Stash.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient0.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient1.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnRevision.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlGeneralOptionsPanel.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffParser.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/SubviewAttachmentHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BaseView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BlameCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeLogWriter.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Commands.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CreatePatchCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultBlameViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultDiffViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultLogViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultMergeViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DiffCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LogCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/MergeCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ResolveConflictsCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnknownRepository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlConfiguration.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItem.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItemList.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlPolicy.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfo.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfoCache.cs
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs
===================================================================
@@ -65,7 +65,7 @@ protected override void Update (CommandInfo info)
}
}
- class PushCommandHandler: GitCommandHandler
+ sealed class PushCommandHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -73,7 +73,7 @@ protected override void Run ()
}
}
- class SwitchToBranchHandler: GitCommandHandler
+ sealed class SwitchToBranchHandler: GitCommandHandler
{
protected override void Run (object dataItem)
{
@@ -102,7 +102,7 @@ protected override void Update (CommandArrayInfo info)
}
}
- class ManageBranchesHandler: GitCommandHandler
+ sealed class ManageBranchesHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -110,7 +110,7 @@ protected override void Run ()
}
}
- class MergeBranchHandler: GitCommandHandler
+ sealed class MergeBranchHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -118,7 +118,7 @@ protected override void Run ()
}
}
- class RebaseBranchHandler: GitCommandHandler
+ sealed class RebaseBranchHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -126,7 +126,7 @@ protected override void Run ()
}
}
- class StashHandler: GitCommandHandler
+ sealed class StashHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -153,7 +153,7 @@ protected override void Run ()
}
}
- class StashPopHandler: GitCommandHandler
+ sealed class StashPopHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -187,7 +187,7 @@ protected override void Update (CommandInfo info)
}
}
- class ManageStashesHandler: GitCommandHandler
+ sealed class ManageStashesHandler: GitCommandHandler
{
protected override void Run ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/FilteredStatus.cs
===================================================================
@@ -34,7 +34,7 @@
namespace MonoDevelop.VersionControl.Git
{
- class FilteredStatus : NGit.Api.StatusCommand
+ sealed class FilteredStatus : NGit.Api.StatusCommand
{
WorkingTreeIterator iter;
IndexDiff diff;
@@ -76,7 +76,7 @@ public override NGit.Api.Status Call ()
return new NGit.Api.Status (diff);
}
- public virtual ICollection<string> GetIgnoredNotInIndex ()
+ public ICollection<string> GetIgnoredNotInIndex ()
{
return diff.GetIgnoredNotInIndex ();
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitCommitDialogExtension: CommitDialogExtension
+ public sealed class GitCommitDialogExtension: CommitDialogExtension
{
GitCommitDialogExtensionWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitCredentials: CredentialsProvider
+ public sealed class GitCredentials: CredentialsProvider
{
bool HasReset {
get; set;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs
===================================================================
@@ -33,7 +33,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitNodeBuilderExtension: NodeBuilderExtension
+ public sealed class GitNodeBuilderExtension: NodeBuilderExtension
{
readonly Dictionary<FilePath,IWorkspaceObject> repos = new Dictionary<FilePath, IWorkspaceObject> ();
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanel.cs
===================================================================
@@ -27,7 +27,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitOptionsPanel : OptionsPanel
+ public sealed class GitOptionsPanel : OptionsPanel
{
GitOptionsPanelWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
===================================================================
@@ -1713,7 +1713,7 @@ protected override void OnUnignore (FilePath[] localPath)
}
}
- public class GitRevision: Revision
+ public sealed class GitRevision: Revision
{
readonly string rev;
@@ -1753,13 +1753,13 @@ public override Revision GetPrevious ()
}
}
- public class Branch
+ public sealed class Branch
{
public string Name { get; internal set; }
public string Tracking { get; internal set; }
}
- public class RemoteSource
+ public sealed class RemoteSource
{
internal RemoteConfig RepoRemote;
internal StoredConfig cfg;
@@ -1800,7 +1800,7 @@ internal void Update ()
public string PushUrl { get; internal set; }
}
- class GitMonitor: ProgressMonitor, IDisposable
+ sealed class GitMonitor: ProgressMonitor, IDisposable
{
readonly IProgressMonitor monitor;
int currentWork;
@@ -1872,7 +1872,7 @@ public void Dispose ()
}
}
- class LocalGitRepository: FileRepository
+ sealed class LocalGitRepository: FileRepository
{
WeakReference dirCacheRef;
DateTime dirCacheTimestamp;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSelectRevisionDialog.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl.Git
{
- class GitSelectRevisionDialog : Xwt.Dialog
+ sealed class GitSelectRevisionDialog : Xwt.Dialog
{
readonly Xwt.TextEntry tagNameEntry;
readonly Xwt.TextEntry tagMessageEntry;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSupportFeature.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitSupportFeature: ISolutionItemFeature
+ public sealed class GitSupportFeature: ISolutionItemFeature
{
public FeatureSupportLevel GetSupportLevel (SolutionFolder parentFolder, SolutionItem entry)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitUtil.cs
===================================================================
@@ -41,7 +41,7 @@
namespace MonoDevelop.VersionControl.Git
{
- internal static class GitUtil
+ static class GitUtil
{
public static string ToGitPath (this NGit.Repository repo, FilePath filePath)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MyersDiff.cs
===================================================================
@@ -39,7 +39,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class MyersDiff : GitCommand<IList<DiffEntry>>
+ public sealed class MyersDiff : GitCommand<IList<DiffEntry>>
{
AbstractTreeIterator oldTree;
@@ -171,7 +171,7 @@ public override IList<DiffEntry> Call()
/// <param name="cached">whether to view the changes you staged for the next commit</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetCached(bool cached)
+ public MyersDiff SetCached(bool cached)
{
this.cached = cached;
return this;
@@ -179,7 +179,7 @@ public virtual MyersDiff SetCached(bool cached)
/// <param name="pathFilter">parameter, used to limit the diff to the named path</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetPathFilter(TreeFilter pathFilter)
+ public MyersDiff SetPathFilter(TreeFilter pathFilter)
{
this.pathFilter = pathFilter;
return this;
@@ -187,7 +187,7 @@ public virtual MyersDiff SetPathFilter(TreeFilter pathFilter)
/// <param name="oldTree">the previous state</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetOldTree(AbstractTreeIterator oldTree)
+ public MyersDiff SetOldTree(AbstractTreeIterator oldTree)
{
this.oldTree = oldTree;
return this;
@@ -195,7 +195,7 @@ public virtual MyersDiff SetOldTree(AbstractTreeIterator oldTree)
/// <param name="newTree">the updated state</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetNewTree(AbstractTreeIterator newTree)
+ public MyersDiff SetNewTree(AbstractTreeIterator newTree)
{
this.newTree = newTree;
return this;
@@ -204,7 +204,7 @@ public virtual MyersDiff SetNewTree(AbstractTreeIterator newTree)
/// <param name="showNameAndStatusOnly">whether to return only names and status of changed files
/// </param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetShowNameAndStatusOnly(bool showNameAndStatusOnly
+ public MyersDiff SetShowNameAndStatusOnly(bool showNameAndStatusOnly
)
{
this.showNameAndStatusOnly = showNameAndStatusOnly;
@@ -213,7 +213,7 @@ public virtual MyersDiff SetNewTree(AbstractTreeIterator newTree)
/// <param name="out">the stream to write line data</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetOutputStream(OutputStream @out)
+ public MyersDiff SetOutputStream(OutputStream @out)
{
this.@out = @out;
return this;
@@ -223,7 +223,7 @@ public virtual MyersDiff SetOutputStream(OutputStream @out)
/// <remarks>Set number of context lines instead of the usual three.</remarks>
/// <param name="contextLines">the number of context lines</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetContextLines(int contextLines)
+ public MyersDiff SetContextLines(int contextLines)
{
this.contextLines = contextLines;
return this;
@@ -233,7 +233,7 @@ public virtual MyersDiff SetContextLines(int contextLines)
/// <remarks>Set the given source prefix instead of "a/".</remarks>
/// <param name="sourcePrefix">the prefix</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetSourcePrefix(string sourcePrefix)
+ public MyersDiff SetSourcePrefix(string sourcePrefix)
{
this.sourcePrefix = sourcePrefix;
return this;
@@ -243,7 +243,7 @@ public virtual MyersDiff SetSourcePrefix(string sourcePrefix)
/// <remarks>Set the given destination prefix instead of "b/".</remarks>
/// <param name="destinationPrefix">the prefix</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetDestinationPrefix(string destinationPrefix
+ public MyersDiff SetDestinationPrefix(string destinationPrefix
)
{
this.destinationPrefix = destinationPrefix;
@@ -258,7 +258,7 @@ public virtual MyersDiff SetSourcePrefix(string sourcePrefix)
/// <seealso cref="NGit.NullProgressMonitor">NGit.NullProgressMonitor</seealso>
/// <param name="monitor">a progress monitor</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetProgressMonitor(ProgressMonitor monitor)
+ public MyersDiff SetProgressMonitor(ProgressMonitor monitor)
{
this.monitor = monitor;
return this;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Stash.cs
===================================================================
@@ -38,7 +38,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class Stash
+ public sealed class Stash
{
internal string CommitId { get; private set; }
internal string FullLine { get; private set; }
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs
===================================================================
@@ -64,7 +64,7 @@ public IntPtr pcalloc (IntPtr pool, object structure)
public const int APR_OS_START_USEERR = APR_OS_START_USERERR;
}
- public class LibApr0: LibApr
+ public sealed class LibApr0: LibApr
{
private const string aprlib = "libapr-0.so.0";
@@ -97,7 +97,7 @@ public class LibApr0: LibApr
[DllImport(aprlib)] static extern int apr_file_close (IntPtr file);
}
- public class LibApr1: LibApr
+ public sealed class LibApr1: LibApr
{
private const string aprlib = "libapr-1.so.0";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient0.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Subversion.Unix {
- public class LibSvnClient0 : LibSvnClient {
+ public sealed class LibSvnClient0 : LibSvnClient {
private const string svnclientlib = "libsvn_client-1.so.0";
public override IntPtr client_root_url_from_path (ref IntPtr url, string path_or_url, IntPtr ctx, IntPtr pool)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient1.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Subversion.Unix {
- public class LibSvnClient1 : LibSvnClient {
+ public sealed class LibSvnClient1 : LibSvnClient {
private const string svnclientlib = "libsvn_client-1.so.1";
public override IntPtr client_root_url_from_path (ref IntPtr url, string path_or_url, IntPtr ctx, IntPtr pool)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnRevision.cs
===================================================================
@@ -28,7 +28,7 @@
namespace MonoDevelop.VersionControl.Subversion
{
- public class SvnRevision : Revision
+ public sealed class SvnRevision : Revision
{
public readonly int Rev;
public readonly int Kind;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlGeneralOptionsPanel.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionControlGeneralOptionsPanel : OptionsPanel
+ public sealed class VersionControlGeneralOptionsPanel : OptionsPanel
{
Xwt.CheckBox disableVersionControl;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionControlPolicyPanel: PolicyOptionsPanel<VersionControlPolicy>
+ public sealed class VersionControlPolicyPanel: PolicyOptionsPanel<VersionControlPolicy>
{
CommitMessageStylePanelWidget widget;
CommitMessageFormat format;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs
===================================================================
@@ -34,7 +34,7 @@ public interface IBlameView : IAttachableViewContent
{
}
- internal class BlameView : BaseView, IBlameView, IUndoHandler, IClipboardHandler
+ sealed class BlameView : BaseView, IBlameView, IUndoHandler, IClipboardHandler
{
BlameWidget widget;
VersionControlDocumentInfo info;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
===================================================================
@@ -44,7 +44,7 @@ public enum BlameCommands {
ShowLog
}
- public class BlameWidget : Bin
+ public sealed class BlameWidget : Bin
{
Adjustment vAdjustment;
Gtk.VScrollbar vScrollBar;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
===================================================================
@@ -10,7 +10,7 @@
namespace MonoDevelop.VersionControl.Views
{
[System.ComponentModel.ToolboxItem (true)]
- public class ChangeSetView: ScrolledWindow
+ public sealed class ChangeSetView: ScrolledWindow
{
bool disposed;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
===================================================================
@@ -39,7 +39,7 @@
namespace MonoDevelop.VersionControl.Views
{
[ToolboxItem (true)]
- public class ComparisonWidget : EditorCompareWidgetBase
+ public sealed class ComparisonWidget : EditorCompareWidgetBase
{
internal DropDownBox originalComboBox, diffComboBox;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffParser.cs
===================================================================
@@ -38,7 +38,7 @@ namespace MonoDevelop.VersionControl.Views
/// <summary>
/// Parser for unified diffs
/// </summary>
- public class DiffParser : TypeSystemParser
+ public sealed class DiffParser : TypeSystemParser
{
// Match the original file and time/revstamp line, capturing the filepath and the stamp
static Regex fileHeaderExpression = new Regex (@"^---\s+(?<filepath>[^\t]+)\t(?<stamp>.*)$", RegexOptions.Compiled);
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
===================================================================
@@ -35,7 +35,7 @@ public interface IDiffView : IAttachableViewContent
{
}
- public class DiffView : BaseView, IDiffView, IUndoHandler, IClipboardHandler
+ sealed class DiffView : BaseView, IDiffView, IUndoHandler, IClipboardHandler
{
DiffWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
===================================================================
@@ -35,7 +35,7 @@ namespace MonoDevelop.VersionControl.Views
//FIXME: re-merge this with MonoDevelop.Components.DropDownBox
[Category ("Widgets")]
[ToolboxItem (true)]
- public class DropDownBox : Gtk.Button
+ public sealed class DropDownBox : Gtk.Button
{
Pango.Layout layout;
const int pixbufSpacing = 2;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
===================================================================
@@ -13,7 +13,7 @@ public interface ILogView : IAttachableViewContent
{
}
- public class LogView : BaseView, ILogView
+ sealed class LogView : BaseView, ILogView
{
LogWidget widget;
VersionInfo vinfo;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs
===================================================================
@@ -32,7 +32,7 @@ public interface IMergeView : IAttachableViewContent
{
}
- class MergeView : BaseView, IMergeView
+ sealed class MergeView : BaseView, IMergeView
{
VersionControlDocumentInfo info;
MergeWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
===================================================================
@@ -36,7 +36,7 @@
namespace MonoDevelop.VersionControl.Views
{
- public class MergeWidget : EditorCompareWidgetBase
+ public sealed class MergeWidget : EditorCompareWidgetBase
{
protected override TextEditor MainEditor {
get {
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
===================================================================
@@ -19,7 +19,7 @@
namespace MonoDevelop.VersionControl.Views
{
- internal class StatusView : BaseView
+ sealed class StatusView : BaseView
{
string filepath;
Repository vc;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/SubviewAttachmentHandler.cs
===================================================================
@@ -34,7 +34,7 @@
namespace MonoDevelop.VersionControl.Views
{
- class SubviewAttachmentHandler : CommandHandler
+ sealed class SubviewAttachmentHandler : CommandHandler
{
protected override void Run ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs
===================================================================
@@ -4,7 +4,7 @@
namespace MonoDevelop.VersionControl
{
- internal class AddCommand
+ sealed class AddCommand
{
public static bool Add (VersionControlItemList items, bool test)
{
@@ -17,7 +17,7 @@ public static bool Add (VersionControlItemList items, bool test)
return true;
}
- private class AddWorker : Task {
+ class AddWorker : Task {
VersionControlItemList items;
public AddWorker (VersionControlItemList items)
@@ -92,7 +92,7 @@ protected override void Run ()
//
// }
- internal class RemoveCommand
+ sealed class RemoveCommand
{
public static bool Remove (VersionControlItemList items, bool test)
{
@@ -108,7 +108,7 @@ public static bool Remove (VersionControlItemList items, bool test)
return true;
}
- private class RemoveWorker : Task {
+ class RemoveWorker : Task {
VersionControlItemList items;
public RemoveWorker (VersionControlItemList items) {
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BaseView.cs
===================================================================
@@ -4,11 +4,11 @@
namespace MonoDevelop.VersionControl
{
- public abstract class BaseView : AbstractBaseViewContent, IViewContent
+ abstract class BaseView : AbstractBaseViewContent, IViewContent
{
string name;
- public BaseView (string name)
+ protected BaseView (string name)
{
this.name = name;
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BlameCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public class BlameCommand
+ static class BlameCommand
{
internal static readonly string BlameViewHandlers = "/MonoDevelop/VersionControl/BlameViewHandler";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeLogWriter.cs
===================================================================
@@ -36,10 +36,10 @@
namespace MonoDevelop.VersionControl
{
- class ChangeLogWriter
+ sealed class ChangeLogWriter
{
- private Dictionary<string, List<string>> messages = new Dictionary<string, List<string>> ();
- private string changelog_path;
+ Dictionary<string, List<string>> messages = new Dictionary<string, List<string>> ();
+ string changelog_path;
AuthorInformation uinfo;
public ChangeLogWriter (string path, AuthorInformation uinfo)
@@ -69,7 +69,7 @@ public void AddFile (string message, string path)
}
}
- private string GetRelativeEntryPath (string path)
+ string GetRelativeEntryPath (string path)
{
if (!path.StartsWith (changelog_path, System.StringComparison.Ordinal)) {
return null;
@@ -85,13 +85,13 @@ public override string ToString ()
CommitMessageStyle message_style = MessageFormat.Style;
- TextFormatter formatter = new TextFormatter ();
+ var formatter = new TextFormatter ();
formatter.MaxColumns = MessageFormat.MaxColumns;
formatter.TabWidth = MessageFormat.TabWidth;
formatter.TabsAsSpaces = MessageFormat.TabsAsSpaces;
if (message_style.Header.Length > 0) {
- string [,] tags = new string[,] { {"AuthorName", uinfo.Name}, {"AuthorEmail", uinfo.Email} };
+ string [,] tags = { {"AuthorName", uinfo.Name}, {"AuthorEmail", uinfo.Email} };
formatter.Append (StringParserService.Parse (message_style.Header, tags));
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
===================================================================
@@ -5,7 +5,7 @@
namespace MonoDevelop.VersionControl
{
- internal class CheckoutCommand : CommandHandler
+ sealed class CheckoutCommand : CommandHandler
{
protected override void Update (CommandInfo info)
{
@@ -25,79 +25,79 @@ protected override void Run()
del.Destroy ();
}
}
- }
-
- class CheckoutWorker : Task
- {
- Repository vc;
- string path;
-
- public CheckoutWorker (Repository vc, string path)
- {
- this.vc = vc;
- this.path = path;
- OperationType = VersionControlOperationType.Pull;
- }
-
- protected override string GetDescription ()
- {
- return GettextCatalog.GetString ("Checking out {0}...", path);
- }
-
- protected override IProgressMonitor CreateProgressMonitor ()
- {
- return new MonoDevelop.Core.ProgressMonitoring.AggregatedProgressMonitor (
- base.CreateProgressMonitor (),
- new MonoDevelop.Ide.ProgressMonitoring.MessageDialogProgressMonitor (true, true, true, true)
- );
- }
-
- protected override void Run ()
+
+ class CheckoutWorker : Task
{
- vc.Checkout (path, null, true, Monitor);
- if (Monitor.IsCancelRequested) {
- Monitor.ReportSuccess (GettextCatalog.GetString ("Checkout operation cancelled"));
- return;
- }
+ Repository vc;
+ string path;
- if (!System.IO.Directory.Exists (path)) {
- Monitor.ReportError (GettextCatalog.GetString ("Checkout folder does not exist"), null);
- return;
+ public CheckoutWorker (Repository vc, string path)
+ {
+ this.vc = vc;
+ this.path = path;
+ OperationType = VersionControlOperationType.Pull;
}
- string projectFn = null;
-
- string[] list = System.IO.Directory.GetFiles(path);
- foreach (string str in list ) {
- if (str.EndsWith (".mds", System.StringComparison.Ordinal)) {
- projectFn = str;
- break;
- }
+ protected override string GetDescription ()
+ {
+ return GettextCatalog.GetString ("Checking out {0}...", path);
}
- if ( projectFn == null ) {
- foreach ( string str in list ) {
- if (str.EndsWith (".mdp", System.StringComparison.Ordinal)) {
- projectFn = str;
- break;
- }
- }
+
+ protected override IProgressMonitor CreateProgressMonitor ()
+ {
+ return new MonoDevelop.Core.ProgressMonitoring.AggregatedProgressMonitor (
+ base.CreateProgressMonitor (),
+ new MonoDevelop.Ide.ProgressMonitoring.MessageDialogProgressMonitor (true, true, true, true)
+ );
}
- if ( projectFn == null ) {
+
+ protected override void Run ()
+ {
+ vc.Checkout (path, null, true, Monitor);
+ if (Monitor.IsCancelRequested) {
+ Monitor.ReportSuccess (GettextCatalog.GetString ("Checkout operation cancelled"));
+ return;
+ }
+
+ if (!System.IO.Directory.Exists (path)) {
+ Monitor.ReportError (GettextCatalog.GetString ("Checkout folder does not exist"), null);
+ return;
+ }
+
+ string projectFn = null;
+
+ string[] list = System.IO.Directory.GetFiles(path);
foreach (string str in list ) {
- if (MonoDevelop.Projects.Services.ProjectService.IsWorkspaceItemFile (str)) {
+ if (str.EndsWith (".mds", System.StringComparison.Ordinal)) {
projectFn = str;
break;
}
- }
- }
-
- if (projectFn != null) {
- DispatchService.GuiDispatch (delegate {
- IdeApp.Workspace.OpenWorkspaceItem (projectFn);
- });
+ }
+ if ( projectFn == null ) {
+ foreach ( string str in list ) {
+ if (str.EndsWith (".mdp", System.StringComparison.Ordinal)) {
+ projectFn = str;
+ break;
+ }
+ }
+ }
+ if ( projectFn == null ) {
+ foreach (string str in list ) {
+ if (MonoDevelop.Projects.Services.ProjectService.IsWorkspaceItemFile (str)) {
+ projectFn = str;
+ break;
+ }
+ }
+ }
+
+ if (projectFn != null) {
+ DispatchService.GuiDispatch (delegate {
+ IdeApp.Workspace.OpenWorkspaceItem (projectFn);
+ });
+ }
+
+ Monitor.ReportSuccess (GettextCatalog.GetString ("Solution checked out"));
}
-
- Monitor.ReportSuccess (GettextCatalog.GetString ("Solution checked out"));
}
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Commands.cs
===================================================================
@@ -129,7 +129,7 @@ protected virtual bool RunCommand (VersionControlItemList items, bool test)
}
}
- class UpdateCommandHandler: SolutionVersionControlCommandHandler
+ sealed class UpdateCommandHandler: SolutionVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -137,7 +137,7 @@ protected override bool RunCommand (VersionControlItemList items, bool test)
}
}
- class StatusCommandHandler: SolutionVersionControlCommandHandler
+ sealed class StatusCommandHandler: SolutionVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -145,7 +145,7 @@ protected override bool RunCommand (VersionControlItemList items, bool test)
}
}
- class AddCommandHandler: FileVersionControlCommandHandler
+ sealed class AddCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -159,7 +159,7 @@ protected override void Update (CommandInfo info)
}
}
- class RemoveCommandHandler: FileVersionControlCommandHandler
+ sealed class RemoveCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -173,7 +173,7 @@ protected override void Update (CommandInfo info)
}
}
- class RevertCommandHandler: FileVersionControlCommandHandler
+ sealed class RevertCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -187,7 +187,7 @@ protected override void Update (CommandInfo info)
}
}
- class LockCommandHandler: FileVersionControlCommandHandler
+ sealed class LockCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -201,7 +201,7 @@ protected override void Update (CommandInfo info)
}
}
- class UnlockCommandHandler: FileVersionControlCommandHandler
+ sealed class UnlockCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -215,7 +215,7 @@ protected override void Update (CommandInfo info)
}
}
- class IgnoreCommandHandler : FileVersionControlCommandHandler
+ sealed class IgnoreCommandHandler : FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -229,7 +229,7 @@ protected override void Update (CommandInfo info)
}
}
- class UnignoreCommandHandler : FileVersionControlCommandHandler
+ sealed class UnignoreCommandHandler : FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -243,7 +243,7 @@ protected override void Update (CommandInfo info)
}
}
- class CurrentFileDiffHandler : FileVersionControlCommandHandler
+ sealed class CurrentFileDiffHandler : FileVersionControlCommandHandler
{
protected override void Run ()
{
@@ -252,7 +252,7 @@ protected override void Run ()
}
}
- class CurrentFileBlameHandler : FileVersionControlCommandHandler
+ sealed class CurrentFileBlameHandler : FileVersionControlCommandHandler
{
protected override void Run ()
{
@@ -261,7 +261,7 @@ protected override void Run ()
}
}
- class CurrentFileLogHandler : FileVersionControlCommandHandler
+ sealed class CurrentFileLogHandler : FileVersionControlCommandHandler
{
protected override void Run ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
===================================================================
@@ -7,7 +7,7 @@
namespace MonoDevelop.VersionControl
{
- class CommitCommand
+ static class CommitCommand
{
public static bool Commit (Repository vc, ChangeSet changeSet, bool test)
{
@@ -49,7 +49,7 @@ public static bool Commit (Repository vc, ChangeSet changeSet, bool test)
}
}
- private class CommitWorker : Task
+ class CommitWorker : Task
{
Repository vc;
ChangeSet changeSet;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CreatePatchCommand.cs
===================================================================
@@ -39,7 +39,7 @@ namespace MonoDevelop.VersionControl
/// <summary>
/// Class for creating patches from VersionControlItems
/// </summary>
- public class CreatePatchCommand
+ static class CreatePatchCommand
{
/// <summary>
/// Creates a patch from a VersionControlItemList
@@ -56,7 +56,8 @@ public class CreatePatchCommand
public static bool CreatePatch (VersionControlItemList items, bool test)
{
bool can = CanCreatePatch (items);
- if (test || !can){ return can; }
+ if (test || !can)
+ return can;
FilePath basePath = items.FindMostSpecificParent ();
if (FilePath.Null == basePath)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultBlameViewHandler.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- public class DefaultBlameViewHandler : IBlameViewHandler
+ sealed class DefaultBlameViewHandler : IBlameViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultDiffViewHandler.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- public class DefaultDiffViewHandler : IDiffViewHandler
+ sealed class DefaultDiffViewHandler : IDiffViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultLogViewHandler.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl
{
- public class DefaultLogViewHandler : ILogViewHandler
+ sealed class DefaultLogViewHandler : ILogViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultMergeViewHandler.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- public class DefaultMergeViewHandler : IMergeViewHandler
+ sealed class DefaultMergeViewHandler : IMergeViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DiffCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public class DiffCommand
+ static class DiffCommand
{
internal static readonly string DiffViewHandlers = "/MonoDevelop/VersionControl/DiffViewHandler";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- class IgnoreCommand
+ static class IgnoreCommand
{
public static bool Ignore (VersionControlItemList items, bool test)
{
@@ -62,7 +62,7 @@ static bool IgnoreInternal (VersionControlItemList items, bool test)
}
}
- private class IgnoreWorker : Task
+ class IgnoreWorker : Task
{
VersionControlItemList items;
@@ -93,7 +93,7 @@ protected override void Run ()
}
}
- class UnignoreCommand
+ static class UnignoreCommand
{
public static bool Unignore (VersionControlItemList items, bool test)
{
@@ -125,7 +125,7 @@ static bool UnignoreInternal (VersionControlItemList items, bool test)
}
}
- private class UnignoreWorker : Task
+ class UnignoreWorker : Task
{
VersionControlItemList items;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl
{
- public class LockCommand
+ static class LockCommand
{
public static bool Lock (VersionControlItemList items, bool test)
{
@@ -43,7 +43,7 @@ public static bool Lock (VersionControlItemList items, bool test)
return true;
}
- private class LockWorker : Task
+ class LockWorker : Task
{
VersionControlItemList items;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LogCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public class LogCommand
+ static class LogCommand
{
internal static readonly string LogViewHandlers = "/MonoDevelop/VersionControl/LogViewHandler";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/MergeCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public class MergeCommand
+ static class MergeCommand
{
internal static readonly string MergeViewHandlers = "/MonoDevelop/VersionControl/MergeViewHandler";
@@ -42,7 +42,7 @@ static bool CanShow (VersionControlItem item)
&& item.VersionInfo.IsVersioned
&& AddinManager.GetExtensionObjects<IMergeViewHandler> (MergeViewHandlers).Any (h => h.CanHandle (item, null));
}
-
+
public static bool Show (VersionControlItemList items, bool test)
{
if (test)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
===================================================================
@@ -8,7 +8,7 @@
namespace MonoDevelop.VersionControl
{
- internal class PublishCommand
+ static class PublishCommand
{
public static bool Publish (IWorkspaceObject entry, FilePath localPath, bool test)
{
@@ -67,38 +67,38 @@ static void GetFiles (List<FilePath> files, IWorkspaceObject entry)
return true;
return false;
}
- }
-
- internal class PublishWorker : Task {
- Repository vc;
- FilePath path;
- string moduleName;
- FilePath[] files;
- string message;
-
- public PublishWorker (Repository vc, string moduleName, FilePath localPath, FilePath[] files, string message)
- {
- this.vc = vc;
- this.path = localPath;
- this.moduleName = moduleName;
- this.files = files;
- this.message = message;
- OperationType = VersionControlOperationType.Push;
- }
- protected override string GetDescription ()
- {
- return GettextCatalog.GetString ("Publishing \"{0}\" Project...", moduleName);
- }
-
- protected override void Run ()
- {
- vc.Publish (moduleName, path, files, message, Monitor);
- Monitor.ReportSuccess (GettextCatalog.GetString ("Publish operation completed."));
-
- Gtk.Application.Invoke (delegate {
- VersionControlService.NotifyFileStatusChanged (new FileUpdateEventArgs (vc, path, true));
- });
+ class PublishWorker : Task {
+ Repository vc;
+ FilePath path;
+ string moduleName;
+ FilePath[] files;
+ string message;
+
+ public PublishWorker (Repository vc, string moduleName, FilePath localPath, FilePath[] files, string message)
+ {
+ this.vc = vc;
+ this.path = localPath;
+ this.moduleName = moduleName;
+ this.files = files;
+ this.message = message;
+ OperationType = VersionControlOperationType.Push;
+ }
+
+ protected override string GetDescription ()
+ {
+ return GettextCatalog.GetString ("Publishing \"{0}\" Project...", moduleName);
+ }
+
+ protected override void Run ()
+ {
+ vc.Publish (moduleName, path, files, message, Monitor);
+ Monitor.ReportSuccess (GettextCatalog.GetString ("Publish operation completed."));
+
+ Gtk.Application.Invoke (delegate {
+ VersionControlService.NotifyFileStatusChanged (new FileUpdateEventArgs (vc, path, true));
+ });
+ }
}
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
===================================================================
@@ -29,12 +29,12 @@ public FilePath RootPath
public event EventHandler NameChanged;
- public Repository ()
+ protected Repository ()
{
infoCache = new VersionInfoCache (this);
}
- public Repository (VersionControlSystem vcs): this ()
+ protected Repository (VersionControlSystem vcs): this ()
{
VersionControlSystem = vcs;
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ResolveConflictsCommand.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl
{
- public class ResolveConflictsCommand
+ static class ResolveConflictsCommand
{
public static bool ResolveConflicts (VersionControlItemList list, bool test)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs
===================================================================
@@ -7,9 +7,8 @@
namespace MonoDevelop.VersionControl
{
- internal class RevertCommand
+ static class RevertCommand
{
-
public static bool Revert (VersionControlItemList items, bool test)
{
if (RevertInternal (items, test)) {
@@ -20,7 +19,7 @@ public static bool Revert (VersionControlItemList items, bool test)
return false;
}
- private static bool RevertInternal (VersionControlItemList items, bool test)
+ static bool RevertInternal (VersionControlItemList items, bool test)
{
try {
if (test)
@@ -43,22 +42,22 @@ private static bool RevertInternal (VersionControlItemList items, bool test)
}
}
- private class RevertWorker : Task {
+ class RevertWorker : Task {
VersionControlItemList items;
-
+
public RevertWorker (VersionControlItemList items) {
this.items = items;
}
-
+
protected override string GetDescription() {
return GettextCatalog.GetString ("Reverting ...");
}
-
+
protected override void Run ()
{
foreach (VersionControlItemList list in items.SplitByRepository ())
list[0].Repository.Revert (list.Paths, true, Monitor);
-
+
Monitor.ReportSuccess (GettextCatalog.GetString ("Revert operation completed."));
Gtk.Application.Invoke (delegate {
foreach (VersionControlItem item in items) {
@@ -74,6 +73,5 @@ protected override void Run ()
});
}
}
-
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- internal class RevertRevisionsCommands
+ static class RevertRevisionsCommands
{
public static bool RevertRevision (Repository vc, string path, Revision revision, bool test)
{
@@ -75,7 +75,7 @@ private static bool RevertRevisions (Repository vc, string path, Revision revisi
}
}
- private class RevertWorker : Task {
+ class RevertWorker : Task {
Repository vc;
string path;
Revision revision;
@@ -130,6 +130,5 @@ protected override void Run ()
});
}
}
-
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs
===================================================================
@@ -6,7 +6,7 @@
namespace MonoDevelop.VersionControl
{
- internal abstract class Task
+ abstract class Task
{
IProgressMonitor tracker;
ThreadNotify threadnotify;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnknownRepository.cs
===================================================================
@@ -7,7 +7,7 @@
namespace MonoDevelop.VersionControl
{
- public class UnknownRepository: Repository, IExtendedDataItem
+ public sealed class UnknownRepository: Repository, IExtendedDataItem
{
Hashtable properties;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs
===================================================================
@@ -32,7 +32,7 @@ namespace MonoDevelop.VersionControl
{
- public class UnlockCommand
+ static class UnlockCommand
{
public static bool Unlock (VersionControlItemList items, bool test)
{
@@ -45,7 +45,7 @@ public static bool Unlock (VersionControlItemList items, bool test)
return true;
}
- private class UnlockWorker : Task
+ class UnlockWorker : Task
{
VersionControlItemList items;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs
===================================================================
@@ -3,7 +3,7 @@
namespace MonoDevelop.VersionControl
{
- internal class UpdateCommand
+ static class UpdateCommand
{
public static bool Update (VersionControlItemList items, bool test)
{
@@ -16,7 +16,7 @@ public static bool Update (VersionControlItemList items, bool test)
return true;
}
- private class UpdateWorker : Task {
+ class UpdateWorker : Task {
VersionControlItemList items;
public UpdateWorker (VersionControlItemList items) {
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepository.cs
===================================================================
@@ -9,11 +9,11 @@ public abstract class UrlBasedRepository: Repository, ICustomDataItem
string url;
Uri uri;
- public UrlBasedRepository ()
+ protected UrlBasedRepository ()
{
}
- public UrlBasedRepository (VersionControlSystem vcs): base (vcs)
+ protected UrlBasedRepository (VersionControlSystem vcs): base (vcs)
{
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlConfiguration.cs
===================================================================
@@ -4,7 +4,7 @@
namespace MonoDevelop.VersionControl
{
- class VersionControlConfiguration
+ sealed class VersionControlConfiguration
{
[ItemProperty ("Repositories")]
List<Repository> repositories = new List<Repository> ();
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs
===================================================================
@@ -10,7 +10,7 @@
namespace MonoDevelop.VersionControl
{
- internal class VersionControlFileSystemExtension: FileSystemExtension
+ class VersionControlFileSystemExtension: FileSystemExtension
{
public override bool CanHandlePath (FilePath path, bool isDirectory)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItem.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionControlItem
+ public sealed class VersionControlItem
{
FilePath path;
bool isDirectory;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItemList.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionControlItemList: List<VersionControlItem>
+ public sealed class VersionControlItemList: List<VersionControlItem>
{
public VersionControlItemList[] SplitByRepository ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
===================================================================
@@ -251,7 +251,7 @@ internal static string GetPath (object dataObject)
- class AddinCommandHandler : VersionControlCommandHandler
+ sealed class AddinCommandHandler : VersionControlCommandHandler
{
[AllowMultiSelection]
[CommandHandler (Commands.Update)]
@@ -428,7 +428,7 @@ protected void UpdateResolveConflicts (CommandInfo item)
TestCommand (Commands.ResolveConflicts, item, false);
}
- private void TestCommand(Commands cmd, CommandInfo item, bool projRecurse = true)
+ void TestCommand(Commands cmd, CommandInfo item, bool projRecurse = true)
{
TestResult res = RunCommand(cmd, true, projRecurse);
if (res == TestResult.NoVersionControl && cmd == Commands.Log) {
@@ -443,7 +443,7 @@ private void TestCommand(Commands cmd, CommandInfo item, bool projRecurse = true
item.Visible = res == TestResult.Enable;
}
- private TestResult RunCommand (Commands cmd, bool test, bool projRecurse = true)
+ TestResult RunCommand (Commands cmd, bool test, bool projRecurse = true)
{
VersionControlItemList items = GetItems (projRecurse);
@@ -530,7 +530,7 @@ public override void RefreshItem ()
}
}
- class OpenCommandHandler : VersionControlCommandHandler
+ sealed class OpenCommandHandler : VersionControlCommandHandler
{
[AllowMultiSelection]
[CommandHandler (ViewCommands.Open)]
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlPolicy.cs
===================================================================
@@ -33,7 +33,7 @@ namespace MonoDevelop.VersionControl
{
[PolicyType ("Version control commit message style")]
[DataItem ("VersionControlPolicy")]
- public class VersionControlPolicy: IEquatable<VersionControlPolicy>
+ public sealed class VersionControlPolicy: IEquatable<VersionControlPolicy>
{
public VersionControlPolicy()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
===================================================================
@@ -19,7 +19,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionControlService
+ public static class VersionControlService
{
static Gdk.Pixbuf overlay_modified;
static Gdk.Pixbuf overlay_removed;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfo.cs
===================================================================
@@ -3,7 +3,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionInfo
+ public sealed class VersionInfo
{
FilePath localPath;
string repositoryPath;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfoCache.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl
{
- class VersionInfoCache
+ sealed class VersionInfoCache
{
Dictionary<FilePath,VersionInfo> fileStatus = new Dictionary<FilePath, VersionInfo> ();
Dictionary<FilePath,DirectoryStatus> directoryStatus = new Dictionary<FilePath, DirectoryStatus> ();
@@ -137,7 +137,7 @@ public void SetDirectoryStatus (FilePath localDirectory, VersionInfo[] versionIn
}
}
- class DirectoryStatus
+ sealed class DirectoryStatus
{
public VersionInfo[] FileInfo { get; set; }
public bool HasRemoteStatus { get; set; }
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.