[ jEdit-commits ] SF.net SVN: jedit:[25731] plugins/WhiteSpace/trunk/whitespace

[<ez...@us...>]

Revision: 25731
          http://sourceforge.net/p/jedit/svn/25731
Author:   ezust
Date:     2024-05-13 18:47:08 +0000 (Mon, 13 May 2024)
Log Message:
-----------
Compatibility with jEdit 5.6.

Modified Paths:
--------------
    plugins/WhiteSpace/trunk/whitespace/BlockHighlight.java
    plugins/WhiteSpace/trunk/whitespace/FoldHighlight.java
    plugins/WhiteSpace/trunk/whitespace/WhiteSpaceHighlight.java
    plugins/WhiteSpace/trunk/whitespace/options/WhiteSpaceAbstractOptionPane.java

Modified: plugins/WhiteSpace/trunk/whitespace/BlockHighlight.java
===================================================================
--- plugins/WhiteSpace/trunk/whitespace/BlockHighlight.java	2024-05-08 15:28:19 UTC (rev 25730)
+++ plugins/WhiteSpace/trunk/whitespace/BlockHighlight.java	2024-05-13 18:47:08 UTC (rev 25731)
@@ -46,7 +46,7 @@
         "white-space.indent-block", true);
 
     private static Color blockColor = SyntaxUtilities.parseColor(
-        jEdit.getProperty("white-space.block-color"));
+        jEdit.getProperty("white-space.block-color"), Color.black);
 
     private JEditTextArea textArea;
     private Segment segment = new Segment();
@@ -170,9 +170,7 @@
             "white-space.indent-block", true
         );
 
-        Color newBlockColor = SyntaxUtilities.parseColor(
-            jEdit.getProperty("white-space.block-color")
-        );
+        Color newBlockColor = SyntaxUtilities.parseColor(jEdit.getProperty("white-space.block-color"), Color.black);
 
         boolean indentBlockChanged = (newIndentBlock != indentBlock);
         boolean blockColorChanged = !(newBlockColor.equals(blockColor));

Modified: plugins/WhiteSpace/trunk/whitespace/FoldHighlight.java
===================================================================
--- plugins/WhiteSpace/trunk/whitespace/FoldHighlight.java	2024-05-08 15:28:19 UTC (rev 25730)
+++ plugins/WhiteSpace/trunk/whitespace/FoldHighlight.java	2024-05-13 18:47:08 UTC (rev 25731)
@@ -44,8 +44,7 @@
     private static final Hashtable<EditPane, TextAreaExtension> highlights = new Hashtable<EditPane, TextAreaExtension>();
 
     private static Color foldColor = SyntaxUtilities.parseColor(
-        jEdit.getProperty("white-space.fold-color")
-    );
+        jEdit.getProperty("white-space.fold-color"), Color.black);
 
     private JEditTextArea textArea;
     private EditPane editPane;
@@ -267,7 +266,7 @@
 
     public static void propertiesChanged() {
         Color newFoldColor = SyntaxUtilities.parseColor(
-            jEdit.getProperty("white-space.fold-color")
+            jEdit.getProperty("white-space.fold-color"), Color.black
         );
 
         boolean foldColorChanged = !(newFoldColor.equals(foldColor));

Modified: plugins/WhiteSpace/trunk/whitespace/WhiteSpaceHighlight.java
===================================================================
--- plugins/WhiteSpace/trunk/whitespace/WhiteSpaceHighlight.java	2024-05-08 15:28:19 UTC (rev 25730)
+++ plugins/WhiteSpace/trunk/whitespace/WhiteSpaceHighlight.java	2024-05-13 18:47:08 UTC (rev 25731)
@@ -62,11 +62,11 @@
     private static Hashtable<EditPane, TextAreaExtension> highlights = new Hashtable<EditPane, TextAreaExtension>();
 
     private static Color spaceColor      = SyntaxUtilities.parseColor(
-        jEdit.getProperty("white-space.space-color"));
+        jEdit.getProperty("white-space.space-color"), Color.black);
     private static Color tabColor        = SyntaxUtilities.parseColor(
-        jEdit.getProperty("white-space.tab-color"));
+        jEdit.getProperty("white-space.tab-color"), Color.black);
     private static Color whitespaceColor = SyntaxUtilities.parseColor(
-        jEdit.getProperty("white-space.whitespace-color"));
+        jEdit.getProperty("white-space.whitespace-color"), Color.black);
 
     private static boolean displayControlChars = jEdit.getBooleanProperty(
         "white-space.display-control-chars", false);
@@ -340,11 +340,11 @@
 
     public static void propertiesChanged() {
         Color newSpaceColor = SyntaxUtilities.parseColor(
-            jEdit.getProperty("white-space.space-color"));
+            jEdit.getProperty("white-space.space-color"), Color.black);
         Color newTabColor = SyntaxUtilities.parseColor(
-            jEdit.getProperty("white-space.tab-color"));
+            jEdit.getProperty("white-space.tab-color"), Color.black);
         Color newWhitespaceColor = SyntaxUtilities.parseColor(
-            jEdit.getProperty("white-space.whitespace-color"));
+            jEdit.getProperty("white-space.whitespace-color"), Color.black);
         boolean newDisplayControlChars = jEdit.getBooleanProperty(
             "white-space.display-control-chars", false
         );

Modified: plugins/WhiteSpace/trunk/whitespace/options/WhiteSpaceAbstractOptionPane.java
===================================================================
--- plugins/WhiteSpace/trunk/whitespace/options/WhiteSpaceAbstractOptionPane.java	2024-05-08 15:28:19 UTC (rev 25730)
+++ plugins/WhiteSpace/trunk/whitespace/options/WhiteSpaceAbstractOptionPane.java	2024-05-13 18:47:08 UTC (rev 25731)
@@ -42,7 +42,7 @@
 
     protected JButton createColorButton(String property) {
         JButton b = new JButton(" ");
-        b.setBackground(SyntaxUtilities.parseColor(jEdit.getProperty(property)));
+        b.setBackground(SyntaxUtilities.parseColor(jEdit.getProperty(property), Color.black));
         b.addActionListener(new ActionHandler());
         b.setRequestFocusEnabled(false);
         return b;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.