changeset 1773:2786abf763ce default tip

Backed out changeset b6d5c31b16fe Commited to wrong branch.
author Andrew Su <asu@redhat.com>
date Mon, 23 Aug 2010 17:31:40 -0400
parents b6d5c31b16fe
children
files ChangeLog plugin/icedtea/sun/applet/PluginAppletViewer.java
diffstat 2 files changed, 34 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Aug 23 17:03:48 2010 -0400
+++ b/ChangeLog	Mon Aug 23 17:31:40 2010 -0400
@@ -1,8 +1,3 @@
-2010-08-23  Andrew Su  <asu@redhat.com>
-
-        * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
-	(parse): Removed parsing for unknown <app> tag.
-
 2009-04-07  Andrew John Hughes  <ahughes@redhat.com>
 
 	* NEWS,
--- a/plugin/icedtea/sun/applet/PluginAppletViewer.java	Mon Aug 23 17:03:48 2010 -0400
+++ b/plugin/icedtea/sun/applet/PluginAppletViewer.java	Mon Aug 23 17:31:40 2010 -0400
@@ -1761,6 +1761,40 @@
     						 atts.put("heightPercentage", Integer.parseInt(h.substring(0,  h.length() -1)));
     					 }
     				 }
+    				 else if (nm.equalsIgnoreCase("app")) {
+    					 statusMsgStream.println(appNotLongerSupportedWarning);
+    					 Hashtable atts2 = scanTag(in);
+    					 nm = (String)atts2.get("class");
+    					 if (nm != null) {
+    						 atts2.remove("class");
+    						 atts2.put("code", nm + ".class");
+    					 }
+    					 nm = (String)atts2.get("src");
+    					 if (nm != null) {
+    						 atts2.remove("src");
+    						 atts2.put("codebase", nm);
+    					 }
+    					 if (atts2.get("width") == null || !isInt(atts2.get("width"))) {
+    						 atts2.put("width", "1000");
+    						 atts2.put("widthPercentage", 100);
+    					 } else if (((String) atts.get("width")).endsWith("%")) {
+    						 String w = (String) atts.get("width");
+    						 atts2.put("width", "100");
+    						 atts2.put("widthPercentage", Integer.parseInt(w.substring(0,  w.length() -1)));
+    					 }
+
+    					 if (atts2.get("height") == null || !isInt(atts2.get("height"))) {
+    						 atts2.put("height", "1000");
+    						 atts2.put("heightPercentage", 100);
+    					 } else if (((String) atts.get("height")).endsWith("%")) {
+    						 String h = (String) atts.get("height");
+    						 atts2.put("height", "100");
+    						 atts2.put("heightPercentage", Integer.parseInt(h.substring(0,  h.length() -1)));
+    					 }
+
+    					 printTag(statusMsgStream, atts2);
+    					 statusMsgStream.println();
+    				 }
     			 }
     		 }
     	 }