diff --git a/src/net/sourceforge/plantuml/klimt/creole/Display.java b/src/net/sourceforge/plantuml/klimt/creole/Display.java index 6fc1425cc..9442133a0 100644 --- a/src/net/sourceforge/plantuml/klimt/creole/Display.java +++ b/src/net/sourceforge/plantuml/klimt/creole/Display.java @@ -88,17 +88,17 @@ public class Display implements Iterable { public final static Display NULL = new Display(true, null, null, true, CreoleMode.FULL); -// @Override -// public int hashCode() { -// if (isNull) -// return 42; -// return displayData.hashCode(); -// } -// -// @Override -// public boolean equals(Object other) { -// return this.displayData.equals(((Display) other).displayData); -// } + @Override + public int hashCode() { + if (isNull) + return 42; + return displayData.hashCode(); + } + + @Override + public boolean equals(Object other) { + return this.displayData.equals(((Display) other).displayData); + } public boolean equalsLike(Display other) { if (isNull(this)) diff --git a/src/net/sourceforge/plantuml/security/SecurityUtils.java b/src/net/sourceforge/plantuml/security/SecurityUtils.java index 21a9736d4..655ed2353 100644 --- a/src/net/sourceforge/plantuml/security/SecurityUtils.java +++ b/src/net/sourceforge/plantuml/security/SecurityUtils.java @@ -210,13 +210,13 @@ public class SecurityUtils { } public static String getenv(String name) { - String env = System.getProperty(name); - if (StringUtils.isNotEmpty(env)) - return env; + String result = System.getProperty(name); + if (StringUtils.isNotEmpty(result)) + return result; - env = System.getenv(name); - if (StringUtils.isNotEmpty(env)) - return env; + result = System.getenv(name); + if (StringUtils.isNotEmpty(result)) + return result; final String alternateName = name.replace(".", "_").toUpperCase(); return System.getenv(alternateName); @@ -448,4 +448,4 @@ public class SecurityUtils { } // ::done -} +} \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index 10635e993..ce70a433d 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -82,7 +82,7 @@ public class Version { } public static int beta() { - final int beta = 0; + final int beta = 1; return beta; }