Dave Jarvis' Repositories

Home Files Commits Tags Clone

Repository:

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

M build.gradle

 version = '1.0.12'
 version = '1.0.13'
 apply plugin: 'java'

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

   public static final String STATUS_BAR_LINE = "Main.statusbar.line";
   // "OK" text
   public static final String STATUS_BAR_DEFAULT = get( "Main.statusbar.state.default" );
   public static final String STATUS_BAR_DEFAULT = Messages.get( "Main.statusbar.state.default" );
   public static final String STATUS_PARSE_ERROR = "Main.statusbar.parse.error";
+}

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

 import com.scrivenvar.service.Options;
 import com.scrivenvar.service.Snitch;
 import com.scrivenvar.service.events.Notifier;
 import com.scrivenvar.util.StageState;
 import java.util.logging.LogManager;
 import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
 import com.scrivenvar.service.events.Notifier;
 /**
   public static void main( final String[] args ) {
     initLogger();
     initPreferences();
     launch( args );
+  }
   /**
    * Prevents JavaFX from logging to standard error.
+   *
    * @see http://stackoverflow.com/a/41476462/59087
    */
   private static void initLogger() {
     LogManager.getLogManager().reset();
+  }
    */
   private void initNotifyService() {
     final Notifier service = Services.load(Notifier.class );
     service.addObserver( getMainWindow() );
     final Notifier notifier = Services.load( Notifier.class );
     notifier.addObserver( getMainWindow() );
+  }

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

         setProcessors( null );
         // Will create new processors and therefore a new resolved map.
         refreshSelectedTab( getActiveFileEditor() );
         updateDefinitionPane();
+      }
     );
+  }
   /**
    * When tabs are added, hook the various change listeners onto the new tab so
    * that the preview pane refreshes as necessary.
    */
   private void initTabAddedListener() {
     final FileEditorTabPane editorPane = getFileEditorPane();
     // Make sure the text processor kicks off when new files are opened.
     final ObservableList<Tab> tabs = editorPane.getTabs();
     // Update the preview pane on tab changes.
     tabs.addListener(
       (final Change<? extends Tab> change) -> {
         while( change.next() ) {
           if( change.wasAdded() ) {
             // Multiple tabs can be added simultaneously.
             for( final Tab newTab : change.getAddedSubList() ) {
               final FileEditorTab tab = (FileEditorTab)newTab;
               initTextChangeListener( tab );
               initCaretParagraphListener( tab );
               initVariableNameInjector( tab );
 //              initSyntaxListener( tab );
+            }
+          }
+        }
+      }
     );
+  }
   /**
    * Reloads the preferences from the previous load.
    */
   private void initPreferences() {
     restoreDefinitionSource();
     getFileEditorPane().restorePreferences();
     updateDefinitionPane();
+  }
   /**
    * Listen for new tab selection events.
    */
   private void initTabChangedListener() {
     final FileEditorTabPane editorPane = getFileEditorPane();
     // Update the preview pane changing tabs.
     editorPane.addTabSelectionListener(
       (ObservableValue<? extends Tab> tabPane,
         final Tab oldTab, final Tab newTab) -> {
         // If there was no old tab, then this is a first time load, which
         // can be ignored.
         if( oldTab != null ) {
           if( newTab == null ) {
             closeRemainingTab();
+          }
           else {
             // Update the preview with the edited text.
             refreshSelectedTab( (FileEditorTab)newTab );
+          }
+        }
+      }
     );
+  }
   private void initTextChangeListener( final FileEditorTab tab ) {
     tab.addTextChangeListener(
       (ObservableValue<? extends String> editor,
         final String oldValue, final String newValue) -> {
         refreshSelectedTab( tab );
+      }
     );
+  }
   private void initCaretParagraphListener( final FileEditorTab tab ) {
     tab.addCaretParagraphListener(
       (ObservableValue<? extends Integer> editor,
         final Integer oldValue, final Integer newValue) -> {
         refreshSelectedTab( tab );
+      }
     );
+  }
   private void initVariableNameInjector( final FileEditorTab tab ) {
     VariableNameInjector.listen( tab, getDefinitionPane() );
+  }
   /**
    * Watch for changes to external files. In particular, this awaits
    * modifications to any XSL files associated with XML files being edited. When
    * an XSL file is modified (external to the application), the snitch's ears
    * perk up and the file is reloaded. This keeps the XSL transformation up to
    * date with what's on the file system.
    */
   private void initSnitch() {
     getSnitch().addObserver( this );
+  }
   /**
    * Called whenever the preview pane becomes out of sync with the file editor
    * tab. This can be called when the text changes, the caret paragraph changes,
    * or the file tab changes.
+   *
    * @param tab The file editor tab that has been changed in some fashion.
    */
   private void refreshSelectedTab( final FileEditorTab tab ) {
     if( tab.isFileOpen() ) {
       getPreviewPane().setPath( tab.getPath() );
       // TODO: https://github.com/DaveJarvis/scrivenvar/issues/29
       final Position p = tab.getCaretOffset();
       getLineNumberText().setText(
         get( STATUS_BAR_LINE, p.getMajor() + 1, p.getMinor() + 1 )
       );
       Processor<String> processor = getProcessors().get( tab );
       if( processor == null ) {
         processor = createProcessor( tab );
         getProcessors().put( tab, processor );
+      }
       try {
         processor.processChain( tab.getEditorText() );
         getNotifier().clear();
       } catch( final Exception ex ) {
         error( ex );
+      }
+    }
+  }
   /**
    * Returns the variable map of interpolated definitions.
+   *
    * @return A map to help dereference variables.
    */
   private Map<String, String> getResolvedMap() {
     return getDefinitionSource().getResolvedMap();
+  }
   /**
    * Returns the root node for the hierarchical definition source.
+   *
    * @return Data to display in the definition pane.
    */
   private TreeView<String> getTreeView() {
     try {
       return getDefinitionSource().asTreeView();
     } catch( Exception e ) {
       error( e );
+    }
     return new TreeView<>();
+  }
   /**
    * Called when a definition source is opened.
+   *
    * @param path Path to the definition source that was opened.
    */
   private void openDefinition( final Path path ) {
     try {
       final DefinitionSource ds = createDefinitionSource( path.toString() );
       setDefinitionSource( ds );
       storeDefinitionSource();
       updateDefinitionPane();
     } catch( final Exception e ) {
       error( e );
+    }
+  }
   private void updateDefinitionPane() {
     getDefinitionPane().setRoot( getDefinitionSource().asTreeView() );
+  }
   private void restoreDefinitionSource() {
     final Preferences preferences = getPreferences();
     final String source = preferences.get( PREFS_DEFINITION_SOURCE, null );
     // If there's no definition source set, don't try to load it.
     if( source != null ) {
       setDefinitionSource( createDefinitionSource( source ) );
+    }
+  }
   private void storeDefinitionSource() {
     final Preferences preferences = getPreferences();
     final DefinitionSource ds = getDefinitionSource();
     preferences.put( PREFS_DEFINITION_SOURCE, ds.toString() );
+  }
   /**
    * Called when the last open tab is closed to clear the preview pane.
    */
   private void closeRemainingTab() {
     getPreviewPane().clear();
+  }
   /**
    * Called when an exception occurs that warrants the user's attention.
+   *
    * @param e The exception with a message that the user should know about.
    */
   private void error( final Exception e ) {
     getNotifier().notify( e );
+  }
   //---- File actions -------------------------------------------------------
   /**
    * Called when an observable instance has changed. This includes the snitch
    * service and the notify service.
+   *
    * @param observable The observed instance.
    * @param value The noteworthy item.
    */
   @Override
   public void update( final Observable observable, final Object value ) {
     if( value != null ) {
       if( observable instanceof Snitch && value instanceof Path ) {
         update( (Path)value );
+      }
       else if( observable instanceof Notifier && value instanceof String ) {
         final String s = (String)value;
         final int index = s.indexOf( '\n' );
         final String message = s.substring( 0, index > 0 ? index : s.length() );
         getStatusBar().setText( message );
+      }
+    }
+  }
   /**
    * Called when a file has been modified.
+   *
    * @param file Path to the modified file.
    */
   private void update( final Path file ) {
     // Avoid throwing IllegalStateException by running from a non-JavaFX thread.
     Platform.runLater(
       () -> {
         // Brute-force XSLT file reload by re-instantiating all processors.
         resetProcessors();
         refreshSelectedTab( getActiveFileEditor() );
+      }
     );
+  }
   /**
    * After resetting the processors, they will refresh anew to be up-to-date
    * with the files (text and definition) currently loaded into the editor.
    */
   private void resetProcessors() {
     getProcessors().clear();
+  }
   //---- File actions -------------------------------------------------------
   private void fileNew() {
     getFileEditorPane().newEditor();
+  }
   private void fileOpen() {
     getFileEditorPane().openFileDialog();
+  }
   private void fileClose() {
     getFileEditorPane().closeEditor( getActiveFileEditor(), true );
+  }
   private void fileCloseAll() {
     getFileEditorPane().closeAllEditors();
+  }
   private void fileSave() {
     getFileEditorPane().saveEditor( getActiveFileEditor() );
+  }
   private void fileSaveAll() {
     getFileEditorPane().saveAllEditors();
+  }
   private void fileExit() {
     final Window window = getWindow();
     fireEvent( window, new WindowEvent( window, WINDOW_CLOSE_REQUEST ) );
+  }
   //---- Help actions -------------------------------------------------------
   private void helpAbout() {
     Alert alert = new Alert( AlertType.INFORMATION );
     alert.setTitle( get( "Dialog.about.title" ) );
     alert.setHeaderText( get( "Dialog.about.header" ) );
     alert.setContentText( get( "Dialog.about.content" ) );
     alert.setGraphic( new ImageView( new Image( FILE_LOGO_32 ) ) );
     alert.initOwner( getWindow() );
     alert.showAndWait();
+  }
   //---- Convenience accessors ----------------------------------------------
   private float getFloat( final String key, final float defaultValue ) {
     return getPreferences().getFloat( key, defaultValue );
+  }
   private Preferences getPreferences() {
     return getOptions().getState();
+  }
   protected Scene getScene() {
     if( this.scene == null ) {
       this.scene = createScene();
+    }
     return this.scene;
+  }
   public Window getWindow() {
     return getScene().getWindow();
+  }
   private MarkdownEditorPane getActiveEditor() {
     final EditorPane pane = getActiveFileEditor().getEditorPane();
     return pane instanceof MarkdownEditorPane ? (MarkdownEditorPane)pane : null;
+  }
   private FileEditorTab getActiveFileEditor() {
     return getFileEditorPane().getActiveFileEditor();
+  }
   //---- Member accessors ---------------------------------------------------
   private void setScene( Scene scene ) {
     this.scene = scene;
+  }
   private void setProcessors( final Map<FileEditorTab, Processor<String>> map ) {
     this.processors = map;
+  }
   private Map<FileEditorTab, Processor<String>> getProcessors() {
     if( this.processors == null ) {
       setProcessors( new HashMap<>() );
+    }
     return this.processors;
+  }
   private FileEditorTabPane getFileEditorPane() {
     if( this.fileEditorPane == null ) {
       this.fileEditorPane = createFileEditorPane();
+    }
     return this.fileEditorPane;
+  }
   private HTMLPreviewPane getPreviewPane() {
     if( this.previewPane == null ) {
       this.previewPane = createPreviewPane();
+    }
     return this.previewPane;
+  }
   private void setDefinitionSource( final DefinitionSource definitionSource ) {
     this.definitionSource = definitionSource;
+  }
   private DefinitionSource getDefinitionSource() {
     if( this.definitionSource == null ) {
       this.definitionSource = new EmptyDefinitionSource();
+    }
     return this.definitionSource;
+  }
   private DefinitionPane getDefinitionPane() {
     if( this.definitionPane == null ) {
       this.definitionPane = createDefinitionPane();
+    }
     return this.definitionPane;
+  }
   private Options getOptions() {
     return this.options;
+  }
   private Snitch getSnitch() {
     return this.snitch;
+  }
   private Notifier getNotifier() {
     return this.notifier;
+  }
   public void setMenuBar( final MenuBar menuBar ) {
     this.menuBar = menuBar;
+  }
   public MenuBar getMenuBar() {
     return this.menuBar;
+  }
   private Text getLineNumberText() {
     if( this.lineNumberText == null ) {
       this.lineNumberText = createLineNumberText();
+    }
     return this.lineNumberText;
+  }
   private synchronized StatusBar getStatusBar() {
     if( this.statusBar == null ) {
       this.statusBar = createStatusBar();
+    }
     return this.statusBar;
+  }
   //---- Member creators ----------------------------------------------------
   /**
    * Factory to create processors that are suited to different file types.
+   *
    * @param tab The tab that is subjected to processing.
+   *
    * @return A processor suited to the file type specified by the tab's path.
    */
   private Processor<String> createProcessor( final FileEditorTab tab ) {
     return createProcessorFactory().createProcessor( tab );
+  }
   private ProcessorFactory createProcessorFactory() {
     return new ProcessorFactory( getPreviewPane(), getResolvedMap() );
+  }
   private DefinitionSource createDefinitionSource( final String path ) {
     return createDefinitionFactory().createDefinitionSource( path );
+  }
   /**
    * Create an editor pane to hold file editor tabs.
+   *
    * @return A new instance, never null.
    */
   private FileEditorTabPane createFileEditorPane() {
     return new FileEditorTabPane();
+  }
   private HTMLPreviewPane createPreviewPane() {
     return new HTMLPreviewPane();
+  }
   private DefinitionPane createDefinitionPane() {
     return new DefinitionPane( getTreeView() );
+  }
   private DefinitionFactory createDefinitionFactory() {
     return new DefinitionFactory();
+  }
   private StatusBar createStatusBar() {
     return new StatusBar();
+  }
   private Scene createScene() {
     final SplitPane splitPane = new SplitPane(
       getDefinitionPane().getNode(),
       getFileEditorPane().getNode(),
       getPreviewPane().getNode() );
     splitPane.setDividerPositions(
       getFloat( K_PANE_SPLIT_DEFINITION, .10f ),
       getFloat( K_PANE_SPLIT_EDITOR, .45f ),
       getFloat( K_PANE_SPLIT_PREVIEW, .45f ) );
     // See: http://broadlyapplicable.blogspot.ca/2015/03/javafx-capture-restorePreferences-splitpane.html
     final BorderPane borderPane = new BorderPane();
     borderPane.setPrefSize( 1024, 800 );
     borderPane.setTop( createMenuBar() );
     borderPane.setBottom( getStatusBar() );
     borderPane.setCenter( splitPane );
     final VBox box = new VBox();
     box.setAlignment( Pos.BASELINE_CENTER );
     box.getChildren().add( getLineNumberText() );
     getStatusBar().getRightItems().add( box );
     return new Scene( borderPane );
+  }
   private Text createLineNumberText() {
     return new Text( get( STATUS_BAR_LINE, 1, 1 ) );
         updateDefinitionPane();
         // Will create new processors and therefore a new resolved map.
         refreshSelectedTab( getActiveFileEditor() );
+      }
     );
+  }
   /**
    * When tabs are added, hook the various change listeners onto the new tab so
    * that the preview pane refreshes as necessary.
    */
   private void initTabAddedListener() {
     final FileEditorTabPane editorPane = getFileEditorPane();
     // Make sure the text processor kicks off when new files are opened.
     final ObservableList<Tab> tabs = editorPane.getTabs();
     // Update the preview pane on tab changes.
     tabs.addListener(
       (final Change<? extends Tab> change) -> {
         while( change.next() ) {
           if( change.wasAdded() ) {
             // Multiple tabs can be added simultaneously.
             for( final Tab newTab : change.getAddedSubList() ) {
               final FileEditorTab tab = (FileEditorTab)newTab;
               initTextChangeListener( tab );
               initCaretParagraphListener( tab );
               initVariableNameInjector( tab );
 //              initSyntaxListener( tab );
+            }
+          }
+        }
+      }
     );
+  }
   /**
    * Reloads the preferences from the previous load.
    */
   private void initPreferences() {
     restoreDefinitionSource();
     getFileEditorPane().restorePreferences();
     updateDefinitionPane();
+  }
   /**
    * Listen for new tab selection events.
    */
   private void initTabChangedListener() {
     final FileEditorTabPane editorPane = getFileEditorPane();
     // Update the preview pane changing tabs.
     editorPane.addTabSelectionListener(
       (ObservableValue<? extends Tab> tabPane,
         final Tab oldTab, final Tab newTab) -> {
         // If there was no old tab, then this is a first time load, which
         // can be ignored.
         if( oldTab != null ) {
           if( newTab == null ) {
             closeRemainingTab();
+          }
           else {
             // Update the preview with the edited text.
             refreshSelectedTab( (FileEditorTab)newTab );
+          }
+        }
+      }
     );
+  }
   private void initTextChangeListener( final FileEditorTab tab ) {
     tab.addTextChangeListener(
       (ObservableValue<? extends String> editor,
         final String oldValue, final String newValue) -> {
         refreshSelectedTab( tab );
+      }
     );
+  }
   private void initCaretParagraphListener( final FileEditorTab tab ) {
     tab.addCaretParagraphListener(
       (ObservableValue<? extends Integer> editor,
         final Integer oldValue, final Integer newValue) -> {
         refreshSelectedTab( tab );
+      }
     );
+  }
   private void initVariableNameInjector( final FileEditorTab tab ) {
     VariableNameInjector.listen( tab, getDefinitionPane() );
+  }
   /**
    * Watch for changes to external files. In particular, this awaits
    * modifications to any XSL files associated with XML files being edited. When
    * an XSL file is modified (external to the application), the snitch's ears
    * perk up and the file is reloaded. This keeps the XSL transformation up to
    * date with what's on the file system.
    */
   private void initSnitch() {
     getSnitch().addObserver( this );
+  }
   /**
    * Called whenever the preview pane becomes out of sync with the file editor
    * tab. This can be called when the text changes, the caret paragraph changes,
    * or the file tab changes.
+   *
    * @param tab The file editor tab that has been changed in some fashion.
    */
   private void refreshSelectedTab( final FileEditorTab tab ) {
     if( tab.isFileOpen() ) {
       getPreviewPane().setPath( tab.getPath() );
       // TODO: https://github.com/DaveJarvis/scrivenvar/issues/29
       final Position p = tab.getCaretOffset();
       getLineNumberText().setText(
         get( STATUS_BAR_LINE,
           p.getMajor() + 1,
           p.getMinor() + 1,
           tab.getCaretPosition() + 1
+        )
       );
       Processor<String> processor = getProcessors().get( tab );
       if( processor == null ) {
         processor = createProcessor( tab );
         getProcessors().put( tab, processor );
+      }
       try {
         getNotifier().clear();
         processor.processChain( tab.getEditorText() );
       } catch( final Exception ex ) {
         error( ex );
+      }
+    }
+  }
   /**
    * Returns the variable map of interpolated definitions.
+   *
    * @return A map to help dereference variables.
    */
   private Map<String, String> getResolvedMap() {
     return getDefinitionSource().getResolvedMap();
+  }
   /**
    * Returns the root node for the hierarchical definition source.
+   *
    * @return Data to display in the definition pane.
    */
   private TreeView<String> getTreeView() {
     try {
       return getDefinitionSource().asTreeView();
     } catch( Exception e ) {
       error( e );
+    }
     // Slightly redundant as getDefinitionSource() might have returned an
     // empty definition source.
     return (new EmptyDefinitionSource()).asTreeView();
+  }
   /**
    * Called when a definition source is opened.
+   *
    * @param path Path to the definition source that was opened.
    */
   private void openDefinition( final Path path ) {
     try {
       final DefinitionSource ds = createDefinitionSource( path.toString() );
       setDefinitionSource( ds );
       storeDefinitionSource();
       updateDefinitionPane();
     } catch( final Exception e ) {
       error( e );
+    }
+  }
   private void updateDefinitionPane() {
     getDefinitionPane().setRoot( getDefinitionSource().asTreeView() );
+  }
   private void restoreDefinitionSource() {
     final Preferences preferences = getPreferences();
     final String source = preferences.get( PREFS_DEFINITION_SOURCE, null );
     // If there's no definition source set, don't try to load it.
     if( source != null ) {
       setDefinitionSource( createDefinitionSource( source ) );
+    }
+  }
   private void storeDefinitionSource() {
     final Preferences preferences = getPreferences();
     final DefinitionSource ds = getDefinitionSource();
     preferences.put( PREFS_DEFINITION_SOURCE, ds.toString() );
+  }
   /**
    * Called when the last open tab is closed to clear the preview pane.
    */
   private void closeRemainingTab() {
     getPreviewPane().clear();
+  }
   /**
    * Called when an exception occurs that warrants the user's attention.
+   *
    * @param e The exception with a message that the user should know about.
    */
   private void error( final Exception e ) {
     getNotifier().notify( e );
+  }
   //---- File actions -------------------------------------------------------
   /**
    * Called when an observable instance has changed. This includes the snitch
    * service and the notify service.
+   *
    * @param observable The observed instance.
    * @param value The noteworthy item.
    */
   @Override
   public void update( final Observable observable, final Object value ) {
     if( value != null ) {
       if( observable instanceof Snitch && value instanceof Path ) {
         update( (Path)value );
+      }
       else if( observable instanceof Notifier && value instanceof String ) {
         final String s = (String)value;
         final int index = s.indexOf( '\n' );
         final String message = s.substring( 0, index > 0 ? index : s.length() );
         getStatusBar().setText( message );
+      }
+    }
+  }
   /**
    * Called when a file has been modified.
+   *
    * @param file Path to the modified file.
    */
   private void update( final Path file ) {
     // Avoid throwing IllegalStateException by running from a non-JavaFX thread.
     Platform.runLater(
       () -> {
         // Brute-force XSLT file reload by re-instantiating all processors.
         resetProcessors();
         refreshSelectedTab( getActiveFileEditor() );
+      }
     );
+  }
   /**
    * After resetting the processors, they will refresh anew to be up-to-date
    * with the files (text and definition) currently loaded into the editor.
    */
   private void resetProcessors() {
     getProcessors().clear();
+  }
   //---- File actions -------------------------------------------------------
   private void fileNew() {
     getFileEditorPane().newEditor();
+  }
   private void fileOpen() {
     getFileEditorPane().openFileDialog();
+  }
   private void fileClose() {
     getFileEditorPane().closeEditor( getActiveFileEditor(), true );
+  }
   private void fileCloseAll() {
     getFileEditorPane().closeAllEditors();
+  }
   private void fileSave() {
     getFileEditorPane().saveEditor( getActiveFileEditor() );
+  }
   private void fileSaveAll() {
     getFileEditorPane().saveAllEditors();
+  }
   private void fileExit() {
     final Window window = getWindow();
     fireEvent( window, new WindowEvent( window, WINDOW_CLOSE_REQUEST ) );
+  }
   //---- Help actions -------------------------------------------------------
   private void helpAbout() {
     Alert alert = new Alert( AlertType.INFORMATION );
     alert.setTitle( get( "Dialog.about.title" ) );
     alert.setHeaderText( get( "Dialog.about.header" ) );
     alert.setContentText( get( "Dialog.about.content" ) );
     alert.setGraphic( new ImageView( new Image( FILE_LOGO_32 ) ) );
     alert.initOwner( getWindow() );
     alert.showAndWait();
+  }
   //---- Convenience accessors ----------------------------------------------
   private float getFloat( final String key, final float defaultValue ) {
     return getPreferences().getFloat( key, defaultValue );
+  }
   private Preferences getPreferences() {
     return getOptions().getState();
+  }
   protected Scene getScene() {
     if( this.scene == null ) {
       this.scene = createScene();
+    }
     return this.scene;
+  }
   public Window getWindow() {
     return getScene().getWindow();
+  }
   private MarkdownEditorPane getActiveEditor() {
     final EditorPane pane = getActiveFileEditor().getEditorPane();
     return pane instanceof MarkdownEditorPane ? (MarkdownEditorPane)pane : null;
+  }
   private FileEditorTab getActiveFileEditor() {
     return getFileEditorPane().getActiveFileEditor();
+  }
   //---- Member accessors ---------------------------------------------------
   private void setScene( Scene scene ) {
     this.scene = scene;
+  }
   private void setProcessors( final Map<FileEditorTab, Processor<String>> map ) {
     this.processors = map;
+  }
   private Map<FileEditorTab, Processor<String>> getProcessors() {
     if( this.processors == null ) {
       setProcessors( new HashMap<>() );
+    }
     return this.processors;
+  }
   private FileEditorTabPane getFileEditorPane() {
     if( this.fileEditorPane == null ) {
       this.fileEditorPane = createFileEditorPane();
+    }
     return this.fileEditorPane;
+  }
   private HTMLPreviewPane getPreviewPane() {
     if( this.previewPane == null ) {
       this.previewPane = createPreviewPane();
+    }
     return this.previewPane;
+  }
   private void setDefinitionSource( final DefinitionSource definitionSource ) {
     this.definitionSource = definitionSource;
+  }
   private DefinitionSource getDefinitionSource() {
     if( this.definitionSource == null ) {
       this.definitionSource = new EmptyDefinitionSource();
+    }
     return this.definitionSource;
+  }
   private DefinitionPane getDefinitionPane() {
     if( this.definitionPane == null ) {
       this.definitionPane = createDefinitionPane();
+    }
     return this.definitionPane;
+  }
   private Options getOptions() {
     return this.options;
+  }
   private Snitch getSnitch() {
     return this.snitch;
+  }
   private Notifier getNotifier() {
     return this.notifier;
+  }
   public void setMenuBar( final MenuBar menuBar ) {
     this.menuBar = menuBar;
+  }
   public MenuBar getMenuBar() {
     return this.menuBar;
+  }
   private Text getLineNumberText() {
     if( this.lineNumberText == null ) {
       this.lineNumberText = createLineNumberText();
+    }
     return this.lineNumberText;
+  }
   private synchronized StatusBar getStatusBar() {
     if( this.statusBar == null ) {
       this.statusBar = createStatusBar();
+    }
     return this.statusBar;
+  }
   //---- Member creators ----------------------------------------------------
   /**
    * Factory to create processors that are suited to different file types.
+   *
    * @param tab The tab that is subjected to processing.
+   *
    * @return A processor suited to the file type specified by the tab's path.
    */
   private Processor<String> createProcessor( final FileEditorTab tab ) {
     return createProcessorFactory().createProcessor( tab );
+  }
   private ProcessorFactory createProcessorFactory() {
     return new ProcessorFactory( getPreviewPane(), getResolvedMap() );
+  }
   private DefinitionSource createDefinitionSource( final String path ) {
     return createDefinitionFactory().createDefinitionSource( path );
+  }
   /**
    * Create an editor pane to hold file editor tabs.
+   *
    * @return A new instance, never null.
    */
   private FileEditorTabPane createFileEditorPane() {
     return new FileEditorTabPane();
+  }
   private HTMLPreviewPane createPreviewPane() {
     return new HTMLPreviewPane();
+  }
   private DefinitionPane createDefinitionPane() {
     return new DefinitionPane( getTreeView() );
+  }
   private DefinitionFactory createDefinitionFactory() {
     return new DefinitionFactory();
+  }
   private StatusBar createStatusBar() {
     return new StatusBar();
+  }
   private Scene createScene() {
     final SplitPane splitPane = new SplitPane(
       getDefinitionPane().getNode(),
       getFileEditorPane().getNode(),
       getPreviewPane().getNode() );
     splitPane.setDividerPositions(
       getFloat( K_PANE_SPLIT_DEFINITION, .10f ),
       getFloat( K_PANE_SPLIT_EDITOR, .45f ),
       getFloat( K_PANE_SPLIT_PREVIEW, .45f ) );
     // See: http://broadlyapplicable.blogspot.ca/2015/03/javafx-capture-restorePreferences-splitpane.html
     final BorderPane borderPane = new BorderPane();
     borderPane.setPrefSize( 1024, 800 );
     borderPane.setTop( createMenuBar() );
     borderPane.setBottom( getStatusBar() );
     borderPane.setCenter( splitPane );
     final VBox box = new VBox();
     box.setAlignment( Pos.BASELINE_CENTER );
     box.getChildren().add( getLineNumberText() );
     getStatusBar().getRightItems().add( box );
     return new Scene( borderPane );
+  }
   private Text createLineNumberText() {
     return new Text( get( STATUS_BAR_LINE, 1, 1, 1 ) );
+  }

M src/main/java/com/scrivenvar/definition/AbstractDefinitionSource.java

 package com.scrivenvar.definition;
 import javafx.scene.control.TreeView;
 /**
  * Implements common behaviour for definition sources.
+ *
+ *
  * @author White Magic Software, Ltd.
  */
 public abstract class AbstractDefinitionSource implements DefinitionSource {
   private TreeView<String> treeView;
   /**
    * Returns this definition source as an editable graphical user interface
    * component.
+   *
    * @return The TreeView for this definition source.
    */
   @Override
   public TreeView<String> asTreeView() {
     if( this.treeView == null ) {
       this.treeView = createTreeView();
       this.treeView.setEditable( true );
       this.treeView.setCellFactory(
         (TreeView<String> t) -> new TextFieldTreeCell()
       );
+    }
     return this.treeView;
+  }
   /**
    * Creates a newly instantiated tree view ready for adding to the definition
    * pane.
+   *
    * @return A new tree view instance, never null.
    */
   protected abstract TreeView<String> createTreeView();
+}

M src/main/java/com/scrivenvar/definition/DefinitionPane.java

    * root node of the given
+   *
    * @param treeView The treeview containing a new root node; if the parameter
    * @param treeView The tree view containing a new root node; if the parameter
    * is null, the tree is cleared.
    */
   public void setRoot( final TreeView<String> treeView ) {
     getTreeView().setRoot( treeView == null ? null : treeView.getRoot() );
+  }
   /**
    * Clears the treeview by setting the root node to null.
    * Clears the tree view by setting the root node to null.
    */
   public void clear() {

M src/main/java/com/scrivenvar/definition/EmptyDefinitionSource.java

  }

  @Override
  public TreeView<String> asTreeView() {
    return new TreeView<>();
  }

  @Override
  public Map<String, String> getResolvedMap() {
    return new HashMap<>();
  }

  @Override
  protected TreeView<String> createTreeView() {
    return new TreeView<>();
  }
}

A src/main/java/com/scrivenvar/definition/TextFieldTreeCell.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition;
 import static com.scrivenvar.Messages.get;
 import javafx.event.ActionEvent;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.TextField;
 import javafx.scene.control.TreeCell;
 import javafx.scene.control.TreeItem;
 import static javafx.scene.input.KeyCode.ENTER;
 import static javafx.scene.input.KeyCode.ESCAPE;
 import javafx.scene.input.KeyEvent;
 /**
  * Provides behaviour of adding, removing, and editing tree view items.
+ *
  * @author White Magic Software, Ltd.
  */
 public class TextFieldTreeCell extends TreeCell<String> {
   private TextField textField;
   private final ContextMenu editMenu = new ContextMenu();
   public TextFieldTreeCell() {
     initEditMenu();
+  }
   private void initEditMenu() {
     final MenuItem addItem = createMenuItem( "Definition.menu.add" );
     final MenuItem removeItem = createMenuItem( "Definition.menu.remove" );
     addItem.setOnAction( (ActionEvent e) -> {
       final VariableTreeItem<String> treeItem = new VariableTreeItem<>( "Undefined" );
       getTreeItem().getChildren().add( treeItem );
     } );
     removeItem.setOnAction( (ActionEvent e) -> {
       final TreeItem c = getTreeItem();
       boolean remove = c.getParent().getChildren().remove( c );
       System.out.println( "Remove" );
     } );
     getEditMenu().getItems().add( addItem );
     getEditMenu().getItems().add( removeItem );
+  }
   private ContextMenu getEditMenu() {
     return this.editMenu;
+  }
   private MenuItem createMenuItem( String label ) {
     return new MenuItem( get( label ) );
+  }
   @Override
   public void startEdit() {
     if( getTreeItem().isLeaf() ) {
       super.startEdit();
       final TextField inputField = getTextField();
       setText( null );
       setGraphic( inputField );
       inputField.selectAll();
       inputField.requestFocus();
+    }
+  }
   @Override
   public void cancelEdit() {
     super.cancelEdit();
     setText( (String)getItem() );
     setGraphic( getTreeItem().getGraphic() );
+  }
   @Override
   public void updateItem( String item, boolean empty ) {
     super.updateItem( item, empty );
     if( empty ) {
       setText( null );
       setGraphic( null );
+    }
     else if( isEditing() ) {
       TextField tf = getTextField();
       tf.setText( getItemValue() );
       setText( null );
       setGraphic( tf );
+    }
     else {
       setText( getItemValue() );
       setGraphic( getTreeItem().getGraphic() );
       if( !getTreeItem().isLeaf() && getTreeItem().getParent() != null ) {
         setContextMenu( getEditMenu() );
+      }
+    }
+  }
   private TextField createTextField() {
     final TextField tf = new TextField( getItemValue() );
     tf.setOnKeyReleased( (KeyEvent t) -> {
       switch( t.getCode() ) {
         case ENTER:
           commitEdit( tf.getText() );
           break;
         case ESCAPE:
           cancelEdit();
           break;
+      }
     } );
     return tf;
+  }
   /**
    * Returns the item's text value.
+   *
    * @return A non-null String, possibly empty.
    */
   private String getItemValue() {
     return getItem() == null ? "" : getItem();
+  }
   private TextField getTextField() {
     if( this.textField == null ) {
       this.textField = createTextField();
+    }
     return this.textField;
+  }
+}

M src/main/java/com/scrivenvar/definition/yaml/YamlFileDefinitionSource.java

   private YamlTreeAdapter yamlTreeAdapter;
   private YamlParser yamlParser;
   private TreeView<String> treeView;
   /**
   private void init() {
     setYamlParser( createYamlParser() );
+  }
   /**
    * TODO: Associate variable file with path to current file.
+   *
    * @return The TreeView for this definition source.
    */
   @Override
   public TreeView<String> asTreeView() {
     if( this.treeView == null ) {
       this.treeView = createTreeView();
+    }
     return this.treeView;
+  }
+  }
   private TreeView<String> createTreeView() {
   @Override
   protected TreeView<String> createTreeView() {
     return getYamlTreeAdapter().adapt(
       get( "Pane.defintion.node.root.title" )

M src/main/java/com/scrivenvar/processors/CaretReplacementProcessor.java

   @Override
   public String processLink( final String t ) {
     return replace(t, CARET_POSITION_MD, CARET_POSITION_HTML );
     return replace( t, CARET_POSITION_MD, CARET_POSITION_HTML );
+  }
   /**
    * Replaces the needle with thread in the given haystack. Based on Apache
    * Commons 3 StringUtils.replace method. Should be faster than
    * String.replace, which performs a little regex under the hood.
    * Commons 3 StringUtils.replace method. Should be faster than String.replace,
    * which performs a little regex under the hood.
+   *
    * @param haystack Search this string for the needle, must not be null.
     final int needleLength = needle.length();
     int increase = thread.length() - needleLength;
     increase = (increase < 0 ? 0 : increase);
     final StringBuilder buffer = new StringBuilder( haystack.length() + increase );
     int len = thread.length() - needleLength;
     len = (len < 0 ? 0 : len);
     final StringBuilder buffer = new StringBuilder( haystack.length() + len );
     if( end != INDEX_NOT_FOUND ) {

M src/main/java/com/scrivenvar/processors/InlineRProcessor.java

 package com.scrivenvar.processors;
 import static com.scrivenvar.Constants.STATUS_PARSE_ERROR;
 import static com.scrivenvar.Messages.get;
 import com.scrivenvar.Services;
 import static com.scrivenvar.decorators.RVariableDecorator.PREFIX;
 import static com.scrivenvar.decorators.RVariableDecorator.SUFFIX;
 import static com.scrivenvar.processors.text.TextReplacementFactory.replace;
 import com.scrivenvar.service.events.Notifier;
 import static java.lang.Math.min;
 import java.nio.file.Path;
   private ScriptEngine engine;
   private final Notifier notifier = Services.load( Notifier.class );
   /**
   /**
    * @see https://github.com/DaveJarvis/scrivenvar/issues/30
    * @param workingDirectory
    * @param workingDirectory
    */
   private void init( final Path workingDirectory ) {
     // In Windows, path characters must be changed from escape chars.
     eval( replace( ""
       + "assign( 'anchor', as.Date( '$date.anchor$', format='%Y-%m-%d' ), envir = .GlobalEnv );"
       + "setwd( '" + workingDirectory.toString().replace( '\\', '/' ) + "' );"
       + "source( '../bin/pluralize.R' );"
       + "source( '../bin/common.R' )", getDefinitions() ) );
     try {
       eval( replace( ""
         + "assign( 'anchor', as.Date( '$date.anchor$', format='%Y-%m-%d' ), envir = .GlobalEnv );"
         + "setwd( '" + workingDirectory.toString().replace( '\\', '/' ) + "' );"
         + "source( '../bin/pluralize.R' );"
         + "source( '../bin/common.R' )", getDefinitions() ) );
     } catch( final Exception e ) {
       throw new RuntimeException( e );
+    }
+  }
         // Pass the R statement into the R engine for evaluation.
         final Object result = eval( r );
         try {
           final Object result = eval( r );
         // Append the string representation of the result into the text.
         sb.append( result );
           // Append the string representation of the result into the text.
           sb.append( result );
         } catch( final Exception e ) {
           // If the string couldn't be parsed using R, append the statement
           // that failed to parse, instead of its evaluated value.
           sb.append( PREFIX ).append( r ).append( SUFFIX );
           // Tell the user that there was a problem.
           getNotifier().notify( get( STATUS_PARSE_ERROR,
             e.getMessage(), currIndex )
           );
+        }
         // Retain the R statement's ending position in the text.
         prevIndex = currIndex + 1;
+      }
       else {
    * @return The object resulting from the evaluation.
    */
   private Object eval( final String r ) {
     try {
       return getScriptEngine().eval( r );
     } catch( final ScriptException ex ) {
       throw new IllegalArgumentException( ex );
+    }
   private Object eval( final String r ) throws ScriptException {
     return getScriptEngine().eval( r );
+  }
   private synchronized ScriptEngine getScriptEngine() {
     if( this.engine == null ) {
       this.engine = (new ScriptEngineManager()).getEngineByName( "Renjin" );
+    }
     return this.engine;
+  }
   private Notifier getNotifier() {
     return this.notifier;
+  }
+}

M src/main/java/com/scrivenvar/service/events/Notifier.java

    * Notifies the user about the exception.
+   *
    * @param exception The exception containing a message to show to the user.
    * @param ex The exception containing a message to show to the user.
    */
   default public void notify( final Exception exception ) {
     notify( exception.getMessage() );
   default public void notify( final Exception ex ) {
     notify( ex.getMessage() );
+  }

M src/main/java/com/scrivenvar/service/events/impl/DefaultNotifier.java

  * @author White Magic Software, Ltd.
  */
 public final class DefaultNotifier extends Observable
   implements Notifier {
 public final class DefaultNotifier extends Observable implements Notifier {
   public DefaultNotifier() {
     setChanged();
     notifyObservers( message );
+  }
   @Override
   public void clear() {
     notify( STATUS_BAR_DEFAULT );
+  }
     final Object... args ) {
     return new DefaultNotification( title, message, args );
+  }
   @Override
   public void clear() {
     setChanged();
     notifyObservers( STATUS_BAR_DEFAULT );
+  }

M src/main/java/com/scrivenvar/util/Action.java

  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.util;
 import de.jensd.fx.glyphs.GlyphIcons;
 import javafx.beans.value.ObservableBooleanValue;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.scene.input.KeyCombination;
 import de.jensd.fx.glyphs.GlyphIcons;
 /**
  * Simple action class
+ *
  * @author Karl Tauber
  */
 public class Action
+{
 	public final String text;
 	public final KeyCombination accelerator;
 	public final GlyphIcons icon;
 	public final EventHandler<ActionEvent> action;
 	public final ObservableBooleanValue disable;
 public class Action {
 	public Action(String text, String accelerator, GlyphIcons icon,
 		EventHandler<ActionEvent> action)
+	{
 		this(text, accelerator, icon, action, null);
+	}
   public final String text;
   public final KeyCombination accelerator;
   public final GlyphIcons icon;
   public final EventHandler<ActionEvent> action;
   public final ObservableBooleanValue disable;
 	public Action(String text, String accelerator, GlyphIcons icon,
 		EventHandler<ActionEvent> action, ObservableBooleanValue disable)
+	{
 		this.text = text;
 		this.accelerator = (accelerator != null) ? KeyCombination.valueOf(accelerator) : null;
 		this.icon = icon;
 		this.action = action;
 		this.disable = disable;
+	}
   public Action(
     final String text,
     final String accelerator,
     final GlyphIcons icon,
     final EventHandler<ActionEvent> action ) {
     this( text, accelerator, icon, action, null );
+  }
   public Action(
     final String text,
     final String accelerator,
     final GlyphIcons icon,
     final EventHandler<ActionEvent> action,
     final ObservableBooleanValue disable ) {
     this.text = text;
     this.accelerator = (accelerator != null)
       ? KeyCombination.valueOf( accelerator )
       : null;
     this.icon = icon;
     this.action = action;
     this.disable = disable;
+  }
+}

M src/main/resources/com/scrivenvar/messages.properties

 # ########################################################################
 Main.statusbar.line=Line {0} of {1}
 Main.statusbar.text.offset=offset
 Main.statusbar.line=Line {0} of {1}, ${Main.statusbar.text.offset} {2}
 Main.statusbar.state.default=OK
 Main.statusbar.parse.error={0} (near ${Main.statusbar.text.offset} {1})
 # ########################################################################
+#
 # Definition Pane and its Tree View
+#
 # ########################################################################
 Definition.menu.add=Add
 Definition.menu.remove=Delete
 # ########################################################################

42	42	}
43	43
44		@Override
45		public TreeView<String> asTreeView() {
46		return new TreeView<>();
47		}
48	44
49	45	@Override
50	46	public Map<String, String> getResolvedMap() {
51	47	return new HashMap<>();
	48	}
	49
	50	@Override
	51	protected TreeView<String> createTreeView() {
	52	return new TreeView<>();
52	53	}
53	54	}