cleanup (java8)

platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerUtilImpl.java

@@ -92,7 +92,7 @@ public class XDebuggerUtilImpl extends XDebuggerUtil {
   public XLineBreakpointType<?>[] getLineBreakpointTypes() {
     if (myLineBreakpointTypes == null) {
       XBreakpointType[] types = XBreakpointUtil.getBreakpointTypes();
-      List<XLineBreakpointType<?>> lineBreakpointTypes = new ArrayList<XLineBreakpointType<?>>();
+      List<XLineBreakpointType<?>> lineBreakpointTypes = new ArrayList<>();
       for (XBreakpointType type : types) {
         if (type instanceof XLineBreakpointType<?>) {
           lineBreakpointTypes.add((XLineBreakpointType<?>)type);
@@ -159,7 +159,7 @@ public class XDebuggerUtilImpl extends XDebuggerUtil {
           if (!variants.isEmpty() && editor != null) {
             RelativePoint relativePoint = DebuggerUIUtil.getPositionForPopup(editor, line);
             if (variants.size() > 1 && relativePoint != null) {
-              final AsyncPromise<XLineBreakpoint> res = new AsyncPromise<XLineBreakpoint>();
+              final AsyncPromise<XLineBreakpoint> res = new AsyncPromise<>();
               class MySelectionListener implements ListSelectionListener {
                 RangeHighlighter myHighlighter = null;
 
@@ -231,12 +231,9 @@ public class XDebuggerUtilImpl extends XDebuggerUtil {
                   @Override
                   public PopupStep onChosen(final XLineBreakpointType.XLineBreakpointVariant selectedValue, boolean finalChoice) {
                     selectionListener.clearHighlighter();
-                    ApplicationManager.getApplication().runWriteAction(new Runnable() {
-                      @Override
-                      public void run() {
-                        P properties = (P)selectedValue.createProperties();
-                        res.setResult(breakpointManager.addLineBreakpoint(type, file.getUrl(), line, properties, temporary));
-                      }
+                    ApplicationManager.getApplication().runWriteAction(() -> {
+                      P properties = (P)selectedValue.createProperties();
+                      res.setResult(breakpointManager.addLineBreakpoint(type, file.getUrl(), line, properties, temporary));
                     });
                     return FINAL_CHOICE;
                   }
@@ -284,7 +281,7 @@ public class XDebuggerUtilImpl extends XDebuggerUtil {
   @Override
   public <T extends XBreakpointType> T findBreakpointType(@NotNull Class<T> typeClass) {
     if (myBreakpointTypeByClass == null) {
-      myBreakpointTypeByClass = new THashMap<Class<? extends XBreakpointType>, XBreakpointType<?, ?>>();
+      myBreakpointTypeByClass = new THashMap<>();
       for (XBreakpointType<?, ?> breakpointType : XBreakpointUtil.getBreakpointTypes()) {
         myBreakpointTypeByClass.put(breakpointType.getClass(), breakpointType);
       }
@@ -341,12 +338,9 @@ public class XDebuggerUtilImpl extends XDebuggerUtil {
 
       private XSourcePosition getDelegate() {
         if (myDelegate == null) {
-          myDelegate = ApplicationManager.getApplication().runReadAction(new Computable<XSourcePosition>() {
-            @Override
-            public XSourcePosition compute() {
-              PsiElement elem = pointer.getElement();
-              return XSourcePositionImpl.createByOffset(pointer.getVirtualFile(), elem != null ? elem.getTextOffset() : -1);
-            }
+          myDelegate = ApplicationManager.getApplication().runReadAction((Computable<XSourcePosition>)() -> {
+            PsiElement elem = pointer.getElement();
+            return XSourcePositionImpl.createByOffset(pointer.getVirtualFile(), elem != null ? elem.getTextOffset() : -1);
           });
         }
         return myDelegate;
@@ -386,7 +380,7 @@ public class XDebuggerUtilImpl extends XDebuggerUtil {
 
   @Override
   public <B extends XLineBreakpoint<?>> XBreakpointGroupingRule<B, ?> getGroupingByFileRule() {
-    return new XBreakpointFileGroupingRule<B>();
+    return new XBreakpointFileGroupingRule<>();
   }
 
   @Nullable
@@ -408,7 +402,7 @@ public class XDebuggerUtilImpl extends XDebuggerUtil {
     }
 
     VirtualFile file = FileDocumentManager.getInstance().getFile(editor.getDocument());
-    List<XSourcePosition> res = new SmartList<XSourcePosition>();
+    List<XSourcePosition> res = new SmartList<>();
     for (Caret caret : editor.getCaretModel().getAllCarets()) {
       XSourcePositionImpl position = XSourcePositionImpl.createByOffset(file, caret.getOffset());
       if (position != null) {
@@ -429,23 +423,15 @@ public class XDebuggerUtilImpl extends XDebuggerUtil {
 
   @Override
   public <B extends XBreakpoint<?>> Comparator<B> getDefaultBreakpointComparator(final XBreakpointType<B, ?> type) {
-    return new Comparator<B>() {
-      @Override
-      public int compare(final B o1, final B o2) {
-        return type.getDisplayText(o1).compareTo(type.getDisplayText(o2));
-      }
-    };
+    return (o1, o2) -> type.getDisplayText(o1).compareTo(type.getDisplayText(o2));
   }
 
   @Override
   public <P extends XBreakpointProperties> Comparator<XLineBreakpoint<P>> getDefaultLineBreakpointComparator() {
-    return new Comparator<XLineBreakpoint<P>>() {
-      @Override
-      public int compare(final XLineBreakpoint<P> o1, final XLineBreakpoint<P> o2) {
-        int fileCompare = o1.getFileUrl().compareTo(o2.getFileUrl());
-        if (fileCompare != 0) return fileCompare;
-        return o1.getLine() - o2.getLine();
-      }
+    return (o1, o2) -> {
+      int fileCompare = o1.getFileUrl().compareTo(o2.getFileUrl());
+      if (fileCompare != 0) return fileCompare;
+      return o1.getLine() - o2.getLine();
     };
   }
 
@@ -503,7 +489,7 @@ public class XDebuggerUtilImpl extends XDebuggerUtil {
 
   @Override
   public <B extends XLineBreakpoint<?>> List<XBreakpointGroupingRule<B, ?>> getGroupingByFileRuleAsList() {
-    return Collections.<XBreakpointGroupingRule<B, ?>>singletonList(this.<B>getGroupingByFileRule());
+    return Collections.singletonList(this.getGroupingByFileRule());
   }
 
   @Override

platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointManagerImpl.java

 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -91,8 +91,7 @@ public class XBreakpointManagerImpl implements XBreakpointManager, PersistentSta
     ApplicationManager.getApplication().invokeLater(new Runnable() {
       @Override
       public void run() {
-        XBreakpointBase<?, ?, ?>[] breakpoints = getAllBreakpoints();
-        for (XBreakpointBase<?, ?, ?> breakpoint : breakpoints) {
+        for (XBreakpointBase breakpoint : getAllBreakpoints()) {
           XSourcePosition position = breakpoint.getSourcePosition();
           if (position != null && Comparing.equal(position.getFile(), file)) {
             fireBreakpointChanged(breakpoint);

platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueContainerNode.java

@@ -76,53 +76,50 @@ public abstract class XValueContainerNode<ValueContainer extends XValueContainer
   @Override
   public void addChildren(@NotNull final XValueChildrenList children, final boolean last) {
     if (myObsolete) return;
-    invokeNodeUpdate(new Runnable() {
-      @Override
-      public void run() {
-        if (myObsolete) return;
-        List<XValueContainerNode<?>> newChildren;
-        if (children.size() > 0) {
-          newChildren = new ArrayList<XValueContainerNode<?>>(children.size());
-          if (myValueChildren == null) {
-            if (!myAlreadySorted && XDebuggerSettingsManager.getInstance().getDataViewSettings().isSortValues()) {
-              myValueChildren = new SortedList<XValueNodeImpl>(XValueNodeImpl.COMPARATOR);
-            }
-            else {
-              myValueChildren = new ArrayList<XValueNodeImpl>(children.size());
-            }
+    invokeNodeUpdate(() -> {
+      if (myObsolete) return;
+      List<XValueContainerNode<?>> newChildren;
+      if (children.size() > 0) {
+        newChildren = new ArrayList<>(children.size());
+        if (myValueChildren == null) {
+          if (!myAlreadySorted && XDebuggerSettingsManager.getInstance().getDataViewSettings().isSortValues()) {
+            myValueChildren = new SortedList<>(XValueNodeImpl.COMPARATOR);
           }
-          boolean valuesInline = XDebuggerSettingsManager.getInstance().getDataViewSettings().isShowValuesInline();
-          InlineDebuggerHelper inlineHelper = getTree().getEditorsProvider().getInlineDebuggerHelper();
-          for (int i = 0; i < children.size(); i++) {
-            XValueNodeImpl node = new XValueNodeImpl(myTree, XValueContainerNode.this, children.getName(i), children.getValue(i));
-            myValueChildren.add(node);
-            newChildren.add(node);
-
-            if (valuesInline && inlineHelper.shouldEvaluateChildrenByDefault(node) && isUseGetChildrenHack(myTree)) { //todo[kb]: try to generify this dirty hack
-              node.getChildren();
-            }
+          else {
+            myValueChildren = new ArrayList<>(children.size());
           }
         }
-        else {
-          newChildren = new SmartList<XValueContainerNode<?>>();
-          if (myValueChildren == null) {
-            myValueChildren = last ? Collections.<XValueNodeImpl>emptyList() : new SmartList<XValueNodeImpl>();
+        boolean valuesInline = XDebuggerSettingsManager.getInstance().getDataViewSettings().isShowValuesInline();
+        InlineDebuggerHelper inlineHelper = getTree().getEditorsProvider().getInlineDebuggerHelper();
+        for (int i = 0; i < children.size(); i++) {
+          XValueNodeImpl node = new XValueNodeImpl(myTree, this, children.getName(i), children.getValue(i));
+          myValueChildren.add(node);
+          newChildren.add(node);
+
+          if (valuesInline && inlineHelper.shouldEvaluateChildrenByDefault(node) && isUseGetChildrenHack(myTree)) { //todo[kb]: try to generify this dirty hack
+            node.getChildren();
           }
         }
+      }
+      else {
+        newChildren = new SmartList<>();
+        if (myValueChildren == null) {
+          myValueChildren = last ? Collections.emptyList() : new SmartList<>();
+        }
+      }
 
-        myTopGroups = createGroupNodes(children.getTopGroups(), myTopGroups, newChildren);
-        myBottomGroups = createGroupNodes(children.getBottomGroups(), myBottomGroups, newChildren);
+      myTopGroups = createGroupNodes(children.getTopGroups(), myTopGroups, newChildren);
+      myBottomGroups = createGroupNodes(children.getBottomGroups(), myBottomGroups, newChildren);
+      myCachedAllChildren = null;
+      fireNodesInserted(newChildren);
+      if (last && myTemporaryMessageChildren != null) {
+        final int[] ints = getNodesIndices(myTemporaryMessageChildren);
+        final TreeNode[] removed = myTemporaryMessageChildren.toArray(new TreeNode[myTemporaryMessageChildren.size()]);
         myCachedAllChildren = null;
-        fireNodesInserted(newChildren);
-        if (last && myTemporaryMessageChildren != null) {
-          final int[] ints = getNodesIndices(myTemporaryMessageChildren);
-          final TreeNode[] removed = myTemporaryMessageChildren.toArray(new TreeNode[myTemporaryMessageChildren.size()]);
-          myCachedAllChildren = null;
-          myTemporaryMessageChildren = null;
-          fireNodesRemoved(ints, removed);
-        }
-        myTree.childrenLoaded(XValueContainerNode.this, newChildren, last);
+        myTemporaryMessageChildren = null;
+        fireNodesRemoved(ints, removed);
       }
+      myTree.childrenLoaded(this, newChildren, last);
     });
   }
 
@@ -136,7 +133,7 @@ public abstract class XValueContainerNode<ValueContainer extends XValueContainer
                                                      List<XValueContainerNode<?>> newChildren) {
     if (groups.isEmpty()) return prevNodes;
 
-    List<XValueGroupNodeImpl> nodes = prevNodes != null ? prevNodes : new SmartList<XValueGroupNodeImpl>();
+    List<XValueGroupNodeImpl> nodes = prevNodes != null ? prevNodes : new SmartList<>();
     for (XValueGroup group : groups) {
       XValueGroupNodeImpl node = new XValueGroupNodeImpl(myTree, this, group);
       nodes.add(node);
@@ -147,12 +144,7 @@ public abstract class XValueContainerNode<ValueContainer extends XValueContainer
 
   @Override
   public void tooManyChildren(final int remaining) {
-    invokeNodeUpdate(new Runnable() {
-      @Override
-      public void run() {
-        setTemporaryMessageNode(MessageTreeNode.createEllipsisNode(myTree, XValueContainerNode.this, remaining));
-      }
-    });
+    invokeNodeUpdate(() -> setTemporaryMessageNode(MessageTreeNode.createEllipsisNode(myTree, this, remaining)));
   }
 
   @Override
@@ -184,14 +176,7 @@ public abstract class XValueContainerNode<ValueContainer extends XValueContainer
   @Override
   public void setMessage(@NotNull final String message,
                          final Icon icon, @NotNull final SimpleTextAttributes attributes, @Nullable final XDebuggerTreeNodeHyperlink link) {
-    invokeNodeUpdate(new Runnable() {
-      @Override
-      public void run() {
-        setMessageNodes(MessageTreeNode.createMessages(myTree, XValueContainerNode.this, message, link,
-                                                       icon,
-                                                       attributes), false);
-      }
-    });
+    invokeNodeUpdate(() -> setMessageNodes(MessageTreeNode.createMessages(myTree, this, message, link, icon, attributes), false));
   }
 
   private void setTemporaryMessageNode(final MessageTreeNode messageNode) {
@@ -200,8 +185,8 @@ public abstract class XValueContainerNode<ValueContainer extends XValueContainer
 
   private void setMessageNodes(final List<MessageTreeNode> messages, boolean temporary) {
     myCachedAllChildren = null;
-    List<MessageTreeNode> allMessageChildren = ContainerUtil.concat(myMessageChildren != null ? myMessageChildren : Collections.<MessageTreeNode>emptyList(),
-                                                                    myTemporaryMessageChildren != null ? myTemporaryMessageChildren : Collections.<MessageTreeNode>emptyList());
+    List<MessageTreeNode> allMessageChildren = ContainerUtil.concat(myMessageChildren != null ? myMessageChildren : Collections.emptyList(),
+                                                                    myTemporaryMessageChildren != null ? myTemporaryMessageChildren : Collections.emptyList());
     final int[] indices = getNodesIndices(allMessageChildren);
     final TreeNode[] nodes = allMessageChildren.toArray(new TreeNode[allMessageChildren.size()]);
     fireNodesRemoved(indices, nodes);
@@ -223,7 +208,7 @@ public abstract class XValueContainerNode<ValueContainer extends XValueContainer
     loadChildren();
 
     if (myCachedAllChildren == null) {
-      myCachedAllChildren = new ArrayList<TreeNode>();
+      myCachedAllChildren = new ArrayList<>();
       if (myMessageChildren != null) {
         myCachedAllChildren.addAll(myMessageChildren);
       }

platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java

@@ -50,12 +50,7 @@ import java.util.Comparator;
  * @author nik
  */
 public class XValueNodeImpl extends XValueContainerNode<XValue> implements XValueNode, XCompositeNode, XValueNodePresentationConfigurator.ConfigurableXValueNode, RestorableStateNode {
-  public static final Comparator<XValueNodeImpl> COMPARATOR = new Comparator<XValueNodeImpl>() {
-    @Override
-    public int compare(XValueNodeImpl o1, XValueNodeImpl o2) {
-      return StringUtil.naturalCompare(o1.getName(), o2.getName());
-    }
-  };
+  public static final Comparator<XValueNodeImpl> COMPARATOR = (o1, o2) -> StringUtil.naturalCompare(o1.getName(), o2.getName());
 
   private static final int MAX_NAME_LENGTH = 100;
 
@@ -153,12 +148,7 @@ public class XValueNodeImpl extends XValueContainerNode<XValue> implements XValu
       };
 
       if (getValueContainer().computeInlineDebuggerData(callback) == ThreeState.UNSURE) {
-        getValueContainer().computeSourcePosition(new XNavigatable() {
-          @Override
-          public void setSourcePosition(@Nullable XSourcePosition sourcePosition) {
-            callback.computed(sourcePosition);
-          }
-        });
+        getValueContainer().computeSourcePosition(callback::computed);
       }
     }
     catch (Exception ignore) {
@@ -167,12 +157,9 @@ public class XValueNodeImpl extends XValueContainerNode<XValue> implements XValu
 
   @Override
   public void setFullValueEvaluator(@NotNull final XFullValueEvaluator fullValueEvaluator) {
-    invokeNodeUpdate(new Runnable() {
-      @Override
-      public void run() {
-        myFullValueEvaluator = fullValueEvaluator;
-        fireNodeChanged();
-      }
+    invokeNodeUpdate(() -> {
+      myFullValueEvaluator = fullValueEvaluator;
+      fireNodeChanged();
     });
   }