Changeset 3468 for devel-tools/trunk

Timestamp:

Mar 7, 2008, 4:00:00 PM (13 years ago)

Author:

yura

Message:

• Using JavaLaunchDelegate? instead of RfpLaunchConfigurationDelegate?.
• All Refal specific configuration are moved into RfpLaunchShortcut? class.

Location:

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

Files:

• plugin.xml (modified) (1 diff)
• src/org/refal/plus/rfpdt/launch/RfpLaunchConfigurationDelegate.java (deleted)
• src/org/refal/plus/rfpdt/launch/ui/RfpLaunchShortcut.java (modified) (15 diffs)
• src/org/refal/plus/rfpdt/launch/ui/RfpRefalMainTab.java (modified) (2 diffs)
• src/org/refal/plus/rfpdt/launch/ui/RfpTabGroup.java (modified) (3 diffs)

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

@@ -12 +12 @@
          point="org.eclipse.debug.core.launchConfigurationTypes">
       <launchConfigurationType
-            delegate="org.refal.plus.rfpdt.launch.RfpLaunchConfigurationDelegate"
+            delegate="org.eclipse.jdt.launching.JavaLaunchDelegate"
             id="org.refal.plus.rfpdt.launch.refal_plus"
             modes="run, debug"

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

@@ -2 +2 @@
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.DebugPlugin;
@@ -17 +15 @@
 import org.eclipse.debug.ui.ILaunchShortcut;
 import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -25 +22 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.dialogs.ElementListSelectionDialog;
 import org.refal.plus.rfpdt.editor.RfpEditor;
@@ -35 +33 @@
 public class RfpLaunchShortcut implements ILaunchShortcut {
     public void launch (ISelection selection, String mode) {
-        IFile module = this.getResourceFromSelection(selection);
+        IFile module = getResourceFromSelection(selection);
         launch: {
             if (module == null)
@@ -42 +40 @@
             if (!moduleName.endsWith(".rf") && !moduleName.endsWith(".rfi"))
                 break launch;
-            this.launch(module, mode);
+            launch(module, mode);
             return;
         }
@@ -50 +48 @@
 
     public void launch (IEditorPart editor, String mode) {
-        IFile module = this.getResourceFromEditor(editor);
+        IFile module = getResourceFromEditor(editor);
         if (module != null) {
-            this.launch(module, mode);
+            launch(module, mode);
             return;
         }
@@ -59 +57 @@
     }
 
-    protected IFile getResourceFromSelection (ISelection selection) {
+    static void createConfiguration (ILaunchConfigurationWorkingCopy config) {
+        createConfiguration(config, getResource());
+    }
+
+    private static IFile getResourceFromSelection (ISelection selection) {
         if (selection.isEmpty())
             return null;
@@ -70 +72 @@
     }
 
-    protected IFile getResourceFromEditor (IEditorPart part) {
+    private static IFile getResourceFromEditor (IEditorPart part) {
         if (part == null || !(part instanceof RfpEditor))
             return null;
         RfpEditor editor = (RfpEditor) part;
         return (IFile) editor.getEditorInput().getAdapter(IFile.class);
+    }
+
+    private static String getWorkingDirectory (IFile module) {
+        return module.getParent().getFullPath().makeRelative().toString();
+    }
+
+    private static String getModuleName (IFile module) {
+        return module.getProjectRelativePath().removeFileExtension().toString().replace('/', '.');
     }
 
@@ -82 +92 @@
      * @return a re-useable config or <code>null</code> if none
      */
-    protected ILaunchConfiguration findLaunchConfiguration (IFile module, String mode) {
-        ILaunchConfigurationType configType = this.getLaunchConfigType();
-        List<ILaunchConfiguration> candidateConfigs = Collections.emptyList();
+    private static ILaunchConfiguration findLaunchConfiguration (IFile module, String mode) {
+        ILaunchConfigurationType configType = getLaunchConfigType();
+        ArrayList<ILaunchConfiguration> candidateConfigs = new ArrayList<ILaunchConfiguration>();
         try {
             ILaunchConfiguration[] configs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations(
                     configType);
-            candidateConfigs = new ArrayList<ILaunchConfiguration>(configs.length);
-            for (int i = 0; i < configs.length; i++) {
-                ILaunchConfiguration config = configs[i];
+            for (ILaunchConfiguration config : configs)
                 if (config.getAttribute(IRfpLaunchConfigurationConstants.ATTR_MODULE_NAME, "").equals(
                         getModuleName(module))
                         && config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, "").equals(
-                                getWorkingDirectory(module))) {
+                                getWorkingDirectory(module)))
                     candidateConfigs.add(config);
-                }
-            }
         } catch (CoreException e) {
             System.err.println(e);
@@ -109 +115 @@
         int candidateCount = candidateConfigs.size();
         if (candidateCount < 1) {
-            return this.createConfiguration(module);
+            return createConfiguration(module);
         } else if (candidateCount == 1) {
             return (ILaunchConfiguration) candidateConfigs.get(0);
@@ -117 +123 @@
              * method returns null, since cancelling the dialog should also cancel launching anything.
              */
-            ILaunchConfiguration config = this.chooseConfiguration(candidateConfigs, mode);
+            ILaunchConfiguration config = chooseConfiguration(candidateConfigs, mode);
             if (config != null) {
                 return config;
@@ -129 +135 @@
      * chosen config, or <code>null</code> if the user cancelled the dialog.
      */
-    protected ILaunchConfiguration chooseConfiguration (List<ILaunchConfiguration> configList, String mode) {
+    private static ILaunchConfiguration chooseConfiguration (List<ILaunchConfiguration> configList, String mode) {
         IDebugModelPresentation labelProvider = DebugUITools.newDebugModelPresentation();
         ElementListSelectionDialog dialog = new ElementListSelectionDialog(LaunchingPlugin.getShell(), labelProvider);
@@ -151 +157 @@
      * Launches a configuration for the given module
      */
-    protected void launch (IFile module, String mode) {
+    private static void launch (IFile module, String mode) {
         ILaunchConfiguration config = findLaunchConfiguration(module, mode);
-        if (config != null) {
+        if (config != null)
             DebugUITools.launch(config, mode);
-        }
-    }
-
-    protected List<String> asMementos (IRuntimeClasspathEntry[] entries) throws CoreException {
-        List<String> mementos = new ArrayList<String>(entries.length);
-        for (IRuntimeClasspathEntry entry : entries) {
-            mementos.add(entry.getMemento());
-        }
-        return mementos;
     }
 
@@ -169 +166 @@
      * Create & return a new configuration based on the specified <code>IFile</code>.
      */
-    protected ILaunchConfiguration createConfiguration (IFile module) {
+    private static ILaunchConfiguration createConfiguration (IFile module) {
         ILaunchConfiguration config = null;
         ILaunchConfigurationWorkingCopy wc = null;
         try {
-            ILaunchConfigurationType configType = this.getLaunchConfigType();
-            wc = configType.newInstance(null, this.getLaunchManager().generateUniqueLaunchConfigurationNameFrom(
+            ILaunchConfigurationType configType = getLaunchConfigType();
+            wc = configType.newInstance(null, getLaunchManager().generateUniqueLaunchConfigurationNameFrom(
                     module.getName()));
         } catch (CoreException exception) {
-            this.reportCreatingConfiguration(exception);
-            return null;
-        }
-        IProject project = module.getProject();
-        // TODO do not hardcode the attributes in 2 places (see RfpTabGroup)
-        wc.setAttribute(IRfpLaunchConfigurationConstants.ATTR_PROJECT_NAME, project.getName());
-        wc.setAttribute(IRfpLaunchConfigurationConstants.ATTR_MODULE_NAME, getModuleName(module));
-        wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER,
-                IRfpLaunchConfigurationConstants.CLASSPATH_PROVIDER);
-        wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, getWorkingDirectory(module));
+            reportCreatingConfiguration(exception);
+            return null;
+        }
+        createConfiguration(wc, module);
         try {
             config = wc.doSave();
         } catch (CoreException exception) {
-            this.reportCreatingConfiguration(exception);
+            reportCreatingConfiguration(exception);
         }
         return config;
     }
 
-    protected void reportCreatingConfiguration (final CoreException exception) {
+    private static void createConfiguration (ILaunchConfigurationWorkingCopy config, IFile module) {
+        if (module != null) {
+            config.setAttribute(IRfpLaunchConfigurationConstants.ATTR_PROJECT_NAME, module.getProject().getName());
+            config.setAttribute(IRfpLaunchConfigurationConstants.ATTR_MODULE_NAME, getModuleName(module));
+            config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, getWorkingDirectory(module));
+        }
+        config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER,
+                IRfpLaunchConfigurationConstants.CLASSPATH_PROVIDER);
+        config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH_PROVIDER,
+                IRfpLaunchConfigurationConstants.CLASSPATH_PROVIDER);
+    }
+
+    private static IFile getResource () {
+        IWorkbenchPage page = LaunchingPlugin.getActivePage();
+        if (page == null)
+            return null;
+        ISelection selection = page.getSelection();
+        if (selection instanceof IStructuredSelection)
+            return getResourceFromSelection((IStructuredSelection) selection);
+        return getResourceFromEditor(page.getActiveEditor());
+    }
+
+    private static void reportCreatingConfiguration (final CoreException exception) {
         Display.getDefault().asyncExec(new Runnable() {
             public void run () {
@@ -207 +220 @@
      * Returns the local java launch config type
      */
-    protected ILaunchConfigurationType getLaunchConfigType () {
-        return this.getLaunchManager().getLaunchConfigurationType(
-                IRfpLaunchConfigurationConstants.LAUNCH_CONFIGURATION_TYPE);
-    }
-
-    protected ILaunchManager getLaunchManager () {
+    private static ILaunchConfigurationType getLaunchConfigType () {
+        return getLaunchManager()
+                .getLaunchConfigurationType(IRfpLaunchConfigurationConstants.LAUNCH_CONFIGURATION_TYPE);
+    }
+
+    private static ILaunchManager getLaunchManager () {
         return DebugPlugin.getDefault().getLaunchManager();
     }
-
-    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/RfpRefalMainTab.java

@@ -156 +156 @@
 
     public boolean isValid (ILaunchConfiguration config) {
-
         setErrorMessage(null);
         setMessage(null);
-
         String name = fProjectText.getText().trim();
         if (name.length() == 0) {
@@ -170 +168 @@
             return false;
         }
-
         return true;
     }

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

@@ -1 +1 @@
 package org.refal.plus.rfpdt.launch.ui;
 
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
@@ -12 +10 @@
 import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
 import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPage;
-import org.refal.plus.rfpdt.launch.IRfpLaunchConfigurationConstants;
-import org.refal.plus.rfpdt.launch.LaunchingPlugin;
 
 public class RfpTabGroup extends AbstractLaunchConfigurationTabGroup {
@@ -29 +21 @@
     public void setDefaults (ILaunchConfigurationWorkingCopy config) {
         super.setDefaults(config);
-        IProject project = null;
-        IFile resource = this.getResource();
-        if (resource != null) {
-            project = resource.getProject();
-            config.setAttribute(IRfpLaunchConfigurationConstants.ATTR_PROJECT_NAME, project.getName());
-            config.setAttribute(IRfpLaunchConfigurationConstants.ATTR_MODULE_NAME, RfpLaunchShortcut
-                    .getModuleName(resource));
-            config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, RfpLaunchShortcut
-                    .getWorkingDirectory(resource));
-        }
-        config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER,
-                IRfpLaunchConfigurationConstants.CLASSPATH_PROVIDER);
-        // 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, "");
-    }
-
-    private IFile getResource () {
-        IWorkbenchPage page = LaunchingPlugin.getActivePage();
-        if (page == null)
-            return null;
-        ISelection selection = page.getSelection();
-        RfpLaunchShortcut helper = new RfpLaunchShortcut();
-        if (selection instanceof IStructuredSelection)
-            return helper.getResourceFromSelection((IStructuredSelection) selection);
-        return helper.getResourceFromEditor(page.getActiveEditor());
+        RfpLaunchShortcut.createConfiguration(config);
     }
 }