Attachment 208785 Details for Bug 367460 – v1.0

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

[patch] v1.0

367460patch.txt (text/plain), 5.86 KB, created by Elson Yuen

on 2011-12-23 14:19:48 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Elson Yuen

Created: 2011-12-23 14:19:48 EST

Size: 5.86 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.server.ui
>Index: serverui/org/eclipse/wst/server/ui/internal/Messages.properties
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.properties,v
>retrieving revision 1.95.6.2
>diff -u -r1.95.6.2 Messages.properties
>--- serverui/org/eclipse/wst/server/ui/internal/Messages.properties	29 Nov 2011 21:46:54 -0000	1.95.6.2
>+++ serverui/org/eclipse/wst/server/ui/internal/Messages.properties	23 Dec 2011 16:26:13 -0000
>@@ -461,6 +461,8 @@
> serverEditorOverviewTimeoutCommand=modify timeout settings
> serverEditorOverviewOpenLaunchConfiguration=Open launch configuration
> 
>+serverEditorSaving=Performing server save operation.
>+
> # Menu items. {0} will be replaced by one of the xxxEditorActionXxx fields
> # from below. @Ctrl+Z is the menu mnemonic
> editorUndoEnabled=Undo {0}@Ctrl+Z
>@@ -493,7 +495,6 @@
> editorResourceWarnTitle=Server Modification Warning
> editorResourceWarnMessage=The server you are modifying is read-only. All changes will be lost because the server cannot be saved.
> 
>-
> audioPrefSelectFile=Select Audio File
> audioPrefEnable=&Enable sounds
> audioPrefVolume=&Volume:
>Index: serverui/org/eclipse/wst/server/ui/internal/Messages.java
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.java,v
>retrieving revision 1.67.6.2
>diff -u -r1.67.6.2 Messages.java
>--- serverui/org/eclipse/wst/server/ui/internal/Messages.java	29 Nov 2011 21:46:54 -0000	1.67.6.2
>+++ serverui/org/eclipse/wst/server/ui/internal/Messages.java	23 Dec 2011 16:26:13 -0000
>@@ -302,6 +302,7 @@
> 	public static String serverEditorOverviewServerNameCommand;
> 	public static String serverEditorOverviewRuntimeCommand;
> 	public static String serverEditorOverviewOpenLaunchConfiguration;
>+	public static String serverEditorSaving;
> 	public static String errorMissingConfiguration;
> 	public static String errorConfigurationNotAccessible;
> 	public static String viewStatusStarting4;
>@@ -361,7 +362,7 @@
> 	public static String audioUnknown;
> 	public static String audioNone;
> 	public static String audioDefault;
>-
>+	
> 	public static String internalWebBrowserName;
> 
> 	static {
>Index: serverui/org/eclipse/wst/server/ui/editor/ServerEditorSection.java
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/ServerEditorSection.java,v
>retrieving revision 1.18
>diff -u -r1.18 ServerEditorSection.java
>--- serverui/org/eclipse/wst/server/ui/editor/ServerEditorSection.java	19 Apr 2011 17:30:40 -0000	1.18
>+++ serverui/org/eclipse/wst/server/ui/editor/ServerEditorSection.java	23 Dec 2011 16:26:13 -0000
>@@ -11,6 +11,7 @@
> package org.eclipse.wst.server.ui.editor;
> 
> import org.eclipse.core.commands.operations.IUndoableOperation;
>+import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.Status;
> import org.eclipse.swt.widgets.Composite;
>@@ -168,6 +169,21 @@
> 	}
> 
> 	/**
>+	 * Allow a section an opportunity to respond to a doSave request on the editor.
>+	 * @param monitor the progress monitor for the save operation.
>+	 */
>+	public void doSave(IProgressMonitor monitor) {
>+		monitor.worked(100);
>+	}
>+
>+	/**
>+	 * Allow a section an opportunity to respond to a doSaveAs request on the editor.
>+	 */
>+	public void doSaveAs() {
>+		// do nothing
>+	}
>+	
>+	/**
> 	 * Disposes of the section.
> 	 */
> 	public void dispose() {
>Index: serverui/org/eclipse/wst/server/ui/editor/ServerEditorPart.java
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/ServerEditorPart.java,v
>retrieving revision 1.29.2.1
>diff -u -r1.29.2.1 ServerEditorPart.java
>--- serverui/org/eclipse/wst/server/ui/editor/ServerEditorPart.java	11 Aug 2011 19:19:36 -0000	1.29.2.1
>+++ serverui/org/eclipse/wst/server/ui/editor/ServerEditorPart.java	23 Dec 2011 16:26:13 -0000
>@@ -15,6 +15,7 @@
> import org.eclipse.core.commands.operations.IUndoableOperation;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.core.runtime.SubProgressMonitor;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Display;
> import org.eclipse.ui.IEditorInput;
>@@ -23,6 +24,7 @@
> import org.eclipse.ui.forms.widgets.FormToolkit;
> import org.eclipse.ui.part.EditorPart;
> import org.eclipse.wst.server.core.IServerWorkingCopy;
>+import org.eclipse.wst.server.ui.internal.Messages;
> import org.eclipse.wst.server.ui.internal.Trace;
> import org.eclipse.wst.server.ui.internal.editor.*;
> /**
>@@ -69,14 +71,21 @@
> 	 * @see org.eclipse.ui.IEditorPart#doSave(IProgressMonitor)
> 	 */
> 	public void doSave(IProgressMonitor monitor) {
>-		// do nothing
>+		List<ServerEditorSection> curSections = getSections();
>+		int ticks = 100;
>+		monitor.beginTask(Messages.savingTask, curSections.size() * ticks);
>+		for (ServerEditorSection section: curSections) {
>+			section.doSave(new SubProgressMonitor(monitor, ticks));
>+		}
> 	}
> 
> 	/**
> 	 * @see org.eclipse.ui.IEditorPart#doSaveAs()
> 	 */
> 	public void doSaveAs() {
>-		// do nothing
>+		for (ServerEditorSection section: getSections()) {
>+			section.doSaveAs();
>+		}
> 	}
> 
> 	/**
>@@ -193,7 +202,7 @@
> 		return status;
> 	}
> 
>-	private List getSections() {
>+	private List<ServerEditorSection> getSections() {
> 		if (sections == null) {
> 			sections = new ArrayList<ServerEditorSection>();
> 			sectionToInsertionId = new HashMap<String, List<ServerEditorSection>>();

Actions: View | Diff

Attachments on bug 367460: 208755 | 208785