deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

allow saving .csc with contiki-relative paths when the .csc file is in a subdirectory of the referenced

Browse source 
application
This commit is contained in:
Fredrik Osterlind 2013-08-14 12:52:20 +02:00
parent eb1a147d7d
commit 9cb2fd8465
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tools/cooja/java/se/sics/cooja/GUI.java
View file

@ -1556,6 +1556,9 @@ public class GUI extends Observable {
"MOTETYPES"); "MOTETYPES");
if (moteTypeClassNames != null) { if (moteTypeClassNames != null) {
for (String moteTypeClassName : moteTypeClassNames) { for (String moteTypeClassName : moteTypeClassNames) {
if (moteTypeClassName.trim().isEmpty()) {
continue;
}
Class<? extends MoteType> moteTypeClass = tryLoadClass(this, Class<? extends MoteType> moteTypeClass = tryLoadClass(this,
MoteType.class, moteTypeClassName); MoteType.class, moteTypeClassName);
@ -4260,6 +4263,22 @@ public class GUI extends Observable {
id += "/.."; id += "/..";
} }
} }
if (!fileCanonical.startsWith(configCanonical)) {
/* SPECIAL CASE: Allow two parent directories */
File parent = new File(configCanonical).getParentFile();
if (parent != null) {
configCanonical = parent.getCanonicalPath();
id += "/..";
}
}
if (!fileCanonical.startsWith(configCanonical)) {
/* SPECIAL CASE: Allow three parent directories */
File parent = new File(configCanonical).getParentFile();
if (parent != null) {
configCanonical = parent.getCanonicalPath();
id += "/..";
}
}
if (!fileCanonical.startsWith(configCanonical)) { if (!fileCanonical.startsWith(configCanonical)) {
/* File is not in a config subdirectory */ /* File is not in a config subdirectory */
/*logger.info("File is not in a config subdirectory: " + file.getAbsolutePath());*/ /*logger.info("File is not in a config subdirectory: " + file.getAbsolutePath());*/