Changeset 3560

Timestamp:

Mar 21, 2008, 4:18:15 PM (13 years ago)

Author:

yura

Message:

• No exception throws to Eclipse runtime.

File:

• devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/launching/RfpContainerInitializerAndResolver.java (modified) (3 diffs)

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/launching/RfpContainerInitializerAndResolver.java

@@ -2 +2 @@
 
 import java.io.IOException;
+import java.net.URL;
 
 import org.eclipse.core.runtime.CoreException;
@@ -28 +29 @@
         private final IClasspathEntry[] entries;
 
-        private RfpContainer (IPath containerPath) {
+        private RfpContainer (IPath containerPath, IClasspathEntry entry) {
             this.containerPath = containerPath;
-            IPath path = RfpContainerInitializerAndResolver.getPath();
-            IPath srcPath = RfpContainerInitializerAndResolver.getSrcPath();
-            this.entries = path == null ? new IClasspathEntry[0] : new IClasspathEntry[] { JavaCore.newLibraryEntry(
-                    path, srcPath, null) };
+            this.entries = new IClasspathEntry[] { entry };
         }
 
@@ -53 +51 @@
     }
 
-    private static IPath getPath () {
-        Bundle b = Platform.getBundle("org.refal.rfpdt.runtime");
-        if (b != null)
-            try {
-                return new Path(FileLocator.resolve(b.getEntry("/rfprt.jar")).getPath());
-            } catch (IOException e) {
-                RfpCore.log(e);
-            }
-        return null;
+    /** May return <code>null</code>. */
+    private static IPath getEntryPath (String bundleName, String entry) {
+        Bundle bundle = Platform.getBundle(bundleName);
+        if (bundle == null)
+            return null;
+        URL entryUrl = bundle.getEntry(entry);
+        if (entryUrl == null)
+            return null;
+        try {
+            return new Path(FileLocator.resolve(entryUrl).getPath());
+        } catch (IOException e) {
+            return null;
+        }
     }
 
+    /** May return <code>null</code>. */
+    private static IPath getBinPath () {
+        return getEntryPath("org.refal.rfpdt.runtime", "rfprt.jar");
+    }
+
+    /** May return <code>null</code>. */
     private static IPath getSrcPath () {
-        Bundle b = Platform.getBundle("org.refal.rfpdt.runtime");
-        if (b != null)
-            try {
-                return new Path(FileLocator.resolve(b.getEntry("/rfprt-src.jar")).getPath());
-            } catch (IOException e) {
-                RfpCore.log(e);
-            }
-        return null;
+        return getEntryPath("org.refal.rfpdt.runtime", "rfprt-src.jar");
+    }
+
+    private static IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry () {
+        IPath path = getBinPath();
+        if (path == null)
+            return new IRuntimeClasspathEntry[] {};
+        else
+            return new IRuntimeClasspathEntry[] { JavaRuntime.newArchiveRuntimeClasspathEntry(path) };
     }
 
     @Override
     public void initialize (IPath containerPath, IJavaProject project) throws CoreException {
-        if (containerPath.segmentCount() > 0 && containerPath.segment(0).equals(RfpCore.RFP_CONTAINER)) {
+        IPath path = getBinPath();
+        if (path == null)
+            RfpCore.log("Refal Plus Library can not be found", IStatus.ERROR);
+        else
             JavaCore.setClasspathContainer(containerPath, new IJavaProject[] { project },
-                    new IClasspathContainer[] { new RfpContainer(containerPath) }, null);
-        } else
-            RfpCore.log("Invalid RfpContainer path", IStatus.ERROR);
+                    new IClasspathContainer[] { new RfpContainer(containerPath, JavaCore.newLibraryEntry(path,
+                            getSrcPath(), null)) }, null);
     }
 
     public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry (IRuntimeClasspathEntry entry,
             ILaunchConfiguration configuration) {
-        return new IRuntimeClasspathEntry[] { JavaRuntime.newArchiveRuntimeClasspathEntry(getPath()) };
+        return resolveRuntimeClasspathEntry();
     }
 
     public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry (IRuntimeClasspathEntry entry, IJavaProject project) {
-        return new IRuntimeClasspathEntry[] { JavaRuntime.newArchiveRuntimeClasspathEntry(getPath()) };
+        return resolveRuntimeClasspathEntry();
     }