/hg/icedtea6: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Jul 8 12:37:29 PDT 2010
changeset f0e89050bb8c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f0e89050bb8c
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jul 08 20:36:25 2010 +0100
Add rebuild target to allow a quick OpenJDK rebuild (warning; may
not work in some cases due to flaws in OpenJDK's build system)
2010-07-08 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (rebuild): Add new target to allow a
quick rebuild of OpenJDK in the manner of the existing
hotspot target.
changeset cc1498495367 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cc1498495367
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jul 08 20:37:25 2010 +0100
Merge
diffstat:
4 files changed, 91 insertions(+), 3 deletions(-)
ChangeLog | 21 ++++
Makefile.am | 15 ++
plugin/icedteanp/java/netscape/security/ForbiddenTargetException.java | 52 ++++++++++
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 6 -
diffs (138 lines):
diff -r 8432ceda94a2 -r cc1498495367 ChangeLog
--- a/ChangeLog Thu Jul 08 17:25:57 2010 +0100
+++ b/ChangeLog Thu Jul 08 20:37:25 2010 +0100
@@ -1,3 +1,24 @@ 2010-07-08 Andrew John Hughes <ahughes
+2010-07-08 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (rebuild): Add new target to allow a quick
+ rebuild of OpenJDK in the manner of the existing
+ hotspot target.
+
+2010-07-08 Omair Majid <omajid at redhat.com>
+
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java:
+ (reFrame): Pass the panel to the constructor, dont set it yourself.
+ (PluginAppletViewer): Set the panel to be the passed in object and only
+ then add it to the list of all panels.
+
+2010-07-08 Omair Majid <omajid at redhat.com>
+
+ PR icedtea/460
+ * plugin/icedteanp/java/netscape/security/ForbiddenTargetException.java:
+ New file. Some applets, for legacy support, expect this class to be
+ present.
+
2010-07-08 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r 8432ceda94a2 -r cc1498495367 Makefile.am
--- a/Makefile.am Thu Jul 08 17:25:57 2010 +0100
+++ b/Makefile.am Thu Jul 08 20:37:25 2010 +0100
@@ -1381,6 +1381,21 @@ clean-icedtea-ecj:
rm -rf $(ECJ_BUILD_OUTPUT_DIR)
rm -f stamps/icedtea-ecj.stamp
+# Rebuild targets
+
+rebuild:
+if WITH_OPENJDK
+ rm -f stamps/icedtea.stamp
+ rm -f stamps/icedtea-against-icedtea.stamp
+ $(ARCH_PREFIX) $(MAKE) icedtea-against-icedtea
+ @echo "IcedTea is served (again):" $(BUILD_OUTPUT_DIR)/j2sdk-image
+else
+ rm -f stamps/icedtea-ecj.stamp
+ rm -f stamps/icedtea-against-ecj.stamp
+ $(ARCH_PREFIX) $(MAKE) icedtea-against-ecj
+ @echo "ecj-poured IcedTea is served (again):" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image
+endif
+
hotspot:
if WITH_OPENJDK
rm -f stamps/icedtea.stamp
diff -r 8432ceda94a2 -r cc1498495367 plugin/icedteanp/java/netscape/security/ForbiddenTargetException.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugin/icedteanp/java/netscape/security/ForbiddenTargetException.java Thu Jul 08 20:37:25 2010 +0100
@@ -0,0 +1,52 @@
+/* ForbiddenTargetException.java
+ Copyright (C) 2010 Red Hat
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+package netscape.security;
+
+public class ForbiddenTargetException extends RuntimeException{
+
+ private static final long serialVersionUID = 1271219852541058396L;
+
+ public ForbiddenTargetException() {
+ super();
+ }
+
+ public ForbiddenTargetException(String s) {
+ super(s);
+ }
+
+}
diff -r 8432ceda94a2 -r cc1498495367 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu Jul 08 17:25:57 2010 +0100
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu Jul 08 20:37:25 2010 +0100
@@ -393,8 +393,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
if (oldFrame != null && handle == oldFrame.handle)
return;
- PluginAppletViewer newFrame = new PluginAppletViewer(handle, identifier, statusMsgStream, heightFactor, widthFactor);
- newFrame.panel = panel;
+ PluginAppletViewer newFrame = new PluginAppletViewer(handle, identifier, statusMsgStream, heightFactor, widthFactor, panel);
if (oldFrame != null) {
applets.remove(oldFrame.identifier);
@@ -425,13 +424,14 @@ import com.sun.jndi.toolkit.url.UrlUtil;
*/
private PluginAppletViewer(long handle, final int identifier,
PrintStream statusMsgStream, double heightFactor,
- double widthFactor) {
+ double widthFactor, AppletViewerPanel appletPanel) {
super(handle, true);
this.statusMsgStream = statusMsgStream;
this.identifier = identifier;
this.proposedHeightFactor = heightFactor;
this.proposedWidthFactor = widthFactor;
+ this.panel = appletPanel;
if (!appletPanels.contains(panel))
appletPanels.addElement(panel);
More information about the distro-pkg-dev
mailing list