Revert "IPTE-165: ON-OFF API Status"

This reverts commit 49630a3.

Author: mairKi

src/main/java/de/doubleslash/keeptime/view/SettingsController.java

@@ -17,7 +17,6 @@
 package de.doubleslash.keeptime.view;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -167,7 +166,7 @@ public class SettingsController {
    private TextField authName;
 
    @FXML
-   private PasswordField authPassword;
+   private PasswordField authPassword1;
 
    private ToggleGroup toggleGroup;
 
@@ -186,15 +185,6 @@ public class SettingsController {
    @FXML
    private TextField authPort;
 
-   @FXML
-   private Label labelPassword;
-
-   @FXML
-   private Label labelPort;
-
-   @FXML
-   private Label labelUsername;
-
    private String propertiesFilePath = "application.properties";
 
    private static final String GITHUB_PAGE = "https://www.github.com/doubleSlashde/KeepTime";
@@ -256,41 +246,8 @@ private void initialize() {
       radioApiOff.setToggleGroup(toggleGroup);
       radioApiOn.setToggleGroup(toggleGroup);
 
-      Properties properties = new Properties();
-      User user;
-      try (FileInputStream input = new FileInputStream(propertiesFilePath)) {
-         properties.load(input);
-         String apistatus = properties.getProperty("api");
-         System.err.println(apistatus);
-
-         if (apistatus.equals("ON")) {
-            radioApiOn.setSelected(true);
-            radioApiOff.setSelected(false);
-            authPort.setText(properties.getProperty("server.port"));
-            authName.setText(properties.getProperty("authUsername"));
-            //            labelPort.setDisable(false);
-            //            labelUsername.setDisable(false);
-            //            labelPassword.setDisable(false);
-            //            authPort.setDisable(false);
-            //            authName.setDisable(false);
-            //            authPassword.setDisable(false);
-            System.err.println("--------");
-         } else if (apistatus.equals("OFF")) {
-            radioApiOn.setSelected(false);
-            radioApiOff.setSelected(true);
-            //            labelPort.setDisable(true);
-            //            labelUsername.setDisable(true);
-            //            labelPassword.setDisable(true);
-            //            authPort.setDisable(true);
-            //            authName.setDisable(true);
-            //            authPassword.setDisable(true);
-            System.err.println("+++++++++");
-         }
-      } catch (IOException e) {
-         e.printStackTrace();
-      }
-
       LOG.debug("saveButton.setOnAction");
+
       saveButton.setOnAction(ae -> {
          LOG.info("Save clicked");
 
@@ -629,24 +586,18 @@ private void showLicense(final Licenses license) {
    }
 
    private void handleApiOff() {
-      Map<String, String> propertiesToUpdate = new HashMap<>();
       setWebApplicationType("none");
-      propertiesToUpdate.put("api", "OFF");
-      propertyWrite(propertiesToUpdate);
-
    }
 
    private void handleApiOn() {
       username = authName.getText();
-      password = authPassword.getText();
+      password = authPassword1.getText();
 
       createAndSaveUser(username, password);
 
       Map<String, String> propertiesToUpdate = new HashMap<>();
       propertiesToUpdate.put("spring.main.web-application-type", "");
       propertiesToUpdate.put("server.port", authPort.getText());
-      propertiesToUpdate.put("api", "ON");
-      propertiesToUpdate.put("authUsername", username);
 
       propertyWrite(propertiesToUpdate);
    }

src/main/resources/layouts/settings.fxml

@@ -372,24 +372,24 @@
                <content>
                   <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="420.0" prefWidth="407.0">
                      <children>
-                        <Label fx:id="labelUsername" layoutX="24.0" layoutY="169.0" text="Username:" />
+                        <Label layoutX="24.0" layoutY="169.0" text="Username:" />
                         <Label layoutX="14.0" layoutY="14.0" prefHeight="28.0" prefWidth="279.0" text="Rest API Authentication">
                            <font>
                               <Font name="System Bold" size="13.0" />
                            </font>
                         </Label>
-                        <Label fx:id="labelPassword" layoutX="24.0" layoutY="219.0" text="Password:" />
-                        <TextField fx:id="authName" layoutX="97.0" layoutY="166.0" prefHeight="26.0" prefWidth="298.0" />
+                        <Label layoutX="24.0" layoutY="219.0" text="Password:" />
+                        <TextField fx:id="authName" layoutX="97.0" layoutY="166.0" prefHeight="26.0" prefWidth="298.0" promptText="User" />
                         <Label layoutX="24.0" layoutY="70.0" text="Auth" />
-                        <Label fx:id="labelPort" layoutX="26.0" layoutY="124.0" text="Port:" />
+                        <Label layoutX="26.0" layoutY="124.0" text="Port:" />
                         <TextField fx:id="authPort" layoutX="97.0" layoutY="120.0" prefHeight="26.0" prefWidth="298.0" promptText="8080" />
                         <RadioButton fx:id="radioApiOn" layoutX="88.0" layoutY="64.0" mnemonicParsing="false" text="ON">
                            <toggleGroup>
                               <ToggleGroup fx:id="authAPI" />
                            </toggleGroup>
                         </RadioButton>
                         <RadioButton fx:id="radioApiOff" layoutX="219.0" layoutY="64.0" mnemonicParsing="false" text="OFF" toggleGroup="$authAPI" />
-                        <PasswordField fx:id="authPassword" layoutX="97.0" layoutY="215.0" prefHeight="26.0" prefWidth="298.0" />
+                        <PasswordField fx:id="authPassword1" layoutX="97.0" layoutY="215.0" prefHeight="26.0" prefWidth="298.0" />
                      </children></AnchorPane>
                </content>
                <graphic>