Remove deprecations for JDK 17

ThexXTURBOXx · ThexXTURBOXx · commit 35613f01dac7 · 2021-09-16T13:56:01.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -365,6 +365,7 @@
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
+                    <showDeprecation>true</showDeprecation>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/GlobalHotKeys.java b/src/main/java/the/bytecode/club/bytecodeviewer/GlobalHotKeys.java
@@ -44,7 +44,7 @@ public static void keyPressed(KeyEvent e)
 		
 		//CTRL + O
 		//open resource
-		if ((e.getKeyCode() == KeyEvent.VK_O) && ((e.getModifiers() & KeyEvent.CTRL_MASK) != 0))
+		if ((e.getKeyCode() == KeyEvent.VK_O) && ((e.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0))
 		{
 			Configuration.lastHotKeyExecuted = System.currentTimeMillis();
 			
@@ -62,15 +62,15 @@ public static void keyPressed(KeyEvent e)
 		
 		//CTRL + N
 		//new workspace
-		else if ((e.getKeyCode() == KeyEvent.VK_N) && ((e.getModifiers() & KeyEvent.CTRL_MASK) != 0))
+		else if ((e.getKeyCode() == KeyEvent.VK_N) && ((e.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0))
 		{
 			Configuration.lastHotKeyExecuted = System.currentTimeMillis();
 			BytecodeViewer.resetWorkspace(true);
 		}
 		
 		//CTRL + T
 		//compile
-		else if ((e.getKeyCode() == KeyEvent.VK_T) && ((e.getModifiers() & KeyEvent.CTRL_MASK) != 0))
+		else if ((e.getKeyCode() == KeyEvent.VK_T) && ((e.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0))
 		{
 			Configuration.lastHotKeyExecuted = System.currentTimeMillis();
 			Thread t = new Thread(() -> BytecodeViewer.compile(true, false), "Compile");
@@ -79,7 +79,7 @@ else if ((e.getKeyCode() == KeyEvent.VK_T) && ((e.getModifiers() & KeyEvent.CTRL
 		
 		//CTRL + R
 		//Run remote code
-		else if ((e.getKeyCode() == KeyEvent.VK_R) && ((e.getModifiers() & KeyEvent.CTRL_MASK) != 0))
+		else if ((e.getKeyCode() == KeyEvent.VK_R) && ((e.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0))
 		{
 			Configuration.lastHotKeyExecuted = System.currentTimeMillis();
 			
@@ -91,7 +91,7 @@ else if ((e.getKeyCode() == KeyEvent.VK_R) && ((e.getModifiers() & KeyEvent.CTRL
 		
 		//CTRL + S
 		//Export resources
-		else if ((e.getKeyCode() == KeyEvent.VK_S) && ((e.getModifiers() & KeyEvent.CTRL_MASK) != 0))
+		else if ((e.getKeyCode() == KeyEvent.VK_S) && ((e.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0))
 		{
 			Configuration.lastHotKeyExecuted = System.currentTimeMillis();
 			
@@ -137,7 +137,7 @@ else if ((e.getKeyCode() == KeyEvent.VK_S) && ((e.getModifiers() & KeyEvent.CTRL
 		
 		//CTRL + W
 		//close active resource (currently opened tab)
-		else if ((e.getKeyCode() == KeyEvent.VK_W) && ((e.getModifiers() & KeyEvent.CTRL_MASK) != 0))
+		else if ((e.getKeyCode() == KeyEvent.VK_W) && ((e.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0))
 		{
 			Configuration.lastHotKeyExecuted = System.currentTimeMillis();
 			
@@ -147,7 +147,7 @@ else if ((e.getKeyCode() == KeyEvent.VK_W) && ((e.getModifiers() & KeyEvent.CTRL
 		
 		//CTRL + L
 		//open last opened resource
-		else if ((e.getKeyCode() == KeyEvent.VK_L) && ((e.getModifiers() & KeyEvent.CTRL_MASK) != 0))
+		else if ((e.getKeyCode() == KeyEvent.VK_L) && ((e.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0))
 		{
 			Configuration.lastHotKeyExecuted = System.currentTimeMillis();
 			
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/ExtendedJOptionPane.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/ExtendedJOptionPane.java
@@ -215,7 +215,7 @@ private static JDialog createNewJDialog(Component parentComponent, JOptionPane p
 		else
 			dialog.setLocationRelativeTo(BytecodeViewer.viewer);
 		
-		dialog.show();
+		dialog.setVisible(true);
 		dialog.dispose();
 		
 		return dialog;
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/SearchableJTextArea.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/SearchableJTextArea.java
@@ -82,7 +82,7 @@ public SearchableJTextArea()
 		
 		addKeyListener(new PressKeyListener(keyEvent ->
 		{
-			if ((keyEvent.getKeyCode() == KeyEvent.VK_F) && ((keyEvent.getModifiers() & KeyEvent.CTRL_MASK) != 0))
+			if ((keyEvent.getKeyCode() == KeyEvent.VK_F) && ((keyEvent.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0))
 				searchInput.requestFocus();
 			
 			GlobalHotKeys.keyPressed(keyEvent);
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/SearchableRSyntaxTextArea.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/SearchableRSyntaxTextArea.java
@@ -108,10 +108,10 @@ else if(Configuration.lafTheme.isDark())
 		
 		addKeyListener(new PressKeyListener(keyEvent ->
 		{
-			if ((keyEvent.getKeyCode() == KeyEvent.VK_F) && ((keyEvent.getModifiers() & KeyEvent.CTRL_MASK) != 0))
+			if ((keyEvent.getKeyCode() == KeyEvent.VK_F) && ((keyEvent.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0))
 				searchInput.requestFocus();
 			
-			if (onCtrlS != null && (keyEvent.getKeyCode() == KeyEvent.VK_S) && ((keyEvent.getModifiers() & KeyEvent.CTRL_MASK) != 0))
+			if (onCtrlS != null && (keyEvent.getKeyCode() == KeyEvent.VK_S) && ((keyEvent.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0))
 			{
 				onCtrlS.run();
 				return;
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabbedPane.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabbedPane.java
@@ -101,7 +101,7 @@ public TabbedPane(int tabIndex, String tabWorkingName, String fileContainerName,
         exitButton.setComponentPopupMenu(rightClickMenu);
         exitButton.addMouseListener(new MouseClickedListener(e ->
         {
-            if (e.getModifiers() != InputEvent.ALT_MASK || System.currentTimeMillis() - lastMouseClick < 100)
+            if (e.getModifiersEx() != InputEvent.ALT_DOWN_MASK || System.currentTimeMillis() - lastMouseClick < 100)
                 return;
     
             lastMouseClick = System.currentTimeMillis();
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/EZInjection.java b/src/main/java/the/bytecode/club/bytecodeviewer/plugin/preinstalled/EZInjection.java
@@ -299,7 +299,7 @@ else if (injectHooks)
                                     if(kit != null)
                                         kit.setVisible(true);
                                     
-                                    m2.invoke(classNode.getClass().newInstance(), (Object[]) new String[1]);
+                                    m2.invoke(classNode.getClass().getDeclaredConstructor().newInstance(), (Object[]) new String[1]);
                                     
                                     print("Finished running " + invokeMethodInformation);
                                 }
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/plugin/strategies/CompiledJavaPluginLaunchStrategy.java b/src/main/java/the/bytecode/club/bytecodeviewer/plugin/strategies/CompiledJavaPluginLaunchStrategy.java
@@ -61,7 +61,7 @@ public Plugin run(File file) throws Throwable {
         }
 
         LoadingClassLoader cl = new LoadingClassLoader(pdata, set);
-        Plugin p = cl.pluginKlass.newInstance();
+        Plugin p = cl.pluginKlass.getDeclaredConstructor().newInstance();
         LoadedPluginData npdata = new LoadedPluginData(pdata, cl, p);
         loaded.add(npdata);
 
@@ -197,4 +197,4 @@ public Class<? extends Plugin> getPluginKlass() {
             return pluginKlass;
         }
     }
-}
+}
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/plugin/strategies/JavaPluginLaunchStrategy.java b/src/main/java/the/bytecode/club/bytecodeviewer/plugin/strategies/JavaPluginLaunchStrategy.java
@@ -51,6 +51,6 @@ public Plugin run(File file) throws Throwable
         );
 
         //create a new instance of the class
-        return (Plugin) clazz.newInstance();
+        return (Plugin) clazz.getDeclaredConstructor().newInstance();
     }
-}
+}
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/translation/TranslatedStrings.java b/src/main/java/the/bytecode/club/bytecodeviewer/translation/TranslatedStrings.java
@@ -84,6 +84,7 @@ public enum TranslatedStrings
 	PLEASE_SEND_THIS_ERROR_LOG_TO,
 	PLEASE_SEND_RESOURCES,
 	ONE_PLUGIN_AT_A_TIME,
+	ILLEGAL_ACCESS_ERROR,
 	
 	
 	YES,
diff --git a/src/main/resources/translations/english.json b/src/main/resources/translations/english.json
@@ -263,6 +263,7 @@
   "PLEASE_SEND_THIS_ERROR_LOG_TO": "Please send this error log to",
   "PLEASE_SEND_RESOURCES": "If you hold appropriate legal rights to the relevant class/jar/apk file please include that as well.",
   "ONE_PLUGIN_AT_A_TIME": "There is currently another plugin running right now, please wait for that to finish executing.",
+  "ILLEGAL_ACCESS_ERROR": "Please use Java 15 or older to do this.",
 
 
   "FILES": "Files",
diff --git a/src/main/resources/translations/german.json b/src/main/resources/translations/german.json
@@ -255,5 +255,6 @@
   "CLOSE_TAB": "Tab schließen",
   "PLEASE_SEND_THIS_ERROR_LOG_TO": "Bitte senden Sie dieses Fehlerprotokoll an",
   "PLEASE_SEND_RESOURCES": "Wenn Sie entsprechende gesetzliche Rechte an der jeweiligen Klasse besitzen",
-  "MIN_SDK_VERSION": "Minimale SDK-Version"
+  "MIN_SDK_VERSION": "Minimale SDK-Version",
+  "ILLEGAL_ACCESS_ERROR": "Bitte benutzen Sie Java 15 oder älter, um dies zu tun."
 }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public SearchableJTextArea()`
`82`	`82`
`83`	`83`	`addKeyListener(new PressKeyListener(keyEvent ->`
`84`	`84`	`{`
`85`		`- if ((keyEvent.getKeyCode() == KeyEvent.VK_F) && ((keyEvent.getModifiers() & KeyEvent.CTRL_MASK) != 0))`
	`85`	`+ if ((keyEvent.getKeyCode() == KeyEvent.VK_F) && ((keyEvent.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0))`
`86`	`86`	`searchInput.requestFocus();`
`87`	`87`
`88`	`88`	`GlobalHotKeys.keyPressed(keyEvent);`
Original file line number	Diff line number	Diff line change
`@@ -108,10 +108,10 @@ else if(Configuration.lafTheme.isDark())`
`108`	`108`
`109`	`109`	`addKeyListener(new PressKeyListener(keyEvent ->`
`110`	`110`	`{`
`111`		`- if ((keyEvent.getKeyCode() == KeyEvent.VK_F) && ((keyEvent.getModifiers() & KeyEvent.CTRL_MASK) != 0))`
	`111`	`+ if ((keyEvent.getKeyCode() == KeyEvent.VK_F) && ((keyEvent.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0))`
`112`	`112`	`searchInput.requestFocus();`
`113`	`113`
`114`		`- if (onCtrlS != null && (keyEvent.getKeyCode() == KeyEvent.VK_S) && ((keyEvent.getModifiers() & KeyEvent.CTRL_MASK) != 0))`
	`114`	`+ if (onCtrlS != null && (keyEvent.getKeyCode() == KeyEvent.VK_S) && ((keyEvent.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0))`
`115`	`115`	`{`
`116`	`116`	`onCtrlS.run();`
`117`	`117`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public TabbedPane(int tabIndex, String tabWorkingName, String fileContainerName,`
`101`	`101`	`exitButton.setComponentPopupMenu(rightClickMenu);`
`102`	`102`	`exitButton.addMouseListener(new MouseClickedListener(e ->`
`103`	`103`	`{`
`104`		`- if (e.getModifiers() != InputEvent.ALT_MASK \|\| System.currentTimeMillis() - lastMouseClick < 100)`
	`104`	`+ if (e.getModifiersEx() != InputEvent.ALT_DOWN_MASK \|\| System.currentTimeMillis() - lastMouseClick < 100)`
`105`	`105`	`return;`
`106`	`106`
`107`	`107`	`lastMouseClick = System.currentTimeMillis();`
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ else if (injectHooks)`
`299`	`299`	`if(kit != null)`
`300`	`300`	`kit.setVisible(true);`
`301`	`301`
`302`		`- m2.invoke(classNode.getClass().newInstance(), (Object[]) new String[1]);`
	`302`	`+ m2.invoke(classNode.getClass().getDeclaredConstructor().newInstance(), (Object[]) new String[1]);`
`303`	`303`
`304`	`304`	`print("Finished running " + invokeMethodInformation);`
`305`	`305`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public Plugin run(File file) throws Throwable {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`LoadingClassLoader cl = new LoadingClassLoader(pdata, set);`
`64`		`- Plugin p = cl.pluginKlass.newInstance();`
	`64`	`+ Plugin p = cl.pluginKlass.getDeclaredConstructor().newInstance();`
`65`	`65`	`LoadedPluginData npdata = new LoadedPluginData(pdata, cl, p);`
`66`	`66`	`loaded.add(npdata);`
`67`	`67`
`@@ -197,4 +197,4 @@ public Class<? extends Plugin> getPluginKlass() {`
`197`	`197`	`return pluginKlass;`
`198`	`198`	`}`
`199`	`199`	`}`
`200`		`-}`
	`200`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,6 @@ public Plugin run(File file) throws Throwable`
`51`	`51`	`);`
`52`	`52`
`53`	`53`	`//create a new instance of the class`
`54`		`- return (Plugin) clazz.newInstance();`
	`54`	`+ return (Plugin) clazz.getDeclaredConstructor().newInstance();`
`55`	`55`	`}`
`56`		`-}`
	`56`	`+}`