Compare commits
No commits in common. "master" and "2.1.1" have entirely different histories.
3
.gitignore
vendored
3
.gitignore
vendored
@ -4,5 +4,4 @@ log/
|
|||||||
reports/
|
reports/
|
||||||
.idea/dataSources*
|
.idea/dataSources*
|
||||||
doxygendoc/
|
doxygendoc/
|
||||||
javadoc/
|
javadoc/
|
||||||
TourplanerImages/
|
|
@ -102,7 +102,6 @@ public class TourPlaner{
|
|||||||
* @return Path zu dem Bild für die GUI
|
* @return Path zu dem Bild für die GUI
|
||||||
*/
|
*/
|
||||||
public static String getImagePath(String tourname){
|
public static String getImagePath(String tourname){
|
||||||
System.out.println(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + tourname + ".jpg");
|
|
||||||
return ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + tourname + ".jpg";
|
return ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + tourname + ".jpg";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -11,7 +11,6 @@ import tourplaner.object.Tour;
|
|||||||
import tourplaner.ui.ProgressBar;
|
import tourplaner.ui.ProgressBar;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.io.File;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.net.URISyntaxException;
|
import java.net.URISyntaxException;
|
||||||
@ -34,7 +33,7 @@ public class ViewModel {
|
|||||||
|
|
||||||
|
|
||||||
public Image getImage(String tourname){
|
public Image getImage(String tourname){
|
||||||
return new Image(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "file_pre") + new File(TourPlaner.getImagePath(tourname)).getAbsolutePath());
|
return new Image( ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "file_pre") + TourPlaner.getImagePath(tourname));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user