1 files changed, 22 insertions, 28 deletions

diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet046UpdateViewerFromBackgroundThread.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet046UpdateViewerFromBackgroundThread.java
index b7b32d3a089..7f3d478b633 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet046UpdateViewerFromBackgroundThread.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet046UpdateViewerFromBackgroundThread.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 Tom Schindl and others.
+ * Copyright (c) 2006, 2013 Tom Schindl 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,10 +7,14 @@
  *
  * Contributors:
  *     Tom Schindl - initial API and implementation
+ *     Hendrik Still <hendrik.still@gammas.de> - bug 417676
  *******************************************************************************/
 
 package org.eclipse.jface.snippets.viewers;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -37,26 +41,18 @@ import org.eclipse.swt.widgets.TableColumn;
 public class Snippet046UpdateViewerFromBackgroundThread {
 	private static Image[] images;
 
-	private class MyContentProvider implements IStructuredContentProvider {
+	private class MyContentProvider implements IStructuredContentProvider<MyModel,List<MyModel>> {
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-		 */
-		public Object[] getElements(Object inputElement) {
-			return (MyModel[])inputElement;
+		public MyModel[] getElements(List<MyModel> inputElement) {
+			MyModel[] myModels = new MyModel[inputElement.size()];
+			return inputElement.toArray(myModels);
 		}
 
-		/* (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<? extends List<MyModel>> viewer, List<MyModel> oldInput, List<MyModel> newInput) {
 
 		}
 
@@ -75,17 +71,17 @@ public class Snippet046UpdateViewerFromBackgroundThread {
 		}
 	}
 
-	public class MyLabelProvider extends LabelProvider implements ITableLabelProvider {
+	public class MyLabelProvider extends LabelProvider<MyModel> implements ITableLabelProvider<MyModel> {
 
-		public Image getColumnImage(Object element, int columnIndex) {
+		public Image getColumnImage(MyModel element, int columnIndex) {
 			if( columnIndex == 0 ) {
-				return images[((MyModel)element).finished?0:1];
+				return images[element.finished?0:1];
 			}
 
 			return null;
 		}
 
-		public String getColumnText(Object element, int columnIndex) {
+		public String getColumnText(MyModel element, int columnIndex) {
 			return "Column " + columnIndex + " => " + element.toString();
 		}
 
@@ -103,7 +99,7 @@ public class Snippet046UpdateViewerFromBackgroundThread {
 	}
 
 	public Snippet046UpdateViewerFromBackgroundThread(Shell shell) {
-		final TableViewer v = new TableViewer(shell,SWT.BORDER|SWT.FULL_SELECTION);
+		final TableViewer<MyModel,List<MyModel>> v = new TableViewer<MyModel,List<MyModel>>(shell,SWT.BORDER|SWT.FULL_SELECTION);
 		v.setLabelProvider(new MyLabelProvider());
 		v.setContentProvider(new MyContentProvider());
 
@@ -115,7 +111,7 @@ public class Snippet046UpdateViewerFromBackgroundThread {
 		column.setWidth(200);
 		column.setText("Column 2");
 
-		final MyModel[] model = createModel();
+		final List<MyModel> model = createModel();
 		v.setInput(model);
 		v.getTable().setLinesVisible(true);
 		v.getTable().setHeaderVisible(true);
@@ -128,7 +124,7 @@ public class Snippet046UpdateViewerFromBackgroundThread {
 				final Thread t = new Thread() {
 
 					public void run() {
-						for( int i = 0; i < model.length; i++ ) {
+						for( int i = 0; i < model.size(); i++ ) {
 							if( v.getTable().isDisposed()) {
 								return;
 							}
@@ -136,8 +132,8 @@ public class Snippet046UpdateViewerFromBackgroundThread {
 							v.getTable().getDisplay().asyncExec(new Runnable() {
 
 								public void run() {
-									model[j].finished = true;
-									v.update(model[j], null);
+									model.get(j).finished = true;
+									v.update(model.get(j), null);
 								}
 
 							});
@@ -154,13 +150,11 @@ public class Snippet046UpdateViewerFromBackgroundThread {
 		});
 	}
 
-	private MyModel[] createModel() {
-		MyModel[] elements = new MyModel[10];
-
+	private List<MyModel> createModel() {
+		List<MyModel> elements = new ArrayList<MyModel>(10);
 		for( int i = 0; i < 10; i++ ) {
-			elements[i] = new MyModel(i);
+			elements.add(i,new MyModel(i));
 		}
-
 		return elements;
 	}