You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/06/17 19:04:54 UTC
svn commit: r785728 - in /incubator/pivot/trunk:
demos/www/kitchen_sink.template.html web/www/index.template.html
web/www/web_test.template.html
wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java
Author: gbrown
Date: Wed Jun 17 17:04:53 2009
New Revision: 785728
URL: http://svn.apache.org/viewvc?rev=785728&view=rev
Log:
Fix issue retrieving startup properties in BrowserApplicationContext; update kitchen_sink.html to use deployJava.js.
Added:
incubator/pivot/trunk/web/www/web_test.template.html
- copied, changed from r785695, incubator/pivot/trunk/web/www/index.template.html
Removed:
incubator/pivot/trunk/web/www/index.template.html
Modified:
incubator/pivot/trunk/demos/www/kitchen_sink.template.html
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java
Modified: incubator/pivot/trunk/demos/www/kitchen_sink.template.html
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/kitchen_sink.template.html?rev=785728&r1=785727&r2=785728&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/kitchen_sink.template.html (original)
+++ incubator/pivot/trunk/demos/www/kitchen_sink.template.html Wed Jun 17 17:04:53 2009
@@ -19,11 +19,15 @@
<head>
<title>Pivot "Kitchen Sink" Demo</title>
</head>
-<body style="margin:0px; padding:0px">
-<applet code="org.apache.pivot.wtk.BrowserApplicationContext$HostApplet"
- archive="@project_name@-core-@version@.jar,@project_name@-wtk-@version@.jar,@project_name@-wtk-@version@.terra.jar,@project_name@-web-@version@.jar,@project_name@-tutorials-@version@.jar"
- width="100%" height="100%">
- <param name="applicationClassName" value="org.apache.pivot.tutorials.KitchenSink">
-</applet>
+<body>
+<script src="http://java.com/js/deployJava.js"></script>
+<script>
+var attributes = {code:"org.apache.pivot.wtk.BrowserApplicationContext$HostApplet",
+ archive:"lib/@project_name@-core-@version@.jar,lib/@project_name@-wtk-@version@.jar,lib/@project_name@-wtk-@version@.terra.jar,lib/@project_name@-tutorials-@version@.jar",
+ width:1024, height:768};
+var parameters = {applicationClassName:"org.apache.pivot.tutorials.KitchenSink", codebase_lookup:"false"} ;
+var version = "1.6";
+deployJava.runApplet(attributes, parameters, version);
+</script>
</body>
</html>
Copied: incubator/pivot/trunk/web/www/web_test.template.html (from r785695, incubator/pivot/trunk/web/www/index.template.html)
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/web/www/web_test.template.html?p2=incubator/pivot/trunk/web/www/web_test.template.html&p1=incubator/pivot/trunk/web/www/index.template.html&r1=785695&r2=785728&rev=785728&view=diff
==============================================================================
--- incubator/pivot/trunk/web/www/index.template.html (original)
+++ incubator/pivot/trunk/web/www/web_test.template.html Wed Jun 17 17:04:53 2009
@@ -21,7 +21,7 @@
</head>
<body style="margin:0px; padding:0px">
<applet code="org.apache.pivot.wtk.BrowserApplicationContext$HostApplet"
- archive="@project_name@-core-@version@.jar,@project_name@-wtk-@version@.jar,@project_name@-wtk-@version@.terra.jar,@project_name@-web-@version@.jar,@project_name@-web-@version@.test.jar"
+ archive="lib/@project_name@-core-@version@.jar,lib/@project_name@-wtk-@version@.jar,lib/@project_name@-wtk-@version@.terra.jar,lib/@project_name@-web-@version@.jar,lib/@project_name@-web-@version@.test.jar"
width="100%" height="100%">
<param name="applicationClassName" value="org.apache.pivot.web.test.WebQueryTestClient">
</applet>
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java?rev=785728&r1=785727&r2=785728&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java Wed Jun 17 17:04:53 2009
@@ -75,17 +75,9 @@
// Create the application context
applicationContext = new BrowserApplicationContext();
- // Get the startup properties
+ // Load properties specified on the query string
properties = new HashMap<String, String>();
- // Load properties specified as applet parameters
- String[][] parameterInfo = getParameterInfo();
- for (int i = 0; i < parameterInfo.length; i++) {
- String[] parameter = parameterInfo[i];
- properties.put(parameter[0], parameter[1]);
- }
-
- // Load properties specified on the query string
URL documentBase = getDocumentBase();
if (documentBase != null) {
String queryString = documentBase.getQuery();