From d4e7102ad0f9b307616f5780d7b88626f8637156 Mon Sep 17 00:00:00 2001 From: Wei-ju Wu Date: Thu, 7 Dec 2017 09:28:51 -0800 Subject: [PATCH] LineageMapper.java: file path construction LineageMapper.java:initFramesList(): input file path creation replaced by using File() constructor rather than String concatenation. This handles when calling the plugin with the input directory parameter when it does not end with a path separator, e.g. when called from a macro. --- .../java/gov/nist/isg/lineage/mapper/LineageMapper.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/gov/nist/isg/lineage/mapper/LineageMapper.java b/src/main/java/gov/nist/isg/lineage/mapper/LineageMapper.java index c3e8150..568f265 100644 --- a/src/main/java/gov/nist/isg/lineage/mapper/LineageMapper.java +++ b/src/main/java/gov/nist/isg/lineage/mapper/LineageMapper.java @@ -55,7 +55,7 @@ private void initFramesList() { // check for 0 or 1 based filename patterns String fn = Utils.getFileName(params.getFilenamePattern(), OptionsPanel .filenamePatternRegex, i); - File f = new File(params.getInputDirectory() + fn); + File f = new File(new File(params.getInputDirectory()), fn); if (f.exists()) { startIndex = i; break; @@ -69,8 +69,9 @@ private void initFramesList() { } int imgIndex = startIndex; - while ((new File(params.getInputDirectory() + Utils.getFileName(params.getFilenamePattern(), - OptionsPanel.filenamePatternRegex, imgIndex))).exists()) { + while ((new File(new File(params.getInputDirectory()), + Utils.getFileName(params.getFilenamePattern(), + OptionsPanel.filenamePatternRegex, imgIndex))).exists()) { String imgName = Utils.getFileName(params.getFilenamePattern(), OptionsPanel.filenamePatternRegex, imgIndex);