diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java index efb078622bc1..703530758a67 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java @@ -387,7 +387,7 @@ public class PushController implements Disposable { Function commitToNode = new Function() { @Override public DefaultMutableTreeNode fun(VcsFullCommitDetails commit) { - return new VcsFullCommitDetailsNode(project, commit); + return new CommitNode(project, commit); } }; List childrenToShown = new ArrayList(); diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsFullCommitDetailsNode.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/CommitNode.java similarity index 87% rename from platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsFullCommitDetailsNode.java rename to platform/dvcs-impl/src/com/intellij/dvcs/push/ui/CommitNode.java index c10640df77ca..b788592eb75b 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsFullCommitDetailsNode.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/CommitNode.java @@ -26,12 +26,12 @@ import org.jetbrains.annotations.NotNull; import javax.swing.tree.DefaultMutableTreeNode; -public class VcsFullCommitDetailsNode extends DefaultMutableTreeNode implements CustomRenderedTreeNode, TooltipNode { +public class CommitNode extends DefaultMutableTreeNode implements CustomRenderedTreeNode, TooltipNode { @NotNull private final Project myProject; - private final VcsFullCommitDetails myCommit; + @NotNull private final VcsFullCommitDetails myCommit; - public VcsFullCommitDetailsNode(@NotNull Project project, @NotNull VcsFullCommitDetails commit) { + public CommitNode(@NotNull Project project, @NotNull VcsFullCommitDetails commit) { super(commit, false); myProject = project; myCommit = commit; diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLog.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLog.java index 370217b9894c..342cf57215c2 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLog.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLog.java @@ -171,8 +171,8 @@ public class PushLog extends JPanel implements TypeSafeDataProvider { if (nodes != null) { ArrayList changes = new ArrayList(); for (TreePath path : nodes) { - if (path.getLastPathComponent() instanceof VcsFullCommitDetailsNode) { - VcsFullCommitDetailsNode commitDetailsNode = (VcsFullCommitDetailsNode)path.getLastPathComponent(); + if (path.getLastPathComponent() instanceof CommitNode) { + CommitNode commitDetailsNode = (CommitNode)path.getLastPathComponent(); changes.addAll(commitDetailsNode.getUserObject().getChanges()); } else if (path.getLastPathComponent() instanceof RepositoryNode) { @@ -194,8 +194,8 @@ public class PushLog extends JPanel implements TypeSafeDataProvider { for (DefaultMutableTreeNode childNode = (DefaultMutableTreeNode)rootNode.getFirstChild(); childNode != null; childNode = (DefaultMutableTreeNode)rootNode.getChildAfter(childNode)) { - if (childNode instanceof VcsFullCommitDetailsNode) { - changes.addAll(((VcsFullCommitDetailsNode)childNode).getUserObject().getChanges()); + if (childNode instanceof CommitNode) { + changes.addAll(((CommitNode)childNode).getUserObject().getChanges()); } } return changes;