Skip to content

Commit 771354d

Browse files
liebowitzcarldea
andauthored
IKDT-1088 Migrate to tinkar-core events module (#617)
* Update version to start feature: IKDT-1088 * IKDT-1088 Migrate to tinkar-core events module * Update version to finish feature: IKDT-1088 --------- Co-authored-by: Carl Dea <carl.dea@gmail.com>
1 parent e9cf6c6 commit 771354d

111 files changed

Lines changed: 239 additions & 730 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

application/src/main/java/dev/ikm/komet/app/App.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import dev.ikm.komet.framework.ScreenInfo;
2626
import dev.ikm.komet.framework.activity.ActivityStreamOption;
2727
import dev.ikm.komet.framework.activity.ActivityStreams;
28-
import dev.ikm.komet.framework.events.*;
28+
import dev.ikm.tinkar.events.*;
2929
import dev.ikm.komet.framework.graphics.Icon;
3030
import dev.ikm.komet.framework.graphics.LoadFonts;
3131
import dev.ikm.komet.framework.preferences.KometPreferencesStage;
@@ -115,7 +115,7 @@
115115
import static dev.ikm.komet.app.util.CssUtils.addStylesheets;
116116
import static dev.ikm.komet.framework.KometNode.PreferenceKey.CURRENT_JOURNAL_WINDOW_TOPIC;
117117
import static dev.ikm.komet.framework.KometNodeFactory.KOMET_NODES;
118-
import static dev.ikm.komet.framework.events.FrameworkTopics.*;
118+
import static dev.ikm.tinkar.events.FrameworkTopics.*;
119119
import static dev.ikm.komet.framework.window.WindowSettings.Keys.*;
120120
import static dev.ikm.komet.kview.events.EventTopics.JOURNAL_TOPIC;
121121
import static dev.ikm.komet.kview.events.JournalTileEvent.UPDATE_JOURNAL_TILE;

application/src/main/java/dev/ikm/komet/app/WebApp.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
import dev.ikm.komet.framework.ScreenInfo;
2626
import dev.ikm.komet.framework.activity.ActivityStreamOption;
2727
import dev.ikm.komet.framework.activity.ActivityStreams;
28-
import dev.ikm.komet.framework.events.Evt;
29-
import dev.ikm.komet.framework.events.EvtBus;
30-
import dev.ikm.komet.framework.events.EvtBusFactory;
31-
import dev.ikm.komet.framework.events.Subscriber;
28+
import dev.ikm.tinkar.events.Evt;
29+
import dev.ikm.tinkar.events.EvtBus;
30+
import dev.ikm.tinkar.events.EvtBusFactory;
31+
import dev.ikm.tinkar.events.Subscriber;
3232
import dev.ikm.komet.framework.graphics.Icon;
3333
import dev.ikm.komet.framework.graphics.LoadFonts;
3434
import dev.ikm.komet.framework.preferences.KometPreferencesStage;
@@ -118,8 +118,8 @@
118118
import static dev.ikm.komet.app.util.CssFile.KVIEW_CSS;
119119
import static dev.ikm.komet.app.util.CssUtils.addStylesheets;
120120
import static dev.ikm.komet.framework.KometNodeFactory.KOMET_NODES;
121-
import static dev.ikm.komet.framework.events.FrameworkTopics.IMPORT_TOPIC;
122-
import static dev.ikm.komet.framework.events.FrameworkTopics.LANDING_PAGE_TOPIC;
121+
import static dev.ikm.tinkar.events.FrameworkTopics.IMPORT_TOPIC;
122+
import static dev.ikm.tinkar.events.FrameworkTopics.LANDING_PAGE_TOPIC;
123123
import static dev.ikm.komet.framework.window.WindowSettings.Keys.*;
124124
import static dev.ikm.komet.kview.events.EventTopics.JOURNAL_TOPIC;
125125
import static dev.ikm.komet.kview.events.EventTopics.USER_TOPIC;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import dev.ikm.komet.framework.KometNodeFactory;
1818
import dev.ikm.komet.framework.concurrent.TaskListsService;
19-
import dev.ikm.komet.framework.events.DefaultEvtBus;
19+
import dev.ikm.tinkar.events.DefaultEvtBus;
2020
import dev.ikm.tinkar.common.service.DataServiceController;
2121
import dev.ikm.tinkar.common.service.DefaultDescriptionForNidService;
2222
import dev.ikm.tinkar.common.service.PublicIdService;

application/src/test/java/module-info.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import dev.ikm.komet.framework.KometNodeFactory;
1818
import dev.ikm.komet.framework.concurrent.TaskListsService;
19-
import dev.ikm.komet.framework.events.DefaultEvtBus;
19+
import dev.ikm.tinkar.events.DefaultEvtBus;
2020
import dev.ikm.tinkar.common.service.DataServiceController;
2121
import dev.ikm.tinkar.common.service.DefaultDescriptionForNidService;
2222
import dev.ikm.tinkar.common.service.PublicIdService;
@@ -85,7 +85,7 @@
8585
uses dev.ikm.tinkar.common.service.PublicIdService;
8686
uses dev.ikm.tinkar.entity.StampService;
8787
uses dev.ikm.komet.framework.concurrent.TaskListsService;
88-
uses dev.ikm.komet.framework.events.DefaultEvtBus;
88+
uses dev.ikm.tinkar.events.DefaultEvtBus;
8989

9090
// For ScenicView...
9191
//requires org.scenicview.scenicview;

artifact/src/main/java/dev/ikm/komet/artifact/ArtifactImportController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
package dev.ikm.komet.artifact;
1717

1818

19-
import static dev.ikm.komet.framework.events.FrameworkTopics.CALCULATOR_CACHE_TOPIC;
19+
import static dev.ikm.tinkar.events.FrameworkTopics.CALCULATOR_CACHE_TOPIC;
2020
import static dev.ikm.komet.framework.events.appevents.RefreshCalculatorCacheEvent.GLOBAL_REFRESH;
2121
import dev.ikm.komet.framework.concurrent.TaskWrapper;
22-
import dev.ikm.komet.framework.events.EvtBusFactory;
22+
import dev.ikm.tinkar.events.EvtBusFactory;
2323
import dev.ikm.komet.framework.events.appevents.RefreshCalculatorCacheEvent;
2424
import dev.ikm.komet.framework.progress.ProgressHelper;
2525
import dev.ikm.tinkar.entity.EntityCountSummary;

framework/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
<groupId>${tinkar-core.groupId}</groupId>
2626
<artifactId>terms</artifactId>
2727
</dependency>
28+
<dependency>
29+
<groupId>${tinkar-core.groupId}</groupId>
30+
<artifactId>events</artifactId>
31+
</dependency>
2832

2933
<!-- JPMS wrapped dependencies -->
3034
<dependency>

framework/src/main/java/dev/ikm/komet/framework/events/AxiomChangeEvent.java

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

framework/src/main/java/dev/ikm/komet/framework/events/DefaultEvtBus.java

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

framework/src/main/java/dev/ikm/komet/framework/events/EntityVersionChangeEvent.java

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

framework/src/main/java/dev/ikm/komet/framework/events/Evt.java

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

0 commit comments

Comments
 (0)