Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
Remove protocol scheme string constants
| Author | DaveJarvis <email> |
|---|---|
| Date | 2020-09-12 18:54:14 GMT-0700 |
| Commit | 034228b7b1ca657826e21bdb57a9b4678c5ba07b |
| Parent | d0b3572 |
| Delta | 7 lines added, 13 lines removed, 6-line decrease |
src/main/java/com/scrivenvar/util/ProtocolResolver.java
| import java.io.File; | ||
| +import java.net.MalformedURLException; | ||
| import java.net.URI; | ||
| import java.net.URL; | ||
| - | ||
| -import static com.scrivenvar.util.ProtocolScheme.FILE; | ||
| -import static com.scrivenvar.util.ProtocolScheme.HTTP; | ||
| -import static org.apache.commons.compress.utils.ArchiveUtils.sanitize; | ||
| /** | ||
| * Responsible for determining the protocol of a resource. | ||
| */ | ||
| public class ProtocolResolver { | ||
| - private static final String SCHEME_HTTP = "http"; | ||
| - private static final String SCHEME_FILE = "file"; | ||
| - private static final String SCHEME_UNKNOWN = "unknown"; | ||
| - | ||
| /** | ||
| * Returns the protocol for a given URI or filename. | ||
 | ||
| } | ||
| - return ProtocolScheme.valueFrom(protocol); | ||
| + return ProtocolScheme.valueFrom( protocol ); | ||
| } | ||
| ||
| try { | ||
| result = file.toURI().toURL().getProtocol(); | ||
| - } catch( final Exception e ) { | ||
| - result = SCHEME_UNKNOWN; | ||
| + } catch( final MalformedURLException ex ) { | ||
| + // Arbitrary value to avoid identification as a standard protocol. | ||
| + result = "unknown"; | ||
| } | ||
src/main/java/com/scrivenvar/preview/CustomImageLoader.java
| package com.scrivenvar.preview; | ||
| -import com.scrivenvar.util.ProtocolResolver; | ||
| import javafx.beans.property.IntegerProperty; | ||
| import javafx.beans.property.SimpleIntegerProperty; | ||
| ||
| import static com.scrivenvar.graphics.SvgRasterizer.BROKEN_IMAGE_PLACEHOLDER; | ||
| +import static com.scrivenvar.util.ProtocolResolver.getProtocol; | ||
| import static org.xhtmlrenderer.swing.AWTFSImage.createImage; | ||
| ||
| try { | ||
| - final var protocol = ProtocolResolver.getProtocol( uri ); | ||
| + final var protocol = getProtocol( uri ); | ||
| if( protocol.isFile() ) { | ||