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 f4f309c..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,7 +8,7 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: XMLMergeViewer.java,v 1.2 2005-05-06 00:55:42 stefanbjarni Exp $
+ * $Id: XMLMergeViewer.java,v 1.3 2006-10-21 23:14:13 pombredanne Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.compare;
@@ -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);