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

diff --git a/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/compare/XMLMergeViewer.java b/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/compare/XMLMergeViewer.java
index 6d817c3..7947a8e 100644
--- a/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/compare/XMLMergeViewer.java
+++ b/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/compare/XMLMergeViewer.java
@@ -8,11 +8,15 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: XMLMergeViewer.java,v 1.1 2004-09-02 18:28:05 jsurfer Exp $
+ * $Id: XMLMergeViewer.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.XMLConfiguration;
+import net.sourceforge.phpeclipse.xml.ui.text.XMLTextTools;
+
 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.XMLConfiguration;
-import net.sourceforge.phpeclipse.xml.ui.text.XMLTextTools;
-
 /**
  * @author Igor Malinin
  */
@@ -109,8 +109,8 @@ public class XMLMergeViewer extends TextMergeViewer {
 	protected void handleDispose(DisposeEvent event) {
 		if (propertyChangeListener != null) {
 			if (preferenceStore != null) {
-				preferenceStore.removePropertyChangeListener(
-						propertyChangeListener);
+				preferenceStore
+						.removePropertyChangeListener(propertyChangeListener);
 			}
 
 			propertyChangeListener = null;
@@ -123,7 +123,8 @@ public class XMLMergeViewer extends TextMergeViewer {
 		String p = event.getProperty();
 
 		if (p.equals(AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND)
-		 || p.equals(AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT)) {
+				|| p
+						.equals(AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT)) {
 			updateBackgroundColor();
 		} else if (textTools.affectsBehavior(event)) {
 			invalidateTextPresentation();
@@ -131,8 +132,8 @@ public class XMLMergeViewer 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);