Attachment 129729 Details for Bug 268442 – patch

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

[patch] patch

patch-bug268442.txt (text/plain), 9.64 KB, created by Carlin Rogers

on 2009-03-24 14:25:32 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlin Rogers

Created: 2009-03-24 14:25:32 EDT

Size: 9.64 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.pagedesigner
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.xml,v
>retrieving revision 1.24
>diff -u -r1.24 plugin.xml
>--- plugin.xml	17 Mar 2009 17:25:16 -0000	1.24
>+++ plugin.xml	24 Mar 2009 18:11:27 -0000
>@@ -229,4 +229,10 @@
> </enabledWhen>
> </page>
> </extension>
>+ <extension
>+ point="org.eclipse.core.runtime.preferences">
>+ <initializer
>+ class="org.eclipse.jst.pagedesigner.ui.preferences.PDPreferences">
>+ </initializer>
>+ </extension>
> </plugin>
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF,v
>retrieving revision 1.42
>diff -u -r1.42 MANIFEST.MF
>--- META-INF/MANIFEST.MF	11 Mar 2009 05:31:29 -0000	1.42
>+++ META-INF/MANIFEST.MF	24 Mar 2009 18:11:27 -0000
>@@ -118,6 +118,7 @@
> org.eclipse.jst.pagedesigner.ui.common.sash;x-internal:=true,
> org.eclipse.jst.pagedesigner.ui.dialogfields;x-internal:=true,
> org.eclipse.jst.pagedesigner.ui.dialogs;x-internal:=true,
>+ org.eclipse.jst.pagedesigner.ui.preferences;x-internal:=true,
> org.eclipse.jst.pagedesigner.utils;x-internal:=true,
> org.eclipse.jst.pagedesigner.validation.caret;x-internal:=true,
> org.eclipse.jst.pagedesigner.viewer;x-internal:=true
>Index: src/org/eclipse/jst/pagedesigner/editors/HTMLEditor.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/HTMLEditor.java,v
>retrieving revision 1.22
>diff -u -r1.22 HTMLEditor.java
>--- src/org/eclipse/jst/pagedesigner/editors/HTMLEditor.java	7 Mar 2009 01:46:24 -0000	1.22
>+++ src/org/eclipse/jst/pagedesigner/editors/HTMLEditor.java	24 Mar 2009 18:11:27 -0000
>@@ -30,6 +30,7 @@
> import org.eclipse.gef.EditPart;
> import org.eclipse.gef.ui.views.palette.PalettePage;
> import org.eclipse.gef.ui.views.palette.PaletteViewerPage;
>+import org.eclipse.jface.preference.IPreferenceStore;
> import org.eclipse.jface.text.IDocument;
> import org.eclipse.jface.text.TextSelection;
> import org.eclipse.jface.viewers.IPostSelectionProvider;
>@@ -51,6 +52,8 @@
> import org.eclipse.jst.pagedesigner.tools.RangeSelectionTool;
> import org.eclipse.jst.pagedesigner.ui.common.PartActivationHandler;
> import org.eclipse.jst.pagedesigner.ui.common.sash.SashEditorPart;
>+import org.eclipse.jst.pagedesigner.ui.preferences.PDPreferences;
>+import org.eclipse.jst.pagedesigner.utils.EditorUtil;
> import org.eclipse.jst.pagedesigner.utils.PreviewUtil;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.layout.FillLayout;
>@@ -255,6 +258,10 @@
> 		};
> 		int sashIndex = addPage(_sashEditorPart, getEditorInput());
> 
>+		// Set the sash editor mode from the stored file property
>+		// or the default preference
>+		initDesignerMode();
>+
> 		setPageText(sashIndex, PDPlugin.getResourceString("HTMLEditor.Design")); //$NON-NLS-1$
> 
> 		// the update's critical, to get viewer selection manager and
>@@ -1036,7 +1043,7 @@
> 	 * @param mode
> 	 */
> 	public void setDesignerMode(int mode) {
>-		if (_sashEditorPart != null) {
>+		if (_sashEditorPart != null && _mode != mode) {
> 			switch (mode) {
> 			case MODE_SASH_HORIZONTAL:
> 				_sashEditorPart.setOrientation(SWT.HORIZONTAL);
>@@ -1051,10 +1058,40 @@
> 			default:
> 				_sashEditorPart.setOrientation(SWT.VERTICAL);
> 			}
>+			if (getEditorInput() != null) {
>+				EditorUtil.setEditorInputDesignModeProperty(getEditorInput(), String.valueOf(mode));
>+			}
> 		}
> 		this._mode = mode;
> 	}
> 
>+	/*
>+	 * Set the sash editor mode from the stored file property
>+	 * or the default preference.
>+	 */
>+	private void initDesignerMode() {
>+		int preferredMode = MODE_SASH_VERTICAL;
>+
>+		// If the user has already selected a mode for the file, use it.
>+		String prop = null;
>+		if (getEditorInput() != null) {
>+			prop = EditorUtil.getEditorInputDesignModeProperty(getEditorInput());
>+		}
>+		if (prop != null) {
>+			try {
>+				preferredMode = Integer.parseInt(prop);
>+			} catch (NumberFormatException e) {
>+				// do nothing;
>+			}
>+		} else {
>+			// Otherwise, get the default mode from preferences.
>+			IPreferenceStore pStore = PDPlugin.getDefault().getPreferenceStore();
>+			preferredMode = pStore.getInt(PDPreferences.SASH_EDITOR_MODE_PREF);
>+		}
>+
>+		setDesignerMode(preferredMode);
>+	}
>+
> 	/**
> 	 * @return the current design mode
> 	 */
>Index: src/org/eclipse/jst/pagedesigner/utils/EditorUtil.java
>===================================================================
>RCS file: src/org/eclipse/jst/pagedesigner/utils/EditorUtil.java
>diff -N src/org/eclipse/jst/pagedesigner/utils/EditorUtil.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/jst/pagedesigner/utils/EditorUtil.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,72 @@
>+/*******************************************************************************
>+ * Copyright (c) 2009 Oracle Corporation.
>+ * 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *******************************************************************************/ 
>+package org.eclipse.jst.pagedesigner.utils;
>+
>+import org.eclipse.core.resources.IResource;
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.QualifiedName;
>+import org.eclipse.ui.IEditorInput;
>+import org.eclipse.ui.ide.ResourceUtil;
>+
>+/**
>+ * Utility class for Editor related information.
>+ * 
>+ * Provisional API - subject to change
>+ */
>+public class EditorUtil {
>+
>+	private static final String PROPERTY_QUALIFIER = "org.eclipse.jst.pagedesigner"; //$NON-NLS-1$
>+ private static final String PERSIST_PROPERTY_NAME_DESIGNER_MODE = "DesignMode"; //$NON-NLS-1$
>+ private static final QualifiedName PERSIST_PROPERTY_KEY_DESIGNER_MODE = 
>+ 	new QualifiedName(PROPERTY_QUALIFIER, PERSIST_PROPERTY_NAME_DESIGNER_MODE);
>+
>+	/**
>+	 * Find the design mode property for the file resource of the
>+	 * editor input. If found, then return the property value,
>+	 * otherwise return null. 
>+	 * 
>+	 * @param editorInput
>+	 * @return user selected design mode for the editor input file
>+	 */
>+	public static String getEditorInputDesignModeProperty(IEditorInput editorInput) {
>+		String dmProperty = null;
>+		if (editorInput != null) {
>+			IResource res = ResourceUtil.getResource(editorInput);
>+			if (res != null) {
>+				try {
>+					dmProperty = res.getPersistentProperty(PERSIST_PROPERTY_KEY_DESIGNER_MODE);
>+				} catch (CoreException e) {
>+					// do nothing;
>+				}
>+			}
>+		}
>+
>+		return dmProperty;
>+	}
>+
>+	/**
>+	 * Save the design mode property for the file resource of the
>+	 * editor input. If the supplied mode is <code>null</code>,
>+	 * the persistent property is removed from this resource. 
>+	 * 
>+	 * @param editorInput
>+	 * @param mode user selected design mode to be saved
>+	 */
>+	public static void setEditorInputDesignModeProperty(IEditorInput editorInput, String mode) {
>+		if (editorInput != null) {
>+			IResource res = ResourceUtil.getResource(editorInput);
>+			if (res != null) {
>+				try {
>+					res.setPersistentProperty(PERSIST_PROPERTY_KEY_DESIGNER_MODE, mode);
>+				} catch (CoreException e) {
>+					// do nothing;
>+				}
>+			}
>+		}
>+	}
>+}
>Index: src/org/eclipse/jst/pagedesigner/ui/preferences/PDPreferences.java
>===================================================================
>RCS file: src/org/eclipse/jst/pagedesigner/ui/preferences/PDPreferences.java
>diff -N src/org/eclipse/jst/pagedesigner/ui/preferences/PDPreferences.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/jst/pagedesigner/ui/preferences/PDPreferences.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,39 @@
>+/*******************************************************************************
>+ * Copyright (c) 2009 Oracle Corporation.
>+ * 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *******************************************************************************/ 
>+package org.eclipse.jst.pagedesigner.ui.preferences;
>+
>+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
>+import org.eclipse.jface.preference.IPreferenceStore;
>+import org.eclipse.jst.pagedesigner.PDPlugin;
>+import org.eclipse.jst.pagedesigner.editors.HTMLEditor;
>+
>+/**
>+ * Utility class for handling preferences related to the Web Page Editor plug-in.
>+ * 
>+ * Provisional API - subject to change
>+ */
>+public class PDPreferences extends AbstractPreferenceInitializer {
>+
>+	/**
>+	 * Preference used to set modes for the page designer when displayed
>+	 * in a sash editor.
>+	 */
>+	public static final String SASH_EDITOR_MODE_PREF = 
>+		PDPreferences.class.getName() + ".sash_editor_mode"; //$NON-NLS-1$
>+
>+	private static IPreferenceStore getPreferenceStore() {
>+		return PDPlugin.getDefault().getPreferenceStore();
>+	}
>+	
>+	@Override
>+	public void initializeDefaultPreferences() {
>+		// Set default HTML editor split vertical (i.e. with top and bottom pane)
>+		IPreferenceStore store = getPreferenceStore();
>+		store.setDefault(SASH_EDITOR_MODE_PREF, HTMLEditor.MODE_SASH_VERTICAL);
>+	}
>+}

Actions: View | Diff

Attachments on bug 268442: 129729