1 files changed, 31 insertions, 60 deletions

diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet038TreeViewerInlinelEditingOldAPI.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet038TreeViewerInlinelEditingOldAPI.java
index 5bdc89b9b16..08ed57d1d4c 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet038TreeViewerInlinelEditingOldAPI.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet038TreeViewerInlinelEditingOldAPI.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 Tom Schindl and others.
+ * Copyright (c) 2006, 2014 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,11 +7,13 @@
  *
  * Contributors:
  *     Tom Schindl - initial API and implementation
+ *     Jeanderson Candido <http://jeandersonbc.github.io> - Bug 414565
  *******************************************************************************/
 
 package org.eclipse.jface.snippets.viewers;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.eclipse.jface.resource.FontRegistry;
 import org.eclipse.jface.viewers.CellEditor;
@@ -32,59 +34,33 @@ import org.eclipse.swt.widgets.TreeItem;
 
 /**
  * A simple TreeViewer to demonstrate usage of inline editing
- * 
+ *
  * @author Tom Schindl <tom.schindl@bestsolution.at>
- * 
+ *
  */
 public class Snippet038TreeViewerInlinelEditingOldAPI {
 	private class MyContentProvider implements ITreeContentProvider {
 
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-		 */
 		@Override
 		public Object[] getElements(Object inputElement) {
 			return ((MyModel) inputElement).child.toArray();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-		 */
 		@Override
 		public void dispose() {
 
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
-		 *      java.lang.Object, java.lang.Object)
-		 */
 		@Override
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-		 */
 		@Override
 		public Object[] getChildren(Object parentElement) {
 			return getElements(parentElement);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-		 */
 		@Override
 		public Object getParent(Object element) {
 			if (element == null) {
@@ -94,11 +70,6 @@ public class Snippet038TreeViewerInlinelEditingOldAPI {
 			return ((MyModel) element).parent;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
-		 */
 		@Override
 		public boolean hasChildren(Object element) {
 			return ((MyModel) element).child.size() > 0;
@@ -108,9 +79,7 @@ public class Snippet038TreeViewerInlinelEditingOldAPI {
 
 	public class MyModel {
 		public MyModel parent;
-
-		public ArrayList child = new ArrayList();
-
+		public List<MyModel> child = new ArrayList<MyModel>();
 		public int counter;
 
 		public MyModel(int counter, MyModel parent) {
@@ -124,7 +93,6 @@ public class Snippet038TreeViewerInlinelEditingOldAPI {
 			if (parent != null) {
 				rv = parent.toString() + ".";
 			}
-
 			rv += counter;
 
 			return rv;
@@ -147,19 +115,17 @@ public class Snippet038TreeViewerInlinelEditingOldAPI {
 	}
 
 	public Snippet038TreeViewerInlinelEditingOldAPI(Shell shell) {
-		final TreeViewer v = new TreeViewer(shell,SWT.FULL_SELECTION);
-		
-		TreeColumn column = new TreeColumn(v.getTree(),SWT.NONE);
-		column.setWidth(200);
-		column.setText("Column 1");
-		
-		column = new TreeColumn(v.getTree(),SWT.NONE);
-		column.setWidth(200);
-		column.setText("Column 2");
-		
-		v.setCellEditors(new CellEditor[]{new TextCellEditor(v.getTree()), new TextCellEditor(v.getTree())});
-		v.setColumnProperties(new String[]{"col1","col2"});
-		v.setCellModifier(new ICellModifier() {
+		final TreeViewer viewer = new TreeViewer(shell, SWT.FULL_SELECTION);
+
+		createColumnFor(viewer, "Column 1");
+		createColumnFor(viewer, "Column 2");
+
+		viewer.setCellEditors(new CellEditor[] {
+				new TextCellEditor(viewer.getTree()),
+				new TextCellEditor(viewer.getTree()) });
+
+		viewer.setColumnProperties(new String[] { "col1", "col2" });
+		viewer.setCellModifier(new ICellModifier() {
 
 			@Override
 			public boolean canModify(Object element, String property) {
@@ -168,23 +134,29 @@ public class Snippet038TreeViewerInlinelEditingOldAPI {
 
 			@Override
 			public Object getValue(Object element, String property) {
-				return ((MyModel)element).counter+"";
+				return ((MyModel) element).counter + "";
 			}
 
 			@Override
 			public void modify(Object element, String property, Object value) {
-				((MyModel)((TreeItem)element).getData()).counter = Integer.parseInt(value.toString());
-				v.update(((TreeItem)element).getData(), null);
+				((MyModel) ((TreeItem) element).getData()).counter = Integer
+						.parseInt(value.toString());
+				viewer.update(((TreeItem) element).getData(), null);
 			}
-			
+
 		});
-		v.setLabelProvider(new MyLabelProvider());
-		v.setContentProvider(new MyContentProvider());
-		v.setInput(createModel());
+		viewer.setLabelProvider(new MyLabelProvider());
+		viewer.setContentProvider(new MyContentProvider());
+		viewer.setInput(createModel());
 	}
 
-	private MyModel createModel() {
+	private void createColumnFor(TreeViewer viewer, String label) {
+		TreeColumn column = new TreeColumn(viewer.getTree(), SWT.NONE);
+		column.setWidth(200);
+		column.setText(label);
+	}
 
+	private MyModel createModel() {
 		MyModel root = new MyModel(0, null);
 		root.counter = 0;
 
@@ -196,7 +168,6 @@ public class Snippet038TreeViewerInlinelEditingOldAPI {
 				tmp.child.add(new MyModel(j, tmp));
 			}
 		}
-
 		return root;
 	}