Mercurial > hg > release > icedtea6-1.8

changeset 2043:edbd0ce1f3cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2010-07-08 Omair Majid <omajid@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.
author Omair Majid <omajid@redhat.com>
date Thu, 08 Jul 2010 14:31:02 -0400
parents 8b2338432fc9
children d53c4ae5b40a
files ChangeLog plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
diffstat 2 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jul 08 14:25:02 2010 -0400
+++ b/ChangeLog	Thu Jul 08 14:31:02 2010 -0400
@@ -1,3 +1,10 @@
+2010-07-08  Omair Majid  <omajid@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@redhat.com>
 
 	PR icedtea/460
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Thu Jul 08 14:25:02 2010 -0400
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Thu Jul 08 14:31:02 2010 -0400
@@ -393,8 +393,7 @@
          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 @@
       */
      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);