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/10/21 15:13:03 UTC
svn commit: r828005 - in /incubator/pivot/trunk:
demos/src/org/apache/pivot/demos/rss/
tutorials/src/org/apache/pivot/tutorials/stocktracker/
wtk/src/org/apache/pivot/wtk/ wtk/src/org/apache/pivot/wtk/skin/
wtk/src/org/apache/pivot/wtk/skin/terra/
Author: gbrown
Date: Wed Oct 21 13:13:02 2009
New Revision: 828005
URL: http://svn.apache.org/viewvc?rev=828005&view=rev
Log:
Eliminate ApplicationContext.open() and beep() methods; minor updates to TextAreaSkin.
Modified:
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/rss/RSSFeedDemo.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/rss/RSSFeedDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/rss/RSSFeedDemo.java?rev=828005&r1=828004&r2=828005&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/rss/RSSFeedDemo.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/rss/RSSFeedDemo.java Wed Oct 21 13:13:02 2009
@@ -16,9 +16,11 @@
package org.apache.pivot.demos.rss;
import java.awt.Color;
+import java.awt.Desktop;
import java.awt.Font;
import java.io.IOException;
import java.net.MalformedURLException;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.Iterator;
@@ -38,7 +40,6 @@
import org.apache.pivot.util.concurrent.TaskExecutionException;
import org.apache.pivot.util.concurrent.TaskListener;
import org.apache.pivot.wtk.Application;
-import org.apache.pivot.wtk.BrowserApplicationContext;
import org.apache.pivot.wtk.CardPane;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.ComponentMouseButtonListener;
@@ -208,11 +209,19 @@
try {
String link = (String)xpath.evaluate("link", itemElement, XPathConstants.STRING);
- BrowserApplicationContext.open(new URL(link));
+ Desktop desktop = Desktop.getDesktop();
+
+ try {
+ desktop.browse(new URL(link).toURI());
+ } catch(MalformedURLException exception) {
+ throw new RuntimeException(exception);
+ } catch(URISyntaxException exception) {
+ throw new RuntimeException(exception);
+ } catch(IOException exception) {
+ System.out.println("Unable to open " + link + " in default browser.");
+ }
} catch(XPathExpressionException exception) {
System.err.print(exception);
- } catch(MalformedURLException exception) {
- System.err.print(exception);
}
}
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java?rev=828005&r1=828004&r2=828005&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java Wed Oct 21 13:13:02 2009
@@ -16,7 +16,10 @@
*/
package org.apache.pivot.tutorials.stocktracker;
+import java.awt.Desktop;
+import java.io.IOException;
import java.net.MalformedURLException;
+import java.net.URISyntaxException;
import java.net.URL;
import java.text.DateFormat;
import java.util.Comparator;
@@ -188,9 +191,17 @@
yahooFinanceButton.getButtonPressListeners().add(new ButtonPressListener() {
@Override
public void buttonPressed(Button button) {
+ Desktop desktop = Desktop.getDesktop();
+
try {
- ApplicationContext.open(new URL(YAHOO_FINANCE_HOME));
+ desktop.browse(new URL(YAHOO_FINANCE_HOME).toURI());
} catch(MalformedURLException exception) {
+ throw new RuntimeException(exception);
+ } catch(URISyntaxException exception) {
+ throw new RuntimeException(exception);
+ } catch(IOException exception) {
+ System.out.println("Unable to open "
+ + YAHOO_FINANCE_HOME + " in default browser.");
}
}
});
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java?rev=828005&r1=828004&r2=828005&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java Wed Oct 21 13:13:02 2009
@@ -17,12 +17,10 @@
package org.apache.pivot.wtk;
import java.awt.AWTEvent;
-import java.awt.Desktop;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.GraphicsConfiguration;
import java.awt.RenderingHints;
-import java.awt.Toolkit;
import java.awt.Transparency;
import java.awt.dnd.DnDConstants;
import java.awt.dnd.DragGestureEvent;
@@ -42,7 +40,6 @@
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.awt.event.MouseWheelEvent;
-import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URI;
@@ -1528,39 +1525,6 @@
}
/**
- * Opens the resource at the given location.
- *
- * @param location
- */
- public static void open(String location) throws MalformedURLException {
- open(new URL(location));
- }
-
- /**
- * Opens the resource at the given location.
- *
- * @param location
- */
- public static void open(URL location) {
- Desktop desktop = Desktop.getDesktop();
-
- try {
- desktop.browse(location.toURI());
- } catch(IOException exception) {
- System.err.println("Unable to open URL in default browser: " + exception.getMessage());
- } catch(URISyntaxException exception) {
- System.err.println("Unable to open URL in default browser: " + exception.getMessage());
- }
- }
-
- /**
- * Issues a system alert sound.
- */
- public static void beep() {
- Toolkit.getDefaultToolkit().beep();
- }
-
- /**
* Returns the current JVM version.
*
* @return
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java?rev=828005&r1=828004&r2=828005&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java Wed Oct 21 13:13:02 2009
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.wtk;
+import java.awt.Toolkit;
import java.io.IOException;
import org.apache.pivot.collections.Dictionary;
@@ -370,7 +371,7 @@
if (text != null) {
if ((text.length() + textNode.getCharacterCount()) > maximumLength) {
- ApplicationContext.beep();
+ Toolkit.getDefaultToolkit().beep();
} else {
// Remove any existing selection
if (selectionLength > 0) {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java?rev=828005&r1=828004&r2=828005&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java Wed Oct 21 13:13:02 2009
@@ -216,7 +216,14 @@
}
}
- public abstract int getOffset();
+ public int getOffset() {
+ return node.getOffset();
+ }
+
+ public int getCharacterCount() {
+ return node.getCharacterCount();
+ }
+
public abstract NodeView getNext();
public abstract int getCharacterAt(int x, int y);
public abstract Bounds getCharacterBounds(int offset);
@@ -370,11 +377,6 @@
}
@Override
- public int getOffset() {
- return getNode().getOffset();
- }
-
- @Override
public int getCharacterAt(int x, int y) {
int offset = -1;
@@ -390,9 +392,6 @@
}
}
- // TODO Return the node view length (not node character count), so we can
- // append to the node?
-
return offset;
}
@@ -403,11 +402,7 @@
for (int i = 0, n = nodeViews.getLength(); i < n; i++) {
NodeView nodeView = nodeViews.get(i);
int nodeViewOffset = nodeView.getOffset();
-
- // TODO This is wrong; we need to know the number of characters this view
- // represents, not the length of its node
- Node node = nodeView.getNode();
- int characterCount = node.getCharacterCount();
+ int characterCount = nodeView.getCharacterCount();
if (offset >= nodeViewOffset
&& offset < nodeViewOffset + characterCount) {
@@ -819,7 +814,12 @@
@Override
public int getOffset() {
- return getNode().getOffset() + start;
+ return super.getOffset() + start;
+ }
+
+ @Override
+ public int getCharacterCount() {
+ return length;
}
@Override
@@ -932,11 +932,6 @@
}
@Override
- public int getOffset() {
- return getNode().getOffset();
- }
-
- @Override
public NodeView getNext() {
return null;
}
@@ -1019,13 +1014,15 @@
@Override
public int getPreferredWidth(int height) {
- throw new UnsupportedOperationException();
+ return 0;
}
@Override
public int getPreferredHeight(int width) {
int preferredHeight;
- if (documentView == null) {
+
+ if (documentView == null
+ || width == -1) {
preferredHeight = 0;
} else {
documentView.setBreakWidth(Math.max(width - (margin.left + margin.right), 0));
@@ -1039,7 +1036,7 @@
@Override
public Dimensions getPreferredSize() {
- throw new UnsupportedOperationException();
+ return new Dimensions(0, 0);
}
@Override
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java?rev=828005&r1=828004&r2=828005&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java Wed Oct 21 13:13:02 2009
@@ -15,6 +15,8 @@
*/
package org.apache.pivot.wtk.skin.terra;
+import java.awt.Toolkit;
+
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.util.Vote;
import org.apache.pivot.wtk.ApplicationContext;
@@ -75,7 +77,7 @@
dialog.requestActive();
consumed = true;
- ApplicationContext.beep();
+ Toolkit.getDefaultToolkit().beep();
}
return consumed;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java?rev=828005&r1=828004&r2=828005&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java Wed Oct 21 13:13:02 2009
@@ -18,10 +18,10 @@
import java.awt.Color;
import java.awt.Graphics2D;
+import java.awt.Toolkit;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.util.Vote;
-import org.apache.pivot.wtk.ApplicationContext;
import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.ComponentListener;
@@ -98,7 +98,7 @@
owner.moveToFront();
consumed = true;
- ApplicationContext.beep();
+ Toolkit.getDefaultToolkit().beep();
}
return consumed;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java?rev=828005&r1=828004&r2=828005&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java Wed Oct 21 13:13:02 2009
@@ -22,6 +22,7 @@
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.Shape;
+import java.awt.Toolkit;
import java.awt.font.FontRenderContext;
import java.awt.font.LineMetrics;
import java.awt.font.TextHitInfo;
@@ -957,13 +958,13 @@
if (validator.isValid(buf.toString())) {
textInput.insertText(character, index);
} else {
- ApplicationContext.beep();
+ Toolkit.getDefaultToolkit().beep();
}
} else {
textInput.insertText(character, index);
}
} else {
- ApplicationContext.beep();
+ Toolkit.getDefaultToolkit().beep();
}
}
@@ -1009,7 +1010,7 @@
if (validator.isValid(buf.toString())) {
textInput.delete(direction);
} else {
- ApplicationContext.beep();
+ Toolkit.getDefaultToolkit().beep();
}
} else {
textInput.delete(direction);
@@ -1119,7 +1120,7 @@
consumed = true;
if (textInput.isPassword()) {
- ApplicationContext.beep();
+ Toolkit.getDefaultToolkit().beep();
} else {
textInput.cut();
}
@@ -1128,7 +1129,7 @@
consumed = true;
if (textInput.isPassword()) {
- ApplicationContext.beep();
+ Toolkit.getDefaultToolkit().beep();
} else {
textInput.copy();
}