#178: rename controller to be consistent

Author: Death111

…/view/MapExternalProjectsController.java …/view/ExternalProjectsMapController.javasrc/main/java/de/doubleslash/keeptime/view/MapExternalProjectsController.java renamed to src/main/java/de/doubleslash/keeptime/view/ExternalProjectsMapController.java src/main/java/de/doubleslash/keeptime/view/MapExternalProjectsController.java renamed to src/main/java/de/doubleslash/keeptime/view/ExternalProjectsMapController.java

@@ -46,9 +46,9 @@
 import java.util.Optional;
 
 @Component
-public class MapExternalProjectsController {
+public class ExternalProjectsMapController {
 
-   private static final Logger LOG = LoggerFactory.getLogger(MapExternalProjectsController.class);
+   private static final Logger LOG = LoggerFactory.getLogger(ExternalProjectsMapController.class);
 
    private final Model model;
    private final Controller controller;
@@ -71,7 +71,7 @@ public class MapExternalProjectsController {
    @FXML
    private DatePicker tasksForDateDatePicker;
 
-   public MapExternalProjectsController(final Model model, Controller controller, HeimatController heimatController) {
+   public ExternalProjectsMapController(final Model model, Controller controller, HeimatController heimatController) {
       this.model = model;
       this.controller = controller;
       this.heimatController = heimatController;

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

@@ -31,7 +31,6 @@
 import de.doubleslash.keeptime.controller.HeimatController;
 import de.doubleslash.keeptime.exceptions.FXMLLoaderException;
 import de.doubleslash.keeptime.model.settings.HeimatSettings;
-import de.doubleslash.keeptime.rest.integration.heimat.HeimatAPI;
 import de.doubleslash.keeptime.rest.integration.heimat.JwtDecoder;
 import javafx.beans.binding.Bindings;
 import javafx.fxml.FXMLLoader;
@@ -44,15 +43,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 import de.doubleslash.keeptime.ApplicationProperties;
 import de.doubleslash.keeptime.common.*;
 import de.doubleslash.keeptime.common.Resources.RESOURCE;
 import de.doubleslash.keeptime.controller.Controller;
 import de.doubleslash.keeptime.model.Model;
-import de.doubleslash.keeptime.model.Settings;
 import de.doubleslash.keeptime.view.license.LicenseTableRow;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
@@ -468,7 +465,7 @@ private void showMapProjectsStage() {
          final FXMLLoader fxmlLoader2 = createFXMLLoader(RESOURCE.FXML_EXT_PROJECT_MAPPING);
          fxmlLoader2.setControllerFactory(model.getSpringContext()::getBean);
          final Parent settingsRoot = fxmlLoader2.load();
-         MapExternalProjectsController settingsController = fxmlLoader2.getController();
+         ExternalProjectsMapController settingsController = fxmlLoader2.getController();
          Stage settingsStage = new Stage();
          settingsController.setStage(settingsStage);
          settingsStage.initModality(Modality.APPLICATION_MODAL);

src/main/resources/layouts/externalProjectMapping.fxml

@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 
-<AnchorPane prefHeight="600.0" prefWidth="700.0" style="-fx-background-color: white;" stylesheets="@../css/dsStyles.css" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.MapExternalProjectsController">
+<AnchorPane prefHeight="600.0" prefWidth="700.0" style="-fx-background-color: white;" stylesheets="@../css/dsStyles.css" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ExternalProjectsMapController">
    <children>
       <TableView fx:id="mappingTableView" layoutY="50.0" prefHeight="500.0" prefWidth="600.0" AnchorPane.bottomAnchor="40.0" AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="40.0" />
       <HBox layoutX="429.0" layoutY="555.0" spacing="5.0" AnchorPane.bottomAnchor="5.0" AnchorPane.rightAnchor="5.0">