From d3d155d4486921618505bb18fdaadbdc991d9e62 Mon Sep 17 00:00:00 2001 From: ks167484 Date: Fri, 9 Aug 2024 03:33:39 +0200 Subject: [PATCH] Use only one constant for extension --- .../csstudio/display/builder/model/AdvancedConverter.java | 6 +++--- .../org/csstudio/display/builder/model/Converter.java | 8 +++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/AdvancedConverter.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/AdvancedConverter.java index 20c6fc2bd8..5946fe0e30 100644 --- a/app/display/model/src/main/java/org/csstudio/display/builder/model/AdvancedConverter.java +++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/AdvancedConverter.java @@ -349,10 +349,10 @@ private void updateScriptsAndBobFiles(File outputFolderFile) { } // Replace embedded opi by bob - newContains = newContains.replaceAll(OPI, BOB); // prevent replaceAll problem for opi becoming .bob in + newContains = newContains.replaceAll(OPI_EXTENSION, BOB_EXTENSION); // prevent replaceAll problem for opi becoming .bob in // the bob file - newContains = newContains.replaceAll(OPI_EXTENSION, BOB_EXTENSION); - newContains = newContains.replaceAll(OPI_EXTENSION.toUpperCase(), BOB_EXTENSION.toUpperCase()); + newContains = newContains.replaceAll("." + OPI_EXTENSION, "." + BOB_EXTENSION); + newContains = newContains.replaceAll("." + OPI_EXTENSION.toUpperCase(), "." + BOB_EXTENSION.toUpperCase()); // Replace name of script for phoebus => phoebus_scritfile.py for (String scriptFile : scriptList) { diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/Converter.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/Converter.java index bb02b7ad9e..496e09f35b 100644 --- a/app/display/model/src/main/java/org/csstudio/display/builder/model/Converter.java +++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/Converter.java @@ -39,10 +39,8 @@ public class Converter { * @return all opi files contained in a given folder */ public static final String OUTPUT_ARG = "-output"; - public static final String OPI_EXTENSION = ".opi"; - public static final String BOB_EXTENSION = ".bob"; - public static final String OPI = "opi"; - public static final String BOB = "bob"; + public static final String OPI_EXTENSION = "opi"; + public static final String BOB_EXTENSION = "bob"; public static final String PYTHON_EXTENSION = ".python"; public static final String PY_EXTENSION = ".py"; public static final String JAVASCRIPT_EXTENSION = ".javascript"; @@ -135,7 +133,7 @@ public static boolean matchExtensions(String fileName, List extensionsLi boolean match = false; if (fileName != null && extensionsList != null && !extensionsList.isEmpty()) { for (String ext : extensionsList) { - if (fileName.toLowerCase().endsWith(ext)) { + if (fileName.toLowerCase().endsWith("." + ext)) { match = true; break; }