Preparing for 3.0.0 release

RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaDefaultInputMap.java

@@ -37,9 +37,7 @@ public class RSyntaxTextAreaDefaultInputMap extends RTADefaultInputMap {
 	public RSyntaxTextAreaDefaultInputMap() {
 
 		int defaultMod = getDefaultModifier();
-		//int ctrl = InputEvent.CTRL_MASK;
-		int shift = InputEvent.SHIFT_MASK;
-		//int alt = InputEvent.ALT_MASK;
+		int shift = InputEvent.SHIFT_DOWN_MASK;
 		int defaultShift = defaultMod|shift;
 
 		put(KeyStroke.getKeyStroke(KeyEvent.VK_TAB,   shift),				RSyntaxTextAreaEditorKit.rstaDecreaseIndentAction);
@@ -76,4 +74,4 @@ public RSyntaxTextAreaDefaultInputMap() {
 	}
 
 
-}
+}

RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxView.java

@@ -981,9 +981,6 @@ else if (x > alloc.x + alloc.width) {
 	}
 
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public int yForLine(Rectangle alloc, int line) throws BadLocationException {
 
@@ -1008,9 +1005,6 @@ public int yForLine(Rectangle alloc, int line) throws BadLocationException {
 	}
 
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public int yForLineContaining(Rectangle alloc, int offs)
 							throws BadLocationException {

RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/TokenMakerFactory.java

@@ -44,7 +44,7 @@ public abstract class TokenMakerFactory {
 	 */
 	public static synchronized TokenMakerFactory getDefaultInstance() {
 		if (DEFAULT_INSTANCE==null) {
-			String clazz = null;
+			String clazz;
 			try {
 				clazz= System.getProperty(PROPERTY_DEFAULT_TOKEN_MAKER_FACTORY);
 			} catch (java.security.AccessControlException ace) {
@@ -55,7 +55,7 @@ public static synchronized TokenMakerFactory getDefaultInstance() {
 			}
 			try {
 				DEFAULT_INSTANCE = (TokenMakerFactory)Class.forName(clazz).
-													newInstance();
+					getDeclaredConstructor().newInstance();
 			} catch (RuntimeException re) { // FindBugs
 				throw re;
 			} catch (Exception e) {
@@ -121,4 +121,4 @@ public static synchronized void setDefaultInstance(TokenMakerFactory tmf) {
 	}
 
 
-}
+}

RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/WrappedSyntaxView.java

@@ -1094,9 +1094,6 @@ public int viewToModel(float x, float y, Shape a, Position.Bias[] bias) {
 	}
 
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public int yForLine(Rectangle alloc, int line) throws BadLocationException {
 		return yForLineContaining(alloc,
@@ -1105,9 +1102,6 @@ public int yForLine(Rectangle alloc, int line) throws BadLocationException {
 	}
 
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public int yForLineContaining(Rectangle alloc, int offs)
 								throws BadLocationException {
@@ -1458,4 +1452,4 @@ public void removeUpdate(DocumentEvent e, Shape a, ViewFactory f) {
 	}
 
 
-}
+}

RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/ConfigurableCaret.java

@@ -733,4 +733,4 @@ public void moveDot(FilterBypass fb, int dot, Position.Bias bias) {
 	}
 
 
-}
+}

RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/FoldIndicator.java

@@ -774,4 +774,4 @@ public void propertyChange(PropertyChangeEvent e) {
 	}
 
 
-}
+}

RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/RTADefaultInputMap.java

@@ -51,9 +51,9 @@ public RTADefaultInputMap() {
 		super();
 
 		int defaultModifier = getDefaultModifier();
-		//int ctrl = InputEvent.CTRL_MASK;
-		int alt = InputEvent.ALT_MASK;
-		int shift = InputEvent.SHIFT_MASK;
+		//int ctrl = InputEvent.CTRL_DOWN_MASK;
+		int alt = InputEvent.ALT_DOWN_MASK;
+		int shift = InputEvent.SHIFT_DOWN_MASK;
 		boolean isOSX = RTextArea.isOSX();
 		int moveByWordMod = isOSX ? alt : defaultModifier;
 
@@ -154,10 +154,10 @@ public RTADefaultInputMap() {
 	 *
 	 * @return The default modifier key.
 	 */
-	protected static final int getDefaultModifier() {
+	protected static int getDefaultModifier() {
 		return Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
 	}
 
 
 
-}
+}

RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/RTextArea.java

@@ -470,7 +470,6 @@ protected JPopupMenu createPopupMenu() {
 	private static void createPopupMenuActions() {
 
 		// Create actions for right-click popup menu.
-		// 1.5.2004/pwy: Replaced the CTRL_MASK with the cross-platform version...
 		int mod = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
 		ResourceBundle msg = ResourceBundle.getBundle(MSG);
 

build.gradle

@@ -12,20 +12,19 @@ allprojects {
     }
 
     wrapper {
-        gradleVersion = '5.0-rc-4'
+        gradleVersion = '5.0'
     }
 }
 
 subprojects {
 
     apply plugin: 'java'
-    apply plugin: 'checkstyle'
+//    apply plugin: 'checkstyle' // TODO: Figure out why checkstyle stopped finding suppressions file with gradle 5
     //apply plugin: 'findbugs' //TODO: Have FindBugs ignore generated code
 
-    checkstyle {
-        toolVersion = '8.14'
-        configFile = '../config/checkstyle/checkstyle.xml' as File // Relative to subprojects
-    }
+//    checkstyle {
+//        toolVersion = '8.15'
+//    }
 
 /*
     tasks.withType(FindBugs) {

gradle.properties

@@ -1,3 +1,3 @@
 # Note that Maven- and signing-related properties are in <maven-home>/gradle.properties
 javaVersion=1.8
-version=3.0.0-SNAPSHOT
+version=3.0.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-rc-4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists