diff --git a/modules/base/src/main/java/com/sun/javafx/PlatformUtil.java b/modules/base/src/main/java/com/sun/javafx/PlatformUtil.java --- a/modules/base/src/main/java/com/sun/javafx/PlatformUtil.java +++ b/modules/base/src/main/java/com/sun/javafx/PlatformUtil.java @@ -48,38 +48,14 @@ private static String javafxPlatform; static { - javafxPlatform = AccessController.doPrivileged(new PrivilegedAction() { - @Override public String run() { - return System.getProperty("javafx.platform"); - } - }); + javafxPlatform = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("javafx.platform")); loadProperties(); - embedded = AccessController.doPrivileged(new PrivilegedAction() { - @Override public Boolean run() { - return Boolean.getBoolean("com.sun.javafx.isEmbedded"); - } - }); - embedded3DEnabled = AccessController.doPrivileged(new PrivilegedAction() { - @Override public Boolean run() { - return Boolean.getBoolean("com.sun.javafx.experimental.embedded.3d"); - } - }); - embeddedType = AccessController.doPrivileged(new PrivilegedAction() { - @Override public String run() { - return System.getProperty("embedded"); - } - }); - useEGL = AccessController.doPrivileged(new PrivilegedAction() { - @Override public Boolean run() { - return Boolean.getBoolean("use.egl"); - } - }); + embedded = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("com.sun.javafx.isEmbedded")); + embedded3DEnabled = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("com.sun.javafx.experimental.embedded.3d")); + embeddedType = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("embedded")); + useEGL = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("use.egl")); if (useEGL) { - doEGLCompositing = AccessController.doPrivileged(new PrivilegedAction() { - @Override public Boolean run() { - return Boolean.getBoolean("doNativeComposite"); - } - }); + doEGLCompositing = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("doNativeComposite")); } else doEGLCompositing = false; } @@ -156,11 +132,7 @@ public static boolean useGLES2() { String useGles2 = "false"; useGles2 = - AccessController.doPrivileged(new PrivilegedAction() { - public String run() { - return System.getProperty("use.gles2"); - } - }); + AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty("use.gles2")); if ("true".equals(useGles2)) return true; else @@ -278,35 +250,33 @@ (vmname != null && vmname.indexOf("Embedded") > 0))) { return; } - AccessController.doPrivileged(new PrivilegedAction() { - public Void run() { - final File rtDir = getRTDir(); - final String propertyFilename = "javafx.platform.properties"; - File rtProperties = new File(rtDir, propertyFilename); - // First look for javafx.platform.properties in the JavaFX runtime - // Then in the installation directory of the JRE - if (rtProperties.exists()) { - loadPropertiesFromFile(rtProperties); - return null; - } - String javaHome = System.getProperty("java.home"); - File javaHomeProperties = new File(javaHome, - "lib" + File.separator - + propertyFilename); - if (javaHomeProperties.exists()) { - loadPropertiesFromFile(javaHomeProperties); - return null; - } - - String javafxRuntimePath = System.getProperty("javafx.runtime.path"); - File javafxRuntimePathProperties = new File(javafxRuntimePath, - File.separator + propertyFilename); - if (javafxRuntimePathProperties.exists()) { - loadPropertiesFromFile(javafxRuntimePathProperties); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + final File rtDir = getRTDir(); + final String propertyFilename = "javafx.platform.properties"; + File rtProperties = new File(rtDir, propertyFilename); + // First look for javafx.platform.properties in the JavaFX runtime + // Then in the installation directory of the JRE + if (rtProperties.exists()) { + loadPropertiesFromFile(rtProperties); return null; } + String javaHome = System.getProperty("java.home"); + File javaHomeProperties = new File(javaHome, + "lib" + File.separator + + propertyFilename); + if (javaHomeProperties.exists()) { + loadPropertiesFromFile(javaHomeProperties); + return null; + } + + String javafxRuntimePath = System.getProperty("javafx.runtime.path"); + File javafxRuntimePathProperties = new File(javafxRuntimePath, + File.separator + propertyFilename); + if (javafxRuntimePathProperties.exists()) { + loadPropertiesFromFile(javafxRuntimePathProperties); + return null; + } + return null; }); } diff --git a/modules/base/src/main/java/com/sun/javafx/collections/TrackableObservableList.java b/modules/base/src/main/java/com/sun/javafx/collections/TrackableObservableList.java --- a/modules/base/src/main/java/com/sun/javafx/collections/TrackableObservableList.java +++ b/modules/base/src/main/java/com/sun/javafx/collections/TrackableObservableList.java @@ -41,12 +41,8 @@ public TrackableObservableList() { super(new ArrayList()); - addListener(new ListChangeListener() { - - @Override - public void onChanged(Change c) { - TrackableObservableList.this.onChanged((Change)c); - } + addListener((Change c) -> { + TrackableObservableList.this.onChanged((Change)c); }); } diff --git a/modules/base/src/main/java/com/sun/javafx/collections/UnmodifiableObservableMap.java b/modules/base/src/main/java/com/sun/javafx/collections/UnmodifiableObservableMap.java --- a/modules/base/src/main/java/com/sun/javafx/collections/UnmodifiableObservableMap.java +++ b/modules/base/src/main/java/com/sun/javafx/collections/UnmodifiableObservableMap.java @@ -51,11 +51,8 @@ public UnmodifiableObservableMap(ObservableMap map) { this.backingMap = map; - listener = new MapChangeListener() { - @Override - public void onChanged(Change c) { - callObservers(new MapAdapterChange(UnmodifiableObservableMap.this, c)); - } + listener = c -> { + callObservers(new MapAdapterChange(UnmodifiableObservableMap.this, c)); }; this.backingMap.addListener(new WeakMapChangeListener(listener)); } diff --git a/modules/base/src/main/java/com/sun/javafx/collections/VetoableListDecorator.java b/modules/base/src/main/java/com/sun/javafx/collections/VetoableListDecorator.java --- a/modules/base/src/main/java/com/sun/javafx/collections/VetoableListDecorator.java +++ b/modules/base/src/main/java/com/sun/javafx/collections/VetoableListDecorator.java @@ -72,12 +72,9 @@ public VetoableListDecorator(ObservableList decorated) { this.list = decorated; - this.list.addListener(new ListChangeListener() { - @Override - public void onChanged(ListChangeListener.Change c) { - ListListenerHelper.fireValueChangedEvent(helper, - new SourceAdapterChange(VetoableListDecorator.this, c)); - } + this.list.addListener((ListChangeListener.Change c) -> { + ListListenerHelper.fireValueChangedEvent(helper, + new SourceAdapterChange(VetoableListDecorator.this, c)); }); } diff --git a/modules/base/src/main/java/com/sun/javafx/logging/PrintLogger.java b/modules/base/src/main/java/com/sun/javafx/logging/PrintLogger.java --- a/modules/base/src/main/java/com/sun/javafx/logging/PrintLogger.java +++ b/modules/base/src/main/java/com/sun/javafx/logging/PrintLogger.java @@ -62,22 +62,13 @@ * only the time of the pulse is logged. */ private static long THRESHOLD = (long) - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Integer run() { - return Integer.getInteger("javafx.pulseLogger.threshold", 17); - } - }); + AccessController.doPrivileged((PrivilegedAction) () -> Integer.getInteger("javafx.pulseLogger.threshold", 17)); /** * Optionally exit after a given number of pulses */ private static final int EXIT_ON_PULSE = - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Integer run() { - return Integer.getInteger("javafx.pulseLogger.exitOnPulse", 0); - } - }); + AccessController.doPrivileged((PrivilegedAction) () -> Integer.getInteger("javafx.pulseLogger.exitOnPulse", 0)); /** * We have a simple counter that keeps track of the current pulse number. @@ -160,11 +151,7 @@ public static Logger getInstance() { if (printLogger == null) { - boolean enabled = AccessController.doPrivileged(new PrivilegedAction() { - @Override public Boolean run() { - return Boolean.getBoolean("javafx.pulseLogger"); - } - }); + boolean enabled = AccessController.doPrivileged((PrivilegedAction) () -> Boolean.getBoolean("javafx.pulseLogger")); if (enabled) { printLogger = new PrintLogger(); } @@ -408,12 +395,7 @@ if (!counters.isEmpty()) { System.err.println("Counters:"); List> entries = new ArrayList(counters.entrySet()); - Collections.sort(entries, new Comparator>() { - @Override - public int compare(Map.Entry a, Map.Entry b) { - return a.getKey().compareTo(b.getKey()); - } - }); + Collections.sort(entries, (a, b) -> a.getKey().compareTo(b.getKey())); for (Map.Entry entry : entries) { System.err.println("\t" + entry.getKey() + ": " + entry.getValue().value); } diff --git a/modules/base/src/main/java/com/sun/javafx/runtime/SystemProperties.java b/modules/base/src/main/java/com/sun/javafx/runtime/SystemProperties.java --- a/modules/base/src/main/java/com/sun/javafx/runtime/SystemProperties.java +++ b/modules/base/src/main/java/com/sun/javafx/runtime/SystemProperties.java @@ -61,14 +61,12 @@ private static boolean isDebug; static { - AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { - addProperties (sysprop_table, false); - addProperties (jfxprop_table, true); - setVersions(); - isDebug = "true".equalsIgnoreCase(getProperty("javafx.debug")); - return null; - } + AccessController.doPrivileged((PrivilegedAction) () -> { + addProperties (sysprop_table, false); + addProperties (jfxprop_table, true); + setVersions(); + isDebug = "true".equalsIgnoreCase(getProperty("javafx.debug")); + return null; }); } diff --git a/modules/base/src/main/java/javafx/beans/property/ListPropertyBase.java b/modules/base/src/main/java/javafx/beans/property/ListPropertyBase.java --- a/modules/base/src/main/java/javafx/beans/property/ListPropertyBase.java +++ b/modules/base/src/main/java/javafx/beans/property/ListPropertyBase.java @@ -50,13 +50,10 @@ */ public abstract class ListPropertyBase extends ListProperty { - private final ListChangeListener listChangeListener = new ListChangeListener() { - @Override - public void onChanged(Change change) { - invalidateProperties(); - invalidated(); - fireValueChangedEvent(change); - } + private final ListChangeListener listChangeListener = change -> { + invalidateProperties(); + invalidated(); + fireValueChangedEvent(change); }; private ObservableList value; diff --git a/modules/base/src/main/java/javafx/beans/property/MapPropertyBase.java b/modules/base/src/main/java/javafx/beans/property/MapPropertyBase.java --- a/modules/base/src/main/java/javafx/beans/property/MapPropertyBase.java +++ b/modules/base/src/main/java/javafx/beans/property/MapPropertyBase.java @@ -50,13 +50,10 @@ */ public abstract class MapPropertyBase extends MapProperty { - private final MapChangeListener mapChangeListener = new MapChangeListener() { - @Override - public void onChanged(Change change) { - invalidateProperties(); - invalidated(); - fireValueChangedEvent(change); - } + private final MapChangeListener mapChangeListener = change -> { + invalidateProperties(); + invalidated(); + fireValueChangedEvent(change); }; private ObservableMap value; diff --git a/modules/base/src/main/java/javafx/beans/property/ReadOnlyBooleanProperty.java b/modules/base/src/main/java/javafx/beans/property/ReadOnlyBooleanProperty.java --- a/modules/base/src/main/java/javafx/beans/property/ReadOnlyBooleanProperty.java +++ b/modules/base/src/main/java/javafx/beans/property/ReadOnlyBooleanProperty.java @@ -94,13 +94,10 @@ return property instanceof ReadOnlyBooleanProperty ? (ReadOnlyBooleanProperty) property : new ReadOnlyBooleanPropertyBase() { private boolean valid = true; - private final InvalidationListener listener = new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - if (valid) { - valid = false; - fireValueChangedEvent(); - } + private final InvalidationListener listener = observable -> { + if (valid) { + valid = false; + fireValueChangedEvent(); } }; @@ -141,13 +138,10 @@ return new ReadOnlyObjectPropertyBase() { private boolean valid = true; - private final InvalidationListener listener = new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - if (valid) { - valid = false; - fireValueChangedEvent(); - } + private final InvalidationListener listener = observable -> { + if (valid) { + valid = false; + fireValueChangedEvent(); } }; diff --git a/modules/base/src/main/java/javafx/beans/property/ReadOnlyDoubleProperty.java b/modules/base/src/main/java/javafx/beans/property/ReadOnlyDoubleProperty.java --- a/modules/base/src/main/java/javafx/beans/property/ReadOnlyDoubleProperty.java +++ b/modules/base/src/main/java/javafx/beans/property/ReadOnlyDoubleProperty.java @@ -94,13 +94,10 @@ return property instanceof ReadOnlyDoubleProperty ? (ReadOnlyDoubleProperty) property: new ReadOnlyDoublePropertyBase() { private boolean valid = true; - private final InvalidationListener listener = new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - if (valid) { - valid = false; - fireValueChangedEvent(); - } + private final InvalidationListener listener = observable -> { + if (valid) { + valid = false; + fireValueChangedEvent(); } }; @@ -141,13 +138,10 @@ return new ReadOnlyObjectPropertyBase() { private boolean valid = true; - private final InvalidationListener listener = new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - if (valid) { - valid = false; - fireValueChangedEvent(); - } + private final InvalidationListener listener = observable -> { + if (valid) { + valid = false; + fireValueChangedEvent(); } }; diff --git a/modules/base/src/main/java/javafx/beans/property/ReadOnlyFloatProperty.java b/modules/base/src/main/java/javafx/beans/property/ReadOnlyFloatProperty.java --- a/modules/base/src/main/java/javafx/beans/property/ReadOnlyFloatProperty.java +++ b/modules/base/src/main/java/javafx/beans/property/ReadOnlyFloatProperty.java @@ -94,13 +94,10 @@ return property instanceof ReadOnlyFloatProperty ? (ReadOnlyFloatProperty) property: new ReadOnlyFloatPropertyBase() { private boolean valid = true; - private final InvalidationListener listener = new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - if (valid) { - valid = false; - fireValueChangedEvent(); - } + private final InvalidationListener listener = observable -> { + if (valid) { + valid = false; + fireValueChangedEvent(); } }; @@ -141,13 +138,10 @@ return new ReadOnlyObjectPropertyBase() { private boolean valid = true; - private final InvalidationListener listener = new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - if (valid) { - valid = false; - fireValueChangedEvent(); - } + private final InvalidationListener listener = observable -> { + if (valid) { + valid = false; + fireValueChangedEvent(); } }; diff --git a/modules/base/src/main/java/javafx/beans/property/ReadOnlyIntegerProperty.java b/modules/base/src/main/java/javafx/beans/property/ReadOnlyIntegerProperty.java --- a/modules/base/src/main/java/javafx/beans/property/ReadOnlyIntegerProperty.java +++ b/modules/base/src/main/java/javafx/beans/property/ReadOnlyIntegerProperty.java @@ -95,13 +95,10 @@ return property instanceof ReadOnlyIntegerProperty ? (ReadOnlyIntegerProperty) property: new ReadOnlyIntegerPropertyBase() { private boolean valid = true; - private final InvalidationListener listener = new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - if (valid) { - valid = false; - fireValueChangedEvent(); - } + private final InvalidationListener listener = observable -> { + if (valid) { + valid = false; + fireValueChangedEvent(); } }; @@ -142,13 +139,10 @@ return new ReadOnlyObjectPropertyBase() { private boolean valid = true; - private final InvalidationListener listener = new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - if (valid) { - valid = false; - fireValueChangedEvent(); - } + private final InvalidationListener listener = observable -> { + if (valid) { + valid = false; + fireValueChangedEvent(); } }; diff --git a/modules/base/src/main/java/javafx/beans/property/ReadOnlyLongProperty.java b/modules/base/src/main/java/javafx/beans/property/ReadOnlyLongProperty.java --- a/modules/base/src/main/java/javafx/beans/property/ReadOnlyLongProperty.java +++ b/modules/base/src/main/java/javafx/beans/property/ReadOnlyLongProperty.java @@ -93,13 +93,10 @@ return property instanceof ReadOnlyLongProperty ? (ReadOnlyLongProperty) property: new ReadOnlyLongPropertyBase() { private boolean valid = true; - private final InvalidationListener listener = new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - if (valid) { - valid = false; - fireValueChangedEvent(); - } + private final InvalidationListener listener = observable -> { + if (valid) { + valid = false; + fireValueChangedEvent(); } }; @@ -140,13 +137,10 @@ return new ReadOnlyObjectPropertyBase() { private boolean valid = true; - private final InvalidationListener listener = new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - if (valid) { - valid = false; - fireValueChangedEvent(); - } + private final InvalidationListener listener = observable -> { + if (valid) { + valid = false; + fireValueChangedEvent(); } }; diff --git a/modules/base/src/main/java/javafx/beans/property/SetPropertyBase.java b/modules/base/src/main/java/javafx/beans/property/SetPropertyBase.java --- a/modules/base/src/main/java/javafx/beans/property/SetPropertyBase.java +++ b/modules/base/src/main/java/javafx/beans/property/SetPropertyBase.java @@ -50,13 +50,10 @@ */ public abstract class SetPropertyBase extends SetProperty { - private final SetChangeListener setChangeListener = new SetChangeListener() { - @Override - public void onChanged(Change change) { - invalidateProperties(); - invalidated(); - fireValueChangedEvent(change); - } + private final SetChangeListener setChangeListener = change -> { + invalidateProperties(); + invalidated(); + fireValueChangedEvent(change); }; private ObservableSet value; diff --git a/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanBooleanProperty.java b/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanBooleanProperty.java --- a/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanBooleanProperty.java +++ b/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanBooleanProperty.java @@ -77,11 +77,8 @@ this.descriptor = descriptor; this.listener = descriptor.new Listener(bean, this); descriptor.addListener(listener); - Cleaner.create(this, new Runnable() { - @Override - public void run() { - JavaBeanBooleanProperty.this.descriptor.removeListener(listener); - } + Cleaner.create(this, () -> { + JavaBeanBooleanProperty.this.descriptor.removeListener(listener); }); } @@ -94,15 +91,13 @@ */ @Override public boolean get() { - return AccessController.doPrivileged(new PrivilegedAction() { - public Boolean run() { - try { - return (Boolean)MethodUtil.invoke(descriptor.getGetter(), getBean(), (Object[])null); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } + return AccessController.doPrivileged((PrivilegedAction) () -> { + try { + return (Boolean)MethodUtil.invoke(descriptor.getGetter(), getBean(), (Object[])null); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } }, acc); } @@ -120,18 +115,16 @@ throw new RuntimeException("A bound value cannot be set."); } - AccessController.doPrivileged(new PrivilegedAction() { - public Void run() { - try { - MethodUtil.invoke(descriptor.getSetter(), getBean(), new Object[] {value}); - ExpressionHelper.fireValueChangedEvent(helper); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + try { + MethodUtil.invoke(descriptor.getSetter(), getBean(), new Object[] {value}); + ExpressionHelper.fireValueChangedEvent(helper); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } + return null; }, acc); } diff --git a/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanDoubleProperty.java b/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanDoubleProperty.java --- a/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanDoubleProperty.java +++ b/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanDoubleProperty.java @@ -77,11 +77,8 @@ this.descriptor = descriptor; this.listener = descriptor.new Listener(bean, this); descriptor.addListener(listener); - Cleaner.create(this, new Runnable() { - @Override - public void run() { - JavaBeanDoubleProperty.this.descriptor.removeListener(listener); - } + Cleaner.create(this, () -> { + JavaBeanDoubleProperty.this.descriptor.removeListener(listener); }); } @@ -94,16 +91,14 @@ */ @Override public double get() { - return AccessController.doPrivileged(new PrivilegedAction() { - public Double run() { - try { - return ((Number)MethodUtil.invoke( - descriptor.getGetter(), getBean(), (Object[])null)).doubleValue(); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } + return AccessController.doPrivileged((PrivilegedAction) () -> { + try { + return ((Number)MethodUtil.invoke( + descriptor.getGetter(), getBean(), (Object[])null)).doubleValue(); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } }, acc); } @@ -121,18 +116,16 @@ throw new RuntimeException("A bound value cannot be set."); } - AccessController.doPrivileged(new PrivilegedAction() { - public Void run() { - try { - MethodUtil.invoke(descriptor.getSetter(), getBean(), new Object[] {value}); - ExpressionHelper.fireValueChangedEvent(helper); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + try { + MethodUtil.invoke(descriptor.getSetter(), getBean(), new Object[] {value}); + ExpressionHelper.fireValueChangedEvent(helper); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } + return null; }, acc); } diff --git a/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanFloatProperty.java b/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanFloatProperty.java --- a/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanFloatProperty.java +++ b/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanFloatProperty.java @@ -77,11 +77,8 @@ this.descriptor = descriptor; this.listener = descriptor.new Listener(bean, this); descriptor.addListener(listener); - Cleaner.create(this, new Runnable() { - @Override - public void run() { - JavaBeanFloatProperty.this.descriptor.removeListener(listener); - } + Cleaner.create(this, () -> { + JavaBeanFloatProperty.this.descriptor.removeListener(listener); }); } @@ -94,16 +91,14 @@ */ @Override public float get() { - return AccessController.doPrivileged(new PrivilegedAction() { - public Float run() { - try { - return ((Number)MethodUtil.invoke( - descriptor.getGetter(), getBean(), (Object[])null)).floatValue(); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } + return AccessController.doPrivileged((PrivilegedAction) () -> { + try { + return ((Number)MethodUtil.invoke( + descriptor.getGetter(), getBean(), (Object[])null)).floatValue(); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } }, acc); } @@ -120,18 +115,16 @@ if (isBound()) { throw new RuntimeException("A bound value cannot be set."); } - AccessController.doPrivileged(new PrivilegedAction() { - public Void run() { - try { - MethodUtil.invoke(descriptor.getSetter(), getBean(), new Object[] {value}); - ExpressionHelper.fireValueChangedEvent(helper); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + try { + MethodUtil.invoke(descriptor.getSetter(), getBean(), new Object[] {value}); + ExpressionHelper.fireValueChangedEvent(helper); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } + return null; }, acc); } diff --git a/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanIntegerProperty.java b/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanIntegerProperty.java --- a/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanIntegerProperty.java +++ b/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanIntegerProperty.java @@ -77,11 +77,8 @@ this.descriptor = descriptor; this.listener = descriptor.new Listener(bean, this); descriptor.addListener(listener); - Cleaner.create(this, new Runnable() { - @Override - public void run() { - JavaBeanIntegerProperty.this.descriptor.removeListener(listener); - } + Cleaner.create(this, () -> { + JavaBeanIntegerProperty.this.descriptor.removeListener(listener); }); } @@ -94,16 +91,14 @@ */ @Override public int get() { - return AccessController.doPrivileged(new PrivilegedAction() { - public Integer run() { - try { - return ((Number)MethodUtil.invoke( - descriptor.getGetter(), getBean(), (Object[])null)).intValue(); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } + return AccessController.doPrivileged((PrivilegedAction) () -> { + try { + return ((Number)MethodUtil.invoke( + descriptor.getGetter(), getBean(), (Object[])null)).intValue(); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } }, acc); } @@ -120,18 +115,16 @@ if (isBound()) { throw new RuntimeException("A bound value cannot be set."); } - AccessController.doPrivileged(new PrivilegedAction() { - public Void run() { - try { - MethodUtil.invoke(descriptor.getSetter(), getBean(), new Object[] {value}); - ExpressionHelper.fireValueChangedEvent(helper); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + try { + MethodUtil.invoke(descriptor.getSetter(), getBean(), new Object[] {value}); + ExpressionHelper.fireValueChangedEvent(helper); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } + return null; }, acc); } diff --git a/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanLongProperty.java b/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanLongProperty.java --- a/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanLongProperty.java +++ b/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanLongProperty.java @@ -77,11 +77,8 @@ this.descriptor = descriptor; this.listener = descriptor.new Listener(bean, this); descriptor.addListener(listener); - Cleaner.create(this, new Runnable() { - @Override - public void run() { - JavaBeanLongProperty.this.descriptor.removeListener(listener); - } + Cleaner.create(this, () -> { + JavaBeanLongProperty.this.descriptor.removeListener(listener); }); } @@ -94,16 +91,14 @@ */ @Override public long get() { - return AccessController.doPrivileged(new PrivilegedAction() { - public Long run() { - try { - return ((Number)MethodUtil.invoke( - descriptor.getGetter(), getBean(), (Object[])null)).longValue(); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } + return AccessController.doPrivileged((PrivilegedAction) () -> { + try { + return ((Number)MethodUtil.invoke( + descriptor.getGetter(), getBean(), (Object[])null)).longValue(); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } }, acc); } @@ -120,18 +115,16 @@ if (isBound()) { throw new RuntimeException("A bound value cannot be set."); } - AccessController.doPrivileged(new PrivilegedAction() { - public Void run() { - try { - MethodUtil.invoke(descriptor.getSetter(), getBean(), new Object[] {value}); - ExpressionHelper.fireValueChangedEvent(helper); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + try { + MethodUtil.invoke(descriptor.getSetter(), getBean(), new Object[] {value}); + ExpressionHelper.fireValueChangedEvent(helper); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } + return null; }, acc); } diff --git a/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanObjectProperty.java b/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanObjectProperty.java --- a/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanObjectProperty.java +++ b/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanObjectProperty.java @@ -79,11 +79,8 @@ this.descriptor = descriptor; this.listener = descriptor.new Listener(bean, this); descriptor.addListener(listener); - Cleaner.create(this, new Runnable() { - @Override - public void run() { - JavaBeanObjectProperty.this.descriptor.removeListener(listener); - } + Cleaner.create(this, () -> { + JavaBeanObjectProperty.this.descriptor.removeListener(listener); }); } @@ -97,15 +94,13 @@ @SuppressWarnings("unchecked") @Override public T get() { - return AccessController.doPrivileged(new PrivilegedAction() { - public T run() { - try { - return (T)MethodUtil.invoke(descriptor.getGetter(), getBean(), (Object[])null); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } + return AccessController.doPrivileged((PrivilegedAction) () -> { + try { + return (T)MethodUtil.invoke(descriptor.getGetter(), getBean(), (Object[])null); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } }, acc); } @@ -123,18 +118,16 @@ throw new RuntimeException("A bound value cannot be set."); } - AccessController.doPrivileged(new PrivilegedAction() { - public Void run() { - try { - MethodUtil.invoke(descriptor.getSetter(), getBean(), new Object[] {value}); - ExpressionHelper.fireValueChangedEvent(helper); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + try { + MethodUtil.invoke(descriptor.getSetter(), getBean(), new Object[] {value}); + ExpressionHelper.fireValueChangedEvent(helper); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } + return null; }, acc); } diff --git a/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanStringProperty.java b/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanStringProperty.java --- a/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanStringProperty.java +++ b/modules/base/src/main/java/javafx/beans/property/adapter/JavaBeanStringProperty.java @@ -77,11 +77,8 @@ this.descriptor = descriptor; this.listener = descriptor.new Listener(bean, this); descriptor.addListener(listener); - Cleaner.create(this, new Runnable() { - @Override - public void run() { - JavaBeanStringProperty.this.descriptor.removeListener(listener); - } + Cleaner.create(this, () -> { + JavaBeanStringProperty.this.descriptor.removeListener(listener); }); } @@ -94,15 +91,13 @@ */ @Override public String get() { - return AccessController.doPrivileged(new PrivilegedAction() { - public String run() { - try { - return (String)MethodUtil.invoke(descriptor.getGetter(), getBean(), (Object[])null); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } + return AccessController.doPrivileged((PrivilegedAction) () -> { + try { + return (String)MethodUtil.invoke(descriptor.getGetter(), getBean(), (Object[])null); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } }, acc); } @@ -119,18 +114,16 @@ if (isBound()) { throw new RuntimeException("A bound value cannot be set."); } - AccessController.doPrivileged(new PrivilegedAction() { - public Void run() { - try { - MethodUtil.invoke(descriptor.getSetter(), getBean(), new Object[] {value}); - ExpressionHelper.fireValueChangedEvent(helper); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } - return null; + AccessController.doPrivileged((PrivilegedAction) () -> { + try { + MethodUtil.invoke(descriptor.getSetter(), getBean(), new Object[] {value}); + ExpressionHelper.fireValueChangedEvent(helper); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } + return null; }, acc); } diff --git a/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanBooleanProperty.java b/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanBooleanProperty.java --- a/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanBooleanProperty.java +++ b/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanBooleanProperty.java @@ -66,11 +66,8 @@ this.descriptor = descriptor; this.listener = descriptor.new ReadOnlyListener(bean, this); descriptor.addListener(listener); - Cleaner.create(this, new Runnable() { - @Override - public void run() { - ReadOnlyJavaBeanBooleanProperty.this.descriptor.removeListener(listener); - } + Cleaner.create(this, () -> { + ReadOnlyJavaBeanBooleanProperty.this.descriptor.removeListener(listener); }); } @@ -83,15 +80,13 @@ */ @Override public boolean get() { - return AccessController.doPrivileged(new PrivilegedAction() { - public Boolean run() { - try { - return (Boolean)MethodUtil.invoke(descriptor.getGetter(), getBean(), (Object[])null); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } + return AccessController.doPrivileged((PrivilegedAction) () -> { + try { + return (Boolean)MethodUtil.invoke(descriptor.getGetter(), getBean(), (Object[])null); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } }, acc); } diff --git a/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanDoubleProperty.java b/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanDoubleProperty.java --- a/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanDoubleProperty.java +++ b/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanDoubleProperty.java @@ -66,11 +66,8 @@ this.descriptor = descriptor; this.listener = descriptor.new ReadOnlyListener(bean, this); descriptor.addListener(listener); - Cleaner.create(this, new Runnable() { - @Override - public void run() { - ReadOnlyJavaBeanDoubleProperty.this.descriptor.removeListener(listener); - } + Cleaner.create(this, () -> { + ReadOnlyJavaBeanDoubleProperty.this.descriptor.removeListener(listener); }); } @@ -83,16 +80,14 @@ */ @Override public double get() { - return AccessController.doPrivileged(new PrivilegedAction() { - public Double run() { - try { - return ((Number)MethodUtil.invoke( - descriptor.getGetter(), getBean(), (Object[])null)).doubleValue(); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } + return AccessController.doPrivileged((PrivilegedAction) () -> { + try { + return ((Number)MethodUtil.invoke( + descriptor.getGetter(), getBean(), (Object[])null)).doubleValue(); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } }, acc); } diff --git a/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanFloatProperty.java b/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanFloatProperty.java --- a/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanFloatProperty.java +++ b/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanFloatProperty.java @@ -66,11 +66,8 @@ this.descriptor = descriptor; this.listener = descriptor.new ReadOnlyListener(bean, this); descriptor.addListener(listener); - Cleaner.create(this, new Runnable() { - @Override - public void run() { - ReadOnlyJavaBeanFloatProperty.this.descriptor.removeListener(listener); - } + Cleaner.create(this, () -> { + ReadOnlyJavaBeanFloatProperty.this.descriptor.removeListener(listener); }); } @@ -83,16 +80,14 @@ */ @Override public float get() { - return AccessController.doPrivileged(new PrivilegedAction() { - public Float run() { - try { - return ((Number)MethodUtil.invoke( - descriptor.getGetter(), getBean(), (Object[])null)).floatValue(); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } + return AccessController.doPrivileged((PrivilegedAction) () -> { + try { + return ((Number)MethodUtil.invoke( + descriptor.getGetter(), getBean(), (Object[])null)).floatValue(); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } }, acc); } diff --git a/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanIntegerProperty.java b/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanIntegerProperty.java --- a/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanIntegerProperty.java +++ b/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanIntegerProperty.java @@ -66,11 +66,8 @@ this.descriptor = descriptor; this.listener = descriptor.new ReadOnlyListener(bean, this); descriptor.addListener(listener); - Cleaner.create(this, new Runnable() { - @Override - public void run() { - ReadOnlyJavaBeanIntegerProperty.this.descriptor.removeListener(listener); - } + Cleaner.create(this, () -> { + ReadOnlyJavaBeanIntegerProperty.this.descriptor.removeListener(listener); }); } @@ -83,16 +80,14 @@ */ @Override public int get() { - return AccessController.doPrivileged(new PrivilegedAction() { - public Integer run() { - try { - return ((Number)MethodUtil.invoke( - descriptor.getGetter(), getBean(), (Object[])null)).intValue(); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } + return AccessController.doPrivileged((PrivilegedAction) () -> { + try { + return ((Number)MethodUtil.invoke( + descriptor.getGetter(), getBean(), (Object[])null)).intValue(); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } }, acc); } diff --git a/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanLongProperty.java b/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanLongProperty.java --- a/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanLongProperty.java +++ b/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanLongProperty.java @@ -66,11 +66,8 @@ this.descriptor = descriptor; this.listener = descriptor.new ReadOnlyListener(bean, this); descriptor.addListener(listener); - Cleaner.create(this, new Runnable() { - @Override - public void run() { - ReadOnlyJavaBeanLongProperty.this.descriptor.removeListener(listener); - } + Cleaner.create(this, () -> { + ReadOnlyJavaBeanLongProperty.this.descriptor.removeListener(listener); }); } @@ -83,16 +80,14 @@ */ @Override public long get() { - return AccessController.doPrivileged(new PrivilegedAction() { - public Long run() { - try { - return ((Number)MethodUtil.invoke( - descriptor.getGetter(), getBean(), (Object[])null)).longValue(); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } + return AccessController.doPrivileged((PrivilegedAction) () -> { + try { + return ((Number)MethodUtil.invoke( + descriptor.getGetter(), getBean(), (Object[])null)).longValue(); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } }, acc); } diff --git a/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanObjectProperty.java b/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanObjectProperty.java --- a/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanObjectProperty.java +++ b/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanObjectProperty.java @@ -68,11 +68,8 @@ this.descriptor = descriptor; this.listener = descriptor.new ReadOnlyListener(bean, this); descriptor.addListener(listener); - Cleaner.create(this, new Runnable() { - @Override - public void run() { - ReadOnlyJavaBeanObjectProperty.this.descriptor.removeListener(listener); - } + Cleaner.create(this, () -> { + ReadOnlyJavaBeanObjectProperty.this.descriptor.removeListener(listener); }); } @@ -85,15 +82,13 @@ */ @Override public T get() { - return AccessController.doPrivileged(new PrivilegedAction() { - public T run() { - try { - return (T)MethodUtil.invoke(descriptor.getGetter(), getBean(), (Object[])null); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } + return AccessController.doPrivileged((PrivilegedAction) () -> { + try { + return (T)MethodUtil.invoke(descriptor.getGetter(), getBean(), (Object[])null); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } }, acc); } diff --git a/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanStringProperty.java b/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanStringProperty.java --- a/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanStringProperty.java +++ b/modules/base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanStringProperty.java @@ -66,11 +66,8 @@ this.descriptor = descriptor; this.listener = descriptor.new ReadOnlyListener(bean, this); descriptor.addListener(listener); - Cleaner.create(this, new Runnable() { - @Override - public void run() { - ReadOnlyJavaBeanStringProperty.this.descriptor.removeListener(listener); - } + Cleaner.create(this, () -> { + ReadOnlyJavaBeanStringProperty.this.descriptor.removeListener(listener); }); } @@ -83,15 +80,13 @@ */ @Override public String get() { - return AccessController.doPrivileged(new PrivilegedAction() { - public String run() { - try { - return (String)MethodUtil.invoke(descriptor.getGetter(), getBean(), (Object[])null); - } catch (IllegalAccessException e) { - throw new UndeclaredThrowableException(e); - } catch (InvocationTargetException e) { - throw new UndeclaredThrowableException(e); - } + return AccessController.doPrivileged((PrivilegedAction) () -> { + try { + return (String)MethodUtil.invoke(descriptor.getGetter(), getBean(), (Object[])null); + } catch (IllegalAccessException e) { + throw new UndeclaredThrowableException(e); + } catch (InvocationTargetException e) { + throw new UndeclaredThrowableException(e); } }, acc); } diff --git a/modules/base/src/main/java/javafx/collections/FXCollections.java b/modules/base/src/main/java/javafx/collections/FXCollections.java --- a/modules/base/src/main/java/javafx/collections/FXCollections.java +++ b/modules/base/src/main/java/javafx/collections/FXCollections.java @@ -925,12 +925,8 @@ public UnmodifiableObservableListImpl(ObservableList backingList) { this.backingList = backingList; - listener = new ListChangeListener() { - - @Override - public void onChanged(Change c) { - fireChange(new SourceAdapterChange(UnmodifiableObservableListImpl.this, c)); - } + listener = c -> { + fireChange(new SourceAdapterChange(UnmodifiableObservableListImpl.this, c)); }; this.backingList.addListener(new WeakListChangeListener(listener)); } @@ -1183,12 +1179,8 @@ SynchronizedObservableList(ObservableList seq, Object mutex) { super(seq, mutex); this.backingList = seq; - listener = new ListChangeListener() { - - @Override - public void onChanged(Change c) { - ListListenerHelper.fireValueChangedEvent(helper, new SourceAdapterChange(SynchronizedObservableList.this, c)); - } + listener = c -> { + ListListenerHelper.fireValueChangedEvent(helper, new SourceAdapterChange(SynchronizedObservableList.this, c)); }; backingList.addListener(new WeakListChangeListener(listener)); } @@ -1274,12 +1266,8 @@ } this.list = list; this.type = type; - listener = new ListChangeListener() { - - @Override - public void onChanged(Change c) { - fireChange(new SourceAdapterChange(CheckedObservableList.this, c)); - } + listener = c -> { + fireChange(new SourceAdapterChange(CheckedObservableList.this, c)); }; list.addListener(new WeakListChangeListener(listener)); } @@ -1651,11 +1639,8 @@ private void initListener() { if (listener == null) { - listener = new SetChangeListener() { - @Override - public void onChanged(Change c) { - callObservers(new SetAdapterChange(UnmodifiableObservableSet.this, c)); - } + listener = c -> { + callObservers(new SetAdapterChange(UnmodifiableObservableSet.this, c)); }; this.backingSet.addListener(new WeakSetChangeListener(listener)); } @@ -1874,11 +1859,8 @@ SynchronizedObservableSet(ObservableSet set, Object mutex) { super(set, mutex); backingSet = set; - listener = new SetChangeListener() { - @Override - public void onChanged(Change c) { - SetListenerHelper.fireValueChangedEvent(listenerHelper, new SetAdapterChange(SynchronizedObservableSet.this, c)); - } + listener = c -> { + SetListenerHelper.fireValueChangedEvent(listenerHelper, new SetAdapterChange(SynchronizedObservableSet.this, c)); }; backingSet.addListener(new WeakSetChangeListener(listener)); } @@ -1920,11 +1902,8 @@ } backingSet = set; this.type = type; - listener = new SetChangeListener() { - @Override - public void onChanged(SetChangeListener.Change c) { - callObservers(new SetAdapterChange(CheckedObservableSet.this, c)); - } + listener = c -> { + callObservers(new SetAdapterChange(CheckedObservableSet.this, c)); }; backingSet.addListener(new WeakSetChangeListener(listener)); } @@ -2148,11 +2127,8 @@ backingMap = map; this.keyType = keyType; this.valueType = valueType; - listener = new MapChangeListener() { - @Override - public void onChanged(MapChangeListener.Change c) { - callObservers(new MapAdapterChange(CheckedObservableMap.this, c)); - } + listener = c -> { + callObservers(new MapAdapterChange(CheckedObservableMap.this, c)); }; backingMap.addListener(new WeakMapChangeListener(listener)); } @@ -2769,11 +2745,8 @@ SynchronizedObservableMap(ObservableMap map, Object mutex) { super(map, mutex); backingMap = map; - listener = new MapChangeListener() { - @Override - public void onChanged(Change c) { - MapListenerHelper.fireValueChangedEvent(listenerHelper, new MapAdapterChange(SynchronizedObservableMap.this, c)); - } + listener = c -> { + MapListenerHelper.fireValueChangedEvent(listenerHelper, new MapAdapterChange(SynchronizedObservableMap.this, c)); }; backingMap.addListener(new WeakMapChangeListener(listener)); } diff --git a/modules/base/src/main/java/javafx/collections/transformation/FilteredList.java b/modules/base/src/main/java/javafx/collections/transformation/FilteredList.java --- a/modules/base/src/main/java/javafx/collections/transformation/FilteredList.java +++ b/modules/base/src/main/java/javafx/collections/transformation/FilteredList.java @@ -53,14 +53,7 @@ private int size; private SortHelper helper; - private static final Predicate ALWAYS_TRUE = new Predicate() { - - @Override - public boolean test(Object t) { - return true; - } - - }; + private static final Predicate ALWAYS_TRUE = t -> true; /** * Constructs a new FilteredList wrapper around the source list. diff --git a/modules/base/src/main/java/javafx/collections/transformation/TransformationList.java b/modules/base/src/main/java/javafx/collections/transformation/TransformationList.java --- a/modules/base/src/main/java/javafx/collections/transformation/TransformationList.java +++ b/modules/base/src/main/java/javafx/collections/transformation/TransformationList.java @@ -102,12 +102,8 @@ private ListChangeListener getListener() { if (sourceListener == null) { - sourceListener = new ListChangeListener() { - - @Override - public void onChanged(Change c) { - TransformationList.this.sourceChanged(c); - } + sourceListener = c -> { + TransformationList.this.sourceChanged(c); }; } return sourceListener; diff --git a/modules/base/src/main/java/javafx/event/Event.java b/modules/base/src/main/java/javafx/event/Event.java --- a/modules/base/src/main/java/javafx/event/Event.java +++ b/modules/base/src/main/java/javafx/event/Event.java @@ -47,13 +47,7 @@ /** * The constant which represents an unknown event source / target. */ - public static final EventTarget NULL_SOURCE_TARGET = new EventTarget() { - @Override - public EventDispatchChain buildEventDispatchChain( - final EventDispatchChain tail) { - return tail; - } - }; + public static final EventTarget NULL_SOURCE_TARGET = tail -> tail; /** * Common supertype for all event types. diff --git a/modules/base/src/test/java/com/sun/javafx/binding/ExpressionHelperBaseTest.java b/modules/base/src/test/java/com/sun/javafx/binding/ExpressionHelperBaseTest.java --- a/modules/base/src/test/java/com/sun/javafx/binding/ExpressionHelperBaseTest.java +++ b/modules/base/src/test/java/com/sun/javafx/binding/ExpressionHelperBaseTest.java @@ -35,19 +35,9 @@ private static final Object listener = new Object(); private static final Object listener2 = new Object(); - private static final WeakListener validWeakListener = new WeakListener() { - @Override - public boolean wasGarbageCollected() { - return false; - } - }; + private static final WeakListener validWeakListener = () -> false; - private static final WeakListener gcedWeakListener = new WeakListener() { - @Override - public boolean wasGarbageCollected() { - return true; - } - }; + private static final WeakListener gcedWeakListener = () -> true; @Test public void testEmptyArray() { diff --git a/modules/base/src/test/java/com/sun/javafx/collections/ListListenerHelperTest.java b/modules/base/src/test/java/com/sun/javafx/collections/ListListenerHelperTest.java --- a/modules/base/src/test/java/com/sun/javafx/collections/ListListenerHelperTest.java +++ b/modules/base/src/test/java/com/sun/javafx/collections/ListListenerHelperTest.java @@ -151,11 +151,8 @@ @Test public void testInvalidation_ChangeInPulse() { - final InvalidationListener listener = new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - helper = ListListenerHelper.addListener(helper, invalidationListenerMock[0]); - } + final InvalidationListener listener = observable -> { + helper = ListListenerHelper.addListener(helper, invalidationListenerMock[0]); }; helper = ListListenerHelper.addListener(helper, listener); ListListenerHelper.fireValueChangedEvent(helper, change); @@ -210,11 +207,8 @@ @Test public void testChange_ChangeInPulse() { - final ListChangeListener listener = new ListChangeListener() { - @Override - public void onChanged(Change c) { - helper = ListListenerHelper.addListener(helper, changeListenerMock[0]); - } + final ListChangeListener listener = c -> { + helper = ListListenerHelper.addListener(helper, changeListenerMock[0]); }; helper = ListListenerHelper.addListener(helper, listener); ListListenerHelper.fireValueChangedEvent(helper, change); diff --git a/modules/base/src/test/java/com/sun/javafx/collections/MapListenerHelperTest.java b/modules/base/src/test/java/com/sun/javafx/collections/MapListenerHelperTest.java --- a/modules/base/src/test/java/com/sun/javafx/collections/MapListenerHelperTest.java +++ b/modules/base/src/test/java/com/sun/javafx/collections/MapListenerHelperTest.java @@ -149,11 +149,8 @@ @Test public void testInvalidation_ChangeInPulse() { - final InvalidationListener listener = new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - helper = MapListenerHelper.addListener(helper, invalidationListenerMock[0]); - } + final InvalidationListener listener = observable -> { + helper = MapListenerHelper.addListener(helper, invalidationListenerMock[0]); }; helper = MapListenerHelper.addListener(helper, listener); MapListenerHelper.fireValueChangedEvent(helper, change); @@ -208,11 +205,8 @@ @Test public void testChange_ChangeInPulse() { - final MapChangeListener listener = new MapChangeListener() { - @Override - public void onChanged(Change change) { - helper = MapListenerHelper.addListener(helper, changeListenerMock[0]); - } + final MapChangeListener listener = change1 -> { + helper = MapListenerHelper.addListener(helper, changeListenerMock[0]); }; helper = MapListenerHelper.addListener(helper, listener); MapListenerHelper.fireValueChangedEvent(helper, change); diff --git a/modules/base/src/test/java/com/sun/javafx/collections/MappingChangeTest.java b/modules/base/src/test/java/com/sun/javafx/collections/MappingChangeTest.java --- a/modules/base/src/test/java/com/sun/javafx/collections/MappingChangeTest.java +++ b/modules/base/src/test/java/com/sun/javafx/collections/MappingChangeTest.java @@ -49,12 +49,7 @@ public void testAddRemove() { Change change = new NonIterableChange.SimpleRemovedChange(0, 1, new Integer(5), originalList); MappingChange mapChange = new MappingChange(change, - new MappingChange.Map() { - @Override - public String map(Integer e) { - return e.toString(); - } - }, list); + e -> e.toString(), list); assertTrue(mapChange.next()); assertEquals(0, mapChange.getFrom()); @@ -69,12 +64,7 @@ public void testUpdate() { Change change = new NonIterableChange.SimpleUpdateChange(0, 1, originalList); MappingChange mapChange = new MappingChange(change, - new MappingChange.Map() { - @Override - public String map(Integer e) { - return e.toString(); - } - }, list); + e -> e.toString(), list); assertTrue(mapChange.next()); assertEquals(0, mapChange.getFrom()); @@ -89,12 +79,7 @@ public void testPermutation() { Change change = new NonIterableChange.SimplePermutationChange(0, 2, new int[] {1, 0}, originalList); MappingChange mapChange = new MappingChange(change, - new MappingChange.Map() { - @Override - public String map(Integer e) { - return e.toString(); - } - }, list); + e -> e.toString(), list); assertTrue(mapChange.next()); assertEquals(0, mapChange.getFrom()); @@ -147,12 +132,7 @@ } }; MappingChange mapChange = new MappingChange(change, - new MappingChange.Map() { - @Override - public String map(Integer e) { - return e.toString(); - } - }, list); + e -> e.toString(), list); assertTrue(mapChange.next()); assertEquals(0, mapChange.getFrom()); diff --git a/modules/base/src/test/java/com/sun/javafx/collections/SetListenerHelperTest.java b/modules/base/src/test/java/com/sun/javafx/collections/SetListenerHelperTest.java --- a/modules/base/src/test/java/com/sun/javafx/collections/SetListenerHelperTest.java +++ b/modules/base/src/test/java/com/sun/javafx/collections/SetListenerHelperTest.java @@ -153,11 +153,8 @@ @Test public void testInvalidation_ChangeInPulse() { - final InvalidationListener listener = new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - helper = SetListenerHelper.addListener(helper, invalidationListenerMock[0]); - } + final InvalidationListener listener = observable -> { + helper = SetListenerHelper.addListener(helper, invalidationListenerMock[0]); }; helper = SetListenerHelper.addListener(helper, listener); SetListenerHelper.fireValueChangedEvent(helper, change); @@ -212,11 +209,8 @@ @Test public void testChange_ChangeInPulse() { - final SetChangeListener listener = new SetChangeListener() { - @Override - public void onChanged(Change change) { - helper = SetListenerHelper.addListener(helper, changeListenerMock[0]); - } + final SetChangeListener listener = change1 -> { + helper = SetListenerHelper.addListener(helper, changeListenerMock[0]); }; helper = SetListenerHelper.addListener(helper, listener); SetListenerHelper.fireValueChangedEvent(helper, change); diff --git a/modules/base/src/test/java/com/sun/javafx/event/EventHandlerManagerTest.java b/modules/base/src/test/java/com/sun/javafx/event/EventHandlerManagerTest.java --- a/modules/base/src/test/java/com/sun/javafx/event/EventHandlerManagerTest.java +++ b/modules/base/src/test/java/com/sun/javafx/event/EventHandlerManagerTest.java @@ -481,10 +481,7 @@ public void addEventHandlerShouldThrowNPEForNullEventType() { eventHandlerManager.addEventHandler( null, - new EventHandler() { - @Override - public void handle(final Event event) { - } + event -> { }); } @@ -497,10 +494,7 @@ public void removeEventHandlerShouldThrowNPEForNullEventType() { eventHandlerManager.removeEventHandler( null, - new EventHandler() { - @Override - public void handle(final Event event) { - } + event -> { }); } @@ -513,10 +507,7 @@ public void addEventFilterShouldThrowNPEForNullEventType() { eventHandlerManager.addEventFilter( null, - new EventHandler() { - @Override - public void handle(final Event event) { - } + event -> { }); } @@ -529,10 +520,7 @@ public void removeEventFilterShouldThrowNPEForNullEventType() { eventHandlerManager.removeEventHandler( null, - new EventHandler() { - @Override - public void handle(final Event event) { - } + event -> { }); } @@ -545,10 +533,7 @@ public void setEventHandlerShouldThrowNPEForNullEventType() { eventHandlerManager.setEventHandler( null, - new EventHandler() { - @Override - public void handle(final Event event) { - } + event -> { }); } diff --git a/modules/base/src/test/java/javafx/beans/property/adapter/JavaBeanPropertyTestBase.java b/modules/base/src/test/java/javafx/beans/property/adapter/JavaBeanPropertyTestBase.java --- a/modules/base/src/test/java/javafx/beans/property/adapter/JavaBeanPropertyTestBase.java +++ b/modules/base/src/test/java/javafx/beans/property/adapter/JavaBeanPropertyTestBase.java @@ -117,11 +117,8 @@ @Test public void testInvalidationListener() { final BooleanProperty fired = new SimpleBooleanProperty(false); - final InvalidationListener listener = new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - fired.set(true); - } + final InvalidationListener listener = observable -> { + fired.set(true); }; property.addListener(listener); @@ -138,11 +135,8 @@ @Test public void testChangeListener() { final BooleanProperty fired = new SimpleBooleanProperty(false); - final ChangeListener listener = new ChangeListener() { - @Override - public void changed(ObservableValue observable, Object oldValue, Object newValue) { - fired.set(true); - } + final ChangeListener listener = (observable, oldValue, newValue) -> { + fired.set(true); }; property.addListener(listener); diff --git a/modules/base/src/test/java/javafx/beans/property/adapter/ReadOnlyJavaBeanPropertyTestBase.java b/modules/base/src/test/java/javafx/beans/property/adapter/ReadOnlyJavaBeanPropertyTestBase.java --- a/modules/base/src/test/java/javafx/beans/property/adapter/ReadOnlyJavaBeanPropertyTestBase.java +++ b/modules/base/src/test/java/javafx/beans/property/adapter/ReadOnlyJavaBeanPropertyTestBase.java @@ -98,11 +98,8 @@ @Test public void testInvalidationListener() { final BooleanProperty fired = new SimpleBooleanProperty(false); - final InvalidationListener listener = new InvalidationListener() { - @Override - public void invalidated(Observable observable) { - fired.set(true); - } + final InvalidationListener listener = observable -> { + fired.set(true); }; property.addListener(listener); @@ -129,11 +126,8 @@ @Test public void testChangeListener() { final BooleanProperty fired = new SimpleBooleanProperty(false); - final ChangeListener listener = new ChangeListener() { - @Override - public void changed(ObservableValue observable, Object oldValue, Object newValue) { - fired.set(true); - } + final ChangeListener listener = (observable, oldValue, newValue) -> { + fired.set(true); }; property.addListener(listener); diff --git a/modules/base/src/test/java/javafx/binding/BindingsCreateBindingTest.java b/modules/base/src/test/java/javafx/binding/BindingsCreateBindingTest.java --- a/modules/base/src/test/java/javafx/binding/BindingsCreateBindingTest.java +++ b/modules/base/src/test/java/javafx/binding/BindingsCreateBindingTest.java @@ -97,12 +97,7 @@ log.reset(); // func returns value0, no dependencies specified - final Callable func0 = new Callable() { - @Override - public T call() throws Exception { - return value0; - } - }; + final Callable func0 = () -> value0; final Binding binding0 = f.create(func0); f.check(value0, binding0.getValue()); @@ -110,12 +105,7 @@ binding0.dispose(); // func returns value1, dependencies set to null - final Callable func1 = new Callable() { - @Override - public T call() throws Exception { - return value1; - } - }; + final Callable func1 = () -> value1; final Binding binding1 = f.create(func1, (Observable[])null); f.check(value1, binding1.getValue()); @@ -123,11 +113,8 @@ binding1.dispose(); // func throws exception, dependencies set to empty array - final Callable func2 = new Callable() { - @Override - public T call() throws Exception { - throw new Exception(); - } + final Callable func2 = () -> { + throw new Exception(); }; final Binding binding2 = f.create(func2, new Observable [0]); @@ -140,12 +127,7 @@ @Test public void testOneDependency() { - final Callable func = new Callable() { - @Override - public T call() throws Exception { - return p0.getValue(); - } - }; + final Callable func = () -> p0.getValue(); final Binding binding = f.create(func, p0); f.check(p0.getValue(), binding.getValue()); @@ -157,12 +139,7 @@ @Test public void testCreateBoolean_TwoDependencies() { - final Callable func = new Callable() { - @Override - public T call() throws Exception { - return p0.getValue(); - } - }; + final Callable func = () -> p0.getValue(); final Binding binding = f.create(func, p0, p1); f.check(p0.getValue(), binding.getValue()); diff --git a/modules/base/src/test/java/javafx/collections/FXCollectionsTest.java b/modules/base/src/test/java/javafx/collections/FXCollectionsTest.java --- a/modules/base/src/test/java/javafx/collections/FXCollectionsTest.java +++ b/modules/base/src/test/java/javafx/collections/FXCollectionsTest.java @@ -167,14 +167,7 @@ observer.check1Permutation(seq, new int[] {4, 8, 0, 5, 6, 9, 7, 1, 2, 3}); seq.setAll( "q", "w", "e", "r", "t", "y", "u", "i", "o", "p"); observer.clear(); - FXCollections.sort(seq, new Comparator() { - - @Override - public int compare(String o1, String o2) { - return o1.charAt(0) - o2.charAt(0); - } - - }); + FXCollections.sort(seq, (o1, o2) -> o1.charAt(0) - o2.charAt(0)); observer.check1Permutation(seq, new int[] {4, 8, 0, 5, 6, 9, 7, 1, 2, 3}); } @@ -198,13 +191,7 @@ observer.check1(); } observer.clear(); - FXCollections.sort(seq, new Comparator() { - - @Override - public int compare(String o1, String o2) { - return -o1.compareTo(o2); - } - }); + FXCollections.sort(seq, (o1, o2) -> -o1.compareTo(o2)); assertArrayEquals(new String[]{"two", "three", "one", "four", "five"}, seq.toArray(new String[0])); if (permutation) { observer.check1Permutation(seq, new int[] {4, 3, 2, 1, 0}); diff --git a/modules/base/src/test/java/javafx/collections/FilteredListTest.java b/modules/base/src/test/java/javafx/collections/FilteredListTest.java --- a/modules/base/src/test/java/javafx/collections/FilteredListTest.java +++ b/modules/base/src/test/java/javafx/collections/FilteredListTest.java @@ -91,14 +91,7 @@ @Test public void testLiveMode_Permutation() { - FXCollections.sort(list, new Comparator() { - - @Override - public int compare(String o1, String o2) { - return -o1.compareTo(o2); - } - - }); + FXCollections.sort(list, (o1, o2) -> -o1.compareTo(o2)); mlo.check1Permutation(filteredList, new int[] {1, 0}); assertEquals(Arrays.asList("d", "a"), filteredList); } diff --git a/modules/base/src/test/java/javafx/collections/ListChangeBuilderTest.java b/modules/base/src/test/java/javafx/collections/ListChangeBuilderTest.java --- a/modules/base/src/test/java/javafx/collections/ListChangeBuilderTest.java +++ b/modules/base/src/test/java/javafx/collections/ListChangeBuilderTest.java @@ -451,13 +451,8 @@ @Test public void testToString_Update() { observableList.removeListener(observer); - observableList.addListener(new ListChangeListener() { - - @Override - public void onChanged(ListChangeListener.Change change) { - assertNotNull(change.toString()); - } - + observableList.addListener((ListChangeListener.Change change) -> { + assertNotNull(change.toString()); }); builder.beginChange(); @@ -469,13 +464,8 @@ @Test public void testToString_Add() { observableList.removeListener(observer); - observableList.addListener(new ListChangeListener() { - - @Override - public void onChanged(ListChangeListener.Change change) { - assertNotNull(change.toString()); - } - + observableList.addListener((ListChangeListener.Change change) -> { + assertNotNull(change.toString()); }); builder.beginChange(); @@ -487,13 +477,8 @@ @Test public void testToString_Remove() { observableList.removeListener(observer); - observableList.addListener(new ListChangeListener() { - - @Override - public void onChanged(ListChangeListener.Change change) { - assertNotNull(change.toString()); - } - + observableList.addListener((ListChangeListener.Change change) -> { + assertNotNull(change.toString()); }); builder.beginChange(); @@ -505,13 +490,8 @@ @Test public void testToString_Composed() { observableList.removeListener(observer); - observableList.addListener(new ListChangeListener() { - - @Override - public void onChanged(ListChangeListener.Change change) { - assertNotNull(change.toString()); - } - + observableList.addListener((ListChangeListener.Change change) -> { + assertNotNull(change.toString()); }); builder.beginChange(); @@ -525,13 +505,8 @@ @Test public void testToString_Permutation() { observableList.removeListener(observer); - observableList.addListener(new ListChangeListener() { - - @Override - public void onChanged(ListChangeListener.Change change) { - assertNotNull(change.toString()); - } - + observableList.addListener((ListChangeListener.Change change) -> { + assertNotNull(change.toString()); }); builder.beginChange(); diff --git a/modules/base/src/test/java/javafx/collections/ObservableListTest.java b/modules/base/src/test/java/javafx/collections/ObservableListTest.java --- a/modules/base/src/test/java/javafx/collections/ObservableListTest.java +++ b/modules/base/src/test/java/javafx/collections/ObservableListTest.java @@ -255,12 +255,8 @@ @Test public void testObserverCanRemoveObservers() { - final ListChangeListener listObserver = new ListChangeListener() { - - @Override - public void onChanged(Change change) { - change.getList().removeListener(mlo); - } + final ListChangeListener listObserver = change -> { + change.getList().removeListener(mlo); }; list.addListener(listObserver); list.add("x"); diff --git a/modules/base/src/test/java/javafx/collections/ObservableListWithExtractor.java b/modules/base/src/test/java/javafx/collections/ObservableListWithExtractor.java --- a/modules/base/src/test/java/javafx/collections/ObservableListWithExtractor.java +++ b/modules/base/src/test/java/javafx/collections/ObservableListWithExtractor.java @@ -73,13 +73,7 @@ public void setUp() { p0 = new Person(); obs = new MockListObserver(); - Callback callback = new Callback() { - - @Override - public Observable[] call(Person param) { - return new Observable[]{param.name}; - } - }; + Callback callback = param -> new Observable[]{param.name}; if (mode == Mode.OBSERVABLE_LIST_WRAPPER) { observedList = modifiedList = FXCollections.observableArrayList(callback); } else { @@ -341,13 +335,7 @@ ArrayList arrayList = new ArrayList(); arrayList.add(p0); obs = new MockListObserver(); - Callback callback = new Callback() { - - @Override - public Observable[] call(Person param) { - return new Observable[]{param.name}; - } - }; + Callback callback = param -> new Observable[]{param.name}; if (mode == Mode.OBSERVABLE_LIST_WRAPPER) { observedList = modifiedList = FXCollections.observableList(arrayList, callback); } else { diff --git a/modules/base/src/test/java/javafx/collections/SortedListTest.java b/modules/base/src/test/java/javafx/collections/SortedListTest.java --- a/modules/base/src/test/java/javafx/collections/SortedListTest.java +++ b/modules/base/src/test/java/javafx/collections/SortedListTest.java @@ -186,27 +186,23 @@ sourceList.addAll(other); // wrap into a sorted list and add a listener to the sorted final SortedList sorted = new SortedList(sourceList, new NaturalElementComparator<>()); - ListChangeListener listener = new ListChangeListener() { + ListChangeListener listener = c -> { + assertEquals(Arrays.asList(400.0, 600.0, 1300.0), c.getList()); - @Override - public void onChanged(Change c) { - assertEquals(Arrays.asList(400.0, 600.0, 1300.0), c.getList()); + c.next(); + assertEquals(Arrays.asList(-300.0, 50.0), c.getRemoved()); + assertEquals(0, c.getFrom()); + assertEquals(0, c.getTo()); + assertTrue(c.next()); + assertEquals(Arrays.asList(4000.), c.getRemoved()); + assertEquals(3, c.getFrom()); + assertEquals(3, c.getTo()); + assertFalse(c.next()); - c.next(); - assertEquals(Arrays.asList(-300.0, 50.0), c.getRemoved()); - assertEquals(0, c.getFrom()); - assertEquals(0, c.getTo()); - assertTrue(c.next()); - assertEquals(Arrays.asList(4000.), c.getRemoved()); - assertEquals(3, c.getFrom()); - assertEquals(3, c.getTo()); - assertFalse(c.next()); - - // grab sourceIndex of last (aka: highest) value in sorted list - int sourceIndex = sorted.getSourceIndex(sorted.size() - 1); - assertEquals(0, sourceIndex); - } + // grab sourceIndex of last (aka: highest) value in sorted list + int sourceIndex = sorted.getSourceIndex(sorted.size() - 1); + assertEquals(0, sourceIndex); }; sorted.addListener(listener); sourceList.removeAll(other); @@ -224,18 +220,14 @@ ObservableList list = FXCollections.observableList(backingList, (Person p) -> new Observable[] {p.name}); SortedList sorted = new SortedList(list, new NaturalElementComparator<>()); - ListChangeListener listener = new ListChangeListener() { - - @Override - public void onChanged(Change c) { - c.next(); - assertTrue(c.wasPermutated()); - assertArrayEquals(new int[] {0, 4, 1, 2, 3}, c.getPermutation()); - assertTrue(c.next()); - assertTrue(c.wasUpdated()); - assertEquals(4, c.getFrom()); - assertEquals(5, c.getTo()); - } + ListChangeListener listener = c -> { + c.next(); + assertTrue(c.wasPermutated()); + assertArrayEquals(new int[] {0, 4, 1, 2, 3}, c.getPermutation()); + assertTrue(c.next()); + assertTrue(c.wasUpdated()); + assertEquals(4, c.getFrom()); + assertEquals(5, c.getTo()); }; assertEquals(Arrays.asList(new Person("b"), new Person("c"), diff --git a/modules/base/src/test/java/javafx/collections/TestedObservableLists.java b/modules/base/src/test/java/javafx/collections/TestedObservableLists.java --- a/modules/base/src/test/java/javafx/collections/TestedObservableLists.java +++ b/modules/base/src/test/java/javafx/collections/TestedObservableLists.java @@ -34,50 +34,20 @@ public interface TestedObservableLists { - Callable> ARRAY_LIST = new Callable>() { + Callable> ARRAY_LIST = () -> FXCollections.observableList(new ArrayList()); + + Callable> LINKED_LIST = () -> FXCollections.observableList(new LinkedList()); + + Callable> VETOABLE_LIST = () -> new VetoableListDecorator(FXCollections.observableArrayList()) { + @Override - public ObservableList call() throws Exception { - return FXCollections.observableList(new ArrayList()); - } + protected void onProposedChange(List list, int[] idx) { } }; - Callable> LINKED_LIST = new Callable>() { - @Override - public ObservableList call() throws Exception { - return FXCollections.observableList(new LinkedList()); - } - }; + Callable> CHECKED_OBSERVABLE_ARRAY_LIST = () -> FXCollections.checkedObservableList(FXCollections.observableList(new ArrayList()), String.class); - Callable> VETOABLE_LIST = new Callable>() { - @Override - public ObservableList call() throws Exception { - return new VetoableListDecorator(FXCollections.observableArrayList()) { - - @Override - protected void onProposedChange(List list, int[] idx) { } - }; - } - }; - - Callable> CHECKED_OBSERVABLE_ARRAY_LIST = new Callable>() { - @Override - public ObservableList call() throws Exception { - return FXCollections.checkedObservableList(FXCollections.observableList(new ArrayList()), String.class); - } - }; - - Callable> SYNCHRONIZED_OBSERVABLE_ARRAY_LIST = new Callable>() { - @Override - public ObservableList call() throws Exception { - return FXCollections.synchronizedObservableList(FXCollections.observableList(new ArrayList())); - } - }; + Callable> SYNCHRONIZED_OBSERVABLE_ARRAY_LIST = () -> FXCollections.synchronizedObservableList(FXCollections.observableList(new ArrayList())); - Callable> OBSERVABLE_LIST_PROPERTY = new Callable>() { - @Override - public ObservableList call() throws Exception { - return new SimpleListProperty<>(FXCollections.observableList(new ArrayList())); - } - }; + Callable> OBSERVABLE_LIST_PROPERTY = () -> new SimpleListProperty<>(FXCollections.observableList(new ArrayList())); } diff --git a/modules/base/src/test/java/javafx/collections/TestedObservableMaps.java b/modules/base/src/test/java/javafx/collections/TestedObservableMaps.java --- a/modules/base/src/test/java/javafx/collections/TestedObservableMaps.java +++ b/modules/base/src/test/java/javafx/collections/TestedObservableMaps.java @@ -33,44 +33,19 @@ public interface TestedObservableMaps { - Callable> HASH_MAP = new Callable>() { - @Override - public ObservableMap call() throws Exception { - return FXCollections.observableMap(new HashMap()); - } - }; + Callable> HASH_MAP = () -> FXCollections.observableMap(new HashMap()); Callable> TREE_MAP = new CallableTreeMapImpl(); - Callable> LINKED_HASH_MAP = new Callable>() { - @Override - public ObservableMap call() throws Exception { - return FXCollections.observableMap(new LinkedHashMap()); - } - }; + Callable> LINKED_HASH_MAP = () -> FXCollections.observableMap(new LinkedHashMap()); Callable> CONCURRENT_HASH_MAP = new CallableConcurrentHashMapImpl(); - Callable> CHECKED_OBSERVABLE_HASH_MAP = new Callable>() { - @Override - public ObservableMap call() throws Exception { - return FXCollections.checkedObservableMap(FXCollections.observableMap(new HashMap()), String.class, String.class); - } - }; + Callable> CHECKED_OBSERVABLE_HASH_MAP = () -> FXCollections.checkedObservableMap(FXCollections.observableMap(new HashMap()), String.class, String.class); - Callable> SYNCHRONIZED_OBSERVABLE_HASH_MAP = new Callable>() { - @Override - public ObservableMap call() throws Exception { - return FXCollections.synchronizedObservableMap(FXCollections.observableMap(new HashMap())); - } - }; + Callable> SYNCHRONIZED_OBSERVABLE_HASH_MAP = () -> FXCollections.synchronizedObservableMap(FXCollections.observableMap(new HashMap())); - Callable> OBSERVABLE_MAP_PROPERTY = new Callable>() { - @Override - public ObservableMap call() throws Exception { - return new SimpleMapProperty<>(FXCollections.observableMap(new HashMap())); - } - }; + Callable> OBSERVABLE_MAP_PROPERTY = () -> new SimpleMapProperty<>(FXCollections.observableMap(new HashMap())); static class CallableTreeMapImpl implements Callable> { public CallableTreeMapImpl() { diff --git a/modules/base/src/test/java/javafx/collections/TestedObservableSets.java b/modules/base/src/test/java/javafx/collections/TestedObservableSets.java --- a/modules/base/src/test/java/javafx/collections/TestedObservableSets.java +++ b/modules/base/src/test/java/javafx/collections/TestedObservableSets.java @@ -32,42 +32,17 @@ public interface TestedObservableSets { - Callable> HASH_SET = new Callable>() { - @Override - public ObservableSet call() throws Exception { - return FXCollections.observableSet(new HashSet()); - } - }; + Callable> HASH_SET = () -> FXCollections.observableSet(new HashSet()); Callable> TREE_SET = new CallableTreeSetImpl(); - Callable> LINKED_HASH_SET = new Callable>() { - @Override - public ObservableSet call() throws Exception { - return FXCollections.observableSet(new LinkedHashSet()); - } - }; + Callable> LINKED_HASH_SET = () -> FXCollections.observableSet(new LinkedHashSet()); - Callable> CHECKED_OBSERVABLE_HASH_SET = new Callable>() { - @Override - public ObservableSet call() throws Exception { - return FXCollections.checkedObservableSet(FXCollections.observableSet(new HashSet()), String.class); - } - }; + Callable> CHECKED_OBSERVABLE_HASH_SET = () -> FXCollections.checkedObservableSet(FXCollections.observableSet(new HashSet()), String.class); - Callable> SYNCHRONIZED_OBSERVABLE_HASH_SET = new Callable>() { - @Override - public ObservableSet call() throws Exception { - return FXCollections.synchronizedObservableSet(FXCollections.observableSet(new HashSet())); - } - }; + Callable> SYNCHRONIZED_OBSERVABLE_HASH_SET = () -> FXCollections.synchronizedObservableSet(FXCollections.observableSet(new HashSet())); - Callable> OBSERVABLE_SET_PROPERTY = new Callable>() { - @Override - public ObservableSet call() throws Exception { - return new SimpleSetProperty<>(FXCollections.observableSet(new HashSet())); - } - }; + Callable> OBSERVABLE_SET_PROPERTY = () -> new SimpleSetProperty<>(FXCollections.observableSet(new HashSet())); static class CallableTreeSetImpl implements Callable> { public CallableTreeSetImpl() { diff --git a/modules/base/src/test/java/javafx/collections/VetoableObservableListTest.java b/modules/base/src/test/java/javafx/collections/VetoableObservableListTest.java --- a/modules/base/src/test/java/javafx/collections/VetoableObservableListTest.java +++ b/modules/base/src/test/java/javafx/collections/VetoableObservableListTest.java @@ -495,11 +495,8 @@ public void testSubListCreatedOnChangeValid() { final List> subLists = new ArrayList<>(); - list.addListener(new ListChangeListener() { - @Override - public void onChanged(Change c) { - subLists.add(c.getList().subList(0, 1)); - } + list.addListener((ListChangeListener) c -> { + subLists.add(c.getList().subList(0, 1)); }); list.add("abc");