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 2020/05/01 22:28:09 UTC
svn commit: r1877272 - in /pivot/trunk/wtk/src/org/apache/pivot/wtk:
SheetCloseListener.java SheetStateListener.java
Author: rwhitcomb
Date: Fri May 1 22:28:09 2020
New Revision: 1877272
URL: http://svn.apache.org/viewvc?rev=1877272&view=rev
Log:
PIVOT-1047: Tweak the Sheet*Listener classes to make them more usable
as lambdas (similar to earlier changes with Dialog listeners).
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/SheetCloseListener.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/SheetStateListener.java
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/SheetCloseListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/SheetCloseListener.java?rev=1877272&r1=1877271&r2=1877272&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/SheetCloseListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/SheetCloseListener.java Fri May 1 22:28:09 2020
@@ -25,6 +25,5 @@ public interface SheetCloseListener {
*
* @param sheet The sheet that is now closed.
*/
- default void sheetClosed(Sheet sheet) {
- }
+ void sheetClosed(Sheet sheet);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/SheetStateListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/SheetStateListener.java?rev=1877272&r1=1877271&r2=1877272&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/SheetStateListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/SheetStateListener.java Fri May 1 22:28:09 2020
@@ -27,10 +27,10 @@ public interface SheetStateListener exte
/**
* Sheet state listeners.
*/
- public static class Listeners extends ListenerList<SheetStateListener>
+ public static final class Listeners extends ListenerList<SheetStateListener>
implements SheetStateListener {
@Override
- public Vote previewSheetClose(Sheet sheet, boolean result) {
+ public Vote previewSheetClose(final Sheet sheet, final boolean result) {
VoteResult vote = new VoteResult(Vote.APPROVE);
forEach(listener -> vote.tally(listener.previewSheetClose(sheet, result)));
@@ -39,12 +39,12 @@ public interface SheetStateListener exte
}
@Override
- public void sheetCloseVetoed(Sheet sheet, Vote reason) {
+ public void sheetCloseVetoed(final Sheet sheet, final Vote reason) {
forEach(listener -> listener.sheetCloseVetoed(sheet, reason));
}
@Override
- public void sheetClosed(Sheet sheet) {
+ public void sheetClosed(final Sheet sheet) {
forEach(listener -> listener.sheetClosed(sheet));
}
}
@@ -56,17 +56,17 @@ public interface SheetStateListener exte
@Deprecated
public static class Adapter implements SheetStateListener {
@Override
- public Vote previewSheetClose(Sheet sheet, boolean result) {
+ public Vote previewSheetClose(final Sheet sheet, final boolean result) {
return Vote.APPROVE;
}
@Override
- public void sheetCloseVetoed(Sheet sheet, Vote reason) {
+ public void sheetCloseVetoed(final Sheet sheet, final Vote reason) {
// empty block
}
@Override
- public void sheetClosed(Sheet sheet) {
+ public void sheetClosed(final Sheet sheet) {
// empty block
}
}
@@ -78,7 +78,7 @@ public interface SheetStateListener exte
* @param result The proposed result of the close.
* @return What this listener wants to decide about this proposed close.
*/
- default Vote previewSheetClose(Sheet sheet, boolean result) {
+ default Vote previewSheetClose(final Sheet sheet, final boolean result) {
return Vote.APPROVE;
}
@@ -88,6 +88,14 @@ public interface SheetStateListener exte
* @param sheet The close event source.
* @param reason The accumulated vote that resulted in the veto.
*/
- default void sheetCloseVetoed(Sheet sheet, Vote reason) {
+ default void sheetCloseVetoed(final Sheet sheet, final Vote reason) {
+ }
+
+ /**
+ * Called when the sheet has closed.
+ *
+ * @param sheet The sheet that has been closed.
+ */
+ default void sheetClosed(final Sheet sheet) {
}
}