INSA/be-graphes
3
0
Fork 0
Code Issues 4 Releases Wiki Activity

Fix issue with graph progress bar.

Browse Source
This commit is contained in:
Mikael Capelle 2018-03-28 17:39:00 +02:00
parent 51e166600d
commit 4e541e67cf
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/org/insa/graphics/GraphReaderProgressBar.java
View File

@ -75,6 +75,7 @@ public class GraphReaderProgressBar extends JDialog implements GraphReaderObserv
@Override @Override
public void notifyEndReading() { public void notifyEndReading() {
setVisible(false); setVisible(false);
dispose();
} }
protected void initProgressBar(int index, int max) { protected void initProgressBar(int index, int max) {

8
src/main/org/insa/graphics/MainWindow.java
View File

@ -254,9 +254,8 @@ public class MainWindow extends JFrame {
} }
}); });
cpPanel = new AlgorithmPanel( cpPanel = new AlgorithmPanel(this, CarPoolingAlgorithm.class, "Car-Pooling", new String[]{
this, CarPoolingAlgorithm.class, "Car-Pooling", new String[] { "Origin Car", "Origin Car", "Origin Pedestrian", "Destination Car", "Destination Pedestrian" },
"Origin Pedestrian", "Destination Car", "Destination Pedestrian" },
true); true);
psPanel = new AlgorithmPanel(this, PackageSwitchAlgorithm.class, "Car-Pooling", psPanel = new AlgorithmPanel(this, PackageSwitchAlgorithm.class, "Car-Pooling",
@ -580,10 +579,10 @@ public class MainWindow extends JFrame {
reader.addObserver(progressBar); reader.addObserver(progressBar);
try { try {
graph = reader.read(); graph = reader.read();
System.out.flush();
} }
catch (Exception exception) { catch (Exception exception) {
progressBar.setVisible(false); progressBar.setVisible(false);
progressBar.dispose();
progressBar = null; progressBar = null;
JOptionPane.showMessageDialog(MainWindow.this, JOptionPane.showMessageDialog(MainWindow.this,
"Unable to read graph from the selected file."); "Unable to read graph from the selected file.");
@ -593,6 +592,7 @@ public class MainWindow extends JFrame {
// In case of.... // In case of....
progressBar.setVisible(false); progressBar.setVisible(false);
progressBar.dispose();
progressBar = null; progressBar = null;
String info = graph.getMapId(); String info = graph.getMapId();