*** empty log message ***

28 files changed, 39 insertions, 45 deletions

diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet110.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet110.java
index b66f501d23..14d36c2afb 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet110.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet110.java
@@ -30,11 +30,11 @@ public static void main (String [] args) {
 	table.setLinesVisible (true);
 	final int rowCount = 64, columnCount = 4;
 	for (int i=0; i < columnCount; i++) {
-		TableColumn column = new TableColumn (table, SWT.NULL);
+		TableColumn column = new TableColumn (table, SWT.NONE);
 		column.setText ("Column " + i);
 	}
 	for (int i=0; i < rowCount; i++) {
-		TableItem item = new TableItem (table, SWT.NULL);
+		TableItem item = new TableItem (table, SWT.NONE);
 		for (int j=0; j < columnCount; j++) {
 			item.setText (j, "Item " + i + "-" + j);
 		}
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet111.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet111.java
index 784f6fee6c..ec9a671559 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet111.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet111.java
@@ -41,8 +41,8 @@ public static void main (String [] args) {
 	final TreeItem [] lastItem = new TreeItem [1];
 	final TreeEditor editor = new TreeEditor (tree);
 	tree.addListener (SWT.Selection, new Listener () {
-		public void handleEvent (Event e) {
-			final TreeItem item = (TreeItem) e.item;
+		public void handleEvent (Event event) {
+			final TreeItem item = (TreeItem) event.item;
 			if (item != null && item == lastItem [0]) {
 				boolean isCarbon = SWT.getPlatform ().equals ("carbon");
 				final Composite composite = new Composite (tree, SWT.NONE);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet119.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet119.java
index 09e12d95ff..8216bad547 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet119.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet119.java
@@ -23,7 +23,7 @@ import org.eclipse.swt.widgets.*;
 
 public class Snippet119 {
 
-static byte[] source = {
+static byte[] srcData = {
 	(byte)0x11, (byte)0x11, (byte)0x11, (byte)0x00, (byte)0x00, (byte)0x11, (byte)0x11, (byte)0x11,
 	(byte)0x11, (byte)0x10, (byte)0x00, (byte)0x01, (byte)0x10, (byte)0x00, (byte)0x01, (byte)0x11, 
 	(byte)0x11, (byte)0x00, (byte)0x22, (byte)0x01, (byte)0x10, (byte)0x33, (byte)0x00, (byte)0x11,
@@ -42,7 +42,7 @@ static byte[] source = {
 	(byte)0x11, (byte)0x11, (byte)0x11, (byte)0x00, (byte)0x00, (byte)0x11, (byte)0x11, (byte)0x11,
 };
 
-static byte[] mask = {
+static byte[] mskData = {
 	(byte)0x03, (byte)0xc0, 
 	(byte)0x1f, (byte)0xf8,
 	(byte)0x3f, (byte)0xfc,
@@ -74,11 +74,11 @@ public static void main (String [] args) {
 	PaletteData palette = new PaletteData (new RGB[] {
 		black.getRGB(), white.getRGB(), yellow.getRGB(), 
 		red.getRGB(), blue.getRGB(), green.getRGB()});
-	ImageData sourceData = new ImageData (16, 16, 4, palette, 1, source);
+	ImageData sourceData = new ImageData (16, 16, 4, palette, 1, srcData);
 	
 	//Create a mask ImageData of depth 1 (monochrome)
 	palette = new PaletteData (new RGB [] {black.getRGB(), white.getRGB(),});
-	ImageData maskData = new ImageData (16, 16, 1, palette, 1, mask);
+	ImageData maskData = new ImageData (16, 16, 1, palette, 1, mskData);
 
 	//Set mask
 	sourceData.maskData = maskData.data;
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet126.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet126.java
index cd834d3f7a..6d6a481ba3 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet126.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet126.java
@@ -33,7 +33,7 @@ public static void main(String[] args) {
 		column.setWidth (100);
 	}
 	for (int i=0; i<12; i++) {
-		TableItem item = new TableItem (table, SWT.NONE);
+		new TableItem (table, SWT.NONE);
 	}
 	TableItem [] items = table.getItems ();
 	for (int i=0; i<items.length; i++) {
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet133.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet133.java
index 8f08ad627a..30003801ce 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet133.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet133.java
@@ -194,7 +194,7 @@ public class Snippet133 {
 	}
 
 	void menuPrint() {
-		PrintDialog dialog = new PrintDialog(shell, SWT.NULL);
+		PrintDialog dialog = new PrintDialog(shell, SWT.NONE);
 		PrinterData data = dialog.open();
 		if (data == null) return;
 		if (data.printToFile) {
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet135.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet135.java
index 7f2f81481c..f0ff5619a1 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet135.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet135.java
@@ -90,7 +90,7 @@ public class Snippet135 {
 				data.horizontalAlignment = GridData.CENTER;
 				button.setLayoutData(data);
 				button.addListener(SWT.Selection, new Listener() {
-					public void handleEvent(Event e) {
+					public void handleEvent(Event event) {
 						s.dispose();
 					}
 				});
@@ -178,7 +178,7 @@ public class Snippet135 {
 			TreeItem treeItem = new TreeItem(fileTree, SWT.NONE);
 			treeItem.setText(file.getAbsolutePath());
 			treeItem.setData(file);
-			TreeItem dumyItem = new TreeItem(treeItem, SWT.NONE);
+			new TreeItem(treeItem, SWT.NONE);
 		}
 		fileTree.addListener(SWT.Expand, new Listener() {
 			public void handleEvent(Event e) {
@@ -200,7 +200,7 @@ public class Snippet135 {
 						TreeItem treeItem = new TreeItem(item, SWT.NONE);
 						treeItem.setText(file.getName());
 						treeItem.setData(file);
-						TreeItem dumyItem = new TreeItem(treeItem, SWT.NONE);
+						new TreeItem(treeItem, SWT.NONE);
 					}
 				}
 			}
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet140.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet140.java
index aede18222b..247bf717f3 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet140.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet140.java
@@ -59,13 +59,13 @@ public static void main (String [] args) {
 				Point pt = coolBar.toDisplay(new Point(itemBounds.x, itemBounds.y));
 				itemBounds.x = pt.x;
 				itemBounds.y = pt.y;
-				ToolBar toolBar = (ToolBar) item.getControl ();
-				ToolItem[] tools = toolBar.getItems ();
+				ToolBar bar = (ToolBar) item.getControl ();
+				ToolItem[] tools = bar.getItems ();
 				
 				int i = 0;
 				while (i < tools.length) {
 					Rectangle toolBounds = tools[i].getBounds ();
-					pt = toolBar.toDisplay(new Point(toolBounds.x, toolBounds.y));
+					pt = bar.toDisplay(new Point(toolBounds.x, toolBounds.y));
 					toolBounds.x = pt.x;
 					toolBounds.y = pt.y;
 					
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet149.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet149.java
index 8d9f2faff8..f79a81981a 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet149.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet149.java
@@ -30,7 +30,7 @@ public class Snippet149 {
 		table.setHeaderVisible (true);
 		table.setLinesVisible(true);
 		for (int i=0; i<2; i++) {
-			TableColumn column = new TableColumn (table, SWT.NONE);
+			new TableColumn (table, SWT.NONE);
 		}
 		table.getColumn (0).setText ("Task");
 		table.getColumn (1).setText ("Progress");
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet188.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet188.java
index 6163239a7d..6a51feae6c 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet188.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet188.java
@@ -12,7 +12,6 @@ package org.eclipse.swt.snippets;
 
 import org.eclipse.swt.*;
 import org.eclipse.swt.custom.*;
-import org.eclipse.swt.events.*;
 import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.layout.*;
 import org.eclipse.swt.widgets.*;
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet189.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet189.java
index 5dda896a6b..d2f35cd4c4 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet189.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet189.java
@@ -12,8 +12,6 @@ package org.eclipse.swt.snippets;
 
 import org.eclipse.swt.*;
 import org.eclipse.swt.custom.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.layout.*;
 import org.eclipse.swt.widgets.*;
 
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet19.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet19.java
index fa68b124ac..a757505408 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet19.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet19.java
@@ -28,9 +28,9 @@ public static void main (String [] args) {
 	text.setBounds (10, 10, 200, 200);
 	text.addListener (SWT.Verify, new Listener () {
 		public void handleEvent (Event e) {
-			String text = e.text;
-			char [] chars = new char [text.length ()];
-			text.getChars (0, chars.length, chars, 0);
+			String string = e.text;
+			char [] chars = new char [string.length ()];
+			string.getChars (0, chars.length, chars, 0);
 			for (int i=0; i<chars.length; i++) {
 				if (!('0' <= chars [i] && chars [i] <= '9')) {
 					e.doit = false;
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet23.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet23.java
index c224086f4e..67bed14f60 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet23.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet23.java
@@ -28,7 +28,7 @@ public static void main (String [] args) {
 	shell.open ();
 	shell.addListener (SWT.MouseDown, new Listener () {
 		public void handleEvent (Event e) {
-			Tracker tracker = new Tracker (shell, 0);
+			Tracker tracker = new Tracker (shell, SWT.NONE);
 			tracker.setRectangles (new Rectangle [] {
 				new Rectangle (e.x, e.y, 100, 100),
 			});
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet24.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet24.java
index 769d970a1a..8887c768df 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet24.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet24.java
@@ -11,7 +11,7 @@
 package org.eclipse.swt.snippets;
 
 /*
- * example snippet: detect CR in a text control (default selelection)
+ * example snippet: detect CR in a text or combo control (default selelection)
  *
  * For a list of all SWT example snippets see
  * http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/platform-swt-home/dev.html#snippets
@@ -26,7 +26,7 @@ public static void main (String [] args) {
 	Display display = new Display ();
 	Shell shell = new Shell (display);
 	shell.setLayout (new RowLayout ());
-	Combo combo = new Combo (shell, SWT.NULL);
+	Combo combo = new Combo (shell, SWT.NONE);
 	combo.setItems (new String [] {"A-1", "B-1", "C-1"});
 	Text text = new Text (shell, SWT.SINGLE | SWT.BORDER);
 	text.setText ("some text");
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet3.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet3.java
index cd56357e93..7466de2035 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet3.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet3.java
@@ -30,11 +30,11 @@ public static void main (String [] args) {
         table.setLinesVisible (true);
         final int rowCount = 64, columnCount = 4;
         for (int i=0; i < columnCount; i++) {
-                TableColumn column = new TableColumn (table, SWT.NULL);
+                TableColumn column = new TableColumn (table, SWT.NONE);
                 column.setText ("Column " + i);
         }
         for (int i=0; i < rowCount; i++) {
-                TableItem item = new TableItem (table, SWT.NULL);
+                TableItem item = new TableItem (table, SWT.NONE);
                 for (int j=0; j < columnCount; j++) {
                         item.setText (j, "Item " + i + "-" + j);
                 }
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet37.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet37.java
index bf457e88bf..39206850d2 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet37.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet37.java
@@ -26,8 +26,8 @@ public static void main (String [] args) {
 	Display display = new Display ();
 	Shell shell = new Shell (display);
 	shell.setLayout (new FillLayout ());
-	Label label1 = new Label (shell, SWT.SEPARATOR | SWT.HORIZONTAL);
-	Label label2 = new Label (shell, SWT.SEPARATOR | SWT.VERTICAL);
+	new Label (shell, SWT.SEPARATOR | SWT.HORIZONTAL);
+	new Label (shell, SWT.SEPARATOR | SWT.VERTICAL);
 	shell.setSize (200, 200);
 	shell.open ();
 	while (!shell.isDisposed ()) {
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet38.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet38.java
index 11a3466004..d264c97ba4 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet38.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet38.java
@@ -29,12 +29,12 @@ public static void main (String [] args) {
 	table.setHeaderVisible (true);
 	String[] titles = {" ", "C", "!", "Description", "Resource", "In Folder", "Location"};
 	for (int i=0; i<titles.length; i++) {
-		TableColumn column = new TableColumn (table, SWT.NULL);
+		TableColumn column = new TableColumn (table, SWT.NONE);
 		column.setText (titles [i]);
 	}	
 	int count = 128;
 	for (int i=0; i<count; i++) {
-		TableItem item = new TableItem (table, SWT.NULL);
+		TableItem item = new TableItem (table, SWT.NONE);
 		item.setText (0, "x");
 		item.setText (1, "y");
 		item.setText (2, "!");
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet4.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet4.java
index 827a6ded39..b22ad88956 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet4.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet4.java
@@ -30,7 +30,7 @@ public class Snippet4 {
 		b.pack();
 		b.setLocation(10, 10);
 		b.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
+			public void widgetSelected(SelectionEvent se) {
 				Shell dialog = new Shell(shell, SWT.DIALOG_TRIM);
 				dialog.addListener(SWT.Traverse, new Listener() {
 					public void handleEvent(Event e) {
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet43.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet43.java
index 6447fc6df1..47d7df7011 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet43.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet43.java
@@ -29,7 +29,6 @@ public static void main (String [] args) {
 	Caret caret = new Caret (shell, SWT.NONE);
 	Color white = display.getSystemColor (SWT.COLOR_WHITE);
 	Color black = display.getSystemColor (SWT.COLOR_BLACK);
-	Color red = display.getSystemColor (SWT.COLOR_RED);
 	Image image = new Image (display, 20, 20);
 	GC gc = new GC (image);
 	gc.setBackground (black);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet46.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet46.java
index 0ab54f9f2a..1b3feed72a 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet46.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet46.java
@@ -25,7 +25,7 @@ public class Snippet46 {
 public static void main (String [] args) {
 	Display display = new Display ();
 	final Shell shell = new Shell (display);
-	final Composite composite = new Composite (shell, SWT.NULL);
+	final Composite composite = new Composite (shell, SWT.NONE);
 	composite.setEnabled (false);
 	composite.setLayout (new FillLayout ());
 	Button button = new Button (composite, SWT.PUSH);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet61.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet61.java
index 558ec011dd..cd3b2c41eb 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet61.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet61.java
@@ -56,13 +56,11 @@ public static void main (String [] args) {
 	});
 	tree.addListener (SWT.Expand, new Listener () {
 		public void handleEvent (Event e) {
-			String string = "";
 			System.out.println ("Expand={" + e.item + "}");
 		}
 	});
 	tree.addListener (SWT.Collapse, new Listener () {
 		public void handleEvent (Event e) {
-			String string = "";
 			System.out.println ("Collapse={" + e.item + "}");
 		}
 	});
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet7.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet7.java
index 6bcbed335e..65ee9f9ae1 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet7.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet7.java
@@ -43,7 +43,7 @@ public static void main (String [] args) {
 				display.syncExec (new Runnable () {
 					public void run () {
 						if (table.isDisposed ()) return;
-						TableItem item = new TableItem (table, SWT.NULL);
+						TableItem item = new TableItem (table, SWT.NONE);
 						item.setText ("Table Item " + index [0]);
 						item.setImage (image);
 					}
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet73.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet73.java
index a2cdc61a23..08453c84c1 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet73.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet73.java
@@ -28,7 +28,7 @@ public static void main (String [] args) {
 	final Menu menu = new Menu (shell, SWT.POP_UP);
 	tree.setMenu (menu);
 	for (int i=0; i<12; i++) {
-		TreeItem treeItem = new TreeItem (tree, SWT.NULL);
+		TreeItem treeItem = new TreeItem (tree, SWT.NONE);
 		treeItem.setText ("Item " + i);
 		MenuItem menuItem = new MenuItem (menu, SWT.PUSH);
 		menuItem.setText (treeItem.getText ());
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet76.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet76.java
index 6666696c99..84f4b7a9f2 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet76.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet76.java
@@ -26,7 +26,7 @@ public static void main (String [] args) {
 	final Shell shell = new Shell (display);
 	final TabFolder tabFolder = new TabFolder (shell, SWT.BORDER);
 	for (int i=0; i<6; i++) {
-		TabItem item = new TabItem (tabFolder, SWT.NULL);
+		TabItem item = new TabItem (tabFolder, SWT.NONE);
 		item.setText ("TabItem " + i);
 		Button button = new Button (tabFolder, SWT.PUSH);
 		button.setText ("Page " + i);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet88.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet88.java
index 0f49da93ea..6590892042 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet88.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet88.java
@@ -61,7 +61,7 @@ public static void main(String[] args) {
 			Text newEditor = new Text(table, SWT.NONE);
 			newEditor.setText(item.getText(EDITABLECOLUMN));
 			newEditor.addModifyListener(new ModifyListener() {
-				public void modifyText(ModifyEvent e) {
+				public void modifyText(ModifyEvent me) {
 					Text text = (Text)editor.getEditor();
 					editor.getItem().setText(EDITABLECOLUMN, text.getText());
 				}
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet90.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet90.java
index 68780dcec8..469da8cae0 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet90.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet90.java
@@ -27,7 +27,7 @@ public static void main (String [] args) {
 	Shell shell = new Shell (display);
 	final Tree tree = new Tree (shell, SWT.BORDER | SWT.MULTI);
 	for (int i=0; i<12; i++) {
-		TreeItem treeItem = new TreeItem (tree, SWT.NULL);
+		TreeItem treeItem = new TreeItem (tree, SWT.NONE);
 		treeItem.setText ("Item " + i);
 	}
 	tree.addListener (SWT.MouseDown, new Listener () {
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet93.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet93.java
index 18c7a15052..488ec50c9f 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet93.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet93.java
@@ -27,7 +27,7 @@ public static void main (String [] args) {
 	Display display = new Display ();
 	Shell shell = new Shell (display);
 	shell.setLayout (new RowLayout ());
-	Label label = new Label (shell, SWT.NULL);
+	Label label = new Label (shell, SWT.NONE);
 	GC gc = new GC (label);
 	Point size = gc.textExtent ("Hello");
 	gc.dispose ();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet95.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet95.java
index aab6a330b6..080f35dc90 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet95.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet95.java
@@ -52,7 +52,7 @@ public static void main(String[] args) {
 			popup.setText("Image");
 			popup.setBounds(50, 50, 200, 200);
 			popup.addListener(SWT.Close, new Listener() {
-				public void handleEvent(Event event) {
+				public void handleEvent(Event e) {
 					image.dispose();
 				}
 			});
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet97.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet97.java
index f421615642..553f39f1cd 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet97.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet97.java
@@ -28,7 +28,7 @@ public static void main (String [] args) {
 	final Menu menu = new Menu (shell, SWT.POP_UP);
 	tree.setMenu (menu);
 	for (int i=0; i<12; i++) {
-		TreeItem item = new TreeItem (tree, SWT.NULL);
+		TreeItem item = new TreeItem (tree, SWT.NONE);
 		item.setText ("Item " + i);
 	}
 	menu.addListener (SWT.Show, new Listener () {