mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-22 14:12:10 +02:00
Fix vararg warning with 4.13.
While touching the class: * convert to lambda * foreach conversion * remove useless non-javadoc comments. Change-Id: I3419be135c68829bb98827683bc8fe47c1e2940e
This commit is contained in:
parent
3bab315fd2
commit
c60a046bd1
1 changed files with 46 additions and 77 deletions
|
@ -1,5 +1,5 @@
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* Copyright (c) 2000, 2015 IBM Corporation and others.
|
* Copyright (c) 2000, 2019 IBM Corporation and others.
|
||||||
*
|
*
|
||||||
* This program and the accompanying materials
|
* This program and the accompanying materials
|
||||||
* are made available under the terms of the Eclipse Public License 2.0
|
* are made available under the terms of the Eclipse Public License 2.0
|
||||||
|
@ -25,8 +25,6 @@ import org.eclipse.core.runtime.IStatus;
|
||||||
import org.eclipse.core.runtime.Status;
|
import org.eclipse.core.runtime.Status;
|
||||||
import org.eclipse.core.runtime.jobs.Job;
|
import org.eclipse.core.runtime.jobs.Job;
|
||||||
import org.eclipse.jface.viewers.IStructuredSelection;
|
import org.eclipse.jface.viewers.IStructuredSelection;
|
||||||
import org.eclipse.swt.events.DisposeEvent;
|
|
||||||
import org.eclipse.swt.events.DisposeListener;
|
|
||||||
import org.eclipse.swt.widgets.Composite;
|
import org.eclipse.swt.widgets.Composite;
|
||||||
import org.eclipse.swt.widgets.Item;
|
import org.eclipse.swt.widgets.Item;
|
||||||
import org.eclipse.swt.widgets.Tree;
|
import org.eclipse.swt.widgets.Tree;
|
||||||
|
@ -54,9 +52,6 @@ public class RemoteTreeViewer extends ProblemTreeViewer {
|
||||||
setSystem(true);
|
setSystem(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor)
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
public IStatus runInUIThread(IProgressMonitor monitor) {
|
public IStatus runInUIThread(IProgressMonitor monitor) {
|
||||||
if (getControl().isDisposed() || element == null) {
|
if (getControl().isDisposed() || element == null) {
|
||||||
|
@ -123,9 +118,6 @@ public class RemoteTreeViewer extends ProblemTreeViewer {
|
||||||
setSystem(true);
|
setSystem(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor)
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
public IStatus runInUIThread(IProgressMonitor monitor) {
|
public IStatus runInUIThread(IProgressMonitor monitor) {
|
||||||
if (getControl().isDisposed() || selection == null) {
|
if (getControl().isDisposed() || selection == null) {
|
||||||
|
@ -214,12 +206,7 @@ public class RemoteTreeViewer extends ProblemTreeViewer {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void addDisposeListener() {
|
private void addDisposeListener() {
|
||||||
getControl().addDisposeListener(new DisposeListener() {
|
getControl().addDisposeListener(e -> cancelJobs());
|
||||||
@Override
|
|
||||||
public void widgetDisposed(DisposeEvent e) {
|
|
||||||
cancelJobs();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void runDeferredUpdates() {
|
protected void runDeferredUpdates() {
|
||||||
|
@ -248,40 +235,28 @@ public class RemoteTreeViewer extends ProblemTreeViewer {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.eclipse.jface.viewers.AbstractTreeViewer#add(java.lang.Object, java.lang.Object)
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
public synchronized void add(Object parentElement, Object childElement) {
|
public synchronized void add(Object parentElement, Object childElement) {
|
||||||
super.add(parentElement, childElement);
|
super.add(parentElement, childElement);
|
||||||
runDeferredUpdates();
|
runDeferredUpdates();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.eclipse.jface.viewers.AbstractTreeViewer#add(java.lang.Object, java.lang.Object[])
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
public synchronized void add(Object parentElement, Object[] childElements) {
|
public synchronized void add(Object parentElement, Object... childElements) {
|
||||||
super.add(parentElement, childElements);
|
super.add(parentElement, childElements);
|
||||||
runDeferredUpdates();
|
runDeferredUpdates();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.eclipse.jface.viewers.AbstractTreeViewer#remove(java.lang.Object)
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
public synchronized void remove(Object element) {
|
public synchronized void remove(Object element) {
|
||||||
validateDeferredUpdates(element);
|
validateDeferredUpdates(element);
|
||||||
super.remove(element);
|
super.remove(element);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.eclipse.jface.viewers.AbstractTreeViewer#remove(java.lang.Object[])
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
public synchronized void remove(Object[] elements) {
|
public synchronized void remove(Object... elements) {
|
||||||
for (int i = 0; i < elements.length; i++) {
|
for (Object element : elements) {
|
||||||
validateDeferredUpdates(elements[i]);
|
validateDeferredUpdates(element);
|
||||||
}
|
}
|
||||||
super.remove(elements);
|
super.remove(elements);
|
||||||
}
|
}
|
||||||
|
@ -371,25 +346,20 @@ public class RemoteTreeViewer extends ProblemTreeViewer {
|
||||||
if (widget != null) {
|
if (widget != null) {
|
||||||
final Item[] currentChildren = getChildren(widget);
|
final Item[] currentChildren = getChildren(widget);
|
||||||
if (offset < currentChildren.length) {
|
if (offset < currentChildren.length) {
|
||||||
preservingSelection(new Runnable() {
|
preservingSelection(() -> {
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
for (int i = offset; i < currentChildren.length; i++) {
|
for (int i = offset; i < currentChildren.length; i++) {
|
||||||
if (currentChildren[i].getData() != null) {
|
if (currentChildren[i].getData() != null) {
|
||||||
disassociate(currentChildren[i]);
|
disassociate(currentChildren[i]);
|
||||||
}
|
}
|
||||||
currentChildren[i].dispose();
|
currentChildren[i].dispose();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public synchronized void replace(final Object parent, final Object[] children, final int offset) {
|
public synchronized void replace(final Object parent, final Object[] children, final int offset) {
|
||||||
preservingSelection(new Runnable() {
|
preservingSelection(() -> {
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
Widget widget = findItem(parent);
|
Widget widget = findItem(parent);
|
||||||
if (widget == null) {
|
if (widget == null) {
|
||||||
add(parent, children);
|
add(parent, children);
|
||||||
|
@ -432,7 +402,6 @@ public class RemoteTreeViewer extends ProblemTreeViewer {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
runDeferredUpdates();
|
runDeferredUpdates();
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue