From e6420556a7d65121e802b37deeb74da06b553305 Mon Sep 17 00:00:00 2001
From: Ed Warnicke <eaw@cisco.com>
Date: Tue, 4 Jun 2013 15:01:22 -0500
Subject: [PATCH] Fix to maintain Java 6 compatability

Swapped out the use of Integer.compare (which requires Java 7)
for Integer.valueOf(x).compareTo(Integer.valueOf(y)) which
is promised to return the identical value here:
http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html#compare(int, int)

Change-Id: I78d325351dac312d120f5c598ec9155d31cfb689
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---
 .../CompositeConditionalTransformer.java      | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/opendaylight/commons/concepts/src/main/java/org/opendaylight/controller/concepts/tranform/CompositeConditionalTransformer.java b/opendaylight/commons/concepts/src/main/java/org/opendaylight/controller/concepts/tranform/CompositeConditionalTransformer.java
index a31d896372..ad3cdbc180 100644
--- a/opendaylight/commons/concepts/src/main/java/org/opendaylight/controller/concepts/tranform/CompositeConditionalTransformer.java
+++ b/opendaylight/commons/concepts/src/main/java/org/opendaylight/controller/concepts/tranform/CompositeConditionalTransformer.java
@@ -17,10 +17,10 @@ import java.util.TreeSet;
 /**
  * Composite transformer which aggregates multiple implementation and selects
  * the one which accepts the input.
- * 
- * 
+ *
+ *
  * @author Tony Tkacik
- * 
+ *
  * @param <I>
  *            Input class for transformation
  * @param <P>
@@ -35,7 +35,7 @@ public class CompositeConditionalTransformer<I, P> implements
         @Override
         public int compare(TransformerWithPriority<I, P> o1,
                 TransformerWithPriority<I, P> o2) {
-            return Integer.compare(o1.priority, o2.priority);
+            return Integer.valueOf(o1.priority).compareTo(Integer.valueOf(o2.priority));
         }
 
     };
@@ -106,13 +106,13 @@ public class CompositeConditionalTransformer<I, P> implements
             SimpleConditionalTransformer<I, P> {
         final int priority;
         final SimpleConditionalTransformer<I, P> transformer;
-    
+
         public TransformerWithPriority(
                 SimpleConditionalTransformer<I, P> transformer, int priority) {
             this.priority = priority;
             this.transformer = transformer;
         }
-    
+
         @Override
         public int hashCode() {
             final int prime = 31;
@@ -121,7 +121,7 @@ public class CompositeConditionalTransformer<I, P> implements
                     + ((transformer == null) ? 0 : transformer.hashCode());
             return result;
         }
-    
+
         @Override
         public boolean equals(Object obj) {
             if (this == obj)
@@ -138,20 +138,20 @@ public class CompositeConditionalTransformer<I, P> implements
                 return false;
             return true;
         }
-    
+
         @Override
         public boolean isAcceptable(I input) {
             return transformer.isAcceptable(input);
         }
-    
+
         @Override
         public P transform(I input) {
             return transformer.transform(input);
         }
-        
-    
-    
-    
-    
+
+
+
+
+
     }
 }
-- 
2.36.6