You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by no...@apache.org on 2012/05/12 13:03:29 UTC
svn commit: r1337511 - in /pivot/trunk: core/src/org/apache/pivot/xml/
demos/src/org/apache/pivot/demos/styles/
demos/src/org/apache/pivot/demos/text/
examples/src/org/apache/pivot/examples/builder/
tests/src/org/apache/pivot/tests/ tutorials/src/org/a...
Author: noelgrandin
Date: Sat May 12 11:03:28 2012
New Revision: 1337511
URL: http://svn.apache.org/viewvc?rev=1337511&view=rev
Log:
Cleanup some eclipse warnings
Modified:
pivot/trunk/core/src/org/apache/pivot/xml/XMLSerializer.java
pivot/trunk/demos/src/org/apache/pivot/demos/styles/ColorSchemeBuilderWindow.java
pivot/trunk/demos/src/org/apache/pivot/demos/text/TextPaneDemo.java
pivot/trunk/examples/src/org/apache/pivot/examples/builder/BuilderExample.java
pivot/trunk/tests/src/org/apache/pivot/tests/ColorPaletteTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/TextInputValidatorTest.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/CreateHighlightedXML.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/ComponentInspectorSkin.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java
pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java
Modified: pivot/trunk/core/src/org/apache/pivot/xml/XMLSerializer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/xml/XMLSerializer.java?rev=1337511&r1=1337510&r2=1337511&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/xml/XMLSerializer.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/xml/XMLSerializer.java Sat May 12 11:03:28 2012
@@ -316,7 +316,7 @@ public class XMLSerializer implements Se
}
}
- private void writeTextNode(TextNode textNode, XMLStreamWriter xmlStreamWriter)
+ private static void writeTextNode(TextNode textNode, XMLStreamWriter xmlStreamWriter)
throws XMLStreamException {
xmlStreamWriter.writeCharacters(textNode.getText());
}
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/styles/ColorSchemeBuilderWindow.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/styles/ColorSchemeBuilderWindow.java?rev=1337511&r1=1337510&r2=1337511&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/styles/ColorSchemeBuilderWindow.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/styles/ColorSchemeBuilderWindow.java Sat May 12 11:03:28 2012
@@ -194,7 +194,7 @@ public class ColorSchemeBuilderWindow ex
colorPaletteTablePane.getStyles().put("verticalSpacing", 4);
}
- private Component createColorPaletteCell(int index) {
+ private static Component createColorPaletteCell(int index) {
Border border = new Border();
border.getStyles().put("backgroundColor", index);
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/text/TextPaneDemo.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/text/TextPaneDemo.java?rev=1337511&r1=1337510&r2=1337511&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/text/TextPaneDemo.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/text/TextPaneDemo.java Sat May 12 11:03:28 2012
@@ -460,7 +460,7 @@ public class TextPaneDemo implements App
textPane.setSelection(selectionStart, selectionLength);
}
- private void applyStyleToTextNode(org.apache.pivot.wtk.Span selectionSpan,
+ private static void applyStyleToTextNode(org.apache.pivot.wtk.Span selectionSpan,
StyleApplicator styleApplicator, org.apache.pivot.wtk.text.TextNode textNode,
int characterCount, org.apache.pivot.wtk.Span textSpan) {
if (selectionSpan.contains(textSpan)) {
@@ -525,7 +525,7 @@ public class TextPaneDemo implements App
}
}
- private void applyStyleToSpanNode(org.apache.pivot.wtk.Span selectionSpan,
+ private static void applyStyleToSpanNode(org.apache.pivot.wtk.Span selectionSpan,
StyleApplicator styleApplicator, TextSpan spanNode,
int characterCount, org.apache.pivot.wtk.Span textSpan) {
if (selectionSpan.contains(textSpan)) {
Modified: pivot/trunk/examples/src/org/apache/pivot/examples/builder/BuilderExample.java
URL: http://svn.apache.org/viewvc/pivot/trunk/examples/src/org/apache/pivot/examples/builder/BuilderExample.java?rev=1337511&r1=1337510&r2=1337511&view=diff
==============================================================================
--- pivot/trunk/examples/src/org/apache/pivot/examples/builder/BuilderExample.java (original)
+++ pivot/trunk/examples/src/org/apache/pivot/examples/builder/BuilderExample.java Sat May 12 11:03:28 2012
@@ -50,7 +50,7 @@ public class BuilderExample implements A
public void resume() {
}
- private MyWindow buildWindow() {
+ private static MyWindow buildWindow() {
final HashMap<String, Object> namespace = new HashMap<String, Object>();
return new MyWindow() {
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/ColorPaletteTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/ColorPaletteTest.java?rev=1337511&r1=1337510&r2=1337511&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/ColorPaletteTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/ColorPaletteTest.java Sat May 12 11:03:28 2012
@@ -82,7 +82,7 @@ public class ColorPaletteTest implements
public void resume() {
}
- private Component createCell(int index) {
+ private static Component createCell(int index) {
StackPane stackPane = new StackPane();
Border border = new Border();
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/TextInputValidatorTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/TextInputValidatorTest.java?rev=1337511&r1=1337510&r2=1337511&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/TextInputValidatorTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/TextInputValidatorTest.java Sat May 12 11:03:28 2012
@@ -104,7 +104,7 @@ public class TextInputValidatorTest ext
return false;
}
- public static void main(String[] args) throws Exception {
+ public static void main(String[] args) {
DesktopApplicationContext.main(new String[] { TextInputValidatorTest.class.getName() });
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/CreateHighlightedXML.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/CreateHighlightedXML.java?rev=1337511&r1=1337510&r2=1337511&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/CreateHighlightedXML.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/CreateHighlightedXML.java Sat May 12 11:03:28 2012
@@ -132,7 +132,7 @@ public class CreateHighlightedXML {
return buf.toString();
}
- public static void main(String[] args) throws Exception {
+ public static void main(String[] args) {
DesktopApplicationContext.main(TestApplication.class, args);
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java?rev=1337511&r1=1337510&r2=1337511&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java Sat May 12 11:03:28 2012
@@ -40,12 +40,12 @@ import org.apache.pivot.wtk.ComponentMou
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.ScrollPane;
+import org.apache.pivot.wtk.ScrollPane.ScrollBarPolicy;
import org.apache.pivot.wtk.SplitPane;
import org.apache.pivot.wtk.TextArea;
import org.apache.pivot.wtk.TreeView;
import org.apache.pivot.wtk.TreeViewSelectionListener;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtk.ScrollPane.ScrollBarPolicy;
public class ComponentExplorerWindow extends Window implements Bindable {
private String classProperty;
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/ComponentInspectorSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/ComponentInspectorSkin.java?rev=1337511&r1=1337510&r2=1337511&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/ComponentInspectorSkin.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/ComponentInspectorSkin.java Sat May 12 11:03:28 2012
@@ -258,7 +258,7 @@ abstract class ComponentInspectorSkin ex
}
}
- private Component addIntControl(final Dictionary<String, Object> dictionary,
+ private static Component addIntControl(final Dictionary<String, Object> dictionary,
final String key, Form.Section section) {
int value = (Integer)dictionary.get(key);
@@ -299,7 +299,7 @@ abstract class ComponentInspectorSkin ex
}
}
- private Component addFloatControl(final Dictionary<String, Object> dictionary,
+ private static Component addFloatControl(final Dictionary<String, Object> dictionary,
final String key, Form.Section section) {
float value = (Float)dictionary.get(key);
@@ -339,7 +339,7 @@ abstract class ComponentInspectorSkin ex
}
}
- private Component addDoubleControl(final Dictionary<String, Object> dictionary,
+ private static Component addDoubleControl(final Dictionary<String, Object> dictionary,
final String key, Form.Section section) {
double value = (Double)dictionary.get(key);
@@ -379,7 +379,7 @@ abstract class ComponentInspectorSkin ex
}
}
- private Component addStringControl(final Dictionary<String, Object> dictionary,
+ private static Component addStringControl(final Dictionary<String, Object> dictionary,
final String key, Form.Section section) {
String value = (String)dictionary.get(key);
@@ -466,7 +466,7 @@ abstract class ComponentInspectorSkin ex
}
}
- private Component addPointControl(final Dictionary<String, Object> dictionary,
+ private static Component addPointControl(final Dictionary<String, Object> dictionary,
final String key, Form.Section section) {
Point point = (Point)dictionary.get(key);
@@ -559,7 +559,7 @@ abstract class ComponentInspectorSkin ex
}
}
- private Component addDimensionsControl(final Dictionary<String, Object> dictionary,
+ private static Component addDimensionsControl(final Dictionary<String, Object> dictionary,
final String key, Form.Section section) {
Dimensions dimensions = (Dimensions)dictionary.get(key);
@@ -652,7 +652,7 @@ abstract class ComponentInspectorSkin ex
}
}
- private Component addLimitsControl(final Dictionary<String, Object> dictionary,
+ private static Component addLimitsControl(final Dictionary<String, Object> dictionary,
final String key, Form.Section section) {
Limits limits = (Limits)dictionary.get(key);
@@ -745,7 +745,7 @@ abstract class ComponentInspectorSkin ex
}
}
- private Component addInsetsControl(final Dictionary<String, Object> dictionary,
+ private static Component addInsetsControl(final Dictionary<String, Object> dictionary,
final String key, Form.Section section) {
Insets insets = (Insets)dictionary.get(key);
@@ -896,7 +896,7 @@ abstract class ComponentInspectorSkin ex
return boxPane;
}
- private Component addSpanControl(final Dictionary<String, Object> dictionary,
+ private static Component addSpanControl(final Dictionary<String, Object> dictionary,
final String key, Form.Section section) {
Span span = (Span)dictionary.get(key);
@@ -989,7 +989,7 @@ abstract class ComponentInspectorSkin ex
}
}
- private Component addCornerRadiiControl(final Dictionary<String, Object> dictionary,
+ private static Component addCornerRadiiControl(final Dictionary<String, Object> dictionary,
final String key, Form.Section section) {
CornerRadii cornerRadii = (CornerRadii)dictionary.get(key);
@@ -1140,7 +1140,7 @@ abstract class ComponentInspectorSkin ex
return boxPane;
}
- private Component addScopeControl(final Dictionary<String, Object> dictionary,
+ private static Component addScopeControl(final Dictionary<String, Object> dictionary,
final String key, Form.Section section) {
Scope scope = (Scope)dictionary.get(key);
@@ -1272,7 +1272,7 @@ abstract class ComponentInspectorSkin ex
}
}
- private Component addColorControl(final Dictionary<String, Object> dictionary,
+ private static Component addColorControl(final Dictionary<String, Object> dictionary,
final String key, Form.Section section) {
Color color = (Color)dictionary.get(key);
@@ -1307,7 +1307,7 @@ abstract class ComponentInspectorSkin ex
}
}
- private Component addCalendarDateControl(final Dictionary<String, Object> dictionary,
+ private static Component addCalendarDateControl(final Dictionary<String, Object> dictionary,
final String key, Form.Section section) {
CalendarDate calendarDate = (CalendarDate)dictionary.get(key);
@@ -1343,7 +1343,7 @@ abstract class ComponentInspectorSkin ex
}
}
- private void displayErrorMessage(Exception exception, Window window) {
+ private static void displayErrorMessage(Exception exception, Window window) {
String message = exception.getLocalizedMessage();
if (message == null) {
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java?rev=1337511&r1=1337510&r2=1337511&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java Sat May 12 11:03:28 2012
@@ -50,6 +50,8 @@ public class Expenses implements Applica
System.out.println("Warning: Origin null, so for this application to run you have to set the following properties: \n"
+ SECURE_KEY + ", " + HOSTNAME_KEY + ", " + PORT_KEY + "\n"
);
+ System.exit(1);
+ return; // make Eclipse's null checker happy
}
if (properties.containsKey(SECURE_KEY)) {
Modified: pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java
URL: http://svn.apache.org/viewvc/pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java?rev=1337511&r1=1337510&r2=1337511&view=diff
==============================================================================
--- pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java (original)
+++ pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java Sat May 12 11:03:28 2012
@@ -584,7 +584,7 @@ public abstract class QueryServlet exten
response.flushBuffer();
}
- private Path getPath(HttpServletRequest request) {
+ private static Path getPath(HttpServletRequest request) {
String pathInfo = request.getPathInfo();
Path path;
if (pathInfo == null
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java?rev=1337511&r1=1337510&r2=1337511&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java Sat May 12 11:03:28 2012
@@ -310,7 +310,7 @@ public class TerraTableViewSkin extends
* Calculates the table row height, which is determined as the maximum
* preferred height of all cell renderers.
*/
- private int calculateFixedRowHeight(TableView tableView) {
+ private static int calculateFixedRowHeight(TableView tableView) {
int fixedRowHeight = 0;
TableView.ColumnSequence columns = tableView.getColumns();
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java?rev=1337511&r1=1337510&r2=1337511&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java Sat May 12 11:03:28 2012
@@ -883,7 +883,7 @@ public class ListView extends Component
}
@SuppressWarnings("unchecked")
- private Sequence<Span> parseSelectedRanges(String json)
+ private static Sequence<Span> parseSelectedRanges(String json)
throws SerializationException {
ArrayList<Span> selectedRanges = new ArrayList<Span>();
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java?rev=1337511&r1=1337510&r2=1337511&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java Sat May 12 11:03:28 2012
@@ -1515,7 +1515,7 @@ public class TableView extends Component
}
@SuppressWarnings("unchecked")
- private Sequence<Span> parseSelectedRanges(String json)
+ private static Sequence<Span> parseSelectedRanges(String json)
throws SerializationException {
ArrayList<Span> selectedRanges = new ArrayList<Span>();
@@ -1887,7 +1887,7 @@ public class TableView extends Component
}
@SuppressWarnings("unchecked")
- private Sequence<Dictionary.Pair<String, SortDirection>> parseSort(String json)
+ private static Sequence<Dictionary.Pair<String, SortDirection>> parseSort(String json)
throws SerializationException {
ArrayList<Dictionary.Pair<String, SortDirection>> sort =
new ArrayList<Dictionary.Pair<String, SortDirection>>();