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>
/**\r
* Composite transformer which aggregates multiple implementation and selects\r
* the one which accepts the input.\r
/**\r
* Composite transformer which aggregates multiple implementation and selects\r
* the one which accepts the input.\r
* @param <I>\r
* Input class for transformation\r
* @param <P>\r
* @param <I>\r
* Input class for transformation\r
* @param <P>\r
@Override\r
public int compare(TransformerWithPriority<I, P> o1,\r
TransformerWithPriority<I, P> o2) {\r
@Override\r
public int compare(TransformerWithPriority<I, P> o1,\r
TransformerWithPriority<I, P> o2) {\r
- return Integer.compare(o1.priority, o2.priority);\r
+ return Integer.valueOf(o1.priority).compareTo(Integer.valueOf(o2.priority));\r
SimpleConditionalTransformer<I, P> {\r
final int priority;\r
final SimpleConditionalTransformer<I, P> transformer;\r
SimpleConditionalTransformer<I, P> {\r
final int priority;\r
final SimpleConditionalTransformer<I, P> transformer;\r
public TransformerWithPriority(\r
SimpleConditionalTransformer<I, P> transformer, int priority) {\r
this.priority = priority;\r
this.transformer = transformer;\r
}\r
public TransformerWithPriority(\r
SimpleConditionalTransformer<I, P> transformer, int priority) {\r
this.priority = priority;\r
this.transformer = transformer;\r
}\r
@Override\r
public int hashCode() {\r
final int prime = 31;\r
@Override\r
public int hashCode() {\r
final int prime = 31;\r
+ ((transformer == null) ? 0 : transformer.hashCode());\r
return result;\r
}\r
+ ((transformer == null) ? 0 : transformer.hashCode());\r
return result;\r
}\r
@Override\r
public boolean equals(Object obj) {\r
if (this == obj)\r
@Override\r
public boolean equals(Object obj) {\r
if (this == obj)\r
return false;\r
return true;\r
}\r
return false;\r
return true;\r
}\r
@Override\r
public boolean isAcceptable(I input) {\r
return transformer.isAcceptable(input);\r
}\r
@Override\r
public boolean isAcceptable(I input) {\r
return transformer.isAcceptable(input);\r
}\r
@Override\r
public P transform(I input) {\r
return transformer.transform(input);\r
}\r
@Override\r
public P transform(I input) {\r
return transformer.transform(input);\r
}\r