Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2020-07-24 07:56:45 +0000
committerAlexander Kurtakov2020-07-24 09:16:21 +0000
commit358e71aaeea1b1fd65f46e4c07562870ccc912a2 (patch)
treef83bfade976258acd95afdc7815a3945a4d761e7
parent9f4c2d7e7a295991c2af9db3406eea7dd360b099 (diff)
downloadeclipse.platform.swt-358e71aaeea1b1fd65f46e4c07562870ccc912a2.tar.gz
eclipse.platform.swt-358e71aaeea1b1fd65f46e4c07562870ccc912a2.tar.xz
eclipse.platform.swt-358e71aaeea1b1fd65f46e4c07562870ccc912a2.zip
JDT lambda and method references applied on SWT custom widgets
Change-Id: I04a40486e2deacc2b3a60db5debaac6c0e9ba279 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/AnimatedProgress.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ControlEditor.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/MouseNavigator.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/SashForm.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableEditor.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeEditor.java2
9 files changed, 15 insertions, 15 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/AnimatedProgress.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/AnimatedProgress.java
index 6a5308c4d4..0f3196c0cf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/AnimatedProgress.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/AnimatedProgress.java
@@ -78,7 +78,7 @@ public AnimatedProgress(Composite parent, int style) {
showBorder = (style & SWT.BORDER) != 0;
addControlListener(ControlListener.controlResizedAdapter(e -> redraw()));
- addPaintListener(e -> paint(e));
+ addPaintListener(this::paint);
addDisposeListener(e -> stop());
}
private static int checkStyle (int style) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java
index 5cb3e280e9..77f060a67e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java
@@ -1161,7 +1161,7 @@ boolean isDropped () {
@Override
public boolean isFocusControl () {
checkWidget();
- Predicate<Control> checkFocusControl = (control) -> (control != null && !control.isDisposed() && control.isFocusControl ());
+ Predicate<Control> checkFocusControl = control -> (control != null && !control.isDisposed() && control.isFocusControl ());
if (checkFocusControl.test(text) || checkFocusControl.test(arrow) ||
checkFocusControl.test(list) || checkFocusControl.test(popup)) {
return true;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java
index 4706d06f77..0dbe029f63 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java
@@ -118,7 +118,7 @@ public CLabel(Composite parent, int style) {
if ((style & SWT.RIGHT) != 0) align = SWT.RIGHT;
if ((style & SWT.LEFT) != 0) align = SWT.LEFT;
- addPaintListener(event -> onPaint(event));
+ addPaintListener(this::onPaint);
addTraverseListener(event -> {
if (event.detail == SWT.TRAVERSE_MNEMONIC) {
@@ -126,7 +126,7 @@ public CLabel(Composite parent, int style) {
}
});
- addListener(SWT.Dispose, event -> onDispose(event));
+ addListener(SWT.Dispose, this::onDispose);
initAccessible();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ControlEditor.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ControlEditor.java
index d243d53f64..bf219b809f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ControlEditor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ControlEditor.java
@@ -128,7 +128,7 @@ public ControlEditor (Composite parent) {
parent.addListener (event, controlListener);
}
- scrollbarListener = e -> scroll (e);
+ scrollbarListener = this::scroll;
ScrollBar hBar = parent.getHorizontalBar ();
if (hBar != null) hBar.addListener (SWT.Selection, scrollbarListener);
ScrollBar vBar = parent.getVerticalBar ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/MouseNavigator.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/MouseNavigator.java
index 764ae80728..06dd7c5671 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/MouseNavigator.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/MouseNavigator.java
@@ -46,27 +46,27 @@ class MouseNavigator {
}
parent = styledText;
- mouseDownListener = (event) -> {
+ mouseDownListener = event -> {
onMouseDown(event);
};
parent.addListener(SWT.MouseDown, mouseDownListener);
- mouseUpListener = (event) -> {
+ mouseUpListener = event -> {
onMouseUp(event);
};
parent.addListener(SWT.MouseUp, mouseUpListener);
- paintListener = (event) -> {
+ paintListener = event -> {
onPaint(event);
};
parent.addListener(SWT.Paint, paintListener);
- mouseMoveListener = (event) -> {
+ mouseMoveListener = event -> {
onMouseMove(event);
};
parent.addListener(SWT.MouseMove, mouseMoveListener);
- focusOutListener = (event) -> {
+ focusOutListener = event -> {
onFocusOut(event);
};
parent.addListener(SWT.FocusOut, focusOutListener);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/SashForm.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/SashForm.java
index 9faf855a92..a556002ea3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/SashForm.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/SashForm.java
@@ -86,7 +86,7 @@ public SashForm(Composite parent, int style) {
sashStyle = ((style & SWT.VERTICAL) != 0) ? SWT.HORIZONTAL : SWT.VERTICAL;
if ((style & SWT.BORDER) != 0) sashStyle |= SWT.BORDER;
if ((style & SWT.SMOOTH) != 0) sashStyle |= SWT.SMOOTH;
- sashListener = e -> onDragSash(e);
+ sashListener = this::onDragSash;
}
static int checkStyle (int style) {
int mask = SWT.BORDER | SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
index d2485241f6..6bd08bb92d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
@@ -5827,10 +5827,10 @@ void installListeners() {
}
});
if (verticalBar != null) {
- verticalBar.addListener(SWT.Selection, event -> handleVerticalScroll(event));
+ verticalBar.addListener(SWT.Selection, this::handleVerticalScroll);
}
if (horizontalBar != null) {
- horizontalBar.addListener(SWT.Selection, event -> handleHorizontalScroll(event));
+ horizontalBar.addListener(SWT.Selection, this::handleHorizontalScroll);
}
}
void internalRedrawRange(int start, int length) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableEditor.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableEditor.java
index 7692fbd466..574dd987a5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableEditor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableEditor.java
@@ -103,7 +103,7 @@ public TableEditor (Table table) {
layout ();
}
};
- timer = () -> layout ();
+ timer = this::layout;
// To be consistent with older versions of SWT, grabVertical defaults to true
grabVertical = true;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeEditor.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeEditor.java
index 5ec8f9503a..0f91ee3600 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeEditor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeEditor.java
@@ -103,7 +103,7 @@ public TreeEditor (Tree tree) {
layout();
}
};
- timer = () -> layout ();
+ timer = this::layout;
treeListener = new TreeListener () {
final Runnable runnable = () -> {
if (editor == null || editor.isDisposed()) return;

Back to the top