|
@@ -19,7 +19,6 @@ import java.io.IOException;
|
19
|
19
|
import java.io.PrintStream;
|
20
|
20
|
import java.util.ArrayList;
|
21
|
21
|
import java.util.List;
|
22
|
|
-import java.util.prefs.Preferences;
|
23
|
22
|
|
24
|
23
|
import javax.swing.BorderFactory;
|
25
|
24
|
import javax.swing.Box;
|
|
@@ -42,7 +41,6 @@ import javax.swing.Timer;
|
42
|
41
|
import javax.swing.UIManager;
|
43
|
42
|
import javax.swing.border.CompoundBorder;
|
44
|
43
|
import javax.swing.border.EmptyBorder;
|
45
|
|
-import javax.swing.filechooser.FileNameExtensionFilter;
|
46
|
44
|
|
47
|
45
|
import org.insa.algo.AbstractSolution;
|
48
|
46
|
import org.insa.algo.AlgorithmFactory;
|
|
@@ -70,6 +68,8 @@ import org.insa.graphics.drawing.Drawing;
|
70
|
68
|
import org.insa.graphics.drawing.GraphPalette;
|
71
|
69
|
import org.insa.graphics.drawing.components.BasicDrawing;
|
72
|
70
|
import org.insa.graphics.drawing.components.MapViewDrawing;
|
|
71
|
+import org.insa.graphics.utils.FileUtils;
|
|
72
|
+import org.insa.graphics.utils.FileUtils.FolderType;
|
73
|
73
|
|
74
|
74
|
public class MainWindow extends JFrame {
|
75
|
75
|
|
|
@@ -88,15 +88,6 @@ public class MainWindow extends JFrame {
|
88
|
88
|
*/
|
89
|
89
|
private static final int THREAD_TIMER_DELAY = 1000; // in milliseconds
|
90
|
90
|
|
91
|
|
- private static final String DEFAULT_MAP_FOLDER_KEY = "DefaultMapFolder";
|
92
|
|
- private static final String DEFAULT_MAP_FOLDER_INSA = "/home/commetud/...";
|
93
|
|
-
|
94
|
|
- private static final String DEFAULT_PATH_FOLDER_KEY = "DefaultPathFolder";
|
95
|
|
- private static final String DEFAULT_PATH_FOLDER_INSA = "/home/commetud/...";
|
96
|
|
-
|
97
|
|
- // Preferences
|
98
|
|
- private Preferences preferences = Preferences.userRoot().node(getClass().getName());
|
99
|
|
-
|
100
|
91
|
// Current graph.
|
101
|
92
|
protected Graph graph;
|
102
|
93
|
|
|
@@ -303,25 +294,9 @@ public class MainWindow extends JFrame {
|
303
|
294
|
ActionListener openMapActionListener = new ActionListener() {
|
304
|
295
|
@Override
|
305
|
296
|
public void actionPerformed(ActionEvent e) {
|
306
|
|
- JFileChooser chooser = new JFileChooser();
|
307
|
|
- FileNameExtensionFilter filter = new FileNameExtensionFilter("Graph files",
|
308
|
|
- "mapgr");
|
309
|
|
- File mapFolder = new File(
|
310
|
|
- preferences.get(DEFAULT_MAP_FOLDER_KEY, DEFAULT_MAP_FOLDER_INSA));
|
311
|
|
- if (!mapFolder.exists()) {
|
312
|
|
- mapFolder = new File(System.getProperty("user.dir"));
|
313
|
|
- }
|
314
|
|
- chooser.setCurrentDirectory(mapFolder);
|
315
|
|
- chooser.setFileFilter(filter);
|
|
297
|
+ JFileChooser chooser = FileUtils.createFileChooser(FolderType.Map);
|
316
|
298
|
if (chooser.showOpenDialog(MainWindow.this) == JFileChooser.APPROVE_OPTION) {
|
317
|
299
|
graphFilePath = chooser.getSelectedFile().getAbsolutePath();
|
318
|
|
-
|
319
|
|
- // Check...
|
320
|
|
- if (chooser.getSelectedFile().exists()) {
|
321
|
|
- preferences.put(DEFAULT_MAP_FOLDER_KEY,
|
322
|
|
- chooser.getSelectedFile().getParent());
|
323
|
|
- }
|
324
|
|
-
|
325
|
300
|
DataInputStream stream;
|
326
|
301
|
try {
|
327
|
302
|
stream = new DataInputStream(new BufferedInputStream(
|
|
@@ -659,24 +634,8 @@ public class MainWindow extends JFrame {
|
659
|
634
|
|
660
|
635
|
@Override
|
661
|
636
|
public void actionPerformed(ActionEvent e) {
|
662
|
|
- JFileChooser chooser = new JFileChooser();
|
663
|
|
- FileNameExtensionFilter filter = new FileNameExtensionFilter(
|
664
|
|
- "Path & compressed path files", "path");
|
665
|
|
- File pathFolder = new File(
|
666
|
|
- preferences.get(DEFAULT_PATH_FOLDER_KEY, DEFAULT_PATH_FOLDER_INSA));
|
667
|
|
- if (!pathFolder.exists()) {
|
668
|
|
- pathFolder = new File(System.getProperty("user.dir"));
|
669
|
|
- }
|
670
|
|
- chooser.setCurrentDirectory(pathFolder);
|
671
|
|
- chooser.setFileFilter(filter);
|
|
637
|
+ JFileChooser chooser = FileUtils.createFileChooser(FolderType.PathInput);
|
672
|
638
|
if (chooser.showOpenDialog(MainWindow.this) == JFileChooser.APPROVE_OPTION) {
|
673
|
|
-
|
674
|
|
- // Check & Update
|
675
|
|
- if (chooser.getSelectedFile().exists()) {
|
676
|
|
- preferences.put(DEFAULT_PATH_FOLDER_KEY,
|
677
|
|
- chooser.getSelectedFile().getParent());
|
678
|
|
- }
|
679
|
|
-
|
680
|
639
|
BinaryPathReader reader;
|
681
|
640
|
try {
|
682
|
641
|
reader = new BinaryPathReader(new DataInputStream(new BufferedInputStream(
|