real license names in table view; modified layout

Author: Martin Plieske

src/main/java/de/doubleslash/keeptime/common/Licenses.java

@@ -2,19 +2,27 @@
 
 public enum Licenses {
 
-   GPLV3("./licenses/GNU General Public License (GPL), Version 3.0.txt"),
-   EPLV1("./licenses/EPL 1.0.txt"),
-   APACHEV2("./licenses/Apache License, Version 2.0.txt"),
-   LGPLV3("./licenses/GNU Lesser General Public License (LGPL), Version 3.0.txt"),
-   MIT("./licenses/The MIT License.txt");
+   GPLV3("./licenses/GNU General Public License (GPL), Version 3.0.txt", "GNU General Public License Version 3.0"),
+   EPLV1("./licenses/EPL 1.0.txt", "Eclipse Public License 1.0"),
+   APACHEV2("./licenses/Apache License, Version 2.0.txt", "Apache License Version 2.0"),
+   LGPLV3(
+         "./licenses/GNU Lesser General Public License (LGPL), Version 3.0.txt",
+         "GNU Lesser General Public License Version 3.0"),
+   MIT("./licenses/The MIT License.txt", "The MIT License");
 
    private final String path;
+   private final String name;
 
-   Licenses(final String licensePath) {
+   Licenses(final String licensePath, final String licenseName) {
       path = licensePath;
+      name = licenseName;
    }
 
    public String getPath() {
       return path;
    }
+
+   public String getName() {
+      return name;
+   }
 }

src/main/java/de/doubleslash/keeptime/model/LicenceTableRow.java

@@ -4,11 +4,13 @@
 
 public class LicenceTableRow {
    private String name;
+   private String licenseName;
    private Licenses license;
 
-   public LicenceTableRow(final String softwareName, final Licenses licenceName) {
-      this.license = licenceName;
-      this.name = softwareName;
+   public LicenceTableRow(final String name, final Licenses license) {
+      this.license = license;
+      this.licenseName = license.getName();
+      this.name = name;
    }
 
    public String getName() {
@@ -19,6 +21,14 @@ public void setName(final String name) {
       this.name = name;
    }
 
+   public String getLicenseName() {
+      return licenseName;
+   }
+
+   public void setLicenseName(final String licenseName) {
+      this.licenseName = licenseName;
+   }
+
    public Licenses getLicense() {
       return license;
    }

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

@@ -23,7 +23,7 @@
 public class AboutController {
 
    private static final String GITHUB_PAGE = "https://www.github.com/doubleSlashde/KeepTime";
-   private static final String GITHUB_ISSUE_PAGE = "/issues";
+   private static final String GITHUB_ISSUE_PAGE = GITHUB_PAGE + "/issues";
 
    private final FileOpenHelper fileOpen = new FileOpenHelper();
    private final BrowserHelper browserOpen = new BrowserHelper();
@@ -51,14 +51,14 @@ public void initialize() {
       // name column
       TableColumn<LicenceTableRow, String> nameColumn;
       nameColumn = new TableColumn<>("Name");
-      nameColumn.setMinWidth(100);
+      nameColumn.setMinWidth(160);
       nameColumn.setCellValueFactory(new PropertyValueFactory<>("name"));
 
       // licenseColumn
-      TableColumn<LicenceTableRow, Licenses> licenseColumn;
+      TableColumn<LicenceTableRow, String> licenseColumn;
       licenseColumn = new TableColumn<>("License");
-      licenseColumn.setMinWidth(200);
-      licenseColumn.setCellValueFactory(new PropertyValueFactory<>("license"));
+      licenseColumn.setMinWidth(260);
+      licenseColumn.setCellValueFactory(new PropertyValueFactory<>("licenseName"));
 
       final ObservableList<LicenceTableRow> licenses = loadRows();
 
@@ -75,7 +75,7 @@ public void initialize() {
             if (!row.isEmpty() && event.getButton() == MouseButton.PRIMARY && event.getClickCount() == 2) {
                final LicenceTableRow clickedRow = row.getItem();
                final Licenses license = clickedRow.getLicense();
-               LOG.debug("License file name: {}", license.getPath());
+               LOG.debug("License file name: {}", license);
 
                fileOpen.openFile(license.getPath());
             }
@@ -92,7 +92,7 @@ public void initialize() {
       LOG.debug("roportbugbutton setonaction");
       reportBugButton.setOnAction(ae -> {
          LOG.info("Clicked reportBugButton");
-         browserOpen.openURL(GITHUB_PAGE + GITHUB_ISSUE_PAGE);
+         browserOpen.openURL(GITHUB_ISSUE_PAGE);
       });
    }
 

src/main/resources/layouts/about.fxml

@@ -8,7 +8,7 @@
 <?import javafx.scene.shape.Line?>
 <?import javafx.scene.text.Font?>
 
-<Pane fx:id="mainContainer" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="460.0" prefWidth="559.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.AboutController">
+<Pane fx:id="mainContainer" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="486.0" prefWidth="559.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.AboutController">
    <children>
       <Label fx:id="keepTimeLabel" layoutX="220.0" layoutY="50.0" text="KeepTime">
          <font>
@@ -42,12 +42,12 @@
             <Font name="Open Sans Regular" size="14.0" />
          </font>
       </Label>
-      <Button fx:id="reportBugButton" layoutX="377.0" layoutY="356.0" mnemonicParsing="false" prefWidth="120.0" text="report a bug">
+      <Button fx:id="reportBugButton" layoutX="378.0" layoutY="288.0" mnemonicParsing="false" prefWidth="120.0" text="report a bug">
          <font>
             <Font name="Open Sans Regular" size="14.0" />
          </font>
       </Button>
-      <TableView fx:id="licenseTableView" layoutX="62.0" layoutY="331.0" prefHeight="120.0" prefWidth="300.0" />
+      <TableView fx:id="licenseTableView" layoutX="62.0" layoutY="331.0" prefHeight="120.0" prefWidth="437.0" />
       <Label fx:id="versionNumberLabel" layoutX="120.0" layoutY="131.0" text="1.0.0">
          <font>
             <Font name="Open Sans Regular" size="14.0" />