From a2a6a5830ac3cf02015c8954d141d929b5ec1bd1 Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@fortiss.org>
Date: Thu, 28 Aug 2014 11:35:03 +0000
Subject: [PATCH] - Fix build with JDK 1.6 which is used on the build server
refs 1841
---
.../base/ui/annotation/view/AnnotationViewPartBase.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/AnnotationViewPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/AnnotationViewPartBase.java
index d8ada35eb..8a531d850 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/AnnotationViewPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/AnnotationViewPartBase.java
@@ -157,9 +157,11 @@ public abstract class AnnotationViewPartBase extends ViewPart implements ISelect
@Override
public int compare(AnnotationEntry a1, AnnotationEntry a2) {
// Equality of model element implies equal hashCode(), order is arbitrary
- // but not relevant for
- // ensuring uniqueness of annotation entries.
- return Integer.compare(a1.getModelElement().hashCode(), a2
+ // but not relevant for ensuring uniqueness of annotation entries.
+ //
+ // int Integer.compare(int x, int y) requires JDK 1.7 which is not available
+ // on the build server
+ return new Integer(a1.getModelElement().hashCode()).compareTo(a2
.getModelElement().hashCode());
}
});
--
GitLab