Ticket #2367: 2367.patch

modules/org.sophie2.main.func.file/src/main/java/org/sophie2/main/func/file/dialogs/FileDialog.java

@@ -76 +76 @@
                         
                 this.fileChooser.setSelectedFile(new File(input.getFileName()));
                 this.fileChooser.setMultiSelectionEnabled(input.isMultiSelectEnabled());
-                
-                
+
+
                 while (true) {
                         final int res = this.fileChooser.showDialog(input.getParent(), input.getTitle());
 
@@ -91 +91 @@
                         case JFileChooser.APPROVE_OPTION:
                                 File files[] = input.isMultiSelectEnabled() ? this.fileChooser.getSelectedFiles()
                                                 : new File[] { this.fileChooser.getSelectedFile() };
+                                if (files.length == 1 && files[0].isDirectory()) {
+                                        this.fileChooser.setCurrentDirectory(files[0]);
+                                        break;
+                                }
                                 FileContainer fileContainer = peformFileCheck(input, files);
 
                                 if (fileContainer != null) {

modules/org.sophie2.dev/src/main/java/org/sophie2/dev/author/FakeAuthorMain.java

@@ -97 +97 @@
                 //Profiler.start();
                 SophieLog.info("Starting fake...");
                 SophieLog.setMinLevel("", LogLevel.INFO);
-                SophieLog.setMinLevel("org.sophie2.core.mvc", LogLevel.DEBUG);
+//              SophieLog.setMinLevel("org.sophie2.core.mvc", LogLevel.DEBUG);
                 //SophieLog.setMinLevel("org.sophie2.core.modularity.FileEntryManager.fillFakeModulePaths", LogLevel.ERROR);
                 //SophieLog.setMinLevel("org.sophie2.base.layout", LogLevel.DEBUG);
                 //SophieLog.setMinLevel("org.sophie2.base.model.resources.r4", LogLevel.DEBUG);
                 //SophieLog.setMinLevel("org.sophie2.base.model.resources.r4.access", LogLevel.INFO);
                 //SophieLog.setMinLevel("org.sophie2.main.media", LogLevel.ALL);
-                SophieLog.setMinLevel("org.sophie2.main.media.natlib", LogLevel.NONE);
-                SophieLog.setMinLevel("org.sophie2.base.natlib", LogLevel.NONE);
+//              SophieLog.setMinLevel("org.sophie2.main.media.natlib", LogLevel.NONE);
+//              SophieLog.setMinLevel("org.sophie2.base.natlib", LogLevel.NONE);
                 //SophieLog.setMinLevel("org.sophie2.main.func.timelines", LogLevel.DEBUG);
                 //SophieLog.setMinLevel("org.sophie2.main.func.media.view", LogLevel.ALL);
                 //SophieLog.setMinLevel("org.sophie2.base.bound", LogLevel.ALL);
-                SophieLog.setMinLevel("org.sophie2.main.scene.simple", LogLevel.NONE);
-                SophieLog.setMinLevel("org.sophie2.main.func.media.logic", LogLevel.DEBUG);
+//              SophieLog.setMinLevel("org.sophie2.main.scene.simple", LogLevel.NONE);
+//              SophieLog.setMinLevel("org.sophie2.main.func.media.logic", LogLevel.DEBUG);
                 SophieLog.setMinLevel("org.sophie2.main.app.commons.book", LogLevel.DEBUG);
                 
                 assert System.getProperty(SophieEditions.PROP_ID) == null :