Skip to content

Commit 380151a

Browse files
committed
CSSTUDIO-2076 Make checks case insensitive.
1 parent 666d070 commit 380151a

File tree

1 file changed

+9
-7
lines changed
  • app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/app

1 file changed

+9
-7
lines changed

app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/app/DisplayInfo.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import java.net.URI;
1414
import java.net.URISyntaxException;
1515
import java.net.URLEncoder;
16+
import java.util.Locale;
1617
import java.util.logging.Level;
1718

1819
import org.csstudio.display.builder.model.DisplayModel;
@@ -115,13 +116,14 @@ public static DisplayInfo forModel(final DisplayModel model)
115116
String path;
116117
{
117118
String userDataInputFile = model.getUserData(DisplayModel.USER_DATA_INPUT_FILE);
118-
if ( !userDataInputFile.startsWith("/")
119-
&& !userDataInputFile.startsWith("examples:")
120-
&& !userDataInputFile.startsWith("file:")
121-
&& !userDataInputFile.startsWith("http:")
122-
&& !userDataInputFile.startsWith("https:")
123-
&& !userDataInputFile.startsWith("ftp:")
124-
&& !userDataInputFile.startsWith("jar:")) {
119+
String userDataInputFile_lowerCase = userDataInputFile.toLowerCase(Locale.ROOT);
120+
if ( !userDataInputFile_lowerCase.startsWith("/")
121+
&& !userDataInputFile_lowerCase.startsWith("examples:")
122+
&& !userDataInputFile_lowerCase.startsWith("file:")
123+
&& !userDataInputFile_lowerCase.startsWith("http:")
124+
&& !userDataInputFile_lowerCase.startsWith("https:")
125+
&& !userDataInputFile_lowerCase.startsWith("ftp:")
126+
&& !userDataInputFile_lowerCase.startsWith("jar:")) {
125127
// Add leading '/' and replace occurrences of '\' by '/' in the file path on Windows:
126128
path = "/" + userDataInputFile.replace('\\', '/');
127129
}

0 commit comments

Comments
 (0)