github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-30 19:50:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'remotes/origin/master' into release/1.2.9

Browse source
This commit is contained in:
Robin 2016-05-24 13:13:48 +02:00
commit 0323705513
276 changed files with 5382 additions and 3666 deletions
Download patch file Download diff file Expand all files Collapse all files

8
GreenshotConfluencePlugin/EnumDisplayer.cs
View file

@ -40,7 +40,7 @@ namespace GreenshotConfluencePlugin {
}
public EnumDisplayer(Type type) {
this.Type = type;
Type = type;
}
public Type Type {
@ -49,15 +49,15 @@ namespace GreenshotConfluencePlugin {
if (!value.IsEnum) {
throw new ArgumentException("parameter is not an Enumerated type", "value");
}
this.type = value;
type = value;
}
}
public ReadOnlyCollection<string> DisplayNames {
get {
this.reverseValues = (IDictionary) Activator.CreateInstance(typeof(Dictionary<,>).GetGenericTypeDefinition().MakeGenericType(typeof(string),type));
reverseValues = (IDictionary) Activator.CreateInstance(typeof(Dictionary<,>).GetGenericTypeDefinition().MakeGenericType(typeof(string),type));
this.displayValues = (IDictionary)Activator.CreateInstance(typeof(Dictionary<,>).GetGenericTypeDefinition().MakeGenericType(type, typeof(string)));
displayValues = (IDictionary)Activator.CreateInstance(typeof(Dictionary<,>).GetGenericTypeDefinition().MakeGenericType(type, typeof(string)));
var fields = type.GetFields(BindingFlags.Public | BindingFlags.Static);
foreach (var field in fields) {