mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 14:12:10 +02:00
Code Issues Wiki Activity

Fix vararg warning with 4.13.

Browse source 
While touching the class:
* convert to lambda
* foreach conversion
* remove useless non-javadoc comments.

Change-Id: I3419be135c68829bb98827683bc8fe47c1e2940e
This commit is contained in:
Alexander Kurtakov 2019-08-08 15:56:36 +03:00
parent 3bab315fd2
commit c60a046bd1
1 changed files with 46 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeViewer.java
View file

@ -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,15 +346,12 @@ 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 for (int i = offset; i < currentChildren.length; i++) {
public void run() { if (currentChildren[i].getData() != null) {
for (int i = offset; i < currentChildren.length; i++) { disassociate(currentChildren[i]);
if (currentChildren[i].getData() != null) {
disassociate(currentChildren[i]);
}
currentChildren[i].dispose();
} }
currentChildren[i].dispose();
} }
}); });
} }
@ -387,52 +359,49 @@ public class RemoteTreeViewer extends ProblemTreeViewer {
} }
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 Widget widget = findItem(parent);
public void run() { if (widget == null) {
Widget widget = findItem(parent); add(parent, children);
if (widget == null) { } else {
Item[] currentChildren = getChildren(widget);
int pos = offset;
if (pos >= currentChildren.length) {
// append
add(parent, children); add(parent, children);
} else { } else {
Item[] currentChildren = getChildren(widget); // replace
int pos = offset; for (int i = 0; i < children.length; i++) {
if (pos >= currentChildren.length) { Object child = children[i];
// append if (pos < currentChildren.length) {
add(parent, children); // replace
} else { Item item = currentChildren[pos];
// replace Object data = item.getData();
for (int i = 0; i < children.length; i++) { if (!child.equals(data)) {
Object child = children[i]; // no need to cancel pending updates here, the child may have shifted up/down
if (pos < currentChildren.length) { internalRefresh(item, child, true, true);
// replace
Item item = currentChildren[pos];
Object data = item.getData();
if (!child.equals(data)) {
// no need to cancel pending updates here, the child may have shifted up/down
internalRefresh(item, child, true, true);
} else {
// If it's the same child, the label/content may still have changed
doUpdateItem(item, child);
updatePlus(item, child);
}
} else { } else {
// add // If it's the same child, the label/content may still have changed
int numLeft = children.length - i; doUpdateItem(item, child);
if (numLeft > 1) { updatePlus(item, child);
Object[] others = new Object[numLeft];
System.arraycopy(children, i, others, 0, numLeft);
add(parent, others);
} else {
add(parent, child);
}
break;
} }
pos++; } else {
// add
int numLeft = children.length - i;
if (numLeft > 1) {
Object[] others = new Object[numLeft];
System.arraycopy(children, i, others, 0, numLeft);
add(parent, others);
} else {
add(parent, child);
}
break;
} }
pos++;
} }
} }
runDeferredUpdates();
} }
runDeferredUpdates();
}); });
} }