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

FEATURE-731: Backport of the title detection code

Browse source
This commit is contained in:
Robin 2016-09-03 23:32:24 +02:00
commit 1d0bdf23c1
17 changed files with 1080 additions and 447 deletions
Download patch file Download diff file Expand all files Collapse all files

37
GreenshotJiraPlugin/JiraPlugin.cs
View file

@ -33,9 +33,9 @@ namespace GreenshotJiraPlugin {
/// </summary>
public class JiraPlugin : IGreenshotPlugin {
private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(typeof(JiraPlugin));
private JiraConnector _jiraConnector;
private JiraConfiguration _config;
private static JiraPlugin _instance;
private JiraConnector _jiraConnector;
public void Dispose() {
Dispose(true);
@ -44,9 +44,9 @@ namespace GreenshotJiraPlugin {
protected void Dispose(bool disposing) {
if (disposing) {
if (_jiraConnector != null) {
_jiraConnector.Dispose();
_jiraConnector = null;
if (JiraConnector != null) {
JiraConnector.Dispose();
JiraConnector = null;
}
}
}
@ -66,9 +66,23 @@ namespace GreenshotJiraPlugin {
}
//Needed for a fail-fast
public JiraConnector CurrentJiraConnector => _jiraConnector;
public JiraConnector CurrentJiraConnector => JiraConnector;
public JiraConnector JiraConnector => _jiraConnector ?? (_jiraConnector = new JiraConnector());
public JiraConnector JiraConnector
{
get
{
lock (_instance)
{
if (_jiraConnector == null)
{
JiraConnector = new JiraConnector();
}
}
return _jiraConnector;
}
private set { _jiraConnector = value; }
}
/// <summary>
/// Implementation of the IGreenshotPlugin.Initialize
@ -80,14 +94,15 @@ namespace GreenshotJiraPlugin {
// Register configuration (don't need the configuration itself)
_config = IniConfig.GetIniSection<JiraConfiguration>();
LogSettings.RegisterDefaultLogger<Log4NetLogger>();
return true;
}
public void Shutdown() {
Log.Debug("Jira Plugin shutdown.");
if (_jiraConnector != null)
if (JiraConnector != null)
{
Task.Run(async () => await _jiraConnector.Logout());
Task.Run(async () => await JiraConnector.LogoutAsync());
}
}
@ -98,12 +113,12 @@ namespace GreenshotJiraPlugin {
string url = _config.Url;
if (ShowConfigDialog()) {
// check for re-login
if (_jiraConnector != null && _jiraConnector.IsLoggedIn && !string.IsNullOrEmpty(url)) {
if (JiraConnector != null && JiraConnector.IsLoggedIn && !string.IsNullOrEmpty(url)) {
if (!url.Equals(_config.Url)) {
Task.Run(async () =>
{
await _jiraConnector.Logout();
await _jiraConnector.Login();
await JiraConnector.LogoutAsync();
await JiraConnector.LoginAsync();
});
}
}