From 0424692315363984ef8219d47255f6c3863d7b0f Mon Sep 17 00:00:00 2001 From: RKrom Date: Thu, 23 Sep 2010 09:09:33 +0000 Subject: [PATCH] Small cleanups git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@902 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4 --- Greenshot-OCR-Plugin/OCRPlugin.cs | 2 +- Greenshot-RunAtOutput-Plugin/RunAtOutput.cs | 2 +- Greenshot-RunAtOutput-Plugin/SettingsForm.cs | 2 +- Greenshot-TitleFix-Plugin/TitleFix.cs | 2 +- Greenshot/Forms/CaptureForm.cs | 2 +- GreenshotConfluencePlugin/Confluence.cs | 2 +- .../ConfluencePluginBase.cs | 2 +- GreenshotCore/Core/ConfigHelper.cs | 2 +- GreenshotCore/Core/LanguageHelper.cs | 4 ++-- GreenshotCore/Core/PropertyHelper.cs | 2 +- GreenshotCore/Forms/SaveImageFileDialog.cs | 2 +- GreenshotCore/Forms/SettingsForm.cs | 2 +- GreenshotCore/Helpers/HotkeyHelper.cs | 2 +- GreenshotCore/Helpers/ImageHelper.cs | 2 +- GreenshotCore/Helpers/PluginHelper.cs | 3 +-- GreenshotCore/Helpers/WindowCapture.cs | 2 +- GreenshotCore/Helpers/WindowsHelper.cs | 2 +- GreenshotEditor/Drawing/BitmapBuffer.cs | 2 +- GreenshotEditor/Drawing/BitmapContainer.cs | 2 +- GreenshotEditor/Drawing/CursorContainer.cs | 2 +- .../Drawing/Filters/FastSmoothFilter.cs | 2 +- GreenshotEditor/Drawing/HtmlContainer.cs | 2 +- GreenshotEditor/Drawing/IconContainer.cs | 2 +- GreenshotEditor/Drawing/MetafileContainer.cs | 2 +- GreenshotEditor/Drawing/Surface.cs | 2 +- GreenshotEditor/Drawing/UrlContainer.cs | 2 +- GreenshotEditor/Helpers/WebToBitmap.cs | 2 +- GreenshotFlickrPlugin/FlickrPlugin.cs | 2 +- GreenshotJiraPlugin/Forms/JiraForm.cs | 20 +++++++++---------- GreenshotJiraPlugin/JiraPluginBase.cs | 2 +- 30 files changed, 40 insertions(+), 41 deletions(-) diff --git a/Greenshot-OCR-Plugin/OCRPlugin.cs b/Greenshot-OCR-Plugin/OCRPlugin.cs index fac3b002c..baee466ab 100644 --- a/Greenshot-OCR-Plugin/OCRPlugin.cs +++ b/Greenshot-OCR-Plugin/OCRPlugin.cs @@ -38,7 +38,7 @@ namespace GreenshotOCR { /// OCR Plugin Greenshot /// public class OcrPlugin : IGreenshotPlugin { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(OcrPlugin)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(OcrPlugin)); private const string MODI_OFFICE11 = @"Software\Microsoft\Office\11.0\MODI"; private const string MODI_OFFICE12 = @"Software\Microsoft\Office\12.0\MODI"; diff --git a/Greenshot-RunAtOutput-Plugin/RunAtOutput.cs b/Greenshot-RunAtOutput-Plugin/RunAtOutput.cs index 6ac5f8cd0..8cc276161 100644 --- a/Greenshot-RunAtOutput-Plugin/RunAtOutput.cs +++ b/Greenshot-RunAtOutput-Plugin/RunAtOutput.cs @@ -37,7 +37,7 @@ namespace RunAtOutput { /// An Plugin to run commands after an image was written /// public class RunAtOutputPlugin : IGreenshotPlugin { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(RunAtOutputPlugin)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(RunAtOutputPlugin)); private IGreenshotPluginHost host; private ICaptureHost captureHost = null; private PluginAttribute myAttributes; diff --git a/Greenshot-RunAtOutput-Plugin/SettingsForm.cs b/Greenshot-RunAtOutput-Plugin/SettingsForm.cs index fdeb0e220..6aa715e90 100644 --- a/Greenshot-RunAtOutput-Plugin/SettingsForm.cs +++ b/Greenshot-RunAtOutput-Plugin/SettingsForm.cs @@ -29,7 +29,7 @@ namespace RunAtOutput { /// Description of SettingsForm. /// public partial class SettingsForm : Form { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(SettingsForm)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(SettingsForm)); private RunAtOutputConfiguration config; public SettingsForm() { diff --git a/Greenshot-TitleFix-Plugin/TitleFix.cs b/Greenshot-TitleFix-Plugin/TitleFix.cs index 3a5cc58b6..23ab6c936 100644 --- a/Greenshot-TitleFix-Plugin/TitleFix.cs +++ b/Greenshot-TitleFix-Plugin/TitleFix.cs @@ -34,7 +34,7 @@ namespace TitleFix { /// An example Plugin so developers can see how they can develop their own plugin /// public class TitleFix : IGreenshotPlugin { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(TitleFix)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(TitleFix)); private IGreenshotPluginHost host; private ICaptureHost captureHost = null; diff --git a/Greenshot/Forms/CaptureForm.cs b/Greenshot/Forms/CaptureForm.cs index 54929abff..e568eb89e 100644 --- a/Greenshot/Forms/CaptureForm.cs +++ b/Greenshot/Forms/CaptureForm.cs @@ -42,7 +42,7 @@ namespace Greenshot.Forms { /// Description of CaptureForm. /// public partial class CaptureForm : Form, ICaptureHost { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(CaptureForm)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(CaptureForm)); private int mX; private int mY; diff --git a/GreenshotConfluencePlugin/Confluence.cs b/GreenshotConfluencePlugin/Confluence.cs index 2e0589230..d76e1fd8e 100644 --- a/GreenshotConfluencePlugin/Confluence.cs +++ b/GreenshotConfluencePlugin/Confluence.cs @@ -89,7 +89,7 @@ namespace Confluence { this.credentials = null; e.Data.Add("user", user); e.Data.Add("url", url); - throw e; + throw; } return true; } diff --git a/GreenshotConfluencePlugin/ConfluencePluginBase.cs b/GreenshotConfluencePlugin/ConfluencePluginBase.cs index 431239358..cd2b50a22 100644 --- a/GreenshotConfluencePlugin/ConfluencePluginBase.cs +++ b/GreenshotConfluencePlugin/ConfluencePluginBase.cs @@ -37,7 +37,7 @@ namespace GreenshotConfluencePlugin { /// This is the ConfluencePlugin base code /// public class ConfluencePlugin : IGreenshotPlugin { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(ConfluencePlugin)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(ConfluencePlugin)); private ILanguage lang = Language.GetInstance(); private IGreenshotPluginHost host; private ICaptureHost captureHost = null; diff --git a/GreenshotCore/Core/ConfigHelper.cs b/GreenshotCore/Core/ConfigHelper.cs index e9bef593a..2b3be3285 100644 --- a/GreenshotCore/Core/ConfigHelper.cs +++ b/GreenshotCore/Core/ConfigHelper.cs @@ -79,7 +79,7 @@ namespace Greenshot.Core { } public class IniConfig { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(IniConfig)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(IniConfig)); private const string CONFIG_FILE_NAME = "greenshot.ini"; private const string DEFAULTS_CONFIG_FILE_NAME = "greenshot-defaults.ini"; diff --git a/GreenshotCore/Core/LanguageHelper.cs b/GreenshotCore/Core/LanguageHelper.cs index 13b977b69..240116fa5 100644 --- a/GreenshotCore/Core/LanguageHelper.cs +++ b/GreenshotCore/Core/LanguageHelper.cs @@ -60,7 +60,7 @@ namespace Greenshot.Core { /// Description of Language. /// public class LanguageContainer : ILanguage { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(LanguageContainer)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(LanguageContainer)); private static char [] TRIMCHARS = new char[] {' ', '\t', '\n', '\r'}; private const string DEFAULT_LANGUAGE= "en-US"; private static string APPLICATIONDATA_LANGUAGE_PATH = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),@"Greenshot\Languages\"); @@ -350,7 +350,7 @@ namespace Greenshot.Core { public class LanguageConfiguration { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(LanguageConfiguration)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(LanguageConfiguration)); public string description; public string Description {get;set;} diff --git a/GreenshotCore/Core/PropertyHelper.cs b/GreenshotCore/Core/PropertyHelper.cs index 94db0578d..29e3d4f6f 100644 --- a/GreenshotCore/Core/PropertyHelper.cs +++ b/GreenshotCore/Core/PropertyHelper.cs @@ -27,7 +27,7 @@ namespace Greenshot.Core { /// A Class to representate a simple "java" properties file /// public class Properties : Dictionary{ - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(Properties)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(Properties)); public string GetProperty(string key) { try { diff --git a/GreenshotCore/Forms/SaveImageFileDialog.cs b/GreenshotCore/Forms/SaveImageFileDialog.cs index 71ac839a0..ae98d10f1 100644 --- a/GreenshotCore/Forms/SaveImageFileDialog.cs +++ b/GreenshotCore/Forms/SaveImageFileDialog.cs @@ -38,7 +38,7 @@ namespace Greenshot.Forms { /// For some reason SFD is sealed :( /// public class SaveImageFileDialog { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(SaveImageFileDialog)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(SaveImageFileDialog)); protected SaveFileDialog saveFileDialog; private FilterOption[] filterOptions; private DirectoryInfo eagerlyCreatedDirectory; diff --git a/GreenshotCore/Forms/SettingsForm.cs b/GreenshotCore/Forms/SettingsForm.cs index 8ec770962..fd69aa2bc 100644 --- a/GreenshotCore/Forms/SettingsForm.cs +++ b/GreenshotCore/Forms/SettingsForm.cs @@ -37,7 +37,7 @@ namespace Greenshot { /// Description of SettingsForm. /// public partial class SettingsForm : Form { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(SettingsForm)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(SettingsForm)); ILanguage lang; private CoreConfiguration conf = IniConfig.GetIniSection(); private ToolTip toolTip; diff --git a/GreenshotCore/Helpers/HotkeyHelper.cs b/GreenshotCore/Helpers/HotkeyHelper.cs index 10167d168..87d3af23f 100644 --- a/GreenshotCore/Helpers/HotkeyHelper.cs +++ b/GreenshotCore/Helpers/HotkeyHelper.cs @@ -30,7 +30,7 @@ namespace Greenshot.Helpers { /// Description of HotkeyHelper. /// public class HotkeyHelper { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(HotkeyHelper)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(HotkeyHelper)); private const uint WM_HOTKEY = 0x312; public const uint VK_SNAPSHOT = 0x2C; diff --git a/GreenshotCore/Helpers/ImageHelper.cs b/GreenshotCore/Helpers/ImageHelper.cs index eb20ce49c..7d6891536 100644 --- a/GreenshotCore/Helpers/ImageHelper.cs +++ b/GreenshotCore/Helpers/ImageHelper.cs @@ -26,7 +26,7 @@ namespace Greenshot.Helpers { /// Description of ImageHelper. /// public class ImageHelper { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(ImageHelper)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(ImageHelper)); private ImageHelper() { } diff --git a/GreenshotCore/Helpers/PluginHelper.cs b/GreenshotCore/Helpers/PluginHelper.cs index 47a0fdd3d..9a7db7f64 100644 --- a/GreenshotCore/Helpers/PluginHelper.cs +++ b/GreenshotCore/Helpers/PluginHelper.cs @@ -166,8 +166,7 @@ namespace Greenshot.Helpers { } public bool RegisterHotKey(uint modifierKeyCode, uint virtualKeyCode, HotKeyHandler handler) { - //return HotkeyHelper.RegisterHotKey(MainForm.instance.Handle, modifierKeyCode, virtualKeyCode, handler); - return false; // TODO + return false; //HotkeyHelper.RegisterHotKey(MainForm.instance.Handle, modifierKeyCode, virtualKeyCode, handler); } #endregion diff --git a/GreenshotCore/Helpers/WindowCapture.cs b/GreenshotCore/Helpers/WindowCapture.cs index 733c0e40a..a4ba96137 100644 --- a/GreenshotCore/Helpers/WindowCapture.cs +++ b/GreenshotCore/Helpers/WindowCapture.cs @@ -104,7 +104,7 @@ namespace Greenshot.Helpers { /// Having the Bitmap, eventually the Windows Title and cursor all together. /// public class Capture : IDisposable, ICapture { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(Capture)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(Capture)); private Rectangle screenBounds; /// diff --git a/GreenshotCore/Helpers/WindowsHelper.cs b/GreenshotCore/Helpers/WindowsHelper.cs index a7a3cc08a..dd1f19e5e 100644 --- a/GreenshotCore/Helpers/WindowsHelper.cs +++ b/GreenshotCore/Helpers/WindowsHelper.cs @@ -216,7 +216,7 @@ namespace Greenshot.Helpers { /// enumeration /// public class WindowDetails { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(WindowDetails)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(WindowDetails)); private static Dictionary> classnameTree = new Dictionary>(); private const string CONFIG_FILE_NAME = "windowcontent.properties"; private static string configfilename = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),@"Greenshot\" + CONFIG_FILE_NAME); diff --git a/GreenshotEditor/Drawing/BitmapBuffer.cs b/GreenshotEditor/Drawing/BitmapBuffer.cs index 9eddc97c6..a26e42b39 100644 --- a/GreenshotEditor/Drawing/BitmapBuffer.cs +++ b/GreenshotEditor/Drawing/BitmapBuffer.cs @@ -30,7 +30,7 @@ namespace Greenshot.Drawing { /// [Serializable()] public unsafe class BitmapBuffer : IDisposable { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(BitmapBuffer)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(BitmapBuffer)); private Bitmap bitmap; public Bitmap Bitmap { get {return bitmap;} diff --git a/GreenshotEditor/Drawing/BitmapContainer.cs b/GreenshotEditor/Drawing/BitmapContainer.cs index 7cae6ae1c..5d9923ad6 100644 --- a/GreenshotEditor/Drawing/BitmapContainer.cs +++ b/GreenshotEditor/Drawing/BitmapContainer.cs @@ -32,7 +32,7 @@ namespace Greenshot.Drawing { /// [Serializable()] public class BitmapContainer : DrawableContainer, IBitmapContainer { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(BitmapContainer)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(BitmapContainer)); protected Bitmap bitmap; diff --git a/GreenshotEditor/Drawing/CursorContainer.cs b/GreenshotEditor/Drawing/CursorContainer.cs index ed7527801..661ac13d4 100644 --- a/GreenshotEditor/Drawing/CursorContainer.cs +++ b/GreenshotEditor/Drawing/CursorContainer.cs @@ -33,7 +33,7 @@ namespace Greenshot.Drawing { /// [Serializable()] public class CursorContainer : DrawableContainer, ICursorContainer { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(CursorContainer)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(CursorContainer)); protected Cursor cursor; diff --git a/GreenshotEditor/Drawing/Filters/FastSmoothFilter.cs b/GreenshotEditor/Drawing/Filters/FastSmoothFilter.cs index e1ae9122c..05435e993 100644 --- a/GreenshotEditor/Drawing/Filters/FastSmoothFilter.cs +++ b/GreenshotEditor/Drawing/Filters/FastSmoothFilter.cs @@ -28,7 +28,7 @@ using Greenshot.Drawing.Fields; namespace Greenshot.Drawing.Filters { [Serializable()] public class FastSmoothFilter : AbstractFilter { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(FastSmoothFilter)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(FastSmoothFilter)); public FastSmoothFilter(DrawableContainer parent) : base(parent) { AddField(FieldFactory.CreateField(FieldType.BLUR_RADIUS, GetType())); diff --git a/GreenshotEditor/Drawing/HtmlContainer.cs b/GreenshotEditor/Drawing/HtmlContainer.cs index bc628f9d1..80cf4b951 100644 --- a/GreenshotEditor/Drawing/HtmlContainer.cs +++ b/GreenshotEditor/Drawing/HtmlContainer.cs @@ -34,7 +34,7 @@ namespace Greenshot.Drawing { /// [Serializable()] public class HtmlContainer : DrawableContainer { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(HtmlContainer)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(HtmlContainer)); private const string SCRIPT_PATTERN = ""; private string html = null; private Bitmap bitmap = null; diff --git a/GreenshotEditor/Drawing/IconContainer.cs b/GreenshotEditor/Drawing/IconContainer.cs index cb7680969..5c1784343 100644 --- a/GreenshotEditor/Drawing/IconContainer.cs +++ b/GreenshotEditor/Drawing/IconContainer.cs @@ -32,7 +32,7 @@ namespace Greenshot.Drawing { /// [Serializable()] public class IconContainer : DrawableContainer, IIconContainer { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(IconContainer)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(IconContainer)); protected Icon icon; diff --git a/GreenshotEditor/Drawing/MetafileContainer.cs b/GreenshotEditor/Drawing/MetafileContainer.cs index a1948517f..ef3900472 100644 --- a/GreenshotEditor/Drawing/MetafileContainer.cs +++ b/GreenshotEditor/Drawing/MetafileContainer.cs @@ -33,7 +33,7 @@ namespace Greenshot.Drawing { /// [Serializable()] public class MetafileContainer : DrawableContainer, IMetafileContainer { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(MetafileContainer)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(MetafileContainer)); protected Metafile metafile; diff --git a/GreenshotEditor/Drawing/Surface.cs b/GreenshotEditor/Drawing/Surface.cs index 53e0cf743..9803cc1ca 100644 --- a/GreenshotEditor/Drawing/Surface.cs +++ b/GreenshotEditor/Drawing/Surface.cs @@ -45,7 +45,7 @@ namespace Greenshot.Drawing { /// Description of Surface. /// public class Surface : PictureBox, ISurface { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(Surface)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(Surface)); public event SurfaceElementEventHandler MovingElementChanged; public event SurfaceDrawingModeEventHandler DrawingModeChanged; diff --git a/GreenshotEditor/Drawing/UrlContainer.cs b/GreenshotEditor/Drawing/UrlContainer.cs index 7ff5be335..044f2f9f5 100644 --- a/GreenshotEditor/Drawing/UrlContainer.cs +++ b/GreenshotEditor/Drawing/UrlContainer.cs @@ -33,7 +33,7 @@ namespace Greenshot.Drawing { /// [Serializable()] public class UrlContainer : DrawableContainer { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(UrlContainer)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(UrlContainer)); protected Bitmap bitmap = null; protected string url = null; diff --git a/GreenshotEditor/Helpers/WebToBitmap.cs b/GreenshotEditor/Helpers/WebToBitmap.cs index 483c9d9b5..5e07a6d0c 100644 --- a/GreenshotEditor/Helpers/WebToBitmap.cs +++ b/GreenshotEditor/Helpers/WebToBitmap.cs @@ -27,7 +27,7 @@ using System.Reflection; namespace Greenshot.Helpers { public class WebsiteImageGenerator { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(WebsiteImageGenerator)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(WebsiteImageGenerator)); private const int MAX_HEIGHT = 2048; private const int MAX_WIDTH = 2048; diff --git a/GreenshotFlickrPlugin/FlickrPlugin.cs b/GreenshotFlickrPlugin/FlickrPlugin.cs index a354db9c4..a261bed05 100644 --- a/GreenshotFlickrPlugin/FlickrPlugin.cs +++ b/GreenshotFlickrPlugin/FlickrPlugin.cs @@ -40,7 +40,7 @@ namespace GreenshotFlickrPlugin { /// OCR Plugin Greenshot /// public class FlickrPlugin : IGreenshotPlugin { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(FlickrPlugin)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(FlickrPlugin)); private const string ApiKey = "f967e5148945cb3c4e149cc5be97796a"; private const string SharedSecret = "4180a21a1d2f8666"; private ILanguage lang = Language.GetInstance(); diff --git a/GreenshotJiraPlugin/Forms/JiraForm.cs b/GreenshotJiraPlugin/Forms/JiraForm.cs index 3d1eb8a59..4e4d04ac1 100644 --- a/GreenshotJiraPlugin/Forms/JiraForm.cs +++ b/GreenshotJiraPlugin/Forms/JiraForm.cs @@ -100,16 +100,16 @@ namespace GreenshotJiraPlugin { } public void upload(string text) { - jiraConnector.addAttachment(selectedIssue.key, jiraFilenameBox.Text, text); + jiraConnector.addAttachment(selectedIssue.Key, jiraFilenameBox.Text, text); if (jiraCommentBox.Text != null && jiraCommentBox.Text.Length > 0) { - jiraConnector.addComment(selectedIssue.key, jiraCommentBox.Text); + jiraConnector.addComment(selectedIssue.Key, jiraCommentBox.Text); } } public void upload(byte [] attachment) { - jiraConnector.addAttachment(selectedIssue.key, jiraFilenameBox.Text, attachment); + jiraConnector.addAttachment(selectedIssue.Key, jiraFilenameBox.Text, attachment); if (jiraCommentBox.Text != null && jiraCommentBox.Text.Length > 0) { - jiraConnector.addComment(selectedIssue.key, jiraCommentBox.Text); + jiraConnector.addComment(selectedIssue.Key, jiraCommentBox.Text); } } @@ -126,7 +126,7 @@ namespace GreenshotJiraPlugin { if (jiraConnector.isLoggedIn()) { JiraFilter filter = (JiraFilter)jiraFilterBox.SelectedItem; if (filter != null) { - JiraIssue[] issues = jiraConnector.getIssuesForFilter(filter.id); + JiraIssue[] issues = jiraConnector.getIssuesForFilter(filter.Id); jiraListView.BeginUpdate(); jiraListView.Items.Clear(); if (issues.Length > 0) { @@ -136,12 +136,12 @@ namespace GreenshotJiraPlugin { jiraListView.Columns.Add(language.GetString(column)); } foreach (JiraIssue issue in issues) { - ListViewItem item = new ListViewItem(issue.key); + ListViewItem item = new ListViewItem(issue.Key); item.Tag = issue; - item.SubItems.Add(issue.created.Value.ToString("d", DateTimeFormatInfo.InvariantInfo)); - item.SubItems.Add(issue.assignee); - item.SubItems.Add(issue.reporter); - item.SubItems.Add(issue.summary); + item.SubItems.Add(issue.Created.Value.ToString("d", DateTimeFormatInfo.InvariantInfo)); + item.SubItems.Add(issue.Assignee); + item.SubItems.Add(issue.Reporter); + item.SubItems.Add(issue.Summary); jiraListView.Items.Add(item); } for (int i = 0; i < columns.Length; i++) { diff --git a/GreenshotJiraPlugin/JiraPluginBase.cs b/GreenshotJiraPlugin/JiraPluginBase.cs index 85b836a1f..75bef8487 100644 --- a/GreenshotJiraPlugin/JiraPluginBase.cs +++ b/GreenshotJiraPlugin/JiraPluginBase.cs @@ -37,7 +37,7 @@ namespace GreenshotJiraPlugin { /// This is the JiraPlugin base code /// public class JiraPlugin : IGreenshotPlugin { - private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(JiraPlugin)); + private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(JiraPlugin)); private ILanguage lang = Language.GetInstance(); private IGreenshotPluginHost host; private ICaptureHost captureHost = null;