Attachment 212175 Details for Bug 373431 – Patch 1.0

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

[patch] Patch 1.0

373431_patch_v1.txt (text/plain), 3.42 KB, created by Steven Hung

on 2012-03-06 17:52:20 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Steven Hung

Created: 2012-03-06 17:52:20 EST

Size: 3.42 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.server.ui
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.42.2.5
>diff -u -r1.42.2.5 MANIFEST.MF
>--- META-INF/MANIFEST.MF	28 Dec 2011 20:26:53 -0000	1.42.2.5
>+++ META-INF/MANIFEST.MF	6 Mar 2012 22:48:59 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.wst.server.ui; singleton:=true
>-Bundle-Version: 1.3.0.qualifier
>+Bundle-Version: 1.3.1.qualifier
> Bundle-Activator: org.eclipse.wst.server.ui.internal.ServerUIPlugin
> Bundle-Vendor: %providerName
> Bundle-Localization: plugin
>Index: serverui/org/eclipse/wst/server/ui/internal/view/servers/GlobalDeleteAction.java
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/GlobalDeleteAction.java,v
>retrieving revision 1.2.8.1
>diff -u -r1.2.8.1 GlobalDeleteAction.java
>--- serverui/org/eclipse/wst/server/ui/internal/view/servers/GlobalDeleteAction.java	29 Nov 2011 21:46:54 -0000	1.2.8.1
>+++ serverui/org/eclipse/wst/server/ui/internal/view/servers/GlobalDeleteAction.java	6 Mar 2012 22:48:59 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2009, 2011 IBM Corporation and others.
>+ * Copyright (c) 2009, 2012 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
>@@ -28,6 +28,7 @@
> import org.eclipse.wst.server.core.ServerCore;
> import org.eclipse.wst.server.ui.internal.DeleteServerDialog;
> import org.eclipse.wst.server.ui.internal.Messages;
>+import org.eclipse.wst.server.ui.internal.Trace;
> /**
>  * This global delete action handles both the server and module deletion.
>  */
>@@ -174,6 +175,33 @@
> 	}
> 	
> 	protected void deleteServer(IServer server){
>+		// It is possible that the server is created and added to the server view on workbench
>+		// startup. As a result, when the user switches to the server view, the server is 
>+		// selected, but the selectionChanged event is not called, which results in servers
>+		// being null. When servers is null the server will not be deleted and the error log
>+		// will have an IllegalArgumentException.
>+		//
>+		// To handle the case where servers is null, the selectionChanged method is called
>+		// to ensure servers will be populated.
>+		if (servers == null){
>+			if (Trace.FINEST) {
>+				Trace.trace(Trace.STRING_FINEST, "Delete server called when servers is null");
>+			}				
>+					
>+		IStructuredSelection sel = getStructuredSelection();
>+		if (sel != null){
>+			selectionChanged(sel);
>+		}
>+		}
>+			
>+		if (Trace.FINEST) {
>+			Trace.trace(Trace.STRING_FINEST, "Opening delete server dialog with parameters shell="
>+					+ shell + " servers=" + servers + " configs=" + configs);
>+		}		
>+
>+		// No check is made for valid parameters at this point, since if there is a failure, it
>+		// should be output to the error log instead of failing silently.		
>+		
> 		DeleteServerDialog dsd = new DeleteServerDialog(shell, servers, configs);
> 		dsd.open();
> 	}

Actions: View | Diff

Attachments on bug 373431: 212175