diff options
| author | Greg Watson | 2014-03-25 01:37:51 +0000 |
|---|---|---|
| committer | Greg Watson | 2014-03-25 01:37:51 +0000 |
| commit | 7193bb1b4a7baeb83b98525396ec756655a624f5 (patch) | |
| tree | c8675f2b7f0468176282c28e0cf9878327e1625d | |
| parent | 666bf7e51510458d7dd5dc9cd0b2f575c9a5c4a1 (diff) | |
| download | org.eclipse.ptp-7193bb1b4a7baeb83b98525396ec756655a624f5.tar.gz org.eclipse.ptp-7193bb1b4a7baeb83b98525396ec756655a624f5.tar.xz org.eclipse.ptp-7193bb1b4a7baeb83b98525396ec756655a624f5.zip | |
Replace missing compare method.
Fix build problems for java 1.7
Signed-off-by: Greg Watson <g.watson@computer.org>
3 files changed, 9 insertions, 31 deletions
diff --git a/rdt/org.eclipse.ptp.rdt.core.remotejars/pom.xml b/rdt/org.eclipse.ptp.rdt.core.remotejars/pom.xml index b2e026c48..a5f447232 100644 --- a/rdt/org.eclipse.ptp.rdt.core.remotejars/pom.xml +++ b/rdt/org.eclipse.ptp.rdt.core.remotejars/pom.xml @@ -14,35 +14,6 @@ <artifactId>org.eclipse.ptp.rdt.core.remotejars</artifactId> <version>8.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - - <profiles> - <profile> - <id>tools.jar</id> - <activation> - <property> - <name>java.vendor</name> - <value>Sun Microsystems Inc.</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <dependencies> - <dependency> - <groupId>com.sun</groupId> - <artifactId>tools</artifactId> - <version>1.5.0</version> - <scope>system</scope> - <systemPath>${java.home}/../lib/tools.jar</systemPath> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> - </profile> - </profiles> <build> <plugins> @@ -63,6 +34,13 @@ <artifactId>ant-trax</artifactId> <version>1.6.5</version> </dependency> + <dependency> + <groupId>com.sun</groupId> + <artifactId>tools</artifactId> + <version>1.7.0</version> + <scope>system</scope> + <systemPath>${java.home}/../lib/tools.jar</systemPath> + </dependency> </dependencies> <executions> <execution> diff --git a/rdt/org.eclipse.ptp.rdt.ui/META-INF/MANIFEST.MF b/rdt/org.eclipse.ptp.rdt.ui/META-INF/MANIFEST.MF index 70dd840da..9c015805b 100755 --- a/rdt/org.eclipse.ptp.rdt.ui/META-INF/MANIFEST.MF +++ b/rdt/org.eclipse.ptp.rdt.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.ptp.rdt.ui;singleton:=true Bundle-Version: 6.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.eclipse.cdt.core;bundle-version="5.0.2", org.eclipse.cdt.ui;bundle-version="5.0.2", org.eclipse.core.runtime;bundle-version="3.4.0", diff --git a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/callhierarchy/RemoteCHViewPart.java b/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/callhierarchy/RemoteCHViewPart.java index f509ff1d8..c25629302 100755 --- a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/callhierarchy/RemoteCHViewPart.java +++ b/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/callhierarchy/RemoteCHViewPart.java @@ -454,7 +454,7 @@ public class RemoteCHViewPart extends ViewPart { CHNode n2= (CHNode) e2; int offset1= n1.getFirstReferenceOffset(); int offset2= n2.getFirstReferenceOffset(); - return CoreUtility.compare(offset1, offset2); + return Integer.compare(offset1, offset2); } }; |