small changes

* some formatting
* exchanged license with cc by 4.0 text
* adapted clipboard icon

Author: Death111

pom.xml

@@ -31,17 +31,6 @@
     <relativePath /> <!-- lookup parent from repository -->
   </parent>
 
-  <repositories>
-
-    <!-- needed to resolve against central first-->
-    <repository>
-      <id>central</id>
-      <name>Maven Central</name>
-      <layout>default</layout>
-      <url>https://repo1.maven.org/maven2</url>
-    </repository>
-  </repositories>
-
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

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

@@ -31,14 +31,9 @@ public enum Licenses {
          "./licenses/GNU Lesser General Public License (LGPL), Version 3.0.txt",
          "GNU Lesser General Public License Version 3.0",
          "https://www.gnu.org/licenses/lgpl-3.0.de.html"),
-   MIT("./licenses/The MIT License.txt",
-           "The MIT License",
-           "https://opensource.org/licenses/MIT"),
-
-   FONTAWESOME("./licenses/Fontawesome Icons — CC BY 4.0 License.txt",
-           "Fontawesome Icons — CC BY 4.0 License ",
-           "http://creativecommons.org/licenses/by/4.0/");
+   MIT("./licenses/The MIT License.txt", "The MIT License", "https://opensource.org/licenses/MIT"),
 
+   CC_4_0("./licenses/CC BY 4.0 License.txt", "CC BY 4.0 License", "https://creativecommons.org/licenses/by/4.0/");
 
    private final String path;
    private final String name;

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

@@ -53,10 +53,9 @@ public enum RESOURCE {
 
       SVG_PENCIL_ICON("/svgs/pencil.svg"),
 
-      SVG_FLOPPY_DISK_ICON("/svgs/floppy-disk.svg"),
-
-      SVG_BUG_ICON("/svgs/bug.svg")
+      SVG_CLIPBOARD("/svgs/clipboard.svg"),
 
+      SVG_BUG_ICON("/svgs/bug.svg"),
 
       ;
 

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

@@ -13,7 +13,7 @@
 import java.io.InputStream;
 
 /**
- * class loads SvgPath from a SvgFile because Java can not load the original svg file as it is.
+ * Class loads SvgPath from a SvgFile because Java can not load the original svg file as it is.
  * <p>
  * To load the svg the class extracts the path as string and creates a new SvgPath and returns it.
  */
@@ -42,7 +42,7 @@ public static String getSvgPathWithXMl(Resources.RESOURCE resource) {
       return svgPath;
    }
 
-   public static Node getSvgNodeWithScale(Resources.RESOURCE resource, Double scaleX , Double scaleY) {
+   public static Node getSvgNodeWithScale(Resources.RESOURCE resource, Double scaleX, Double scaleY) {
       SVGPath iconSvg = new SVGPath();
       iconSvg.setContent(getSvgPathWithXMl(resource));
       iconSvg.setScaleX(scaleX);

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

@@ -18,25 +18,26 @@
 
 import java.util.Comparator;
 
-import de.doubleslash.keeptime.common.*;
-import javafx.geometry.Pos;
-import javafx.scene.Group;
-import javafx.scene.control.*;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.Background;
-import javafx.scene.shape.SVGPath;
-import javafx.scene.text.TextAlignment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import de.doubleslash.keeptime.ApplicationProperties;
-import de.doubleslash.keeptime.Main;
+import de.doubleslash.keeptime.common.BrowserHelper;
+import de.doubleslash.keeptime.common.FileOpenHelper;
+import de.doubleslash.keeptime.common.Licenses;
 import de.doubleslash.keeptime.view.license.LicenseTableRow;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
+import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.Button;
+import javafx.scene.control.Hyperlink;
+import javafx.scene.control.Label;
+import javafx.scene.control.TableCell;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.input.MouseButton;
 import javafx.scene.layout.Region;
@@ -55,9 +56,6 @@ public class AboutController {
    @FXML
    private Button reportBugButton;
 
-   @FXML
-   private SVGPath contentId;
-
    @FXML
    private Label versionNumberLabel;
 
@@ -71,10 +69,10 @@ public class AboutController {
 
    private final ApplicationProperties applicationProperties;
 
-   public AboutController (ApplicationProperties applicationProperties) {
-	   this.applicationProperties = applicationProperties;
+   public AboutController(ApplicationProperties applicationProperties) {
+      this.applicationProperties = applicationProperties;
    }
-   
+
    @FXML
    public void initialize() {
       LOG.debug("set version label");
@@ -90,7 +88,6 @@ public void initialize() {
       nameColumn.setMinWidth(160);
 
       nameColumn.setCellValueFactory(new PropertyValueFactory<>("name"));
-      //Set Bug Icon to reportBugButton
 
       // licenseColumn
       final TableColumn<LicenseTableRow, String> licenseColumn = new TableColumn<>("License");
@@ -151,7 +148,7 @@ public ObservableList<LicenseTableRow> loadLicenseRows() {
       licenseRows.add(new LicenseTableRow("spring-boot-starter-data-jpa", Licenses.APACHEV2));
       licenseRows.add(new LicenseTableRow("mockito-core", Licenses.MIT));
       licenseRows.add(new LicenseTableRow("h2", Licenses.EPLV1));
-      licenseRows.add(new LicenseTableRow("Fontawesome", Licenses.FONTAWESOME));
+      licenseRows.add(new LicenseTableRow("Font Awesome Icons", Licenses.CC_4_0));
 
       licenseRows.sort(Comparator.comparing(LicenseTableRow::getName));
 

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

@@ -25,8 +25,6 @@
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 
-import de.doubleslash.keeptime.common.SvgNodeProvider;
-import javafx.scene.control.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +35,7 @@
 import de.doubleslash.keeptime.common.DateFormatter;
 import de.doubleslash.keeptime.common.Resources;
 import de.doubleslash.keeptime.common.Resources.RESOURCE;
+import de.doubleslash.keeptime.common.SvgNodeProvider;
 import de.doubleslash.keeptime.controller.Controller;
 import de.doubleslash.keeptime.exceptions.FXMLLoaderException;
 import de.doubleslash.keeptime.model.Model;
@@ -52,7 +51,20 @@
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
 import javafx.scene.canvas.Canvas;
+import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.ContentDisplay;
+import javafx.scene.control.DateCell;
+import javafx.scene.control.DatePicker;
+import javafx.scene.control.Dialog;
+import javafx.scene.control.Label;
+import javafx.scene.control.Tooltip;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeTableCell;
+import javafx.scene.control.TreeTableColumn;
+import javafx.scene.control.TreeTableView;
 import javafx.scene.control.cell.TreeItemPropertyValueFactory;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
@@ -63,6 +75,7 @@
 import javafx.scene.shape.Circle;
 import javafx.stage.Stage;
 import javafx.util.Callback;
+
 @Component
 public class ReportController {
 
@@ -187,19 +200,22 @@ private void updateReport(final LocalDate dateToShow) {
 
       this.currentDayLabel.setText(DateFormatter.toDayDateString(this.currentReportDate));
       final List<Work> currentWorkItems = model.getWorkRepository()
-            .findByStartDateOrderByStartTimeAsc(this.currentReportDate);
+                                               .findByStartDateOrderByStartTimeAsc(this.currentReportDate);
 
       colorTimeLine.update(currentWorkItems, controller.calcSeconds(currentWorkItems));
 
-      final SortedSet<Project> workedProjectsSet = currentWorkItems.stream().map(Work::getProject)
-            .collect(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(Project::getIndex))));
+      final SortedSet<Project> workedProjectsSet = currentWorkItems.stream()
+                                                                   .map(Work::getProject)
+                                                                   .collect(Collectors.toCollection(() -> new TreeSet<>(
+                                                                         Comparator.comparing(Project::getIndex))));
 
       long currentWorkSeconds = 0;
       long currentSeconds = 0;
 
       for (final Project project : workedProjectsSet) {
-         final List<Work> onlyCurrentProjectWork = currentWorkItems.stream().filter(w -> w.getProject() == project)
-               .collect(Collectors.toList());
+         final List<Work> onlyCurrentProjectWork = currentWorkItems.stream()
+                                                                   .filter(w -> w.getProject() == project)
+                                                                   .collect(Collectors.toList());
 
          final long projectWorkSeconds = controller.calcSeconds(onlyCurrentProjectWork);
 
@@ -269,11 +285,12 @@ public void updateItem(final LocalDate item, final boolean empty) {
    }
 
    private Button createDeleteWorkButton(final Work w) {
-      final Button deleteButton;
-      deleteButton = new Button("", SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_TRASH_ICON,0.03,0.03));
+      final Button deleteButton = new Button("",
+            SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_TRASH_ICON, 0.03, 0.03));
       deleteButton.setMaxSize(20, 18);
       deleteButton.setMinSize(20, 18);
       deleteButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+
       deleteButton.setOnAction(e -> {
          LOG.info("Delete work clicked.");
          final Alert alert = new Alert(AlertType.CONFIRMATION);
@@ -295,10 +312,12 @@ private Button createDeleteWorkButton(final Work w) {
    }
 
    private Button createEditWorkButton(final Work work) {
-      final Button editButton = new Button("",SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_PENCIL_ICON, 0.03 ,0.03));
+      final Button editButton = new Button("",
+            SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_PENCIL_ICON, 0.03, 0.03));
       editButton.setMaxSize(20, 18);
       editButton.setMinSize(20, 18);
       editButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+
       editButton.setOnAction(e -> {
          LOG.info("Edit work clicked.");
          final Dialog<Work> dialog = setupEditWorkDialog(work);
@@ -355,10 +374,11 @@ private GridPane setUpEditWorkGridPane(final Work work, final Dialog<Work> dialo
    }
 
    private Button createCopyProjectButton(final List<Work> projectWork) {
-      final Button copyButton = new Button("", SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_FLOPPY_DISK_ICON, 0.03 ,0.03));
+      final Button copyButton = new Button("", SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_CLIPBOARD, 0.03, 0.03));
       copyButton.setMaxSize(20, 18);
       copyButton.setMinSize(20, 18);
       copyButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+
       final EventHandler<ActionEvent> eventListener = actionEvent -> {
          LOG.debug("Copy to Clipboard clicked.");
          final ProjectReport pr = new ProjectReport(projectWork.size());
@@ -378,7 +398,7 @@ private Button createCopyProjectButton(final List<Work> projectWork) {
    }
 
    private Node createCopyWorkButton(final Work w) {
-      final Button copyButton = new Button("", SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_FLOPPY_DISK_ICON, 0.03 ,0.03));
+      final Button copyButton = new Button("", SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_CLIPBOARD, 0.03, 0.03));
       copyButton.setMaxSize(20, 18);
       copyButton.setMinSize(20, 18);
       copyButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);