Dave Jarvis' Repositories

Home Files Commits Tags Clone

Repository:

git clone https://repo.autonoma.ca/repo/keenwrite.git

M src/main/java/com/scrivenvar/FileEditorTab.java

 import com.scrivenvar.service.events.Notification;
 import com.scrivenvar.service.events.Notifier;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Locale.ENGLISH;
 import static javafx.application.Platform.runLater;
 /**
     setOnSelectionChanged( e -> {
       if( isSelected() ) {
         Platform.runLater( this::activated );
         runLater( this::activated );
         requestFocus();
+      }
     } );
+    }
     // Switch to the tab without loading if the contents are already in memory.
     if( getContent() != null ) {
       getEditorPane().requestFocus();
       return;
     // If the tab is devoid of content, load it.
     if( getContent() == null ) {
       readFile();
       initLayout();
       initUndoManager();
+    }
     // Load the text and update the preview before the undo manager.
     load();
     // Track undo requests -- can only be called *after* load.
     initUndoManager();
     initLayout();
     initFocus();
+  }
   private void initLayout() {
     setContent( getScrollPane() );
+  }
   private void initFocus() {
     getEditorPane().requestFocus();
+  }
   /**
    * Tracks undo requests, but can only be called <em>after</em> load.
    */
   private void initUndoManager() {
     final UndoManager<?> undoManager = getUndoManager();
     undoManager.forgetHistory();
     // Bind the editor undo manager to the properties.
     mModified.bind( Bindings.not( undoManager.atMarkedPositionProperty() ) );
     canUndo.bind( undoManager.undoAvailableProperty() );
     canRedo.bind( undoManager.redoAvailableProperty() );
+  }
   private void requestFocus() {
     getEditorPane().requestFocus();
+  }
    * Reads the entire file contents from the path associated with this tab.
    */
   private void load() {
   private void readFile() {
     final Path path = getPath();
     final File file = path.toFile();

M src/main/java/com/scrivenvar/FileEditorTabPane.java

   /**
    * Called to add a new {@link FileEditorTab} to the tab pane. The return
    * value is used when initializing the application, but isn't required.
+   *
    * @return The new {@link FileEditorTab} instance created.
    * Called to add a new {@link FileEditorTab} to the tab pane.
    */
   FileEditorTab newEditor() {
   void newEditor() {
     final FileEditorTab tab = createFileEditor( getDefaultPath() );
     getTabs().add( tab );
     getSelectionModel().select( tab );
     return tab;
+  }

M src/main/java/com/scrivenvar/editors/EditorPane.java

   @Override
   public void requestFocus() {
     runLater( () -> getEditor().requestFocus() );
     requestFocus( 3 );
+  }
   /**
    * There's a race-condition between displaying the {@link EditorPane}
    * and giving the {@link #mEditor} focus. Try to focus up to {@code max}
    * times before giving up.
+   *
    * @param max The number of attempts to try to request focus.
    */
   private void requestFocus( final int max ) {
     if( max > 0 ) {
       runLater(
           () -> {
             final var editor = getEditor();
             if( !editor.isFocused() ) {
               editor.requestFocus();
               requestFocus( max - 1 );
+            }
+          }
       );
+    }
+  }