From eda5f1fca8a8a1ed5c98bb6d7486283cccb08b37 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 22 Oct 2015 12:37:48 +0200
Subject: A "workaround to CodeWarrior's compiler bug" is probably not needed
 anymore

Change-Id: I84cb3bb1e3fa42a7b96286f317aa0fb4e8ada8f3
---
 qadevOOo/runner/lib/MultiPropertyTest.java | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java
index cbf8f5db93ea..57a82fff86be 100644
--- a/qadevOOo/runner/lib/MultiPropertyTest.java
+++ b/qadevOOo/runner/lib/MultiPropertyTest.java
@@ -466,7 +466,7 @@ public class MultiPropertyTest extends MultiMethodTest
          */
         protected boolean compare(Object obj1, Object obj2)
         {
-            return callCompare(obj1, obj2);
+            return MultiPropertyTest.this.compare(obj1, obj2);
         }
 
         /**
@@ -476,7 +476,7 @@ public class MultiPropertyTest extends MultiMethodTest
          */
         protected String toString(Object obj)
         {
-            return callToString(obj);
+            return MultiPropertyTest.this.toString(obj);
         }
     }
 
@@ -556,15 +556,6 @@ public class MultiPropertyTest extends MultiMethodTest
         testProperty(propName, new PropertyValueSwitcher(val1, val2));
     }
 
-    /**
-     * The method just calls compare. This is a workaround to CodeWarrior's
-     * compiler bug.
-     */
-    private boolean callCompare(Object obj1, Object obj2)
-    {
-        return compare(obj1, obj2);
-    }
-
     /**
      * Compares two object. In the implementation calls obj1.equals(obj2).
      */
@@ -573,15 +564,6 @@ public class MultiPropertyTest extends MultiMethodTest
         return ValueComparer.equalValue(obj1, obj2);
     }
 
-    /**
-     * The method just calls toString. This is a workaround to
-     * CodeWarrior's compiler bug.
-     */
-    private String callToString(Object obj)
-    {
-        return toString(obj);
-    }
-
     /**
      * Gets string representation of the obj. In the implementation
      * returns obj.toString().
-- 
cgit v1.2.3