ecd-plugin#55 - Make sure plugin not fails on old version of Eclipse

helospark · Nov 16, 2018 · c6794bc · c6794bc
1 parent 12bbd64
commit c6794bc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/org.sf.feeling.decompiler/src/org/sf/feeling/decompiler/util/JarClassExtractor.java b/org.sf.feeling.decompiler/src/org/sf/feeling/decompiler/util/JarClassExtractor.java
@@ -33,7 +33,7 @@ public class JarClassExtractor
 	public static void extract( String archivePath, String packege, String className, boolean inner, String to )
 			throws IOException
 	{
-		if ( archivePath.endsWith( JRTUtil.JRT_FS_JAR ) )
+		if ( isClassInJrt( archivePath ) )
 		{
 			extractClassFromJrt( archivePath, packege, className, to );
 		}
@@ -43,6 +43,19 @@ public static void extract( String archivePath, String packege, String className
 		}
 	}
 
+	private static boolean isClassInJrt( String archivePath )
+	{
+		try
+		{
+			return archivePath.endsWith( JRTUtil.JRT_FS_JAR );
+		}
+		catch ( NoClassDefFoundError e )
+		{
+			// Compatible with pre-Oxygen Eclipse, where JRTUtil does not exist
+			return false;
+		}
+	}
+
 	private static void extractClassFromJrt( String archivePath, String packege, String className, String to )
 			throws IOException, FileNotFoundException
 	{
@@ -57,7 +70,6 @@ private static void extractClassFromJrt( String archivePath, String packege, Str
 		}
 		catch ( ClassFormatException e )
 		{
-			e.printStackTrace( );
 			throw new RuntimeException( "Unable to read JRT file", e );
 		}
 	}

diff --git a/pom.xml b/pom.xml
@@ -103,9 +103,9 @@
 
 	<repositories>
 		<repository>
-			<id>eclipse-juno</id>
+			<id>eclipse-oxygen</id>
 			<layout>p2</layout>
-			<url>http://download.eclipse.org/releases/juno</url>
+			<url>http://download.eclipse.org/releases/oxygen</url>
 		</repository>
 	</repositories>