X-Git-Url: http://secure.phpeclipse.com

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 d20f85a..a833e92 100644
--- 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,11 +8,15 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: DTDMergeViewer.java,v 1.1 2004-09-02 18:28:05 jsurfer Exp $
+ * $Id: DTDMergeViewer.java,v 1.3 2006-10-21 23:14:13 pombredanne Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.compare;
 
+import net.sourceforge.phpeclipse.xml.ui.XMLPlugin;
+import net.sourceforge.phpeclipse.xml.ui.internal.text.DTDConfiguration;
+import net.sourceforge.phpeclipse.xml.ui.text.DTDTextTools;
+
 import org.eclipse.compare.CompareConfiguration;
 import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -27,10 +31,6 @@ import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.texteditor.AbstractTextEditor;
 
-import net.sourceforge.phpeclipse.xml.ui.XMLPlugin;
-import net.sourceforge.phpeclipse.xml.ui.internal.text.DTDConfiguration;
-import net.sourceforge.phpeclipse.xml.ui.text.DTDTextTools;
-
 /**
  * @author Igor Malinin
  */
@@ -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);
 		}