diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/AbstractPrintElementGenerator.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/AbstractPrintElementGenerator.java index 1a48f05100f5..71df4dc77589 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/AbstractPrintElementGenerator.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/AbstractPrintElementGenerator.java @@ -93,14 +93,16 @@ public abstract class AbstractPrintElementGenerator implements PrintElementGener return result; } - private SimplePrintElementImpl createSimplePrintElement(int rowIndex, SimpleRowElement rowElement) { + @NotNull + private SimplePrintElementImpl createSimplePrintElement(int rowIndex, @NotNull SimpleRowElement rowElement) { return new SimplePrintElementImpl(rowIndex, rowElement.myPosition, rowElement.myElement, myPrintElementManager); } + @NotNull private EdgePrintElementImpl createEdgePrintElement(int rowIndex, @NotNull ShortEdge shortEdge, @NotNull EdgePrintElement.Type type, - @NotNull boolean hasArrow) { + boolean hasArrow) { int positionInCurrentRow, positionInOtherRow; if (type == EdgePrintElement.Type.DOWN) { positionInCurrentRow = shortEdge.myUpPosition; diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/elements/PrintElementWithGraphElement.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/elements/PrintElementWithGraphElement.java index b1f93f358360..510137a86386 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/elements/PrintElementWithGraphElement.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/elements/PrintElementWithGraphElement.java @@ -64,6 +64,7 @@ public abstract class PrintElementWithGraphElement implements PrintElement { return myPrintElementManager.isSelected(this); } + @NotNull public static PrintElementWithGraphElement converted(@NotNull PrintElementWithGraphElement element, @NotNull GraphElement convertedGraphElement) { return new PrintElementWithGraphElement(element.getRowIndex(), element.getPositionInCurrentRow(), convertedGraphElement,