harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r792883 - /harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/ExecutionEnvironmentAnalyzer.java
Date Fri, 10 Jul 2009 11:08:23 GMT
Author: tellison
Date: Fri Jul 10 11:08:23 2009
New Revision: 792883

URL: http://svn.apache.org/viewvc?rev=792883&view=rev
Log:
Look for Harmony Select specification string for perfect match.

Modified:
    harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/ExecutionEnvironmentAnalyzer.java

Modified: harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/ExecutionEnvironmentAnalyzer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/ExecutionEnvironmentAnalyzer.java?rev=792883&r1=792882&r2=792883&view=diff
==============================================================================
--- harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/ExecutionEnvironmentAnalyzer.java
(original)
+++ harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching.environments/src/org/apache/harmony/eclipse/jdt/launching/environments/ExecutionEnvironmentAnalyzer.java
Fri Jul 10 11:08:23 2009
@@ -48,13 +48,15 @@
 
         String javaVersion = vm2.getJavaVersion();
         if (javaVersion == null) {
-            Activator.getDefault().log("VM does not report version string");
+            Activator.getDefault().log(
+                    "VM does not report version string : " + vm.getName());
             return new CompatibleEnvironment[0];
         }
 
         // Select is a subset of SE runtimes that are 1.5 or above
-        if (javaVersion.startsWith("1.7") || javaVersion.startsWith("1.6")
-                || javaVersion.startsWith("1.5")) {
+        boolean perfectMatch = javaVersion.startsWith("Harmony-Select-1.0");
+        if (perfectMatch || javaVersion.startsWith("1.7")
+                || javaVersion.startsWith("1.6") || javaVersion.startsWith("1.5")) {
 
             IExecutionEnvironmentsManager manager = JavaRuntime
                     .getExecutionEnvironmentsManager();
@@ -62,8 +64,7 @@
             if (env != null) {
                 CompatibleEnvironment[] result = new CompatibleEnvironment[1];
                 // SE is not a perfect match
-                // TODO: figure out how we detect a real Select runtime
-                result[0] = new CompatibleEnvironment(env, false);
+                result[0] = new CompatibleEnvironment(env, perfectMatch);
                 return result;
             }
         }



Mime
View raw message