jedit-cvs Mailing List for jEdit (Page 5)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 25693
          http://sourceforge.net/p/jedit/svn/25693
Author:   vampire0
Date:     2023-10-13 20:06:50 +0000 (Fri, 13 Oct 2023)
Log Message:
-----------
Fix unchecked and deprecated compiler warnings

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/browser/VFSBrowser.java
    jEdit/trunk/org/gjt/sp/jedit/gui/BufferSwitcher.java
    jEdit/trunk/org/gjt/sp/jedit/gui/statusbar/EncodingWidgetFactory.java
    jEdit/trunk/org/gjt/sp/jedit/gui/statusbar/FoldWidgetFactory.java
    jEdit/trunk/org/gjt/sp/jedit/gui/statusbar/ModeWidgetFactory.java
    jEdit/trunk/org/gjt/sp/jedit/gui/statusbar/WrapWidgetFactory.java
    jEdit/trunk/org/gjt/sp/jedit/pluginmgr/PluginManagerProgress.java
    jEdit/trunk/org/gjt/sp/jedit/pluginmgr/Roster.java
    jEdit/trunk/org/gjt/sp/jedit/syntax/ParserRuleSet.java
    jEdit/trunk/org/gjt/sp/util/StandardUtilities.java

Modified: jEdit/trunk/org/gjt/sp/jedit/browser/VFSBrowser.java
===================================================================

--- jEdit/trunk/org/gjt/sp/jedit/browser/VFSBrowser.java	2023-10-13 19:09:34 UTC (rev 25692)
+++ jEdit/trunk/org/gjt/sp/jedit/browser/VFSBrowser.java	2023-10-13 20:06:50 UTC (rev 25693)
@@ -51,6 +51,8 @@
 import org.gjt.sp.jedit.buffer.JEditBuffer;
 import org.gjt.sp.util.*;
 import org.gjt.sp.jedit.menu.MenuItemTextComparator;
+
+import static org.gjt.sp.util.StandardUtilities.castUnchecked;
 //}}}
 
 /**
@@ -731,7 +733,7 @@
 			}
 
 			final Task task = new DeleteBrowserTask(this, session, vfs, files[i].getDeletePath());
-			TaskManager.instance.addTaskListener(new TaskAdapter()
+			TaskManager.instance.addTaskListener(new TaskListener()
 			{
 				@Override
 				public void done(Task t)
@@ -1037,7 +1039,7 @@
 			return getSelectedFiles();
 		}
 	} //}}}
-	
+
 	//{{{ paste() method
 	/**
 	 * Paste the file contained in the clipboard.
@@ -1045,7 +1047,6 @@
 	 * @param file the target, it can be a file, in that case it will be pasted to
 	 * the parent directory, or a directory.
 	 */
-	@SuppressWarnings({"unchecked"}) 
 	public void paste(VFSFile file) throws IOException, UnsupportedFlavorException
 	{
 		if (file == null)
@@ -1079,7 +1080,7 @@
 			List<String> sources = new ArrayList<>();
 			if (transferable.isDataFlavorSupported(ListVFSFileTransferable.jEditFileList))
 			{
-				Iterable<VFSFile> copiedFiles = (Iterable<VFSFile>) transferable.getTransferData(ListVFSFileTransferable.jEditFileList);
+				Iterable<VFSFile> copiedFiles = castUnchecked(transferable.getTransferData(ListVFSFileTransferable.jEditFileList));
 				for (VFSFile copiedFile : copiedFiles)
 				{
 					sources.add(copiedFile.getPath());
@@ -1087,7 +1088,7 @@
 			}
 			else if (transferable.isDataFlavorSupported(DataFlavor.javaFileListFlavor))
 			{
-				Iterable<File> copiedFiles = (Iterable<File>) transferable.getTransferData(DataFlavor.javaFileListFlavor);
+				Iterable<File> copiedFiles = castUnchecked(transferable.getTransferData(DataFlavor.javaFileListFlavor));
 				for (File copiedFile : copiedFiles)
 				{
 					sources.add(copiedFile.getAbsolutePath());
@@ -1797,7 +1798,7 @@
 				}
 			}
 		} //}}}
-		
+
 		//{{{ Action class
 		class Action extends AbstractAction
 		{
@@ -1887,7 +1888,7 @@
 
 		@Override
 		void doPopup()
-		{	
+		{
 			if (popup==null) createPopupMenu();
 			GenericGUIUtilities.showPopupMenu(popup, this, 0, getHeight(), false);
 		}

Modified: jEdit/trunk/org/gjt/sp/jedit/gui/BufferSwitcher.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/BufferSwitcher.java	2023-10-13 19:09:34 UTC (rev 25692)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/BufferSwitcher.java	2023-10-13 20:06:50 UTC (rev 25693)
@@ -41,6 +41,8 @@
 import org.gjt.sp.jedit.bufferset.BufferSetManager;
 import org.gjt.sp.jedit.msg.PropertiesChanged;
 import org.gjt.sp.util.ThreadUtilities;
+
+import static org.gjt.sp.util.StandardUtilities.castUnchecked;
 //}}}
 
 /** BufferSwitcher class
@@ -223,7 +225,7 @@
 			Accessible acc = ui.getAccessibleChild(null, 0);
 			if (acc instanceof BasicComboPopup)
 			{
-				JList list = ((BasicComboPopup)acc).getList();
+				JList<Object> list = ((BasicComboPopup)acc).getList();
 				list.setDragEnabled(true);
 				list.setDropMode(DropMode.INSERT);
 				list.setTransferHandler(new BufferSwitcherTransferHandler());
@@ -444,7 +446,7 @@
 		@Override
 		public Transferable createTransferable(JComponent c)
 		{
-			JList<Buffer> list = (JList<Buffer>) c;
+			JList<Buffer> list = castUnchecked(c);
 			Buffer buffer = list.getSelectedValue();
 			if (buffer == null)
 			{

Modified: jEdit/trunk/org/gjt/sp/jedit/gui/statusbar/EncodingWidgetFactory.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/statusbar/EncodingWidgetFactory.java	2023-10-13 19:09:34 UTC (rev 25692)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/statusbar/EncodingWidgetFactory.java	2023-10-13 20:06:50 UTC (rev 25693)
@@ -38,11 +38,12 @@
 import javax.swing.*;
 
 import static java.lang.String.CASE_INSENSITIVE_ORDER;
+import static org.gjt.sp.util.StandardUtilities.castUnchecked;
 //}}}
 
 /**
  * @author Matthieu Casanova
- * @since jEdit 4.3pre14 
+ * @since jEdit 4.3pre14
  */
 public class EncodingWidgetFactory implements StatusWidgetFactory
 {
@@ -73,7 +74,7 @@
 				currentEncoding,
 				listSelectionEvent -> EventQueue.invokeLater(() ->
 				{
-					JList<String> list = (JList<String>) listSelectionEvent.getSource();
+					JList<String> list = castUnchecked(listSelectionEvent.getSource());
 					String selectedValue = list.getSelectedValue();
 					int selectedOption = DialogChooser.openChooserWindow(view,
 						jEdit.getProperty("buffer.encoding.reload", new String[]{selectedValue}),

Modified: jEdit/trunk/org/gjt/sp/jedit/gui/statusbar/FoldWidgetFactory.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/statusbar/FoldWidgetFactory.java	2023-10-13 19:09:34 UTC (rev 25692)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/statusbar/FoldWidgetFactory.java	2023-10-13 20:06:50 UTC (rev 25693)
@@ -38,11 +38,13 @@
 import org.gjt.sp.jedit.msg.BufferUpdate;
 
 import javax.swing.*;
+
+import static org.gjt.sp.util.StandardUtilities.castUnchecked;
 //}}}
 
 /**
  * @author Matthieu Casanova
- * @since jEdit 4.3pre14 
+ * @since jEdit 4.3pre14
  */
 public class FoldWidgetFactory implements StatusWidgetFactory
 {
@@ -71,7 +73,7 @@
 				currentFoldingMode,
 				listSelectionEvent -> EventQueue.invokeLater(() ->
 				{
-					JList<String> list = (JList<String>) listSelectionEvent.getSource();
+					JList<String> list = castUnchecked(listSelectionEvent.getSource());
 					String selectedValue = list.getSelectedValue();
 					buffer.setStringProperty("folding", selectedValue);
 					buffer.propertiesChanged();

Modified: jEdit/trunk/org/gjt/sp/jedit/gui/statusbar/ModeWidgetFactory.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/statusbar/ModeWidgetFactory.java	2023-10-13 19:09:34 UTC (rev 25692)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/statusbar/ModeWidgetFactory.java	2023-10-13 20:06:50 UTC (rev 25693)
@@ -33,6 +33,8 @@
 import org.gjt.sp.jedit.gui.DialogChooser;
 
 import javax.swing.*;
+
+import static org.gjt.sp.util.StandardUtilities.castUnchecked;
 //}}}
 
 /**
@@ -67,7 +69,7 @@
 				currentMode,
 				listSelectionEvent -> EventQueue.invokeLater(() ->
 				{
-					JList<Mode> list = (JList<Mode>) listSelectionEvent.getSource();
+					JList<Mode> list = castUnchecked(listSelectionEvent.getSource());
 					buffer.setMode(list.getSelectedValue());
 				}),
 				modes);

Modified: jEdit/trunk/org/gjt/sp/jedit/gui/statusbar/WrapWidgetFactory.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/statusbar/WrapWidgetFactory.java	2023-10-13 19:09:34 UTC (rev 25692)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/statusbar/WrapWidgetFactory.java	2023-10-13 20:06:50 UTC (rev 25693)
@@ -37,6 +37,7 @@
 
 import static org.gjt.sp.jedit.buffer.WordWrap.none;
 import static org.gjt.sp.jedit.buffer.WordWrap.soft;
+import static org.gjt.sp.util.StandardUtilities.castUnchecked;
 //}}}
 
 /**
@@ -70,7 +71,7 @@
 				currentFoldingMode,
 				listSelectionEvent -> EventQueue.invokeLater(() ->
 				{
-					JList<WordWrap> list = (JList<WordWrap>) listSelectionEvent.getSource();
+					JList<WordWrap> list = castUnchecked(listSelectionEvent.getSource());
 					WordWrap selectedValue = list.getSelectedValue();
 					buffer.setWordWrap(selectedValue);
 					EditBus.send(new BufferUpdate(buffer,null,BufferUpdate.PROPERTIES_CHANGED));

Modified: jEdit/trunk/org/gjt/sp/jedit/pluginmgr/PluginManagerProgress.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/pluginmgr/PluginManagerProgress.java	2023-10-13 19:09:34 UTC (rev 25692)
+++ jEdit/trunk/org/gjt/sp/jedit/pluginmgr/PluginManagerProgress.java	2023-10-13 20:06:50 UTC (rev 25693)
@@ -60,8 +60,8 @@
 		JButton stop = new JButton(jEdit.getProperty("plugin-manager.progress.stop"));
 		stop.addActionListener(e ->
 		{
-			// TODO: Thread.stop is deprecated, this should probably be Thread.interrupt
-			thread.stop();
+			roster.abortWorkThreadOperations();
+			thread.interrupt();
 			dispose();
 		});
 		JPanel panel = new JPanel(new FlowLayout(
@@ -172,12 +172,10 @@
 		}
 
 		@Override
-		@SuppressWarnings("deprecation")
 		public void windowClosing(WindowEvent evt)
 		{
-			// TODO: Thread.stop is deprecated, this should probably be Thread.interrupt
-			thread.stop();
-			dispose();
+			roster.abortWorkThreadOperations();
+			thread.interrupt();
 		}
 	} //}}}
 	//}}}

Modified: jEdit/trunk/org/gjt/sp/jedit/pluginmgr/Roster.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/pluginmgr/Roster.java	2023-10-13 19:09:34 UTC (rev 25692)
+++ jEdit/trunk/org/gjt/sp/jedit/pluginmgr/Roster.java	2023-10-13 20:06:50 UTC (rev 25693)
@@ -28,6 +28,7 @@
 import java.awt.Component;
 import java.io.*;
 import java.net.*;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.*;
@@ -51,6 +52,7 @@
 	//{{{ Roster constructor
 	Roster()
 	{
+		abortWorkThreadOperations = new AtomicBoolean(false);
 		operations = new ArrayList<>();
 		toLoad = new ArrayList<>();
 	} //}}}
@@ -77,6 +79,12 @@
 		toLoad.add(path);
 	} //}}}
 
+	//{{{ abortWorkThreadOperations() method
+	void abortWorkThreadOperations()
+	{
+		abortWorkThreadOperations.set(true);
+	} //}}}
+
 	//{{{ getOperation() method
 	public Operation getOperation(int i)
 	{
@@ -103,7 +111,7 @@
 			op.runInWorkThread(progress);
 			progress.done();
 
-			if (Thread.interrupted())
+			if (abortWorkThreadOperations.get())
 				return;
 		}
 	} //}}}
@@ -143,6 +151,7 @@
 	//{{{ Private members
 	private static File downloadDir;
 
+	private final AtomicBoolean abortWorkThreadOperations;
 	private final List<Operation> operations;
 	private final List<String> toLoad;
 

Modified: jEdit/trunk/org/gjt/sp/jedit/syntax/ParserRuleSet.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/syntax/ParserRuleSet.java	2023-10-13 19:09:34 UTC (rev 25692)
+++ jEdit/trunk/org/gjt/sp/jedit/syntax/ParserRuleSet.java	2023-10-13 20:06:50 UTC (rev 25693)
@@ -25,8 +25,11 @@
 
 //{{{ Imports
 import org.jedit.annotation.Nonnull;
+import java.lang.reflect.Array;
 import java.util.*;
 import java.util.regex.Pattern;
+
+import static org.gjt.sp.util.StandardUtilities.castUnchecked;
 //}}}
 
 /**
@@ -54,7 +57,7 @@
 		this.setName = setName;
 		allRules = new ArrayList<>();
 		rulesForNull = new ArrayList<>();
-		ruleArray = new List[BASE_CACHE];
+		ruleArray = castUnchecked(Array.newInstance(List.class, BASE_CACHE));
 		imports = new ArrayList<>();
 	} //}}}
 

Modified: jEdit/trunk/org/gjt/sp/util/StandardUtilities.java
===================================================================
--- jEdit/trunk/org/gjt/sp/util/StandardUtilities.java	2023-10-13 19:09:34 UTC (rev 25692)
+++ jEdit/trunk/org/gjt/sp/util/StandardUtilities.java	2023-10-13 20:06:50 UTC (rev 25693)
@@ -754,4 +754,18 @@
 		}
 	}
 	// }}}
+
+	//{{{ castUnchecked() method
+	/**
+	 * Casts the given argument to the needed return type.
+	 *
+	 * @param castee The object to be casted unchecked
+	 * @throws ClassCastException if the cast does not succeed
+	 * @since jEdit 5.7
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T> T castUnchecked(Object castee)
+	{
+		return (T) castee;
+	} //}}}
 }

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





2000	Jan (11)	Feb	Mar	Apr	May	Jun	Jul	Aug (8)	Sep (1)	Oct	Nov	Dec
2001	Jan	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (145)	Nov (352)	Dec (329)
2002	Jan (461)	Feb (533)	Mar (632)	Apr (363)	May (619)	Jun (324)	Jul (109)	Aug (247)	Sep (167)	Oct (215)	Nov (115)	Dec (262)
2003	Jan (568)	Feb (537)	Mar (760)	Apr (493)	May (500)	Jun (284)	Jul (178)	Aug (180)	Sep (135)	Oct (230)	Nov (266)	Dec (175)
2004	Jan (121)	Feb (294)	Mar (222)	Apr (172)	May (162)	Jun (105)	Jul (93)	Aug (151)	Sep (136)	Oct (62)	Nov (74)	Dec (178)
2005	Jan (179)	Feb (288)	Mar (153)	Apr (138)	May (195)	Jun (39)	Jul (62)	Aug (41)	Sep (15)	Oct (365)	Nov (130)	Dec (199)
2006	Jan (235)	Feb (92)	Mar (262)	Apr (250)	May (345)	Jun (513)	Jul (587)	Aug (210)	Sep (216)	Oct (200)	Nov (188)	Dec (115)
2007	Jan (259)	Feb (182)	Mar (217)	Apr (109)	May (161)	Jun (205)	Jul (291)	Aug (176)	Sep (185)	Oct (190)	Nov (208)	Dec (182)
2008	Jan (141)	Feb (193)	Mar (219)	Apr (112)	May (233)	Jun (218)	Jul (149)	Aug (338)	Sep (291)	Oct (143)	Nov (131)	Dec (152)
2009	Jan (266)	Feb (178)	Mar (168)	Apr (167)	May (198)	Jun (282)	Jul (383)	Aug (341)	Sep (153)	Oct (214)	Nov (164)	Dec (278)
2010	Jan (430)	Feb (300)	Mar (214)	Apr (198)	May (271)	Jun (321)	Jul (144)	Aug (208)	Sep (275)	Oct (287)	Nov (218)	Dec (153)
2011	Jan (172)	Feb (172)	Mar (121)	Apr (62)	May (23)	Jun (155)	Jul (120)	Aug (252)	Sep (170)	Oct (206)	Nov (356)	Dec (300)
2012	Jan (412)	Feb (313)	Mar (419)	Apr (153)	May (194)	Jun (226)	Jul (115)	Aug (143)	Sep (223)	Oct (173)	Nov (121)	Dec (143)
2013	Jan (156)	Feb (109)	Mar (146)	Apr (82)	May (65)	Jun (52)	Jul (55)	Aug (347)	Sep (65)	Oct (95)	Nov (85)	Dec (37)
2014	Jan (12)	Feb (51)	Mar (31)	Apr (97)	May (60)	Jun (32)	Jul (35)	Aug (47)	Sep (16)	Oct (36)	Nov (55)	Dec (90)
2015	Jan (34)	Feb (65)	Mar (13)	Apr (13)	May (49)	Jun (10)	Jul (23)	Aug (96)	Sep (78)	Oct (38)	Nov (41)	Dec (126)
2016	Jan (29)	Feb (38)	Mar (21)	Apr (12)	May (45)	Jun (53)	Jul (40)	Aug (69)	Sep (60)	Oct (11)	Nov (19)	Dec (2)
2017	Jan (28)	Feb (17)	Mar (57)	Apr (4)	May (15)	Jun (60)	Jul (21)	Aug (5)	Sep (6)	Oct (34)	Nov (17)	Dec (28)
2018	Jan (15)	Feb (7)	Mar (13)	Apr (7)	May (2)	Jun (6)	Jul (10)	Aug (15)	Sep (6)	Oct	Nov	Dec
2019	Jan (2)	Feb (2)	Mar (9)	Apr (5)	May	Jun (6)	Jul (4)	Aug (35)	Sep (1)	Oct (6)	Nov (1)	Dec (18)
2020	Jan (1)	Feb	Mar (141)	Apr (196)	May (41)	Jun (3)	Jul (4)	Aug (3)	Sep (27)	Oct (2)	Nov (4)	Dec (25)
2021	Jan (8)	Feb (1)	Mar (46)	Apr (48)	May	Jun (9)	Jul (1)	Aug	Sep (5)	Oct (3)	Nov (10)	Dec (7)
2022	Jan (2)	Feb	Mar	Apr	May (9)	Jun (24)	Jul (7)	Aug (7)	Sep (13)	Oct (7)	Nov (1)	Dec (2)
2023	Jan (11)	Feb (4)	Mar (1)	Apr	May	Jun	Jul (3)	Aug (13)	Sep (32)	Oct (10)	Nov (6)	Dec
2024	Jan	Feb (8)	Mar (4)	Apr (3)	May (22)	Jun	Jul (11)	Aug (8)	Sep	Oct (9)	Nov	Dec
2025	Jan	Feb (2)	Mar (16)	Apr (5)	May	Jun	Jul (2)	Aug	Sep	Oct	Nov	Dec

jedit-cvs Mailing List for jEdit (Page 5)

jEdit is a programmer's text editor written in Java.

jedit-cvs