Remove old license headers

[gpl/argeo-slc.git] / org.argeo.slc.support / src / org / argeo / slc / diff / DiffNotMatched.java

diff --git a/org.argeo.slc.support/src/org/argeo/slc/diff/DiffNotMatched.java b/org.argeo.slc.support/src/org/argeo/slc/diff/DiffNotMatched.java
index 9483dfeffcc74be8328b39631fb6c4e7019cc66c..eba911f9c3dd76ed8998648b5477747d0d72a168 100644 (file)
--- a/org.argeo.slc.support/src/org/argeo/slc/diff/DiffNotMatched.java
+++ b/org.argeo.slc.support/src/org/argeo/slc/diff/DiffNotMatched.java
@@ -1,90 +1,75 @@
-/*\r
- * Copyright (C) 2007-2012 Argeo GmbH\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.argeo.slc.diff;\r
-\r
-import org.argeo.slc.SlcException;\r
-\r
-/** Diff issue where reached and expected values are different. */\r
-public class DiffNotMatched extends DiffIssueKey {\r
-\r
-       // To enable hibernate persistance, these object cannot be final\r
-       // private final Object expected;\r
-       // private final Object reached;\r
-\r
-       private Object expected;\r
-       private Object reached;\r
-\r
-       public DiffNotMatched(DiffPosition position, Object expected, Object reached) {\r
-               super(position);\r
-               this.expected = expected;\r
-               this.reached = reached;\r
-       }\r
-\r
-       public DiffNotMatched(DiffPosition position, Object expected,\r
-                       Object reached, DiffKey key) {\r
-               super(position, key);\r
-               this.expected = expected;\r
-               this.reached = reached;\r
-       }\r
-\r
-       public Object getExpected() {\r
-               return expected;\r
-       }\r
-\r
-       public Object getReached() {\r
-               return reached;\r
-       }\r
-\r
-       @Override\r
-       public String toString() {\r
-               String result = position + ": not matched " + expected + " <> "\r
-                               + reached;\r
-               if (super.key != null) {\r
-                       result = result + " - Key: " + super.toString();\r
-               }\r
-\r
-               return result;\r
-       }\r
-\r
-       @SuppressWarnings("unused")\r
-       private String getExpectedStr() {\r
-               if (expected instanceof String)\r
-                       return (String) expected;\r
-               else\r
-                       throw new SlcException(\r
-                                       "Object 'expected' is of wrong type. Must be a String");\r
-       }\r
-\r
-       @SuppressWarnings("unused")\r
-       private String getReachedStr() {\r
-               if (reached instanceof String)\r
-                       return (String) reached;\r
-               else\r
-                       throw new SlcException(\r
-                                       "Object 'reached' is of wrong type. Must be a String");\r
-       }\r
-\r
-       @SuppressWarnings("unused")\r
-       private void setReachedStr(String reachedStr) {\r
-               this.reached = reachedStr;\r
-       }\r
-\r
-       @SuppressWarnings("unused")\r
-       private void setExpectedStr(String expectedStr) {\r
-               this.expected = expectedStr;\r
-       }\r
-\r
-}\r
+package org.argeo.slc.diff;
+
+import org.argeo.slc.SlcException;
+
+/** Diff issue where reached and expected values are different. */
+public class DiffNotMatched extends DiffIssueKey {
+
+       // To enable hibernate persistance, these object cannot be final
+       // private final Object expected;
+       // private final Object reached;
+
+       private Object expected;
+       private Object reached;
+
+       public DiffNotMatched(DiffPosition position, Object expected, Object reached) {
+               super(position);
+               this.expected = expected;
+               this.reached = reached;
+       }
+
+       public DiffNotMatched(DiffPosition position, Object expected,
+                       Object reached, DiffKey key) {
+               super(position, key);
+               this.expected = expected;
+               this.reached = reached;
+       }
+
+       public Object getExpected() {
+               return expected;
+       }
+
+       public Object getReached() {
+               return reached;
+       }
+
+       @Override
+       public String toString() {
+               String result = position + ": not matched " + expected + " <> "
+                               + reached;
+               if (super.key != null) {
+                       result = result + " - Key: " + super.toString();
+               }
+
+               return result;
+       }
+
+       @SuppressWarnings("unused")
+       private String getExpectedStr() {
+               if (expected instanceof String)
+                       return (String) expected;
+               else
+                       throw new SlcException(
+                                       "Object 'expected' is of wrong type. Must be a String");
+       }
+
+       @SuppressWarnings("unused")
+       private String getReachedStr() {
+               if (reached instanceof String)
+                       return (String) reached;
+               else
+                       throw new SlcException(
+                                       "Object 'reached' is of wrong type. Must be a String");
+       }
+
+       @SuppressWarnings("unused")
+       private void setReachedStr(String reachedStr) {
+               this.reached = reachedStr;
+       }
+
+       @SuppressWarnings("unused")
+       private void setExpectedStr(String expectedStr) {
+               this.expected = expectedStr;
+       }
+
+}