101570 - Fix compiler warnings in the examples.

9 files changed, 13 insertions, 23 deletions

diff --git a/examples/org.eclipse.swt.examples.browser.demos/src/org/eclipse/swt/examples/browser/demos/Pawns.java b/examples/org.eclipse.swt.examples.browser.demos/src/org/eclipse/swt/examples/browser/demos/Pawns.java
index 9473a97715..1e2ef706d8 100644
--- a/examples/org.eclipse.swt.examples.browser.demos/src/org/eclipse/swt/examples/browser/demos/Pawns.java
+++ b/examples/org.eclipse.swt.examples.browser.demos/src/org/eclipse/swt/examples/browser/demos/Pawns.java
@@ -197,11 +197,11 @@ static void initPawnBorders(byte[] g, int[] gameWallWeight) {
 			if (nTypes[2] == WALL || nTypes[5] == WALL) nAxis++;
 			if (nTypes[4] == WALL || nTypes[3] == WALL) nAxis++;
 			switch (nAxis) {
-				case 4: switch (nWalls) { case 4: score = 16; break; case 5: score = 14; break; case 6: score = 9; case 7: score = 6; break; case 8: score = 0; break;}; break;
-				case 3: switch (nWalls) { case 3: score = 9; break; case 4: score = 8;}; break;
-				case 2: switch (nWalls) { case 2: score = 6; break; case 3: score = 4; break; case 4: score = 2; }; break;
-				case 1: switch (nWalls) { case 1: score = 2; break; case 2: score = 1; break;}; break;
-			};
+				case 4: switch (nWalls) { case 4: score = 16; break; case 5: score = 14; break; case 6: score = 9; case 7: score = 6; break; case 8: score = 0; break;} break;
+				case 3: switch (nWalls) { case 3: score = 9; break; case 4: score = 8;} break;
+				case 2: switch (nWalls) { case 2: score = 6; break; case 3: score = 4; break; case 4: score = 2; } break;
+				case 1: switch (nWalls) { case 1: score = 2; break; case 2: score = 1; break;} break;
+			}
 		}
 		gameWallWeight[i] = score;
 	}
diff --git a/examples/org.eclipse.swt.examples.browser.demos/src/org/eclipse/swt/examples/browser/demos/views/BrowserDemoView.java b/examples/org.eclipse.swt.examples.browser.demos/src/org/eclipse/swt/examples/browser/demos/views/BrowserDemoView.java
index cadb35821c..69184e7357 100644
--- a/examples/org.eclipse.swt.examples.browser.demos/src/org/eclipse/swt/examples/browser/demos/views/BrowserDemoView.java
+++ b/examples/org.eclipse.swt.examples.browser.demos/src/org/eclipse/swt/examples/browser/demos/views/BrowserDemoView.java
@@ -11,7 +11,6 @@
 package org.eclipse.swt.examples.browser.demos.views;
 
 import org.eclipse.ui.part.*;
-import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.action.*;
 import org.eclipse.swt.*;
 import org.eclipse.swt.widgets.*;
@@ -45,12 +44,6 @@ public class BrowserDemoView extends ViewPart {
 		EditorTab editorTab = new EditorTab(item);
 	}
 	
-	private void showMessage(String message) {
-		MessageDialog.openInformation(
-			parent.getShell(),
-			"Browser Demo",
-			message);
-	}
 	public void setFocus() {
 	}
 	
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CTabFolderTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CTabFolderTab.java
index 79340c5ff7..f292b42353 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CTabFolderTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CTabFolderTab.java
@@ -410,7 +410,7 @@ class CTabFolderTab extends Tab {
 	void hookCustomListener (final String eventName) {
 		if (eventName == "CTabFolderEvent") {
 			tabFolder1.addCTabFolder2Listener (new CTabFolder2Adapter () {
-				public void itemClosed (CTabFolderEvent event) {
+				public void close (CTabFolderEvent event) {
 					log (eventName, event);
 				}
 			});
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/FileViewer.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/FileViewer.java
index 5ab1e310ad..bca6c97127 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/FileViewer.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/FileViewer.java
@@ -1679,7 +1679,7 @@ public class FileViewer {
 		 */
 		public void setProgress(int work) {
 			progressBar.setSelection(work);
-			while (display.readAndDispatch()); // enable event processing
+			while (display.readAndDispatch()) {} // enable event processing
 		}
 		/**
 		 * Adds to the progress of completion of the total work units.
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/hoverhelp/HoverHelp.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/hoverhelp/HoverHelp.java
index f31a44065e..93f7b3e87e 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/hoverhelp/HoverHelp.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/hoverhelp/HoverHelp.java
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.*;
  * using the MouseTrackListener.
  */
 public class HoverHelp {
-	private static ResourceBundle resourceBundle = ResourceBundle.getBundle("examples_hoverhelp");;
+	private static ResourceBundle resourceBundle = ResourceBundle.getBundle("examples_hoverhelp");
 	
 	static final int
 		hhiInformation = 0,
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/imageanalyzer/ImageAnalyzer.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/imageanalyzer/ImageAnalyzer.java
index 7b5e5fe74e..8a193ec77c 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/imageanalyzer/ImageAnalyzer.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/imageanalyzer/ImageAnalyzer.java
@@ -1966,7 +1966,7 @@ public class ImageAnalyzer {
 			public void widgetSelected (SelectionEvent event) {
 				Button radio = (Button) event.widget;
 				if (radio.getSelection()) bmpType[0] = ((Integer)radio.getData()).intValue();
-			};
+			}
 		};
 		// need to externalize strings
 		final Shell dialog = new Shell(shell, SWT.DIALOG_TRIM);
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/GridLayoutTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/GridLayoutTab.java
index 281708abf2..c8901caa8e 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/GridLayoutTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/GridLayoutTab.java
@@ -64,7 +64,7 @@ class GridLayoutTab extends Tab {
 					resetEditors ();
 				if (e.detail == SWT.TRAVERSE_ESCAPE)
 					disposeEditors ();
-			};
+			}
 		};
 		
 		/* Add common controls */
@@ -144,7 +144,7 @@ class GridLayoutTab extends Tab {
 				hGrabEditor.grabHorizontal = true;
 				hGrabEditor.minimumWidth = 50;
 				hGrabEditor.setEditor (hGrab, newItem, HGRAB_COL);
-				hGrab.addTraverseListener (traverseListener);;
+				hGrab.addTraverseListener (traverseListener);
 				
 				vGrab = new CCombo (table, SWT.NONE);
 				vGrab.setItems (boolValues);
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/Tab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/Tab.java
index 9cf803cd12..467612580f 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/Tab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/Tab.java
@@ -60,7 +60,7 @@ abstract class Tab {
 	SelectionListener selectionListener = new SelectionAdapter () {
 		public void widgetSelected (SelectionEvent e) {
 			resetEditors ();
-		};
+		}
 	};
 		
 	TraverseListener traverseListener = new TraverseListener () {
@@ -69,7 +69,7 @@ abstract class Tab {
 				e.doit = false;
 				resetEditors ();
 			}
-		};
+		}
 	};
 
 	/**
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/paint/PaintExample.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/paint/PaintExample.java
index b1adb6e42c..19a10a4597 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/paint/PaintExample.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/paint/PaintExample.java
@@ -35,9 +35,6 @@ public class PaintExample {
 	private static final int numPaletteCols = 50;
 	private ToolSettings toolSettings; // current active settings
 	private PaintSurface paintSurface; // paint surface for drawing
-	private int activeTool; // currently active tool
-	private int activeFillType; // currently active fill type
-	private int activeLineStyle; // currently active line type
 
 	static final int Pencil_tool = 0;
 	static final int Airbrush_tool = 1;