Skip to content

Commit

Permalink
Added more module-info.java files. Replaced fontawesomefx with ikonli.
Browse files Browse the repository at this point in the history
  • Loading branch information
dlemmermann committed Sep 25, 2019
1 parent 823f3fa commit 992f9e3
Show file tree
Hide file tree
Showing 30 changed files with 1,447 additions and 827 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
public class IntroPaneApp extends Application {

@Override
public void start(Stage primaryStage) throws Exception {
public void start(Stage primaryStage) {
CalendarView calendarView = new CalendarView();

Calendar katja = new Calendar("Katja");
Expand Down

This file was deleted.

This file was deleted.

6 changes: 6 additions & 0 deletions CalendarFXExperimental/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module com.calendarfx.experimental {
requires javafx.controls;
requires com.calendarfx.view;

exports com.calendarfx.experimental;
}
12 changes: 6 additions & 6 deletions CalendarFXGoogle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>12.0.1</version>
<version>13</version>
</dependency>

<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-web</artifactId>
<version>12.0.1</version>
<version>13</version>
</dependency>

<dependency>
Expand All @@ -66,25 +66,25 @@
<dependency>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client</artifactId>
<version>1.22.0</version>
<version>1.30.4</version>
</dependency>

<dependency>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client-java6</artifactId>
<version>1.30.2</version>
<version>1.30.4</version>
</dependency>

<dependency>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client-jackson2</artifactId>
<version>1.30.2</version>
<version>1.30.4</version>
</dependency>

<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-calendar</artifactId>
<version>v3-rev20190609-1.30.1</version>
<version>v3-rev20190910-1.30.1</version>
</dependency>

<dependency>
Expand Down
134 changes: 134 additions & 0 deletions CalendarFXGoogle/pom.xml.versionsBackup
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
<!--
~ Copyright (C) 2017 Dirk Lemmermann Software & Consulting (dlsc.com)
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>
<name>CalendarFXGoogle</name>
<artifactId>google</artifactId>

<parent>
<groupId>com.calendarfx</groupId>
<artifactId>calendar</artifactId>
<version>11.6.4</version>
</parent>

<properties>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>

<dependencies>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>12.0.1</version>
</dependency>

<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-web</artifactId>
<version>12.0.1</version>
</dependency>

<dependency>
<groupId>com.lynden</groupId>
<artifactId>GMapsFX</artifactId>
<version>2.12.0</version>
</dependency>

<!-- Required for GMapsFX -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.0-alpha0</version>
</dependency>

<dependency>
<groupId>com.calendarfx</groupId>
<artifactId>view</artifactId>
<version>11.6.4</version>
</dependency>

<dependency>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client</artifactId>
<version>1.22.0</version>
</dependency>

<dependency>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client-java6</artifactId>
<version>1.30.2</version>
</dependency>

<dependency>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client-jackson2</artifactId>
<version>1.30.2</version>
</dependency>

<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-calendar</artifactId>
<version>v3-rev20190609-1.30.1</version>
</dependency>

<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-oauth2</artifactId>
<version>v2-rev20190313-1.30.1</version>
</dependency>

<dependency>
<groupId>com.google.code.geocoder-java</groupId>
<artifactId>geocoder-java</artifactId>
<version>0.16</version>
</dependency>


</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<configuration>
<finalName>google-demo</finalName>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<appendAssemblyId>false</appendAssemblyId>
<archive>
<manifest>
<mainClass>com.calendarfx.google.GoogleCalendarApp</mainClass>
</manifest>
</archive>
</configuration>
<executions>
<execution>
<id>make-samples</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@

package com.calendarfx.google.view.log;

import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon;
import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView;
import javafx.scene.paint.Color;
import org.kordamp.ikonli.Ikon;
import org.kordamp.ikonli.fontawesome.FontAwesome;
import org.kordamp.ikonli.javafx.FontIcon;

/**
* Status of the google task.
Expand All @@ -34,8 +35,8 @@ public String getDisplayName() {
}

@Override
public FontAwesomeIcon getIcon() {
return FontAwesomeIcon.CHECK;
public Ikon getIcon() {
return FontAwesome.CHECK;
}

@Override
Expand All @@ -51,8 +52,8 @@ public String getDisplayName() {
}

@Override
public FontAwesomeIcon getIcon() {
return FontAwesomeIcon.EXCLAMATION_TRIANGLE;
public Ikon getIcon() {
return FontAwesome.EXCLAMATION_TRIANGLE;
}

@Override
Expand All @@ -68,8 +69,8 @@ public String getDisplayName() {
}

@Override
public FontAwesomeIcon getIcon() {
return FontAwesomeIcon.CLOSE;
public Ikon getIcon() {
return FontAwesome.CLOSE;
}

@Override
Expand All @@ -85,8 +86,8 @@ public String getDisplayName() {
}

@Override
public FontAwesomeIcon getIcon() {
return FontAwesomeIcon.EXCLAMATION_CIRCLE;
public Ikon getIcon() {
return FontAwesome.EXCLAMATION_CIRCLE;
}

@Override
Expand All @@ -97,12 +98,12 @@ public Color getColor() {

public abstract String getDisplayName();

public abstract FontAwesomeIcon getIcon();
public abstract Ikon getIcon();

public abstract Color getColor();

public FontAwesomeIconView createView() {
FontAwesomeIconView view = new FontAwesomeIconView(getIcon());
public FontIcon createView() {
FontIcon view = new FontIcon(getIcon());
view.setFill(getColor());
return view;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
import com.calendarfx.google.view.log.LogPane;
import com.calendarfx.google.view.log.StatusType;
import com.google.api.client.util.Lists;
import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon;
import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView;
import javafx.beans.InvalidationListener;
import javafx.beans.Observable;
import javafx.event.Event;
Expand All @@ -43,6 +41,8 @@
import javafx.scene.input.KeyEvent;
import javafx.scene.layout.BorderPane;
import org.controlsfx.control.MasterDetailPane;
import org.kordamp.ikonli.fontawesome.FontAwesome;
import org.kordamp.ikonli.javafx.FontIcon;

import java.io.PrintWriter;
import java.io.StringWriter;
Expand Down Expand Up @@ -97,12 +97,12 @@ public LogPaneSkin(LogPane control, TableView<LogItem> table) {
private ToolBar createToolBar() {
Button clearAllBtn = new Button();
clearAllBtn.setText("Clear All");
clearAllBtn.setGraphic(new FontAwesomeIconView(FontAwesomeIcon.TRASH));
clearAllBtn.setGraphic(new FontIcon(FontAwesome.TRASH));
clearAllBtn.setOnAction(evt -> getSkinnable().clearItems());

Button clearSelectionBtn = new Button();
clearSelectionBtn.setText("Clear Selected");
clearSelectionBtn.setGraphic(new FontAwesomeIconView(FontAwesomeIcon.TRASH_ALT));
clearSelectionBtn.setGraphic(new FontIcon(FontAwesome.TRASH_O));
clearSelectionBtn.setOnAction(evt -> getSkinnable().removeItems(Lists.newArrayList(getSkinnable().getSelectedItems())));

List<ToggleButton> statusTypeButtons = new ArrayList<>();
Expand Down Expand Up @@ -138,7 +138,7 @@ private ToolBar createToolBar() {
}
});
Button searchBtn = new Button();
searchBtn.setGraphic(new FontAwesomeIconView(FontAwesomeIcon.SEARCH));
searchBtn.setGraphic(new FontIcon(FontAwesome.SEARCH));
searchBtn.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
searchBtn.setOnAction(evt -> getSkinnable().filter(textField.getText()));

Expand Down
17 changes: 10 additions & 7 deletions CalendarFXGoogle/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
module com.calendarfx.google {

requires org.kordamp.ikonli.javafx;
requires org.kordamp.ikonli.fontawesome;
requires org.kordamp.iconli.core;

requires com.calendarfx.view;
requires javafx.base;
requires com.google.api.services.calendar;
requires javafx.graphics;
requires de.jensd.fx.glyphs.fontawesome;
requires guava.jdk5;
requires org.controlsfx.controls;
requires google.http.client;
requires javafx.controls;
requires javafx.web;
requires com.google.api.services.oauth2;
requires google.oauth.client;
requires google.api.client;
requires google.http.client.jackson2;
requires geocoder.java;
requires GMapsFX;
requires com.google.common;
requires com.google.api.client;
requires com.google.api.client.auth;
requires com.google.api.services.oauth2;
requires com.google.api.client.json.jackson2;
requires google.api.client;

exports com.calendarfx.google;
}
Loading

0 comments on commit 992f9e3

Please sign in to comment.