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/03 16:04:02 UTC
svn commit: r781383 - in /incubator/pivot/trunk: ./ wtk/src/pivot/wtk/
wtk/src/pivot/wtk/content/ wtk/src/pivot/wtk/media/drawing/
wtk/src/pivot/wtk/skin/ wtk/src/pivot/wtk/skin/terra/
Author: gbrown
Date: Wed Jun 3 14:04:02 2009
New Revision: 781383
URL: http://svn.apache.org/viewvc?rev=781383&view=rev
Log:
Update build version to 1.3-incubating; minor source code documentation updates; eliminate remaining instances of raw type usage.
Modified:
incubator/pivot/trunk/build.properties
incubator/pivot/trunk/wtk/src/pivot/wtk/Border.java
incubator/pivot/trunk/wtk/src/pivot/wtk/Button.java
incubator/pivot/trunk/wtk/src/pivot/wtk/Container.java
incubator/pivot/trunk/wtk/src/pivot/wtk/DesktopApplicationContext.java
incubator/pivot/trunk/wtk/src/pivot/wtk/ImageView.java
incubator/pivot/trunk/wtk/src/pivot/wtk/Keyboard.java
incubator/pivot/trunk/wtk/src/pivot/wtk/TreeView.java
incubator/pivot/trunk/wtk/src/pivot/wtk/content/CalendarButtonDataRenderer.java
incubator/pivot/trunk/wtk/src/pivot/wtk/content/NumericSpinnerData.java
incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Shape.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/BorderSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ImageViewSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ScrollPaneSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTreeViewSkin.java
Modified: incubator/pivot/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/build.properties?rev=781383&r1=781382&r2=781383&view=diff
==============================================================================
--- incubator/pivot/trunk/build.properties (original)
+++ incubator/pivot/trunk/build.properties Wed Jun 3 14:04:02 2009
@@ -12,4 +12,4 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-version=1.2-incubating
+version=1.3-incubating
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/Border.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/Border.java?rev=781383&r1=781382&r2=781383&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/Border.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/Border.java Wed Jun 3 14:04:02 2009
@@ -21,9 +21,6 @@
/**
* Container that displays a border.
- * <p>
- * TODO Add styles to support different border styles (e.g. inset, outset) or
- * create subclasses for these border types.
*
* @author gbrown
*/
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/Button.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/Button.java?rev=781383&r1=781382&r2=781383&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/Button.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/Button.java Wed Jun 3 14:04:02 2009
@@ -22,12 +22,12 @@
/**
* Abstract base class for button components.
- *
+ * <p>
* TODO Ensure that button group names are unique across applications?
* Applets downloaded from different domains won't clash, but multiple instances
* of the same application from the same domain would. Put the groups in the
* application context?
- *
+ * <p>
* TODO Allow callers to remove a button group (possibly by exposing group
* dictionary interface).
*
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/Container.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/Container.java?rev=781383&r1=781382&r2=781383&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/Container.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/Container.java Wed Jun 3 14:04:02 2009
@@ -119,10 +119,6 @@
}
}
- // TODO A linked list may be more efficient than an array list; it would
- // certainly optimize moveToTop() and moveToBottom() in Window, since
- // an array list will need to perform a lot of copying as owned windows
- // are removed from the list and appended to the end
private ArrayList<Component> components = new ArrayList<Component>();
private FocusTraversalPolicy focusTraversalPolicy = null;
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=781383&r1=781382&r2=781383&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/DesktopApplicationContext.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/DesktopApplicationContext.java Wed Jun 3 14:04:02 2009
@@ -313,7 +313,7 @@
fullScreenHostFrame = new HostFrame();
fullScreenHostFrame.setUndecorated(true);
- // Hook into OSX application menu
+ // Hook into OS X application menu
if (System.getProperty("mrj.version") != null) {
try {
// Get the EAWT classes and methods
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/ImageView.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/ImageView.java?rev=781383&r1=781382&r2=781383&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/ImageView.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/ImageView.java Wed Jun 3 14:04:02 2009
@@ -24,8 +24,6 @@
/**
* Component that displays an image.
- * <p>
- * TODO Load images asynchronously in setImage()?
*
* @author gbrown
*/
@@ -93,11 +91,12 @@
* @param image
* The location of the image to set.
*/
- public void setImage(URL image) {
+ public final void setImage(URL image) {
if (image == null) {
throw new IllegalArgumentException("image is null.");
}
+ // TODO Support asynchronous loading?
setImage(Image.load(image));
}
@@ -107,7 +106,7 @@
* @param image
* The resource name of the image to set.
*/
- public void setImage(String image) {
+ public final void setImage(String image) {
if (image == null) {
throw new IllegalArgumentException("image is null.");
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/Keyboard.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/Keyboard.java?rev=781383&r1=781382&r2=781383&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/Keyboard.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/Keyboard.java Wed Jun 3 14:04:02 2009
@@ -296,9 +296,9 @@
* or <tt>null</tt> if no modifiers are pressed.
*/
public static DropAction getDropAction() {
- // TODO Return an appropriate action for OS
+ // TODO Return an appropriate action for OS:
// Windows: no modifier - move; control - copy; control-shift - link
- // Mac OSX: no modifier - move; option - copy; option-command - link
+ // Mac OS X: no modifier - move; option - copy; option-command - link
DropAction dropAction = null;
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/TreeView.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/TreeView.java?rev=781383&r1=781382&r2=781383&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/TreeView.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/TreeView.java Wed Jun 3 14:04:02 2009
@@ -1649,7 +1649,7 @@
List<?> parentBranchData = parent.getBranchData();
Object childData = parentBranchData.get(index);
- if (!(childData instanceof List)) {
+ if (!(childData instanceof List<?>)) {
throw new IllegalArgumentException
("Unexpected leaf in branch path: " + path);
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/content/CalendarButtonDataRenderer.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/content/CalendarButtonDataRenderer.java?rev=781383&r1=781382&r2=781383&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/content/CalendarButtonDataRenderer.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/content/CalendarButtonDataRenderer.java Wed Jun 3 14:04:02 2009
@@ -26,9 +26,6 @@
/**
* Default calendar button data renderer.
- * <p>
- * TODO Add showIcon property to this class so the size of the button doesn't
- * change when changing selection between items with and without icons.
*
* @author gbrown
*/
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/content/NumericSpinnerData.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/content/NumericSpinnerData.java?rev=781383&r1=781382&r2=781383&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/content/NumericSpinnerData.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/content/NumericSpinnerData.java Wed Jun 3 14:04:02 2009
@@ -133,7 +133,6 @@
public void setLowerBound(int lowerBound) {
this.lowerBound = lowerBound;
- // TODO Notify listListeners of change
}
public int getUpperBound() {
@@ -142,7 +141,6 @@
public void setUpperBound(int upperBound) {
this.upperBound = upperBound;
- // TODO Notify listListeners of change
}
public int getIncrement() {
@@ -151,7 +149,6 @@
public void setIncrement(int increment) {
this.increment = increment;
- // TODO Notify listListeners of change
}
public int add(Integer item) {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Shape.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Shape.java?rev=781383&r1=781382&r2=781383&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Shape.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Shape.java Wed Jun 3 14:04:02 2009
@@ -34,8 +34,7 @@
/**
* Abstract base class for shapes.
* <p>
- * TODO Add a lineStyle property (solid, dashed, dotted, etc.)? Or support a
- * strokeDashArray property?
+ * TODO Add a strokeDashArray property.
*
* @author gbrown
*/
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/BorderSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/BorderSkin.java?rev=781383&r1=781382&r2=781383&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/BorderSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/BorderSkin.java Wed Jun 3 14:04:02 2009
@@ -40,6 +40,9 @@
/**
* Border skin.
+ * <p>
+ * TODO Add styles to support different border styles (e.g. inset, outset) or
+ * create subclasses for these border types.
*
* @author gbrown
*/
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ImageViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ImageViewSkin.java?rev=781383&r1=781382&r2=781383&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ImageViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ImageViewSkin.java Wed Jun 3 14:04:02 2009
@@ -38,8 +38,8 @@
* <p>
* TODO Add rotation style.
* <p>
- * TODO If horizontal or vertical alignment is specified, but not both, scale
- * aspect-correct in that dimension.
+ * TODO If horizontal or vertical alignment is "justify", but not both, scale
+ * aspect-correct.
*
* @author gbrown
*/
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ScrollPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ScrollPaneSkin.java?rev=781383&r1=781382&r2=781383&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ScrollPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ScrollPaneSkin.java Wed Jun 3 14:04:02 2009
@@ -952,8 +952,9 @@
ApplicationContext.DisplayHost displayHost = viewport.getDisplay().getDisplayHost();
ApplicationContext applicationContext = displayHost.getApplicationContext();
- optimizeScrolling = (applicationContext instanceof DesktopApplicationContext ||
- (displayHost.getPeer().canDetermineObscurity() && !displayHost.getPeer().isObscured()));
+ optimizeScrolling = (applicationContext instanceof DesktopApplicationContext
+ || (displayHost.getPeer().canDetermineObscurity()
+ && !displayHost.getPeer().isObscured()));
}
if (optimizeScrolling) {
@@ -1032,8 +1033,9 @@
ApplicationContext.DisplayHost displayHost = viewport.getDisplay().getDisplayHost();
ApplicationContext applicationContext = displayHost.getApplicationContext();
- optimizeScrolling = (applicationContext instanceof DesktopApplicationContext ||
- (displayHost.getPeer().canDetermineObscurity() && !displayHost.getPeer().isObscured()));
+ optimizeScrolling = (applicationContext instanceof DesktopApplicationContext
+ || (displayHost.getPeer().canDetermineObscurity()
+ && !displayHost.getPeer().isObscured()));
}
if (optimizeScrolling) {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTreeViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTreeViewSkin.java?rev=781383&r1=781382&r2=781383&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTreeViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTreeViewSkin.java Wed Jun 3 14:04:02 2009
@@ -100,7 +100,7 @@
public static NodeInfo createNew(BranchInfo parent, Object data) {
NodeInfo nodeInfo = null;
- if (data instanceof List) {
+ if (data instanceof List<?>) {
nodeInfo = new BranchInfo(parent, (List<Object>)data);
} else {
nodeInfo = new NodeInfo(parent, data);