1 files changed, 16 insertions, 14 deletions

diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet053StartEditorWithContextMenu.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet053StartEditorWithContextMenu.java
index e4b0eb3b323..3b1867e83cf 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet053StartEditorWithContextMenu.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet053StartEditorWithContextMenu.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Marcel and others.
+ * Copyright (c) 2007, 2003 Marcel 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:
  *     Marcel <emmpeegee@gmail.com> - initial API and implementation
+ *     Hendrik Still <hendrik.still@gammas.de> - bug 417676
  *******************************************************************************/
 package org.eclipse.jface.snippets.viewers;
 
@@ -38,15 +39,16 @@ import org.eclipse.swt.widgets.TreeItem;
  */
 public class Snippet053StartEditorWithContextMenu implements SelectionListener {
 
-	private TreeViewer viewer;
+	private TreeViewer<MyModel,MyModel> viewer;
 
-	private class MyContentProvider implements ITreeContentProvider {
+	private class MyContentProvider implements ITreeContentProvider<MyModel,MyModel> {
 
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
 		 */
-		public Object[] getElements(Object inputElement) {
-			return ((MyModel)inputElement).child.toArray();
+		public MyModel[] getElements(MyModel inputElement) {
+			MyModel[] myModels = new MyModel[inputElement.child.size()];
+			return inputElement.child.toArray(myModels);
 		}
 
 		/* (non-Javadoc)
@@ -59,40 +61,40 @@ public class Snippet053StartEditorWithContextMenu implements SelectionListener {
 		/* (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 MyModel> viewer, MyModel oldInput, MyModel newInput) {
 
 		}
 
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
 		 */
-		public Object[] getChildren(Object parentElement) {
+		public MyModel[] getChildren(MyModel parentElement) {
 			return getElements(parentElement);
 		}
 
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
 		 */
-		public Object getParent(Object element) {
+		public MyModel getParent(MyModel element) {
 			if( element == null) {
 				return null;
 			}
 
-			return ((MyModel)element).parent;
+			return element.parent;
 		}
 
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
 		 */
-		public boolean hasChildren(Object element) {
-			return ((MyModel)element).child.size() > 0;
+		public boolean hasChildren(MyModel element) {
+			return element.child.size() > 0;
 		}
 
 	}
 
 	public class MyModel {
 		public MyModel parent;
-		public ArrayList child = new ArrayList();
+		public ArrayList<MyModel> child = new ArrayList<MyModel>();
 		public int counter;
 
 		public MyModel(int counter, MyModel parent) {
@@ -113,7 +115,7 @@ public class Snippet053StartEditorWithContextMenu implements SelectionListener {
 	}
 
 	public Snippet053StartEditorWithContextMenu(Shell shell) {
-		viewer = new TreeViewer(shell, SWT.BORDER);
+		viewer = new TreeViewer<MyModel,MyModel>(shell, SWT.BORDER);
 		viewer.setContentProvider(new MyContentProvider());
 		viewer.setCellEditors(new CellEditor[] {new TextCellEditor(viewer.getTree())});
 		viewer.setColumnProperties(new String[] { "name" });
@@ -139,7 +141,7 @@ public class Snippet053StartEditorWithContextMenu implements SelectionListener {
 			public void modify(Object element, String property, Object value) {
 				TreeItem item = (TreeItem)element;
 				((MyModel)item.getData()).counter = Integer.parseInt(value.toString());
-				viewer.update(item.getData(), null);
+				viewer.update((MyModel)item.getData(), null);
 			}
 
 		});