Skip to content

Commit b454ef6

Browse files
committed
fixed merge conflicts with dev/1.9.4_add_jl_web_engine
1 parent b1726ba commit b454ef6

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

src/main/java/io/github/makbn/jlmap/JLMapView.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.github.makbn.jlmap;
22

3+
import io.github.makbn.jlmap.engine.JLJavaFXEngine;
4+
import io.github.makbn.jlmap.engine.JLWebEngine;
35
import io.github.makbn.jlmap.layer.*;
46
import io.github.makbn.jlmap.listener.OnJLMapViewListener;
57
import io.github.makbn.jlmap.model.JLLatLng;

src/main/java/module-info.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,21 @@
55
requires javafx.swing;
66
requires javafx.web;
77
requires javafx.graphics;
8-
8+
99
// JDK modules
1010
requires jdk.jsobject;
11-
11+
1212
// Logging
13-
requires org.apache.logging.log4j;
14-
requires org.apache.logging.log4j.core;
15-
13+
requires org.slf4j;
14+
1615
// JSON processing
1716
requires com.google.gson;
1817
requires com.fasterxml.jackson.databind;
19-
18+
2019
// Annotations
2120
requires static org.jetbrains.annotations;
2221
requires static lombok;
23-
22+
2423
// Exports for public API
2524
exports io.github.makbn.jlmap;
2625
exports io.github.makbn.jlmap.layer;
@@ -29,7 +28,7 @@
2928
exports io.github.makbn.jlmap.model;
3029
exports io.github.makbn.jlmap.exception;
3130
exports io.github.makbn.jlmap.geojson;
32-
31+
3332
// Opens for reflection (if needed by frameworks)
3433
opens io.github.makbn.jlmap to javafx.graphics;
3534
opens io.github.makbn.jlmap.layer to javafx.graphics;

0 commit comments

Comments
 (0)