Merge pull request #299 from JordanMartinez/removeUnneededDisposal

Remove unneeded disposal method from behavior
FXMisc · Apr 24, 2016 · 2ac5b74 · 2ac5b74
2 parents 7e55428 + da2fd32
commit 2ac5b74
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/StyledTextArea.java b/richtextfx/src/main/java/org/fxmisc/richtext/StyledTextArea.java
@@ -1007,7 +1007,6 @@ public void positionCaret(int pos) {
     public void dispose() {
         subscriptions.unsubscribe();
         model.dispose();
-        behavior.dispose();
         virtualFlow.dispose();
     }
 

diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/StyledTextAreaBehavior.java b/richtextfx/src/main/java/org/fxmisc/richtext/StyledTextAreaBehavior.java
@@ -209,9 +209,6 @@ private enum DragState {
 
     private final StyledTextAreaModel<?, ?> model;
 
-    private final Subscription subscription;
-
-
     /**
      * Indicates whether selection is being dragged by the user.
      */
@@ -241,7 +238,6 @@ private CaretOffsetX getTargetCaretOffset() {
         this.model = area.getModel();
 
         InputMapTemplate.installFallback(EVENT_TEMPLATE, this, b -> b.view);
-        subscription = () -> InputMapTemplate.uninstall(EVENT_TEMPLATE, this, b -> b.view);
 
         // setup auto-scroll
         Val<Point2D> projection = Val.combine(
@@ -264,14 +260,6 @@ private CaretOffsetX getTargetCaretOffset() {
             });
     }
 
-    /* ********************************************************************** *
-     * Public API (from Behavior)                                             *
-     * ********************************************************************** */
-
-    public void dispose() {
-        subscription.unsubscribe();
-    }
-
     /* ********************************************************************** *
      * Key handling implementation                                            *
      * ********************************************************************** */