diff options
author | Sarika Sinha | 2015-11-20 06:29:54 +0000 |
---|---|---|
committer | Sarika Sinha | 2015-11-20 06:29:54 +0000 |
commit | 7524d39c4f2f8b62e7bf82363ccc1f4be0b7697a (patch) | |
tree | 1f0eca0701fd4fe938dd4f8792828b378519ed9c | |
parent | 447cb82aa1ba84445f8f84dff2449eddb599f73a (diff) | |
download | eclipse.platform.debug-7524d39c4f2f8b62e7bf82363ccc1f4be0b7697a.tar.gz eclipse.platform.debug-7524d39c4f2f8b62e7bf82363ccc1f4be0b7697a.tar.xz eclipse.platform.debug-7524d39c4f2f8b62e7bf82363ccc1f4be0b7697a.zip |
Bug 482570 - Compiler warning in platform.debug.ui
Change-Id: I34344417db23ad4c95ad7d2d2273532f2a3a9aa8
4 files changed, 13 insertions, 10 deletions
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ChildrenUpdateTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ChildrenUpdateTests.java index 62ead990d..863b4a785 100644 --- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ChildrenUpdateTests.java +++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ChildrenUpdateTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2013 IBM Corporation and others. + * Copyright (c) 2007, 2015 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 @@ -159,7 +159,8 @@ public class ChildrenUpdateTests extends TestCase { @Override public void addFilter(ViewerFilter filter) {} @Override - public void setFilters(ViewerFilter[] filters) {} + public void setFilters(ViewerFilter... filters) { + } @Override public boolean getExpandedState(Object elementOrTreePath) { diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTests.java index 6e9b6f608..f7f9ae78d 100644 --- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTests.java +++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2013 Wind River Systems and others. + * Copyright (c) 2009, 2015 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 @@ -370,6 +370,7 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL * Fire CONTENT delta on parent. */ private void doTestRefreshToUnfilterElements(ViewerFilter[] filters) throws InterruptedException { + ViewerFilter[] filters1 = filters; // Populate a view with a large model (only first 100 elements will be visible in virtual viewer). TestModel model = TestModel.simpleMultiLevel(); @@ -391,8 +392,9 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL } // Turn off filters and refresh. - filters = new ViewerFilter[0]; - fViewer.setFilters(filters); + filters1 = new ViewerFilter[0]; + fViewer.setFilters(filters1); + fListener.reset(); model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) { @@ -401,7 +403,7 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL } } - model.validateData(fViewer, TreePath.EMPTY, false, filters); + model.validateData(fViewer, TreePath.EMPTY, false, filters1); } public void testPreserveExpandedOnMultLevelContent() throws InterruptedException { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalVirtualTreeModelViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalVirtualTreeModelViewer.java index 68e472f61..e9f573aa9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalVirtualTreeModelViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalVirtualTreeModelViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2013 Wind River Systems and others. + * Copyright (c) 2009, 2015 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 @@ -1075,7 +1075,7 @@ public class InternalVirtualTreeModelViewer extends Viewer } @Override - public void setFilters(ViewerFilter[] filters) { + public void setFilters(ViewerFilter... filters) { fFilters = filters; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/SubTreeModelViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/SubTreeModelViewer.java index 36fa8c7d6..ce7b203cc 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/SubTreeModelViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/SubTreeModelViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Wind River Systems and others. + * Copyright (c) 2009, 2015 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 @@ -392,7 +392,7 @@ public class SubTreeModelViewer extends TreeModelViewer { } @Override - public void setFilters(ViewerFilter[] filters) { + public void setFilters(ViewerFilter... filters) { SubTreeModelViewer.this.setFilters(filters); } |