You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2012/05/14 16:01:15 UTC
svn commit: r1338206 - in /pivot/trunk/wtk/src/org/apache/pivot/wtk:
BrowserApplicationContext.java DesktopApplicationContext.java
ScriptApplication.java
Author: smartini
Date: Mon May 14 14:01:15 2012
New Revision: 1338206
URL: http://svn.apache.org/viewvc?rev=1338206&view=rev
Log:
fix some eclipse warnings
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java?rev=1338206&r1=1338205&r2=1338206&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java Mon May 14 14:01:15 2012
@@ -25,12 +25,12 @@ import java.net.URL;
import java.net.URLDecoder;
import java.util.Locale;
+import netscape.javascript.JSObject;
+
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.HashMap;
import org.apache.pivot.collections.immutable.ImmutableMap;
-import netscape.javascript.JSObject;
-
/**
* Application context used to execute applications in a web browser.
*/
@@ -51,6 +51,9 @@ public final class BrowserApplicationCon
private static final long serialVersionUID = -7710026348576806673L;
private class InitCallback implements Runnable {
+ public InitCallback() {
+ }
+
@Override
public void run() {
// Set the origin
@@ -120,7 +123,7 @@ public final class BrowserApplicationCon
}
// Load properties specified in the startup properties parameter
- startupProperties = new HashMap<String, String>();
+ HostApplet.this.startupProperties = new HashMap<String, String>();
String startupPropertiesParameter = getParameter(STARTUP_PROPERTIES_PARAMETER);
if (startupPropertiesParameter != null) {
@@ -138,7 +141,7 @@ public final class BrowserApplicationCon
} catch (UnsupportedEncodingException exception) {
throw new RuntimeException(exception);
}
- startupProperties.put(key, value);
+ HostApplet.this.startupProperties.put(key, value);
} else {
System.err.println(argument + " is not a valid startup property.");
}
@@ -146,12 +149,12 @@ public final class BrowserApplicationCon
}
// Create the display host
- displayHost = new DisplayHost();
+ HostApplet.this.displayHost = new DisplayHost();
setLayout(new java.awt.BorderLayout());
- add(displayHost);
+ add(HostApplet.this.displayHost);
// Add the display to the display list
- displays.add(displayHost.getDisplay());
+ displays.add(HostApplet.this.displayHost.getDisplay());
// Disable focus traversal keys
setFocusTraversalKeysEnabled(false);
@@ -173,7 +176,7 @@ public final class BrowserApplicationCon
} else {
try {
Class<?> applicationClass = Class.forName(applicationClassName);
- application = (Application)applicationClass.newInstance();
+ HostApplet.this.application = (Application)applicationClass.newInstance();
} catch (Throwable throwable) {
throwable.printStackTrace();
}
@@ -182,45 +185,54 @@ public final class BrowserApplicationCon
}
private class StartCallback implements Runnable {
+ public StartCallback() {
+ }
+
@Override
public void run() {
// Start the application
- if (application != null) {
+ if (HostApplet.this.application != null) {
try {
- application.startup(displayHost.getDisplay(),
- new ImmutableMap<String, String>(startupProperties));
+ HostApplet.this.application.startup(HostApplet.this.displayHost.getDisplay(),
+ new ImmutableMap<String, String>(HostApplet.this.startupProperties));
} catch (Exception exception) {
displayException(exception);
}
// Add the application to the application list
- applications.add(application);
+ applications.add(HostApplet.this.application);
}
}
}
private class StopCallback implements Runnable {
+ public StopCallback() {
+ }
+
@Override
public void run() {
- if (application != null) {
+ if (HostApplet.this.application != null) {
try {
- application.shutdown(false);
+ HostApplet.this.application.shutdown(false);
} catch (Exception exception) {
displayException(exception);
}
// Remove the application from the application list
- applications.remove(application);
- application = null;
+ applications.remove(HostApplet.this.application);
+ HostApplet.this.application = null;
}
}
}
private class DestroyCallback implements Runnable {
+ public DestroyCallback() {
+ }
+
@Override
public void run() {
// Remove the display from the display list
- displays.remove(displayHost.getDisplay());
+ displays.remove(HostApplet.this.displayHost.getDisplay());
// Remove this applet from the host applets list and stop the timer
hostApplets.remove(HostApplet.this);
@@ -240,7 +252,7 @@ public final class BrowserApplicationCon
public static final String SYSTEM_PROPERTIES_PARAMETER = "system_properties";
public Application getApplication() {
- return application;
+ return this.application;
}
@Override
@@ -307,7 +319,7 @@ public final class BrowserApplicationCon
}
Alert alert = new Alert(MessageType.ERROR, message, null, body, false);
- alert.open(displayHost.getDisplay());
+ alert.open(this.displayHost.getDisplay());
}
}
@@ -369,4 +381,5 @@ public final class BrowserApplicationCon
throw new UnsupportedOperationException(throwable);
}
}
+
}
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=1338206&r1=1338205&r2=1338206&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java Mon May 14 14:01:15 2012
@@ -21,6 +21,7 @@ import java.awt.Graphics;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import java.awt.SplashScreen;
+import java.awt.event.InputEvent;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.WindowEvent;
@@ -54,10 +55,12 @@ public final class DesktopApplicationCon
public static class Adapter implements DisplayListener {
@Override
public void hostWindowOpened(Display display) {
+ // empty block
}
@Override
public void hostWindowClosed(Display display) {
+ // empty block
}
}
@@ -134,29 +137,29 @@ public final class DesktopApplicationCon
Display display = getDisplay();
int n = display.getLength();
- Window rootOwner;
+ Window rootOwnerLocal;
if (n == 0) {
- rootOwner = null;
+ rootOwnerLocal = null;
} else {
Window topWindow = (Window)display.get(display.getLength() - 1);
- rootOwner = topWindow.getRootOwner();
+ rootOwnerLocal = topWindow.getRootOwner();
}
Window previousRootOwner = this.rootOwner;
- if (rootOwner != previousRootOwner) {
+ if (rootOwnerLocal != previousRootOwner) {
if (previousRootOwner != null) {
- previousRootOwner.getWindowListeners().remove(rootOwnerListener);
+ previousRootOwner.getWindowListeners().remove(this.rootOwnerListener);
}
- if (rootOwner != null) {
- rootOwner.getWindowListeners().add(rootOwnerListener);
+ if (rootOwnerLocal != null) {
+ rootOwnerLocal.getWindowListeners().add(this.rootOwnerListener);
}
- this.rootOwner = rootOwner;
+ this.rootOwner = rootOwnerLocal;
}
- if (updateHostWindowTitleBarCallback == null) {
- updateHostWindowTitleBarCallback = new Runnable() {
+ if (this.updateHostWindowTitleBarCallback == null) {
+ this.updateHostWindowTitleBarCallback = new Runnable() {
@Override
public void run() {
java.awt.Window hostWindow = getDisplay().getHostWindow();
@@ -181,11 +184,11 @@ public final class DesktopApplicationCon
}
}
- updateHostWindowTitleBarCallback = null;
+ DesktopDisplayHost.this.updateHostWindowTitleBarCallback = null;
}
};
- queueCallback(updateHostWindowTitleBarCallback);
+ queueCallback(this.updateHostWindowTitleBarCallback);
}
}
}
@@ -295,7 +298,7 @@ public final class DesktopApplicationCon
setBackground(null);
// Add the display host
- add(displayHost);
+ add(this.displayHost);
}
@Override
@@ -304,7 +307,7 @@ public final class DesktopApplicationCon
}
public Display getDisplay() {
- return displayHost.getDisplay();
+ return this.displayHost.getDisplay();
}
@Override
@@ -323,14 +326,14 @@ public final class DesktopApplicationCon
switch(event.getID()) {
case WindowEvent.WINDOW_OPENED: {
- Display display = displayHost.getDisplay();
+ Display display = this.displayHost.getDisplay();
displays.add(display);
- if (displayCloseListener != null) {
- displayCloseListener.hostWindowOpened(display);
+ if (this.displayCloseListener != null) {
+ this.displayCloseListener.hostWindowOpened(display);
}
- displayHost.requestFocus();
+ this.displayHost.requestFocus();
break;
}
@@ -341,11 +344,11 @@ public final class DesktopApplicationCon
}
case WindowEvent.WINDOW_CLOSED: {
- Display display = displayHost.getDisplay();
+ Display display = this.displayHost.getDisplay();
displays.remove(display);
- if (displayCloseListener != null) {
- displayCloseListener.hostWindowClosed(display);
+ if (this.displayCloseListener != null) {
+ this.displayCloseListener.hostWindowClosed(display);
}
break;
@@ -586,8 +589,8 @@ public final class DesktopApplicationCon
@Override
public void keyPressed(KeyEvent keyEvent) {
if (keyEvent.getKeyCode() == KeyEvent.VK_F
- && (keyEvent.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) > 0
- && (keyEvent.getModifiersEx() & KeyEvent.SHIFT_DOWN_MASK) > 0) {
+ && (keyEvent.getModifiersEx() & InputEvent.CTRL_DOWN_MASK) > 0
+ && (keyEvent.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK) > 0) {
setFullScreen(!isFullScreen());
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java?rev=1338206&r1=1338205&r2=1338206&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java Mon May 14 14:01:15 2012
@@ -67,14 +67,14 @@ public class ScriptApplication implement
// Load the file and open the window
BXMLSerializer bxmlSerializer = new BXMLSerializer();
- window = (Window)bxmlSerializer.readObject(location, resources);
- window.open(display);
+ this.window = (Window)bxmlSerializer.readObject(location, resources);
+ this.window.open(display);
}
@Override
public boolean shutdown(boolean optional) {
- if (window != null) {
- window.close();
+ if (this.window != null) {
+ this.window.close();
}
return false;
@@ -82,13 +82,16 @@ public class ScriptApplication implement
@Override
public void resume() {
+ // empty block
}
@Override
public void suspend() {
+ // empty block
}
public static void main(String[] args) {
DesktopApplicationContext.main(ScriptApplication.class, args);
}
+
}