Bug 502845 - Update SWT snippets to use the SelectionListener lambda
helper methods
Converts all relevant snippets below Snippets 300.
Change-Id: I7c54c8627e7e33db63e9da93a9fc43008e75f3a1
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet247.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet247.java
index 9f94fed..c68fd7c 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet247.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet247.java
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Lars Vogel <Lars.Vogel@vogella.com> - Bug 502845
*******************************************************************************/
package org.eclipse.swt.snippets;
@@ -16,8 +17,10 @@
* For a list of all SWT example snippets see
* http://www.eclipse.org/swt/snippets/
*/
+
+import static org.eclipse.swt.events.SelectionListener.*;
+
import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;
@@ -38,12 +41,8 @@
Button button = new Button (shell, SWT.PUSH);
button.pack();
button.setText("OK");
- button.addSelectionListener(new SelectionAdapter () {
- @Override
- public void widgetSelected(SelectionEvent e) {
- System.out.println("OK selected");
- }
- });
+ button.addSelectionListener(widgetSelectedAdapter(e->System.out.println("OK selected")));
+
shell.setDefaultButton(button);
shell.pack ();
shell.open();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet250.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet250.java
index 1fdca4a..3ca3f3c 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet250.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet250.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Lars Vogel <Lars.Vogel@vogella.com> - Bug 502845
*******************************************************************************/
package org.eclipse.swt.snippets;
@@ -16,8 +17,10 @@
* For a list of all SWT example snippets see
* http://www.eclipse.org/swt/snippets/
*/
+
+import static org.eclipse.swt.events.SelectionListener.*;
+
import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;
@@ -29,20 +32,10 @@
shell.setLayout (new RowLayout ());
DateTime calendar = new DateTime (shell, SWT.CALENDAR);
- calendar.addSelectionListener (new SelectionAdapter () {
- @Override
- public void widgetSelected (SelectionEvent e) {
- System.out.println ("calendar date changed");
- }
- });
+ calendar.addSelectionListener (widgetSelectedAdapter(e -> System.out.println ("calendar date changed")));
DateTime time = new DateTime (shell, SWT.TIME);
- time.addSelectionListener (new SelectionAdapter () {
- @Override
- public void widgetSelected (SelectionEvent e) {
- System.out.println ("time changed");
- }
- });
+ time.addSelectionListener (widgetSelectedAdapter(e -> System.out.println ("time changed")));
shell.pack ();
shell.open ();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet251.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet251.java
index 4a9f146..e48d52b 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet251.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet251.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Lars Vogel <Lars.Vogel@vogella.com> - Bug 502845
*******************************************************************************/
package org.eclipse.swt.snippets;
@@ -16,8 +17,10 @@
* For a list of all SWT example snippets see
* http://www.eclipse.org/swt/snippets/
*/
+
+import static org.eclipse.swt.events.SelectionListener.*;
+
import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;
@@ -30,9 +33,7 @@
Button open = new Button (shell, SWT.PUSH);
open.setText ("Open Dialog");
- open.addSelectionListener (new SelectionAdapter () {
- @Override
- public void widgetSelected (SelectionEvent e) {
+ open.addSelectionListener (widgetSelectedAdapter(e-> {
final Shell dialog = new Shell (shell, SWT.DIALOG_TRIM);
dialog.setLayout (new GridLayout (3, false));
@@ -45,20 +46,18 @@
Button ok = new Button (dialog, SWT.PUSH);
ok.setText ("OK");
ok.setLayoutData(new GridData (SWT.FILL, SWT.CENTER, false, false));
- ok.addSelectionListener (new SelectionAdapter () {
- @Override
- public void widgetSelected (SelectionEvent e) {
+ ok.addSelectionListener (widgetSelectedAdapter(event -> {
System.out.println ("Calendar date selected (MM/DD/YYYY) = " + (calendar.getMonth () + 1) + "/" + calendar.getDay () + "/" + calendar.getYear ());
System.out.println ("Date selected (MM/YYYY) = " + (date.getMonth () + 1) + "/" + date.getYear ());
System.out.println ("Time selected (HH:MM) = " + time.getHours () + ":" + (time.getMinutes () < 10 ? "0" : "") + time.getMinutes ());
dialog.close ();
}
- });
+ ));
dialog.setDefaultButton (ok);
dialog.pack ();
dialog.open ();
}
- });
+ ));
shell.pack ();
shell.open ();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet258.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet258.java
index 399b7b0..c7d865b 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet258.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet258.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2013 IBM Corporation and others.
+ * Copyright (c) 2007, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Lars Vogel <Lars.Vogel@vogella.com> - Bug 502845
*******************************************************************************/
package org.eclipse.swt.snippets;
@@ -18,11 +19,13 @@
*
* @since 3.3
*/
+
+import static org.eclipse.swt.events.SelectionListener.*;
+
import org.eclipse.swt.*;
import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
import org.eclipse.swt.layout.*;
-import org.eclipse.swt.events.*;
+import org.eclipse.swt.widgets.*;
public class Snippet258 {
public static void main(String[] args) {
@@ -37,26 +40,22 @@
ToolBar toolBar = new ToolBar (shell, SWT.FLAT);
ToolItem item = new ToolItem (toolBar, SWT.PUSH);
item.setImage (image);
- item.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
+ item.addSelectionListener(widgetSelectedAdapter(e -> {
text.setText("");
System.out.println("Search cancelled");
}
- });
+ ));
}
text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
text.setText("Search text");
- text.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetDefaultSelected(SelectionEvent e) {
+ text.addSelectionListener(widgetSelectedAdapter(e -> {
if (e.detail == SWT.CANCEL) {
System.out.println("Search cancelled");
} else {
System.out.println("Searching for: " + text.getText() + "...");
}
}
- });
+ ));
shell.pack();
shell.open();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet261.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet261.java
index 3d7ad4b..f5ba695 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet261.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet261.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2013 IBM Corporation and others.
+ * Copyright (c) 2007, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,9 +7,12 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Lars Vogel <Lars.Vogel@vogella.com> - Bug 502845
*******************************************************************************/
package org.eclipse.swt.snippets;
+import static org.eclipse.swt.events.SelectionListener.*;
+
import org.eclipse.swt.*;
import org.eclipse.swt.events.*;
import org.eclipse.swt.layout.*;
@@ -59,12 +62,7 @@
fileMenu.setMenu(menuFile);
MenuItem menuFileControl = new MenuItem(menuFile, SWT.CASCADE);
menuFileControl.setText("Exit");
- menuFileControl.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- shell.dispose();
- }
- });
+ menuFileControl.addSelectionListener(widgetSelectedAdapter(e-> shell.dispose());
frame.setFileMenus(new MenuItem[] { fileMenu });
}
}
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet262.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet262.java
index b9b7844..51a50bd 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet262.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet262.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2013 IBM Corporation and others.
+ * Copyright (c) 2007, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,9 +7,12 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Lars Vogel <Lars.Vogel@vogella.com> - Bug 502845
*******************************************************************************/
package org.eclipse.swt.snippets;
+import static org.eclipse.swt.events.SelectionListener.*;
+
import java.io.*;
import org.eclipse.swt.*;
@@ -69,20 +72,11 @@
MenuItem menuFileOpen = new MenuItem(menuFile, SWT.CASCADE);
menuFileOpen.setText("Open...");
- menuFileOpen.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- fileOpen();
- }
- });
+ menuFileOpen.addSelectionListener(widgetSelectedAdapter( e-> fileOpen());
+
MenuItem menuFileExit = new MenuItem(menuFile, SWT.CASCADE);
menuFileExit.setText("Exit");
- menuFileExit.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- shell.dispose();
- }
- });
+ menuFileExit.addSelectionListener(widgetSelectedAdapter( e-> shell.dispose()));
}
static void fileOpen() {
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet263.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet263.java
index 30629ed..79b8167 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet263.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet263.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2013 IBM Corporation and others.
+ * Copyright (c) 2007, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,9 +7,12 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Lars Vogel <Lars.Vogel@vogella.com> - Bug 502845
*******************************************************************************/
package org.eclipse.swt.snippets;
+import static org.eclipse.swt.events.SelectionListener.*;
+
import org.eclipse.swt.*;
import org.eclipse.swt.events.*;
import org.eclipse.swt.layout.*;
@@ -61,12 +64,7 @@
fileMenu.setMenu(menuFile);
MenuItem menuFileControl = new MenuItem(menuFile, SWT.CASCADE);
menuFileControl.setText("Exit");
- menuFileControl.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- shell.dispose();
- }
- });
+ menuFileControl.addSelectionListener(widgetSelectedAdapter(e-> shell.dispose());
frame.setFileMenus(new MenuItem[] { fileMenu });
}
}
\ No newline at end of file
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet264.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet264.java
index 41f41ea..d00e765 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet264.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet264.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2013 IBM Corporation and others.
+ * Copyright (c) 2007, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,9 +7,12 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Lars Vogel <Lars.Vogel@vogella.com> - Bug 502845
*******************************************************************************/
package org.eclipse.swt.snippets;
+import static org.eclipse.swt.events.SelectionListener.*;
+
import org.eclipse.swt.*;
import org.eclipse.swt.events.*;
import org.eclipse.swt.layout.*;
@@ -61,12 +64,7 @@
fileMenu.setMenu(menuFile);
MenuItem menuFileControl = new MenuItem(menuFile, SWT.CASCADE);
menuFileControl.setText("Exit");
- menuFileControl.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- shell.dispose();
- }
- });
+ menuFileControl.addSelectionListener(widgetSelectedAdapter(e-> shell.dispose());
frame.setFileMenus(new MenuItem[] { fileMenu });
}
}
\ No newline at end of file
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet265.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet265.java
index 0e8a497..81222a0 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet265.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet265.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2013 IBM Corporation and others.
+ * Copyright (c) 2007, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,9 +7,12 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Lars Vogel <Lars.Vogel@vogella.com> - Bug 502845
*******************************************************************************/
package org.eclipse.swt.snippets;
+import static org.eclipse.swt.events.SelectionListener.*;
+
import org.eclipse.swt.*;
import org.eclipse.swt.events.*;
import org.eclipse.swt.layout.*;
@@ -66,20 +69,10 @@
MenuItem menuFileOpen = new MenuItem(menuFile, SWT.CASCADE);
menuFileOpen.setText("Open...");
- menuFileOpen.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- fileOpen();
- }
- });
+ menuFileOpen.addSelectionListener(widgetSelectedAdapter(e-> fileOpen()));
MenuItem menuFileExit = new MenuItem(menuFile, SWT.CASCADE);
menuFileExit.setText("Exit");
- menuFileExit.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- shell.dispose();
- }
- });
+ menuFileExit.addSelectionListener(widgetSelectedAdapter(e-> shell.dispose()))
}
static void fileOpen() {
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet296.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet296.java
index 7db8ae4..c6280b0 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet296.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet296.java
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Lars Vogel <Lars.Vogel@vogella.com> - Bug 502845
*******************************************************************************/
package org.eclipse.swt.snippets;
@@ -16,6 +17,9 @@
* For a list of all SWT example snippets see
* http://www.eclipse.org/swt/snippets/
*/
+
+import static org.eclipse.swt.events.SelectionListener.*;
+
import org.eclipse.swt.*;
import org.eclipse.swt.custom.*;
import org.eclipse.swt.events.*;
@@ -61,9 +65,7 @@
* The following listener ensures that a newly-selected item
* in the Tree is always visible.
*/
- tree.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
+ tree.addSelectionListener(widgetSelectedAdapter(e-> {
TreeItem [] selectedItems = tree.getSelection();
if (selectedItems.length > 0) {
Rectangle itemRect = selectedItems[0].getBounds();
@@ -75,8 +77,7 @@
sc.setOrigin(itemRect.x, itemRect.y);
}
}
- }
- });
+ }));
/*
* The following listener scrolls the Tree one item at a time
* in response to MouseWheel events.