Attachment #208785 for bug #367460

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

Lines 461-466 Link Here

(-)serverui/org/eclipse/wst/server/ui/internal/Messages.properties (-1 / +2 lines)
461	serverEditorOverviewTimeoutCommand=modify timeout settings	461	serverEditorOverviewTimeoutCommand=modify timeout settings
462	serverEditorOverviewOpenLaunchConfiguration=Open launch configuration	462	serverEditorOverviewOpenLaunchConfiguration=Open launch configuration
463		463
		464	serverEditorSaving=Performing server save operation.
		465
464	# Menu items. {0} will be replaced by one of the xxxEditorActionXxx fields	466	# Menu items. {0} will be replaced by one of the xxxEditorActionXxx fields
465	# from below. @Ctrl+Z is the menu mnemonic	467	# from below. @Ctrl+Z is the menu mnemonic
466	editorUndoEnabled=Undo {0}@Ctrl+Z	468	editorUndoEnabled=Undo {0}@Ctrl+Z
Lines 493-499 Link Here
493	editorResourceWarnTitle=Server Modification Warning	495	editorResourceWarnTitle=Server Modification Warning
494	editorResourceWarnMessage=The server you are modifying is read-only. All changes will be lost because the server cannot be saved.	496	editorResourceWarnMessage=The server you are modifying is read-only. All changes will be lost because the server cannot be saved.
495		497
496
497	audioPrefSelectFile=Select Audio File	498	audioPrefSelectFile=Select Audio File
498	audioPrefEnable=&Enable sounds	499	audioPrefEnable=&Enable sounds
499	audioPrefVolume=&Volume:	500	audioPrefVolume=&Volume:

Lines 302-307 Link Here

(-)serverui/org/eclipse/wst/server/ui/internal/Messages.java (-1 / +2 lines)
302	public static String serverEditorOverviewServerNameCommand;	302	public static String serverEditorOverviewServerNameCommand;
303	public static String serverEditorOverviewRuntimeCommand;	303	public static String serverEditorOverviewRuntimeCommand;
304	public static String serverEditorOverviewOpenLaunchConfiguration;	304	public static String serverEditorOverviewOpenLaunchConfiguration;
		305	public static String serverEditorSaving;
305	public static String errorMissingConfiguration;	306	public static String errorMissingConfiguration;
306	public static String errorConfigurationNotAccessible;	307	public static String errorConfigurationNotAccessible;
307	public static String viewStatusStarting4;	308	public static String viewStatusStarting4;
Lines 361-367 Link Here
361	public static String audioUnknown;	362	public static String audioUnknown;
362	public static String audioNone;	363	public static String audioNone;
363	public static String audioDefault;	364	public static String audioDefault;
364		365
365	public static String internalWebBrowserName;	366	public static String internalWebBrowserName;
366		367
367	static {	368	static {




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;

	}

	/**
	 * 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() {

Lines 15-20 Link Here

(-)serverui/org/eclipse/wst/server/ui/editor/ServerEditorPart.java (-3 / +12 lines)
15	import org.eclipse.core.commands.operations.IUndoableOperation;	15	import org.eclipse.core.commands.operations.IUndoableOperation;
16	import org.eclipse.core.runtime.IProgressMonitor;	16	import org.eclipse.core.runtime.IProgressMonitor;
17	import org.eclipse.core.runtime.IStatus;	17	import org.eclipse.core.runtime.IStatus;
		18	import org.eclipse.core.runtime.SubProgressMonitor;
18	import org.eclipse.swt.widgets.Composite;	19	import org.eclipse.swt.widgets.Composite;
19	import org.eclipse.swt.widgets.Display;	20	import org.eclipse.swt.widgets.Display;
20	import org.eclipse.ui.IEditorInput;	21	import org.eclipse.ui.IEditorInput;
Lines 23-28 Link Here
23	import org.eclipse.ui.forms.widgets.FormToolkit;	24	import org.eclipse.ui.forms.widgets.FormToolkit;
24	import org.eclipse.ui.part.EditorPart;	25	import org.eclipse.ui.part.EditorPart;
25	import org.eclipse.wst.server.core.IServerWorkingCopy;	26	import org.eclipse.wst.server.core.IServerWorkingCopy;
		27	import org.eclipse.wst.server.ui.internal.Messages;
26	import org.eclipse.wst.server.ui.internal.Trace;	28	import org.eclipse.wst.server.ui.internal.Trace;
27	import org.eclipse.wst.server.ui.internal.editor.*;	29	import org.eclipse.wst.server.ui.internal.editor.*;
28	/**	30	/**
Lines 69-82 Link Here
69	* @see org.eclipse.ui.IEditorPart#doSave(IProgressMonitor)	71	* @see org.eclipse.ui.IEditorPart#doSave(IProgressMonitor)
70	*/	72	*/
71	public void doSave(IProgressMonitor monitor) {	73	public void doSave(IProgressMonitor monitor) {
72	// do nothing	74	List<ServerEditorSection> curSections = getSections();
		75	int ticks = 100;
		76	monitor.beginTask(Messages.savingTask, curSections.size() * ticks);
		77	for (ServerEditorSection section: curSections) {
		78	section.doSave(new SubProgressMonitor(monitor, ticks));
		79	}
73	}	80	}
74		81
75	/**	82	/**
76	* @see org.eclipse.ui.IEditorPart#doSaveAs()	83	* @see org.eclipse.ui.IEditorPart#doSaveAs()
77	*/	84	*/
78	public void doSaveAs() {	85	public void doSaveAs() {
79	// do nothing	86	for (ServerEditorSection section: getSections()) {
		87	section.doSaveAs();
		88	}
80	}	89	}
81		90
82	/**	91	/**
Lines 193-199 Link Here
193	return status;	202	return status;
194	}	203	}
195		204
196	private List getSections() {	205	private List<ServerEditorSection> getSections() {
197	if (sections == null) {	206	if (sections == null) {
198	sections = new ArrayList<ServerEditorSection>();	207	sections = new ArrayList<ServerEditorSection>();
199	sectionToInsertionId = new HashMap<String, List<ServerEditorSection>>();	208	sectionToInsertionId = new HashMap<String, List<ServerEditorSection>>();

Return to bug 367460

Lines 11-16 Link Here

(-)serverui/org/eclipse/wst/server/ui/editor/ServerEditorSection.java (+16 lines)
11	package org.eclipse.wst.server.ui.editor;	11	package org.eclipse.wst.server.ui.editor;
12		12
13	import org.eclipse.core.commands.operations.IUndoableOperation;	13	import org.eclipse.core.commands.operations.IUndoableOperation;
		14	import org.eclipse.core.runtime.IProgressMonitor;
14	import org.eclipse.core.runtime.IStatus;	15	import org.eclipse.core.runtime.IStatus;
15	import org.eclipse.core.runtime.Status;	16	import org.eclipse.core.runtime.Status;
16	import org.eclipse.swt.widgets.Composite;	17	import org.eclipse.swt.widgets.Composite;
Lines 168-173 Link Here
168	}	169	}
169		170
170	/**	171	/**
		172	* Allow a section an opportunity to respond to a doSave request on the editor.
		173	* @param monitor the progress monitor for the save operation.
		174	*/
		175	public void doSave(IProgressMonitor monitor) {
		176	monitor.worked(100);
		177	}
		178
		179	/**
		180	* Allow a section an opportunity to respond to a doSaveAs request on the editor.
		181	*/
		182	public void doSaveAs() {
		183	// do nothing
		184	}
		185
		186	/**
171	* Disposes of the section.	187	* Disposes of the section.
172	*/	188	*/
173	public void dispose() {	189	public void dispose() {