/hg/release/icedtea6-1.7: netx: use getMethod instead of getDecl...

[omajid at icedtea.classpath.org]

changeset c5c7cfebb101 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=c5c7cfebb101
author: Omair Majid <omajid at redhat.com>
date: Thu Aug 05 17:52:08 2010 -0400

	netx: use getMethod instead of getDeclaredMethod to find main method

	2010-08-05 Omair Majid <omajid at redhat.com>

	 * NEWS: Update with netx bugfix.
	    * rt/net/sourceforge/jnlp/Launcher.java (launchApplication):
	Replace use of getDeclaredMethod with getMethod. Fixes
	applications that have a main-class that inherits
	main(String[]).


diffstat:

3 files changed, 10 insertions(+), 1 deletion(-)
ChangeLog                             |    8 ++++++++
NEWS                                  |    1 +
rt/net/sourceforge/jnlp/Launcher.java |    2 +-

diffs (38 lines):

diff -r 9e75f57aae29 -r c5c7cfebb101 ChangeLog
--- a/ChangeLog	Fri Jul 30 16:06:02 2010 -0400
+++ b/ChangeLog	Thu Aug 05 17:52:08 2010 -0400
@@ -1,3 +1,11 @@ 2010-07-30  Man Lung Wong  <mwong at redhat
+2010-08-05  Omair Majid  <omajid at redhat.com>
+
+	* NEWS: Update with netx bugfix.
+	* rt/net/sourceforge/jnlp/Launcher.java
+	(launchApplication): Replace use of getDeclaredMethod with 
+	getMethod. Fixes applications that have a main-class that 
+	inherits main(String[]).
+
 2010-07-30  Man Lung Wong  <mwong at redhat.com>
 	* netx/net/sourceforge/jnlp/Launcher.java
 	(launchApplication): Make sure an Event Dispatch Thread
diff -r 9e75f57aae29 -r c5c7cfebb101 NEWS
--- a/NEWS	Fri Jul 30 16:06:02 2010 -0400
+++ b/NEWS	Thu Aug 05 17:52:08 2010 -0400
@@ -2,6 +2,7 @@ New in release 1.7.5 (XXXX-XX-XX):
 
 * NetX
  - Fix browser command in BasicService.showDocument(URL)
+ - Run programs that inherit main(String[]) in their main-class
 
 New in release 1.7.4 (2010-07-28):
 
diff -r 9e75f57aae29 -r c5c7cfebb101 rt/net/sourceforge/jnlp/Launcher.java
--- a/rt/net/sourceforge/jnlp/Launcher.java	Fri Jul 30 16:06:02 2010 -0400
+++ b/rt/net/sourceforge/jnlp/Launcher.java	Thu Aug 05 17:52:08 2010 -0400
@@ -441,7 +441,7 @@ public class Launcher {
             
             Class mainClass = app.getClassLoader().loadClass(mainName);
 
-            Method main = mainClass.getDeclaredMethod("main", new Class[] {String[].class} );
+            Method main = mainClass.getMethod("main", new Class[] {String[].class} );
             String args[] = file.getApplication().getArguments();
             
             SwingUtilities.invokeAndWait(new Runnable() {