Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Insure all public methods are overridden in interface; move interfaces to view package #631

Merged
merged 6 commits into from
Oct 27, 2017
Merged

Insure all public methods are overridden in interface; move interfaces to view package #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4ebbd48
Move event classes and helpers to own package
JordanMartinez Oct 27, 2017
4359071
Remove unneeded import
JordanMartinez Oct 27, 2017
b6e26cd
Close UndoManager on dispose to prevent possible memory leak
JordanMartinez Oct 27, 2017
b637287
Move TextEditingArea and its *Actions interfaces into view package
JordanMartinez Oct 27, 2017
343499b
Move public methods declarations to interfaces and override them in GSA
JordanMartinez Oct 27, 2017
1e550d9
Rename navigator to clarify usage; remove middle-man method
JordanMartinez Oct 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion richtextfx-demos/src/main/java/org/fxmisc/richtext/demo/TooltipDemo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import javafx.stage.Popup;
import javafx.stage.Stage;

import org.fxmisc.richtext.MouseOverTextEvent;
import org.fxmisc.richtext.event.MouseOverTextEvent;
import org.fxmisc.richtext.StyleClassedTextArea;

public class TooltipDemo extends Application {
Expand Down
2 changes: 1 addition & 1 deletion richtextfx/src/integrationTest/java/org/fxmisc/richtext/api/HitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import javafx.geometry.Pos;
import javafx.stage.Stage;
import org.fxmisc.richtext.InlineCssTextAreaAppTest;
import org.fxmisc.richtext.model.NavigationActions;
import org.fxmisc.richtext.NavigationActions;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down
2 changes: 1 addition & 1 deletion richtextfx/src/integrationTest/java/org/fxmisc/richtext/api/MouseOverTextDelayTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import javafx.geometry.Pos;
import javafx.stage.Stage;
import org.fxmisc.richtext.InlineCssTextAreaAppTest;
import org.fxmisc.richtext.MouseOverTextEvent;
import org.fxmisc.richtext.event.MouseOverTextEvent;
import org.junit.Ignore;
import org.junit.Test;

Expand Down
2 changes: 1 addition & 1 deletion richtextfx/src/integrationTest/java/org/fxmisc/richtext/keyboard/DeletionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import static javafx.scene.input.KeyCode.BACK_SPACE;
import static javafx.scene.input.KeyCode.DELETE;
import static javafx.scene.input.KeyCode.SHORTCUT;
import static org.fxmisc.richtext.model.NavigationActions.SelectionPolicy.CLEAR;
import static org.fxmisc.richtext.NavigationActions.SelectionPolicy.CLEAR;
import static org.junit.Assert.assertEquals;

@RunWith(NestedRunner.class)
Expand Down
2 changes: 1 addition & 1 deletion richtextfx/src/main/java/org/fxmisc/richtext/Caret.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public static enum CaretVisibility {
* This method can be used to achieve the special case of positioning the caret outside or inside the selection,
* as opposed to always being at the boundary. Use with care.
*
* <p><b>Caution:</b> see {@link org.fxmisc.richtext.model.TextEditingArea#getAbsolutePosition(int, int)} to
* <p><b>Caution:</b> see {@link TextEditingArea#getAbsolutePosition(int, int)} to
* know how the column index argument can affect the returned position.</p>
*/
public void moveTo(int paragraphIndex, int columnPosition);
Expand Down
7 changes: 3 additions & 4 deletions richtextfx/src/main/java/org/fxmisc/richtext/CaretSelectionBind.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import javafx.beans.value.ObservableValue;
import javafx.scene.control.IndexRange;
import org.fxmisc.richtext.model.NavigationActions;
import org.fxmisc.richtext.model.StyledDocument;

import java.text.BreakIterator;
Expand Down Expand Up @@ -103,7 +102,7 @@ default void moveTo(int position) {

/**
* Moves the caret to the position returned from
* {@link org.fxmisc.richtext.model.TextEditingArea#getAbsolutePosition(int, int)}
* {@link TextEditingArea#getAbsolutePosition(int, int)}
* and clears any selection.
*/
@Override
Expand Down Expand Up @@ -176,7 +175,7 @@ default void moveToNextChar() {
* Selects the given range and moves the caret to either the start of the new selection if the anchor was equal to
* the original start or the end if the anchor was equal to the original end
*
* <p><b>Caution:</b> see {@link org.fxmisc.richtext.model.TextEditingArea#getAbsolutePosition(int, int)} to
* <p><b>Caution:</b> see {@link TextEditingArea#getAbsolutePosition(int, int)} to
* know how the column index argument can affect the returned position.</p>
*/
@Override
Expand Down Expand Up @@ -292,7 +291,7 @@ else if(pos >= sel.getEnd())

/**
* Moves the caret to the position returned from
* {@link org.fxmisc.richtext.model.TextEditingArea#getAbsolutePosition(int, int)}.
* {@link TextEditingArea#getAbsolutePosition(int, int)}.
*/
void moveTo(int paragraphIndex, int columnIndex, NavigationActions.SelectionPolicy selectionPolicy);

Expand Down
1 change: 0 additions & 1 deletion richtextfx/src/main/java/org/fxmisc/richtext/CaretSelectionBindImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import javafx.beans.value.ObservableValue;
import javafx.geometry.Bounds;
import javafx.scene.control.IndexRange;
import org.fxmisc.richtext.model.NavigationActions;
import org.fxmisc.richtext.model.StyledDocument;
import org.reactfx.Subscription;
import org.reactfx.Suspendable;
Expand Down
2 changes: 0 additions & 2 deletions richtextfx/src/main/java/org/fxmisc/richtext/ClipboardActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,10 @@
import javafx.scene.input.DataFormat;

import org.fxmisc.richtext.model.Codec;
import org.fxmisc.richtext.model.EditActions;
import org.fxmisc.richtext.model.ReadOnlyStyledDocument;
import org.fxmisc.richtext.model.SegmentOps;
import org.fxmisc.richtext.model.StyledDocument;
import org.fxmisc.richtext.model.StyledSegment;
import org.fxmisc.richtext.model.TextEditingArea;
import org.reactfx.util.Tuple2;

/**
Expand Down
4 changes: 2 additions & 2 deletions ...rg/fxmisc/richtext/model/EditActions.java → ...java/org/fxmisc/richtext/EditActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.fxmisc.richtext.model;
package org.fxmisc.richtext;

import javafx.scene.control.IndexRange;
import org.fxmisc.richtext.GenericStyledArea;
import org.fxmisc.richtext.model.StyledDocument;

/**
* Specifies actions for editing the content of a {@link TextEditingArea}.
Expand Down
Loading