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

make sure parent directory of current config file exists

Browse source
This commit is contained in:
fros4943 2009-03-22 13:47:38 +00:00
parent cc85a36722
commit 65d64d0c06
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: GUI.java,v 1.121 2009/03/21 16:45:42 fros4943 Exp $ * $Id: GUI.java,v 1.122 2009/03/22 13:47:38 fros4943 Exp $
*/ */
package se.sics.cooja; package se.sics.cooja;
@ -3710,7 +3710,7 @@ public class GUI extends Observable {
return restoreConfigPath(file); return restoreConfigPath(file);
} }
private File currentConfigFile = null; /* Used to generate config relative paths */ public File currentConfigFile = null; /* Used to generate config relative paths */
public File createConfigPath(File file) { public File createConfigPath(File file) {
if (currentConfigFile == null) { if (currentConfigFile == null) {
return file; return file;
@ -3719,6 +3719,9 @@ public class GUI extends Observable {
try { try {
File configPath = currentConfigFile.getParentFile(); File configPath = currentConfigFile.getParentFile();
String configIdentifier = "[CONFIG_DIR]"; String configIdentifier = "[CONFIG_DIR]";
if (configPath == null) {
return file;
}
String configCanonical = configPath.getCanonicalPath(); String configCanonical = configPath.getCanonicalPath();
String fileCanonical = file.getCanonicalPath(); String fileCanonical = file.getCanonicalPath();
@ -3753,6 +3756,9 @@ public class GUI extends Observable {
} }
File configPath = currentConfigFile.getParentFile(); File configPath = currentConfigFile.getParentFile();
if (configPath == null) {
return file;
}
String path = file.getPath(); String path = file.getPath();
if (!path.startsWith("[CONFIG_DIR]")) { if (!path.startsWith("[CONFIG_DIR]")) {