Skip to content

Fix Java 11 compiler warnings #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bobbylight merged 1 commit into from
Jun 17, 2025
Merged

Fix Java 11 compiler warnings #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RSTALanguageSupport/src/main/java/org/fife/rsta/ac/GoToMemberAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public void actionPerformed(ActionEvent e) {
private AbstractSourceTree createTree() {
AbstractSourceTree tree = null;
try {
tree = (AbstractSourceTree)outlineTreeClass.newInstance();
tree = (AbstractSourceTree)outlineTreeClass.getDeclaredConstructor().newInstance();
tree.setSorted(true);
} catch (RuntimeException re) { // FindBugs
throw re;
Expand Down
2 changes: 1 addition & 1 deletion RSTALanguageSupport/src/main/java/org/fife/rsta/ac/LanguageSupportFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public LanguageSupport getSupportFor(String style) {
if (supportClazz!=null) {
try {
Class<?> clazz = Class.forName(supportClazz);
support = (LanguageSupport)clazz.newInstance();
support = (LanguageSupport)clazz.getDeclaredConstructor().newInstance();
} catch (RuntimeException re) { // FindBugs
throw re;
} catch (Exception e) {
Expand Down
4 changes: 2 additions & 2 deletions RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/JavaLanguageSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ private void installKeyboardShortcuts(RSyntaxTextArea textArea) {

InputMap im = textArea.getInputMap();
ActionMap am = textArea.getActionMap();
int c = textArea.getToolkit().getMenuShortcutKeyMask();
int c = textArea.getToolkit().getMenuShortcutKeyMaskEx();
int shift = InputEvent.SHIFT_DOWN_MASK;

im.put(KeyStroke.getKeyStroke(KeyEvent.VK_O, c|shift), "GoToType");
Expand Down Expand Up @@ -221,7 +221,7 @@ private void uninstallKeyboardShortcuts(RSyntaxTextArea textArea) {

InputMap im = textArea.getInputMap();
ActionMap am = textArea.getActionMap();
int c = textArea.getToolkit().getMenuShortcutKeyMask();
int c = textArea.getToolkit().getMenuShortcutKeyMaskEx();
int shift = InputEvent.SHIFT_DOWN_MASK;

im.remove(KeyStroke.getKeyStroke(KeyEvent.VK_O, c|shift));
Expand Down
4 changes: 2 additions & 2 deletions RSTALanguageSupport/src/main/java/org/fife/rsta/ac/js/JavaScriptLanguageSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ private void installKeyboardShortcuts(RSyntaxTextArea textArea) {

InputMap im = textArea.getInputMap();
ActionMap am = textArea.getActionMap();
int c = textArea.getToolkit().getMenuShortcutKeyMask();
int c = textArea.getToolkit().getMenuShortcutKeyMaskEx();
int shift = InputEvent.SHIFT_DOWN_MASK;

im.put(KeyStroke.getKeyStroke(KeyEvent.VK_O, c | shift), "GoToType");
Expand Down Expand Up @@ -514,7 +514,7 @@ private void uninstallKeyboardShortcuts(RSyntaxTextArea textArea) {

InputMap im = textArea.getInputMap();
ActionMap am = textArea.getActionMap();
int c = textArea.getToolkit().getMenuShortcutKeyMask();
int c = textArea.getToolkit().getMenuShortcutKeyMaskEx();
int shift = InputEvent.SHIFT_DOWN_MASK;

im.remove(KeyStroke.getKeyStroke(KeyEvent.VK_O, c | shift));
Expand Down
2 changes: 1 addition & 1 deletion RSTALanguageSupport/src/main/java/org/fife/rsta/ac/js/SourceCompletionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public void setShorthandCache(ShorthandCompletionCache shorthandCache) {
@Override
public List<Completion> getCompletionsAt(JTextComponent tc, Point p) {

int offset = tc.viewToModel(p);
int offset = tc.viewToModel2D(p);
if (offset<0 || offset>=tc.getDocument().getLength()) {
lastCompletionsAtText = null;
return lastParameterizedCompletionsAt = null;
Expand Down
2 changes: 1 addition & 1 deletion RSTALanguageSupport/src/main/java/org/fife/rsta/ac/js/ast/type/TypeDeclarationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public List<String> setTypeDeclarationVersion(String ecmaVersion,
ecmaVersion = ecmaVersion == null ? getDefaultECMAVersion() : ecmaVersion;
//try to instantiate classes
Class<?> ecmaClass = TypeDeclarationFactory.class.getClassLoader().loadClass(ecmaVersion);
ecma = (TypeDeclarations) ecmaClass.newInstance();
ecma = (TypeDeclarations) ecmaClass.getDeclaredConstructor().newInstance();
}
catch(Exception e)
{
Expand Down
4 changes: 2 additions & 2 deletions RSTALanguageSupport/src/main/java/org/fife/rsta/ac/xml/XmlLanguageSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ protected void installKeyboardShortcuts(RSyntaxTextArea textArea) {

InputMap im = textArea.getInputMap();
ActionMap am = textArea.getActionMap();
int c = textArea.getToolkit().getMenuShortcutKeyMask();
int c = textArea.getToolkit().getMenuShortcutKeyMaskEx();
int shift = InputEvent.SHIFT_DOWN_MASK;

im.put(KeyStroke.getKeyStroke(KeyEvent.VK_O, c|shift), "GoToType");
Expand Down Expand Up @@ -227,7 +227,7 @@ protected void uninstallKeyboardShortcuts(RSyntaxTextArea textArea) {

InputMap im = textArea.getInputMap();
ActionMap am = textArea.getActionMap();
int c = textArea.getToolkit().getMenuShortcutKeyMask();
int c = textArea.getToolkit().getMenuShortcutKeyMaskEx();
int shift = InputEvent.SHIFT_DOWN_MASK;

im.remove(KeyStroke.getKeyStroke(KeyEvent.VK_O, c | shift));
Expand Down