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 2014/07/16 14:24:46 UTC
svn commit: r1610977 - in /pivot/branches/2.0.x:
core/src/org/apache/pivot/beans/ core/src/org/apache/pivot/collections/
core/src/org/apache/pivot/serialization/ core/src/org/apache/pivot/sql/
core/test/org/apache/pivot/collections/test/ core/test/org/...
Author: smartini
Date: Wed Jul 16 12:24:45 2014
New Revision: 1610977
URL: http://svn.apache.org/r1610977
Log:
source cleanup in latest eclipse, using Pivot profile
Modified:
pivot/branches/2.0.x/core/src/org/apache/pivot/beans/BeanAdapter.java
pivot/branches/2.0.x/core/src/org/apache/pivot/collections/ArrayAdapter.java
pivot/branches/2.0.x/core/src/org/apache/pivot/collections/EnumList.java
pivot/branches/2.0.x/core/src/org/apache/pivot/serialization/Serializer.java
pivot/branches/2.0.x/core/src/org/apache/pivot/sql/ResultList.java
pivot/branches/2.0.x/core/test/org/apache/pivot/collections/test/ArrayListTest.java
pivot/branches/2.0.x/core/test/org/apache/pivot/collections/test/HashSetTest.java
pivot/branches/2.0.x/core/test/org/apache/pivot/collections/test/LinkedListTest.java
pivot/branches/2.0.x/core/test/org/apache/pivot/json/test/BindTest.java
pivot/branches/2.0.x/core/test/org/apache/pivot/serialization/test/BinarySerializerTest.java
pivot/branches/2.0.x/core/test/org/apache/pivot/serialization/test/CSVSerializerTest.java
pivot/branches/2.0.x/demos-server/src/org/apache/pivot/demos/rest/server/RESTDemoServlet.java
pivot/branches/2.0.x/demos/src/org/apache/pivot/demos/itunes/SearchDemo.java
pivot/branches/2.0.x/demos/src/org/apache/pivot/demos/rest/RESTDemoTest.java
pivot/branches/2.0.x/demos/src/org/apache/pivot/demos/roweditor/AmountBindMapping.java
pivot/branches/2.0.x/demos/src/org/apache/pivot/demos/swing/SwingDemo.java
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/FileBrowserWithCharsetTest.java
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/Pivot694.java
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/Pivot765.java
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/Pivot951.java
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java
pivot/branches/2.0.x/tutorials-server/src/org/apache/pivot/tutorials/webqueries/server/ExpenseServlet.java
pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/layout/BoxPanes.java
pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/lists/RepeatableListButtons.java
pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/menus/MenuBars.java
pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java
pivot/branches/2.0.x/web-server/src/org/apache/pivot/web/server/ProxyServlet.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Keyboard.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Spinner.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Theme.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Window.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuBarItemDataRenderer.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewCheckboxCellRenderer.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/effects/DropShadowDecorator.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/media/Drawing.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/CalendarSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/CheckboxSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ColorChooserSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/FileBrowserSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/FillPaneSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/PushButtonSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/RadioButtonSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/FloatValidator.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/IntRangeValidator.java
Modified: pivot/branches/2.0.x/core/src/org/apache/pivot/beans/BeanAdapter.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/src/org/apache/pivot/beans/BeanAdapter.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/core/src/org/apache/pivot/beans/BeanAdapter.java (original)
+++ pivot/branches/2.0.x/core/src/org/apache/pivot/beans/BeanAdapter.java Wed Jul 16 12:24:45 2014
@@ -389,8 +389,9 @@ public class BeanAdapter implements Map<
put(key, valueMap.get(key));
}
catch (PropertyNotFoundException ex) {
- if (!ignoreErrors)
+ if (!ignoreErrors) {
throw ex;
+ }
anyErrors = true;
}
}
Modified: pivot/branches/2.0.x/core/src/org/apache/pivot/collections/ArrayAdapter.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/src/org/apache/pivot/collections/ArrayAdapter.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/core/src/org/apache/pivot/collections/ArrayAdapter.java (original)
+++ pivot/branches/2.0.x/core/src/org/apache/pivot/collections/ArrayAdapter.java Wed Jul 16 12:24:45 2014
@@ -18,8 +18,6 @@ package org.apache.pivot.collections;
import java.io.Serializable;
-import org.apache.pivot.collections.Sequence;
-
/**
* Implementation of the {@link Sequence} interface that wraps an array.
*/
Modified: pivot/branches/2.0.x/core/src/org/apache/pivot/collections/EnumList.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/src/org/apache/pivot/collections/EnumList.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/core/src/org/apache/pivot/collections/EnumList.java (original)
+++ pivot/branches/2.0.x/core/src/org/apache/pivot/collections/EnumList.java Wed Jul 16 12:24:45 2014
@@ -22,9 +22,6 @@ import java.util.Comparator;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.pivot.collections.List;
-import org.apache.pivot.collections.ListListener;
-import org.apache.pivot.collections.Sequence;
import org.apache.pivot.util.ListenerList;
/**
Modified: pivot/branches/2.0.x/core/src/org/apache/pivot/serialization/Serializer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/src/org/apache/pivot/serialization/Serializer.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/core/src/org/apache/pivot/serialization/Serializer.java (original)
+++ pivot/branches/2.0.x/core/src/org/apache/pivot/serialization/Serializer.java Wed Jul 16 12:24:45 2014
@@ -16,9 +16,9 @@
*/
package org.apache.pivot.serialization;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.IOException;
/**
* Defines an interface for writing objects to and reading objects from a data
Modified: pivot/branches/2.0.x/core/src/org/apache/pivot/sql/ResultList.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/src/org/apache/pivot/sql/ResultList.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/core/src/org/apache/pivot/sql/ResultList.java (original)
+++ pivot/branches/2.0.x/core/src/org/apache/pivot/sql/ResultList.java Wed Jul 16 12:24:45 2014
@@ -23,8 +23,8 @@ import java.util.Date;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.ArrayAdapter;
+import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.HashMap;
import org.apache.pivot.collections.List;
import org.apache.pivot.collections.ListListener;
Modified: pivot/branches/2.0.x/core/test/org/apache/pivot/collections/test/ArrayListTest.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/test/org/apache/pivot/collections/test/ArrayListTest.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/core/test/org/apache/pivot/collections/test/ArrayListTest.java (original)
+++ pivot/branches/2.0.x/core/test/org/apache/pivot/collections/test/ArrayListTest.java Wed Jul 16 12:24:45 2014
@@ -16,7 +16,10 @@
*/
package org.apache.pivot.collections.test;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.List;
Modified: pivot/branches/2.0.x/core/test/org/apache/pivot/collections/test/HashSetTest.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/test/org/apache/pivot/collections/test/HashSetTest.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/core/test/org/apache/pivot/collections/test/HashSetTest.java (original)
+++ pivot/branches/2.0.x/core/test/org/apache/pivot/collections/test/HashSetTest.java Wed Jul 16 12:24:45 2014
@@ -16,7 +16,10 @@
*/
package org.apache.pivot.collections.test;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Iterator;
Modified: pivot/branches/2.0.x/core/test/org/apache/pivot/collections/test/LinkedListTest.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/test/org/apache/pivot/collections/test/LinkedListTest.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/core/test/org/apache/pivot/collections/test/LinkedListTest.java (original)
+++ pivot/branches/2.0.x/core/test/org/apache/pivot/collections/test/LinkedListTest.java Wed Jul 16 12:24:45 2014
@@ -16,7 +16,10 @@
*/
package org.apache.pivot.collections.test;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.util.Comparator;
import java.util.ConcurrentModificationException;
Modified: pivot/branches/2.0.x/core/test/org/apache/pivot/json/test/BindTest.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/test/org/apache/pivot/json/test/BindTest.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/core/test/org/apache/pivot/json/test/BindTest.java (original)
+++ pivot/branches/2.0.x/core/test/org/apache/pivot/json/test/BindTest.java Wed Jul 16 12:24:45 2014
@@ -16,7 +16,9 @@
*/
package org.apache.pivot.json.test;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.io.StringReader;
Modified: pivot/branches/2.0.x/core/test/org/apache/pivot/serialization/test/BinarySerializerTest.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/test/org/apache/pivot/serialization/test/BinarySerializerTest.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/core/test/org/apache/pivot/serialization/test/BinarySerializerTest.java (original)
+++ pivot/branches/2.0.x/core/test/org/apache/pivot/serialization/test/BinarySerializerTest.java Wed Jul 16 12:24:45 2014
@@ -16,6 +16,9 @@
*/
package org.apache.pivot.serialization.test;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.fail;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -23,9 +26,6 @@ import org.apache.pivot.serialization.Bi
import org.apache.pivot.serialization.Serializer;
import org.junit.Test;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.fail;
-
public class BinarySerializerTest {
@Test
public void testBinarySerializer() {
Modified: pivot/branches/2.0.x/core/test/org/apache/pivot/serialization/test/CSVSerializerTest.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/test/org/apache/pivot/serialization/test/CSVSerializerTest.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/core/test/org/apache/pivot/serialization/test/CSVSerializerTest.java (original)
+++ pivot/branches/2.0.x/core/test/org/apache/pivot/serialization/test/CSVSerializerTest.java Wed Jul 16 12:24:45 2014
@@ -16,6 +16,8 @@
*/
package org.apache.pivot.serialization.test;
+import static org.junit.Assert.assertEquals;
+
import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
@@ -24,14 +26,11 @@ import org.apache.pivot.collections.Arra
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.HashMap;
import org.apache.pivot.collections.List;
-import org.apache.pivot.serialization.CSVSerializerListener;
import org.apache.pivot.serialization.CSVSerializer;
+import org.apache.pivot.serialization.CSVSerializerListener;
import org.apache.pivot.serialization.SerializationException;
-
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
public class CSVSerializerTest {
@Test
@SuppressWarnings("unchecked")
Modified: pivot/branches/2.0.x/demos-server/src/org/apache/pivot/demos/rest/server/RESTDemoServlet.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/demos-server/src/org/apache/pivot/demos/rest/server/RESTDemoServlet.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/demos-server/src/org/apache/pivot/demos/rest/server/RESTDemoServlet.java (original)
+++ pivot/branches/2.0.x/demos-server/src/org/apache/pivot/demos/rest/server/RESTDemoServlet.java Wed Jul 16 12:24:45 2014
@@ -27,8 +27,8 @@ import org.apache.pivot.json.JSONSeriali
import org.apache.pivot.serialization.SerializationException;
import org.apache.pivot.serialization.Serializer;
import org.apache.pivot.web.Query;
-import org.apache.pivot.web.QueryException;
import org.apache.pivot.web.Query.Method;
+import org.apache.pivot.web.QueryException;
import org.apache.pivot.web.server.QueryServlet;
public class RESTDemoServlet extends QueryServlet {
@@ -132,8 +132,9 @@ public class RESTDemoServlet extends Que
}
boolean deleted = file.delete();
- if (!deleted)
+ if (!deleted) {
throw new QueryException(Query.Status.INTERNAL_SERVER_ERROR);
+ }
}
@Override
Modified: pivot/branches/2.0.x/demos/src/org/apache/pivot/demos/itunes/SearchDemo.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/demos/src/org/apache/pivot/demos/itunes/SearchDemo.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/demos/src/org/apache/pivot/demos/itunes/SearchDemo.java (original)
+++ pivot/branches/2.0.x/demos/src/org/apache/pivot/demos/itunes/SearchDemo.java Wed Jul 16 12:24:45 2014
@@ -30,9 +30,9 @@ import org.apache.pivot.util.concurrent.
import org.apache.pivot.web.GetQuery;
import org.apache.pivot.wtk.ActivityIndicator;
import org.apache.pivot.wtk.Application;
+import org.apache.pivot.wtk.BoxPane;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
-import org.apache.pivot.wtk.BoxPane;
import org.apache.pivot.wtk.ImageView;
import org.apache.pivot.wtk.Label;
import org.apache.pivot.wtk.PushButton;
Modified: pivot/branches/2.0.x/demos/src/org/apache/pivot/demos/rest/RESTDemoTest.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/demos/src/org/apache/pivot/demos/rest/RESTDemoTest.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/demos/src/org/apache/pivot/demos/rest/RESTDemoTest.java (original)
+++ pivot/branches/2.0.x/demos/src/org/apache/pivot/demos/rest/RESTDemoTest.java Wed Jul 16 12:24:45 2014
@@ -16,6 +16,10 @@
*/
package org.apache.pivot.demos.rest;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
import java.io.IOException;
import java.net.URL;
@@ -31,10 +35,6 @@ import org.apache.pivot.web.QueryExcepti
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
public class RESTDemoTest {
private static String hostname = null;
private static int port = -1;
Modified: pivot/branches/2.0.x/demos/src/org/apache/pivot/demos/roweditor/AmountBindMapping.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/demos/src/org/apache/pivot/demos/roweditor/AmountBindMapping.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/demos/src/org/apache/pivot/demos/roweditor/AmountBindMapping.java (original)
+++ pivot/branches/2.0.x/demos/src/org/apache/pivot/demos/roweditor/AmountBindMapping.java Wed Jul 16 12:24:45 2014
@@ -32,8 +32,9 @@ public class AmountBindMapping implement
@Override
public Object valueOf(String text) {
// in case of an empty string to validate, return a default value, to avoid an NPE
- if (text.length() < 1)
+ if (text.length() < 1) {
return "";
+ }
try {
return FORMAT.parse(text);
Modified: pivot/branches/2.0.x/demos/src/org/apache/pivot/demos/swing/SwingDemo.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/demos/src/org/apache/pivot/demos/swing/SwingDemo.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/demos/src/org/apache/pivot/demos/swing/SwingDemo.java (original)
+++ pivot/branches/2.0.x/demos/src/org/apache/pivot/demos/swing/SwingDemo.java Wed Jul 16 12:24:45 2014
@@ -24,9 +24,9 @@ import javax.swing.ButtonGroup;
import javax.swing.JApplet;
import javax.swing.JButton;
import javax.swing.JCheckBox;
-import javax.swing.JInternalFrame;
import javax.swing.JDesktopPane;
import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
import javax.swing.JLabel;
import javax.swing.JProgressBar;
import javax.swing.JRadioButton;
Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/FileBrowserWithCharsetTest.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/FileBrowserWithCharsetTest.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/FileBrowserWithCharsetTest.java (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/FileBrowserWithCharsetTest.java Wed Jul 16 12:24:45 2014
@@ -61,8 +61,9 @@ public class FileBrowserWithCharsetTest
choices.add("US-ASCII");
choices.add(defaultCS.name());
choices.add("ISO-8859-1");
- if (!"UTF-8".equals(defaultCS.name()))
+ if (!"UTF-8".equals(defaultCS.name())) {
choices.add("UTF-8");
+ }
lb.setListData(choices);
lb.setSelectedIndex(1);
@@ -85,7 +86,7 @@ public class FileBrowserWithCharsetTest
button.getButtonPressListeners().add(new ButtonPressListener() {
@Override
public void buttonPressed(Button buttonArgument) {
- final Window window = FileBrowserWithCharsetTest.getActiveWindow();
+ final Window window = Window.getActiveWindow();
final FileBrowserSheet fileBrowserSheet = new FileBrowserWithCharsetTest(FileBrowserSheet.Mode.OPEN);
fileBrowserSheet.open(window, new SheetCloseListener() {
Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/Pivot694.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/Pivot694.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/Pivot694.java (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/Pivot694.java Wed Jul 16 12:24:45 2014
@@ -191,8 +191,9 @@ public class Pivot694 extends Applicatio
}
protected static final void clearComponent(Component component) {
- if (component == null)
+ if (component == null) {
throw new IllegalArgumentException();
+ }
component.clear();
component.repaint();
Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/Pivot765.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/Pivot765.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/Pivot765.java (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/Pivot765.java Wed Jul 16 12:24:45 2014
@@ -57,9 +57,10 @@ public class Pivot765 extends Applicatio
@Override
public void windowOpened(Window windowArgument) {
- if (!menuPopulated)
+ if (!menuPopulated) {
Alert.alert("Window was opened before the menu was populated." +
"Either previewWindowOpen threw an exception, or it wasn't called before the Window was opened.", windowArgument);
+ }
}
@Override
Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/Pivot951.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/Pivot951.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/Pivot951.java (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/Pivot951.java Wed Jul 16 12:24:45 2014
@@ -45,7 +45,7 @@ public class Pivot951 extends Applicatio
return true;
}
});
-
+
window.setContent(brd);
window.setTitle("Pivot951: Cannot click twice");
window.setMaximized(true);
Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java Wed Jul 16 12:24:45 2014
@@ -27,6 +27,7 @@ import org.apache.pivot.beans.BXMLSerial
import org.apache.pivot.collections.Map;
import org.apache.pivot.util.concurrent.TaskExecutionException;
import org.apache.pivot.wtk.Application;
+import org.apache.pivot.wtk.ApplicationContext;
import org.apache.pivot.wtk.CardPane;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.DesktopApplicationContext;
@@ -62,7 +63,7 @@ public class Pivot894 extends Applicatio
final Window window = new Window(cardPane);
window.open(display);
- DesktopApplicationContext.scheduleRecurringCallback(new Runnable() {
+ ApplicationContext.scheduleRecurringCallback(new Runnable() {
@Override
public void run() {
Thread.currentThread().setName("switcher-thread");
Modified: pivot/branches/2.0.x/tutorials-server/src/org/apache/pivot/tutorials/webqueries/server/ExpenseServlet.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tutorials-server/src/org/apache/pivot/tutorials/webqueries/server/ExpenseServlet.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/tutorials-server/src/org/apache/pivot/tutorials/webqueries/server/ExpenseServlet.java (original)
+++ pivot/branches/2.0.x/tutorials-server/src/org/apache/pivot/tutorials/webqueries/server/ExpenseServlet.java Wed Jul 16 12:24:45 2014
@@ -30,8 +30,8 @@ import org.apache.pivot.serialization.CS
import org.apache.pivot.serialization.SerializationException;
import org.apache.pivot.serialization.Serializer;
import org.apache.pivot.web.Query;
-import org.apache.pivot.web.QueryException;
import org.apache.pivot.web.Query.Method;
+import org.apache.pivot.web.QueryException;
import org.apache.pivot.web.server.QueryServlet;
public class ExpenseServlet extends QueryServlet {
Modified: pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/layout/BoxPanes.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/layout/BoxPanes.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/layout/BoxPanes.java (original)
+++ pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/layout/BoxPanes.java Wed Jul 16 12:24:45 2014
@@ -21,10 +21,10 @@ import java.net.URL;
import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.Map;
import org.apache.pivot.util.Resources;
+import org.apache.pivot.wtk.BoxPane;
import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.ButtonStateListener;
import org.apache.pivot.wtk.Checkbox;
-import org.apache.pivot.wtk.BoxPane;
import org.apache.pivot.wtk.HorizontalAlignment;
import org.apache.pivot.wtk.Orientation;
import org.apache.pivot.wtk.RadioButton;
Modified: pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/lists/RepeatableListButtons.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/lists/RepeatableListButtons.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/lists/RepeatableListButtons.java (original)
+++ pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/lists/RepeatableListButtons.java Wed Jul 16 12:24:45 2014
@@ -26,12 +26,12 @@ import org.apache.pivot.util.Resources;
import org.apache.pivot.wtk.Action;
import org.apache.pivot.wtk.BoxPane;
import org.apache.pivot.wtk.Button;
+import org.apache.pivot.wtk.Button.State;
import org.apache.pivot.wtk.ButtonStateListener;
import org.apache.pivot.wtk.Checkbox;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.ListButton;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtk.Button.State;
import org.apache.pivot.wtk.content.ColorItem;
public class RepeatableListButtons extends Window implements Bindable {
Modified: pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/menus/MenuBars.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/menus/MenuBars.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/menus/MenuBars.java (original)
+++ pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/menus/MenuBars.java Wed Jul 16 12:24:45 2014
@@ -34,8 +34,8 @@ import org.apache.pivot.wtk.MenuBar;
import org.apache.pivot.wtk.MenuHandler;
import org.apache.pivot.wtk.TabPane;
import org.apache.pivot.wtk.TextInput;
-import org.apache.pivot.wtk.TextInputSelectionListener;
import org.apache.pivot.wtk.TextInputContentListener;
+import org.apache.pivot.wtk.TextInputSelectionListener;
public class MenuBars extends Frame implements Bindable {
@BXML private FileBrowserSheet fileBrowserSheet;
Modified: pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java (original)
+++ pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java Wed Jul 16 12:24:45 2014
@@ -22,10 +22,10 @@ import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.Map;
import org.apache.pivot.util.Resources;
import org.apache.pivot.util.Vote;
+import org.apache.pivot.wtk.BoxPane;
import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.ButtonStateListener;
import org.apache.pivot.wtk.Checkbox;
-import org.apache.pivot.wtk.BoxPane;
import org.apache.pivot.wtk.Orientation;
import org.apache.pivot.wtk.Prompt;
import org.apache.pivot.wtk.RadioButton;
Modified: pivot/branches/2.0.x/web-server/src/org/apache/pivot/web/server/ProxyServlet.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/web-server/src/org/apache/pivot/web/server/ProxyServlet.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/web-server/src/org/apache/pivot/web/server/ProxyServlet.java (original)
+++ pivot/branches/2.0.x/web-server/src/org/apache/pivot/web/server/ProxyServlet.java Wed Jul 16 12:24:45 2014
@@ -25,6 +25,7 @@ import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Enumeration;
+
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java Wed Jul 16 12:24:45 2014
@@ -23,6 +23,7 @@ import java.awt.GradientPaint;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.geom.GeneralPath;
+import java.awt.geom.Path2D;
import java.awt.geom.RoundRectangle2D;
import java.util.Locale;
@@ -317,7 +318,7 @@ public class TerraCalendarButtonSkin ext
RenderingHints.VALUE_ANTIALIAS_OFF);
// Paint the trigger
- GeneralPath triggerIconShape = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
+ GeneralPath triggerIconShape = new GeneralPath(Path2D.WIND_EVEN_ODD);
triggerIconShape.moveTo(0, 0);
triggerIconShape.lineTo(3, 3);
triggerIconShape.lineTo(6, 0);
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java Wed Jul 16 12:24:45 2014
@@ -23,6 +23,7 @@ import java.awt.GradientPaint;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.geom.GeneralPath;
+import java.awt.geom.Path2D;
import java.awt.geom.RoundRectangle2D;
import org.apache.pivot.collections.Dictionary;
@@ -325,7 +326,7 @@ public class TerraColorChooserButtonSkin
RenderingHints.VALUE_ANTIALIAS_OFF);
// Paint the trigger
- GeneralPath triggerIconShape = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
+ GeneralPath triggerIconShape = new GeneralPath(Path2D.WIND_EVEN_ODD);
triggerIconShape.moveTo(0, 0);
triggerIconShape.lineTo(3, 3);
triggerIconShape.lineTo(6, 0);
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java Wed Jul 16 12:24:45 2014
@@ -27,9 +27,9 @@ import org.apache.pivot.wtk.DialogStateL
import org.apache.pivot.wtk.Dimensions;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Keyboard;
+import org.apache.pivot.wtk.Keyboard.KeyCode;
import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtk.Keyboard.KeyCode;
/**
* Dialog skin.
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java Wed Jul 16 12:24:45 2014
@@ -22,6 +22,7 @@ import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.geom.AffineTransform;
import java.awt.geom.GeneralPath;
+import java.awt.geom.Path2D;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.Dictionary;
@@ -68,7 +69,7 @@ public class TerraFormSkin extends Conta
@Override
public void update() {
- GeneralPath arrow = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
+ GeneralPath arrow = new GeneralPath(Path2D.WIND_EVEN_ODD);
arrow.moveTo(POPUP_FIELD_INDICATOR_OFFSET, 0);
arrow.lineTo(POPUP_FIELD_INDICATOR_OFFSET + POPUP_FIELD_INDICATOR_WIDTH / 2, -POPUP_FIELD_INDICATOR_HEIGHT);
arrow.lineTo(POPUP_FIELD_INDICATOR_OFFSET + POPUP_FIELD_INDICATOR_WIDTH, 0);
@@ -176,7 +177,7 @@ public class TerraFormSkin extends Conta
flagMessageLabel.paint(graphics);
// Draw the arrow
- GeneralPath arrow = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
+ GeneralPath arrow = new GeneralPath(Path2D.WIND_EVEN_ODD);
arrow.moveTo(0, 0);
arrow.lineTo(-INLINE_FIELD_INDICATOR_WIDTH, (float)flagMessageLabel.getHeight() / 2);
arrow.lineTo(0, flagMessageLabel.getHeight());
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java Wed Jul 16 12:24:45 2014
@@ -24,6 +24,7 @@ import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.geom.GeneralPath;
import java.awt.geom.Line2D;
+import java.awt.geom.Path2D;
import java.awt.geom.RoundRectangle2D;
import org.apache.pivot.collections.Dictionary;
@@ -387,7 +388,7 @@ public class TerraListButtonSkin extends
RenderingHints.VALUE_ANTIALIAS_OFF);
// Paint the trigger
- GeneralPath triggerIconShape = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
+ GeneralPath triggerIconShape = new GeneralPath(Path2D.WIND_EVEN_ODD);
triggerIconShape.moveTo(0, 0);
triggerIconShape.lineTo(3, 3);
triggerIconShape.lineTo(6, 0);
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java Wed Jul 16 12:24:45 2014
@@ -23,6 +23,7 @@ import java.awt.GradientPaint;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.geom.GeneralPath;
+import java.awt.geom.Path2D;
import java.awt.geom.RoundRectangle2D;
import org.apache.pivot.collections.Dictionary;
@@ -318,7 +319,7 @@ public class TerraMenuButtonSkin extends
RenderingHints.VALUE_ANTIALIAS_OFF);
// Paint the trigger
- GeneralPath triggerIconShape = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
+ GeneralPath triggerIconShape = new GeneralPath(Path2D.WIND_EVEN_ODD);
triggerIconShape.moveTo(0, 0);
triggerIconShape.lineTo(3, 3);
triggerIconShape.lineTo(6, 0);
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java Wed Jul 16 12:24:45 2014
@@ -27,6 +27,7 @@ import org.apache.pivot.wtk.ContainerMou
import org.apache.pivot.wtk.Dimensions;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Keyboard;
+import org.apache.pivot.wtk.Keyboard.KeyCode;
import org.apache.pivot.wtk.Menu;
import org.apache.pivot.wtk.MenuItemSelectionListener;
import org.apache.pivot.wtk.MenuPopup;
@@ -37,7 +38,6 @@ import org.apache.pivot.wtk.Panorama;
import org.apache.pivot.wtk.Point;
import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtk.Keyboard.KeyCode;
import org.apache.pivot.wtk.effects.DropShadowDecorator;
import org.apache.pivot.wtk.effects.Transition;
import org.apache.pivot.wtk.effects.TransitionListener;
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java Wed Jul 16 12:24:45 2014
@@ -22,6 +22,7 @@ import java.awt.GradientPaint;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.geom.GeneralPath;
+import java.awt.geom.Path2D;
import org.apache.pivot.wtk.ApplicationContext;
import org.apache.pivot.wtk.Component;
@@ -355,7 +356,7 @@ public class TerraScrollBarSkin extends
graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
- GeneralPath arrow = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
+ GeneralPath arrow = new GeneralPath(Path2D.WIND_EVEN_ODD);
if (scrollBar.getOrientation() == Orientation.HORIZONTAL) {
arrow.moveTo(width + 0.5f, 0);
@@ -385,7 +386,7 @@ public class TerraScrollBarSkin extends
graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
- GeneralPath arrow = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
+ GeneralPath arrow = new GeneralPath(Path2D.WIND_EVEN_ODD);
if (scrollBar.getOrientation() == Orientation.HORIZONTAL) {
arrow.moveTo(0, 0);
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java Wed Jul 16 12:24:45 2014
@@ -34,15 +34,15 @@ import org.apache.pivot.wtk.GraphicsUtil
import org.apache.pivot.wtk.ImageView;
import org.apache.pivot.wtk.Insets;
import org.apache.pivot.wtk.Keyboard;
+import org.apache.pivot.wtk.Keyboard.KeyCode;
import org.apache.pivot.wtk.Mouse;
+import org.apache.pivot.wtk.Mouse.Button;
import org.apache.pivot.wtk.Orientation;
import org.apache.pivot.wtk.Point;
import org.apache.pivot.wtk.Sheet;
import org.apache.pivot.wtk.SheetStateListener;
import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtk.Keyboard.KeyCode;
-import org.apache.pivot.wtk.Mouse.Button;
import org.apache.pivot.wtk.effects.DropShadowDecorator;
import org.apache.pivot.wtk.effects.Transition;
import org.apache.pivot.wtk.effects.TransitionListener;
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java Wed Jul 16 12:24:45 2014
@@ -26,12 +26,12 @@ import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Dimensions;
import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.Keyboard;
+import org.apache.pivot.wtk.Keyboard.KeyCode;
import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.Orientation;
import org.apache.pivot.wtk.Point;
import org.apache.pivot.wtk.Slider;
import org.apache.pivot.wtk.Theme;
-import org.apache.pivot.wtk.Keyboard.KeyCode;
import org.apache.pivot.wtk.skin.ComponentSkin;
import org.apache.pivot.wtk.skin.SliderSkin;
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java Wed Jul 16 12:24:45 2014
@@ -32,6 +32,8 @@ import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.FocusTraversalDirection;
import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.Keyboard;
+import org.apache.pivot.wtk.Keyboard.KeyCode;
+import org.apache.pivot.wtk.Keyboard.Modifier;
import org.apache.pivot.wtk.ListView;
import org.apache.pivot.wtk.ListViewSelectionListener;
import org.apache.pivot.wtk.Mouse;
@@ -44,8 +46,6 @@ import org.apache.pivot.wtk.SuggestionPo
import org.apache.pivot.wtk.TextInput;
import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtk.Keyboard.KeyCode;
-import org.apache.pivot.wtk.Keyboard.Modifier;
import org.apache.pivot.wtk.effects.DropShadowDecorator;
import org.apache.pivot.wtk.effects.Transition;
import org.apache.pivot.wtk.effects.TransitionListener;
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java Wed Jul 16 12:24:45 2014
@@ -40,10 +40,10 @@ import org.apache.pivot.wtk.SortDirectio
import org.apache.pivot.wtk.TableView;
import org.apache.pivot.wtk.TableViewColumnListener;
import org.apache.pivot.wtk.TableViewHeader;
+import org.apache.pivot.wtk.TableViewHeader.SortMode;
import org.apache.pivot.wtk.TableViewHeaderListener;
import org.apache.pivot.wtk.TableViewSortListener;
import org.apache.pivot.wtk.Theme;
-import org.apache.pivot.wtk.TableViewHeader.SortMode;
import org.apache.pivot.wtk.media.Image;
import org.apache.pivot.wtk.skin.ComponentSkin;
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ApplicationContext.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ApplicationContext.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ApplicationContext.java Wed Jul 16 12:24:45 2014
@@ -879,15 +879,15 @@ public abstract class ApplicationContext
int mouseButtons = 0x00;
int modifiersEx = event.getModifiersEx();
- if ((modifiersEx & MouseEvent.BUTTON1_DOWN_MASK) > 0) {
+ if ((modifiersEx & InputEvent.BUTTON1_DOWN_MASK) > 0) {
mouseButtons |= Mouse.Button.LEFT.getMask();
}
- if ((modifiersEx & MouseEvent.BUTTON2_DOWN_MASK) > 0) {
+ if ((modifiersEx & InputEvent.BUTTON2_DOWN_MASK) > 0) {
mouseButtons |= Mouse.Button.MIDDLE.getMask();
}
- if ((modifiersEx & MouseEvent.BUTTON3_DOWN_MASK) > 0) {
+ if ((modifiersEx & InputEvent.BUTTON3_DOWN_MASK) > 0) {
mouseButtons |= Mouse.Button.RIGHT.getMask();
}
@@ -1338,22 +1338,22 @@ public abstract class ApplicationContext
// Set the keyboard modifier state
int keyboardModifiers = 0;
- if ((modifiersEx & KeyEvent.SHIFT_DOWN_MASK) > 0) {
+ if ((modifiersEx & InputEvent.SHIFT_DOWN_MASK) > 0) {
keyboardModifiers |= Keyboard.Modifier.SHIFT.getMask();
}
// Ignore Control when Alt-Graphics is pressed
- if ((modifiersEx & KeyEvent.CTRL_DOWN_MASK) > 0
- && ((modifiersEx & KeyEvent.ALT_DOWN_MASK) == 0
+ if ((modifiersEx & InputEvent.CTRL_DOWN_MASK) > 0
+ && ((modifiersEx & InputEvent.ALT_DOWN_MASK) == 0
|| awtKeyLocation == KeyEvent.KEY_LOCATION_RIGHT)) {
keyboardModifiers |= Keyboard.Modifier.CTRL.getMask();
}
- if ((modifiersEx & KeyEvent.ALT_DOWN_MASK) > 0) {
+ if ((modifiersEx & InputEvent.ALT_DOWN_MASK) > 0) {
keyboardModifiers |= Keyboard.Modifier.ALT.getMask();
}
- if ((modifiersEx & KeyEvent.META_DOWN_MASK) > 0) {
+ if ((modifiersEx & InputEvent.META_DOWN_MASK) > 0) {
keyboardModifiers |= Keyboard.Modifier.META.getMask();
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Keyboard.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Keyboard.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Keyboard.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Keyboard.java Wed Jul 16 12:24:45 2014
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.wtk;
+import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.lang.reflect.Field;
import java.util.Locale;
@@ -98,23 +99,23 @@ public final class Keyboard {
int awtModifiers = 0x00;
if (((modifiersLocal & Modifier.META.getMask()) > 0)) {
- awtModifiers |= KeyEvent.META_DOWN_MASK;
+ awtModifiers |= InputEvent.META_DOWN_MASK;
}
if (((modifiersLocal & Modifier.CTRL.getMask()) > 0)) {
- awtModifiers |= KeyEvent.CTRL_DOWN_MASK;
+ awtModifiers |= InputEvent.CTRL_DOWN_MASK;
}
if (((modifiersLocal & Modifier.ALT.getMask()) > 0)) {
- awtModifiers |= KeyEvent.ALT_DOWN_MASK;
+ awtModifiers |= InputEvent.ALT_DOWN_MASK;
}
if (((modifiersLocal & Modifier.SHIFT.getMask()) > 0)) {
- awtModifiers |= KeyEvent.SHIFT_DOWN_MASK;
+ awtModifiers |= InputEvent.SHIFT_DOWN_MASK;
}
if (awtModifiers != 0x00) {
- return KeyEvent.getModifiersExText(awtModifiers) + Platform.getKeyStrokeModifierSeparator()
+ return InputEvent.getModifiersExText(awtModifiers) + Platform.getKeyStrokeModifierSeparator()
+ KeyEvent.getKeyText(keyCode);
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Spinner.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Spinner.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Spinner.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Spinner.java Wed Jul 16 12:24:45 2014
@@ -20,10 +20,10 @@ import java.util.Comparator;
import org.apache.pivot.beans.DefaultProperty;
import org.apache.pivot.collections.ArrayList;
-import org.apache.pivot.collections.immutable.ImmutableList;
import org.apache.pivot.collections.List;
import org.apache.pivot.collections.ListListener;
import org.apache.pivot.collections.Sequence;
+import org.apache.pivot.collections.immutable.ImmutableList;
import org.apache.pivot.json.JSON;
import org.apache.pivot.json.JSONSerializer;
import org.apache.pivot.serialization.SerializationException;
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Theme.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Theme.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Theme.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Theme.java Wed Jul 16 12:24:45 2014
@@ -38,8 +38,8 @@ import org.apache.pivot.wtk.skin.Separat
import org.apache.pivot.wtk.skin.StackPaneSkin;
import org.apache.pivot.wtk.skin.TablePaneFillerSkin;
import org.apache.pivot.wtk.skin.TablePaneSkin;
-import org.apache.pivot.wtk.skin.TextPaneSkin;
import org.apache.pivot.wtk.skin.TextAreaSkin;
+import org.apache.pivot.wtk.skin.TextPaneSkin;
import org.apache.pivot.wtk.skin.WindowSkin;
/**
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Window.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Window.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Window.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Window.java Wed Jul 16 12:24:45 2014
@@ -946,8 +946,9 @@ public class Window extends Container {
* Clears the active window.
*/
public static void clearActive() {
- if (activeWindow != null)
+ if (activeWindow != null) {
setActiveWindow(activeWindow.owner);
+ }
}
/**
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuBarItemDataRenderer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuBarItemDataRenderer.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuBarItemDataRenderer.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuBarItemDataRenderer.java Wed Jul 16 12:24:45 2014
@@ -19,8 +19,8 @@ package org.apache.pivot.wtk.content;
import java.awt.Color;
import java.awt.Font;
-import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.BoxPane;
+import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.HorizontalAlignment;
import org.apache.pivot.wtk.ImageView;
import org.apache.pivot.wtk.Insets;
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewCheckboxCellRenderer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewCheckboxCellRenderer.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewCheckboxCellRenderer.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewCheckboxCellRenderer.java Wed Jul 16 12:24:45 2014
@@ -16,9 +16,9 @@
*/
package org.apache.pivot.wtk.content;
+import org.apache.pivot.wtk.BoxPane;
import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.Checkbox;
-import org.apache.pivot.wtk.BoxPane;
import org.apache.pivot.wtk.HorizontalAlignment;
import org.apache.pivot.wtk.TableView;
import org.apache.pivot.wtk.VerticalAlignment;
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/effects/DropShadowDecorator.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/effects/DropShadowDecorator.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/effects/DropShadowDecorator.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/effects/DropShadowDecorator.java Wed Jul 16 12:24:45 2014
@@ -189,8 +189,9 @@ public class DropShadowDecorator impleme
// Avoid drawing shadow if it will be covered by the component itself:
Bounds paintBounds = new Bounds(0, 0, width, height);
- if (!component.isOpaque() || !paintBounds.contains(new Bounds(graphics.getClipBounds())))
+ if (!component.isOpaque() || !paintBounds.contains(new Bounds(graphics.getClipBounds()))) {
graphics.drawImage(shadowImage, xOffset - blurRadius, yOffset - blurRadius, null);
+ }
} else {
shadowImage = null;
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/media/Drawing.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/media/Drawing.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/media/Drawing.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/media/Drawing.java Wed Jul 16 12:24:45 2014
@@ -19,8 +19,6 @@ package org.apache.pivot.wtk.media;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
-import org.apache.pivot.wtk.media.Image;
-
import com.kitfox.svg.SVGDiagram;
import com.kitfox.svg.SVGElementException;
import com.kitfox.svg.SVGException;
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/CalendarSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/CalendarSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/CalendarSkin.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/CalendarSkin.java Wed Jul 16 12:24:45 2014
@@ -20,7 +20,6 @@ import org.apache.pivot.wtk.Calendar;
import org.apache.pivot.wtk.CalendarListener;
import org.apache.pivot.wtk.CalendarSelectionListener;
import org.apache.pivot.wtk.Component;
-import org.apache.pivot.wtk.skin.ContainerSkin;
/**
* Abstract base class for calendar skins.
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/CheckboxSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/CheckboxSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/CheckboxSkin.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/CheckboxSkin.java Wed Jul 16 12:24:45 2014
@@ -19,8 +19,8 @@ package org.apache.pivot.wtk.skin;
import org.apache.pivot.wtk.Checkbox;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Keyboard;
-import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.Keyboard.KeyCode;
+import org.apache.pivot.wtk.Mouse;
/**
* Abstract base class for checkbox skins.
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java Wed Jul 16 12:24:45 2014
@@ -30,11 +30,11 @@ import org.apache.pivot.wtk.ContainerMou
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.FocusTraversalDirection;
import org.apache.pivot.wtk.Keyboard;
+import org.apache.pivot.wtk.Keyboard.KeyCode;
+import org.apache.pivot.wtk.Keyboard.Modifier;
import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.WindowStateListener;
-import org.apache.pivot.wtk.Keyboard.KeyCode;
-import org.apache.pivot.wtk.Keyboard.Modifier;
/**
* Abstract base class for color chooser button skins.
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ColorChooserSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ColorChooserSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ColorChooserSkin.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ColorChooserSkin.java Wed Jul 16 12:24:45 2014
@@ -21,7 +21,6 @@ import java.awt.Color;
import org.apache.pivot.wtk.ColorChooser;
import org.apache.pivot.wtk.ColorChooserSelectionListener;
import org.apache.pivot.wtk.Component;
-import org.apache.pivot.wtk.skin.ContainerSkin;
/**
* Abstract base class for color chooser skins.
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/FileBrowserSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/FileBrowserSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/FileBrowserSkin.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/FileBrowserSkin.java Wed Jul 16 12:24:45 2014
@@ -19,7 +19,6 @@ package org.apache.pivot.wtk.skin;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.FileBrowser;
import org.apache.pivot.wtk.FileBrowserListener;
-import org.apache.pivot.wtk.skin.ContainerSkin;
/**
* Abstract base class for file browser skins.
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/FillPaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/FillPaneSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/FillPaneSkin.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/FillPaneSkin.java Wed Jul 16 12:24:45 2014
@@ -270,17 +270,20 @@ public class FillPaneSkin extends Contai
int width = getWidth();
int height = getHeight();
- if (width <= 0)
+ if (width <= 0) {
width = getPreferredWidth(-1);
- if (height <= 0)
+ }
+ if (height <= 0) {
height = getPreferredHeight(-1);
+ }
Orientation orientation = fillPane.getOrientation();
if (orientation == Orientation.HORIZONTAL) {
// Determine the starting x-coordinate
int x = padding.left;
int totalWidth = width - (padding.left + padding.right);
- if (n > 1)
+ if (n > 1) {
totalWidth -= spacing * (n - 1);
+ }
int dividedWidth = n == 0 ? 0 : totalWidth / n;
int leftoverWidth = totalWidth - (dividedWidth * n);
@@ -290,8 +293,9 @@ public class FillPaneSkin extends Contai
if (component.isVisible()) {
int componentWidth = dividedWidth;
- if (j == n - 1)
+ if (j == n - 1) {
componentWidth += leftoverWidth;
+ }
int componentHeight = Math.max(height - (padding.top
+ padding.bottom), 0);
@@ -311,8 +315,9 @@ public class FillPaneSkin extends Contai
// Determine the starting y-coordinate
int y = padding.top;
int totalHeight = height - (padding.top + padding.bottom);
- if (n > 1)
+ if (n > 1) {
totalHeight -= spacing * (n - 1);
+ }
int dividedHeight = n == 0 ? 0 : totalHeight / n;
int leftoverHeight = totalHeight - (dividedHeight * n);
@@ -322,8 +327,9 @@ public class FillPaneSkin extends Contai
if (component.isVisible()) {
int componentHeight = dividedHeight;
- if (j == n - 1)
+ if (j == n - 1) {
componentHeight += leftoverHeight;
+ }
int componentWidth = Math.max(width - (padding.left
+ padding.right), 0);
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java Wed Jul 16 12:24:45 2014
@@ -22,6 +22,7 @@ import org.apache.pivot.wtk.Container;
import org.apache.pivot.wtk.ContainerMouseListener;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Keyboard;
+import org.apache.pivot.wtk.Keyboard.KeyCode;
import org.apache.pivot.wtk.Menu;
import org.apache.pivot.wtk.MenuButton;
import org.apache.pivot.wtk.MenuButtonListener;
@@ -30,7 +31,6 @@ import org.apache.pivot.wtk.MenuPopupSta
import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.WindowStateListener;
-import org.apache.pivot.wtk.Keyboard.KeyCode;
/**
* Abstract base class for menu button skins.
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/PushButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/PushButtonSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/PushButtonSkin.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/PushButtonSkin.java Wed Jul 16 12:24:45 2014
@@ -18,9 +18,9 @@ package org.apache.pivot.wtk.skin;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Keyboard;
+import org.apache.pivot.wtk.Keyboard.KeyCode;
import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.PushButton;
-import org.apache.pivot.wtk.Keyboard.KeyCode;
/**
* Abstract base class for push button skins.
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/RadioButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/RadioButtonSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/RadioButtonSkin.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/RadioButtonSkin.java Wed Jul 16 12:24:45 2014
@@ -18,9 +18,9 @@ package org.apache.pivot.wtk.skin;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Keyboard;
+import org.apache.pivot.wtk.Keyboard.KeyCode;
import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.RadioButton;
-import org.apache.pivot.wtk.Keyboard.KeyCode;
/**
* Abstract base class for radio button skins.
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java Wed Jul 16 12:24:45 2014
@@ -1533,7 +1533,9 @@ public class TablePaneSkin extends Conta
rowHeightsLocal[i]--;
remainingHeight++;
progress = true;
- if (remainingHeight >= 0) break;
+ if (remainingHeight >= 0) {
+ break;
+ }
}
}
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/FloatValidator.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/FloatValidator.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/FloatValidator.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/FloatValidator.java Wed Jul 16 12:24:45 2014
@@ -34,8 +34,9 @@ public class FloatValidator extends Deci
@Override
public boolean isValid(String text) {
- if (!super.isValid(text))
+ if (!super.isValid(text)) {
return false;
+ }
/*
* DecimalFormat will parse the number as a double. Make sure the
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/IntRangeValidator.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/IntRangeValidator.java?rev=1610977&r1=1610976&r2=1610977&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/IntRangeValidator.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/IntRangeValidator.java Wed Jul 16 12:24:45 2014
@@ -69,8 +69,8 @@ public class IntRangeValidator extends I
boolean valid = false;
if (super.isValid(text)) {
- BigInteger min = BigInteger.valueOf((long)minValue);
- BigInteger max = BigInteger.valueOf((long)maxValue);
+ BigInteger min = BigInteger.valueOf(minValue);
+ BigInteger max = BigInteger.valueOf(maxValue);
BigInteger value = new BigInteger(text);
valid = value.compareTo(min) >= 0 && value.compareTo(max) <= 0;
}