[376658] Run on Server Wizard server name and status cannot be re-sized
[376996] deleting a server with a dirty server editor
[377095] FileNotFound and ResourceExceptions when Deleting Servers Configuration
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 a3e65f8..0dd0cf0 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
@@ -20,5 +20,8 @@
<p>Bug <a href='https://bugs.eclipse.org/352850'>352850</a>. [TCP/IP Monitor] Improper handling of national characters</p>
<p>Bug <a href='https://bugs.eclipse.org/370894'>370894</a>. Context menu not available if server is empty</p>
<p>Bug <a href='https://bugs.eclipse.org/376654'>376654</a>. RejectedExecutionException is thrown if Finish is clicked and then trying to edit the host name field</p>
+<p>Bug <a href='https://bugs.eclipse.org/376658'>376658</a>. Run on Server Wizard server name and status cannot be re-sized</p>
+<p>Bug <a href='https://bugs.eclipse.org/376996'>376996</a>. deleting a server with a dirty server editor</p>
+<p>Bug <a href='https://bugs.eclipse.org/377095'>377095</a>. FileNotFound and ResourceExceptions when Deleting Servers Configuration</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 508005e..4aebe55 100644
--- a/features/org.eclipse.wst.server_ui.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.server_ui.feature.patch/feature.properties
@@ -34,6 +34,9 @@
Bug https://bugs.eclipse.org/352850 [TCP/IP Monitor] Improper handling of national characters\n\
Bug https://bugs.eclipse.org/371828 IllegalArgumentException when trying to delete a Server from server definitions\n\
Bug https://bugs.eclipse.org/376654 RejectedExecutionException is thrown if Finish is clicked and then trying to edit the host name field\n\
+Bug https://bugs.eclipse.org/376658 Run on Server Wizard server name and status cannot be re-sized\n\
+Bug https://bugs.eclipse.org/376996 deleting a server with a dirty server editor\n\
+Bug https://bugs.eclipse.org/377095 FileNotFound and ResourceExceptions when Deleting Servers Configuration\n\
\n\
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/DeleteServerDialog.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/DeleteServerDialog.java
index 648edfc..0c7a9ab 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/DeleteServerDialog.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/DeleteServerDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2011 IBM Corporation and others.
+ * Copyright (c) 2003, 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
@@ -17,6 +17,7 @@
import java.util.List;
import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceRuleFactory;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -173,8 +174,10 @@
if (checked) {
size = configs.length;
- for (int i = 0; i < size; i++)
+ for (int i = 0; i < size; i++) {
+ configs[i].refreshLocal(IResource.DEPTH_INFINITE, monitor);
configs[i].delete(true, true, monitor);
+ }
}
} catch (Exception e) {
if (Trace.SEVERE) {
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditor.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditor.java
index 5f38ef9..9f9e906 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditor.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2011 IBM Corporation and others.
+ * Copyright (c) 2003, 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
@@ -95,8 +95,18 @@
// do nothing
}
public void serverRemoved(IServer oldServer) {
- if (oldServer.equals(server.getOriginal()) && !isDirty())
- closeEditor();
+ if (oldServer.equals(server.getOriginal())) {
+ resourceDeleted = true;
+ if (!isDirty()) {
+ closeEditor();
+ } else {
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ checkAndCloseEditorOnDeletedServer();
+ }
+ });
+ }
+ }
}
}
@@ -927,17 +937,8 @@
public void setFocus() {
super.setFocus();
}
-
- /**
- *
- */
- protected void checkResourceState() {
- // do not check the resource state change if saving through the editor
- if (isSaving) {
- // do nothing
- return;
- }
-
+
+ void checkAndCloseEditorOnDeletedServer() {
// check for deleted files
if (resourceDeleted) {
String title = Messages.editorResourceDeleteTitle;
@@ -951,9 +952,22 @@
doSave(new NullProgressMonitor());
else
closeEditor();
- return;
}
resourceDeleted = false;
+ }
+
+ /**
+ *
+ */
+ protected void checkResourceState() {
+ // do not check the resource state change if saving through the editor
+ if (isSaving) {
+ // do nothing
+ return;
+ }
+
+ // check for deleted files
+ checkAndCloseEditorOnDeletedServer();
// check for server changes
if (serverId != null) {
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/ServerComposite.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/ServerComposite.java
index ce73bbe..5802034 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/ServerComposite.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/ServerComposite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 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
@@ -58,9 +58,10 @@
this.listener = listener2;
Tree tree2 = treeViewer.getTree();
+ tree2.setHeaderVisible(true);
TreeColumn column = new TreeColumn(tree2, SWT.SINGLE);
column.setText(Messages.viewServer);
- column.setWidth(325);
+ column.setWidth(400);
TreeColumn column2 = new TreeColumn(tree2, SWT.SINGLE);
column2.setText(Messages.viewState);
