Moving back to trunk!

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1602 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-01-24 19:24:36 +00:00
commit 8d458998a1
332 changed files with 17647 additions and 9466 deletions

View file

@ -20,14 +20,11 @@
*/
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Reflection;
using System.Runtime.Serialization;
using Greenshot.Configuration;
using Greenshot.Helpers;
using GreenshotPlugin.Core;
using IniFile;
namespace Greenshot.Drawing.Fields {
/// <summary>
@ -61,7 +58,11 @@ namespace Greenshot.Drawing.Fields {
fieldsByType = new Dictionary<FieldType, Field>();
// listen to changing properties
foreach(Field field in fields) {
field.PropertyChanged += delegate { if(fieldChanged != null) fieldChanged(this, new FieldChangedEventArgs(field)); };
field.PropertyChanged += delegate {
if (fieldChanged != null) {
fieldChanged(this, new FieldChangedEventArgs(field));
}
};
fieldsByType[field.FieldType] = field;
}
}
@ -71,8 +72,8 @@ namespace Greenshot.Drawing.Fields {
}
public virtual void AddField(Field field) {
if(fieldsByType != null && fieldsByType.ContainsKey(field.FieldType)) {
if(LOG.IsDebugEnabled) {
if (fieldsByType != null && fieldsByType.ContainsKey(field.FieldType)) {
if (LOG.IsDebugEnabled) {
LOG.DebugFormat("A field with of type '{0}' already exists in this {1}, will overwrite.", field.FieldType, GetType());
}
}
@ -85,7 +86,11 @@ namespace Greenshot.Drawing.Fields {
public void RemoveField(Field field) {
fields.Remove(field);
fieldsByType.Remove(field.FieldType);
field.PropertyChanged -= delegate { if(fieldChanged != null) fieldChanged(this, new FieldChangedEventArgs(field)); };
field.PropertyChanged -= delegate {
if (fieldChanged != null) {
fieldChanged(this, new FieldChangedEventArgs(field));
}
};
}
public List<Field> GetFields() {
@ -97,7 +102,7 @@ namespace Greenshot.Drawing.Fields {
try {
return fieldsByType[fieldType];
} catch(KeyNotFoundException e) {
throw new ArgumentException("Field '"+fieldType+"' does not exist in " + GetType(), e);
throw new ArgumentException("Field '" + fieldType + "' does not exist in " + GetType(), e);
}
}
@ -152,8 +157,9 @@ namespace Greenshot.Drawing.Fields {
}
protected void OnFieldChanged(object sender, FieldChangedEventArgs e){
if(fieldChanged != null) fieldChanged(sender, e);
if (fieldChanged != null) {
fieldChanged(sender, e);
}
}
}
}