Attachment 87717 Details for Bug 214696 – Updated patch to prevent an NPE from being thrown.

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Updated patch to prevent an NPE from being thrown.

patch.txt (text/plain), 19.47 KB, created by Remy Suen

on 2008-01-23 18:51:28 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Remy Suen

Created: 2008-01-23 18:51:28 EST

Size: 19.47 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.debug.ui
>Index: ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetEditorPropertyPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetEditorPropertyPage.java,v
>retrieving revision 1.25
>diff -u -r1.25 SnippetEditorPropertyPage.java
>--- ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetEditorPropertyPage.java	27 Apr 2007 18:24:48 -0000	1.25
>+++ ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetEditorPropertyPage.java	23 Jan 2008 23:42:17 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2007 IBM Corporation and others.
>+ * Copyright (c) 2000, 2008 IBM Corporation 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
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>+ *     Remy Chi Jian Suen <remy.suen@gmail.com> - Bug 214696 Expose WorkingDirectoryBlock as API
>  *******************************************************************************/
> package org.eclipse.jdt.internal.debug.ui.snippeteditor;
> 
>@@ -20,6 +21,7 @@
> import org.eclipse.debug.ui.ILaunchConfigurationTab;
> import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
> import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
>+import org.eclipse.jdt.internal.debug.ui.launcher.JavaWorkingDirectoryBlock;
> import org.eclipse.jdt.internal.debug.ui.launcher.VMArgumentsBlock;
> import org.eclipse.jdt.internal.debug.ui.launcher.WorkingDirectoryBlock;
> import org.eclipse.jface.operation.IRunnableWithProgress;
>@@ -34,7 +36,7 @@
>  */
> public class SnippetEditorPropertyPage extends PropertyPage {
> 	
>-	private WorkingDirectoryBlock fWorkingDirBlock = new WorkingDirectoryBlock();
>+	private WorkingDirectoryBlock fWorkingDirBlock = new JavaWorkingDirectoryBlock();
> 	
> 	private JavaJRETab fJRETab = new JavaJRETab();
> 	
>Index: ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletWorkingDirectoryBlock.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletWorkingDirectoryBlock.java,v
>retrieving revision 1.8
>diff -u -r1.8 AppletWorkingDirectoryBlock.java
>--- ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletWorkingDirectoryBlock.java	8 May 2006 20:35:08 -0000	1.8
>+++ ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletWorkingDirectoryBlock.java	23 Jan 2008 23:42:13 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2006 IBM Corporation and others.
>+ * Copyright (c) 2000, 2008 IBM Corporation 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
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>+ *     Remy Chi Jian Suen <remy.suen@gmail.com> - Bug 214696 Expose WorkingDirectoryBlock as API
>  *******************************************************************************/
> package org.eclipse.jdt.internal.debug.ui.launcher;
> 
>@@ -14,7 +15,7 @@
> import org.eclipse.jdt.launching.JavaRuntime;
> 
>  
>-public class AppletWorkingDirectoryBlock extends WorkingDirectoryBlock {
>+public class AppletWorkingDirectoryBlock extends JavaWorkingDirectoryBlock {
> 
> 	/**
> 	 * @see org.eclipse.jdt.internal.debug.ui.launcher.WorkingDirectoryBlock#setDefaultWorkingDir()
>Index: ui/org/eclipse/jdt/internal/debug/ui/launcher/WorkingDirectoryBlock.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/WorkingDirectoryBlock.java,v
>retrieving revision 1.36
>diff -u -r1.36 WorkingDirectoryBlock.java
>--- ui/org/eclipse/jdt/internal/debug/ui/launcher/WorkingDirectoryBlock.java	27 Mar 2007 02:35:58 -0000	1.36
>+++ ui/org/eclipse/jdt/internal/debug/ui/launcher/WorkingDirectoryBlock.java	23 Jan 2008 23:42:17 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation 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
>@@ -7,12 +7,14 @@
>  *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>+ *     Remy Chi Jian Suen <remy.suen@gmail.com> - Bug 214696 Expose WorkingDirectoryBlock as API
>  *******************************************************************************/
> package org.eclipse.jdt.internal.debug.ui.launcher;
> 
> import java.io.File;
> 
> import org.eclipse.core.resources.IContainer;
>+import org.eclipse.core.resources.IProject;
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.resources.IWorkspaceRoot;
> import org.eclipse.core.resources.ResourcesPlugin;
>@@ -23,14 +25,10 @@
> import org.eclipse.core.variables.VariablesPlugin;
> import org.eclipse.debug.core.ILaunchConfiguration;
> import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
>+import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
> import org.eclipse.debug.ui.StringVariableSelectionDialog;
>-import org.eclipse.jdt.core.IJavaProject;
>-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaLaunchTab;
>-import org.eclipse.jdt.internal.debug.ui.IJavaDebugHelpContextIds;
>-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
> import org.eclipse.jdt.internal.debug.ui.SWTFactory;
>-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
>-import org.eclipse.jdt.launching.JavaRuntime;
>+import org.eclipse.jface.util.Assert;
> import org.eclipse.swt.events.ModifyEvent;
> import org.eclipse.swt.events.ModifyListener;
> import org.eclipse.swt.events.SelectionAdapter;
>@@ -50,7 +48,7 @@
>  * A control for setting the working directory associated with a launch
>  * configuration.
>  */
>-public class WorkingDirectoryBlock extends JavaLaunchTab {
>+public abstract class WorkingDirectoryBlock extends AbstractLaunchConfigurationTab {
> 			
> 	// Local directory
> 	private Button fWorkspaceButton;
>@@ -103,6 +101,40 @@
> 	
> 	private WidgetListener fListener = new WidgetListener();
> 	
>+	/**
>+	 * The name of the launch configuration attribute that will be used to save
>+	 * the location of the working directory.
>+	 */
>+	private final String workingDirectoryAttribteName;
>+	
>+	/**
>+	 * The help context id to use to connect this working directory block
>+	 * to the help system.
>+	 */
>+	private final String helpContextId;
>+	
>+	/**
>+	 * Creates a new WorkingDirectoryBlock for setting a working directory.
>+	 * 
>+	 * @param workingDirectoryAttribteName the name of the launch configuration attribute to set the working directory's location, cannot be <tt>null</tt>
>+	 */
>+	public WorkingDirectoryBlock(String workingDirectoryAttribteName) {
>+		this(workingDirectoryAttribteName, null);
>+	}
>+	
>+	/**
>+	 * Creates a new WorkingDirectoryBlock for setting a working directory.
>+	 * 
>+	 * @param workingDirectoryAttribteName the name of the launch configuration attribute to set the working directory's location, cannot be <tt>null</tt>
>+	 * @param helpContextId the help context id to use to hook onto the help system
>+	 */
>+	public WorkingDirectoryBlock(String workingDirectoryAttribteName,
>+			String helpContextId) {
>+		Assert.isNotNull(workingDirectoryAttribteName);
>+		this.workingDirectoryAttribteName = workingDirectoryAttribteName;
>+		this.helpContextId = helpContextId;
>+	}
>+	
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
> 	 */
>@@ -110,7 +142,11 @@
> 		Font font = parent.getFont();	
> 		Group group = SWTFactory.createGroup(parent, LauncherMessages.WorkingDirectoryBlock_12, 2, 1, GridData.FILL_HORIZONTAL);
> 		setControl(group);
>-		PlatformUI.getWorkbench().getHelpSystem().setHelp(group, IJavaDebugHelpContextIds.WORKING_DIRECTORY_BLOCK);
>+		
>+		if (helpContextId != null) {
>+			PlatformUI.getWorkbench().getHelpSystem().setHelp(group, helpContextId);	
>+		}
>+		
> 	//default choice
> 		Composite comp = SWTFactory.createComposite(group, font, 2, 2, GridData.FILL_BOTH, 0, 0);
> 		fUseDefaultDirButton = SWTFactory.createRadioButton(comp, LauncherMessages.WorkingDirectoryBlock_18);
>@@ -192,7 +228,9 @@
>                         res = containers[0];
>                     }
>                 } 
>-			    catch (CoreException e) {}
>+			    catch (CoreException e) {
>+			    	log(e);
>+			    }
> 			} 
> 		    else {	    
> 				res = root.findMember(path);
>@@ -247,16 +285,26 @@
> 		try {
> 			ILaunchConfiguration config = getLaunchConfiguration();
> 			if (config != null) {
>-				IJavaProject javaProject = JavaRuntime.getJavaProject(config);
>-				if (javaProject != null) {
>-					setDefaultWorkingDirectoryText("${workspace_loc:" + javaProject.getPath().makeRelative().toOSString() + "}");  //$NON-NLS-1$//$NON-NLS-2$
>+				IProject project = getProject(config);
>+				if (project != null) {
>+					setDefaultWorkingDirectoryText("${workspace_loc:" + project.getFullPath().makeRelative().toOSString() + "}");  //$NON-NLS-1$//$NON-NLS-2$
> 					return;
> 				}
> 			}
> 		} 
>-		catch (CoreException ce) {}
>+		catch (CoreException ce) {
>+			log(ce);
>+		}
> 		setDefaultWorkingDirectoryText(System.getProperty("user.dir")); //$NON-NLS-1$
> 	}
>+	
>+	/**
>+	 * Retrieves the project that is associated with the specified launch configuration.
>+	 * @param configuration the launch configuration that has been set to this working directory block
>+	 * @return the project specified by the launch configuration, or <tt>null</tt> if nothing has been set
>+	 * @throws CoreException if an error occurred while retrieving the project from the launch configuration
>+	 */
>+	protected abstract IProject getProject(ILaunchConfiguration configuration) throws CoreException;
> 
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
>@@ -273,6 +321,7 @@
> 			}
> 			catch (CoreException e) {
> 				setErrorMessage(e.getMessage());
>+				log(e);
> 				return false;
> 			}
> 		} 
>@@ -299,7 +348,7 @@
> 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
> 	 */
> 	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
>-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, (String)null);
>+		config.setAttribute(workingDirectoryAttribteName, (String)null);
> 	}
> 
> 	/* (non-Javadoc)
>@@ -308,15 +357,15 @@
> 	public void initializeFrom(ILaunchConfiguration configuration) {
> 		setLaunchConfiguration(configuration);
> 		try {			
>-			String wd = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, (String)null);
>+			String wd = configuration.getAttribute(workingDirectoryAttribteName, (String)null);
> 			setDefaultWorkingDir();
> 			if (wd != null) {
> 				setOtherWorkingDirectoryText(wd);
> 			}
> 		} 
> 		catch (CoreException e) {
>-			setErrorMessage(LauncherMessages.JavaArgumentsTab_Exception_occurred_reading_configuration___15 + e.getStatus().getMessage()); 
>-			JDIDebugUIPlugin.log(e);
>+			setErrorMessage(LauncherMessages.JavaArgumentsTab_Exception_occurred_reading_configuration___15 + e.getStatus().getMessage());
>+			log(e);
> 		}
> 	}
> 
>@@ -325,10 +374,10 @@
> 	 */
> 	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
> 		if(fUseDefaultDirButton.getSelection()) {
>-			configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, (String)null);
>+			configuration.setAttribute(workingDirectoryAttribteName, (String)null);
> 		}
> 		else {
>-			configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, getWorkingDirectoryText());
>+			configuration.setAttribute(workingDirectoryAttribteName, getWorkingDirectoryText());
> 		}
> 	}
> 	
>@@ -340,6 +389,16 @@
> 	}
> 	
> 	/**
>+	 * Logs exceptions that have been caught by this working directory block.
>+	 * The default implementation does nothing. Subclasses should reimplement
>+	 * if they wish to monitor such exceptions.
>+	 * @param e the exception to log
>+	 */
>+	protected void log(CoreException e) {
>+		// do nothing
>+	}
>+	
>+	/**
> 	 * gets the path from the text box that is selected
> 	 * @return the working directory the user wishes to use
> 	 * @since 3.2
>@@ -397,7 +456,7 @@
> 	 * Allows this entire block to be enabled/disabled
> 	 * @param enabled whether to enable it or not
> 	 */
>-	protected void setEnabled(boolean enabled) {
>+	public void setEnabled(boolean enabled) {
> 		fUseDefaultDirButton.setEnabled(enabled);
> 		fUseOtherDirButton.setEnabled(enabled);
> 		if(fOtherWorkingText.isEnabled()) {
>Index: ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaArgumentsTab.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaArgumentsTab.java,v
>retrieving revision 1.37
>diff -u -r1.37 JavaArgumentsTab.java
>--- ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaArgumentsTab.java	12 Sep 2007 15:24:18 -0000	1.37
>+++ ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaArgumentsTab.java	23 Jan 2008 23:42:13 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2006 IBM Corporation and others.
>+ * Copyright (c) 2000, 2008 IBM Corporation 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
>@@ -7,6 +7,7 @@
>  * 
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>+ *     Remy Chi Jian Suen <remy.suen@gmail.com> - Bug 214696 Expose WorkingDirectoryBlock as API
>  *******************************************************************************/
> package org.eclipse.jdt.debug.ui.launchConfigurations;
> 
>@@ -20,6 +21,7 @@
> import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
> import org.eclipse.jdt.internal.debug.ui.JavaDebugImages;
> import org.eclipse.jdt.internal.debug.ui.actions.ControlAccessibleListener;
>+import org.eclipse.jdt.internal.debug.ui.launcher.JavaWorkingDirectoryBlock;
> import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages;
> import org.eclipse.jdt.internal.debug.ui.launcher.VMArgumentsBlock;
> import org.eclipse.jdt.internal.debug.ui.launcher.WorkingDirectoryBlock;
>@@ -72,7 +74,7 @@
> 	}
> 	
> 	protected WorkingDirectoryBlock createWorkingDirBlock() {
>-		return new WorkingDirectoryBlock();
>+		return new JavaWorkingDirectoryBlock();
> 	}
> 	
> 	/**
>Index: ui/org/eclipse/jdt/internal/debug/ui/launcher/JavaWorkingDirectoryBlock.java
>===================================================================
>RCS file: ui/org/eclipse/jdt/internal/debug/ui/launcher/JavaWorkingDirectoryBlock.java
>diff -N ui/org/eclipse/jdt/internal/debug/ui/launcher/JavaWorkingDirectoryBlock.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ ui/org/eclipse/jdt/internal/debug/ui/launcher/JavaWorkingDirectoryBlock.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,40 @@
>+/*******************************************************************************
>+ * Copyright (c) 2008 IBM Corporation 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:
>+ *     IBM Corporation - initial API and implementation
>+ *     Remy Chi Jian Suen <remy.suen@gmail.com> - Bug 214696 Expose WorkingDirectoryBlock as API
>+ *******************************************************************************/
>+package org.eclipse.jdt.internal.debug.ui.launcher;
>+
>+import org.eclipse.core.resources.IProject;
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.debug.core.ILaunchConfiguration;
>+import org.eclipse.jdt.core.IJavaProject;
>+import org.eclipse.jdt.internal.debug.ui.IJavaDebugHelpContextIds;
>+import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
>+import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
>+import org.eclipse.jdt.launching.JavaRuntime;
>+
>+public class JavaWorkingDirectoryBlock extends WorkingDirectoryBlock {
>+
>+	public JavaWorkingDirectoryBlock() {
>+		super(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY,
>+				IJavaDebugHelpContextIds.WORKING_DIRECTORY_BLOCK);
>+	}
>+
>+	protected IProject getProject(ILaunchConfiguration configuration)
>+			throws CoreException {
>+		IJavaProject project = JavaRuntime.getJavaProject(configuration);
>+		return project == null ? null : project.getProject();
>+	}
>+
>+	protected void log(CoreException e) {
>+		JDIDebugUIPlugin.log(e);
>+	}
>+
>+}
>#P org.eclipse.ant.ui
>Index: Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntWorkingDirectoryBlock.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntWorkingDirectoryBlock.java,v
>retrieving revision 1.18
>diff -u -r1.18 AntWorkingDirectoryBlock.java
>--- Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntWorkingDirectoryBlock.java	10 Apr 2006 15:39:25 -0000	1.18
>+++ Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntWorkingDirectoryBlock.java	23 Jan 2008 23:42:21 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2006 IBM Corporation and others.
>+ * Copyright (c) 2000, 2008 IBM Corporation 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
>@@ -7,20 +7,21 @@
>  *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>+ *     Remy Chi Jian Suen <remy.suen@gmail.com> - Bug 214696 Expose WorkingDirectoryBlock as API
>  *******************************************************************************/
> package org.eclipse.ant.internal.ui.launchConfigurations;
> 
>-import com.ibm.icu.text.MessageFormat;
>-
> import org.eclipse.ant.internal.ui.AntUIPlugin;
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.debug.core.ILaunchConfiguration;
>-import org.eclipse.jdt.internal.debug.ui.launcher.WorkingDirectoryBlock;
>+import org.eclipse.jdt.internal.debug.ui.launcher.JavaWorkingDirectoryBlock;
> import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
> import org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsUtil;
> 
>+import com.ibm.icu.text.MessageFormat;
>+
> 
>-public class AntWorkingDirectoryBlock extends WorkingDirectoryBlock {
>+public class AntWorkingDirectoryBlock extends JavaWorkingDirectoryBlock {
> 	
> 	private String fDefaultWorkingDirPath;
> 
>@@ -67,11 +68,4 @@
> 	private boolean isSameAsDefault(String workingDir) {
> 		return workingDir == null || (workingDir.equals(fDefaultWorkingDirPath) || workingDir.equals(System.getProperty("user.dir"))); //$NON-NLS-1$
> 	}
>-	
>-	/* (non-Javadoc)
>-	 * @see org.eclipse.jdt.internal.debug.ui.launcher.WorkingDirectoryBlock#setEnabled(boolean)
>-	 */
>-	protected void setEnabled(boolean enabled) {
>-		super.setEnabled(enabled);
>-	}
> }

Actions: View | Diff

Attachments on bug 214696: 87364 | 87556 | 87717