diff options
Diffstat (limited to 'org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers')
26 files changed, 84 insertions, 84 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousModel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousModel.java index 2920ebf81..487a90747 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousModel.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousModel.java @@ -45,7 +45,7 @@ import org.eclipse.jface.viewers.ViewerSorter; public abstract class AsynchronousModel { private ModelNode fRoot; // root node - private Map<Object, ModelNode[]> fElementToNodes = new HashMap<Object, ModelNode[]>(); // map + private Map<Object, ModelNode[]> fElementToNodes = new HashMap<>(); // map // of // element // to @@ -53,7 +53,7 @@ public abstract class AsynchronousModel { // tree // nodes // (list) - private Map<Object, IModelProxy> fModelProxies = new HashMap<Object, IModelProxy>(); // map + private Map<Object, IModelProxy> fModelProxies = new HashMap<>(); // map // of // installed // model @@ -95,12 +95,12 @@ public abstract class AsynchronousModel { /** * List of requests currently being performed. */ - private List<IStatusMonitor> fPendingUpdates = new ArrayList<IStatusMonitor>(); + private List<IStatusMonitor> fPendingUpdates = new ArrayList<>(); /** * List of pending viewer updates */ - private List<IStatusMonitor> fViewerUpdates = new ArrayList<IStatusMonitor>(); + private List<IStatusMonitor> fViewerUpdates = new ArrayList<>(); /** * Constructs a new empty tree model @@ -393,7 +393,7 @@ public abstract class AsynchronousModel { protected Object[] filter(Object parent, Object[] elements) { ViewerFilter[] filters = getViewer().getFilters(); if (filters != null) { - ArrayList<Object> filtered = new ArrayList<Object>(elements.length); + ArrayList<Object> filtered = new ArrayList<>(elements.length); for (int i = 0; i < elements.length; i++) { boolean add = true; for (int j = 0; j < filters.length; j++) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableModel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableModel.java index 31d58fbc7..06016b5dc 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableModel.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableModel.java @@ -57,9 +57,9 @@ public class AsynchronousTableModel extends AsynchronousModel { synchronized (this) { ModelNode[] childrenNodes = getRootNode().getChildrenNodes(); if (childrenNodes == null) { - kids = new ArrayList<Object>(elements.length); + kids = new ArrayList<>(elements.length); } else { - kids = new ArrayList<Object>(elements.length + childrenNodes.length); + kids = new ArrayList<>(elements.length + childrenNodes.length); for (int i = 0; i < childrenNodes.length; i++) { kids.add(childrenNodes[i].getElement()); } @@ -100,9 +100,9 @@ public class AsynchronousTableModel extends AsynchronousModel { synchronized (this) { ModelNode[] childrenNodes = getRootNode().getChildrenNodes(); if (childrenNodes == null) { - kids = new ArrayList<Object>(elements.length); + kids = new ArrayList<>(elements.length); } else { - kids = new ArrayList<Object>(elements.length + childrenNodes.length); + kids = new ArrayList<>(elements.length + childrenNodes.length); for (int i = 0; i < childrenNodes.length; i++) { kids.add(childrenNodes[i].getElement()); } @@ -142,7 +142,7 @@ public class AsynchronousTableModel extends AsynchronousModel { synchronized (this) { ModelNode[] childrenNodes = getRootNode().getChildrenNodes(); if (childrenNodes != null) { - kids = new ArrayList<Object>(childrenNodes.length); + kids = new ArrayList<>(childrenNodes.length); for (int i = 0; i < childrenNodes.length; i++) { kids.add(childrenNodes[i].getElement()); } @@ -180,7 +180,7 @@ public class AsynchronousTableModel extends AsynchronousModel { remove(new Object[]{element}); return; } - List<ModelNode> list = new ArrayList<ModelNode>(); + List<ModelNode> list = new ArrayList<>(); synchronized (this) { ModelNode[] nodes = getNodes(element); for (int i = 0; i < nodes.length; i++) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableViewer.java index bcc728fbb..88485ce2e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableViewer.java @@ -152,7 +152,7 @@ public class AsynchronousTableViewer extends AsynchronousViewer implements Liste @Override protected List getSelectionFromWidget() { TableItem[] selection = fTable.getSelection(); - List<Object> datas = new ArrayList<Object>(selection.length); + List<Object> datas = new ArrayList<>(selection.length); for (int i = 0; i < selection.length; i++) { datas.add(selection[i].getData()); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java index ce0f0bb47..93d281e20 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java @@ -82,21 +82,21 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis * use the method <code>getImage(...)</code> to cache images for * image descriptors. The images are disposed when this viewer is disposed. */ - private Map<ImageDescriptor, Image> fImageCache = new HashMap<ImageDescriptor, Image>(); + private Map<ImageDescriptor, Image> fImageCache = new HashMap<>(); /** * Cache of the fonts used for elements in this tree viewer. Label updates * use the method <code>getFont(...)</code> to cache fonts for * FontData objects. The fonts are disposed with the viewer. */ - private Map<FontData, Font> fFontCache = new HashMap<FontData, Font>(); + private Map<FontData, Font> fFontCache = new HashMap<>(); /** * Cache of the colors used for elements in this tree viewer. Label updates * use the method <code>getColor(...)</code> to cache colors for * RGB values. The colors are disposed with the viewer. */ - private Map<RGB, Color> fColorCache = new HashMap<RGB, Color>(); + private Map<RGB, Color> fColorCache = new HashMap<>(); /** * The context in which this viewer is being used - i.e. what part it is contained diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ChildrenRequestMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ChildrenRequestMonitor.java index 9f6515481..25cf98bb0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ChildrenRequestMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ChildrenRequestMonitor.java @@ -32,7 +32,7 @@ class ChildrenRequestMonitor extends AsynchronousRequestMonitor implements IChil /** * Collection of children retrieved */ - private List<Object> fChildren = new ArrayList<Object>(); + private List<Object> fChildren = new ArrayList<>(); /** * Constucts a monitor to retrieve and update the children of the given diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ModelNode.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ModelNode.java index 816aa70d4..e334ec853 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ModelNode.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ModelNode.java @@ -93,7 +93,7 @@ public class ModelNode { * @return */ public synchronized TreePath getTreePath() { - List<Object> path = new ArrayList<Object>(); + List<Object> path = new ArrayList<>(); ModelNode node = this; while (node != null) { path.add(0, node.getElement()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbViewer.java index fb83b9a8f..fa503d9c1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbViewer.java @@ -93,7 +93,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer { */ public BreadcrumbViewer(Composite parent, int style) { fStyle = style; - fBreadcrumbItems = new ArrayList<BreadcrumbItem>(); + fBreadcrumbItems = new ArrayList<>(); fMenuListeners= new ListenerList<>(); fContainer= new Composite(parent, SWT.NONE); @@ -362,7 +362,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer { } protected TreePath getTreePathFromItem(BreadcrumbItem item) { - List<Object> elements = new ArrayList<Object>(fBreadcrumbItems.size()); + List<Object> elements = new ArrayList<>(fBreadcrumbItems.size()); for (int i = 0; i < fBreadcrumbItems.size(); i++) { elements.add( fBreadcrumbItems.get(i).getData() ); if (fBreadcrumbItems.get(i).equals(item)) { @@ -385,7 +385,7 @@ public abstract class BreadcrumbViewer extends StructuredViewer { return Collections.EMPTY_LIST; } - ArrayList<Object> result = new ArrayList<Object>(); + ArrayList<Object> result = new ArrayList<>(); result.add(fSelectedItem.getData()); return result; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/TreeViewerDropDown.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/TreeViewerDropDown.java index 2c3afc4a6..a0b978763 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/TreeViewerDropDown.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/TreeViewerDropDown.java @@ -114,7 +114,7 @@ public abstract class TreeViewerDropDown { return; } - List<Object> pathElements = new LinkedList<Object>(); + List<Object> pathElements = new LinkedList<>(); while(item != null) { Object data = item.getData(); if (data == null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenCountUpdate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenCountUpdate.java index 84f75aff8..86f697ee6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenCountUpdate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenCountUpdate.java @@ -176,7 +176,7 @@ class ChildrenCountUpdate extends ViewerUpdateMonitor implements IChildrenCountU return true; } else if (getElementContentProvider().equals(request.getElementContentProvider())) { if (fBatchedRequests == null) { - fBatchedRequests = new ArrayList<ViewerUpdateMonitor>(4); + fBatchedRequests = new ArrayList<>(4); fBatchedRequests.add(this); } fBatchedRequests.add(request); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/FilterTransform.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/FilterTransform.java index 5e207da8b..287092b64 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/FilterTransform.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/FilterTransform.java @@ -82,7 +82,7 @@ public class FilterTransform { } if (children == null) { - children = new HashMap<Object, Node>(); + children = new HashMap<>(); } Object element = path.getSegment(pathIndex); Node node = children.get(element); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/HasChildrenUpdate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/HasChildrenUpdate.java index 059f4570a..52346e79f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/HasChildrenUpdate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/HasChildrenUpdate.java @@ -87,7 +87,7 @@ class HasChildrenUpdate extends ViewerUpdateMonitor implements IHasChildrenUpdat return true; } else if (getElementContentProvider().equals(request.getElementContentProvider())) { if (fBatchedRequests == null) { - fBatchedRequests = new ArrayList<ViewerUpdateMonitor>(); + fBatchedRequests = new ArrayList<>(); fBatchedRequests.add(this); } fBatchedRequests.add(request); 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 0aa7c1160..d3fdd8215 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 @@ -90,25 +90,25 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree * Map of columns presentation id to its visible columns id's (String[]) * When a columns presentation is not in the map, default settings are used. */ - private final Map<String, String[]> fVisibleColumns = new HashMap<String, String[]>(); + private final Map<String, String[]> fVisibleColumns = new HashMap<>(); /** * Map of column id's to persisted sizes */ - private final Map<Object, Integer> fColumnSizes = new HashMap<Object, Integer>(); + private final Map<Object, Integer> fColumnSizes = new HashMap<>(); /** * Map of column presentation id's to an array of integers representing the column order * for that presentation, or <code>null</code> if default. */ - private final Map<String, int[]> fColumnOrder = new HashMap<String, int[]>(); + private final Map<String, int[]> fColumnOrder = new HashMap<>(); /** * Map of column presentation id to whether columns should be displayed * for that presentation (the user can toggle columns on/off when a * presentation is optional. */ - private final Map<String, Boolean> fShowColumns = new HashMap<String, Boolean>(); + private final Map<String, Boolean> fShowColumns = new HashMap<>(); /** * Item's tree path cache @@ -1647,7 +1647,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree public boolean saveElementState(TreePath path, ModelDelta delta, int flagsToSave) { Tree tree = (Tree) getControl(); TreeItem[] selection = tree.getSelection(); - Set<TreeItem> set = new HashSet<TreeItem>(); + Set<TreeItem> set = new HashSet<>(); for (int i = 0; i < selection.length; i++) { set.add(selection[i]); } 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 fafeebd65..ddf1c1f42 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 @@ -128,7 +128,7 @@ public class InternalVirtualTreeModelViewer extends Viewer * tree may contain the same element in several places, so the map values * are lists. */ - private Map<Object, List<VirtualItem>> fItemsMap = new HashMap<Object, List<VirtualItem>>(); + private Map<Object, List<VirtualItem>> fItemsMap = new HashMap<>(); /** * Whether to notify the content provider when an element is unmapped. @@ -173,14 +173,14 @@ public class InternalVirtualTreeModelViewer extends Viewer * Map of columns presentation id to its visible columns id's (String[]) * When a columns presentation is not in the map, default settings are used. */ - private Map<String, String[]> fVisibleColumns = new HashMap<String, String[]>(); + private Map<String, String[]> fVisibleColumns = new HashMap<>(); /** * Map of column presentation id to whether columns should be displayed * for that presentation (the user can toggle columns on/off when a * presentation is optional. */ - private Map<String, Boolean> fShowColumns = new HashMap<String, Boolean>(); + private Map<String, Boolean> fShowColumns = new HashMap<>(); /** * Runnable for validating the virtual tree. It is scheduled to run in the @@ -305,7 +305,7 @@ public class InternalVirtualTreeModelViewer extends Viewer @Override public void remove(final Object parentOrTreePath, final int index) { - final List<TreePath> oldSelection = new LinkedList<TreePath>(Arrays.asList(((TreeSelection) getSelection()).getPaths())); + final List<TreePath> oldSelection = new LinkedList<>(Arrays.asList(((TreeSelection) getSelection()).getPaths())); preservingSelection(new Runnable() { @Override public void run() { @@ -716,7 +716,7 @@ public class InternalVirtualTreeModelViewer extends Viewer } private TreePath getTreePathFromItem(VirtualItem item) { - List<Object> segments = new LinkedList<Object>(); + List<Object> segments = new LinkedList<>(); while (item.getParent() != null) { segments.add(0, item.getData()); item = item.getParent(); @@ -750,7 +750,7 @@ public class InternalVirtualTreeModelViewer extends Viewer // one. List<VirtualItem> itemsList = fItemsMap.remove(element); if (itemsList == null) { - itemsList = new ArrayList<VirtualItem>(1); + itemsList = new ArrayList<>(1); } if (!itemsList.contains(item)) { @@ -879,7 +879,7 @@ public class InternalVirtualTreeModelViewer extends Viewer private void internalSetSelection(ISelection selection, boolean reveal) { if (selection instanceof ITreeSelection) { TreePath[] paths = ((ITreeSelection) selection).getPaths(); - List<VirtualItem> newSelection = new ArrayList<VirtualItem>(paths.length); + List<VirtualItem> newSelection = new ArrayList<>(paths.length); for (int i = 0; i < paths.length; ++i) { // Use internalExpand since item may not yet be created. See // 1G6B1AR. @@ -928,8 +928,8 @@ public class InternalVirtualTreeModelViewer extends Viewer return TreeSelection.EMPTY; } VirtualItem[] items = fTree.getSelection(); - ArrayList<TreePath> list = new ArrayList<TreePath>(items.length); - Map<VirtualItem, TreePath> map = new LinkedHashMap<VirtualItem, TreePath>(items.length * 4 / 3); + ArrayList<TreePath> list = new ArrayList<>(items.length); + Map<VirtualItem, TreePath> map = new LinkedHashMap<>(items.length * 4 / 3); for (int i = 0; i < items.length; i++) { TreePath path = null; if (items[i].getData() != null) { @@ -1464,7 +1464,7 @@ public class InternalVirtualTreeModelViewer extends Viewer public boolean saveElementState(TreePath path, ModelDelta delta, int flagsToSave) { VirtualTree tree = getTree(); VirtualItem[] selection = tree.getSelection(); - Set<VirtualItem> set = new HashSet<VirtualItem>(); + Set<VirtualItem> set = new HashSet<>(); for (int i = 0; i < selection.length; i++) { set.add(selection[i]); } 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 9afa548cf..589a4f493 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 @@ -78,7 +78,7 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon * Used to install different model proxy instances for one element depending * on the tree path. */ - private Map<TreePath, IModelProxy> fTreeModelProxies = new HashMap<TreePath, IModelProxy>(); // tree + private Map<TreePath, IModelProxy> fTreeModelProxies = new HashMap<>(); // tree // model // proxy // by @@ -90,7 +90,7 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon * Used to install a single model proxy which is responsible for all * instances of an element in the model tree. */ - private Map<Object, IModelProxy> fModelProxies = new HashMap<Object, IModelProxy>(); // model + private Map<Object, IModelProxy> fModelProxies = new HashMap<>(); // model // proxy // by // element @@ -119,15 +119,15 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon /** * Map of updates in progress: element path -> list of requests */ - private Map<TreePath, List<ViewerUpdateMonitor>> fRequestsInProgress = new HashMap<TreePath, List<ViewerUpdateMonitor>>(); + private Map<TreePath, List<ViewerUpdateMonitor>> fRequestsInProgress = new HashMap<>(); /** * Map of dependent requests waiting for parent requests to complete: * element path -> list of requests */ - private Map<TreePath, List<ViewerUpdateMonitor>> fWaitingRequests = new HashMap<TreePath, List<ViewerUpdateMonitor>>(); + private Map<TreePath, List<ViewerUpdateMonitor>> fWaitingRequests = new HashMap<>(); - private List<ViewerUpdateMonitor> fCompletedUpdates = new ArrayList<ViewerUpdateMonitor>(); + private List<ViewerUpdateMonitor> fCompletedUpdates = new ArrayList<>(); private Runnable fCompletedUpdatesRunnable; @@ -552,7 +552,7 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon * @return corresponding tree path */ TreePath getFullTreePath(IModelDelta node) { - ArrayList<Object> list = new ArrayList<Object>(); + ArrayList<Object> list = new ArrayList<>(); while (node.getParentDelta() != null) { list.add(0, node.getElement()); node = node.getParentDelta(); @@ -568,7 +568,7 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon * @return corresponding tree path */ TreePath getViewerTreePath(IModelDelta node) { - ArrayList<Object> list = new ArrayList<Object>(); + ArrayList<Object> list = new ArrayList<>(); IModelDelta parentDelta = node.getParentDelta(); while (parentDelta != null) { list.add(0, node.getElement()); @@ -707,7 +707,7 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon List<ViewerUpdateMonitor> requests = fRequestsInProgress.get(update.getSchedulingPath()); if (requests == null) { - requests = new ArrayList<ViewerUpdateMonitor>(); + requests = new ArrayList<>(); fRequestsInProgress.put(update.getSchedulingPath(), requests); } requests.add(update); @@ -866,7 +866,7 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon } } } - List<TreePath> purge = new ArrayList<TreePath>(); + List<TreePath> purge = new ArrayList<>(); for (TreePath entryPath : fWaitingRequests.keySet()) { if (entryPath.startsWith(path, null)) { purge.add(entryPath); @@ -891,7 +891,7 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon TreePath schedulingPath = update.getSchedulingPath(); List<ViewerUpdateMonitor> requests = fWaitingRequests.get(schedulingPath); if (requests == null) { - requests = new LinkedList<ViewerUpdateMonitor>(); + requests = new LinkedList<>(); requests.add(update); fWaitingRequests.put(schedulingPath, requests); @@ -1102,7 +1102,7 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon childrenUpdate.cancel(); iterator.remove(); if (reCreate == null) { - reCreate = new ArrayList<IChildrenUpdate>(); + reCreate = new ArrayList<>(); } reCreate.add(childrenUpdate); if (DebugUIPlugin.DEBUG_CONTENT_PROVIDER && DebugUIPlugin.DEBUG_TEST_PRESENTATION_ID(getPresentationContext())) { @@ -1811,7 +1811,7 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon } jobCompletedUpdates = fCompletedUpdates; fCompletedUpdatesRunnable = null; - fCompletedUpdates = new ArrayList<ViewerUpdateMonitor>(); + fCompletedUpdates = new ArrayList<>(); } // necessary to check if viewer is disposed try { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelLabelProvider.java index 705b10734..19d2b3eb2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelLabelProvider.java @@ -61,21 +61,21 @@ public class TreeModelLabelProvider extends ColumnLabelProvider * use the method <code>getImage(...)</code> to cache images for * image descriptors. The images are disposed with this label provider. */ - private Map<ImageDescriptor, Image> fImageCache = new HashMap<ImageDescriptor, Image>(); + private Map<ImageDescriptor, Image> fImageCache = new HashMap<>(); /** * Cache of the fonts used for elements in this label provider. Label updates * use the method <code>getFont(...)</code> to cache fonts for * FontData objects. The fonts are disposed with this label provider. */ - private Map<FontData, Font> fFontCache = new HashMap<FontData, Font>(); + private Map<FontData, Font> fFontCache = new HashMap<>(); /** * Cache of the colors used for elements in this label provider. Label updates * use the method <code>getColor(...)</code> to cache colors for * RGB values. The colors are disposed with this label provider. */ - private Map<RGB, Color> fColorCache = new HashMap<RGB, Color>(); + private Map<RGB, Color> fColorCache = new HashMap<>(); /** * Label listeners @@ -86,7 +86,7 @@ public class TreeModelLabelProvider extends ColumnLabelProvider * Updates waiting to be sent to the label provider. The map contains * lists of updates, keyed using the provider. */ - private Map<IElementLabelProvider, List<ILabelUpdate>> fPendingUpdates = new HashMap<IElementLabelProvider, List<ILabelUpdate>>(); + private Map<IElementLabelProvider, List<ILabelUpdate>> fPendingUpdates = new HashMap<>(); /** * A runnable that will send the label update requests. @@ -98,7 +98,7 @@ public class TreeModelLabelProvider extends ColumnLabelProvider /** * List of updates in progress */ - private List<ILabelUpdate> fUpdatesInProgress = new ArrayList<ILabelUpdate>(); + private List<ILabelUpdate> fUpdatesInProgress = new ArrayList<>(); /** * Delta visitor actively cancels the outstanding label updates for @@ -273,7 +273,7 @@ public class TreeModelLabelProvider extends ColumnLabelProvider if (presentation != null) { List<ILabelUpdate> updates = fPendingUpdates.get(presentation); if (updates == null) { - updates = new LinkedList<ILabelUpdate>(); + updates = new LinkedList<>(); fPendingUpdates.put(presentation, updates); } updates.add(new LabelUpdate(fViewer.getInput(), elementPath, this, visibleColumns, fViewer.getPresentationContext())); @@ -398,7 +398,7 @@ public class TreeModelLabelProvider extends ColumnLabelProvider } if (fComplete == null) { - fComplete = new LinkedList<ILabelUpdate>(); + fComplete = new LinkedList<>(); fViewer.getDisplay().asyncExec(new Runnable() { @Override public void run() { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerStateTracker.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerStateTracker.java index 6368a43df..f894f9e51 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerStateTracker.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ViewerStateTracker.java @@ -148,7 +148,7 @@ class ViewerStateTracker { /** * Map of viewer states keyed by viewer input mementos */ - private Map<String, ModelDelta> fViewerStates = new LRUMap<String, ModelDelta>(20); + private Map<String, ModelDelta> fViewerStates = new LRUMap<>(20); /** * Pending viewer state to be restored @@ -175,7 +175,7 @@ class ViewerStateTracker { /** * Set of IMementoManager's that are currently saving state */ - private Set<IElementMementoCollector> fPendingStateSaves = new HashSet<IElementMementoCollector>(); + private Set<IElementMementoCollector> fPendingStateSaves = new HashSet<>(); /** * Used to queue a viewer input for state restore @@ -213,7 +213,7 @@ class ViewerStateTracker { /** * Compare requests that are currently running. */ - private Map<CompareRequestKey, ElementCompareRequest> fCompareRequestsInProgress = new LinkedHashMap<CompareRequestKey, ElementCompareRequest>(); + private Map<CompareRequestKey, ElementCompareRequest> fCompareRequestsInProgress = new LinkedHashMap<>(); /** @@ -641,7 +641,7 @@ class ViewerStateTracker { private ModelDelta findSubDeltaParent(ModelDelta destinationDeltaRoot, IModelDelta subDelta) { // Create a path of elements to the sub-delta. - LinkedList<IModelDelta> deltaPath = new LinkedList<IModelDelta>(); + LinkedList<IModelDelta> deltaPath = new LinkedList<>(); IModelDelta delta = subDelta; while (delta.getParentDelta() != null) { delta = delta.getParentDelta(); @@ -699,7 +699,7 @@ class ViewerStateTracker { /** * list of memento fRequests */ - private List<IElementMementoRequest> fRequests = new ArrayList<IElementMementoRequest>(); + private List<IElementMementoRequest> fRequests = new ArrayList<>(); /** * Flag indicating whether the encoding of delta has been canceled. @@ -779,7 +779,7 @@ class ViewerStateTracker { public void processReqeusts() { Assert.isTrue( fContentProvider.getViewer().getDisplay().getThread() == Thread.currentThread() ); - Map<IElementMementoProvider, List<IElementMementoRequest>> providers = new HashMap<IElementMementoProvider, List<IElementMementoRequest>>(); + Map<IElementMementoProvider, List<IElementMementoRequest>> providers = new HashMap<>(); for (IElementMementoRequest request : fRequests) { notifyStateUpdate(input, TreeModelContentProvider.UPDATE_BEGINS, request); IElementMementoProvider provider = ViewerAdapterService.getMementoProvider(request.getElement()); @@ -788,7 +788,7 @@ class ViewerStateTracker { } List<IElementMementoRequest> reqs = providers.get(provider); if (reqs == null) { - reqs = new ArrayList<IElementMementoRequest>(); + reqs = new ArrayList<>(); providers.put(provider, reqs); } reqs.add(request); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java index 3510c9dd6..be623e7d4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java @@ -169,7 +169,7 @@ public class VirtualCopyToClipboardActionDelegate extends AbstractDebugActionDel void setItemsToCopy(Set<VirtualItem> itemsToCopy) { fItemsToCopy = itemsToCopy; - fItemsToValidate = new HashSet<VirtualItem>(); + fItemsToValidate = new HashSet<>(); for (VirtualItem itemToCopy : itemsToCopy) { while (itemToCopy != null) { fItemsToValidate.add(itemToCopy); @@ -202,7 +202,7 @@ public class VirtualCopyToClipboardActionDelegate extends AbstractDebugActionDel // Parse selected items from client viewer and add them to the virtual viewer selection. listener.fSelectionRootDepth = Integer.MAX_VALUE; TreeItem[] selection = getSelectedItems(clientViewer); - Set<VirtualItem> vSelection = new HashSet<VirtualItem>(selection.length * 4 / 3); + Set<VirtualItem> vSelection = new HashSet<>(selection.length * 4 / 3); for (int i = 0; i < selection.length; i++) { TreePath parentPath = fClientViewer.getTreePathFromItem(selection[i].getParentItem()); listener.fSelectionRootDepth = Math.min(parentPath.getSegmentCount() + 1, listener.fSelectionRootDepth); @@ -221,7 +221,7 @@ public class VirtualCopyToClipboardActionDelegate extends AbstractDebugActionDel } } validator.setItemsToCopy(vSelection); - listener.fItemsToUpdate = new HashSet<VirtualItem>(vSelection); + listener.fItemsToUpdate = new HashSet<>(vSelection); virtualViewer.getTree().validate(); return virtualViewer; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualFindAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualFindAction.java index 1835c308f..f107d0cc3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualFindAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualFindAction.java @@ -127,7 +127,7 @@ public class VirtualFindAction extends Action implements IUpdate { private static class FindLabelProvider extends LabelProvider { private VirtualTreeModelViewer fVirtualViewer; - private Map<VirtualItem, String> fTextCache = new HashMap<VirtualItem, String>(); + private Map<VirtualItem, String> fTextCache = new HashMap<>(); public FindLabelProvider(VirtualTreeModelViewer viewer, List<VirtualItem> items) { fVirtualViewer = viewer; @@ -217,7 +217,7 @@ public class VirtualFindAction extends Action implements IUpdate { VirtualItem root = virtualViewer.getTree(); if (!monitor.isCanceled()) { - List<VirtualItem> list = new ArrayList<VirtualItem>(); + List<VirtualItem> list = new ArrayList<>(); collectAllChildren(root, list); FindLabelProvider labelProvider = new FindLabelProvider(virtualViewer, list); VirtualItem result = performFind(list, labelProvider); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ModelDelta.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ModelDelta.java index 219b1e1b9..0cf593864 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ModelDelta.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/ModelDelta.java @@ -175,11 +175,11 @@ public class ModelDelta implements IModelDelta { private void mapNodes() { if (fNodesList == null) { - fNodesMap = new HashMap<Object, Object>(1); + fNodesMap = new HashMap<>(1); return; } // Create a map with capacity for all child nodes. - fNodesMap = new HashMap<Object, Object>(fNodesList.size() * 4 / 3); + fNodesMap = new HashMap<>(fNodesList.size() * 4 / 3); for (int i = 0; i < fNodesList.size(); i++) { mapNode( fNodesList.get(i) ); } @@ -298,7 +298,7 @@ public class ModelDelta implements IModelDelta { private void addDelta(ModelDelta delta) { if (fNodesList == null) { - fNodesList = new ArrayList<ModelDelta>(4); + fNodesList = new ArrayList<>(4); } fNodesList.add(delta); fNodes = null; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/PresentationContext.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/PresentationContext.java index 0a73045fd..2db4c188d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/PresentationContext.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/PresentationContext.java @@ -45,7 +45,7 @@ public class PresentationContext implements IPresentationContext { final private String fId; final private ListenerList<IPropertyChangeListener> fListeners = new ListenerList<>(); - final private Map<String, Object> fProperties = new HashMap<String, Object>(); + final private Map<String, Object> fProperties = new HashMap<>(); private IWorkbenchWindow fWindow; private IWorkbenchPart fPart; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualItem.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualItem.java index 7f6c66fcb..f6cb5c99e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualItem.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualItem.java @@ -97,7 +97,7 @@ public class VirtualItem { * keeps the items sorted while allowing indexes (keys) to be modified as * child items are inserted and removed. */ - private Map<Index, VirtualItem> fItems = new TreeMap<Index, VirtualItem>(); + private Map<Index, VirtualItem> fItems = new TreeMap<>(); /** * Flag indicating whether this item has child items. @@ -120,7 +120,7 @@ public class VirtualItem { * The data held by this item. It includes the element as well as the item * display attributes. */ - private Map<String, Object> fData = new HashMap<String, Object>(1); + private Map<String, Object> fData = new HashMap<>(1); /** * Flag indicating that the item needs to have it's label updated. @@ -513,7 +513,7 @@ public class VirtualItem { private void ensureItems() { if (fItems == null) { - fItems = new HashMap<Index, VirtualItem>(Math.max(1, Math.min(fItemCount, 16))); + fItems = new HashMap<>(Math.max(1, Math.min(fItemCount, 16))); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualTree.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualTree.java index d6442c9c6..b84d47aa2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualTree.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualTree.java @@ -58,7 +58,7 @@ public class VirtualTree extends VirtualItem { /** * Set of listeners of the virtual tree. */ - private Set<IVirtualItemListener> fVirtualItemListeners = new HashSet<IVirtualItemListener>(1); + private Set<IVirtualItemListener> fVirtualItemListeners = new HashSet<>(1); /** * The currently selected items. This array contains only 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 9e80c07a0..04b7a5156 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 @@ -68,7 +68,7 @@ public class BreakpointManagerProxy extends AbstractModelProxy { /** * List of posted deltas ready to be fired. */ - private List<DeltaInfo> fPendingDeltas = new LinkedList<DeltaInfo>(); + private List<DeltaInfo> fPendingDeltas = new LinkedList<>(); /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/EventHandlerModelProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/EventHandlerModelProxy.java index 00c770bf9..cce0299d7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/EventHandlerModelProxy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/EventHandlerModelProxy.java @@ -29,7 +29,7 @@ public abstract class EventHandlerModelProxy extends AbstractModelProxy implemen /** * Map of elements to timer tasks */ - private Map<Object, PendingSuspendTask> fTimerTasks = new HashMap<Object, PendingSuspendTask>(); + private Map<Object, PendingSuspendTask> fTimerTasks = new HashMap<>(); /** * Timer for timer tasks @@ -40,7 +40,7 @@ public abstract class EventHandlerModelProxy extends AbstractModelProxy implemen * Map of event source to resume events with a pending suspend that timed * out. */ - private Map<Object, DebugEvent> fPendingSuspends = new HashMap<Object, DebugEvent>(); + private Map<Object, DebugEvent> fPendingSuspends = new HashMap<>(); /** * Event handlers for specific elements diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/LaunchProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/LaunchProxy.java index b3b90db6a..502b58292 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/LaunchProxy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/LaunchProxy.java @@ -39,7 +39,7 @@ public class LaunchProxy extends AbstractModelProxy implements ILaunchesListener * Set of launch's previous children. When a child is added, * its model proxy is installed. */ - private Set<Object> fPrevChildren = new HashSet<Object>(); + private Set<Object> fPrevChildren = new HashSet<>(); /** * Constructs a new model proxy for the given launch. diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ThreadEventHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ThreadEventHandler.java index 9afed3627..dece8b1d9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ThreadEventHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/ThreadEventHandler.java @@ -38,12 +38,12 @@ public class ThreadEventHandler extends DebugEventHandler { * to select a thread when another is resumed. Threads * are added in the order they suspend. */ - private Set<IThread> fThreadQueue = new LinkedHashSet<IThread>(); + private Set<IThread> fThreadQueue = new LinkedHashSet<>(); /** * Map of previous TOS per thread */ - private Map<IThread, IStackFrame> fLastTopFrame = new HashMap<IThread, IStackFrame>(); + private Map<IThread, IStackFrame> fLastTopFrame = new HashMap<>(); /** * Constructs and event handler for a threads in the given viewer. * |