github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-15 09:33:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Added fail-fast for Confluence & Jira, this prevents slow-down in the Destination-Picker when moving over the Jira or Confluence destination and no login was made.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1794 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-04-18 10:25:12 +00:00
parent 63cfb8b3ee
commit d73d80fe1a
4 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
GreenshotConfluencePlugin/ConfluenceDestination.cs
View file

@ -92,7 +92,7 @@ namespace GreenshotConfluencePlugin {
} }
public override IEnumerable<IDestination> DynamicDestinations() { public override IEnumerable<IDestination> DynamicDestinations() {
if (!ConfluencePlugin.ConfluenceConnectorNoLogin.isLoggedIn) { if (ConfluencePlugin.ConfluenceConnectorNoLogin == null || !ConfluencePlugin.ConfluenceConnectorNoLogin.isLoggedIn) {
yield break; yield break;
} }
List<Confluence.Page> currentPages = ConfluenceUtils.GetCurrentPages(); List<Confluence.Page> currentPages = ConfluenceUtils.GetCurrentPages();

21
GreenshotConfluencePlugin/ConfluencePlugin.cs
View file

@ -41,16 +41,19 @@ namespace GreenshotConfluencePlugin {
private static PluginAttribute ConfluencePluginAttributes; private static PluginAttribute ConfluencePluginAttributes;
private static ConfluenceConfiguration config = null; private static ConfluenceConfiguration config = null;
private static IGreenshotHost host; private static IGreenshotHost host;
private static void CreateConfluenceConntector() {
if (confluenceConnector == null) {
if (config.Url.Contains("soap-axis")) {
confluenceConnector = new ConfluenceConnector(config.Url, config.Timeout);
} else {
confluenceConnector = new ConfluenceConnector(config.Url + ConfluenceConfiguration.DEFAULT_POSTFIX, config.Timeout);
}
}
}
public static ConfluenceConnector ConfluenceConnectorNoLogin { public static ConfluenceConnector ConfluenceConnectorNoLogin {
get { get {
if (confluenceConnector == null) {
if (config.Url.Contains("soap-axis")) {
confluenceConnector = new ConfluenceConnector(config.Url, config.Timeout);
} else {
confluenceConnector = new ConfluenceConnector(config.Url + ConfluenceConfiguration.DEFAULT_POSTFIX, config.Timeout);
}
}
return confluenceConnector; return confluenceConnector;
} }
} }
@ -58,7 +61,7 @@ namespace GreenshotConfluencePlugin {
public static ConfluenceConnector ConfluenceConnector { public static ConfluenceConnector ConfluenceConnector {
get { get {
if (confluenceConnector == null) { if (confluenceConnector == null) {
confluenceConnector = ConfluenceConnectorNoLogin; CreateConfluenceConntector();
} }
try { try {
if (!confluenceConnector.isLoggedIn) { if (!confluenceConnector.isLoggedIn) {

3
GreenshotJiraPlugin/JiraDestination.cs
View file

@ -86,8 +86,7 @@ namespace GreenshotJiraPlugin {
} }
public override IEnumerable<IDestination> DynamicDestinations() { public override IEnumerable<IDestination> DynamicDestinations() {
// Fail fast would be like this: if (JiraPlugin.Instance.CurrentJiraConnector == null || !JiraPlugin.Instance.JiraConnector.isLoggedIn) { if (JiraPlugin.Instance.CurrentJiraConnector == null || !JiraPlugin.Instance.CurrentJiraConnector.isLoggedIn) {
if (!JiraPlugin.Instance.JiraConnector.isLoggedIn) {
yield break; yield break;
} }
List<JiraIssue> issues = JiraUtils.GetCurrentJiras(); List<JiraIssue> issues = JiraUtils.GetCurrentJiras();

10
GreenshotJiraPlugin/JiraPlugin.cs
View file

@ -75,11 +75,11 @@ namespace GreenshotJiraPlugin {
} }
//Needed for a fail-fast //Needed for a fail-fast
//public JiraConnector CurrentJiraConnector { public JiraConnector CurrentJiraConnector {
// get { get {
// return jiraConnector; return jiraConnector;
// } }
//} }
public JiraConnector JiraConnector { public JiraConnector JiraConnector {
get { get {