Skip to content

Commit 8aa48c2

Browse files
committed
Refactoring
1 parent d906385 commit 8aa48c2

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

src/main/java/org/flightgear/terramaster/HTTPTerraSync.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ private void sync() {
223223

224224
TerraSyncDirectoryTypes[] types = n.getTypes();
225225
for (TerraSyncDirectoryTypes terraSyncDirectoryType : types) {
226-
int updates = syncDirectory(terraSyncDirectoryType.dirname + n.buildPath(), false, terraSyncDirectoryType);
226+
int updates = syncDirectory(terraSyncDirectoryType.getDirname() + n.buildPath(), false, terraSyncDirectoryType);
227227
invokeLater(UPDATETYPE.UPDATE, DIR_SIZE - updates); // update progressBar
228228
}
229229

@@ -775,7 +775,7 @@ public Map<TileName, TileData> newScnMap(String path) {
775775
Map<TileName, TileData> map = new HashMap<>(180 * 90);
776776

777777
for (TerraSyncDirectoryTypes terraSyncDirectoryType : types) {
778-
File d = new File(path + File.separator + terraSyncDirectoryType.dirname);
778+
File d = new File(path + File.separator + terraSyncDirectoryType.getDirname());
779779
File[] list = d.listFiles();
780780
if (list != null) {
781781
// list of 10x10 dirs

src/main/java/org/flightgear/terramaster/TerraMaster.java

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ void createAndShowGUI() {
6565
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
6666
frame.setVisible(true);
6767
frame.toFront();
68+
new VersionChecker(this).run();
6869
}
6970

7071
public static void main(String[] args) {

src/main/java/org/flightgear/terramaster/TerraSyncDirectoryTypes.java

+10-2
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,24 @@ public enum TerraSyncDirectoryTypes {
1212
TERRAIN("Terrain", 0, true), OBJECTS("Objects", 1, true), MODELS("Models",
1313
2, false), AIRPORTS("Airports", 3, false), BUILDINGS("Buildings", 4, false), PYLONS("Pylons", 4, true), ROADS("Roads", 4, true);
1414

15-
String dirname = null;
15+
private String dirname = null;
1616
private boolean tile;
1717

1818
public synchronized boolean isTile() {
1919
return tile;
2020
}
2121

2222
TerraSyncDirectoryTypes(String name, int index, boolean tile) {
23-
this.dirname = name + "/";
23+
this.setDirname(name + "/");
2424
this.tile = tile;
2525
}
2626

27+
public String getDirname() {
28+
return dirname;
29+
}
30+
31+
public void setDirname(String dirname) {
32+
this.dirname = dirname;
33+
}
34+
2735
}

src/main/java/org/flightgear/terramaster/TileName.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public TileName getNeighbour(int i, int j) {
155155
/**
156156
* Returns a TileIndex for the given lat/lon
157157
* @see <a href="http://wiki.flightgear.org/Tile_Index_Scheme">http://wiki.flightgear.org/Tile_Index_Scheme</a>
158-
* @param p
158+
* @param p (x lon, y lat)
159159
* @return
160160
*/
161161

@@ -183,7 +183,7 @@ public static int getTileIndex(Point2D.Double p) {
183183
* @return
184184
*/
185185

186-
private static double getTileWidth(Double p) {
186+
public static double getTileWidth(Double p) {
187187
if (Math.abs(p.y) < 22)
188188
return 0.125;
189189
if (Math.abs(p.y) < 62)

0 commit comments

Comments
 (0)