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 2011/05/24 14:58:43 UTC
svn commit: r1127018 - in /pivot/trunk/wtk/src/org/apache/pivot/wtk:
ApplicationContext.java DesktopApplicationContext.java
Author: gbrown
Date: Tue May 24 12:58:43 2011
New Revision: 1127018
URL: http://svn.apache.org/viewvc?rev=1127018&view=rev
Log:
Apply patch for PIVOT-747; handle missing build.properties in dev environment.
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java?rev=1127018&r1=1127017&r2=1127018&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java Tue May 24 12:58:43 2011
@@ -1512,14 +1512,22 @@ public abstract class ApplicationContext
private static Version pivotVersion = null;
static {
+ // Get the JVM version
jvmVersion = Version.decode(System.getProperty("java.vm.version"));
- try {
- Properties buildProperties = new Properties();
- buildProperties.load(ApplicationContext.class.getClassLoader().getResourceAsStream("build.properties"));
- pivotVersion = Version.decode(buildProperties.getProperty("version"));
- }
- catch (IOException ioe) {
- throw new RuntimeException(ioe);
+
+ // Get the Pivot version
+ InputStream buildPropertiesInputStream = ApplicationContext.class.getClassLoader().getResourceAsStream("build.properties");
+
+ if (buildPropertiesInputStream == null) {
+ pivotVersion = new Version(0, 0, 0, 0);
+ } else {
+ try {
+ Properties buildProperties = new Properties();
+ buildProperties.load(buildPropertiesInputStream);
+ pivotVersion = Version.decode(buildProperties.getProperty("version"));
+ } catch (IOException exception) {
+ throw new RuntimeException(exception);
+ }
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java?rev=1127018&r1=1127017&r2=1127018&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java Tue May 24 12:58:43 2011
@@ -373,13 +373,25 @@ public final class DesktopApplicationCon
/**
* Terminates the application context.
+ * this call is the same as exit(true)
*/
- public static boolean exit() {
+ public static void exit() {
+ exit(true);
+ }
+
+ /**
+ * Terminates the application context.
+ *
+ * @param optional
+ * If <tt>true</tt>, shutdown is optional and may be cancelled. If
+ * <tt>false</tt>, shutdown cannot be cancelled.
+ */
+ public static boolean exit(boolean optional) {
boolean cancelShutdown = false;
if (application != null) {
try {
- cancelShutdown = application.shutdown(true);
+ cancelShutdown = application.shutdown(optional);
} catch(Exception exception) {
displayException(exception);
}
@@ -632,7 +644,7 @@ public final class DesktopApplicationCon
Application.AboutHandler aboutHandler = (Application.AboutHandler)application;
aboutHandler.aboutRequested();
} else if (methodName.equals("handleQuit")) {
- handled = !exit();
+ handled = !exit(true);
}
// Invoke setHandled()