### Eclipse Workspace Patch 1.0
#P org.eclipse.photran.cdtinterface
Index: plugin.xml
===================================================================
RCS file: /cvsroot/tools/org.eclipse.ptp/photran/org.eclipse.photran.cdtinterface/plugin.xml,v
retrieving revision 1.17
diff -u -r1.17 plugin.xml
--- plugin.xml	29 Jan 2009 20:29:41 -0000	1.17
+++ plugin.xml	22 Jun 2009 01:29:46 -0000
@@ -55,7 +55,7 @@
             label="Local Fortran Application"
             icon="icons/obj16/f_app.gif"
             modes="run, debug"
-            class="org.eclipse.photran.cdtinterface.launch.FortranApplicationLaunchShortcut"
+            class="org.eclipse.photran.cdtinterface.launch.CApplicationLaunchShortcut"
             id="org.eclipse.photran.debug.ui.localCShortcut">
          <contextualLaunch>
            <enablement>
Index: build.properties
===================================================================
RCS file: /cvsroot/tools/org.eclipse.ptp/photran/org.eclipse.photran.cdtinterface/build.properties,v
retrieving revision 1.8
diff -u -r1.8 build.properties
--- build.properties	19 Feb 2009 22:10:18 -0000	1.8
+++ build.properties	22 Jun 2009 01:29:46 -0000
@@ -5,7 +5,8 @@
                cdtinterface.jar,\
                icons/,\
                META-INF/,\
-               about.html
+               about.html,\
+               plugin.properties
 jre.compilation.profile=J2SE-1.4
 src.includes = .classpath,\
                .project,\
Index: META-INF/MANIFEST.MF
===================================================================
RCS file: /cvsroot/tools/org.eclipse.ptp/photran/org.eclipse.photran.cdtinterface/META-INF/MANIFEST.MF,v
retrieving revision 1.16
diff -u -r1.16 MANIFEST.MF
--- META-INF/MANIFEST.MF	21 Jun 2009 17:57:55 -0000	1.16
+++ META-INF/MANIFEST.MF	22 Jun 2009 01:29:46 -0000
@@ -31,6 +31,11 @@
  org.eclipse.debug.core,
  org.eclipse.debug.ui,
  org.eclipse.jface.text,
+ org.eclipse.cdt.debug.ui,
+ org.eclipse.cdt.debug.core,
+ com.ibm.icu,
+ org.eclipse.jface.text,
  org.eclipse.ui.editors,
  org.eclipse.ui.views
 Eclipse-LazyStart: true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Index: .settings/org.eclipse.jdt.core.prefs
===================================================================
RCS file: /cvsroot/tools/org.eclipse.ptp/photran/org.eclipse.photran.cdtinterface/.settings/org.eclipse.jdt.core.prefs,v
retrieving revision 1.2
diff -u -r1.2 org.eclipse.jdt.core.prefs
--- .settings/org.eclipse.jdt.core.prefs	5 Jun 2008 14:11:43 -0000	1.2
+++ .settings/org.eclipse.jdt.core.prefs	22 Jun 2009 01:29:46 -0000
@@ -1,15 +1,77 @@
-#Thu Jun 05 10:08:51 EDT 2008
+#Sun Jun 21 02:06:42 CDT 2009
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=20
Index: src/org/eclipse/photran/cdtinterface/launch/FortranApplicationLaunchShortcut.java
===================================================================
RCS file: src/org/eclipse/photran/cdtinterface/launch/FortranApplicationLaunchShortcut.java
diff -N src/org/eclipse/photran/cdtinterface/launch/FortranApplicationLaunchShortcut.java
--- src/org/eclipse/photran/cdtinterface/launch/FortranApplicationLaunchShortcut.java	4 Apr 2008 14:32:38 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-package org.eclipse.photran.cdtinterface.launch;
-
-import org.eclipse.cdt.launch.internal.CApplicationLaunchShortcut;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-
-public class FortranApplicationLaunchShortcut extends CApplicationLaunchShortcut
-{
-    /*@Override*/ protected ILaunchConfigurationType getCLaunchConfigType() {
-        return getLaunchManager().getLaunchConfigurationType("org.eclipse.photran.launch.localCLaunch");
-    }
-}
Index: src/org/eclipse/photran/cdtinterface/ui/editor/CDTBasedTextEditor.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.ptp/photran/org.eclipse.photran.cdtinterface/src/org/eclipse/photran/cdtinterface/ui/editor/CDTBasedTextEditor.java,v
retrieving revision 1.1
diff -u -r1.1 CDTBasedTextEditor.java
--- src/org/eclipse/photran/cdtinterface/ui/editor/CDTBasedTextEditor.java	21 Jun 2009 17:51:31 -0000	1.1
+++ src/org/eclipse/photran/cdtinterface/ui/editor/CDTBasedTextEditor.java	22 Jun 2009 01:29:46 -0000
@@ -14,6 +14,8 @@
  *******************************************************************************/
 package org.eclipse.photran.cdtinterface.ui.editor;
 
+import java.util.ResourceBundle;
+
 import org.eclipse.cdt.core.model.CModelException;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.ISourceRange;
@@ -22,7 +24,7 @@
 import org.eclipse.cdt.internal.ui.actions.SelectionConverter;
 import org.eclipse.cdt.internal.ui.editor.CContentOutlinePage;
 import org.eclipse.cdt.internal.ui.editor.CEditor;
-import org.eclipse.cdt.internal.ui.editor.CEditorMessages;
+import org.eclipse.cdt.internal.ui.editor.ConstructedCEditorMessages;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.IWorkingCopyManager;
 import org.eclipse.jface.action.IAction;
@@ -85,17 +87,14 @@
 
         // See CEditor#createActions
         
-//        IAction action = new TextOperationAction(CEditorMessages.getResourceBundle(), "Format.", this, ISourceViewer.FORMAT); //$NON-NLS-1$
-//        action.setActionDefinitionId(ICEditorActionDefinitionIds.FORMAT);
-//        setAction("Format", action); //$NON-NLS-1$
-//        markAsStateDependentAction("Format", true); //$NON-NLS-1$
+        final ResourceBundle bundle = ConstructedCEditorMessages.getResourceBundle();
 
-        IAction action = new ContentAssistAction(CEditorMessages.getResourceBundle(), "ContentAssistProposal.", this); //$NON-NLS-1$
+        IAction action = new ContentAssistAction(bundle, "ContentAssistProposal.", this); //$NON-NLS-1$
         action.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
         setAction("ContentAssistProposal", action); //$NON-NLS-1$
         markAsStateDependentAction("ContentAssistProposal", true); //$NON-NLS-1$
 
-        action= new TextOperationAction(CEditorMessages.getResourceBundle(), "ContentAssistContextInformation.", this, ISourceViewer.CONTENTASSIST_CONTEXT_INFORMATION); //$NON-NLS-1$
+        action= new TextOperationAction(bundle, "ContentAssistContextInformation.", this, ISourceViewer.CONTENTASSIST_CONTEXT_INFORMATION); //$NON-NLS-1$
         action.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_CONTEXT_INFORMATION);
         setAction("ContentAssistContextInformation", action); //$NON-NLS-1$
         markAsStateDependentAction("ContentAssistContextInformation", true); //$NON-NLS-1$
Index: src/org/eclipse/photran/cdtinterface/launch/LaunchMessages.java
===================================================================
RCS file: src/org/eclipse/photran/cdtinterface/launch/LaunchMessages.java
diff -N src/org/eclipse/photran/cdtinterface/launch/LaunchMessages.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/photran/cdtinterface/launch/LaunchMessages.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.photran.cdtinterface.launch;
+
+import com.ibm.icu.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class LaunchMessages {
+
+	private static final String BUNDLE_NAME = "org.eclipse.photran.cdtinterface.launch.LaunchMessages";//$NON-NLS-1$
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+	private LaunchMessages() {
+	}
+
+	public static String getFormattedString(String key, String arg) {
+		return MessageFormat.format(getString(key), new String[]{arg});
+	}
+
+	public static String getFormattedString(String key, String[] args) {
+		return MessageFormat.format(getString(key), args);
+	}
+
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+}
Index: src/org/eclipse/photran/cdtinterface/launch/LaunchMessages.properties
===================================================================
RCS file: src/org/eclipse/photran/cdtinterface/launch/LaunchMessages.properties
diff -N src/org/eclipse/photran/cdtinterface/launch/LaunchMessages.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/photran/cdtinterface/launch/LaunchMessages.properties	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,34 @@
+###############################################################################
+# Copyright (c) 2002, 2008 QNX Software Systems and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#       QNX Software Systems - Initial API and implementation
+# 		Monta Vista - Joanne Woo - Bug 87556
+#       Nokia - Ken Ryall - Bug 118894
+#       Carlos O'Donnel (CodeSourcery) - Bug 218366
+#		IBM Corporation
+###############################################################################
+
+CApplicationLaunchShortcut.Application_Launcher=Application Launcher
+CApplicationLaunchShortcut.ChooseConfigToDebug=Choose a debug configuration to debug
+CApplicationLaunchShortcut.ChooseConfigToRun=Choose a configuration to run
+CApplicationLaunchShortcut.CLocalApplication=Fortran Local Application
+CApplicationLaunchShortcut.ChooseLocalAppToDebug=Choose a local application to debug
+CApplicationLaunchShortcut.ChooseLocalAppToRun=Choose a local application to run
+CApplicationLaunchShortcut.Launch_failed_no_binaries=Launch failed. Binary not found.
+CApplicationLaunchShortcut.LaunchFailed=Launch failed
+CApplicationLaunchShortcut.LaunchDebugConfigSelection=Launch Debug Configuration Selection
+CApplicationLaunchShortcut.LaunchConfigSelection=Launch Configuration Selection
+CApplicationLaunchShortcut.Invalid_launch_mode_1=Invalid launch mode
+CApplicationLaunchShortcut.Invalid_launch_mode_2=Invalid launch mode.
+CApplicationLaunchShortcut.Invalid_launch_mode_3=Invalid launch mode.
+CApplicationLaunchShortcut.ChooseLaunchConfigToDebug=Choose a launch configuration to debug
+CApplicationLaunchShortcut.ChooseLaunchConfigToRun=Choose a launch configuration to run
+CApplicationLaunchShortcut.Launch_failed_no_project_selected=Launch failed no project selected
+
+Launch.common.BinariesColon=Binaries:
+Launch.common.QualifierColon=Qualifier:
Index: src/org/eclipse/photran/cdtinterface/launch/CApplicationLaunchShortcut.java
===================================================================
RCS file: src/org/eclipse/photran/cdtinterface/launch/CApplicationLaunchShortcut.java
diff -N src/org/eclipse/photran/cdtinterface/launch/CApplicationLaunchShortcut.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/photran/cdtinterface/launch/CApplicationLaunchShortcut.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,590 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Ken Ryall (Nokia) - bug 178731
+ * Ken Ryall (Nokia) - bug 246201
+ *******************************************************************************/
+package org.eclipse.photran.cdtinterface.launch;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.model.CModelException;
+import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.core.model.IBinary;
+import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.core.settings.model.ICProjectDescription;
+import org.eclipse.cdt.debug.core.CDebugCorePlugin;
+import org.eclipse.cdt.debug.core.CDebugUtils;
+import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
+import org.eclipse.cdt.debug.core.ICDebugConfiguration;
+import org.eclipse.cdt.debug.core.executables.Executable;
+import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
+import org.eclipse.cdt.debug.ui.ICDebuggerPage;
+import org.eclipse.cdt.ui.CElementLabelProvider;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationType;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.core.ILaunchDelegate;
+import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.ui.DebugUITools;
+import org.eclipse.debug.ui.IDebugModelPresentation;
+import org.eclipse.debug.ui.ILaunchShortcut2;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.text.ITextSelection;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.dialogs.ElementListSelectionDialog;
+import org.eclipse.ui.dialogs.TwoPaneElementSelector;
+
+public class CApplicationLaunchShortcut implements ILaunchShortcut2 {
+
+	public void launch(IEditorPart editor, String mode) {
+		searchAndLaunch(new Object[] { editor.getEditorInput()}, mode);
+	}
+
+	public void launch(ISelection selection, String mode) {
+		if (selection instanceof IStructuredSelection) {
+			searchAndLaunch(((IStructuredSelection) selection).toArray(), mode);
+		}
+	}
+
+	public void launch(IBinary bin, String mode) {
+        ILaunchConfiguration config = findLaunchConfiguration(bin, mode);
+        if (config != null) {
+            DebugUITools.launch(config, mode);
+        }
+    }
+
+	/**
+	 * Locate a configuration to relaunch for the given type.  If one cannot be found, create one.
+	 * 
+	 * @return a re-useable config or <code>null</code> if none
+	 */
+	protected ILaunchConfiguration findLaunchConfiguration(IBinary bin, String mode) {
+		ILaunchConfiguration configuration = null;
+		ILaunchConfigurationType configType = getCLaunchConfigType();
+		List candidateConfigs = Collections.EMPTY_LIST;
+		try {
+			ILaunchConfiguration[] configs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations(configType);
+			candidateConfigs = new ArrayList(configs.length);
+			for (int i = 0; i < configs.length; i++) {
+				ILaunchConfiguration config = configs[i];
+				IPath programPath = CDebugUtils.getProgramPath(config);
+				String projectName = CDebugUtils.getProjectName(config);
+				IPath name = bin.getResource().getProjectRelativePath();
+				if (programPath != null && programPath.equals(name)) {
+					if (projectName != null && projectName.equals(bin.getCProject().getProject().getName())) {
+						candidateConfigs.add(config);
+					}
+				}
+			}
+		} catch (CoreException e) {
+		    CDebugUIPlugin.log(e);
+		}
+
+		// If there are no existing configs associated with the IBinary, create one.
+		// If there is exactly one config associated with the IBinary, return it.
+		// Otherwise, if there is more than one config associated with the IBinary, prompt the
+		// user to choose one.
+		int candidateCount = candidateConfigs.size();
+		if (candidateCount < 1) {
+			// Set the default debugger based on the active toolchain on the project (if possible)
+			ICDebugConfiguration debugConfig = null;
+			IProject project = bin.getResource().getProject();
+           	ICProjectDescription projDesc = CoreModel.getDefault().getProjectDescription(project);
+           	ICConfigurationDescription configDesc = projDesc.getActiveConfiguration();
+           	String configId = configDesc.getId();
+       		ICDebugConfiguration[] debugConfigs = CDebugCorePlugin.getDefault().getActiveDebugConfigurations();
+       		int matchLength = 0;
+       		for (int i = 0; i < debugConfigs.length; ++i) {
+       			ICDebugConfiguration dc = debugConfigs[i];
+       			String[] patterns = dc.getSupportedBuildConfigPatterns();
+       			if (patterns != null) {
+       				for (int j = 0; j < patterns.length; ++j) {
+       					if (patterns[j].length() > matchLength && configId.matches(patterns[j])) {
+       						debugConfig = dc;
+       						matchLength = patterns[j].length();
+       					}
+       				}
+       			}
+			}
+
+			if ( debugConfig == null ) {
+				// Prompt the user if more then 1 debugger.
+				String programCPU = bin.getCPU();
+				String os = Platform.getOS();
+				debugConfigs = CDebugCorePlugin.getDefault().getActiveDebugConfigurations();
+				List debugList = new ArrayList(debugConfigs.length);
+				for (int i = 0; i < debugConfigs.length; i++) {
+					String platform = debugConfigs[i].getPlatform();
+					if (debugConfigs[i].supportsMode(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN)) {
+						if (platform.equals("*") || platform.equals(os)) { //$NON-NLS-1$
+							if (debugConfigs[i].supportsCPU(programCPU)) 
+								debugList.add(debugConfigs[i]);
+						}
+					}
+				}
+				debugConfigs = (ICDebugConfiguration[]) debugList.toArray(new ICDebugConfiguration[0]);
+				if (debugConfigs.length == 1) {
+					debugConfig = debugConfigs[0];
+				} else if (debugConfigs.length > 1) {
+					debugConfig = chooseDebugConfig(debugConfigs, mode);
+				}
+			}
+			
+			if (debugConfig != null) {
+				configuration = createConfiguration(bin, debugConfig, mode);
+			}
+		} else if (candidateCount == 1) {
+			configuration = (ILaunchConfiguration) candidateConfigs.get(0);
+		} else {
+			// Prompt the user to choose a config.  A null result means the user
+			// cancelled the dialog, in which case this method returns null,
+			// since cancelling the dialog should also cancel launching anything.
+			configuration = chooseConfiguration(candidateConfigs, mode);
+		}
+		return configuration;
+	}
+
+	/**
+	 * Method createConfiguration.
+	 * @param bin
+	 * @return ILaunchConfiguration
+	 */
+	private ILaunchConfiguration createConfiguration(IBinary bin, ICDebugConfiguration debugConfig, String mode) {
+		ILaunchConfiguration config = null;
+		try {
+			String projectName = bin.getResource().getProjectRelativePath().toString();
+			ILaunchConfigurationType configType = getCLaunchConfigType();
+			ILaunchConfigurationWorkingCopy wc =
+				configType.newInstance(null, getLaunchManager().generateUniqueLaunchConfigurationNameFrom(bin.getElementName()));
+			wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, projectName);
+			wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, bin.getCProject().getElementName());
+			wc.setMappedResources(new IResource[] {bin.getResource().getProject()});
+			wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, (String) null);
+			wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, true);
+			wc.setAttribute(
+				ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
+				ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN);
+			wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, debugConfig.getID());
+
+	        // Workaround for bug 262840: select the standard CDT launcher by default.
+	        HashSet<String> set = new HashSet<String>();
+	        set.add(mode);
+	        try {
+	            ILaunchDelegate preferredDelegate = wc.getPreferredDelegate(set);
+	            if (preferredDelegate == null) {
+                    wc.setPreferredLaunchDelegate(set, "org.eclipse.cdt.cdi.launch.localCLaunch");
+	            }
+	        } catch (CoreException e) {}
+			// End workaround for bug 262840
+	        
+			ICProjectDescription projDes = CCorePlugin.getDefault().getProjectDescription(bin.getCProject().getProject());
+			if (projDes != null)
+			{
+				String buildConfigID = projDes.getActiveConfiguration().getId();
+				wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_BUILD_CONFIG_ID, buildConfigID);				
+			}
+
+			// Load up the debugger page to set the defaults. There should probably be a separate
+			// extension point for this.
+			ICDebuggerPage page = CDebugUIPlugin.getDefault().getDebuggerPage(debugConfig.getID());
+			page.setDefaults(wc);
+			
+			config = wc.doSave();
+		} catch (CoreException ce) {
+			CDebugUIPlugin.log(ce);
+		}
+		return config;
+	}
+
+	/**
+	 * Method getCLaunchConfigType.
+	 * @return ILaunchConfigurationType
+	 */
+	protected ILaunchConfigurationType getCLaunchConfigType() {
+		return getLaunchManager().getLaunchConfigurationType(ICDTLaunchConfigurationConstants.ID_LAUNCH_C_APP);
+	}
+
+	protected ILaunchManager getLaunchManager() {
+		return DebugPlugin.getDefault().getLaunchManager();
+	}
+
+	/**
+	 * Convenience method to get the window that owns this action's Shell.
+	 */
+	protected Shell getShell() {
+       IWorkbenchWindow w = CDebugUIPlugin.getDefault().getActiveWorkbenchWindow();
+        if (w != null) {
+            return w.getShell();
+        }
+        return null;
+	}
+
+	/**
+	 * Method chooseDebugConfig.
+	 * @param debugConfigs
+	 * @param mode
+	 * @return ICDebugConfiguration
+	 */
+	private ICDebugConfiguration chooseDebugConfig(ICDebugConfiguration[] debugConfigs, String mode) {
+		ILabelProvider provider = new LabelProvider() {
+			/**
+			 * The <code>LabelProvider</code> implementation of this 
+			 * <code>ILabelProvider</code> method returns the element's <code>toString</code>
+			 * string. Subclasses may override.
+			 */
+			public String getText(Object element) {
+				if (element == null) {
+					return ""; //$NON-NLS-1$
+				} else if (element instanceof ICDebugConfiguration) {
+					return ((ICDebugConfiguration) element).getName();
+				}
+				return element.toString();
+			}
+		};
+		ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), provider);
+		dialog.setElements(debugConfigs);
+		dialog.setTitle(getDebugConfigDialogTitleString(debugConfigs, mode)); 
+		dialog.setMessage(getDebugConfigDialogMessageString(debugConfigs, mode)); 
+		dialog.setMultipleSelection(false);
+		int result = dialog.open();
+		provider.dispose();
+		if (result == Window.OK) {
+			return (ICDebugConfiguration) dialog.getFirstResult();
+		}
+		return null;
+	}
+
+	protected String getDebugConfigDialogTitleString(ICDebugConfiguration [] configList, String mode) {
+		return LaunchMessages.getString("CApplicationLaunchShortcut.LaunchDebugConfigSelection");  //$NON-NLS-1$
+	}
+	
+	protected String getDebugConfigDialogMessageString(ICDebugConfiguration [] configList, String mode) {
+		if (mode.equals(ILaunchManager.DEBUG_MODE)) {
+			return LaunchMessages.getString("CApplicationLaunchShortcut.ChooseConfigToDebug");  //$NON-NLS-1$
+		} else if (mode.equals(ILaunchManager.RUN_MODE)) {
+			return LaunchMessages.getString("CApplicationLaunchShortcut.ChooseConfigToRun");  //$NON-NLS-1$
+		}
+		return LaunchMessages.getString("CApplicationLaunchShortcut.Invalid_launch_mode_1"); //$NON-NLS-1$
+	}
+
+
+	/**
+	 * Show a selection dialog that allows the user to choose one of the specified
+	 * launch configurations.  Return the chosen config, or <code>null</code> if the
+	 * user cancelled the dialog.
+	 */
+	protected ILaunchConfiguration chooseConfiguration(List configList, String mode) {
+		IDebugModelPresentation labelProvider = DebugUITools.newDebugModelPresentation();
+		ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), labelProvider);
+		dialog.setElements(configList.toArray());
+		dialog.setTitle(getLaunchSelectionDialogTitleString(configList, mode)); 
+		dialog.setMessage(getLaunchSelectionDialogMessageString(configList, mode)); 
+		dialog.setMultipleSelection(false);
+		int result = dialog.open();
+		labelProvider.dispose();
+		if (result == Window.OK) {
+			return (ILaunchConfiguration) dialog.getFirstResult();
+		}
+		return null;
+	}
+
+	protected String getLaunchSelectionDialogTitleString(List configList, String mode) {
+		return LaunchMessages.getString("CApplicationLaunchShortcut.LaunchConfigSelection");  //$NON-NLS-1$
+	}
+	
+	protected String getLaunchSelectionDialogMessageString(List binList, String mode) {
+		if (mode.equals(ILaunchManager.DEBUG_MODE)) {
+			return LaunchMessages.getString("CApplicationLaunchShortcut.ChooseLaunchConfigToDebug");  //$NON-NLS-1$
+		} else if (mode.equals(ILaunchManager.RUN_MODE)) {
+			return LaunchMessages.getString("CApplicationLaunchShortcut.ChooseLaunchConfigToRun");  //$NON-NLS-1$
+		}
+		return LaunchMessages.getString("CApplicationLaunchShortcut.Invalid_launch_mode_2"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Prompts the user to select a  binary
+	 * 
+	 * @return the selected binary or <code>null</code> if none.
+	 */
+	protected IBinary chooseBinary(List binList, String mode) {
+		ILabelProvider programLabelProvider = new CElementLabelProvider() {
+			public String getText(Object element) {
+				if (element instanceof IBinary) {
+					IBinary bin = (IBinary)element;
+					StringBuffer name = new StringBuffer();
+					name.append(bin.getPath().lastSegment());
+					return name.toString();
+				}
+				return super.getText(element);
+			}
+		};
+
+		ILabelProvider qualifierLabelProvider = new CElementLabelProvider() {
+			public String getText(Object element) {
+				if (element instanceof IBinary) {
+					IBinary bin = (IBinary)element;
+					StringBuffer name = new StringBuffer();
+					name.append(bin.getCPU() + (bin.isLittleEndian() ? "le" : "be")); //$NON-NLS-1$ //$NON-NLS-2$
+					name.append(" - "); //$NON-NLS-1$
+					name.append(bin.getPath().toString());
+					return name.toString();
+				}
+				return super.getText(element);
+			}
+		};
+		
+		TwoPaneElementSelector dialog = new TwoPaneElementSelector(getShell(), programLabelProvider, qualifierLabelProvider);
+		dialog.setElements(binList.toArray());
+		dialog.setTitle(getBinarySelectionDialogTitleString(binList, mode));
+		dialog.setMessage(getBinarySelectionDialogMessageString(binList, mode));
+		dialog.setUpperListLabel(LaunchMessages.getString("Launch.common.BinariesColon")); //$NON-NLS-1$
+		dialog.setLowerListLabel(LaunchMessages.getString("Launch.common.QualifierColon")); //$NON-NLS-1$
+		dialog.setMultipleSelection(false);
+		if (dialog.open() == Window.OK) {
+			return (IBinary) dialog.getFirstResult();
+		}
+
+		return null;
+	}
+	
+	protected String getBinarySelectionDialogTitleString(List binList, String mode) {
+		return LaunchMessages.getString("CApplicationLaunchShortcut.CLocalApplication");  //$NON-NLS-1$
+	}
+	
+	protected String getBinarySelectionDialogMessageString(List binList, String mode) {
+		if (mode.equals(ILaunchManager.DEBUG_MODE)) {
+			return LaunchMessages.getString("CApplicationLaunchShortcut.ChooseLocalAppToDebug");  //$NON-NLS-1$
+		} else if (mode.equals(ILaunchManager.RUN_MODE)) {
+			return LaunchMessages.getString("CApplicationLaunchShortcut.ChooseLocalAppToRun");  //$NON-NLS-1$
+		}
+		return LaunchMessages.getString("CApplicationLaunchShortcut.Invalid_launch_mode_3"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Method searchAndLaunch.
+	 * @param objects
+	 * @param mode
+	 */
+	private void searchAndLaunch(final Object[] elements, String mode) {
+		if (elements != null && elements.length > 0) {
+			IBinary bin = null;
+			if (elements.length == 1 && elements[0] instanceof IBinary) {
+				bin = (IBinary)elements[0];
+			} else {
+				final List results = new ArrayList();
+				ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());
+				IRunnableWithProgress runnable = new IRunnableWithProgress() {
+					public void run(IProgressMonitor pm) throws InterruptedException {
+						int nElements = elements.length;
+						pm.beginTask("Looking for executables", nElements); //$NON-NLS-1$
+						try {
+							IProgressMonitor sub = new SubProgressMonitor(pm, 1);
+							for (int i = 0; i < nElements; i++) {
+								if (elements[i] instanceof IAdaptable) {
+									IResource r = (IResource) ((IAdaptable) elements[i]).getAdapter(IResource.class);
+									if (r != null) {
+										ICProject cproject = CoreModel.getDefault().create(r.getProject());
+										if (cproject != null) {
+											try {
+												IBinary[] bins = cproject.getBinaryContainer().getBinaries();
+
+												for (int j = 0; j < bins.length; j++) {
+													if (bins[j].isExecutable()) {
+														results.add(bins[j]);
+													}
+												}
+											} catch (CModelException e) {
+											}
+										}
+									}
+								}
+								if (pm.isCanceled()) {
+									throw new InterruptedException();
+								}
+								sub.done();
+							}
+						} finally {
+							pm.done();
+						}
+					}
+				};
+				try {
+					dialog.run(true, true, runnable);
+				} catch (InterruptedException e) {
+					return;
+				} catch (InvocationTargetException e) {
+					MessageDialog.openError(getShell(), LaunchMessages.getString("CApplicationLaunchShortcut.Application_Launcher"), e.getMessage()); //$NON-NLS-1$
+					return;
+				}
+				int count = results.size();
+				if (count == 0) {					
+					MessageDialog.openError(getShell(), LaunchMessages.getString("CApplicationLaunchShortcut.Application_Launcher"), LaunchMessages.getString("CApplicationLaunchShortcut.Launch_failed_no_binaries")); //$NON-NLS-1$ //$NON-NLS-2$
+				} else if (count > 1) {
+					bin = chooseBinary(results, mode);
+				} else {
+					bin = (IBinary)results.get(0);
+				}
+			}
+			if (bin != null) {
+				launch(bin, mode);
+			}
+		} else {
+			MessageDialog.openError(getShell(), LaunchMessages.getString("CApplicationLaunchShortcut.Application_Launcher"), LaunchMessages.getString("CApplicationLaunchShortcut.Launch_failed_no_project_selected")); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	public ILaunchConfiguration[] getLaunchConfigurations(ISelection selection) {
+		// This returns null so the platform will use the ILaunchShortcut behavior
+		// and get the configurations based on the project resource association.
+		return null;
+	}
+
+	public ILaunchConfiguration[] getLaunchConfigurations(IEditorPart editorpart) {
+		// This returns null so the platform will use the ILaunchShortcut behavior
+		// and get the configurations based on the project resource association.
+		return null;
+	}
+
+	public IResource getLaunchableResource(ISelection selection) {
+		// Take the selection and determine which project is intended to
+		// be used for the launch.
+		if (selection instanceof IStructuredSelection) {
+			Object firstElement = ((IStructuredSelection) selection).getFirstElement();
+			if (firstElement != null)
+			{
+				if (firstElement instanceof IFile)
+				{
+					IFile file = (IFile) firstElement;
+					return file.getProject();
+				}
+				if (firstElement instanceof Executable)
+				{
+					return ((Executable)firstElement).getProject();
+				}
+				if (firstElement instanceof IBinary)
+				{
+					return ((IBinary)firstElement).getResource().getProject();
+				}
+			}
+		}
+		List<IProject> projects = getProjectsFromSelection(selection);		
+		if (projects.size() > 0) {
+			return projects.get(0);
+		}
+		return null;
+	}
+
+	/**
+	 * Gets the owning project(s) of the selected object(s) if any
+	 * @param selection the current selection
+	 * @return a list of projects - may be empty
+	 */
+	public static List<IProject> getProjectsFromSelection(ISelection selection) {
+		List<IProject> projects = new ArrayList<IProject>();
+
+		if (selection != null && !selection.isEmpty()) {
+			if (selection instanceof ITextSelection) {
+				
+				IWorkbenchWindow activeWindow = CDebugUIPlugin.getActiveWorkbenchWindow();				
+				IWorkbenchPage wpage = activeWindow.getActivePage();
+				if (wpage != null) {
+					IEditorPart ep = wpage.getActiveEditor();
+					if (ep != null) {
+						IEditorInput editorInput = ep.getEditorInput();
+						if (editorInput instanceof IFileEditorInput) {
+							IFile file = ((IFileEditorInput)editorInput).getFile();
+							if (file != null) {
+								projects.add(file.getProject());
+							}
+						}
+					}
+				}
+			} else if (selection instanceof IStructuredSelection) {
+				IStructuredSelection structuredSelection = (IStructuredSelection) selection;
+				
+				for (Iterator<?> iter = structuredSelection.iterator(); iter.hasNext();) {
+					Object element = (Object) iter.next();
+					if (element != null) {
+
+						if (element instanceof ICProject) {
+							projects.add(((ICProject)element).getProject());
+						} else if (element instanceof IResource) {
+							projects.add(((IResource)element).getProject());
+						} else if (element instanceof ICElement) {
+							ICElement unit = (ICElement) element;
+
+							// Get parent of the Element until we reach the owner project.
+							while (unit != null && ! (unit instanceof ICProject))
+								unit = unit.getParent();
+							
+							if (unit != null) {
+								projects.add(((ICProject)unit).getProject());
+							}
+						} else if (element instanceof IAdaptable) {
+							Object adapter = ((IAdaptable)element).getAdapter(IResource.class);
+							if (adapter != null && adapter instanceof IResource) {
+								projects.add(((IResource)adapter).getProject());
+							} else {
+								adapter = ((IAdaptable)element).getAdapter(ICProject.class);
+								if (adapter != null && adapter instanceof ICProject) {
+									projects.add(((ICProject)adapter).getProject());
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		return projects;
+	}
+
+	public IResource getLaunchableResource(IEditorPart editorpart) {
+		// This handles the case where the selection is text in an editor.
+		IEditorInput editorInput = editorpart.getEditorInput();
+		if (editorInput instanceof IFileEditorInput) {
+			IFile file = ((IFileEditorInput)editorInput).getFile();
+			if (file != null) {
+				return file.getProject();
+			}
+		}
+		return null;
+	}
+
+}
#P org.eclipse.photran.ui
Index: plugin.xml
===================================================================
RCS file: /cvsroot/tools/org.eclipse.ptp/photran/org.eclipse.photran.ui/plugin.xml,v
retrieving revision 1.20
diff -u -r1.20 plugin.xml
--- plugin.xml	11 Feb 2009 18:00:52 -0000	1.20
+++ plugin.xml	22 Jun 2009 01:29:47 -0000
@@ -141,9 +141,9 @@
             id="org.eclipse.photran.ui.FreeFormBreakpointRulerAction">
          <action
                label="Toggle Breakpoint"
-               class="org.eclipse.cdt.debug.internal.ui.actions.ManageBreakpointRulerActionDelegate"
+               class="org.eclipse.debug.ui.actions.RulerToggleBreakpointActionDelegate"
                actionID="RulerDoubleClick"
-               id="org.eclipse.cdt.debug.ui.CEditor.ManageBreakpointRulerAction">
+               id="org.eclipse.cdt.debug.ui.CEditor.RulerTobbleBreakpointAction">
          </action>
       </editorContribution>
       <editorContribution
@@ -151,12 +151,24 @@
             id="org.eclipse.photran.ui.FixedFormBreakpointRulerAction">
          <action
                label="Toggle Breakpoint"
-               class="org.eclipse.cdt.debug.internal.ui.actions.ManageBreakpointRulerActionDelegate"
+               class="org.eclipse.debug.ui.actions.RulerToggleBreakpointActionDelegate"
                actionID="RulerDoubleClick"
-               id="org.eclipse.cdt.debug.ui.CEditor.ManageBreakpointRulerAction">
+               id="org.eclipse.cdt.debug.ui.CEditor.RulerTobbleBreakpointAction">
          </action>
       </editorContribution>
    </extension>
+   <!-- Enable CDT breakpoint toggle for Photran's editors and model elements -->
+   <extension point="org.eclipse.debug.ui.toggleBreakpointsTargetFactories">
+      <toggleTargetFactory
+            id="ToggleFortranBreakpointsTargetFactory"
+            class="org.eclipse.cdt.debug.internal.ui.actions.ToggleCBreakpointsTargetFactory">
+            <enablement>
+            <or>
+               <instanceof value="org.eclipse.photran.internal.ui.editor.AbstractFortranEditor"/>
+            </or>
+         </enablement>
+      </toggleTargetFactory>
+   </extension>
    
    <!--=============================-->
    <!-- ActionSet-part associations -->
Index: META-INF/MANIFEST.MF
===================================================================
RCS file: /cvsroot/tools/org.eclipse.ptp/photran/org.eclipse.photran.ui/META-INF/MANIFEST.MF,v
retrieving revision 1.14
diff -u -r1.14 MANIFEST.MF
--- META-INF/MANIFEST.MF	21 Jun 2009 17:58:00 -0000	1.14
+++ META-INF/MANIFEST.MF	22 Jun 2009 01:29:47 -0000
@@ -23,5 +23,6 @@
  org.eclipse.core.resources,
  org.eclipse.ui.ide,
  org.eclipse.cdt.debug.ui,
- org.eclipse.cdt.core
+ org.eclipse.cdt.core,
+ org.eclipse.debug.ui
 Eclipse-LazyStart: true