MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[vcs]: cleanUp - lambdify

Browse Source
This commit is contained in:
Nadya Zabrodina
2016-11-03 19:21:38 +03:00
parent 3214522190
commit 2c5b14d40b
1 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLog.java
+10 -24
View File
@@ -20,7 +20,6 @@ import com.intellij.openapi.keymap.KeymapUtil;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.Splitter;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.vcs.VcsDataKeys;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.TextRevisionNumber;
@@ -34,8 +33,6 @@ import com.intellij.ui.components.JBViewport;
import com.intellij.ui.components.labels.LinkLabel;
import com.intellij.ui.components.labels.LinkListener;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Function;
import com.intellij.util.Processor;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.ui.ThreeStateCheckBox;
import com.intellij.util.ui.tree.TreeUtil;
@@ -161,12 +158,9 @@ public class PushLog extends JPanel implements DataProvider {
else {
if (mySyncStrategy) {
resetEditSync();
ContainerUtil.process(getChildNodesByType(root, RepositoryNode.class, false), new Processor<RepositoryNode>() {
@Override
public boolean process(RepositoryNode node) {
node.fireOnChange();
return true;
}
ContainerUtil.process(getChildNodesByType(root, RepositoryNode.class, false), node1 -> {
node1.fireOnChange();
return true;
});
}
else {
@@ -402,12 +396,9 @@ public class PushLog extends JPanel implements DataProvider {
}
else if (VcsDataKeys.VCS_REVISION_NUMBERS.is(id)) {
List<CommitNode> commitNodes = getSelectedCommitNodes();
return ArrayUtil.toObjectArray(ContainerUtil.map(commitNodes, new Function<CommitNode, VcsRevisionNumber>() {
@Override
public VcsRevisionNumber fun(CommitNode commitNode) {
Hash hash = commitNode.getUserObject().getId();
return new TextRevisionNumber(hash.asString(), hash.toShortString());
}
return ArrayUtil.toObjectArray(ContainerUtil.map(commitNodes, commitNode -> {
Hash hash = commitNode.getUserObject().getId();
return new TextRevisionNumber(hash.asString(), hash.toShortString());
}), VcsRevisionNumber.class);
}
return null;
@@ -482,12 +473,7 @@ public class PushLog extends JPanel implements DataProvider {
}
List<RepositoryNode> repositoryNodes = getChildNodesByType((DefaultMutableTreeNode)myTree.getModel().getRoot(),
RepositoryNode.class, false);
RepositoryNode editableNode = ContainerUtil.find(repositoryNodes, new Condition<RepositoryNode>() {
@Override
public boolean value(RepositoryNode repositoryNode) {
return repositoryNode.isEditableNow();
}
});
RepositoryNode editableNode = ContainerUtil.find(repositoryNodes, repositoryNode -> repositoryNode.isEditableNow());
if (editableNode != null) {
TreeUtil.selectNode(myTree, editableNode);
}
@@ -698,9 +684,9 @@ public class PushLog extends JPanel implements DataProvider {
@Override
public Rectangle getNodeDimensions(Object value, int row, int depth, boolean expanded, Rectangle size) {
Rectangle dimensions = super.getNodeDimensions(value, row, depth, expanded, size);
dimensions.width = myScrollPane != null
? Math.max(myScrollPane.getViewport().getWidth() - getRowX(row, depth), dimensions.width)
: Math.max(myTree.getMinimumSize().width, dimensions.width);
dimensions.width = Math.max(
myScrollPane != null ? myScrollPane.getViewport().getWidth() - getRowX(row, depth) : myTree.getMinimumSize().width,
dimensions.width);
return dimensions;
}
};