Skip to content

Commit 7bfce3f

Browse files
ddamkeddamke
authored andcommitted
remove FontAwesome Imports in Fxml and Dependencys in pom
1 parent 2715495 commit 7bfce3f

File tree

3 files changed

+7
-72
lines changed

3 files changed

+7
-72
lines changed

pom.xml

Lines changed: 6 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

66
<groupId>de.doubleslash</groupId>
@@ -28,26 +28,17 @@
2828
<groupId>org.springframework.boot</groupId>
2929
<artifactId>spring-boot-starter-parent</artifactId>
3030
<version>2.3.7.RELEASE</version>
31-
<relativePath /> <!-- lookup parent from repository -->
31+
<relativePath/> <!-- lookup parent from repository -->
3232
</parent>
3333

34-
<repositories>
35-
36-
<!-- Including for fontawesome-->
34+
<repositories>
3735
<repository>
38-
<id>fontawesomefx-repo</id>
39-
<name>FontAwesome Repository</name>
40-
<url>https://dl.bintray.com/jerady/maven</url>
41-
</repository>
42-
43-
<!-- needed to resolve against central first-->
44-
<repository>
4536
<id>central</id>
4637
<name>Maven Central</name>
4738
<layout>default</layout>
4839
<url>https://repo1.maven.org/maven2</url>
4940
</repository>
50-
</repositories>
41+
</repositories>
5142

5243
<properties>
5344
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -111,17 +102,6 @@
111102
<type>maven-plugin</type>
112103
</dependency>
113104

114-
<dependency>
115-
<groupId>de.jensd</groupId>
116-
<artifactId>fontawesomefx-commons</artifactId>
117-
<version>8.15</version>
118-
</dependency>
119-
120-
<dependency>
121-
<groupId>de.jensd</groupId>
122-
<artifactId>fontawesomefx-fontawesome</artifactId>
123-
<version>4.7.0-5</version>
124-
</dependency>
125105
</dependencies>
126106

127107
<build>
@@ -184,34 +164,5 @@
184164
</build>
185165

186166
<reporting>
187-
<plugins>
188-
<!-- needed for mvn site - see https://stackoverflow.com/a/51099913 -->
189-
<plugin>
190-
<groupId>org.apache.maven.plugins</groupId>
191-
<artifactId>maven-site-plugin</artifactId>
192-
<version>3.9.1</version>
193-
</plugin>
194-
195-
<plugin>
196-
<!-- https://mvnrepository.com/artifact/org.owasp/dependency-check-maven -->
197-
<groupId>org.owasp</groupId>
198-
<artifactId>dependency-check-maven</artifactId>
199-
<version>${maven-dependency-check.version}</version>
200-
<reportSets>
201-
<reportSet>
202-
<reports>
203-
<report>aggregate</report>
204-
</reports>
205-
</reportSet>
206-
</reportSets>
207-
<configuration>
208-
<format>${maven-dependency-check.format}</format>
209-
<failOnError>${maven-dependency-check.failOnError}</failOnError>
210-
<failBuildOnCVSS>${maven-dependency-check.failBuildOnCVSS}</failBuildOnCVSS>
211-
<outputDirectory>target/site</outputDirectory>
212-
<!--suppressionFile>${project.basedir}/dependency-check-report_suppressions.xml</suppressionFile -->
213-
</configuration>
214-
</plugin>
215-
</plugins>
216167
</reporting>
217-
</project>
168+
</project>

src/main/resources/layouts/ViewLayout.fxml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
You should have received a copy of the GNU General Public License
1717
along with this program. If not, see <http://www.gnu.org/licenses/>. -->
1818

19-
<?import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView?>
2019
<?import javafx.geometry.Insets?>
2120
<?import javafx.scene.Group?>
2221
<?import javafx.scene.canvas.Canvas?>
@@ -52,14 +51,8 @@
5251
<HBox alignment="CENTER" prefHeight="36.0">
5352
<children>
5453
<Button fx:id="calendarButton" mnemonicParsing="false" prefHeight="25.0" prefWidth="22.0" stylesheets="@../css/application.css">
55-
<graphic>
56-
<FontAwesomeIconView fx:id="calendarIcon" glyphName="CALENDAR" glyphStyle="fas" size="20" text="" />
57-
</graphic>
5854
</Button>
5955
<Button fx:id="settingsButton" mnemonicParsing="false" prefHeight="25.0" prefWidth="22.0" stylesheets="@../css/application.css">
60-
<graphic>
61-
<FontAwesomeIconView fx:id="settingsIcon" glyphName="COG" glyphStyle="fas" size="20" />
62-
</graphic>
6356
</Button>
6457
</children>
6558
</HBox>
@@ -89,16 +82,11 @@
8982
<font>
9083
<Font name="Open Sans Regular" size="12.0" />
9184
</font>
92-
<graphic>
93-
<FontAwesomeIconView fx:id="minimizeIcon" glyphName="WINDOW_MINIMIZE" glyphStyle="fas" size="10" text="" />
94-
</graphic></Button>
85+
</Button>
9586
<Button fx:id="closeButton" layoutX="266.0" layoutY="8.0" mnemonicParsing="false" stylesheets="@../css/application.css">
9687
<font>
9788
<Font name="Open Sans Regular" size="12.0" />
9889
</font>
99-
<graphic>
100-
<FontAwesomeIconView fx:id="closeIcon" glyphName="TIMES" glyphStyle="fas" size="10" />
101-
</graphic>
10290
</Button>
10391
</children>
10492
</Group>

src/main/resources/layouts/about.fxml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
You should have received a copy of the GNU General Public License
1717
along with this program. If not, see <http://www.gnu.org/licenses/>. -->
1818

19-
<?import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView?>
2019
<?import javafx.scene.control.Button?>
2120
<?import javafx.scene.control.Hyperlink?>
2221
<?import javafx.scene.control.Label?>
@@ -63,9 +62,6 @@
6362
<font>
6463
<Font name="Open Sans Regular" size="14.0" />
6564
</font>
66-
<graphic>
67-
<FontAwesomeIconView glyphName="BUG" />
68-
</graphic>
6965
</Button>
7066
<TableView fx:id="licenseTableView" focusTraversable="false" layoutX="39.0" layoutY="302.0" prefHeight="188.0" prefWidth="437.0" />
7167
<Label fx:id="versionNumberLabel" layoutX="97.0" layoutY="92.0" text="1.0.0">

0 commit comments

Comments
 (0)