Modernizing the code base a bit

src/main/java/org/fife/rtext/AbstractParserNoticeWindow.java

@@ -195,11 +195,11 @@ public Class<?> getColumnClass(int col) {
 		public void addRow(Object[] data) {
 			// NOTE: It's valid for data[1] to be Strings, in which case
 			// it's taken to be the full path of a file.
-			if (data[1] instanceof RTextEditorPane) {
-				data[1] = new TextAreaWrapper((RTextEditorPane)data[1]);
+			if (data[1] instanceof RTextEditorPane pane) {
+				data[1] = new TextAreaWrapper(pane);
 			}
-			else if (data[1] instanceof String) {
-				data[1] = new TextAreaWrapper((String)data[1]);
+			else if (data[1] instanceof String str) {
+				data[1] = new TextAreaWrapper(str);
 			}
 			super.addRow(data);
 		}

src/main/java/org/fife/rtext/RTextUtilities.java

@@ -746,14 +746,14 @@ public static void setDropShadowsEnabledInEditor(boolean enabled) {
 							@Override
 							public void decorate(JWindow window) {
 								Container cp = window.getContentPane();
-								if (cp instanceof JComponent) {
+								if (cp instanceof JComponent jc) {
 									TranslucencyUtil util =
 										TranslucencyUtil.get();
 									util.setOpaque(window, false);
-									((JComponent)cp).setBorder(
+									jc.setBorder(
 										BorderFactory.createCompoundBorder(
 											ShadowPopupBorder.getInstance(),
-											((JComponent)cp).getBorder()));
+											jc.getBorder()));
 								}
 							}
 						});

src/main/java/org/fife/rtext/RemoteFileChooser.java

@@ -311,8 +311,8 @@ protected void escapePressed() {
 	@Override
 	public void focusGained(FocusEvent e) {
 		Object source = e.getSource();
-		if (source instanceof JTextComponent) {
-			((JTextComponent)source).selectAll();
+		if (source instanceof JTextComponent tc) {
+			tc.selectAll();
 		}
 	}
 

src/main/java/org/fife/rtext/SyntaxFilters.java

@@ -204,19 +204,14 @@ public static boolean isValidFileFilterString(String fileFilterString) {
 		for (int i=0; i<length; i++) {
 			char c = fileFilterString.charAt(i);
 			switch (c) {
-				case '*':
-				case '?':
-				case '.':
-				case '-':
-				case '_':
-				case '$':
-				case ' ':
-					continue;
-				default:
+				case '*', '?', '.', '-', '_', '$', ' ' -> {
+					// Valid special character, keep going
+				}
+				default -> {
 					if (!Character.isLetterOrDigit(c)) {
 						return false;
 					}
-					break;
+				}
 			}
 		}
 		return true;

src/main/java/org/fife/rtext/TabbedPaneViewTransferHandler.java

@@ -87,8 +87,8 @@ public boolean importData(JComponent c, Transferable t) {
 	protected void selectTab(final JTabbedPane tabbedPane, final int index) {
 		SwingUtilities.invokeLater(() -> {
 			Container parent = tabbedPane.getParent();
-			if (parent instanceof AbstractMainView) {
-				((AbstractMainView)parent).setSelectedIndex(index);
+			if (parent instanceof AbstractMainView mainView) {
+				mainView.setSelectedIndex(index);
 			}
 			else {
 				// Should never happen.

src/main/java/org/fife/rtext/plugins/console/RubyShellTextArea.java

@@ -145,8 +145,8 @@ private void handleSubmitImpl(String code, boolean appendPrompt) {
 
 		} catch (Exception e) {
 			// Peel off wrapper ScriptException
-			if (e instanceof ScriptException) {
-				append(massageScriptException((ScriptException)e), STYLE_STDERR);
+			if (e instanceof ScriptException se) {
+				append(massageScriptException(se), STYLE_STDERR);
 			}
 			else {
 				StringWriter sw = new StringWriter();

src/main/java/org/fife/rtext/plugins/langsupport/LangSupportUtils.java

@@ -35,14 +35,14 @@ private LangSupportUtils() {
 	 * @return The file.
 	 */
 	public static File getClassFileLocation(LibraryInfo li) {
-		if (li instanceof JarLibraryInfo) {
-			return ((JarLibraryInfo)li).getJarFile();
+		if (li instanceof JarLibraryInfo jli) {
+			return jli.getJarFile();
 		}
 		else if (li instanceof DirLibraryInfo) {
 			return new File(li.getLocationAsString());
 		}
-		else if (li instanceof Jdk9LibraryInfo) {
-			return ((Jdk9LibraryInfo)li).getJreHome();
+		else if (li instanceof Jdk9LibraryInfo j9li) {
+			return j9li.getJreHome();
 		}
 		throw new IllegalArgumentException("Unknown LibraryInfo type: " + li.getClass().getName());
 	}

src/main/java/org/fife/rtext/plugins/macros/Macro.java

@@ -92,7 +92,7 @@ else if (o!=null) {
 	 */
 	@Override
 	public boolean equals(Object o) {
-		return o instanceof Macro && compareTo((Macro)o)==0;
+		return o instanceof Macro other && compareTo(other)==0;
 	}
 
 

src/main/java/org/fife/rtext/plugins/project/model/FileProjectEntry.java

@@ -44,8 +44,8 @@ public void accept(WorkspaceVisitor visitor) {
 
 	@Override
 	public int compareTo(ProjectEntry entry) {
-		if (entry instanceof FileProjectEntry) {
-			return file.compareTo(entry.getFile());
+		if (entry instanceof FileProjectEntry other) {
+			return file.compareTo(other.getFile());
 		}
 		return -1;
 	}
@@ -56,8 +56,8 @@ public final boolean equals(Object o) {
 		if (o==this) {
 			return true;
 		}
-		return o instanceof FileProjectEntry &&
-				compareTo((FileProjectEntry)o)==0;
+		return o instanceof FileProjectEntry other &&
+				compareTo(other)==0;
 	}
 
 

src/main/java/org/fife/rtext/plugins/project/model/FolderProjectEntry.java

@@ -45,8 +45,8 @@ public void accept(WorkspaceVisitor visitor) {
 
 	@Override
 	public int compareTo(ProjectEntry o) {
-		if (o instanceof FolderProjectEntry) {
-			return dir.compareTo(o.getFile());
+		if (o instanceof FolderProjectEntry other) {
+			return dir.compareTo(other.getFile());
 		}
 		return -1;
 	}
@@ -57,8 +57,8 @@ public final boolean equals(Object o) {
 		if (o==this) {
 			return true;
 		}
-		return o instanceof FolderProjectEntry &&
-				compareTo((FolderProjectEntry)o)==0;
+		return o instanceof FolderProjectEntry other &&
+				compareTo(other)==0;
 	}
 
 

src/main/java/org/fife/rtext/plugins/project/model/LogicalFolderProjectEntry.java

@@ -55,8 +55,8 @@ public void addEntry(ProjectEntry entry) {
 
 	@Override
 	public int compareTo(ProjectEntry o) {
-		if (o instanceof LogicalFolderProjectEntry) {
-			return name.compareTo(((LogicalFolderProjectEntry)o).getName());
+		if (o instanceof LogicalFolderProjectEntry other) {
+			return name.compareTo(other.getName());
 		}
 		return -1;
 	}
@@ -67,8 +67,8 @@ public final boolean equals(Object o) {
 		if (o==this) {
 			return true;
 		}
-		return o instanceof LogicalFolderProjectEntry &&
-				compareTo((LogicalFolderProjectEntry)o)==0;
+		return o instanceof LogicalFolderProjectEntry other &&
+				compareTo(other)==0;
 	}
 
 

src/main/java/org/fife/rtext/plugins/project/model/Project.java

@@ -64,8 +64,8 @@ public boolean equals(Object o) {
 		if (o==this) {
 			return true;
 		}
-		if (o instanceof Project) {
-			return compareTo((Project)o)==0;
+		if (o instanceof Project other) {
+			return compareTo(other)==0;
 		}
 		return false;
 	}

src/main/java/org/fife/rtext/plugins/project/tree/WorkspaceTree.java

@@ -288,8 +288,8 @@ public String getToolTipText(MouseEvent e) {
 		TreePath path = getPathForLocation(e.getX(), e.getY());
 		if (path!=null) {
 			Object last = path.getLastPathComponent();
-			if (last instanceof AbstractWorkspaceTreeNode) {
-				return ((AbstractWorkspaceTreeNode)last).getToolTipText();
+			if (last instanceof AbstractWorkspaceTreeNode node) {
+				return node.getToolTipText();
 			}
 		}
 		return null;
@@ -329,8 +329,8 @@ private void installActions() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				Object selected = getLastSelectedPathComponent();
-				if (selected instanceof AbstractWorkspaceTreeNode) {
-					((AbstractWorkspaceTreeNode)selected).handleRename();
+				if (selected instanceof AbstractWorkspaceTreeNode node) {
+					node.handleRename();
 				}
 			}
 		});
@@ -350,8 +350,8 @@ public void actionPerformed(ActionEvent e) {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				Object selected = getLastSelectedPathComponent();
-				if (selected instanceof ProjectEntryTreeNode) {
-					((ProjectEntryTreeNode)selected).handleRemove();
+				if (selected instanceof ProjectEntryTreeNode node) {
+					node.handleRemove();
 				}
 			}
 		});
@@ -371,8 +371,8 @@ public void actionPerformed(ActionEvent e) {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				Object selected = getLastSelectedPathComponent();
-				if (selected instanceof PhysicalLocationTreeNode) {
-					refreshChildren((PhysicalLocationTreeNode)selected);
+				if (selected instanceof PhysicalLocationTreeNode node) {
+					refreshChildren(node);
 				}
 			}
 		});
@@ -397,8 +397,8 @@ public void actionPerformed(ActionEvent e) {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				Object selected = getLastSelectedPathComponent();
-				if (selected instanceof AbstractWorkspaceTreeNode) {
-					((AbstractWorkspaceTreeNode)selected).handleProperties();
+				if (selected instanceof AbstractWorkspaceTreeNode node) {
+					node.handleProperties();
 				}
 			}
 		});

src/main/java/org/fife/rtext/plugins/sourcebrowser/DefaultSourceTree.java

@@ -393,21 +393,20 @@ private void mouseMovedImpl(MouseEvent e) {
 			String text = null;
 
 			// If it's a high-level node (e.g. "Methods (4)").
-			if (object instanceof String) {
-				text = (String)object;
+			if (object instanceof String str) {
+				text = str;
 			}
 
 			// If it's a low-level node (function, variable, etc.).  Note
 			// that this should always be a TagEntry, but we're just being
 			// safe by checking here.
-			else if (object instanceof TagEntry) {
-				ExtendedTagEntry entry = (ExtendedTagEntry)object;
+			else if (object instanceof ExtendedTagEntry entry) {
 				text = mouseMovedTagEntry(entry);
 			}
 
 			// Set the tooltip text.
-			if (treeRenderer instanceof JComponent) {
-				((JComponent)treeRenderer).setToolTipText(text);
+			if (treeRenderer instanceof JComponent jc) {
+				jc.setToolTipText(text);
 			}
 
 		}

src/main/java/org/fife/rtext/plugins/tools/Tool.java

@@ -178,7 +178,7 @@ else if (t2!=null) {
 	 */
 	@Override
 	public boolean equals(Object o) {
-		return o instanceof Tool && compareTo((Tool)o)==0;
+		return o instanceof Tool other && compareTo(other)==0;
 	}
 
 

src/main/java/org/fife/ui/rsyntaxtextarea/TemplateOptionPanel.java

@@ -198,8 +198,8 @@ class TemplateDialog extends EscapableDialog implements ActionListener,
 			idField = new JTextField(20);
 			Document doc = idField.getDocument();
 			doc.addDocumentListener(this);
-			if (doc instanceof AbstractDocument) {
-				((AbstractDocument)doc).setDocumentFilter(
+			if (doc instanceof AbstractDocument ad) {
+				ad.setDocumentFilter(
 					new TemplateNameDocumentFilter());
 			}
 			idLabel.setLabelFor(idField);