From owner-svn-ports-head@FreeBSD.ORG Sun Aug 26 02:41:47 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 774C4106564A; Sun, 26 Aug 2012 02:41:47 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 62C808FC16; Sun, 26 Aug 2012 02:41:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7Q2flEh043424; Sun, 26 Aug 2012 02:41:47 GMT (envelope-from glewis@svn.freebsd.org) Received: (from glewis@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7Q2flBN043423; Sun, 26 Aug 2012 02:41:47 GMT (envelope-from glewis@svn.freebsd.org) Message-Id: <201208260241.q7Q2flBN043423@svn.freebsd.org> From: Greg Lewis Date: Sun, 26 Aug 2012 02:41:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r303173 - head/java/openjdk7/files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Aug 2012 02:41:47 -0000 Author: glewis Date: Sun Aug 26 02:41:46 2012 New Revision: 303173 URL: http://svn.freebsd.org/changeset/ports/303173 Log: . Allow openjdk7 to work with icedtea-web port. Submitted by: jkim@ Added: head/java/openjdk7/files/patch-icedtea-web (contents, props changed) Added: head/java/openjdk7/files/patch-icedtea-web ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk7/files/patch-icedtea-web Sun Aug 26 02:41:46 2012 (r303173) @@ -0,0 +1,106 @@ +--- jdk/src/share/classes/sun/applet/AppletPanel.java Mon Nov 22 21:55:09 2010 +0000 ++++ jdk/src/share/classes/sun/applet/AppletPanel.java Wed Dec 08 23:26:01 2010 +0000 +@@ -67,7 +67,7 @@ abstract class AppletPanel extends Panel + /** + * The applet (if loaded). + */ +- Applet applet; ++ protected Applet applet; + + /** + * Applet will allow initialization. Should be +@@ -161,7 +161,8 @@ abstract class AppletPanel extends Panel + * Creates a thread to run the applet. This method is called + * each time an applet is loaded and reloaded. + */ +- synchronized void createAppletThread() { ++ //Overridden by NetxPanel. ++ protected synchronized void createAppletThread() { + // Create a thread group for the applet, and start a new + // thread to load the applet. + String nm = "applet-" + getCode(); +@@ -305,7 +306,7 @@ abstract class AppletPanel extends Panel + /** + * Get an event from the queue. + */ +- synchronized AppletEvent getNextEvent() throws InterruptedException { ++ protected synchronized AppletEvent getNextEvent() throws InterruptedException { + while (queue == null || queue.isEmpty()) { + wait(); + } +@@ -694,7 +695,8 @@ abstract class AppletPanel extends Panel + * applet event processing so that it can be gracefully interrupted from + * things like HotJava. + */ +- private void runLoader() { ++ //Overridden by NetxPanel. ++ protected void runLoader() { + if (status != APPLET_DISPOSE) { + showAppletStatus("notdisposed"); + return; +--- jdk/src/share/classes/sun/applet/AppletViewerPanel.java Mon Nov 22 21:55:09 2010 +0000 ++++ jdk/src/share/classes/sun/applet/AppletViewerPanel.java Wed Dec 08 23:26:01 2010 +0000 +@@ -42,25 +42,25 @@ import sun.tools.jar.*; + * + * @author Arthur van Hoff + */ +-class AppletViewerPanel extends AppletPanel { ++public class AppletViewerPanel extends AppletPanel { + + /* Are we debugging? */ +- static boolean debug = false; ++ protected static boolean debug = false; + + /** + * The document url. + */ +- URL documentURL; ++ protected URL documentURL; + + /** + * The base url. + */ +- URL baseURL; ++ protected URL baseURL; + + /** + * The attributes of the applet. + */ +- Hashtable atts; ++ protected Hashtable atts; + + /* + * JDK 1.1 serialVersionUID +@@ -70,7 +70,7 @@ class AppletViewerPanel extends AppletPa + /** + * Construct an applet viewer and start the applet. + */ +- AppletViewerPanel(URL documentURL, Hashtable atts) { ++ protected AppletViewerPanel(URL documentURL, Hashtable atts) { + this.documentURL = documentURL; + this.atts = atts; + +@@ -106,7 +106,7 @@ class AppletViewerPanel extends AppletPa + * Get an applet parameter. + */ + public String getParameter(String name) { +- return (String)atts.get(name.toLowerCase()); ++ return atts.get(name.toLowerCase()); + } + + /** +@@ -202,12 +202,12 @@ class AppletViewerPanel extends AppletPa + return (AppletContext)getParent(); + } + +- static void debug(String s) { ++ protected static void debug(String s) { + if(debug) + System.err.println("AppletViewerPanel:::" + s); + } + +- static void debug(String s, Throwable t) { ++ protected static void debug(String s, Throwable t) { + if(debug) { + t.printStackTrace(); + debug(s);