A massive organize imports and formatting of the sources using default Eclipse code...

[phpeclipse.git] / net.sourceforge.phpeclipse.xml.ui / src / net / sourceforge / phpeclipse / xml / ui / internal / compare / DTDMergeViewer.java

diff --git a/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/compare/DTDMergeViewer.java b/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/compare/DTDMergeViewer.java
index ac2567d..a833e92 100644 (file)
--- a/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/compare/DTDMergeViewer.java
+++ b/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/compare/DTDMergeViewer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: DTDMergeViewer.java,v 1.2 2005-05-06 00:55:42 stefanbjarni Exp $
+ * $Id: DTDMergeViewer.java,v 1.3 2006-10-21 23:14:13 pombredanne Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.compare;
@@ -42,7 +42,7 @@ public class DTDMergeViewer extends TextMergeViewer {
        private IPreferenceStore preferenceStore;
 
        /**
-        * The listener for changes to the preference store. 
+        * The listener for changes to the preference store.
         */
        private IPropertyChangeListener propertyChangeListener;
 
@@ -52,11 +52,11 @@ public class DTDMergeViewer extends TextMergeViewer {
        private DTDTextTools textTools;
 
        /*
-        * @see TextMergeViewer#TextMergeViewer(Composite, int, CompareConfiguration)
+        * @see TextMergeViewer#TextMergeViewer(Composite, int,
+        *      CompareConfiguration)
         */
-       public DTDMergeViewer(
-               Composite parent, int style, CompareConfiguration configuration
-       ) {
+       public DTDMergeViewer(Composite parent, int style,
+                       CompareConfiguration configuration) {
                super(parent, style, configuration);
        }
 
@@ -109,7 +109,7 @@ public class DTDMergeViewer extends TextMergeViewer {
                if (propertyChangeListener != null) {
                        if (preferenceStore != null) {
                                preferenceStore
-                                       .removePropertyChangeListener(propertyChangeListener);
+                                               .removePropertyChangeListener(propertyChangeListener);
                        }
 
                        propertyChangeListener = null;
@@ -121,10 +121,9 @@ public class DTDMergeViewer extends TextMergeViewer {
        protected void handlePreferenceStoreChanged(PropertyChangeEvent event) {
                String p = event.getProperty();
 
-               if (p.equals(AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND) ||
-                       p.equals(AbstractTextEditor
-                               .PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT)
-               ) {
+               if (p.equals(AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND)
+                               || p
+                                               .equals(AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT)) {
                        updateBackgroundColor();
                } else if (textTools.affectsBehavior(event)) {
                        invalidateTextPresentation();
@@ -132,14 +131,13 @@ public class DTDMergeViewer extends TextMergeViewer {
        }
 
        private void updateBackgroundColor() {
-               boolean defaultBackgroundColor = preferenceStore.getBoolean(
-                       AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT);
+               boolean defaultBackgroundColor = preferenceStore
+                               .getBoolean(AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT);
 
                if (defaultBackgroundColor) {
                        setBackgroundColor(null);
                } else {
-                       RGB backgroundColor = PreferenceConverter
-                               .getColor(preferenceStore,
+                       RGB backgroundColor = PreferenceConverter.getColor(preferenceStore,
                                        AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND);
                        setBackgroundColor(backgroundColor);
                }