DIRSTUDIO-1125: Fix high contrast appearance

2 files changed, 6 insertions, 5 deletions

diff --git a/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java b/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java
index a1ea99064..a816bf7ef 100644
--- a/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java
+++ b/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java
@@ -183,10 +183,6 @@ public class LdifEditorSyntaxColoringPreferencePage extends PreferencePage imple
             this.rgb = PreferenceConverter.getDefaultColor( store, colorKey );
             int style = store.getDefaultInt( styleKey );
             setStyle( style );
-
-            System.out.println( colorKey + ": isDefault=" + store.isDefault( colorKey ) );
-            System.out.println( colorKey + ": string=" + store.getString( colorKey ) );
-            System.out.println( colorKey + ": rgb=" + PreferenceConverter.getColor( store, colorKey ) );
         }
 
 
diff --git a/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifDamagerRepairer.java b/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifDamagerRepairer.java
index e58f59e5e..8cba4d2c0 100644
--- a/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifDamagerRepairer.java
+++ b/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifDamagerRepairer.java
@@ -138,7 +138,12 @@ public class LdifDamagerRepairer implements IPresentationDamager, IPresentationR
             }
         }
 
-        Color color = store.isDefault( colorKey ) ? null : LdifEditorActivator.getDefault().getColor( rgb );
+        /*
+         * Use color <code>null</code> if the default is the default string, This is important
+         * to not override the system color when a high-contrast theme is used.
+         */
+        boolean isDefaultDefaultKey = IPreferenceStore.STRING_DEFAULT_DEFAULT.equals( store.getString( colorKey ) );
+        Color color = isDefaultDefaultKey ? null : LdifEditorActivator.getDefault().getColor( rgb );
         TextAttribute textAttribute = new TextAttribute( color, null, style );
         return textAttribute;
     }