Modernizing the code base a bit

Author: bobbylight

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;
 	}