Changeset 3467 for devel-tools

Timestamp:

Mar 7, 2008, 2:56:03 PM (13 years ago)

Author:

yura

Message:

• setClasspathDefaults is not needed due to RfpClassProvider? is used.

Location:

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

Files:

• IRfpLaunchConfigurationConstants.java (modified) (1 diff)
• ui/RfpLaunchShortcut.java (modified) (6 diffs)
• ui/RfpTabGroup.java (modified) (2 diffs)

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

@@ -8 +8 @@
  */
 public interface IRfpLaunchConfigurationConstants /* extends IJavaLaunchConfigurationConstants */{
-    public static final String ATTR_PROJECT_NAME = "org.refal.plus.rfpdt.launch.project_name";
+    public static final String ATTR_PROJECT_NAME = "org.refal.plus.rfpdt.launch.project_name"; // FIXME: Project is not JavaProject, must be IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME
     public static final String ATTR_MODULE_NAME = IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME;
     public static final String PLUGIN_ID = "org.refal.plus.rfpdt.launch";

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

@@ -18 +18 @@
 import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
 import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -95 +94 @@
                         getModuleName(module))
                         && config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, "").equals(
-                                this.getWorkingDirectory(module))) {
+                                getWorkingDirectory(module))) {
                     candidateConfigs.add(config);
                 }
@@ -159 +158 @@
     }
 
-    public void setClasspathDefaults (ILaunchConfigurationWorkingCopy configuration) {
-        try {
-            IRuntimeClasspathEntry[] entries = JavaRuntime.computeUnresolvedRuntimeClasspath(configuration);
-            // Set ATTR_DEFAULT_CLASSPATH to false here, because we want to use
-            // a custom class path.
-            configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
-            configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, this.asMementos(entries));
-        } catch (CoreException e) {
-            // CorePlugin.log(e); // TODO can we do better? Like:
-            // JDIDebugUIPlugin.errorDialog(LauncherMessages.getString("JavaClasspathTab.Unable_to_save_classpath_1"),
-            // e); //$NON-NLS-1$
-            return;
-        }
-    }
-
     protected List<String> asMementos (IRuntimeClasspathEntry[] entries) throws CoreException {
         List<String> mementos = new ArrayList<String>(entries.length);
@@ -202 +186 @@
         wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER,
                 IRfpLaunchConfigurationConstants.CLASSPATH_PROVIDER);
-        setClasspathDefaults(wc);
-        wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, this.getWorkingDirectory(module));
+        wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, getWorkingDirectory(module));
         try {
             config = wc.doSave();
@@ -210 +193 @@
         }
         return config;
-    }
-
-    protected String getWorkingDirectory (IFile rfFile) {
-        return rfFile.getParent().getFullPath().makeRelative().toString();
     }
 
@@ -237 +216 @@
     }
 
+    static String getWorkingDirectory (IFile module) {
+        return module.getParent().getFullPath().makeRelative().toString();
+    }
+
     static String getModuleName (IFile module) {
         return module.getProjectRelativePath().removeFileExtension().toString().replace('/', '.');

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

@@ -29 +29 @@
     public void setDefaults (ILaunchConfigurationWorkingCopy config) {
         super.setDefaults(config);
-        RfpLaunchShortcut helper = new RfpLaunchShortcut();
         IProject project = null;
         IFile resource = this.getResource();
@@ -37 +36 @@
             config.setAttribute(IRfpLaunchConfigurationConstants.ATTR_MODULE_NAME, RfpLaunchShortcut
                     .getModuleName(resource));
-            config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, helper
+            config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, RfpLaunchShortcut
                     .getWorkingDirectory(resource));
         }
         config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER,
                 IRfpLaunchConfigurationConstants.CLASSPATH_PROVIDER);
-        helper.setClasspathDefaults(config);
+        // helper.setClasspathDefaults(config);
         // This is tricky: without setting ATTR_PROJECT_NAME to the empty
         // string, the project is expected to be a Java project, which in our
         // case is not necessarily so, and some methods validate on the
         // existance of a Java project with that name.
-        config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, "");
+        //config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, "");
     }