From 79ffa072e53215c0a43f675eda3b7092eeb8fcda Mon Sep 17 00:00:00 2001
From: Fabien Tessier <fabien.tessier@telecom-paristech.fr>
Date: Thu, 12 Oct 2017 13:06:45 +0200
Subject: [PATCH] Allow to load .ttool directory

---
 src/main/java/myutil/FileUtils.java | 2 +-
 src/main/java/ui/MainGUI.java       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/myutil/FileUtils.java b/src/main/java/myutil/FileUtils.java
index e5275fd022..4e741cf8d9 100755
--- a/src/main/java/myutil/FileUtils.java
+++ b/src/main/java/myutil/FileUtils.java
@@ -72,7 +72,7 @@ public class FileUtils {
 
 
     public static String getExtension(File f) {
-        String ext = null;
+        String ext = "";
         String s = f.getName();
         int i = s.lastIndexOf('.');
 
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index ff55e03bbe..f60aaa0160 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -445,6 +445,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
 
         TFileFilter filter = new TFileFilter();
         jfc.setFileFilter(filter);
+        jfc.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
 
         TTIFFilter filtertif = new TTIFFilter();
         jfctif.setFileFilter(filtertif);
@@ -2329,7 +2330,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
     public void openProjectFromFile(File _f) {
     	if (FileUtils.getExtension(_f).equals("ttool")) {
     		dir = _f;
-    		String filename = dir.getAbsolutePath() + dir.getName().replaceAll(".ttool", ".xml");
+    		String filename = dir.getAbsolutePath() + "/" + dir.getName().replaceAll(".ttool", ".xml");
     		file = new File(filename);
     	}
     	else {
-- 
GitLab