Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
Address IDE warnings, fix closing bug
| Author | DaveJarvis <email> |
|---|---|
| Date | 2020-05-30 10:30:39 GMT-0700 |
| Commit | c2500f449f66ffd79738c0088d943b3809eb5251 |
| Parent | 157d052 |
| Delta | 57 lines added, 62 lines removed, 5-line decrease |
src/main/java/com/scrivenvar/service/impl/DefaultSettings.java
| import java.io.InputStreamReader; | ||
| import java.io.Reader; | ||
| -import java.net.URISyntaxException; | ||
| import java.net.URL; | ||
| import java.nio.charset.Charset; | ||
 | ||
| private PropertiesConfiguration properties; | ||
| - public DefaultSettings() | ||
| - throws ConfigurationException, URISyntaxException, IOException { | ||
| + public DefaultSettings() throws ConfigurationException { | ||
| setProperties( createProperties() ); | ||
| } | ||
src/main/java/com/scrivenvar/definition/yaml/resolvers/ResolverYAMLGenerator.java
| /* | ||
| - * The MIT License | ||
| + * Copyright 2020 White Magic Software, Ltd. | ||
| * | ||
| - * Copyright 2017 White Magic Software, Ltd.. | ||
| + * All rights reserved. | ||
| * | ||
| - * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| - * of this software and associated documentation files (the "Software"), to deal | ||
| - * in the Software without restriction, including without limitation the rights | ||
| - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| - * copies of the Software, and to permit persons to whom the Software is | ||
| - * furnished to do so, subject to the following conditions: | ||
| + * Redistribution and use in source and binary forms, with or without | ||
| + * modification, are permitted provided that the following conditions are met: | ||
| * | ||
| - * The above copyright notice and this permission notice shall be included in | ||
| - * all copies or substantial portions of the Software. | ||
| + * o Redistributions of source code must retain the above copyright | ||
| + * notice, this list of conditions and the following disclaimer. | ||
| * | ||
| - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| - * THE SOFTWARE. | ||
| + * 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.yaml.resolvers; | ||
| -import com.fasterxml.jackson.core.JsonGenerationException; | ||
| import com.fasterxml.jackson.core.ObjectCodec; | ||
| import com.fasterxml.jackson.core.io.IOContext; | ||
| import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator; | ||
| import com.scrivenvar.definition.yaml.YamlParser; | ||
| +import org.yaml.snakeyaml.DumperOptions; | ||
| + | ||
| import java.io.IOException; | ||
| import java.io.Writer; | ||
| -import org.yaml.snakeyaml.DumperOptions; | ||
| -/** | ||
| - * | ||
| - * @author White Magic Software, Ltd. | ||
| - */ | ||
| /** | ||
| * Intercepts the string writing functionality to resolve the definition | ||
| * value. | ||
| */ | ||
| public class ResolverYAMLGenerator extends YAMLGenerator { | ||
| private YamlParser yamlParser; | ||
| public ResolverYAMLGenerator( | ||
| - final YamlParser yamlParser, | ||
| - final IOContext ctxt, | ||
| - final int jsonFeatures, | ||
| - final int yamlFeatures, | ||
| - final ObjectCodec codec, | ||
| - final Writer out, | ||
| - final DumperOptions.Version version ) throws IOException { | ||
| + final YamlParser yamlParser, | ||
| + final IOContext ctxt, | ||
| + final int jsonFeatures, | ||
| + final int yamlFeatures, | ||
| + final ObjectCodec codec, | ||
| + final Writer out, | ||
| + final DumperOptions.Version version ) throws IOException { | ||
| super( ctxt, jsonFeatures, yamlFeatures, codec, out, version ); | ||
| setYamlParser( yamlParser ); | ||
| } | ||
| @Override | ||
| - public void writeString( final String text ) | ||
| - throws IOException, JsonGenerationException { | ||
| + public void writeString( final String text ) throws IOException { | ||
| final YamlParser parser = getYamlParser(); | ||
| super.writeString( parser.substitute( text ) ); |
src/main/java/com/scrivenvar/definition/VariableTreeItem.java
| for( final TreeItem<T> child : parent.getChildren() ) { | ||
| if( child.isLeaf() ) { | ||
| - @SuppressWarnings( "unchecked" ) | ||
| final String key = toVariable( ((VariableTreeItem<String>)child).toPath() ); | ||
| final String value = child.getValue().toString(); |
src/main/java/com/scrivenvar/MainWindow.java
| */ | ||
| private void refreshSelectedTab( final FileEditorTab tab ) { | ||
| - if( tab.isFileOpen() ) { | ||
| - getPreviewPane().setPath( tab.getPath() ); | ||
| + 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 | ||
| - ) | ||
| - ); | ||
| + // 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 ); | ||
| + Processor<String> processor = getProcessors().get( tab ); | ||
| - if( processor == null ) { | ||
| - processor = createProcessor( tab ); | ||
| - getProcessors().put( tab, processor ); | ||
| - } | ||
| + if( processor == null ) { | ||
| + processor = createProcessor( tab ); | ||
| + getProcessors().put( tab, processor ); | ||
| + } | ||
| - try { | ||
| - getNotifier().clear(); | ||
| - processor.processChain( tab.getEditorText() ); | ||
| - } catch( final Exception ex ) { | ||
| - error( ex ); | ||
| - } | ||
| + try { | ||
| + getNotifier().clear(); | ||
| + processor.processChain( tab.getEditorText() ); | ||
| + } catch( final Exception ex ) { | ||
| + error( ex ); | ||
| } | ||
| } | ||
| ||
| () -> { | ||
| final int index = s.indexOf( '\n' ); | ||
| - final String message = s.substring( 0, | ||
| - index > 0 ? index : s.length() ); | ||
| + final String message = s.substring( | ||
| + 0, index > 0 ? index : s.length() ); | ||
| getStatusBar().setText( message ); | ||
| ||
| final EditorPane pane = getActiveFileEditor().getEditorPane(); | ||
| - return pane instanceof MarkdownEditorPane ? (MarkdownEditorPane) pane : | ||
| - null; | ||
| + return pane instanceof MarkdownEditorPane | ||
| + ? (MarkdownEditorPane) pane | ||
| + : null; | ||
| } | ||