Menu
▾
▴
[ jEdit-commits ] SF.net SVN: jedit:[25726] plugins/WhiteSpace/trunk/whitespace
|
From: <ez...@us...> - 2024-05-07 02:50:29
|
Revision: 25726
http://sourceforge.net/p/jedit/svn/25726
Author: ezust
Date: 2024-05-07 02:50:26 +0000 (Tue, 07 May 2024)
Log Message:
-----------
Remove warnings (deprecation and others)
Modified Paths:
--------------
plugins/WhiteSpace/trunk/whitespace/BlockHighlight.java
plugins/WhiteSpace/trunk/whitespace/BufferOptionsDialog.java
plugins/WhiteSpace/trunk/whitespace/BufferOptionsOptionPane.java
plugins/WhiteSpace/trunk/whitespace/FoldHighlight.java
plugins/WhiteSpace/trunk/whitespace/WhiteSpaceDefaults.java
plugins/WhiteSpace/trunk/whitespace/WhiteSpaceHighlight.java
plugins/WhiteSpace/trunk/whitespace/WhiteSpacePlugin.java
Modified: plugins/WhiteSpace/trunk/whitespace/BlockHighlight.java
===================================================================
--- plugins/WhiteSpace/trunk/whitespace/BlockHighlight.java 2024-05-07 01:59:03 UTC (rev 25725)
+++ plugins/WhiteSpace/trunk/whitespace/BlockHighlight.java 2024-05-07 02:50:26 UTC (rev 25726)
@@ -29,7 +29,6 @@
import org.gjt.sp.jedit.Buffer;
import org.gjt.sp.jedit.EditPane;
-import org.gjt.sp.jedit.View;
import org.gjt.sp.jedit.jEdit;
import org.gjt.sp.jedit.textarea.DisplayManager;
import org.gjt.sp.jedit.textarea.JEditTextArea;
@@ -41,7 +40,7 @@
public class BlockHighlight extends TextAreaExtension
{
// (EditPane, BlockHighlight) association
- private static Hashtable highlights = new Hashtable();
+ private static Hashtable<EditPane, TextAreaExtension> highlights = new Hashtable<EditPane, TextAreaExtension>();
private static boolean indentBlock = jEdit.getBooleanProperty(
"white-space.indent-block", true);
@@ -124,9 +123,8 @@
* which display the given <code>buffer</code>
*/
public static void updateTextAreas(Buffer buffer) {
- View[] views = jEdit.getViews();
- for (int i = 0; i < views.length; i++) {
- EditPane[] editPanes = views[i].getEditPanes();
+ jEdit.getViewManager().forEach(v -> {
+ EditPane[] editPanes = v.getEditPanes();
BlockHighlight highlight;
for (int j = 0; j < editPanes.length; j++) {
@@ -137,7 +135,7 @@
highlight.updateTextArea();
}
}
- }
+ });
}
@@ -187,9 +185,9 @@
blockColor = newBlockColor;
// Propagate the changes to all textareas
- View[] views = jEdit.getViews();
- for (int i = 0; i < views.length; i++) {
- EditPane[] editPanes = views[i].getEditPanes();
+ jEdit.getViewManager().forEach(v -> {
+
+ EditPane[] editPanes = v.getEditPanes();
BlockHighlight highlight;
WhiteSpaceModel model;
for (int j = 0; j < editPanes.length; j++) {
@@ -203,6 +201,6 @@
highlight.updateTextArea();
}
}
- }
+ });
}
}
Modified: plugins/WhiteSpace/trunk/whitespace/BufferOptionsDialog.java
===================================================================
--- plugins/WhiteSpace/trunk/whitespace/BufferOptionsDialog.java 2024-05-07 01:59:03 UTC (rev 25725)
+++ plugins/WhiteSpace/trunk/whitespace/BufferOptionsDialog.java 2024-05-07 02:50:26 UTC (rev 25726)
@@ -25,12 +25,10 @@
//{{{ Imports
import javax.swing.*;
import javax.swing.border.*;
-import javax.swing.event.*;
import java.awt.*;
import java.awt.event.*;
import org.gjt.sp.jedit.*;
import org.gjt.sp.jedit.gui.*;
-import whitespace.options.WhiteSpaceOptionPane;
//}}}
public class BufferOptionsDialog extends EnhancedDialog
@@ -39,8 +37,8 @@
//{{{ BufferOptionsDialog constructor
public BufferOptionsDialog(Buffer buffer, View view, WhiteSpaceModel model)
{
- super(view,jEdit.getProperty("whitespace.buffer-options-dialog.title"),true);
- this.view = view;
+ super(view, jEdit.getProperty("whitespace.buffer-options-dialog.title"),true);
+ // this.view = view;
this.buffer = buffer;
// this.listModel = model;
@@ -89,7 +87,6 @@
//}}}
//{{{ Instance variables
- private View view;
private JButton ok;
private JButton cancel;
//}}}
Modified: plugins/WhiteSpace/trunk/whitespace/BufferOptionsOptionPane.java
===================================================================
--- plugins/WhiteSpace/trunk/whitespace/BufferOptionsOptionPane.java 2024-05-07 01:59:03 UTC (rev 25725)
+++ plugins/WhiteSpace/trunk/whitespace/BufferOptionsOptionPane.java 2024-05-07 02:50:26 UTC (rev 25726)
@@ -27,7 +27,6 @@
import java.awt.*;
import java.util.*;
import javax.swing.*;
-import javax.swing.border.*;
import org.gjt.sp.jedit.AbstractOptionPane;
import org.gjt.sp.jedit.jEdit;
// }}}
Modified: plugins/WhiteSpace/trunk/whitespace/FoldHighlight.java
===================================================================
--- plugins/WhiteSpace/trunk/whitespace/FoldHighlight.java 2024-05-07 01:59:03 UTC (rev 25725)
+++ plugins/WhiteSpace/trunk/whitespace/FoldHighlight.java 2024-05-07 02:50:26 UTC (rev 25726)
@@ -29,7 +29,6 @@
import org.gjt.sp.jedit.Buffer;
import org.gjt.sp.jedit.EditPane;
-import org.gjt.sp.jedit.View;
import org.gjt.sp.jedit.jEdit;
import org.gjt.sp.jedit.textarea.DisplayManager;
import org.gjt.sp.jedit.textarea.JEditTextArea;
@@ -42,7 +41,7 @@
public class FoldHighlight extends TextAreaExtension
{
// (EditPane, FoldHighlight) association
- private static final Hashtable highlights = new Hashtable();
+ private static final Hashtable<EditPane, TextAreaExtension> highlights = new Hashtable<EditPane, TextAreaExtension>();
private static Color foldColor = SyntaxUtilities.parseColor(
jEdit.getProperty("white-space.fold-color")
@@ -82,7 +81,7 @@
TextAreaPainter painter = this.textArea.getPainter();
FontMetrics fm = painter.getFontMetrics();
int spaceWidth = fm.charWidth(' ');
- Vector foldLevels = new Vector();
+ Vector<Integer> foldLevels = new Vector<Integer>();
int level = foldLevel;
for (int i = physicalLine - 1; i >= 0; i--) {
level = buffer.getFoldLevel(i);
@@ -90,7 +89,7 @@
break;
}
if (level < foldLevel) {
- foldLevels.addElement(new Integer(level));
+ foldLevels.addElement(level);
foldLevel = level;
}
}
@@ -224,9 +223,8 @@
* which display the given <code>buffer</code>
*/
public static void updateTextAreas(Buffer buffer) {
- View[] views = jEdit.getViews();
- for (int i = 0; i < views.length; i++) {
- EditPane[] editPanes = views[i].getEditPanes();
+ jEdit.getViewManager().forEach(v -> {
+ EditPane[] editPanes = v.getEditPanes();
FoldHighlight highlight;
for (int j = 0; j < editPanes.length; j++) {
@@ -237,7 +235,7 @@
highlight.updateTextArea();
}
}
- }
+ });
}
@@ -281,9 +279,8 @@
foldColor = newFoldColor;
// Propagate the changes to all textareas
- View[] views = jEdit.getViews();
- for (int i = 0; i < views.length; i++) {
- EditPane[] editPanes = views[i].getEditPanes();
+ jEdit.getViewManager().forEach(v -> {
+ EditPane[] editPanes = v.getEditPanes();
FoldHighlight highlight;
WhiteSpaceModel model;
for (int j = 0; j < editPanes.length; j++) {
@@ -297,7 +294,7 @@
highlight.updateTextArea();
}
}
- }
+ });
}
Modified: plugins/WhiteSpace/trunk/whitespace/WhiteSpaceDefaults.java
===================================================================
--- plugins/WhiteSpace/trunk/whitespace/WhiteSpaceDefaults.java 2024-05-07 01:59:03 UTC (rev 25725)
+++ plugins/WhiteSpace/trunk/whitespace/WhiteSpaceDefaults.java 2024-05-07 02:50:26 UTC (rev 25726)
@@ -19,7 +19,6 @@
package whitespace;
-import org.gjt.sp.jedit.Buffer;
import org.gjt.sp.jedit.buffer.JEditBuffer;
import org.gjt.sp.jedit.jEdit;
@@ -150,10 +149,9 @@
public static void editorStarted() {
- Buffer[] buffers = jEdit.getBuffers();
- for (int i = 0; i < buffers.length; i++) {
- WhiteSpaceDefaults.bufferCreated(buffers[i]);
- }
+ jEdit.getBufferManager().forEach(b -> {
+ WhiteSpaceDefaults.bufferCreated(b);
+ });
}
}
Modified: plugins/WhiteSpace/trunk/whitespace/WhiteSpaceHighlight.java
===================================================================
--- plugins/WhiteSpace/trunk/whitespace/WhiteSpaceHighlight.java 2024-05-07 01:59:03 UTC (rev 25725)
+++ plugins/WhiteSpace/trunk/whitespace/WhiteSpaceHighlight.java 2024-05-07 02:50:26 UTC (rev 25726)
@@ -31,7 +31,6 @@
import org.gjt.sp.jedit.Buffer;
import org.gjt.sp.jedit.EditPane;
-import org.gjt.sp.jedit.View;
import org.gjt.sp.jedit.jEdit;
import org.gjt.sp.jedit.textarea.DisplayManager;
import org.gjt.sp.jedit.textarea.JEditTextArea;
@@ -60,7 +59,7 @@
};
// (EditPane, WhiteSpaceHighlight) association
- private static Hashtable highlights = new Hashtable();
+ private static Hashtable<EditPane, TextAreaExtension> highlights = new Hashtable<EditPane, TextAreaExtension>();
private static Color spaceColor = SyntaxUtilities.parseColor(
jEdit.getProperty("white-space.space-color"));
@@ -292,9 +291,8 @@
* which display the given <code>buffer</code>
*/
public static void updateTextAreas(Buffer buffer) {
- View[] views = jEdit.getViews();
- for (int i = 0; i < views.length; i++) {
- EditPane[] editPanes = views[i].getEditPanes();
+ jEdit.getViewManager().forEach(v -> {
+ EditPane[] editPanes = v.getEditPanes();
WhiteSpaceHighlight highlight;
for (int j = 0; j < editPanes.length; j++) {
@@ -305,7 +303,7 @@
highlight.updateTextArea();
}
}
- }
+ });
}
@@ -370,9 +368,8 @@
displayControlChars = newDisplayControlChars;
// Propagate the changes to all textareas
- View[] views = jEdit.getViews();
- for (int i = 0; i < views.length; i++) {
- EditPane[] editPanes = views[i].getEditPanes();
+ jEdit.getViewManager().forEach(v -> {
+ EditPane[] editPanes = v.getEditPanes();
WhiteSpaceHighlight highlight;
WhiteSpaceModel model;
for (int j = 0; j < editPanes.length; j++) {
@@ -389,7 +386,7 @@
highlight.updateTextArea();
}
}
- }
+ });
}
Modified: plugins/WhiteSpace/trunk/whitespace/WhiteSpacePlugin.java
===================================================================
--- plugins/WhiteSpace/trunk/whitespace/WhiteSpacePlugin.java 2024-05-07 01:59:03 UTC (rev 25725)
+++ plugins/WhiteSpace/trunk/whitespace/WhiteSpacePlugin.java 2024-05-07 02:50:26 UTC (rev 25726)
@@ -21,7 +21,6 @@
package whitespace;
-import org.gjt.sp.jedit.Buffer;
import org.gjt.sp.jedit.buffer.JEditBuffer;
import org.gjt.sp.jedit.EBMessage;
import org.gjt.sp.jedit.EBPlugin;
@@ -33,7 +32,6 @@
import org.gjt.sp.jedit.msg.PropertiesChanged;
import org.gjt.sp.util.Log;
-import whitespace.WhiteSpaceModel;
public class WhiteSpacePlugin
@@ -67,10 +65,9 @@
view = view.getNext();
}
Log.log(Log.DEBUG, this, "removing WhiteSpaceModel properties");
- Buffer[] buffers = jEdit.getBuffers();
- for(int i=0; i < buffers.length; i++) {
- buffers[i].setProperty(WhiteSpaceModel.MODEL_PROPERTY,null);
- }
+ jEdit.getBufferManager().forEach(b -> {
+ b.setProperty(WhiteSpaceModel.MODEL_PROPERTY,null);
+ });
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
