langde von conf.ini -> langde.ini verschoben +
fixed alert -> del log, del tour, input errors (nurZahlen, nurPositive, keinText, zuerstTourDannLog) + Logo
This commit is contained in:
@ -72,7 +72,7 @@ public class AlertHelper {
|
||||
PrintWriter pw = new PrintWriter(sw);
|
||||
ex.printStackTrace(pw);
|
||||
String exceptionText = sw.toString();
|
||||
Label label = new Label(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "exceptionstackheader"));
|
||||
Label label = new Label(ConfigHelper.getLangIniString("exceptionstackheader"));
|
||||
TextArea textArea = new TextArea(exceptionText);
|
||||
textArea.setEditable(false);
|
||||
textArea.setWrapText(true);
|
||||
@ -145,10 +145,11 @@ public class AlertHelper {
|
||||
int resultInt = Integer.parseInt(result.get());
|
||||
returnText.set(resultInt);
|
||||
}catch (NumberFormatException e){
|
||||
AlertHelper.warn(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "achtung"), "Bitte nur Zahlen eingeben!", "Bitte geben sie nur Zahlen von 0 - 10 an!");
|
||||
AlertHelper.warn(ConfigHelper.getLangIniString("achtung"), "Bitte nur Zahlen eingeben!", "Bitte geben sie nur Zahlen von 0 - 10 an!");
|
||||
returnText.set(-1);
|
||||
}
|
||||
});
|
||||
|
||||
return returnText.get();
|
||||
}
|
||||
|
||||
|
||||
@ -11,6 +11,7 @@ import java.io.IOException;
|
||||
public class ConfigHelper {
|
||||
|
||||
public static String standartConfig = "conf.ini"; // Config.ini befindet sich im Root Verzeichnis
|
||||
public static String standartLangDe = "langde.ini"; // langde.ini befindet sich im Root Verzeichnis
|
||||
|
||||
/**
|
||||
* Liest einen Int aus der Config aus
|
||||
@ -48,6 +49,16 @@ public class ConfigHelper {
|
||||
return ini.get(sectionName, optionName, String.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* Liest einen String aus der Lang datei aus
|
||||
* Die Sprache wird im config file umgestellt
|
||||
* @param optionName Options Name
|
||||
* @return Den angeforderten String
|
||||
*/
|
||||
public static String getLangIniString(String optionName){
|
||||
return ConfigHelper.getIniString(ConfigHelper.getStandartLangde(), ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "lang", "lang"),optionName);
|
||||
}
|
||||
|
||||
/**
|
||||
* Setzt ein String in der Config
|
||||
* @param filename Speicherort
|
||||
@ -92,4 +103,12 @@ public class ConfigHelper {
|
||||
public static String getStandartConfig() {
|
||||
return standartConfig;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gibt den namen des standard langde file zurück
|
||||
* @return Name des standard langde files
|
||||
*/
|
||||
public static String getStandartLangde() {
|
||||
return standartLangDe;
|
||||
}
|
||||
}
|
||||
|
||||
@ -51,7 +51,7 @@
|
||||
<?import javafx.scene.paint.Color?>
|
||||
<?import javafx.scene.text.Font?>
|
||||
|
||||
<VBox prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/15.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="tourplaner.ui.TourplanerController">
|
||||
<VBox prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="tourplaner.ui.TourplanerController">
|
||||
<children>
|
||||
<MenuBar VBox.vgrow="NEVER">
|
||||
<menus>
|
||||
|
||||
@ -80,10 +80,10 @@ public class TourplanerController implements Initializable {
|
||||
uriString);
|
||||
desktop.browse(oURL);
|
||||
} catch (URISyntaxException | IOException e) {
|
||||
LogHelper.error(e.getMessage(), ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "openbrowsererror") + appname);
|
||||
AlertHelper.exerror(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "browserexception"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "openbrowsererror") + appname,
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "browserexceptionmsg"), e);
|
||||
LogHelper.error(e.getMessage(), ConfigHelper.getLangIniString("openbrowsererror") + appname);
|
||||
AlertHelper.exerror(ConfigHelper.getLangIniString("browserexception"),
|
||||
ConfigHelper.getLangIniString("openbrowsererror") + appname,
|
||||
ConfigHelper.getLangIniString("browserexceptionmsg"), e);
|
||||
}
|
||||
}
|
||||
|
||||
@ -105,7 +105,7 @@ public class TourplanerController implements Initializable {
|
||||
nameCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("name"));
|
||||
|
||||
//Log anzeigen
|
||||
logTableView.setPlaceholder(new Label( ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinelogsvorhanden")));
|
||||
logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinelogsvorhanden")));
|
||||
logTableView.setItems(this.viewModel.getLogData());
|
||||
logDauerCol.setCellValueFactory(new PropertyValueFactory<Log, String>("dauer"));
|
||||
logStreckeCol.setCellValueFactory(new PropertyValueFactory<Log, String>("strecke"));
|
||||
@ -137,9 +137,10 @@ public class TourplanerController implements Initializable {
|
||||
@FXML
|
||||
private void delTour(){
|
||||
this.beschreibungTableView.getItems().removeIf(s -> true); //löscht alles aus der tabelle
|
||||
this.titleTextView.setText(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinetourselected"));
|
||||
this.titleTextView.setText(ConfigHelper.getLangIniString("keinetourselected"));
|
||||
this.viewModel.delTour();
|
||||
logTableView.setPlaceholder(new Label( ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinetourselected")));
|
||||
this.viewModel.setSelectedTour(null);
|
||||
logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected")));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -150,9 +151,9 @@ public class TourplanerController implements Initializable {
|
||||
private void suche(){
|
||||
String sucheInput = this.sucheInput.getText();
|
||||
if(sucheInput.isEmpty()){
|
||||
AlertHelper.warn(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "achtung"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "suchfeldleer"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "suchtextzuerst"));
|
||||
AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
|
||||
ConfigHelper.getLangIniString("suchfeldleer"),
|
||||
ConfigHelper.getLangIniString("suchtextzuerst"));
|
||||
}else {
|
||||
this.viewModel.suche(sucheInput);
|
||||
}
|
||||
@ -166,9 +167,9 @@ public class TourplanerController implements Initializable {
|
||||
private void addLog(){
|
||||
Tour selectedTour = this.viewModel.getSelectedTour();
|
||||
if (selectedTour == null){
|
||||
AlertHelper.warn(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "achtung"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinetourselected"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "logtournotselectedmsg"));
|
||||
AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
|
||||
ConfigHelper.getLangIniString("keinetourselected"),
|
||||
ConfigHelper.getLangIniString("logtournotselectedmsg"));
|
||||
}else {
|
||||
ObservableList<Tour> tourData = this.viewModel.getTourData();
|
||||
tourData.forEach(s -> {
|
||||
@ -185,19 +186,19 @@ public class TourplanerController implements Initializable {
|
||||
double neueStrecke = -1;
|
||||
LocalDate neuesDatum = null;
|
||||
while (neuesDatum == null) {
|
||||
neuesDatum = AlertHelper.datePicker(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "datum"));
|
||||
neuesDatum = AlertHelper.datePicker(ConfigHelper.getLangIniString("datum"));
|
||||
}
|
||||
while (neueDauer == -1) {
|
||||
neueDauer = AlertHelper.inputNumber(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "dauer"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "dauermsg"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "dauer") +
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "doppelpunkt"));
|
||||
neueDauer = AlertHelper.inputNumber(ConfigHelper.getLangIniString("dauer"),
|
||||
ConfigHelper.getLangIniString("dauermsg"),
|
||||
ConfigHelper.getLangIniString("dauer") +
|
||||
ConfigHelper.getLangIniString("doppelpunkt"));
|
||||
}
|
||||
while (neueStrecke == -1) {
|
||||
neueStrecke = AlertHelper.inputNumber(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "strecke"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "streckemsg"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "strecke") +
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "doppelpunkt"));
|
||||
neueStrecke = AlertHelper.inputNumber(ConfigHelper.getLangIniString("strecke"),
|
||||
ConfigHelper.getLangIniString("streckemsg"),
|
||||
ConfigHelper.getLangIniString("strecke") +
|
||||
ConfigHelper.getLangIniString("doppelpunkt"));
|
||||
}
|
||||
|
||||
Log newLog = new Log(newId.get(), neueDauer + "", neuesDatum, neueStrecke);
|
||||
@ -213,6 +214,10 @@ public class TourplanerController implements Initializable {
|
||||
Log selectedLog = this.viewModel.getSelectedLog();
|
||||
if(selectedLog != null) {
|
||||
this.viewModel.delLog(selectedLog.getId());
|
||||
}else{
|
||||
AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
|
||||
ConfigHelper.getLangIniString("keinetourselected"),
|
||||
ConfigHelper.getLangIniString("deltournoselectmsg"));
|
||||
}
|
||||
}
|
||||
|
||||
@ -239,10 +244,10 @@ public class TourplanerController implements Initializable {
|
||||
TourListView.setOrientation(Orientation.VERTICAL);
|
||||
TourListView.setItems(this.viewModel.getTourNamen());
|
||||
//Tabs zu Tour -> rechts oben
|
||||
beschreibungTableView.setPlaceholder(new Label( ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinetourselected")));
|
||||
titleTextView.setText( ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinetourselected"));
|
||||
beschreibungTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected")));
|
||||
titleTextView.setText( ConfigHelper.getLangIniString("keinetourselected"));
|
||||
//Log -> rechts unten
|
||||
logTableView.setPlaceholder(new Label( ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinetourselected")));
|
||||
logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected")));
|
||||
|
||||
}
|
||||
|
||||
@ -251,9 +256,9 @@ public class TourplanerController implements Initializable {
|
||||
*/
|
||||
@FXML
|
||||
public void nimpButton(){
|
||||
AlertHelper.inform(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "achtung"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "fktnichtimplementiert"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "vergessenodernochnichtsoweit"));
|
||||
AlertHelper.inform(ConfigHelper.getLangIniString("achtung"),
|
||||
ConfigHelper.getLangIniString("fktnichtimplementiert"),
|
||||
ConfigHelper.getLangIniString("vergessenodernochnichtsoweit"));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -27,27 +27,27 @@ public class ViewModel {
|
||||
*/
|
||||
public void addTour(){
|
||||
while(this.neueTourName == null) {
|
||||
this.neueTourName = AlertHelper.inputText(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "tournametitle"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "tournameheader"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "tournamemsg"));
|
||||
this.neueTourName = AlertHelper.inputText(ConfigHelper.getLangIniString("tournametitle"),
|
||||
ConfigHelper.getLangIniString("tournameheader"),
|
||||
ConfigHelper.getLangIniString("tournamemsg"));
|
||||
if (getTour(this.neueTourName) != null) {
|
||||
AlertHelper.warn(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "achtung"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "namevergebenheader"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "namevergebenmsg1")
|
||||
AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
|
||||
ConfigHelper.getLangIniString("namevergebenheader"),
|
||||
ConfigHelper.getLangIniString("namevergebenmsg1")
|
||||
+ this.neueTourName +
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "namevergebenmsg2"));
|
||||
ConfigHelper.getLangIniString("namevergebenmsg2"));
|
||||
this.neueTourName = null;
|
||||
}
|
||||
}
|
||||
while(this.neueTourStart == null){
|
||||
this.neueTourStart = AlertHelper.inputText(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "startpunkttitle"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "startpunktheader"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "startpunktmsg"));
|
||||
this.neueTourStart = AlertHelper.inputText(ConfigHelper.getLangIniString("startpunkttitle"),
|
||||
ConfigHelper.getLangIniString("startpunktheader"),
|
||||
ConfigHelper.getLangIniString("startpunktmsg"));
|
||||
}
|
||||
while(this.neueTourZiel == null){
|
||||
this.neueTourZiel = AlertHelper.inputText(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "zielpunkttitle"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "zielpunktheader"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "zielpunktmsg"));
|
||||
this.neueTourZiel = AlertHelper.inputText(ConfigHelper.getLangIniString("zielpunkttitle"),
|
||||
ConfigHelper.getLangIniString("zielpunktheader"),
|
||||
ConfigHelper.getLangIniString("zielpunktmsg"));
|
||||
}
|
||||
if (getTour(this.neueTourName) == null) {
|
||||
tourData.add(new Tour(this.neueTourName, "TBD", "TBD", 0, this.neueTourStart, this.neueTourZiel));
|
||||
@ -202,11 +202,11 @@ public class ViewModel {
|
||||
tourNamen.removeIf(s -> s.equals(tourname));
|
||||
logData.removeIf(s -> true);
|
||||
}catch (NullPointerException e){
|
||||
LogHelper.error(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinetourselected"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "deltournoselect"));
|
||||
AlertHelper.warn(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "achtung"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinetourselected"),
|
||||
ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "deltournoselectmsg"));
|
||||
LogHelper.error(ConfigHelper.getLangIniString("keinetourselected"),
|
||||
ConfigHelper.getLangIniString("deltournoselect"));
|
||||
AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
|
||||
ConfigHelper.getLangIniString("keinetourselected"),
|
||||
ConfigHelper.getLangIniString("deltournoselectmsg"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user