This commit is contained in:
Alexey Kudravtsev
2013-05-31 16:31:58 +04:00
parent 0538610119
commit ed67220464
3 changed files with 14 additions and 14 deletions
@@ -630,7 +630,7 @@ public class EditorWindow extends UserDataHolderBase implements EditorEx {
}
@Override
public void addFocusListener(@NotNull FocusChangeListener listener, Disposable parentDisposable) {
public void addFocusListener(@NotNull FocusChangeListener listener, @NotNull Disposable parentDisposable) {
myDelegate.addFocusListener(listener, parentDisposable);
}
@@ -794,7 +794,7 @@ public class EditorWindow extends UserDataHolderBase implements EditorEx {
@Override
public void setPurePaintingMode(boolean enabled) {
myDelegate.setPurePaintingMode(enabled);
myDelegate.setPurePaintingMode(enabled);
}
@Override
@@ -106,8 +106,8 @@ public interface EditorEx extends Editor {
boolean setCaretEnabled(boolean enabled);
void addFocusListener(@NotNull FocusChangeListener listener);
void addFocusListener(@NotNull FocusChangeListener listener, Disposable parentDisposable);
void addFocusListener(@NotNull FocusChangeListener listener, @NotNull Disposable parentDisposable);
void setOneLineMode(boolean b);
@@ -186,7 +186,7 @@ public interface EditorEx extends Editor {
* <p/>
* Feel free to see the detailed feature
* definition <a href="http://dev.w3.org/html5/spec/Overview.html#the-placeholder-attribute">here</a>.
*
*
* @param text virtual text to show until user data is entered or the editor is focused
*/
void setPlaceholder(@Nullable CharSequence text);
@@ -196,14 +196,14 @@ public interface EditorEx extends Editor {
* <p/>
* 'Sticky selection' means that every time caret position changes, selection end offset is automatically set to the same position.
* Selection start is always caret offset on {@link #setStickySelection(boolean)} call with <code>'true'</code> argument.
*
*
* @return <code>true</code> if 'sticky selection' mode is active at the current editor; <code>false</code> otherwise
*/
boolean isStickySelection();
/**
* Allows to set current {@link #isStickySelection() sticky selection} mode.
*
*
* @param enable flag that identifies if <code>'sticky selection'</code> mode should be enabled
*/
void setStickySelection(boolean enable);
@@ -216,7 +216,7 @@ public interface EditorEx extends Editor {
/**
* Allows to define prefix to be displayed on every editor line and text attributes to use for its coloring.
*
*
* @param prefixText target prefix text
* @param attributes text attributes to use during given prefix painting
*/
@@ -227,7 +227,7 @@ public interface EditorEx extends Editor {
* @see #setPurePaintingMode(boolean)
*/
boolean isPurePaintingMode();
/**
* We often re-use the logic encapsulated at the editor. For example, every time we show editor fragment (folding, preview etc) we
* create a dedicated graphics object and ask the editor to paint into it.
@@ -236,7 +236,7 @@ public interface EditorEx extends Editor {
* (e.g. soft wraps recalculation is triggered by the paint request and newly calculated soft wraps cause caret to change its position).
* <p/>
* This method allows to inform the editor that all subsequent painting request should not change the editor state.
*
*
* @param enabled 'pure painting mode' status to use
*/
void setPurePaintingMode(boolean enabled);
@@ -4029,7 +4029,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
}
myDragOnGutterSelectionStartLine = - 1;
}
Rectangle visibleArea = getScrollingModel().getVisibleArea();
int x = e.getX();
@@ -4269,7 +4269,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
}
@Override
public void addFocusListener(@NotNull FocusChangeListener listener, Disposable parentDisposable) {
public void addFocusListener(@NotNull FocusChangeListener listener, @NotNull Disposable parentDisposable) {
ContainerUtil.add(listener, myFocusListeners, parentDisposable);
}
@@ -5352,7 +5352,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
if (event.getArea() == EditorMouseEventArea.LINE_MARKERS_AREA) {
myDragOnGutterSelectionStartLine = yPositionToLogicalLine(e.getY());
}
// On some systems (for example on Linux) popup trigger is MOUSE_PRESSED event.
// But this trigger is always consumed by popup handler. In that case we have to
// also move caret.
@@ -5504,7 +5504,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
final int oldStart = mySelectionModel.getSelectionStart();
final int oldEnd = mySelectionModel.getSelectionEnd();
// Don't move caret on mouse press above gutter line markers area (a place where break points, 'override', 'implements' etc icons
// are drawn) and annotations area. E.g. we don't want to change caret position if a user sets new break point (clicks
// at 'line markers' area).