Author: sletellier Date: 2012-07-06 10:42:54 +0200 (Fri, 06 Jul 2012) New Revision: 2386 Url: http://nuiton.org/repositories/revision/jaxx/2386 Log: really fixes #2171 : FileEditor dont keep input path Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx 2012-07-06 08:24:11 UTC (rev 2385) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx 2012-07-06 08:42:54 UTC (rev 2386) @@ -24,7 +24,6 @@ <BaseActionPanel layout='{new BorderLayout()}'> <import> java.io.File - java.beans.PropertyChangeListener jaxx.runtime.swing.BaseActionPanel org.apache.commons.lang3.StringUtils </import> @@ -50,6 +49,10 @@ public void setSelectedFile(File selectedFile) { this.selectedFile = selectedFile; + if (selectedFile != null) { + setStartPath(selectedFile.getAbsolutePath()); + fireActionEvent(); + } } public File getSelectedFile() { @@ -67,7 +70,7 @@ constraints='BorderLayout.CENTER' enabled='{isEnabled()}' text='{getStartPath()}' - onKeyReleased='handler.setSelectedFile(pathField.getText())'/> + onKeyReleased='setSelectedFile(null);setStartPath(pathField.getText())'/> <JButton id='boutonXslLocation' constraints='BorderLayout.EAST' Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java 2012-07-06 08:24:11 UTC (rev 2385) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java 2012-07-06 08:42:54 UTC (rev 2386) @@ -56,7 +56,7 @@ // else filed start path startFile = new File(startPath); - } else { + } else if (startFile == null) { // else start with user home startFile = lastSelectedPath;