From 2cb8511d2ff90807bfa8aa597d1cdf8c2f62a911 Mon Sep 17 00:00:00 2001
From: Hendrik Still
Date: Wed, 7 Aug 2013 13:42:09 +0200
Subject: Bug 414565 - [JFace][snippets] Update JFace snippets to generified
 viewers

Change-Id: I9c06b217132b53d7bb3966d39f73b15150f11570
Signed-off-by: Hendrik Still <hendrik.still@gammas.de>
---
 .../snippets/viewers/Snippet063ComboViewer.java    | 36 ++++++----------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet063ComboViewer.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet063ComboViewer.java
index 0f26c0aa7f0..47cbe4efa80 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet063ComboViewer.java	
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet063ComboViewer.java	
@@ -30,37 +30,18 @@ import org.eclipse.swt.widgets.Shell;
  * 
  */
 public class Snippet063ComboViewer {
-	private class MyContentProvider implements IStructuredContentProvider {
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see
-		 * org.eclipse.jface.viewers.IStructuredContentProvider#getElements(
-		 * java.lang.Object)
-		 */
-		public Object[] getElements(Object inputElement) {
-			return (MyModel[]) inputElement;
-		}
+	private class MyContentProvider implements IStructuredContentProvider<MyModel,MyModel[]> {
 
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-		 */
 		public void dispose() {
 
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see
-		 * org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse
-		 * .jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-		 */
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		public void inputChanged(Viewer<MyModel[]> viewer, MyModel[] oldInput,
+				MyModel[] newInput) {
+		}
 
+		public MyModel[] getElements(MyModel[] inputElement) {
+			return inputElement;
 		}
 
 	}
@@ -72,6 +53,7 @@ public class Snippet063ComboViewer {
 			this.counter = counter;
 		}
 
+		@Override
 		public String toString() {
 			return "Item " + this.counter;
 		}
@@ -84,8 +66,8 @@ public class Snippet063ComboViewer {
 
 		final Label l = new Label(shell, SWT.None);
 		l.setText("Choose Item:");
-		final ComboViewer v = new ComboViewer(shell);
-		v.setLabelProvider(new LabelProvider());
+		final ComboViewer<MyModel,MyModel[]> v = new ComboViewer<MyModel,MyModel[]>(shell);
+		v.setLabelProvider(new LabelProvider<MyModel>());
 		v.setContentProvider(new MyContentProvider());
 
 		MyModel[] model = createModel();
-- 
cgit v1.2.3