-
Notifications
You must be signed in to change notification settings - Fork 176
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #10 from imario42/master
reformat and copyright header. no code changes.
- Loading branch information
Showing
367 changed files
with
26,390 additions
and
22,797 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,52 +1,68 @@ | ||
| <!-- | ||
| ~ 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> | ||
| <artifactId>application</artifactId> | ||
| <name>CalendarFXApp</name> | ||
| 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> | ||
| <artifactId>application</artifactId> | ||
| <name>CalendarFXApp</name> | ||
|
|
||
| <parent> | ||
| <groupId>com.calendarfx</groupId> | ||
| <artifactId>calendar</artifactId> | ||
| <version>8.4.1</version> | ||
| </parent> | ||
| <parent> | ||
| <groupId>com.calendarfx</groupId> | ||
| <artifactId>calendar</artifactId> | ||
| <version>8.4.1</version> | ||
| </parent> | ||
|
|
||
| <dependencies> | ||
| <dependencies> | ||
|
|
||
| <dependency> | ||
| <groupId>com.calendarfx</groupId> | ||
| <artifactId>view</artifactId> | ||
| <version>8.4.1</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.calendarfx</groupId> | ||
| <artifactId>view</artifactId> | ||
| <version>8.4.1</version> | ||
| </dependency> | ||
|
|
||
| </dependencies> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| <version>2.4</version> | ||
| <configuration> | ||
| <finalName>calendar-demo</finalName> | ||
| <descriptorRefs> | ||
| <descriptorRef>jar-with-dependencies</descriptorRef> | ||
| </descriptorRefs> | ||
| <appendAssemblyId>false</appendAssemblyId> | ||
| <archive> | ||
| <manifest> | ||
| <mainClass>com.calendarfx.app.CalendarAppLauncher</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> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| <version>2.4</version> | ||
| <configuration> | ||
| <finalName>calendar-demo</finalName> | ||
| <descriptorRefs> | ||
| <descriptorRef>jar-with-dependencies</descriptorRef> | ||
| </descriptorRefs> | ||
| <appendAssemblyId>false</appendAssemblyId> | ||
| <archive> | ||
| <manifest> | ||
| <mainClass>com.calendarfx.app.CalendarAppLauncher</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> |
18 changes: 14 additions & 4 deletions
18
CalendarFXApp/src/main/java/com/calendarfx/app/CalendarApp.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 14 additions & 4 deletions
18
CalendarFXApp/src/main/java/com/calendarfx/app/CalendarAppLauncher.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,63 +1,79 @@ | ||
| <!-- | ||
| ~ 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> | ||
| <parent> | ||
| <groupId>com.calendarfx</groupId> | ||
| <artifactId>calendar</artifactId> | ||
| <version>8.4.1</version> | ||
| </parent> | ||
| <artifactId>assembly</artifactId> | ||
| <packaging>pom</packaging> | ||
| <name>CalendarFXAssembly</name> | ||
| <description>A module for the sole purpose of creating assemblies.</description> | ||
|
|
||
| <dependencies> | ||
|
|
||
| <dependency> | ||
| <groupId>com.calendarfx</groupId> | ||
| <artifactId>view</artifactId> | ||
| <version>8.4.1</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>com.calendarfx</groupId> | ||
| <artifactId>recurrence</artifactId> | ||
| <version>8.4.1</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>com.calendarfx</groupId> | ||
| <artifactId>google</artifactId> | ||
| <version>8.4.1</version> | ||
| </dependency> | ||
|
|
||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
|
|
||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| <version>2.4.1</version> | ||
| <configuration> | ||
| <descriptors> | ||
| <descriptor>${project.basedir}/src/assembly/bin.xml</descriptor> | ||
| <descriptor>${project.basedir}/src/assembly/src.xml</descriptor> | ||
| </descriptors> | ||
| <finalName>calendarfx-${project.version}</finalName> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <id>make-distribution-assembly</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> | ||
| 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> | ||
| <parent> | ||
| <groupId>com.calendarfx</groupId> | ||
| <artifactId>calendar</artifactId> | ||
| <version>8.4.1</version> | ||
| </parent> | ||
| <artifactId>assembly</artifactId> | ||
| <packaging>pom</packaging> | ||
| <name>CalendarFXAssembly</name> | ||
| <description>A module for the sole purpose of creating assemblies.</description> | ||
|
|
||
| <dependencies> | ||
|
|
||
| <dependency> | ||
| <groupId>com.calendarfx</groupId> | ||
| <artifactId>view</artifactId> | ||
| <version>8.4.1</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>com.calendarfx</groupId> | ||
| <artifactId>recurrence</artifactId> | ||
| <version>8.4.1</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>com.calendarfx</groupId> | ||
| <artifactId>google</artifactId> | ||
| <version>8.4.1</version> | ||
| </dependency> | ||
|
|
||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
|
|
||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| <version>2.4.1</version> | ||
| <configuration> | ||
| <descriptors> | ||
| <descriptor>${project.basedir}/src/assembly/bin.xml</descriptor> | ||
| <descriptor>${project.basedir}/src/assembly/src.xml</descriptor> | ||
| </descriptors> | ||
| <finalName>calendarfx-${project.version}</finalName> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <id>make-distribution-assembly</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> |
Oops, something went wrong.