X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/PreferencesAdapter.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/PreferencesAdapter.java index 0302dc9..80437b3 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/PreferencesAdapter.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/PreferencesAdapter.java @@ -12,10 +12,11 @@ package net.sourceforge.phpdt.internal.ui.text; import org.eclipse.core.runtime.Preferences; - import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.ListenerList; +//incastrix +//import org.eclipse.jface.util.ListenerList; +import org.eclipse.core.runtime.ListenerList; import org.eclipse.jface.util.PropertyChangeEvent; /** @@ -28,47 +29,51 @@ public class PreferencesAdapter implements IPreferenceStore { /** * Property change listener. Listens for events of type - * {@link org.eclipse.core.runtime.Preferences.PropertyChangeEvent} and fires - * a {@link org.eclipse.jface.util.PropertyChangeEvent} on the - * adapter with arguments from the received event. + * {@link org.eclipse.core.runtime.Preferences.PropertyChangeEvent} and + * fires a {@link org.eclipse.jface.util.PropertyChangeEvent} on the adapter + * with arguments from the received event. */ - private class PropertyChangeListener implements Preferences.IPropertyChangeListener { + private class PropertyChangeListener implements + Preferences.IPropertyChangeListener { /* * @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent) */ public void propertyChange(Preferences.PropertyChangeEvent event) { - firePropertyChangeEvent(event.getProperty(), event.getOldValue(), event.getNewValue()); + firePropertyChangeEvent(event.getProperty(), event.getOldValue(), + event.getNewValue()); } } - + /** Listeners on the adapter */ - private ListenerList fListeners= new ListenerList(); - + private ListenerList fListeners = new ListenerList(); + /** Listener on the adapted Preferences */ - private PropertyChangeListener fListener= new PropertyChangeListener(); - + private PropertyChangeListener fListener = new PropertyChangeListener(); + /** Adapted Preferences */ private Preferences fPreferences; /** True iff no events should be forwarded */ private boolean fSilent; - + /** * Initialize with empty Preferences. */ public PreferencesAdapter() { this(new Preferences()); } + /** * Initialize with the given Preferences. * - * @param preferences The preferences to wrap. + * @param preferences + * The preferences to wrap. */ public PreferencesAdapter(Preferences preferences) { - fPreferences= preferences; + fPreferences = preferences; } - + /** * {@inheritDoc} */ @@ -97,11 +102,13 @@ public class PreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ - public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) { + public void firePropertyChangeEvent(String name, Object oldValue, + Object newValue) { if (!fSilent) { - PropertyChangeEvent event= new PropertyChangeEvent(this, name, oldValue, newValue); - Object[] listeners= fListeners.getListeners(); - for (int i= 0; i < listeners.length; i++) + PropertyChangeEvent event = new PropertyChangeEvent(this, name, + oldValue, newValue); + Object[] listeners = fListeners.getListeners(); + for (int i = 0; i < listeners.length; i++) ((IPropertyChangeListener) listeners[i]).propertyChange(event); } } @@ -209,10 +216,10 @@ public class PreferencesAdapter implements IPreferenceStore { */ public void putValue(String name, String value) { try { - fSilent= true; + fSilent = true; fPreferences.setValue(name, value); } finally { - fSilent= false; + fSilent = false; } }