github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-19 21:13:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup [skip ci]

Browse source
This commit is contained in:
Robin 2016-08-16 17:39:56 +02:00
commit 5685531770
3 changed files with 7 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

9
GreenshotJiraPlugin/JiraConnector.cs
View file

@ -42,11 +42,6 @@ namespace GreenshotJiraPlugin {
private JiraApi _jiraApi; private JiraApi _jiraApi;
public void Dispose() { public void Dispose() {
Dispose(true);
GC.SuppressFinalize(this);
}
protected void Dispose(bool disposing) {
if (_jiraApi != null) if (_jiraApi != null)
{ {
Task.Run(async () => await Logout()).Wait(); Task.Run(async () => await Logout()).Wait();
@ -59,10 +54,6 @@ namespace GreenshotJiraPlugin {
_jiraApi = new JiraApi(new Uri(_url)); _jiraApi = new JiraApi(new Uri(_url));
} }
~JiraConnector() {
Dispose(false);
}
/// <summary> /// <summary>
/// Internal login which catches the exceptions /// Internal login which catches the exceptions
/// </summary> /// </summary>

19
GreenshotJiraPlugin/JiraDestination.cs
View file

@ -52,11 +52,7 @@ namespace GreenshotJiraPlugin {
_jira = jira; _jira = jira;
} }
public override string Designation { public override string Designation => "Jira";
get {
return "Jira";
}
}
private string FormatUpload(Issue jira) { private string FormatUpload(Issue jira) {
return Designation + " - " + jira.Key + ": " + jira.Fields.Summary.Substring(0, Math.Min(20, jira.Fields.Summary.Length)); return Designation + " - " + jira.Key + ": " + jira.Fields.Summary.Substring(0, Math.Min(20, jira.Fields.Summary.Length));
@ -72,17 +68,10 @@ namespace GreenshotJiraPlugin {
} }
} }
public override bool isActive { public override bool isActive => base.isActive && !string.IsNullOrEmpty(Config.Url);
get {
return base.isActive && !string.IsNullOrEmpty(Config.Url); public override bool isDynamic => true;
}
}
public override bool isDynamic {
get {
return true;
}
}
public override Image DisplayIcon { public override Image DisplayIcon {
get { get {
var resources = new ComponentResourceManager(typeof(JiraPlugin)); var resources = new ComponentResourceManager(typeof(JiraPlugin));

23
GreenshotJiraPlugin/JiraPlugin.cs
View file

@ -32,7 +32,6 @@ namespace GreenshotJiraPlugin {
/// </summary> /// </summary>
public class JiraPlugin : IGreenshotPlugin { public class JiraPlugin : IGreenshotPlugin {
private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(typeof(JiraPlugin)); private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(typeof(JiraPlugin));
private PluginAttribute _jiraPluginAttributes;
private JiraConnector _jiraConnector; private JiraConnector _jiraConnector;
private JiraConfiguration _config; private JiraConfiguration _config;
private static JiraPlugin _instance; private static JiraPlugin _instance;
@ -51,21 +50,11 @@ namespace GreenshotJiraPlugin {
} }
} }
public static JiraPlugin Instance { public static JiraPlugin Instance => _instance;
get {
return _instance;
}
}
public JiraPlugin() { public JiraPlugin() {
_instance = this; _instance = this;
} }
public PluginAttribute JiraPluginAttributes {
get {
return _jiraPluginAttributes;
}
}
public IEnumerable<IDestination> Destinations() { public IEnumerable<IDestination> Destinations() {
yield return new JiraDestination(this); yield return new JiraDestination(this);
@ -76,12 +65,8 @@ namespace GreenshotJiraPlugin {
} }
//Needed for a fail-fast //Needed for a fail-fast
public JiraConnector CurrentJiraConnector { public JiraConnector CurrentJiraConnector => _jiraConnector;
get {
return _jiraConnector;
}
}
public JiraConnector JiraConnector { public JiraConnector JiraConnector {
get { get {
if (_jiraConnector == null) { if (_jiraConnector == null) {
@ -98,8 +83,6 @@ namespace GreenshotJiraPlugin {
/// <param name="myAttributes">My own attributes</param> /// <param name="myAttributes">My own attributes</param>
/// <returns>true if plugin is initialized, false if not (doesn't show)</returns> /// <returns>true if plugin is initialized, false if not (doesn't show)</returns>
public bool Initialize(IGreenshotHost pluginHost, PluginAttribute myAttributes) { public bool Initialize(IGreenshotHost pluginHost, PluginAttribute myAttributes) {
_jiraPluginAttributes = myAttributes;
// Register configuration (don't need the configuration itself) // Register configuration (don't need the configuration itself)
_config = IniConfig.GetIniSection<JiraConfiguration>(); _config = IniConfig.GetIniSection<JiraConfiguration>();
return true; return true;