Rename abstract classes.
This commit is contained in:
parent
6c3bc23984
commit
0514c627b4
@ -12,7 +12,7 @@ import org.insa.graph.Point;
|
|||||||
import org.insa.graph.RoadInformation;
|
import org.insa.graph.RoadInformation;
|
||||||
import org.insa.graph.RoadInformation.RoadType;
|
import org.insa.graph.RoadInformation.RoadType;
|
||||||
|
|
||||||
public class BinaryGraphReader extends BinaryReader implements AbstractGraphReader {
|
public class BinaryGraphReader extends BinaryReader implements GraphReader {
|
||||||
|
|
||||||
// Map version and magic number targeted for this reader.
|
// Map version and magic number targeted for this reader.
|
||||||
private static final int VERSION = 4;
|
private static final int VERSION = 4;
|
||||||
|
@ -12,7 +12,7 @@ import org.insa.graph.Point;
|
|||||||
import org.insa.graph.RoadInformation;
|
import org.insa.graph.RoadInformation;
|
||||||
import org.insa.graph.RoadInformation.RoadType;
|
import org.insa.graph.RoadInformation.RoadType;
|
||||||
|
|
||||||
public class BinaryGraphReaderV2 extends BinaryReader implements AbstractGraphReader {
|
public class BinaryGraphReaderV2 extends BinaryReader implements GraphReader {
|
||||||
|
|
||||||
// Map version and magic number targeted for this reader.
|
// Map version and magic number targeted for this reader.
|
||||||
private static final int VERSION = 5;
|
private static final int VERSION = 5;
|
||||||
|
@ -9,7 +9,7 @@ import org.insa.graph.Node;
|
|||||||
import org.insa.graph.Path;
|
import org.insa.graph.Path;
|
||||||
import org.insa.graph.Path.CreationMode;
|
import org.insa.graph.Path.CreationMode;
|
||||||
|
|
||||||
public class BinaryPathReader extends BinaryReader implements AbstractPathReader {
|
public class BinaryPathReader extends BinaryReader implements PathReader {
|
||||||
|
|
||||||
// Map version and magic number targeted for this reader.
|
// Map version and magic number targeted for this reader.
|
||||||
protected static final int VERSION = 1;
|
protected static final int VERSION = 1;
|
||||||
|
@ -6,7 +6,7 @@ import java.io.IOException;
|
|||||||
import org.insa.graph.Arc;
|
import org.insa.graph.Arc;
|
||||||
import org.insa.graph.Path;
|
import org.insa.graph.Path;
|
||||||
|
|
||||||
public class BinaryPathWriter extends BinaryWriter implements AbstractPathWriter {
|
public class BinaryPathWriter extends BinaryWriter implements PathWriter {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param dos
|
* @param dos
|
||||||
|
@ -4,7 +4,7 @@ import java.io.IOException;
|
|||||||
|
|
||||||
import org.insa.graph.Graph;
|
import org.insa.graph.Graph;
|
||||||
|
|
||||||
public interface AbstractGraphReader {
|
public interface GraphReader {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Read a graph an returns it.
|
* Read a graph an returns it.
|
@ -5,7 +5,7 @@ import java.io.IOException;
|
|||||||
import org.insa.graph.Graph;
|
import org.insa.graph.Graph;
|
||||||
import org.insa.graph.Path;
|
import org.insa.graph.Path;
|
||||||
|
|
||||||
public interface AbstractPathReader {
|
public interface PathReader {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Read a path of the given graph and returns it.
|
* Read a path of the given graph and returns it.
|
@ -4,7 +4,7 @@ import java.io.IOException;
|
|||||||
|
|
||||||
import org.insa.graph.Path;
|
import org.insa.graph.Path;
|
||||||
|
|
||||||
public interface AbstractPathWriter {
|
public interface PathWriter {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Write a path.
|
* Write a path.
|
@ -49,7 +49,7 @@ import org.insa.algo.weakconnectivity.WeaklyConnectedComponentsData;
|
|||||||
import org.insa.graph.Graph;
|
import org.insa.graph.Graph;
|
||||||
import org.insa.graph.Node;
|
import org.insa.graph.Node;
|
||||||
import org.insa.graph.Path;
|
import org.insa.graph.Path;
|
||||||
import org.insa.graph.io.AbstractGraphReader;
|
import org.insa.graph.io.GraphReader;
|
||||||
import org.insa.graph.io.BinaryGraphReader;
|
import org.insa.graph.io.BinaryGraphReader;
|
||||||
import org.insa.graph.io.BinaryGraphReaderV2;
|
import org.insa.graph.io.BinaryGraphReaderV2;
|
||||||
import org.insa.graph.io.BinaryPathReader;
|
import org.insa.graph.io.BinaryPathReader;
|
||||||
@ -286,7 +286,7 @@ public class MainWindow extends JFrame {
|
|||||||
JOptionPane.showMessageDialog(MainWindow.this, "Cannot open the selected file.");
|
JOptionPane.showMessageDialog(MainWindow.this, "Cannot open the selected file.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
AbstractGraphReader reader;
|
GraphReader reader;
|
||||||
if (path.endsWith(".map2") || path.endsWith("mapgr")) {
|
if (path.endsWith(".map2") || path.endsWith("mapgr")) {
|
||||||
reader = new BinaryGraphReaderV2(stream);
|
reader = new BinaryGraphReaderV2(stream);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user