From edb88b8b2af7a43bb0e17809d6cdcd432043a6b8 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 23 Apr 2014 14:51:11 +0400 Subject: [PATCH] notnull --- .../src/com/intellij/injected/editor/MarkupModelWindow.java | 5 +++-- .../src/com/intellij/openapi/editor/ex/MarkupModelEx.java | 5 +++-- .../com/intellij/openapi/editor/impl/EmptyMarkupModel.java | 5 +++-- .../com/intellij/openapi/editor/impl/MarkupModelImpl.java | 4 +++- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/platform/editor-ui-ex/src/com/intellij/injected/editor/MarkupModelWindow.java b/platform/editor-ui-ex/src/com/intellij/injected/editor/MarkupModelWindow.java index 9fd72279c4f2..d60f12839e75 100644 --- a/platform/editor-ui-ex/src/com/intellij/injected/editor/MarkupModelWindow.java +++ b/platform/editor-ui-ex/src/com/intellij/injected/editor/MarkupModelWindow.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -62,6 +62,7 @@ public class MarkupModelWindow extends UserDataHolderBase implements MarkupModel return myHostModel.addRangeHighlighter(hostRange.getStartOffset(), hostRange.getEndOffset(), layer, textAttributes, targetArea); } + @NotNull @Override public RangeHighlighterEx addRangeHighlighterAndChangeAttributes(int startOffset, int endOffset, @@ -172,7 +173,7 @@ public class MarkupModelWindow extends UserDataHolderBase implements MarkupModel } @Override - public void addRangeHighlighter(RangeHighlighterEx marker, int start, int end, boolean greedyToLeft, boolean greedyToRight, int layer) { + public void addRangeHighlighter(@NotNull RangeHighlighterEx marker, int start, int end, boolean greedyToLeft, boolean greedyToRight, int layer) { } } diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/MarkupModelEx.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/MarkupModelEx.java index 28d8cb447d7c..2d5a437bcf2d 100644 --- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/MarkupModelEx.java +++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/MarkupModelEx.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -43,7 +43,7 @@ public interface MarkupModelEx extends MarkupModel { boolean containsHighlighter(@NotNull RangeHighlighter highlighter); - void addRangeHighlighter(RangeHighlighterEx marker, + void addRangeHighlighter(@NotNull RangeHighlighterEx marker, int start, int end, boolean greedyToLeft, @@ -61,6 +61,7 @@ public interface MarkupModelEx extends MarkupModel { DisposableIterator overlappingIterator(int startOffset, int endOffset); // optimization: creates highlighter and fires only one event: highlighterCreated + @NotNull RangeHighlighterEx addRangeHighlighterAndChangeAttributes(int startOffset, int endOffset, int layer, diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/EmptyMarkupModel.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/EmptyMarkupModel.java index a3ac344e23bf..52fdbf1030a9 100644 --- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/EmptyMarkupModel.java +++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/EmptyMarkupModel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -59,6 +59,7 @@ public class EmptyMarkupModel implements MarkupModelEx { throw new ProcessCanceledException(); } + @NotNull @Override public RangeHighlighterEx addRangeHighlighterAndChangeAttributes(int startOffset, int endOffset, @@ -164,7 +165,7 @@ public class EmptyMarkupModel implements MarkupModelEx { } @Override - public void addRangeHighlighter(RangeHighlighterEx marker, int start, int end, boolean greedyToLeft, boolean greedyToRight, int layer) { + public void addRangeHighlighter(@NotNull RangeHighlighterEx marker, int start, int end, boolean greedyToLeft, boolean greedyToRight, int layer) { } } diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/MarkupModelImpl.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/MarkupModelImpl.java index dee1a6678c86..02b07369a8a7 100644 --- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/MarkupModelImpl.java +++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/MarkupModelImpl.java @@ -105,6 +105,7 @@ public class MarkupModelImpl extends UserDataHolderBase implements MarkupModelEx return myCachedHighlighters; } + @NotNull @Override public RangeHighlighterEx addRangeHighlighterAndChangeAttributes(int startOffset, int endOffset, @@ -119,6 +120,7 @@ public class MarkupModelImpl extends UserDataHolderBase implements MarkupModelEx false), changeAttributesAction); } + @NotNull private RangeHighlighterEx addRangeHighlighter(@NotNull RangeHighlighterImpl highlighter, @Nullable Consumer changeAttributesAction) { ApplicationManager.getApplication().assertIsDispatchThread(); @@ -141,7 +143,7 @@ public class MarkupModelImpl extends UserDataHolderBase implements MarkupModelEx } @Override - public void addRangeHighlighter(RangeHighlighterEx marker, + public void addRangeHighlighter(@NotNull RangeHighlighterEx marker, int start, int end, boolean greedyToLeft,