[328200] ServerUIPlugin shows server view when the view is not open
diff --git a/features/org.eclipse.wst.server_ui.feature.patch/buildnotes_org.eclipse.wst.server_ui.feature.patch.html b/features/org.eclipse.wst.server_ui.feature.patch/buildnotes_org.eclipse.wst.server_ui.feature.patch.html index 82f71f2..d24046f 100644 --- a/features/org.eclipse.wst.server_ui.feature.patch/buildnotes_org.eclipse.wst.server_ui.feature.patch.html +++ b/features/org.eclipse.wst.server_ui.feature.patch/buildnotes_org.eclipse.wst.server_ui.feature.patch.html
@@ -17,5 +17,6 @@ <p>Bug <a href='https://bugs.eclipse.org/286960'>286960</a>. Cannot delete a module using the delete key button on servers view.</p> <p>Bug <a href='https://bugs.eclipse.org/291960'>291960</a>. XMLViewer makes (apparently) invalid assumptions about TransformerFactory</p> <p>Bug <a href='https://bugs.eclipse.org/309781'>309781</a>. Deadlock during debugging</p> +<p>Bug <a href='https://bugs.eclipse.org/328200'>328200</a>. ServerUIPlugin shows server view when the view is not open</p> </body></html> \ No newline at end of file
diff --git a/features/org.eclipse.wst.server_ui.feature.patch/feature.properties b/features/org.eclipse.wst.server_ui.feature.patch/feature.properties index e043e9d..604bb27 100644 --- a/features/org.eclipse.wst.server_ui.feature.patch/feature.properties +++ b/features/org.eclipse.wst.server_ui.feature.patch/feature.properties
@@ -30,6 +30,7 @@ Bug https://bugs.eclipse.org/286960 Cannot delete a module using the delete key button on servers view.\n\ Bug https://bugs.eclipse.org/291960 XMLViewer makes (apparently) invalid assumptions about TransformerFactory\n\ Bug https://bugs.eclipse.org/309781 Deadlock during debugging\n\ +Bug https://bugs.eclipse.org/328200 ServerUIPlugin shows server view when the view is not open\n\ \n\ # "copyright" property - text of the "Feature Update Copyright"
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerUIPlugin.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerUIPlugin.java index 5d09bdc..4f69f16 100644 --- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerUIPlugin.java +++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerUIPlugin.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2008 IBM Corporation and others. + * Copyright (c) 2003, 2010 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 @@ -503,8 +503,7 @@ view2.getSite().getAdapter(IWorkbenchSiteProgressService.class); wsps.warnOfContentChange(); } - } else - page.showView(VIEW_ID); + } } catch (Exception e) { Trace.trace(Trace.SEVERE, "Error opening Servers view", e); }