You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2017/12/22 22:32:20 UTC
svn commit: r1819096 [2/2] - /pivot/trunk/wtk/src/org/apache/pivot/wtk/
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java?rev=1819096&r1=1819095&r2=1819096&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java Fri Dec 22 22:32:19 2017
@@ -28,6 +28,7 @@ import org.apache.pivot.json.JSON;
import org.apache.pivot.json.JSONSerializer;
import org.apache.pivot.serialization.SerializationException;
import org.apache.pivot.util.ListenerList;
+import org.apache.pivot.util.Utils;
import org.apache.pivot.wtk.content.SpinnerItemRenderer;
/**
@@ -123,23 +124,17 @@ public class Spinner extends Container {
SpinnerListener {
@Override
public void spinnerDataChanged(Spinner spinner, List<?> previousSpinnerData) {
- for (SpinnerListener listener : this) {
- listener.spinnerDataChanged(spinner, previousSpinnerData);
- }
+ forEach(listener -> listener.spinnerDataChanged(spinner, previousSpinnerData));
}
@Override
public void itemRendererChanged(Spinner spinner, Spinner.ItemRenderer previousItemRenderer) {
- for (SpinnerListener listener : this) {
- listener.itemRendererChanged(spinner, previousItemRenderer);
- }
+ forEach(listener -> listener.itemRendererChanged(spinner, previousItemRenderer));
}
@Override
public void circularChanged(Spinner spinner) {
- for (SpinnerListener listener : this) {
- listener.circularChanged(spinner);
- }
+ forEach(listener -> listener.circularChanged(spinner));
}
}
@@ -147,37 +142,27 @@ public class Spinner extends Container {
implements SpinnerItemListener {
@Override
public void itemInserted(Spinner spinner, int index) {
- for (SpinnerItemListener listener : this) {
- listener.itemInserted(spinner, index);
- }
+ forEach(listener -> listener.itemInserted(spinner, index));
}
@Override
public void itemsRemoved(Spinner spinner, int index, int count) {
- for (SpinnerItemListener listener : this) {
- listener.itemsRemoved(spinner, index, count);
- }
+ forEach(listener -> listener.itemsRemoved(spinner, index, count));
}
@Override
public void itemUpdated(Spinner spinner, int index) {
- for (SpinnerItemListener listener : this) {
- listener.itemUpdated(spinner, index);
- }
+ forEach(listener -> listener.itemUpdated(spinner, index));
}
@Override
public void itemsCleared(Spinner spinner) {
- for (SpinnerItemListener listener : this) {
- listener.itemsCleared(spinner);
- }
+ forEach(listener -> listener.itemsCleared(spinner));
}
@Override
public void itemsSorted(Spinner spinner) {
- for (SpinnerItemListener listener : this) {
- listener.itemsSorted(spinner);
- }
+ forEach(listener -> listener.itemsSorted(spinner));
}
}
@@ -185,16 +170,12 @@ public class Spinner extends Container {
ListenerList<SpinnerSelectionListener> implements SpinnerSelectionListener {
@Override
public void selectedIndexChanged(Spinner spinner, int previousSelectedIndex) {
- for (SpinnerSelectionListener listener : this) {
- listener.selectedIndexChanged(spinner, previousSelectedIndex);
- }
+ forEach(listener -> listener.selectedIndexChanged(spinner, previousSelectedIndex));
}
@Override
public void selectedItemChanged(Spinner spinner, Object previousSelectedItem) {
- for (SpinnerSelectionListener listener : this) {
- listener.selectedItemChanged(spinner, previousSelectedItem);
- }
+ forEach(listener -> listener.selectedItemChanged(spinner, previousSelectedItem));
}
}
@@ -202,47 +183,35 @@ public class Spinner extends Container {
implements SpinnerBindingListener {
@Override
public void spinnerDataKeyChanged(Spinner spinner, String previousSpinnerDataKey) {
- for (SpinnerBindingListener listener : this) {
- listener.spinnerDataKeyChanged(spinner, previousSpinnerDataKey);
- }
+ forEach(listener -> listener.spinnerDataKeyChanged(spinner, previousSpinnerDataKey));
}
@Override
public void spinnerDataBindTypeChanged(Spinner spinner, BindType previousSpinnerDataBindType) {
- for (SpinnerBindingListener listener : this) {
- listener.spinnerDataBindTypeChanged(spinner, previousSpinnerDataBindType);
- }
+ forEach(listener -> listener.spinnerDataBindTypeChanged(spinner, previousSpinnerDataBindType));
}
@Override
public void spinnerDataBindMappingChanged(Spinner spinner,
Spinner.SpinnerDataBindMapping previousSpinnerDataBindMapping) {
- for (SpinnerBindingListener listener : this) {
- listener.spinnerDataBindMappingChanged(spinner, previousSpinnerDataBindMapping);
- }
+ forEach(listener -> listener.spinnerDataBindMappingChanged(spinner, previousSpinnerDataBindMapping));
}
@Override
public void selectedItemKeyChanged(Spinner spinner, String previousSelectedItemKey) {
- for (SpinnerBindingListener listener : this) {
- listener.selectedItemKeyChanged(spinner, previousSelectedItemKey);
- }
+ forEach(listener -> listener.selectedItemKeyChanged(spinner, previousSelectedItemKey));
}
@Override
public void selectedItemBindTypeChanged(Spinner spinner,
BindType previousSelectedItemBindType) {
- for (SpinnerBindingListener listener : this) {
- listener.selectedItemBindTypeChanged(spinner, previousSelectedItemBindType);
- }
+ forEach(listener -> listener.selectedItemBindTypeChanged(spinner, previousSelectedItemBindType));
}
@Override
public void selectedItemBindMappingChanged(Spinner spinner,
ItemBindMapping previousSelectedItemBindMapping) {
- for (SpinnerBindingListener listener : this) {
- listener.selectedItemBindMappingChanged(spinner, previousSelectedItemBindMapping);
- }
+ forEach(listener -> listener.selectedItemBindMappingChanged(spinner, previousSelectedItemBindMapping));
}
}
@@ -385,9 +354,7 @@ public class Spinner extends Container {
*/
@SuppressWarnings("unchecked")
public void setSpinnerData(List<?> spinnerData) {
- if (spinnerData == null) {
- throw new IllegalArgumentException("spinnerData is null.");
- }
+ Utils.checkNull(spinnerData, "spinnerData");
List<?> previousSpinnerData = this.spinnerData;
@@ -415,9 +382,7 @@ public class Spinner extends Container {
}
public final void setSpinnerData(String spinnerData) {
- if (spinnerData == null) {
- throw new IllegalArgumentException("spinnerData is null.");
- }
+ Utils.checkNullOrEmpty(spinnerData, "spinnerData");
try {
setSpinnerData(JSONSerializer.parseList(spinnerData));
@@ -428,10 +393,7 @@ public class Spinner extends Container {
@Override
protected void setSkin(org.apache.pivot.wtk.Skin skin) {
- if (!(skin instanceof Spinner.Skin)) {
- throw new IllegalArgumentException("Skin class must implement "
- + Spinner.Skin.class.getName());
- }
+ checkSkin(skin, Spinner.Skin.class);
super.setSkin(skin);
}
@@ -449,9 +411,7 @@ public class Spinner extends Container {
* @param itemRenderer The new item renderer for the list.
*/
public void setItemRenderer(ItemRenderer itemRenderer) {
- if (itemRenderer == null) {
- throw new IllegalArgumentException("itemRenderer is null.");
- }
+ Utils.checkNull(itemRenderer, "itemRenderer");
ItemRenderer previousItemRenderer = this.itemRenderer;
@@ -540,9 +500,7 @@ public class Spinner extends Container {
}
public void setSpinnerDataBindType(BindType spinnerDataBindType) {
- if (spinnerDataBindType == null) {
- throw new IllegalArgumentException();
- }
+ Utils.checkNull(spinnerDataBindType, "spinnerDataBindType");
BindType previousSpinnerDataBindType = this.spinnerDataBindType;
@@ -584,9 +542,7 @@ public class Spinner extends Container {
}
public void setSelectedItemBindType(BindType selectedItemBindType) {
- if (selectedItemBindType == null) {
- throw new IllegalArgumentException();
- }
+ Utils.checkNull(selectedItemBindType, "selectedItemBindType");
BindType previousSelectedItemBindType = this.selectedItemBindType;
if (previousSelectedItemBindType != selectedItemBindType) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java?rev=1819096&r1=1819095&r2=1819096&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java Fri Dec 22 22:32:19 2017
@@ -18,6 +18,7 @@ package org.apache.pivot.wtk;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.util.ListenerList;
+import org.apache.pivot.util.Utils;
/**
* A <tt>SplitPane</tt> is a container component that splits its size up into
@@ -59,51 +60,37 @@ public class SplitPane extends Container
SplitPaneListener {
@Override
public void topLeftChanged(SplitPane splitPane, Component previousTopLeft) {
- for (SplitPaneListener listener : this) {
- listener.topLeftChanged(splitPane, previousTopLeft);
- }
+ forEach(listener -> listener.topLeftChanged(splitPane, previousTopLeft));
}
@Override
public void bottomRightChanged(SplitPane splitPane, Component previousBottomRight) {
- for (SplitPaneListener listener : this) {
- listener.bottomRightChanged(splitPane, previousBottomRight);
- }
+ forEach(listener -> listener.bottomRightChanged(splitPane, previousBottomRight));
}
@Override
public void orientationChanged(SplitPane splitPane) {
- for (SplitPaneListener listener : this) {
- listener.orientationChanged(splitPane);
- }
+ forEach(listener -> listener.orientationChanged(splitPane));
}
@Override
public void primaryRegionChanged(SplitPane splitPane) {
- for (SplitPaneListener listener : this) {
- listener.primaryRegionChanged(splitPane);
- }
+ forEach(listener -> listener.primaryRegionChanged(splitPane));
}
@Override
public void splitRatioChanged(SplitPane splitPane, float previousSplitRatio) {
- for (SplitPaneListener listener : this) {
- listener.splitRatioChanged(splitPane, previousSplitRatio);
- }
+ forEach(listener -> listener.splitRatioChanged(splitPane, previousSplitRatio));
}
@Override
public void lockedChanged(SplitPane splitPane) {
- for (SplitPaneListener listener : this) {
- listener.lockedChanged(splitPane);
- }
+ forEach(listener -> listener.lockedChanged(splitPane));
}
@Override
public void resizeModeChanged(SplitPane splitPane, ResizeMode previousResizeMode) {
- for (SplitPaneListener listener : this) {
- listener.resizeModeChanged(splitPane, previousResizeMode);
- }
+ forEach(listener -> listener.resizeModeChanged(splitPane, previousResizeMode));
}
}
@@ -229,9 +216,7 @@ public class SplitPane extends Container
}
public void setOrientation(Orientation orientation) {
- if (orientation == null) {
- throw new IllegalArgumentException("orientation is null.");
- }
+ Utils.checkNull(orientation, "orientation");
if (this.orientation != orientation) {
this.orientation = orientation;
@@ -244,9 +229,7 @@ public class SplitPane extends Container
}
public void setPrimaryRegion(Region primaryRegion) {
- if (primaryRegion == null) {
- throw new IllegalArgumentException("primaryRegion is null.");
- }
+ Utils.checkNull(primaryRegion, "primaryRegion");
if (this.primaryRegion != primaryRegion) {
this.primaryRegion = primaryRegion;
@@ -287,9 +270,7 @@ public class SplitPane extends Container
}
public void setResizeMode(ResizeMode resizeMode) {
- if (resizeMode == null) {
- throw new IllegalArgumentException("resizeMode is null.");
- }
+ Utils.checkNull(resizeMode, "resizeMode");
ResizeMode previousResizeMode = this.resizeMode;
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java?rev=1819096&r1=1819095&r2=1819096&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java Fri Dec 22 22:32:19 2017
@@ -23,6 +23,7 @@ import org.apache.pivot.collections.Arra
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.util.ImmutableIterator;
import org.apache.pivot.util.ListenerList;
+import org.apache.pivot.util.Utils;
/**
* Container that arranges components in a two-dimensional grid, optionally
@@ -199,9 +200,7 @@ public class TablePane extends Container
@Override
public void insert(Component component, int index) {
- if (component == null) {
- throw new IllegalArgumentException("Component is null.");
- }
+ Utils.checkNull(component, "Component");
if (component.getParent() != null) {
throw new IllegalArgumentException("Component already has a parent.");
@@ -220,9 +219,7 @@ public class TablePane extends Container
Component previousComponent = cells.get(index);
if (component != previousComponent) {
- if (component == null) {
- throw new IllegalArgumentException("Component is null.");
- }
+ Utils.checkNull(component, "Component");
if (component.getParent() != null) {
throw new IllegalArgumentException("Component already has a parent.");
@@ -473,12 +470,10 @@ public class TablePane extends Container
@Override
public void insert(Row row, int index) {
- if (row == null) {
- throw new IllegalArgumentException("row is null.");
- }
+ Utils.checkNull(row, "Row");
if (row.tablePane != null) {
- throw new IllegalArgumentException("row is already in use by another table pane.");
+ throw new IllegalArgumentException("Row is already in use by another table pane.");
}
rows.insert(row, index);
@@ -568,13 +563,11 @@ public class TablePane extends Container
@Override
public void insert(Column column, int index) {
- if (column == null) {
- throw new IllegalArgumentException("column is null.");
- }
+ Utils.checkNull(column, "Column");
if (column.tablePane != null) {
throw new IllegalArgumentException(
- "column is already in use by another table pane.");
+ "Column is already in use by another table pane.");
}
columns.insert(column, index);
@@ -653,81 +646,59 @@ public class TablePane extends Container
TablePaneListener {
@Override
public void rowInserted(TablePane tablePane, int index) {
- for (TablePaneListener listener : this) {
- listener.rowInserted(tablePane, index);
- }
+ forEach(listener -> listener.rowInserted(tablePane, index));
}
@Override
public void rowsRemoved(TablePane tablePane, int index, Sequence<TablePane.Row> rows) {
- for (TablePaneListener listener : this) {
- listener.rowsRemoved(tablePane, index, rows);
- }
+ forEach(listener -> listener.rowsRemoved(tablePane, index, rows));
}
@Override
public void rowHeightChanged(TablePane.Row row, int previousHeight, boolean previousRelative) {
- for (TablePaneListener listener : this) {
- listener.rowHeightChanged(row, previousHeight, previousRelative);
- }
+ forEach(listener -> listener.rowHeightChanged(row, previousHeight, previousRelative));
}
@Override
public void rowHighlightedChanged(TablePane.Row row) {
- for (TablePaneListener listener : this) {
- listener.rowHighlightedChanged(row);
- }
+ forEach(listener -> listener.rowHighlightedChanged(row));
}
@Override
public void columnInserted(TablePane tablePane, int index) {
- for (TablePaneListener listener : this) {
- listener.columnInserted(tablePane, index);
- }
+ forEach(listener -> listener.columnInserted(tablePane, index));
}
@Override
public void columnsRemoved(TablePane tablePane, int index,
Sequence<TablePane.Column> columns) {
- for (TablePaneListener listener : this) {
- listener.columnsRemoved(tablePane, index, columns);
- }
+ forEach(listener -> listener.columnsRemoved(tablePane, index, columns));
}
@Override
public void columnWidthChanged(TablePane.Column column, int previousWidth,
boolean previousRelative) {
- for (TablePaneListener listener : this) {
- listener.columnWidthChanged(column, previousWidth, previousRelative);
- }
+ forEach(listener -> listener.columnWidthChanged(column, previousWidth, previousRelative));
}
@Override
public void columnHighlightedChanged(TablePane.Column column) {
- for (TablePaneListener listener : this) {
- listener.columnHighlightedChanged(column);
- }
+ forEach(listener -> listener.columnHighlightedChanged(column));
}
@Override
public void cellInserted(TablePane.Row row, int column) {
- for (TablePaneListener listener : this) {
- listener.cellInserted(row, column);
- }
+ forEach(listener -> listener.cellInserted(row, column));
}
@Override
public void cellsRemoved(TablePane.Row row, int column, Sequence<Component> removed) {
- for (TablePaneListener listener : this) {
- listener.cellsRemoved(row, column, removed);
- }
+ forEach(listener -> listener.cellsRemoved(row, column, removed));
}
@Override
public void cellUpdated(TablePane.Row row, int column, Component previousComponent) {
- for (TablePaneListener listener : this) {
- listener.cellUpdated(row, column, previousComponent);
- }
+ forEach(listener -> listener.cellUpdated(row, column, previousComponent));
}
}
@@ -735,17 +706,13 @@ public class TablePane extends Container
ListenerList<TablePaneAttributeListener> implements TablePaneAttributeListener {
@Override
public void rowSpanChanged(TablePane tablePane, Component component, int previousRowSpan) {
- for (TablePaneAttributeListener listener : this) {
- listener.rowSpanChanged(tablePane, component, previousRowSpan);
- }
+ forEach(listener -> listener.rowSpanChanged(tablePane, component, previousRowSpan));
}
@Override
public void columnSpanChanged(TablePane tablePane, Component component,
int previousColumnSpan) {
- for (TablePaneAttributeListener listener : this) {
- listener.columnSpanChanged(tablePane, component, previousColumnSpan);
- }
+ forEach(listener -> listener.columnSpanChanged(tablePane, component, previousColumnSpan));
}
}
@@ -774,9 +741,7 @@ public class TablePane extends Container
* be made
*/
public TablePane(Sequence<Column> columns) {
- if (columns == null) {
- throw new IllegalArgumentException("columns is null");
- }
+ Utils.checkNull(columns, "columns");
this.rows = new ArrayList<>();
this.columns = new ArrayList<>(columns);
@@ -786,10 +751,7 @@ public class TablePane extends Container
@Override
protected void setSkin(org.apache.pivot.wtk.Skin skin) {
- if (!(skin instanceof TablePane.Skin)) {
- throw new IllegalArgumentException("Skin class must implement "
- + TablePane.Skin.class.getName());
- }
+ checkSkin(skin, TablePane.Skin.class);
super.setSkin(skin);
}
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=1819096&r1=1819095&r2=1819096&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java Fri Dec 22 22:32:19 2017
@@ -1198,10 +1198,7 @@ public class TableView extends Component
@Override
protected void setSkin(org.apache.pivot.wtk.Skin skin) {
- if (!(skin instanceof TableView.Skin)) {
- throw new IllegalArgumentException("Skin class must implement "
- + TableView.Skin.class.getName());
- }
+ checkSkin(skin, TableView.Skin.class);
super.setSkin(skin);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TableViewHeader.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TableViewHeader.java?rev=1819096&r1=1819095&r2=1819096&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TableViewHeader.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TableViewHeader.java Fri Dec 22 22:32:19 2017
@@ -17,6 +17,7 @@
package org.apache.pivot.wtk;
import org.apache.pivot.util.ListenerList;
+import org.apache.pivot.util.Utils;
/**
* Component representing a table view header.
@@ -43,16 +44,12 @@ public class TableViewHeader extends Com
ListenerList<TableViewHeaderListener> implements TableViewHeaderListener {
@Override
public void tableViewChanged(TableViewHeader tableViewHeader, TableView previousTableView) {
- for (TableViewHeaderListener listener : this) {
- listener.tableViewChanged(tableViewHeader, previousTableView);
- }
+ forEach(listener -> listener.tableViewChanged(tableViewHeader, previousTableView));
}
@Override
public void sortModeChanged(TableViewHeader tableViewHeader, SortMode previousSortMode) {
- for (TableViewHeaderListener listener : this) {
- listener.sortModeChanged(tableViewHeader, previousSortMode);
- }
+ forEach(listener -> listener.sortModeChanged(tableViewHeader, previousSortMode));
}
}
@@ -60,9 +57,7 @@ public class TableViewHeader extends Com
ListenerList<TableViewHeaderPressListener> implements TableViewHeaderPressListener {
@Override
public void headerPressed(TableViewHeader tableViewHeader, int index) {
- for (TableViewHeaderPressListener listener : this) {
- listener.headerPressed(tableViewHeader, index);
- }
+ forEach(listener -> listener.headerPressed(tableViewHeader, index));
}
}
@@ -83,10 +78,7 @@ public class TableViewHeader extends Com
@Override
protected void setSkin(org.apache.pivot.wtk.Skin skin) {
- if (!(skin instanceof TableViewHeader.Skin)) {
- throw new IllegalArgumentException("Skin class must implement "
- + TableViewHeader.Skin.class.getName());
- }
+ checkSkin(skin, TableViewHeader.Skin.class);
super.setSkin(skin);
}
@@ -109,9 +101,7 @@ public class TableViewHeader extends Com
}
public void setSortMode(SortMode sortMode) {
- if (sortMode == null) {
- throw new IllegalArgumentException();
- }
+ Utils.checkNull(sortMode, "sortMode");
SortMode previousSortMode = this.sortMode;
if (previousSortMode != sortMode) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java?rev=1819096&r1=1819095&r2=1819096&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java Fri Dec 22 22:32:19 2017
@@ -576,10 +576,7 @@ public class TextArea extends Component
@Override
protected void setSkin(org.apache.pivot.wtk.Skin skin) {
- if (!(skin instanceof TextArea.Skin)) {
- throw new IllegalArgumentException("Skin class must implement "
- + TextArea.Skin.class.getName());
- }
+ checkSkin(skin, TextArea.Skin.class);
super.setSkin(skin);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java?rev=1819096&r1=1819095&r2=1819096&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java Fri Dec 22 22:32:19 2017
@@ -145,10 +145,7 @@ public class TextInput extends Component
@Override
protected void setSkin(org.apache.pivot.wtk.Skin skin) {
- if (!(skin instanceof TextInput.Skin)) {
- throw new IllegalArgumentException("Skin class must implement "
- + TextInput.Skin.class.getName());
- }
+ checkSkin(skin, TextInput.Skin.class);
super.setSkin(skin);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java?rev=1819096&r1=1819095&r2=1819096&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java Fri Dec 22 22:32:19 2017
@@ -321,10 +321,7 @@ public class TextPane extends Container
@Override
protected void setSkin(org.apache.pivot.wtk.Skin skin) {
- if (!(skin instanceof TextPane.Skin)) {
- throw new IllegalArgumentException("Skin class must implement "
- + TextPane.Skin.class.getName());
- }
+ checkSkin(skin, TextPane.Skin.class);
super.setSkin(skin);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java?rev=1819096&r1=1819095&r2=1819096&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java Fri Dec 22 22:32:19 2017
@@ -29,8 +29,9 @@ import org.apache.pivot.collections.Sequ
import org.apache.pivot.collections.immutable.ImmutableList;
import org.apache.pivot.util.Filter;
import org.apache.pivot.util.ListenerList;
-import org.apache.pivot.util.Vote;
import org.apache.pivot.util.Utils;
+import org.apache.pivot.util.Vote;
+import org.apache.pivot.util.VoteResult;
import org.apache.pivot.wtk.content.TreeViewNodeRenderer;
/**
@@ -214,60 +215,44 @@ public class TreeView extends Component
@Override
public void treeDataChanged(TreeView treeView, List<?> previousTreeData) {
- for (TreeViewListener listener : this) {
- listener.treeDataChanged(treeView, previousTreeData);
- }
+ forEach(listener -> listener.treeDataChanged(treeView, previousTreeData));
}
@Override
public void nodeRendererChanged(TreeView treeView, NodeRenderer previousNodeRenderer) {
- for (TreeViewListener listener : this) {
- listener.nodeRendererChanged(treeView, previousNodeRenderer);
- }
+ forEach(listener -> listener.nodeRendererChanged(treeView, previousNodeRenderer));
}
@Override
public void nodeEditorChanged(TreeView treeView, TreeView.NodeEditor previousNodeEditor) {
- for (TreeViewListener listener : this) {
- listener.nodeEditorChanged(treeView, previousNodeEditor);
- }
+ forEach(listener -> listener.nodeEditorChanged(treeView, previousNodeEditor));
}
@Override
public void selectModeChanged(TreeView treeView, SelectMode previousSelectMode) {
- for (TreeViewListener listener : this) {
- listener.selectModeChanged(treeView, previousSelectMode);
- }
+ forEach(listener -> listener.selectModeChanged(treeView, previousSelectMode));
}
@Override
public void checkmarksEnabledChanged(TreeView treeView) {
- for (TreeViewListener listener : this) {
- listener.checkmarksEnabledChanged(treeView);
- }
+ forEach(listener -> listener.checkmarksEnabledChanged(treeView));
}
@Override
public void showMixedCheckmarkStateChanged(TreeView treeView) {
- for (TreeViewListener listener : this) {
- listener.showMixedCheckmarkStateChanged(treeView);
- }
+ forEach(listener -> listener.showMixedCheckmarkStateChanged(treeView));
}
@Override
public void disabledNodeFilterChanged(TreeView treeView,
Filter<?> previousDisabledNodeFilter) {
- for (TreeViewListener listener : this) {
- listener.disabledNodeFilterChanged(treeView, previousDisabledNodeFilter);
- }
+ forEach(listener -> listener.disabledNodeFilterChanged(treeView, previousDisabledNodeFilter));
}
@Override
public void disabledCheckmarkFilterChanged(TreeView treeView,
Filter<?> previousDisabledCheckmarkFilter) {
- for (TreeViewListener listener : this) {
- listener.disabledCheckmarkFilterChanged(treeView, previousDisabledCheckmarkFilter);
- }
+ forEach(listener -> listener.disabledCheckmarkFilterChanged(treeView, previousDisabledCheckmarkFilter));
}
}
@@ -278,34 +263,26 @@ public class TreeView extends Component
implements TreeViewBranchListener {
@Override
public void branchExpanded(TreeView treeView, Path path) {
- for (TreeViewBranchListener listener : this) {
- listener.branchExpanded(treeView, path);
- }
+ forEach(listener -> listener.branchExpanded(treeView, path));
}
@Override
public void branchCollapsed(TreeView treeView, Path path) {
- for (TreeViewBranchListener listener : this) {
- listener.branchCollapsed(treeView, path);
- }
+ forEach(listener -> listener.branchCollapsed(treeView, path));
}
@Override
public Vote previewBranchExpandedChange(TreeView treeView, Path path) {
- Vote vote = Vote.APPROVE;
+ VoteResult vote = new VoteResult(Vote.APPROVE);
- for (TreeViewBranchListener listener : this) {
- vote = vote.tally(listener.previewBranchExpandedChange(treeView, path));
- }
+ forEach(listener -> vote.tally(listener.previewBranchExpandedChange(treeView, path)));
- return vote;
+ return vote.get();
}
@Override
public void branchExpandedChangeVetoed(TreeView treeView, Path path, Vote reason) {
- for (TreeViewBranchListener listener : this) {
- listener.branchExpandedChangeVetoed(treeView, path, reason);
- }
+ forEach(listener -> listener.branchExpandedChangeVetoed(treeView, path, reason));
}
}
@@ -316,37 +293,27 @@ public class TreeView extends Component
implements TreeViewNodeListener {
@Override
public void nodeInserted(TreeView treeView, Path path, int index) {
- for (TreeViewNodeListener listener : this) {
- listener.nodeInserted(treeView, path, index);
- }
+ forEach(listener -> listener.nodeInserted(treeView, path, index));
}
@Override
public void nodesRemoved(TreeView treeView, Path path, int index, int count) {
- for (TreeViewNodeListener listener : this) {
- listener.nodesRemoved(treeView, path, index, count);
- }
+ forEach(listener -> listener.nodesRemoved(treeView, path, index, count));
}
@Override
public void nodeUpdated(TreeView treeView, Path path, int index) {
- for (TreeViewNodeListener listener : this) {
- listener.nodeUpdated(treeView, path, index);
- }
+ forEach(listener -> listener.nodeUpdated(treeView, path, index));
}
@Override
public void nodesCleared(TreeView treeView, Path path) {
- for (TreeViewNodeListener listener : this) {
- listener.nodesCleared(treeView, path);
- }
+ forEach(listener -> listener.nodesCleared(treeView, path));
}
@Override
public void nodesSorted(TreeView treeView, Path path) {
- for (TreeViewNodeListener listener : this) {
- listener.nodesSorted(treeView, path);
- }
+ forEach(listener -> listener.nodesSorted(treeView, path));
}
}
@@ -358,9 +325,7 @@ public class TreeView extends Component
@Override
public void nodeCheckStateChanged(TreeView treeView, Path path,
TreeView.NodeCheckState previousCheckState) {
- for (TreeViewNodeStateListener listener : this) {
- listener.nodeCheckStateChanged(treeView, path, previousCheckState);
- }
+ forEach(listener -> listener.nodeCheckStateChanged(treeView, path, previousCheckState));
}
}
@@ -371,30 +336,22 @@ public class TreeView extends Component
ListenerList<TreeViewSelectionListener> implements TreeViewSelectionListener {
@Override
public void selectedPathAdded(TreeView treeView, Path path) {
- for (TreeViewSelectionListener listener : this) {
- listener.selectedPathAdded(treeView, path);
- }
+ forEach(listener -> listener.selectedPathAdded(treeView, path));
}
@Override
public void selectedPathRemoved(TreeView treeView, Path path) {
- for (TreeViewSelectionListener listener : this) {
- listener.selectedPathRemoved(treeView, path);
- }
+ forEach(listener -> listener.selectedPathRemoved(treeView, path));
}
@Override
public void selectedPathsChanged(TreeView treeView, Sequence<Path> previousSelectedPaths) {
- for (TreeViewSelectionListener listener : this) {
- listener.selectedPathsChanged(treeView, previousSelectedPaths);
- }
+ forEach(listener -> listener.selectedPathsChanged(treeView, previousSelectedPaths));
}
@Override
public void selectedNodeChanged(TreeView treeView, Object previousSelectedNode) {
- for (TreeViewSelectionListener listener : this) {
- listener.selectedNodeChanged(treeView, previousSelectedNode);
- }
+ forEach(listener -> listener.selectedNodeChanged(treeView, previousSelectedNode));
}
}
@@ -691,14 +648,12 @@ public class TreeView extends Component
int n = paths.getLength();
try {
- // Update all affected paths by incrementing the appropriate
- // path element
+ // Update all affected paths by incrementing the appropriate path element
for (int depth = basePath.getLength(); i < n; i++) {
Path affectedPath = paths.get(i);
if (!Sequence.Tree.isDescendant(basePath, affectedPath)) {
- // All paths from here forward are guaranteed to be
- // unaffected
+ // All paths from here forward are guaranteed to be unaffected
break;
}
@@ -722,8 +677,7 @@ public class TreeView extends Component
* <tt>count</tt> is <tt>2</tt>, then <tt>paths</tt> will be updated to
* <tt>[[4, 0]]</tt>. No events are fired.
*
- * @param paths Sequence of paths guaranteed to be sorted by
- * "row order".
+ * @param paths Sequence of paths guaranteed to be sorted by "row order".
* @param basePath The path to the parent of the removed items.
* @param index The index of the first removed item within the base.
* @param count The number of items removed.
@@ -761,8 +715,7 @@ public class TreeView extends Component
Path affectedPath = paths.get(i);
if (!Sequence.Tree.isDescendant(basePath, affectedPath)) {
- // All paths from here forward are guaranteed to be
- // unaffected
+ // All paths from here forward are guaranteed to be unaffected
break;
}
@@ -782,8 +735,7 @@ public class TreeView extends Component
* then <tt>paths</tt> will be updated to <tt>[[3], [3, 1], [5,
* 0]]</tt>. No events are fired.
*
- * @param paths Sequence of paths guaranteed to be sorted by
- * "row order".
+ * @param paths Sequence of paths guaranteed to be sorted by "row order".
* @param basePath The path to the parent of the updated item.
* @param index The index of the updated item within its parent.
*/
@@ -817,8 +769,7 @@ public class TreeView extends Component
* <tt>[3]</tt>, then <tt>paths</tt> will be updated to <tt>[[3], [5,
* 0]]</tt>. No events are fired.
*
- * @param paths Sequence of paths guaranteed to be sorted by
- * "row order".
+ * @param paths Sequence of paths guaranteed to be sorted by "row order".
* @param basePath The path whose children were sorted.
* @return The number of path elements that were updated.
*/
@@ -910,10 +861,7 @@ public class TreeView extends Component
*/
@Override
protected void setSkin(org.apache.pivot.wtk.Skin skin) {
- if (!(skin instanceof TreeView.Skin)) {
- throw new IllegalArgumentException("Skin class must implement "
- + TreeView.Skin.class.getName());
- }
+ checkSkin(skin, TreeView.Skin.class);
super.setSkin(skin);
}
@@ -1143,8 +1091,7 @@ public class TreeView extends Component
}
/**
- * Returns the first selected path, as it would appear in a fully expanded
- * tree.
+ * Returns the first selected path, as it would appear in a fully expanded tree.
*
* @return The first selected path, or <tt>null</tt> if nothing is selected.
*/
@@ -1153,8 +1100,7 @@ public class TreeView extends Component
}
/**
- * Returns the last selected path, as it would appear in a fully expanded
- * tree.
+ * Returns the last selected path, as it would appear in a fully expanded tree.
*
* @return The last selected path, or <tt>null</tt> if nothing is selected.
*/
@@ -1268,8 +1214,8 @@ public class TreeView extends Component
if (previousTreeDataKey != treeDataKey) {
this.treeDataKey = treeDataKey;
- // treeViewBindingListeners.treeDataKeyChanged(this,
- // previousTreeDataKey); // future use
+ // treeViewBindingListeners.treeDataKeyChanged(this, previousTreeDataKey);
+ // future use
}
}
@@ -1298,8 +1244,7 @@ public class TreeView extends Component
}
/**
- * @return Whether or not the node at the given path is part of the
- * current selection.
+ * @return Whether or not the node at the given path is part of the current selection.
* @param path Path to the node to check.
*/
public boolean isNodeSelected(Path path) {
@@ -1496,8 +1441,7 @@ public class TreeView extends Component
* checked, but one or more of its descendants are."
*
* @param path The path to the node.
- * @param checked <tt>true</tt> to check the node; <tt>false</tt> to uncheck
- * it.
+ * @param checked <tt>true</tt> to check the node; <tt>false</tt> to uncheck it.
* @throws IllegalStateException If checkmarks are not enabled (see
* {@link #getCheckmarksEnabled()}).
* @see NodeCheckState#MIXED
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Viewport.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Viewport.java?rev=1819096&r1=1819095&r2=1819096&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Viewport.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Viewport.java Fri Dec 22 22:32:19 2017
@@ -19,6 +19,7 @@ package org.apache.pivot.wtk;
import org.apache.pivot.beans.DefaultProperty;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.util.ListenerList;
+import org.apache.pivot.util.Utils;
/**
* Abstract base class for viewport components. Viewports provide a windowed
@@ -47,23 +48,17 @@ public abstract class Viewport extends C
@Override
public void scrollTopChanged(Viewport viewport, int previousScrollTop) {
- for (ViewportListener listener : this) {
- listener.scrollTopChanged(viewport, previousScrollTop);
- }
+ forEach(listener -> listener.scrollTopChanged(viewport, previousScrollTop));
}
@Override
public void scrollLeftChanged(Viewport viewport, int previousScrollLeft) {
- for (ViewportListener listener : this) {
- listener.scrollLeftChanged(viewport, previousScrollLeft);
- }
+ forEach(listener -> listener.scrollLeftChanged(viewport, previousScrollLeft));
}
@Override
public void viewChanged(Viewport viewport, Component previousView) {
- for (ViewportListener listener : this) {
- listener.viewChanged(viewport, previousView);
- }
+ forEach(listener -> listener.viewChanged(viewport, previousView));
}
}
@@ -78,10 +73,7 @@ public abstract class Viewport extends C
@Override
protected void setSkin(org.apache.pivot.wtk.Skin skin) {
- if (!(skin instanceof Viewport.Skin)) {
- throw new IllegalArgumentException("Skin class must implement "
- + Viewport.Skin.class.getName());
- }
+ checkSkin(skin, Viewport.Skin.class);
super.setSkin(skin);
}