X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fnet%2Fsf%2Fopenrocket%2Fdatabase%2FDatabases.java;fp=src%2Fnet%2Fsf%2Fopenrocket%2Fdatabase%2FDatabases.java;h=c5c28b7906d95ba5ace90a28c1fa99a5b91a99e7;hb=bf76931b27b597f7bc1dd5a0e7e2460ac065415b;hp=efb8cd6cb36a26f48ac1fed28403edba3179228c;hpb=def27b03bd9ebe6628421ec61112ebe4f45f043d;p=debian%2Fopenrocket diff --git a/src/net/sf/openrocket/database/Databases.java b/src/net/sf/openrocket/database/Databases.java index efb8cd6c..c5c28b79 100644 --- a/src/net/sf/openrocket/database/Databases.java +++ b/src/net/sf/openrocket/database/Databases.java @@ -46,9 +46,9 @@ public class Databases { // TODO: HIGH: loading the thrust curves and other databases static { - + final String filePattern = ".*\\.([eE][nN][gG]|[rR][sS][eE])$"; try { - MOTOR.loadJarDirectory("datafiles/thrustcurves/", ".*\\.[eE][nN][gG]$"); + MOTOR.loadJarDirectory("datafiles/thrustcurves/", filePattern); } catch (IOException e) { System.out.println("Could not read thrust curves from JAR: "+e.getMessage()); @@ -63,7 +63,7 @@ public class Databases { } try { - MOTOR.loadDirectory(dir, ".*\\.[eE][nN][gG]$"); + MOTOR.loadDirectory(dir, filePattern); } catch (IOException e1) { System.out.println("Could not read thrust curves from directory either."); throw new ConfigurationException("Couldn't read thrust curves from either " +