Copyright updates

51 files changed, 817 insertions, 807 deletions

diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/IDebugTarget.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/IDebugTarget.java
index 901a8dc75..dee67fb7c 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/IDebugTarget.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/IDebugTarget.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation 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
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java
index cd275b7ff..180c528d7 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
+ * Copyright (c) 2005, 2010 IBM Corporation 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
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameData.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameData.java
index d3f9bbc9e..5bd1b5e00 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameData.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameData.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 Wind River Systems and others.
+ * Copyright (c) 2008, 2009 Wind River Systems 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
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAListResult.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAListResult.java
index 4abab970a..4ac17b284 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAListResult.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAListResult.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 Wind River Systems and others.
+ * Copyright (c) 2008, 2009 Wind River Systems 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
diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegisterData.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegisterData.java
index 81be71016..52b883bf4 100644
--- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegisterData.java
+++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegisterData.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 Wind River Systems and others.
+ * Copyright (c) 2008, 2009 Wind River Systems 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
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/CheckTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/CheckTests.java
index cf9af6ab8..51812ff00 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/CheckTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/CheckTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Wind River Systems and others.
+ * Copyright (c) 2009, 2011 Wind River Systems 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
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ColumnPresentationTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ColumnPresentationTests.java
index ceaa82751..6f3b2e47e 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ColumnPresentationTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ColumnPresentationTests.java
@@ -1,381 +1,381 @@
-/*******************************************************************************

- * Copyright (c) 2009 Wind River Systems 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

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     Wind River Systems - initial API and implementation

- *******************************************************************************/

-package org.eclipe.debug.tests.viewer.model;

-

-import java.util.Arrays;

-

-import junit.framework.TestCase;

-

-import org.eclipe.debug.tests.viewer.model.TestModel.TestElement;

-import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation;

-import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation2;

-import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentationFactory;

-import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;

-import org.eclipse.debug.internal.ui.viewers.model.provisional.PresentationContext;

-import org.eclipse.debug.internal.ui.viewers.model.provisional.TreeModelViewer;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.viewers.TreePath;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.events.ControlListener;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.XMLMemento;

-

-/**

- * Tests to verify that the viewer properly handles initial columns width.

- */

-public class ColumnPresentationTests extends TestCase implements ITestModelUpdatesListenerConstants {

-	private Display fDisplay;

-	private Shell fShell;

-	private TreeModelViewer fViewer;

-	private TestModelUpdatesListener fListener;

-	private boolean fResized = false; 

-

-	public ColumnPresentationTests(String name) {

-		super(name);

-	}

-

-	/**

-	 * @throws java.lang.Exception

-	 */

-	protected void setUp() throws Exception {

-		createViewer();

-	}

-

-	/**

-	 * @throws java.lang.Exception

-	 */

-	protected void tearDown() throws Exception {

-		destroyViewer();

-	}

-

-	void createViewer() {

-		fDisplay = PlatformUI.getWorkbench().getDisplay();

-        fShell = new Shell(fDisplay);

-        fShell.setSize(800, 600);

-		fShell.setLayout(new FillLayout());

-		fViewer = new TreeModelViewer(fShell, SWT.VIRTUAL, new PresentationContext("TestViewer"));

-        fViewer.getTree().addControlListener(new ControlListener() {

-            public void controlResized(ControlEvent e) {

-                fResized = true;

-            }

-            

-            public void controlMoved(ControlEvent e) {

-            }

-        });

-		fListener = new TestModelUpdatesListener(fViewer, false, false);

-		fShell.open();

-	}

-

-	void destroyViewer() throws InterruptedException {

-		fListener.dispose();

-		fViewer.getPresentationContext().dispose();

-		// Close the shell.

-		fShell.close();

-		while (!fShell.isDisposed()) {

-			if (!fDisplay.readAndDispatch()) {

-				Thread.sleep(0);

-			}

-		}

-	}

-

-	void recreateViewer() throws InterruptedException {

-		destroyViewer();

-		createViewer();

-	}

-

-	static class MyColumnPresentation implements IColumnPresentation {

-		private IPresentationContext fContext;

-		protected String[] columnIds;

-

-		MyColumnPresentation() {

-			columnIds = new String[5];

-			for (int i = 0; i < columnIds.length; i++) {

-				columnIds[i] = "ColumnId_" + i;

-			}

-		}

-

-		public void init(IPresentationContext context) {

-			fContext = context;

-		}

-

-		public void dispose() {

-			fContext = null;

-		}

-

-		public ImageDescriptor getImageDescriptor(String id) {

-			return null;

-		}

-

-		protected IPresentationContext getPresentationContext() {

-			return fContext;

-		}

-

-		public String[] getAvailableColumns() {

-			return columnIds;

-		}

-

-		public String[] getInitialColumns() {

-			return columnIds;

-		}

-

-		public String getHeader(String id) {

-			return id;

-		}

-

-		public String getId() {

-			return "MyColumnPresentationID";

-		}

-

-		public boolean isOptional() {

-			return true;

-		}

-

-	}

-

-	static class MyColumnPresentation2 extends MyColumnPresentation implements IColumnPresentation2 {

-		int[] repliedWidths;

-

-		MyColumnPresentation2() {

-			super();

-			for (int i = 0; i < columnIds.length; i++) {

-				columnIds[i] += "_2";

-			}

-			repliedWidths = new int[columnIds.length];

-			Arrays.fill(repliedWidths, -2);

-		}

-

-		public int getInitialColumnWidth(String id, int treeWidgetWidth,

-				String[] visibleColumnIds) {

-			for (int i = 0; i < columnIds.length; i++) {

-				if (id.equals(columnIds[i]) && i == 0) {

-					repliedWidths[i] = 2 * (treeWidgetWidth / visibleColumnIds.length);

-					return repliedWidths[i];

-				}

-				if (id.equals(columnIds[i]) && (i == 1 || i == 2)) {

-					repliedWidths[i] = (treeWidgetWidth / visibleColumnIds.length) / 2;

-					return repliedWidths[i];

-				}

-				if (id.equals(columnIds[i]) && i == 3) {

-					repliedWidths[i] = (treeWidgetWidth / visibleColumnIds.length);

-					return repliedWidths[i];

-				}

-				if (id.equals(columnIds[i]) && i == 4) {

-					repliedWidths[i] = -1;

-					return repliedWidths[i];

-				}

-			}

-			return -1;

-		}

-

-		public String getId() {

-			return "MyColumnPresentation2ID";

-		}

-	}

-

-	class MyModel extends TestModel implements IColumnPresentationFactory {

-		MyColumnPresentation colPresenation;

-

-		MyModel(MyColumnPresentation cp1) {

-			colPresenation = cp1;

-		}

-

-		public IColumnPresentation createColumnPresentation(

-				IPresentationContext context, Object element) {

-			if (colPresenation != null) {

-				return colPresenation;

-			}

-			return null;

-		}

-

-		public String getColumnPresentationId(IPresentationContext context,

-				Object element) {

-			if (colPresenation != null) {

-				return colPresenation.getId();

-			}

-			return null;

-		}

-

-	}

-

-	private TestModel makeModel(MyColumnPresentation cp, String rootSufffix) throws InterruptedException {

-		MyModel model = new MyModel(cp);

-		model.setRoot(new TestElement(model, "root" + rootSufffix, new TestElement[] {

-				new TestElement(model, "1", true, true, new TestElement[0]),

-				new TestElement(model, "2", true, false, new TestElement[0]),

-				new TestElement(model, "3", false, true, new TestElement[0]),

-				new TestElement(model, "4", false, false, new TestElement[0]),

-				new TestElement(model, "5", new TestElement[0]),

-				new TestElement(model, "6", new TestElement[0]) }));

-		fListener.reset(TreePath.EMPTY, model.getRootElement(), -1, true, false);

-		fViewer.setInput(model.getRootElement());

-		while (!fListener.isFinished()) {

-			if (!fDisplay.readAndDispatch()) {

-				Thread.sleep(0);

-			}

-		}

-		model.validateData(fViewer, TreePath.EMPTY);

-		return model;

-	}

-

-	/**

-	 * In this test: verify that tree viewer can handle IColumnPresentation

-	 * implementation without requiring the presentation being

-	 * IColumnPresentation2 (i.e. ensure we do not break backward compatibility

-	 * of interface). Also, we verify that the initial columns width is the

-	 * average of tree width / number of visible columns, which is the logic

-	 * in InternalTreeModelViewer.

-	 */

-	public void testInitialColumnAverageWidth() throws InterruptedException {

-        // Try to wait for the shell painting to settle

-        if (!fDisplay.readAndDispatch ()) Thread.sleep(0);

-        fResized = false;

-	    

-		MyColumnPresentation colPre = new MyColumnPresentation();

-		makeModel(colPre, "m1");

-		Tree tree = fViewer.getTree();

-		TreeColumn[] columns = tree.getColumns();

-		int treeWidth = tree.getSize().x;

-		int avgWidth = treeWidth / columns.length;

-

-        // Resizing the tree invalidates the test.

-		if (fResized) {

-		    return;

-		}

-

-		for (int i = 0; i < columns.length - 1; i++) {

-			assertEquals(avgWidth, columns[i].getWidth());

-		}

-		// Checking of the width of the last column is not reliable.  

-		// I.e. it's handled differenty on different platforms.

-        //int remainder = treeWidth % columns.length;

-        //assertEquals(avgWidth + remainder, columns[columns.length - 1].getWidth());

-	}

-

-	/**

-	 * In this test: verify that tree viewer can handle IColumnPresentation2.

-	 * Also, we verify that the initial columns width is the width computed by

-	 * the IColumnPresentation2 implementation.

-	 */

-	public void testInitialColumnWidth() throws InterruptedException {

-        // Try to wait for the shell painting to settle

-        if (!fDisplay.readAndDispatch ()) Thread.sleep(0);

-        fResized = false;

-

-        MyColumnPresentation2 colPre = new MyColumnPresentation2();

-		makeModel(colPre, "m2");

-		Tree tree = fViewer.getTree();

-		TreeColumn[] columns = tree.getColumns();

-		

-        // Resizing the tree invalidates the test.

-		if (fResized) {

-		    return;

-		}

-		

-		for (int i = 0; i < columns.length; i++) {

-			int width = colPre.repliedWidths[i];

-			if (width != -1) {

-	            assertEquals(width, columns[i].getWidth());

-			}

-		}

-	}

-

-	/**

-	 * In this test: verify that tree viewer can handle IColumnPresentation2.

-	 * Also, we verify that the initial columns width from IColumnPresentation2

-	 * is not used when there are user settings inside the viewer which are

-	 * created from user resizing columns.

-	 */

-	public void testRespectUserSettings() throws InterruptedException {

-		MyColumnPresentation2 colPre = new MyColumnPresentation2();

-		makeModel(colPre, "m2");

-		TreeColumn[] columns = fViewer.getTree().getColumns();

-		// simulate user resizing each column width

-		int[] newWidths = new int[columns.length];

-		for (int i = 0; i < columns.length; i++) {

-			newWidths[i] = columns[i].getWidth() + 10;

-			columns[i].setWidth(newWidths[i]);

-		}

-		for (int i = 0; i < columns.length; i++) {

-			assertEquals(newWidths[i], columns[i].getWidth());

-		}

-		// get InternalTreeModelViewer to rebuild columns due to change of

-		// model and presentation - first set to another model and column

-		// presentation, then switch to a model with original presentation.

-		makeModel(new MyColumnPresentation(), "m1");

-		makeModel(colPre, "m3");

-		// verify user resized widths are used instead of the initial widths from IColumnPresentation2

-		columns = fViewer.getTree().getColumns();

-		for (int i = 0; i < columns.length; i++) {

-			assertEquals(newWidths[i], columns[i].getWidth());

-		}

-

-		// get InternalTreeModelViewer to rebuild columns due to hide and show columns

-		fViewer.setShowColumns(false);

-		do {

-			if (!fDisplay.readAndDispatch()) {

-				Thread.sleep(0);

-			}

-		} while (fViewer.getTree().getColumns().length > 0);

-		fViewer.setShowColumns(true);

-		do {

-			if (!fDisplay.readAndDispatch()) {

-				Thread.sleep(0);

-			}

-		} while (fViewer.getTree().getColumns().length != newWidths.length);

-		// verify user resized widths are used instead of the initial widths from IColumnPresentation2

-		columns = fViewer.getTree().getColumns();

-		for (int i = 0; i < columns.length; i++) {

-			assertEquals(newWidths[i], columns[i].getWidth());

-		}

-	}

-

-	/**

-	 * In this test: verify that tree viewer can handle IColumnPresentation2.

-	 * Also, we verify that the initial columns width from IColumnPresentation2

-	 * is not used when there are user settings inside the viewer which are

-	 * restored from memento, e.g., restoring workspace, etc.

-	 */

-	public void testRespectMemento() throws InterruptedException {

-		MyColumnPresentation2 colPre = new MyColumnPresentation2();

-		makeModel(colPre, "m2");

-		TreeColumn[] columns = fViewer.getTree().getColumns();

-		// simulate user resizing each column width

-		int[] newWidths = new int[columns.length];

-		for (int i = 0; i < columns.length; i++) {

-			newWidths[i] = columns[i].getWidth() + 10;

-			columns[i].setWidth(newWidths[i]);

-		}

-		for (int i = 0; i < columns.length; i++) {

-			assertEquals(newWidths[i], columns[i].getWidth());

-		}

-		// save memento

-		final XMLMemento memento = XMLMemento.createWriteRoot("TEST"); 

-		fViewer.saveState(memento);

-		// throw away any settings inside the viewer and create a new viewer

-		// with memento settings, this is the same effect resulted from closing

-		// and opening workspace again.

-		recreateViewer();

-		fViewer.initState(memento);

-		// get InternalTreeModelViewer to rebuild columns

-		makeModel(colPre, "m2");

-		// verify widths from memento are used instead of the initial widths from IColumnPresentation2

-		columns = fViewer.getTree().getColumns();

-		for (int i = 0; i < columns.length; i++) {

-			assertEquals(newWidths[i], columns[i].getWidth());

-		}

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2009, 2011 Wind River Systems 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipe.debug.tests.viewer.model;
+
+import java.util.Arrays;
+
+import junit.framework.TestCase;
+
+import org.eclipe.debug.tests.viewer.model.TestModel.TestElement;
+import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation;
+import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation2;
+import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentationFactory;
+import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
+import org.eclipse.debug.internal.ui.viewers.model.provisional.PresentationContext;
+import org.eclipse.debug.internal.ui.viewers.model.provisional.TreeModelViewer;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.TreePath;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.events.ControlListener;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.XMLMemento;
+
+/**
+ * Tests to verify that the viewer properly handles initial columns width.
+ */
+public class ColumnPresentationTests extends TestCase implements ITestModelUpdatesListenerConstants {
+	private Display fDisplay;
+	private Shell fShell;
+	private TreeModelViewer fViewer;
+	private TestModelUpdatesListener fListener;
+	private boolean fResized = false; 
+
+	public ColumnPresentationTests(String name) {
+		super(name);
+	}
+
+	/**
+	 * @throws java.lang.Exception
+	 */
+	protected void setUp() throws Exception {
+		createViewer();
+	}
+
+	/**
+	 * @throws java.lang.Exception
+	 */
+	protected void tearDown() throws Exception {
+		destroyViewer();
+	}
+
+	void createViewer() {
+		fDisplay = PlatformUI.getWorkbench().getDisplay();
+        fShell = new Shell(fDisplay);
+        fShell.setSize(800, 600);
+		fShell.setLayout(new FillLayout());
+		fViewer = new TreeModelViewer(fShell, SWT.VIRTUAL, new PresentationContext("TestViewer"));
+        fViewer.getTree().addControlListener(new ControlListener() {
+            public void controlResized(ControlEvent e) {
+                fResized = true;
+            }
+            
+            public void controlMoved(ControlEvent e) {
+            }
+        });
+		fListener = new TestModelUpdatesListener(fViewer, false, false);
+		fShell.open();
+	}
+
+	void destroyViewer() throws InterruptedException {
+		fListener.dispose();
+		fViewer.getPresentationContext().dispose();
+		// Close the shell.
+		fShell.close();
+		while (!fShell.isDisposed()) {
+			if (!fDisplay.readAndDispatch()) {
+				Thread.sleep(0);
+			}
+		}
+	}
+
+	void recreateViewer() throws InterruptedException {
+		destroyViewer();
+		createViewer();
+	}
+
+	static class MyColumnPresentation implements IColumnPresentation {
+		private IPresentationContext fContext;
+		protected String[] columnIds;
+
+		MyColumnPresentation() {
+			columnIds = new String[5];
+			for (int i = 0; i < columnIds.length; i++) {
+				columnIds[i] = "ColumnId_" + i;
+			}
+		}
+
+		public void init(IPresentationContext context) {
+			fContext = context;
+		}
+
+		public void dispose() {
+			fContext = null;
+		}
+
+		public ImageDescriptor getImageDescriptor(String id) {
+			return null;
+		}
+
+		protected IPresentationContext getPresentationContext() {
+			return fContext;
+		}
+
+		public String[] getAvailableColumns() {
+			return columnIds;
+		}
+
+		public String[] getInitialColumns() {
+			return columnIds;
+		}
+
+		public String getHeader(String id) {
+			return id;
+		}
+
+		public String getId() {
+			return "MyColumnPresentationID";
+		}
+
+		public boolean isOptional() {
+			return true;
+		}
+
+	}
+
+	static class MyColumnPresentation2 extends MyColumnPresentation implements IColumnPresentation2 {
+		int[] repliedWidths;
+
+		MyColumnPresentation2() {
+			super();
+			for (int i = 0; i < columnIds.length; i++) {
+				columnIds[i] += "_2";
+			}
+			repliedWidths = new int[columnIds.length];
+			Arrays.fill(repliedWidths, -2);
+		}
+
+		public int getInitialColumnWidth(String id, int treeWidgetWidth,
+				String[] visibleColumnIds) {
+			for (int i = 0; i < columnIds.length; i++) {
+				if (id.equals(columnIds[i]) && i == 0) {
+					repliedWidths[i] = 2 * (treeWidgetWidth / visibleColumnIds.length);
+					return repliedWidths[i];
+				}
+				if (id.equals(columnIds[i]) && (i == 1 || i == 2)) {
+					repliedWidths[i] = (treeWidgetWidth / visibleColumnIds.length) / 2;
+					return repliedWidths[i];
+				}
+				if (id.equals(columnIds[i]) && i == 3) {
+					repliedWidths[i] = (treeWidgetWidth / visibleColumnIds.length);
+					return repliedWidths[i];
+				}
+				if (id.equals(columnIds[i]) && i == 4) {
+					repliedWidths[i] = -1;
+					return repliedWidths[i];
+				}
+			}
+			return -1;
+		}
+
+		public String getId() {
+			return "MyColumnPresentation2ID";
+		}
+	}
+
+	class MyModel extends TestModel implements IColumnPresentationFactory {
+		MyColumnPresentation colPresenation;
+
+		MyModel(MyColumnPresentation cp1) {
+			colPresenation = cp1;
+		}
+
+		public IColumnPresentation createColumnPresentation(
+				IPresentationContext context, Object element) {
+			if (colPresenation != null) {
+				return colPresenation;
+			}
+			return null;
+		}
+
+		public String getColumnPresentationId(IPresentationContext context,
+				Object element) {
+			if (colPresenation != null) {
+				return colPresenation.getId();
+			}
+			return null;
+		}
+
+	}
+
+	private TestModel makeModel(MyColumnPresentation cp, String rootSufffix) throws InterruptedException {
+		MyModel model = new MyModel(cp);
+		model.setRoot(new TestElement(model, "root" + rootSufffix, new TestElement[] {
+				new TestElement(model, "1", true, true, new TestElement[0]),
+				new TestElement(model, "2", true, false, new TestElement[0]),
+				new TestElement(model, "3", false, true, new TestElement[0]),
+				new TestElement(model, "4", false, false, new TestElement[0]),
+				new TestElement(model, "5", new TestElement[0]),
+				new TestElement(model, "6", new TestElement[0]) }));
+		fListener.reset(TreePath.EMPTY, model.getRootElement(), -1, true, false);
+		fViewer.setInput(model.getRootElement());
+		while (!fListener.isFinished()) {
+			if (!fDisplay.readAndDispatch()) {
+				Thread.sleep(0);
+			}
+		}
+		model.validateData(fViewer, TreePath.EMPTY);
+		return model;
+	}
+
+	/**
+	 * In this test: verify that tree viewer can handle IColumnPresentation
+	 * implementation without requiring the presentation being
+	 * IColumnPresentation2 (i.e. ensure we do not break backward compatibility
+	 * of interface). Also, we verify that the initial columns width is the
+	 * average of tree width / number of visible columns, which is the logic
+	 * in InternalTreeModelViewer.
+	 */
+	public void testInitialColumnAverageWidth() throws InterruptedException {
+        // Try to wait for the shell painting to settle
+        if (!fDisplay.readAndDispatch ()) Thread.sleep(0);
+        fResized = false;
+	    
+		MyColumnPresentation colPre = new MyColumnPresentation();
+		makeModel(colPre, "m1");
+		Tree tree = fViewer.getTree();
+		TreeColumn[] columns = tree.getColumns();
+		int treeWidth = tree.getSize().x;
+		int avgWidth = treeWidth / columns.length;
+
+        // Resizing the tree invalidates the test.
+		if (fResized) {
+		    return;
+		}
+
+		for (int i = 0; i < columns.length - 1; i++) {
+			assertEquals(avgWidth, columns[i].getWidth());
+		}
+		// Checking of the width of the last column is not reliable.  
+		// I.e. it's handled differenty on different platforms.
+        //int remainder = treeWidth % columns.length;
+        //assertEquals(avgWidth + remainder, columns[columns.length - 1].getWidth());
+	}
+
+	/**
+	 * In this test: verify that tree viewer can handle IColumnPresentation2.
+	 * Also, we verify that the initial columns width is the width computed by
+	 * the IColumnPresentation2 implementation.
+	 */
+	public void testInitialColumnWidth() throws InterruptedException {
+        // Try to wait for the shell painting to settle
+        if (!fDisplay.readAndDispatch ()) Thread.sleep(0);
+        fResized = false;
+
+        MyColumnPresentation2 colPre = new MyColumnPresentation2();
+		makeModel(colPre, "m2");
+		Tree tree = fViewer.getTree();
+		TreeColumn[] columns = tree.getColumns();
+		
+        // Resizing the tree invalidates the test.
+		if (fResized) {
+		    return;
+		}
+		
+		for (int i = 0; i < columns.length; i++) {
+			int width = colPre.repliedWidths[i];
+			if (width != -1) {
+	            assertEquals(width, columns[i].getWidth());
+			}
+		}
+	}
+
+	/**
+	 * In this test: verify that tree viewer can handle IColumnPresentation2.
+	 * Also, we verify that the initial columns width from IColumnPresentation2
+	 * is not used when there are user settings inside the viewer which are
+	 * created from user resizing columns.
+	 */
+	public void testRespectUserSettings() throws InterruptedException {
+		MyColumnPresentation2 colPre = new MyColumnPresentation2();
+		makeModel(colPre, "m2");
+		TreeColumn[] columns = fViewer.getTree().getColumns();
+		// simulate user resizing each column width
+		int[] newWidths = new int[columns.length];
+		for (int i = 0; i < columns.length; i++) {
+			newWidths[i] = columns[i].getWidth() + 10;
+			columns[i].setWidth(newWidths[i]);
+		}
+		for (int i = 0; i < columns.length; i++) {
+			assertEquals(newWidths[i], columns[i].getWidth());
+		}
+		// get InternalTreeModelViewer to rebuild columns due to change of
+		// model and presentation - first set to another model and column
+		// presentation, then switch to a model with original presentation.
+		makeModel(new MyColumnPresentation(), "m1");
+		makeModel(colPre, "m3");
+		// verify user resized widths are used instead of the initial widths from IColumnPresentation2
+		columns = fViewer.getTree().getColumns();
+		for (int i = 0; i < columns.length; i++) {
+			assertEquals(newWidths[i], columns[i].getWidth());
+		}
+
+		// get InternalTreeModelViewer to rebuild columns due to hide and show columns
+		fViewer.setShowColumns(false);
+		do {
+			if (!fDisplay.readAndDispatch()) {
+				Thread.sleep(0);
+			}
+		} while (fViewer.getTree().getColumns().length > 0);
+		fViewer.setShowColumns(true);
+		do {
+			if (!fDisplay.readAndDispatch()) {
+				Thread.sleep(0);
+			}
+		} while (fViewer.getTree().getColumns().length != newWidths.length);
+		// verify user resized widths are used instead of the initial widths from IColumnPresentation2
+		columns = fViewer.getTree().getColumns();
+		for (int i = 0; i < columns.length; i++) {
+			assertEquals(newWidths[i], columns[i].getWidth());
+		}
+	}
+
+	/**
+	 * In this test: verify that tree viewer can handle IColumnPresentation2.
+	 * Also, we verify that the initial columns width from IColumnPresentation2
+	 * is not used when there are user settings inside the viewer which are
+	 * restored from memento, e.g., restoring workspace, etc.
+	 */
+	public void testRespectMemento() throws InterruptedException {
+		MyColumnPresentation2 colPre = new MyColumnPresentation2();
+		makeModel(colPre, "m2");
+		TreeColumn[] columns = fViewer.getTree().getColumns();
+		// simulate user resizing each column width
+		int[] newWidths = new int[columns.length];
+		for (int i = 0; i < columns.length; i++) {
+			newWidths[i] = columns[i].getWidth() + 10;
+			columns[i].setWidth(newWidths[i]);
+		}
+		for (int i = 0; i < columns.length; i++) {
+			assertEquals(newWidths[i], columns[i].getWidth());
+		}
+		// save memento
+		final XMLMemento memento = XMLMemento.createWriteRoot("TEST"); 
+		fViewer.saveState(memento);
+		// throw away any settings inside the viewer and create a new viewer
+		// with memento settings, this is the same effect resulted from closing
+		// and opening workspace again.
+		recreateViewer();
+		fViewer.initState(memento);
+		// get InternalTreeModelViewer to rebuild columns
+		makeModel(colPre, "m2");
+		// verify widths from memento are used instead of the initial widths from IColumnPresentation2
+		columns = fViewer.getTree().getColumns();
+		for (int i = 0; i < columns.length; i++) {
+			assertEquals(newWidths[i], columns[i].getWidth());
+		}
+	}
+}
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ContentTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ContentTests.java
index ece0b3e0c..0725b1fd3 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ContentTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ContentTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Wind River Systems and others.
+ * Copyright (c) 2009, 2011 Wind River Systems 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
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/DeltaTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/DeltaTests.java
index 16fd3485a..d78e9367d 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/DeltaTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/DeltaTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Wind River Systems and others.
+ * Copyright (c) 2009, 2011 Wind River Systems 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
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ITestModelUpdatesListenerConstants.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ITestModelUpdatesListenerConstants.java
index 73b4cb027..0d47d6ed5 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ITestModelUpdatesListenerConstants.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ITestModelUpdatesListenerConstants.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Wind River Systems and others.
+ * Copyright (c) 2009, 2010 Wind River Systems 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
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerLazyTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerLazyTests.java
index 42028b0b7..fa6183d61 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerLazyTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerLazyTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Wind River Systems and others.
+ * Copyright (c) 2009, 2010 Wind River Systems 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
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerPopupTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerPopupTests.java
index f3dcce096..70f41bd3c 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerPopupTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerPopupTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Wind River Systems and others.
+ * Copyright (c) 2009, 2010 Wind River Systems 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
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerStateTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerStateTests.java
index 2e4f23979..07104a79b 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerStateTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerStateTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Wind River Systems and others.
+ * Copyright (c) 2009, 2010 Wind River Systems 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
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerTopIndexTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerTopIndexTests.java
index ffa53e9f9..7ca0eceb1 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerTopIndexTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerTopIndexTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Wind River Systems and others.
+ * Copyright (c) 2010, 2011 Wind River Systems 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
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/LazyTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/LazyTests.java
index 373e67132..f6566d9bc 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/LazyTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/LazyTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Wind River Systems and others.
+ * Copyright (c) 2009, 2011 Wind River Systems 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
@@ -160,12 +160,12 @@ abstract public class LazyTests extends TestCase implements ITestModelUpdatesLis
         // for the content update sequence to finish (elements off screen will
         // not be updated).
         // TODO: child count for element 1 is updated multiple times.
-        fListener.reset();

-        fListener.setFailOnMultipleModelUpdateSequences(true); 

-        fListener.setFailOnRedundantUpdates(false);

+        fListener.reset();
+        fListener.setFailOnMultipleModelUpdateSequences(true); 
+        fListener.setFailOnRedundantUpdates(false);
         fViewer.setInput(model.getRootElement());
-        fListener.addLabelUpdate(model.findElement("1.0"));

-        while (!fListener.isFinished(CONTENT_UPDATES_COMPLETE | LABEL_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0);

+        fListener.addLabelUpdate(model.findElement("1.0"));
+        while (!fListener.isFinished(CONTENT_UPDATES_COMPLETE | LABEL_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0);
 
         // Set selection so that the initial selection is not empty
         fViewer.setSelection(new TreeSelection(new TreePath[] { model.findElement("1.0")} ));
@@ -190,7 +190,7 @@ abstract public class LazyTests extends TestCase implements ITestModelUpdatesLis
         fListener.addLabelUpdate(_1_0_newElementPath);
         model.postDelta(rootDelta);
 
-        while (!fListener.isFinished(MODEL_CHANGED_COMPLETE |  LABEL_COMPLETE)) 

+        while (!fListener.isFinished(MODEL_CHANGED_COMPLETE |  LABEL_COMPLETE)) 
             if (!fDisplay.readAndDispatch ()) Thread.sleep(0);
 
 
@@ -218,7 +218,7 @@ abstract public class LazyTests extends TestCase implements ITestModelUpdatesLis
         fListener.reset();
         fListener.setFailOnRedundantUpdates(false);
         fViewer.reveal(model.findElement("1"), 500);
-        while (!fListener.isFinished(CONTENT_UPDATES_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0);

+        while (!fListener.isFinished(CONTENT_UPDATES_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0);
         
         // Create delta to refresh the "1" element.
         TestElement rootElement = model.getRootElement();
@@ -248,7 +248,7 @@ abstract public class LazyTests extends TestCase implements ITestModelUpdatesLis
             }
             model.postDelta(rootDelta);
     
-            while (!fListener.isFinished(CONTENT_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) 

+            while (!fListener.isFinished(CONTENT_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) 
                 if (!fDisplay.readAndDispatch ()) Thread.sleep(0);
         }
     }
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PerformanceTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PerformanceTests.java
index c184485e8..55a140e2c 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PerformanceTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PerformanceTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Wind River Systems and others.
+ * Copyright (c) 2009, 2011 Wind River Systems 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
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PopupTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PopupTests.java
index 73c592a5a..19247755d 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PopupTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PopupTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Wind River Systems and others.
+ * Copyright (c) 2009, 2011 Wind River Systems 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
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/SelectionTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/SelectionTests.java
index 3c70b8a45..e062ed719 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/SelectionTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/SelectionTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Wind River Systems and others.
+ * Copyright (c) 2009, 2011 Wind River Systems 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
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/StateTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/StateTests.java
index 3828e03c2..9f1b85aa4 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/StateTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/StateTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Wind River Systems and others.
+ * Copyright (c) 2009, 2011 Wind River Systems 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
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModel.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModel.java
index 609ce9838..d64f6bb0b 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModel.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModel.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Wind River Systems and others.
+ * Copyright (c) 2009, 2010 Wind River Systems 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
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModelUpdatesListener.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModelUpdatesListener.java
index ebe686801..31a3523f2 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModelUpdatesListener.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModelUpdatesListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Wind River Systems and others.
+ * Copyright (c) 2009, 2011 Wind River Systems 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
@@ -132,10 +132,10 @@ public class TestModelUpdatesListener
         fFailOnRedundantUpdates = failOnRedundantUpdates;
     }
 
-    public void setFailOnRedundantLabelUpdates(boolean failOnRedundantLabelUpdates) {

-        fFailOnRedundantLabelUpdates = failOnRedundantLabelUpdates;

-    }

-

+    public void setFailOnRedundantLabelUpdates(boolean failOnRedundantLabelUpdates) {
+        fFailOnRedundantLabelUpdates = failOnRedundantLabelUpdates;
+    }
+
     public void setFailOnMultipleModelUpdateSequences(boolean failOnMultipleLabelUpdateSequences) {
         fFailOnMultipleModelUpdateSequences = failOnMultipleLabelUpdateSequences;
     }
@@ -171,7 +171,7 @@ public class TestModelUpdatesListener
     public void reset() {
         fJobError = null;
         fRedundantUpdates.clear();
-        fRedundantLabelUpdates.clear();

+        fRedundantLabelUpdates.clear();
         fRedundantHasChildrenUpdateExceptions.clear();
         fRedundantChildCountUpdateExceptions.clear();
         fRedundantChildrenUpdateExceptions.clear();
@@ -375,9 +375,9 @@ public class TestModelUpdatesListener
         if (fFailOnRedundantUpdates && !fRedundantUpdates.isEmpty()) {
             Assert.fail("Redundant Updates: " + fRedundantUpdates.toString());
         }
-        if (fFailOnRedundantLabelUpdates && !fRedundantLabelUpdates.isEmpty()) {

-            Assert.fail("Redundant Label Updates: " + fRedundantLabelUpdates.toString());

-        }        

+        if (fFailOnRedundantLabelUpdates && !fRedundantLabelUpdates.isEmpty()) {
+            Assert.fail("Redundant Label Updates: " + fRedundantLabelUpdates.toString());
+        }        
         if (fFailOnMultipleLabelUpdateSequences && !fMultipleLabelUpdateSequencesObserved) {
             Assert.fail("Multiple label update sequences detected");
         }
@@ -534,10 +534,10 @@ public class TestModelUpdatesListener
         	fLabelUpdatesCounter--;
         }
         if (!fLabelUpdates.remove(update.getElementPath()) && 
-            fFailOnRedundantLabelUpdates && 

+            fFailOnRedundantLabelUpdates && 
             !fRedundantLabelUpdateExceptions.contains(update.getElementPath())) 
         {
-        	fRedundantLabelUpdates.add(update);

+        	fRedundantLabelUpdates.add(update);
             Assert.fail("Redundant update: " + update);
         }
     }
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TreePathWrapper.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TreePathWrapper.java
index e45f72fd5..23484333f 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TreePathWrapper.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TreePathWrapper.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011 IBM Corporation 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipe.debug.tests.viewer.model;
 
 import junit.framework.Assert;
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/UpdateTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/UpdateTests.java
index 1044f62d1..2f6a0985a 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/UpdateTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/UpdateTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Wind River Systems and others.
+ * Copyright (c) 2009, 2011 Wind River Systems 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
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerLazyModeTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerLazyModeTests.java
index e3b2ea827..300f76424 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerLazyModeTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerLazyModeTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Wind River Systems and others.
+ * Copyright (c) 2009, 2011 Wind River Systems 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
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerPopupTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerPopupTests.java
index 71484d116..ee8e9c745 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerPopupTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerPopupTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Wind River Systems and others.
+ * Copyright (c) 2009, 2010 Wind River Systems 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
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/AutomatedSuite.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/AutomatedSuite.java
index 745993e4f..82ba80b7a 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/AutomatedSuite.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/AutomatedSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
+ * Copyright (c) 2009, 2011 IBM Corporation 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
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/LocalSuite.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/LocalSuite.java
index bfe8ba5fa..55acd5731 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/LocalSuite.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/LocalSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
+ * Copyright (c) 2009, 2011 IBM Corporation 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
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ShowTargetBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ShowTargetBreakpointsAction.java
index b6821f131..c9f0bff4e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ShowTargetBreakpointsAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/ShowTargetBreakpointsAction.java
@@ -1,63 +1,63 @@
-/*****************************************************************

- * Copyright (c) 2009 Texas Instruments 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

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Patrick Chuong (Texas Instruments) - Initial API and implementation (Bug 238956)

- *****************************************************************/

-package org.eclipse.debug.internal.ui.actions.breakpoints;

-

-import org.eclipse.debug.internal.ui.DebugPluginImages;

-import org.eclipse.debug.internal.ui.DebugUIPlugin;

-import org.eclipse.debug.internal.ui.IDebugHelpContextIds;

-import org.eclipse.debug.internal.ui.actions.ActionMessages;

-import org.eclipse.debug.internal.ui.views.breakpoints.BreakpointsView;

-import org.eclipse.debug.ui.IDebugUIConstants;

-import org.eclipse.jface.action.Action;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * This class implements the show target breakpoint action.

- * 

- * @since 3.6

- */

-public class ShowTargetBreakpointsAction extends Action {

-	/**

-	 * Breakpoints view

-	 */

-	BreakpointsView fView;

-	

-	/**

-	 * Constructor.

-	 * 

-	 * @param view the breakpoints view

-	 */

-	public ShowTargetBreakpointsAction(BreakpointsView view) {

-		super();

-		

-		fView = view;

-		

-		setText(ActionMessages.ShowSupportedBreakpointsAction_Show_For_Selected); 

-		setToolTipText(ActionMessages.ShowSupportedBreakpointsAction_tooltip); 

-		

-		setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_OBJS_DEBUG_TARGET));

-		setChecked(false);

-		setId(DebugUIPlugin.getUniqueIdentifier() + ".ShowSupportedBreakpointsAction"); //$NON-NLS-1$

-		

-		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.SHOW_BREAKPOINTS_FOR_MODEL_ACTION);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.jface.action.Action#run()

-	 */

-	public void run() {

-		if (fView.getViewer().getControl().isDisposed()) {

-			return;

-		}

-		fView.setFilterSelection(isChecked());

-	}

-}

+/*****************************************************************
+ * Copyright (c) 2009, 2010 Texas Instruments 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Patrick Chuong (Texas Instruments) - Initial API and implementation (Bug 238956)
+ *****************************************************************/
+package org.eclipse.debug.internal.ui.actions.breakpoints;
+
+import org.eclipse.debug.internal.ui.DebugPluginImages;
+import org.eclipse.debug.internal.ui.DebugUIPlugin;
+import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
+import org.eclipse.debug.internal.ui.actions.ActionMessages;
+import org.eclipse.debug.internal.ui.views.breakpoints.BreakpointsView;
+import org.eclipse.debug.ui.IDebugUIConstants;
+import org.eclipse.jface.action.Action;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * This class implements the show target breakpoint action.
+ * 
+ * @since 3.6
+ */
+public class ShowTargetBreakpointsAction extends Action {
+	/**
+	 * Breakpoints view
+	 */
+	BreakpointsView fView;
+	
+	/**
+	 * Constructor.
+	 * 
+	 * @param view the breakpoints view
+	 */
+	public ShowTargetBreakpointsAction(BreakpointsView view) {
+		super();
+		
+		fView = view;
+		
+		setText(ActionMessages.ShowSupportedBreakpointsAction_Show_For_Selected); 
+		setToolTipText(ActionMessages.ShowSupportedBreakpointsAction_tooltip); 
+		
+		setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_OBJS_DEBUG_TARGET));
+		setChecked(false);
+		setId(DebugUIPlugin.getUniqueIdentifier() + ".ShowSupportedBreakpointsAction"); //$NON-NLS-1$
+		
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.SHOW_BREAKPOINTS_FOR_MODEL_ACTION);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.jface.action.Action#run()
+	 */
+	public void run() {
+		if (fView.getViewer().getControl().isDisposed()) {
+			return;
+		}
+		fView.setFilterSelection(isChecked());
+	}
+}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/IBreakpointUIConstants.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/IBreakpointUIConstants.java
index 85784cdba..ad55c0751 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/IBreakpointUIConstants.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/breakpoints/provisional/IBreakpointUIConstants.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Wind River Systems and others.
+ * Copyright (c) 2009, 2010 Wind River Systems 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
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultBreakpointsViewInput.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultBreakpointsViewInput.java
index 27a161a3a..a525bdf95 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultBreakpointsViewInput.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultBreakpointsViewInput.java
@@ -1,74 +1,74 @@
-/*****************************************************************

- * Copyright (c) 2009 Texas Instruments 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

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Patrick Chuong (Texas Instruments) - Initial API and implementation (Bug 238956)

- *     Wind River Systems - ongoing enhancements and bug fixing

- *****************************************************************/

-package org.eclipse.debug.internal.ui.elements.adapters;

-

-import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;

-

-/**

- * The default breakpoints view input populates the view with content 

- * from the default breakpoint manager.

- * 

- * @since 3.6

- */

-public class DefaultBreakpointsViewInput {

-	

-	/**

-	 * The presentation context of the breakpoints view.

-	 */

-	final private IPresentationContext fContext;

-	

-	/**

-	 * Constructor.

-	 * 

-	 * @param context the presentation context for this input

-	 */

-	public DefaultBreakpointsViewInput(IPresentationContext context) {

-		fContext = context;

-	}

-		

-	/**

-	 * Returns the presentation context for this input.

-	 * 

-	 * @return the presentation context

-	 */

-	public IPresentationContext getContext() {

-		return fContext;

-	}

-	

-	/*

-     * (non-Javadoc)

-     * @see java.lang.Object#hashCode()

-     */

-    public int hashCode() {

-        if (getContext() != null) {

-            return getContext().hashCode();

-        } else {

-            return 1;

-        }

-    }

-

-    /*

-     * (non-Javadoc)

-     * @see java.lang.Object#equals(java.lang.Object)

-     */

-    public boolean equals(Object arg0) {

-        if ( (arg0 != null) && arg0.getClass().equals(this.getClass()) ) {

-

-            IPresentationContext context = ((DefaultBreakpointsViewInput) arg0).getContext();

-            if (getContext() != null && context != null)

-                return getContext().equals(context);

-        } 

-        

-        return super.equals(arg0);              

-    }

-

-}

+/*****************************************************************
+ * Copyright (c) 2009, 2010 Texas Instruments 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Patrick Chuong (Texas Instruments) - Initial API and implementation (Bug 238956)
+ *     Wind River Systems - ongoing enhancements and bug fixing
+ *****************************************************************/
+package org.eclipse.debug.internal.ui.elements.adapters;
+
+import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
+
+/**
+ * The default breakpoints view input populates the view with content 
+ * from the default breakpoint manager.
+ * 
+ * @since 3.6
+ */
+public class DefaultBreakpointsViewInput {
+	
+	/**
+	 * The presentation context of the breakpoints view.
+	 */
+	final private IPresentationContext fContext;
+	
+	/**
+	 * Constructor.
+	 * 
+	 * @param context the presentation context for this input
+	 */
+	public DefaultBreakpointsViewInput(IPresentationContext context) {
+		fContext = context;
+	}
+		
+	/**
+	 * Returns the presentation context for this input.
+	 * 
+	 * @return the presentation context
+	 */
+	public IPresentationContext getContext() {
+		return fContext;
+	}
+	
+	/*
+     * (non-Javadoc)
+     * @see java.lang.Object#hashCode()
+     */
+    public int hashCode() {
+        if (getContext() != null) {
+            return getContext().hashCode();
+        } else {
+            return 1;
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    public boolean equals(Object arg0) {
+        if ( (arg0 != null) && arg0.getClass().equals(this.getClass()) ) {
+
+            IPresentationContext context = ((DefaultBreakpointsViewInput) arg0).getContext();
+            if (getContext() != null && context != null)
+                return getContext().equals(context);
+        } 
+        
+        return super.equals(arg0);              
+    }
+
+}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultViewerInputProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultViewerInputProvider.java
index 04997ef06..258cc1ec4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultViewerInputProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/DefaultViewerInputProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2009 Wind River Systems and others.
+ * Copyright (c) 2007, 2010 Wind River Systems 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
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/StackFrameSourceDisplayAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/StackFrameSourceDisplayAdapter.java
index 74dd07cd0..03a373071 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/StackFrameSourceDisplayAdapter.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/StackFrameSourceDisplayAdapter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
+ * Copyright (c) 2005, 2011 IBM Corporation 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
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointManagerContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointManagerContentProvider.java
index dc883ecf8..f4c4cb4cb 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointManagerContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointManagerContentProvider.java
@@ -1,5 +1,5 @@
 /*****************************************************************
- * Copyright (c) 2009, 2010 Texas Instruments and others
+ * Copyright (c) 2009, 2011 Texas Instruments 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
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PromptingResolver.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PromptingResolver.java
index d1c3bb4cd..fc00f409e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PromptingResolver.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PromptingResolver.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 Matt Conway and others.
+ * Copyright (c) 2000, 2006 Matt Conway 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
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ElementCompareRequest.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ElementCompareRequest.java
index 882a7df4e..ffa062c1e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ElementCompareRequest.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ElementCompareRequest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
+ * Copyright (c) 2006, 2010 IBM Corporation 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
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ITreeModelContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ITreeModelContentProvider.java
index e4d5f3dc3..bad08fb73 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ITreeModelContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ITreeModelContentProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Wind River Systems and others.
+ * Copyright (c) 2009, 2010 Wind River Systems 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
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalTreeModelViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalTreeModelViewer.java
index e542b826b..1f356c1dc 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalTreeModelViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalTreeModelViewer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
+ * Copyright (c) 2006, 2011 IBM Corporation 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
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/LabelUpdate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/LabelUpdate.java
index 3ffc28db7..764eecc60 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/LabelUpdate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/LabelUpdate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
+ * Copyright (c) 2006, 2010 IBM Corporation 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
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelContentProvider.java
index ab1136b1e..aa1e21dac 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelContentProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
+ * Copyright (c) 2006, 2011 IBM Corporation 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
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualItem.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualItem.java
index e5e022e2e..1365c5ff2 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualItem.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualItem.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 Wind River Systems and others.
+ * Copyright (c) 2008, 2009 Wind River Systems 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
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualTree.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualTree.java
index 89c2f366f..9cd993390 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualTree.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualTree.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 Wind River Systems and others.
+ * Copyright (c) 2008, 2009 Wind River Systems 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
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointManagerProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointManagerProxy.java
index 570eaec04..639872ca6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointManagerProxy.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointManagerProxy.java
@@ -1,182 +1,182 @@
-/*****************************************************************

- * Copyright (c) 2009 Texas Instruments 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

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Patrick Chuong (Texas Instruments) - Initial API and implementation (Bug 238956)

- *     Wind River Systems - ongoing enhancements and bug fixing

- *****************************************************************/

-package org.eclipse.debug.internal.ui.viewers.update;

-

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.core.runtime.jobs.Job;

-import org.eclipse.debug.internal.ui.elements.adapters.DefaultBreakpointsViewInput;

-import org.eclipse.debug.internal.ui.model.elements.BreakpointManagerContentProvider;

-import org.eclipse.debug.internal.ui.viewers.model.ViewerAdapterService;

-import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider;

-import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;

-import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;

-import org.eclipse.debug.internal.ui.viewers.provisional.AbstractModelProxy;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.swt.widgets.Widget;

-import org.eclipse.ui.progress.WorkbenchJob;

-

-/**

- * Breakpoint manager model proxy.

- * 

- * @since 3.6

- */

-public class BreakpointManagerProxy extends AbstractModelProxy {

-	/**

-	 * The breakpoint manager content provider for this model proxy

-	 */

-	final private BreakpointManagerContentProvider fProvider;

-	

-	/**

-	 * The breakpoint manager input for this model proxy

-	 */

-	final private DefaultBreakpointsViewInput fInput;

-	

-	/**

-	 * Job to fire posted deltas.

-	 */

-    private Job fFireModelChangedJob;

-    

-    /**

-     * Object used for describing a posted delta.

-     */

-    private static class DeltaInfo {

-        final boolean fSelect;

-        final IModelDelta fDelta;

-

-        DeltaInfo(boolean selectDelta, IModelDelta delta) {

-            fSelect = selectDelta;

-            fDelta = delta;

-        }

-    }

-    

-    /**

-     * List of posted deltas ready to be fired.

-     */

-    private List/*<DeltaInfo>*/ fPendingDeltas = new LinkedList();

-    

-

-	/**

-	 * Constructor.

-	 * 

-	 * @param input the breakpoint manager input

-	 * @param context the presentation context for this model proxy

-	 */

-	public BreakpointManagerProxy(Object input, IPresentationContext context) {

-		super();

-				

-		DefaultBreakpointsViewInput bpmInput = null;

-		BreakpointManagerContentProvider bpmProvider = null;

-		if (input instanceof DefaultBreakpointsViewInput) {

-			bpmInput = (DefaultBreakpointsViewInput) input;

-			

-			// cache the required data and pass to the provider when this model is installed

-			IElementContentProvider provider = ViewerAdapterService.getContentProvider(input);

-			if (provider instanceof BreakpointManagerContentProvider) {

-				bpmProvider = (BreakpointManagerContentProvider) provider;

-			}

-		}

-		fInput = bpmInput;

-		fProvider = bpmProvider;

-	}

-	

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.debug.internal.ui.viewers.provisional.AbstractModelProxy#installed(org.eclipse.jface.viewers.Viewer)

-	 */

-	public void installed(Viewer viewer) {

-		super.installed(viewer);

-		if (fProvider != null) {

-			fProvider.registerModelProxy(fInput, this);

-		}

-	}

-	

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.debug.internal.ui.viewers.provisional.AbstractModelProxy#dispose()

-	 */

-	public void dispose() {

-	    fProvider.unregisterModelProxy(fInput, this);

-	    synchronized(this) {

-	        if (fFireModelChangedJob != null) {

-                fFireModelChangedJob.cancel();

-                fFireModelChangedJob = null;

-	        }

-            fPendingDeltas.clear();

-	    }

-        

-		super.dispose();		

-	}

-	

-	/**

-	 * Posts a given delta to be fired by the proxy.  Posting a delta places it 

-	 * in a queue which is later emptied by a job that fires the deltas.

-	 * <p>

-	 * If the delta is used only to select a breakpiont and does not change the

-	 * viewer content, the caller should set the <code>select</code> parameter 

-	 * to <code>true</code>.  When a select delta is added to the delta queue, 

-	 * any previous select deltas are removed. 

-	 * 

-	 * @param delta Delta to be posted to the viewer.

-	 * @param select Flag indicating that the delta is only to change the

-	 * viewer selection.

-	 */

-	public synchronized void postModelChanged(IModelDelta delta, boolean select) {

-        // Check for proxy being disposed.

-        if (isDisposed()) {

-            return;

-        }

-        // Check for viewer being disposed.

-        Widget viewerControl = getViewer().getControl();

-        if (viewerControl == null) {

-            return;

-        }

-        

-        // If we are processing a select delta, remove the previous select delta.

-        if (select) {

-            for (Iterator itr = fPendingDeltas.iterator(); itr.hasNext(); ) {

-                if ( ((DeltaInfo)itr.next()).fSelect ) {

-                    itr.remove();

-                }

-            }

-        }

-        fPendingDeltas.add(new DeltaInfo(select, delta));

-        

-        if (fFireModelChangedJob == null) {

-	        fFireModelChangedJob = new WorkbenchJob(viewerControl.getDisplay(), "Select Breakpoint Job") { //$NON-NLS-1$

-	            {

-	                setSystem(true);

-	            }

-	            

-	            public IStatus runInUIThread(IProgressMonitor monitor) {

-                    Object[] deltas; 

-                    synchronized(BreakpointManagerProxy.this) {

-                        deltas = fPendingDeltas.toArray();

-                        fPendingDeltas.clear();

-                        fFireModelChangedJob = null;

-                    }

-                    for (int i = 0; i < deltas.length; i++) {

-                        fireModelChanged( ((DeltaInfo)deltas[i]).fDelta );

-                    }

-                    return Status.OK_STATUS;

-                }

-            };

-            fFireModelChangedJob.schedule();

-	    }

-	}

-

-}

+/*****************************************************************
+ * Copyright (c) 2009, 2010 Texas Instruments 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Patrick Chuong (Texas Instruments) - Initial API and implementation (Bug 238956)
+ *     Wind River Systems - ongoing enhancements and bug fixing
+ *****************************************************************/
+package org.eclipse.debug.internal.ui.viewers.update;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.debug.internal.ui.elements.adapters.DefaultBreakpointsViewInput;
+import org.eclipse.debug.internal.ui.model.elements.BreakpointManagerContentProvider;
+import org.eclipse.debug.internal.ui.viewers.model.ViewerAdapterService;
+import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider;
+import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
+import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
+import org.eclipse.debug.internal.ui.viewers.provisional.AbstractModelProxy;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.widgets.Widget;
+import org.eclipse.ui.progress.WorkbenchJob;
+
+/**
+ * Breakpoint manager model proxy.
+ * 
+ * @since 3.6
+ */
+public class BreakpointManagerProxy extends AbstractModelProxy {
+	/**
+	 * The breakpoint manager content provider for this model proxy
+	 */
+	final private BreakpointManagerContentProvider fProvider;
+	
+	/**
+	 * The breakpoint manager input for this model proxy
+	 */
+	final private DefaultBreakpointsViewInput fInput;
+	
+	/**
+	 * Job to fire posted deltas.
+	 */
+    private Job fFireModelChangedJob;
+    
+    /**
+     * Object used for describing a posted delta.
+     */
+    private static class DeltaInfo {
+        final boolean fSelect;
+        final IModelDelta fDelta;
+
+        DeltaInfo(boolean selectDelta, IModelDelta delta) {
+            fSelect = selectDelta;
+            fDelta = delta;
+        }
+    }
+    
+    /**
+     * List of posted deltas ready to be fired.
+     */
+    private List/*<DeltaInfo>*/ fPendingDeltas = new LinkedList();
+    
+
+	/**
+	 * Constructor.
+	 * 
+	 * @param input the breakpoint manager input
+	 * @param context the presentation context for this model proxy
+	 */
+	public BreakpointManagerProxy(Object input, IPresentationContext context) {
+		super();
+				
+		DefaultBreakpointsViewInput bpmInput = null;
+		BreakpointManagerContentProvider bpmProvider = null;
+		if (input instanceof DefaultBreakpointsViewInput) {
+			bpmInput = (DefaultBreakpointsViewInput) input;
+			
+			// cache the required data and pass to the provider when this model is installed
+			IElementContentProvider provider = ViewerAdapterService.getContentProvider(input);
+			if (provider instanceof BreakpointManagerContentProvider) {
+				bpmProvider = (BreakpointManagerContentProvider) provider;
+			}
+		}
+		fInput = bpmInput;
+		fProvider = bpmProvider;
+	}
+	
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.debug.internal.ui.viewers.provisional.AbstractModelProxy#installed(org.eclipse.jface.viewers.Viewer)
+	 */
+	public void installed(Viewer viewer) {
+		super.installed(viewer);
+		if (fProvider != null) {
+			fProvider.registerModelProxy(fInput, this);
+		}
+	}
+	
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.debug.internal.ui.viewers.provisional.AbstractModelProxy#dispose()
+	 */
+	public void dispose() {
+	    fProvider.unregisterModelProxy(fInput, this);
+	    synchronized(this) {
+	        if (fFireModelChangedJob != null) {
+                fFireModelChangedJob.cancel();
+                fFireModelChangedJob = null;
+	        }
+            fPendingDeltas.clear();
+	    }
+        
+		super.dispose();		
+	}
+	
+	/**
+	 * Posts a given delta to be fired by the proxy.  Posting a delta places it 
+	 * in a queue which is later emptied by a job that fires the deltas.
+	 * <p>
+	 * If the delta is used only to select a breakpiont and does not change the
+	 * viewer content, the caller should set the <code>select</code> parameter 
+	 * to <code>true</code>.  When a select delta is added to the delta queue, 
+	 * any previous select deltas are removed. 
+	 * 
+	 * @param delta Delta to be posted to the viewer.
+	 * @param select Flag indicating that the delta is only to change the
+	 * viewer selection.
+	 */
+	public synchronized void postModelChanged(IModelDelta delta, boolean select) {
+        // Check for proxy being disposed.
+        if (isDisposed()) {
+            return;
+        }
+        // Check for viewer being disposed.
+        Widget viewerControl = getViewer().getControl();
+        if (viewerControl == null) {
+            return;
+        }
+        
+        // If we are processing a select delta, remove the previous select delta.
+        if (select) {
+            for (Iterator itr = fPendingDeltas.iterator(); itr.hasNext(); ) {
+                if ( ((DeltaInfo)itr.next()).fSelect ) {
+                    itr.remove();
+                }
+            }
+        }
+        fPendingDeltas.add(new DeltaInfo(select, delta));
+        
+        if (fFireModelChangedJob == null) {
+	        fFireModelChangedJob = new WorkbenchJob(viewerControl.getDisplay(), "Select Breakpoint Job") { //$NON-NLS-1$
+	            {
+	                setSystem(true);
+	            }
+	            
+	            public IStatus runInUIThread(IProgressMonitor monitor) {
+                    Object[] deltas; 
+                    synchronized(BreakpointManagerProxy.this) {
+                        deltas = fPendingDeltas.toArray();
+                        fPendingDeltas.clear();
+                        fFireModelChangedJob = null;
+                    }
+                    for (int i = 0; i < deltas.length; i++) {
+                        fireModelChanged( ((DeltaInfo)deltas[i]).fDelta );
+                    }
+                    return Status.OK_STATUS;
+                }
+            };
+            fFireModelChangedJob.schedule();
+	    }
+	}
+
+}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java
index c029c2bf5..96cda0564 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2006, 2010 IBM Corporation and others.
+ *  Copyright (c) 2006, 2011 IBM Corporation 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
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionDropAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionDropAdapter.java
index 207cd4bad..b63b1c8b1 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionDropAdapter.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionDropAdapter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2007, 2010 IBM Corporation 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
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java
index 4180d3c88..ced87df39 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation 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
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java
index 1959b45a9..5a7402e27 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 IBM Corporation 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
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/modules/ModulesViewMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/modules/ModulesViewMessages.properties
index b8c3458e9..c275074f7 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/modules/ModulesViewMessages.properties
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/modules/ModulesViewMessages.properties
@@ -1,5 +1,5 @@
 #########################################################################
-# Copyright (c) 2004, 2008 QNX Software Systems and others.
+# Copyright (c) 2004, 2010 QNX Software Systems 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
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersView.java
index acee47c8e..d0fa27aff 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersView.java
@@ -1,5 +1,5 @@
 /**********************************************************************
- * Copyright (c) 2004, 2005 QNX Software Systems and others.
+ * Copyright (c) 2004, 2006 QNX Software Systems 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
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersViewMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersViewMessages.properties
index b6d185868..f7c8e3413 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersViewMessages.properties
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersViewMessages.properties
@@ -1,5 +1,5 @@
 #########################################################################
-# Copyright (c) 2004, 2005 QNX Software Systems and others.
+# Copyright (c) 2004, 2010 QNX Software Systems 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
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/contexts/IDebugContextProvider2.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/contexts/IDebugContextProvider2.java
index 88f4f89b6..48c8b1690 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/contexts/IDebugContextProvider2.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/contexts/IDebugContextProvider2.java
@@ -1,44 +1,44 @@
-/*****************************************************************

- * Copyright (c) 2010 Texas Instruments 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

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Patrick Chuong (Texas Instruments) - Allow multiple debug views and 

- *     		multiple debug context providers (Bug 327263)

- *****************************************************************/

-package org.eclipse.debug.ui.contexts;

-

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-

-

-/**

- * This extension to {@link IDebugContextProvider} allows clients to specify the scope that the context 

- * provider will apply to. With {@link IDebugContextProvider2}, a provider indicate if it should be a context

- * provider for the entire {@link IWorkbenchWindow} or only for is given {@link IWorkbenchPart}. 

- * 

- * <p>

- * This interface is intended to be implemented by clients

- * </p>

- * 

- * @since 3.7

- */

-public interface IDebugContextProvider2 extends IDebugContextProvider {

-	/**

-	 * Return whether the provider can be set as an active provider for the 

-	 * window.  

-	 * <p>

-	 * If <code>true</code>, when the provider's part is 

-	 * activated this provider will become the active debug context provider

-	 * for the whole window.  If <code>false</code>, this provider will

-	 * only set the active context in a given workbench part.

-	 *  

-	 * @return <code>true</code> if this provider can act as the provider for the entire window, <code>false</code> if it can

-	 * only be the provider for its given part.

-	 * provider for a window.

-	 */

-	boolean isWindowContextProvider();

-}

+/*****************************************************************
+ * Copyright (c) 2010, 2011 Texas Instruments 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Patrick Chuong (Texas Instruments) - Allow multiple debug views and 
+ *     		multiple debug context providers (Bug 327263)
+ *****************************************************************/
+package org.eclipse.debug.ui.contexts;
+
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+
+
+/**
+ * This extension to {@link IDebugContextProvider} allows clients to specify the scope that the context 
+ * provider will apply to. With {@link IDebugContextProvider2}, a provider indicate if it should be a context
+ * provider for the entire {@link IWorkbenchWindow} or only for is given {@link IWorkbenchPart}. 
+ * 
+ * <p>
+ * This interface is intended to be implemented by clients
+ * </p>
+ * 
+ * @since 3.7
+ */
+public interface IDebugContextProvider2 extends IDebugContextProvider {
+	/**
+	 * Return whether the provider can be set as an active provider for the 
+	 * window.  
+	 * <p>
+	 * If <code>true</code>, when the provider's part is 
+	 * activated this provider will become the active debug context provider
+	 * for the whole window.  If <code>false</code>, this provider will
+	 * only set the active context in a given workbench part.
+	 *  
+	 * @return <code>true</code> if this provider can act as the provider for the entire window, <code>false</code> if it can
+	 * only be the provider for its given part.
+	 * provider for a window.
+	 */
+	boolean isWindowContextProvider();
+}
diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java
index f8952055a..45d9bc823 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation 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