Changeset 3466 for devel-tools

Timestamp:

Mar 7, 2008, 1:49:44 PM (13 years ago)

Author:

yura

Message:

• Simlification.
• Refal plus runtime classes are added to bootstrap.

File:

• devel-tools/trunk/eclipse/org.refal.plus.rfpdt.launch/src/org/refal/plus/rfpdt/launch/RfpClasspathProvider.java (modified) (4 diffs)

devel-tools/trunk/eclipse/org.refal.plus.rfpdt.launch/src/org/refal/plus/rfpdt/launch/RfpClasspathProvider.java

@@ -2 +2 @@
 
 import java.io.IOException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -10 +9 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
 import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
@@ -25 +20 @@
 
 public class RfpClasspathProvider extends StandardClasspathProvider {
-    private List<IRuntimeClasspathEntry> defaultUserClassPath (ILaunchConfiguration configuration) throws CoreException {
-        List<IPath> paths = new ArrayList<IPath>();
-        String projectName = configuration.getAttribute(IRfpLaunchConfigurationConstants.ATTR_PROJECT_NAME, "");
-        if (projectName.length() > 0) {
-            paths.add(ResourcesPlugin.getWorkspace().getRoot().getProject(projectName).getFullPath());
-        }
-        Bundle b = Platform.getBundle("org.refal.plus");
-        // TODO:
-        // if (b instanceof BundleHost) {
-        // BundleFile file = ((BaseData) ((BundleHost) b).getBundleData()).getBundleFile();
-        // String x = file.getBaseFile().getAbsolutePath();
-        // x.charAt(0);
-        // }
+    private static IRuntimeClasspathEntry newStandartEntry (String path) {
+        IRuntimeClasspathEntry entry = JavaRuntime.newArchiveRuntimeClasspathEntry(new Path(path));
+        entry.setClasspathProperty(IRuntimeClasspathEntry.BOOTSTRAP_CLASSES);
+        return entry;
+    }
+
+    private static void addDefaultUserPath (List<IRuntimeClasspathEntry> entries, ILaunchConfiguration configuration)
+            throws CoreException {
         try {
-            URL url = b.getEntry("/bin");
-            if (url == null) {
-                String file = FileLocator.resolve(b.getEntry("")).getPath();
-                paths.add(new Path(file.substring(5, file.length() - 2)));
-            } else {
-                paths.add(new Path(FileLocator.resolve(url).getPath()));
-                paths.add(new Path(FileLocator.resolve(b.getEntry("/asm")).getPath()));
-                paths.add(new Path(FileLocator.resolve(b.getEntry("/wrappers")).getPath()));
+            Bundle b = Platform.getBundle("org.refal.plus");
+            String file = FileLocator.resolve(b.getEntry("")).getPath();
+            if (file.startsWith("file:") && file.endsWith("jar!/"))
+                entries.add(newStandartEntry(file.substring(5, file.length() - 2)));
+            else {
+                entries.add(newStandartEntry(FileLocator.resolve(b.getEntry("/bin")).getPath()));
+                entries.add(newStandartEntry(FileLocator.resolve(b.getEntry("/asm")).getPath()));
+                entries.add(newStandartEntry(FileLocator.resolve(b.getEntry("/wrappers")).getPath()));
             }
         } catch (IOException e) {
             RfpCorePlugin.log(e);
         }
-        List<IRuntimeClasspathEntry> classpathEntries = new ArrayList<IRuntimeClasspathEntry>();
-        for (IPath path : paths) {
-            IClasspathEntry entry = JavaCore.newLibraryEntry((IPath) path, null, null);
-            IRuntimeClasspathEntry runtimeClasspathEntry = runtimeClasspathEntryFor(entry);
-            if (runtimeClasspathEntry != null)
-                classpathEntries.add(runtimeClasspathEntry);
-        }
-        return classpathEntries;
-    }
-
-    public IRuntimeClasspathEntry runtimeClasspathEntryFor (IClasspathEntry entry) throws CoreException {
-        switch (entry.getEntryKind()) {
-            case IClasspathEntry.CPE_LIBRARY:
-                return JavaRuntime.newArchiveRuntimeClasspathEntry(entry.getPath());
-            case IClasspathEntry.CPE_CONTAINER:
-                IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), null);
-                if (container != null) {
-                    switch (container.getKind()) {
-                        case IClasspathContainer.K_APPLICATION:
-                            // don't look at application entries
-                            return null;
-                        case IClasspathContainer.K_DEFAULT_SYSTEM:
-                            return JavaRuntime.newRuntimeContainerClasspathEntry(container.getPath(),
-                                    IRuntimeClasspathEntry.STANDARD_CLASSES);
-                        case IClasspathContainer.K_SYSTEM:
-                            return JavaRuntime.newRuntimeContainerClasspathEntry(container.getPath(),
-                                    IRuntimeClasspathEntry.BOOTSTRAP_CLASSES);
-                    }
-                }
-                break;
-            case IClasspathEntry.CPE_VARIABLE:
-                if (JavaRuntime.JRELIB_VARIABLE.equals(entry.getPath().segment(0))) {
-                    IRuntimeClasspathEntry jre = JavaRuntime.newVariableRuntimeClasspathEntry(entry.getPath());
-                    jre.setClasspathProperty(IRuntimeClasspathEntry.STANDARD_CLASSES);
-                    return jre;
-                }
-                break;
-            default:
-                break;
-        }
-        return JavaRuntime.newDefaultProjectClasspathEntry(null);
+        // FIXME: Project must be JavaProject
+        String projectName = configuration.getAttribute(IRfpLaunchConfigurationConstants.ATTR_PROJECT_NAME, "");
+        if (projectName.length() > 0)
+            entries.add(JavaRuntime.newArchiveRuntimeClasspathEntry(ResourcesPlugin.getWorkspace().getRoot()
+                    .getProject(projectName).getFullPath()));
     }
 
@@ -100 +54 @@
         if (useDefault) {
             List<IRuntimeClasspathEntry> list = new ArrayList<IRuntimeClasspathEntry>(Arrays.asList(entries));
-            list.addAll(defaultUserClassPath(configuration));
+            addDefaultUserPath(list, configuration);
             return list.toArray(new IRuntimeClasspathEntry[list.size()]);
         }