X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/preferences/OverlayPreferenceStore.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/preferences/OverlayPreferenceStore.java index 61951fa..e1f123c 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/preferences/OverlayPreferenceStore.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/preferences/OverlayPreferenceStore.java @@ -8,7 +8,7 @@ * Contributors: * Igor Malinin - initial contribution * - * $Id: OverlayPreferenceStore.java,v 1.1 2004-09-02 18:26:30 jsurfer Exp $ + * $Id: OverlayPreferenceStore.java,v 1.2 2006-10-21 23:13:54 pombredanne Exp $ */ package net.sourceforge.phpeclipse.ui.preferences; @@ -18,7 +18,6 @@ import org.eclipse.jface.preference.PreferenceStore; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; - /** * An overlaying preference store. */ @@ -33,15 +32,15 @@ public class OverlayPreferenceStore implements IPreferenceStore { } IPreferenceStore parent; + IPreferenceStore store; private PreferenceDescriptor[] keys; private PropertyListener fPropertyListener; - public OverlayPreferenceStore( - IPreferenceStore parent, PreferenceDescriptor[] overlayKeys - ) { + public OverlayPreferenceStore(IPreferenceStore parent, + PreferenceDescriptor[] overlayKeys) { this.parent = parent; this.keys = overlayKeys; @@ -62,10 +61,8 @@ public class OverlayPreferenceStore implements IPreferenceStore { return (findOverlayKey(key) != null); } - void propagateProperty( - IPreferenceStore orgin, PreferenceDescriptor key, - IPreferenceStore target - ) { + void propagateProperty(IPreferenceStore orgin, PreferenceDescriptor key, + IPreferenceStore target) { if (orgin.isDefault(key.key)) { if (!target.isDefault(key.key)) { target.setToDefault(key.key); @@ -121,10 +118,8 @@ public class OverlayPreferenceStore implements IPreferenceStore { } } - private void loadProperty( - IPreferenceStore orgin, PreferenceDescriptor key, - IPreferenceStore target, boolean forceInitialization - ) { + private void loadProperty(IPreferenceStore orgin, PreferenceDescriptor key, + IPreferenceStore target, boolean forceInitialization) { PreferenceDescriptor.Type d = key.type; if (PreferenceDescriptor.BOOLEAN == d) { if (forceInitialization) { @@ -208,9 +203,8 @@ public class OverlayPreferenceStore implements IPreferenceStore { /* * @see IPreferenceStore#firePropertyChangeEvent(String, Object, Object) */ - public void firePropertyChangeEvent( - String name, Object oldValue, Object newValue - ) { + public void firePropertyChangeEvent(String name, Object oldValue, + Object newValue) { store.firePropertyChangeEvent(name, oldValue, newValue); }