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/05/01 16:59:09 UTC
svn commit: r770705 - in /incubator/pivot/trunk:
tutorials/src/pivot/tutorials/Demo.java
wtk/src/pivot/wtk/DesktopApplicationContext.java
wtk/src/pivot/wtk/ScriptApplication.java
Author: gbrown
Date: Fri May 1 14:59:08 2009
New Revision: 770705
URL: http://svn.apache.org/viewvc?rev=770705&view=rev
Log:
Update Kitchen Sink demo and ScriptApplication to use new convenience launcher method in DesktopApplicationContext; update variable names in convenience launcher method for clarity.
Modified:
incubator/pivot/trunk/tutorials/src/pivot/tutorials/Demo.java
incubator/pivot/trunk/wtk/src/pivot/wtk/DesktopApplicationContext.java
incubator/pivot/trunk/wtk/src/pivot/wtk/ScriptApplication.java
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/Demo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/Demo.java?rev=770705&r1=770704&r2=770705&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/Demo.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/Demo.java Fri May 1 14:59:08 2009
@@ -41,6 +41,7 @@
import pivot.wtk.ButtonPressListener;
import pivot.wtk.ComponentMouseButtonListener;
import pivot.wtk.ComponentStateListener;
+import pivot.wtk.DesktopApplicationContext;
import pivot.wtk.DragSource;
import pivot.wtk.DropAction;
import pivot.wtk.DropTarget;
@@ -138,6 +139,10 @@
private Window window = null;
+ public static void main(String[] args) {
+ DesktopApplicationContext.main(Demo.class, args);
+ }
+
@SuppressWarnings("unchecked")
public void startup(final Display display, Dictionary<String, String> properties) throws Exception {
// NOTE This is commented out because it takes a non-negligible amount
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/DesktopApplicationContext.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/DesktopApplicationContext.java?rev=770705&r1=770704&r2=770705&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/DesktopApplicationContext.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/DesktopApplicationContext.java Fri May 1 14:59:08 2009
@@ -172,26 +172,6 @@
System.exit(0);
}
- /**
- * Utility method to make it easier to define main() entry-points in applications.
- * <p>
- * Then your main class looks like:
- * <p>
- * <pre>
- * public class MyApp implements Application {
- * public static void main(String[] args) throws Exception {
- * DesktopApplicationContext.main(MyApp.class, args);
- * }
- * }
- * </pre>
- */
- public static void main(Class<? extends Application> applicationClass, String[] args) {
- String [] newArgs = new String[args.length + 1];
- System.arraycopy(args, 0, newArgs, 1, args.length);
- newArgs[0] = applicationClass.getName();
- main(newArgs);
- }
-
public static void main(String[] args) {
if (application != null) {
throw new IllegalStateException();
@@ -321,4 +301,27 @@
}
});
}
+
+ /**
+ * Utility method to make it easier to define <tt>main()</tt> entry-points
+ * into applications. For example:
+ *
+ * <code>
+ * public class MyApp implements Application {
+ * public static void main(String[] args) throws Exception {
+ * DesktopApplicationContext.main(MyApp.class, args);
+ * }
+ * }
+ * </code>
+ *
+ * @param applicationClass
+ * @param applicationArgs
+ */
+ public static void main(Class<? extends Application> applicationClass,
+ String[] applicationArgs) {
+ String[] args = new String[applicationArgs.length + 1];
+ System.arraycopy(applicationArgs, 0, args, 1, applicationArgs.length);
+ args[0] = applicationClass.getName();
+ main(args);
+ }
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/ScriptApplication.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/ScriptApplication.java?rev=770705&r1=770704&r2=770705&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/ScriptApplication.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/ScriptApplication.java Fri May 1 14:59:08 2009
@@ -30,6 +30,10 @@
private static final String SRC_ARGUMENT = "src";
private static final String TITLE_ARGUMENT = "title";
+ public static void main(String[] args) {
+ DesktopApplicationContext.main(ScriptApplication.class, args);
+ }
+
public void startup(Display display, Dictionary<String, String> properties)
throws Exception {
if (!properties.containsKey(SRC_ARGUMENT)) {