Skip to content

Commit 84a541c

Browse files
BenHerbstBenHerbst
committed
Ready for beta
1 parent 481e976 commit 84a541c

21 files changed

+288
-115
lines changed

‎.idea/jarRepositories.xml‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_0.xml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_test_1_6_0_RC.xml renamed to .idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_5_31.xml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_0_RC.xml renamed to .idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_5_31.xml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_6_0_RC.xml renamed to .idea/libraries/Maven__org_jetbrains_kotlin_kotlin_test_1_5_31.xml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎idaesbasic.iml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<compilerSettings />
77
<compilerArguments>
88
<option name="jvmTarget" value="16" />
9-
<option name="languageVersion" value="1.6" />
10-
<option name="apiVersion" value="1.6" />
9+
<option name="languageVersion" value="1.5" />
10+
<option name="apiVersion" value="1.5" />
1111
<option name="pluginOptions">
1212
<array />
1313
</option>
@@ -46,7 +46,6 @@
4646
<orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-core:12.2.0" level="project" />
4747
<orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-fontawesome-pack:12.2.0" level="project" />
4848
<orderEntry type="library" name="Maven: com.calendarfx:view:11.10.1" level="project" />
49-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.0" level="project" />
5049
<orderEntry type="library" name="Maven: org.mnode.ical4j:ical4j:3.1.1" level="project" />
5150
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
5251
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
@@ -55,10 +54,10 @@
5554
<orderEntry type="library" name="Maven: com.sun.mail:javax.mail:1.6.2" level="project" />
5655
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
5756
<orderEntry type="library" name="Maven: org.controlsfx:controlsfx:11.1.0" level="project" />
58-
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.6.0-RC" level="project" />
57+
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.5.31" level="project" />
5958
<orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
60-
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0-RC" level="project" />
61-
<orderEntry type="library" scope="TEST" name="Maven: org.jetbrains.kotlin:kotlin-test:1.6.0-RC" level="project" />
59+
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31" level="project" />
60+
<orderEntry type="library" scope="TEST" name="Maven: org.jetbrains.kotlin:kotlin-test:1.5.31" level="project" />
6261
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
6362
</component>
6463
</module>

‎pom.xml‎

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,18 @@
77
<version>0.0.1-SNAPSHOT</version>
88

99
<properties>
10-
<kotlin.version>1.6.0-RC</kotlin.version>
10+
<kotlin.version>1.5.31</kotlin.version>
1111
</properties>
1212

13+
<repositories>
14+
<repository>
15+
<id>mvnrepo</id>
16+
<url>https://mvnrepository.com/artifact/</url>
17+
</repository>
18+
</repositories>
19+
1320
<build>
21+
1422
<plugins>
1523
<plugin>
1624
<groupId>org.openjfx</groupId>
@@ -24,24 +32,6 @@
2432
<launcher>idaesbasic</launcher>
2533
</configuration>
2634
</plugin>
27-
<plugin>
28-
<groupId>org.panteleyev</groupId>
29-
<artifactId>jpackage-maven-plugin</artifactId>
30-
<version>1.4.0</version>
31-
<configuration>
32-
<name>Idaesbasic</name>
33-
<appVersion>1.0.0</appVersion>
34-
<destination>target/</destination>
35-
<input>target/</input>
36-
<mainJar>idaesbasic-0.0.1-SNAPSHOT-shaded.jar</mainJar>
37-
<icon>${project.basedir}/icon.png</icon>
38-
<mainClass>org.idaesbasic.Main</mainClass>
39-
<verbose>true</verbose>
40-
<winPerUserInstall>true</winPerUserInstall>
41-
<type>EXE</type>
42-
<winDirChooser>true</winDirChooser>
43-
</configuration>
44-
</plugin>
4535
<plugin>
4636
<groupId>org.apache.maven.plugins</groupId>
4737
<artifactId>maven-shade-plugin</artifactId>
@@ -54,6 +44,7 @@
5444
<configuration>
5545
<shadedArtifactAttached>true</shadedArtifactAttached>
5646
<transformers>
47+
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
5748
<transformer implementation=
5849
"org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
5950
<mainClass>org.idaesbasic.Main</mainClass>
@@ -146,11 +137,6 @@
146137
<artifactId>view</artifactId>
147138
<version>11.10.1</version>
148139
</dependency>
149-
<dependency>
150-
<groupId>com.fasterxml.jackson.core</groupId>
151-
<artifactId>jackson-core</artifactId>
152-
<version>2.13.0</version>
153-
</dependency>
154140
<dependency>
155141
<groupId>org.mnode.ical4j</groupId>
156142
<artifactId>ical4j</artifactId>

‎src/main/java/module-info.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@
2020
opens org.idaesbasic.models to com.google.gson;
2121
opens org.idaesbasic.controllers.calendar to javafx.fxml;
2222
opens org.idaesbasic.controllers.kanban to javafx.fxml;
23+
opens org.idaesbasic.models.kanban to com.google.gson;
2324

2425
exports org.idaesbasic;
2526
exports org.idaesbasic.controllers;
2627
exports org.idaesbasic.controllers.todolist;
2728
exports org.idaesbasic.controllers.calendar;
2829
exports org.idaesbasic.controllers.kanban;
2930
exports org.idaesbasic.models;
30-
}
31+
exports org.idaesbasic.models.kanban;
32+
}

‎src/main/java/org/idaesbasic/controllers/MainController.java‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ void newKanban(ActionEvent event) throws IOException {
414414
loader.setLocation(getClass().getResource("/fxml/views/kanban/KanbanView.fxml"));
415415
Node view = loader.load();
416416
KanbanController controller = loader.getController();
417-
// controller.viewModel.setOpenedFile(Paths.get(fullPath));
417+
controller.viewModel.setOpenedFile(Paths.get(fullPath));
418418
view.setUserData(controller);
419419
// Show new calendar in current tab
420420
addViewToCurrentTab(view);
@@ -451,6 +451,8 @@ void saveFileAs() throws IOException {
451451
((TodolistController) controller).saveFileAs(Paths.get(file.getAbsolutePath()));
452452
} else if (controller.getClass().equals(new CalendarController().getClass())) {
453453
((CalendarController) controller).saveFile(file.getAbsolutePath());
454+
} else if (controller.getClass().equals(new KanbanController().getClass())) {
455+
((KanbanController) controller).saveFile(file.getAbsolutePath());
454456
}
455457
}
456458

@@ -490,6 +492,18 @@ void openFile(String filename) throws IOException, ParserException {
490492
calendarController.loadFile(filename);
491493
// Open todolist view
492494
addViewToCurrentTab(view);
495+
} else if (filename.endsWith(".knbn")) {
496+
// Load calendar view
497+
FXMLLoader loader = new FXMLLoader();
498+
loader.setLocation(getClass().getResource("/fxml/views/kanban/KanbanView.fxml"));
499+
Node view = loader.load();
500+
// Load calendar
501+
KanbanController kanbanController = loader.getController();
502+
// Set controller as user data for later access
503+
view.setUserData(kanbanController);
504+
kanbanController.loadFile(filename);
505+
// Open todolist view
506+
addViewToCurrentTab(view);
493507
}
494508
}
495509

‎src/main/java/org/idaesbasic/controllers/WelcomeScreenController.kt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,7 @@ class WelcomeScreenController {
6060
val loader = FXMLLoader()
6161
loader.location = javaClass.getResource("/fxml/MainView.fxml")
6262
var parent: Parent? = null
63-
try {
64-
parent = loader.load()
65-
} catch (e: IOException) {
66-
// TODO Auto-generated catch block
67-
e.printStackTrace()
68-
}
63+
parent = loader.load()
6964
val node = projectListBox as Node?
7065
val thisStage = node!!.scene.window as Stage
7166
val scene = Scene(parent)

0 commit comments

Comments
 (0)