Skip to content

Commit 69ea3a8

Browse files
makbnmakbn
committed
fixed the incompatibility with javafx version and api
Signed-off-by: makbn <mehdi74akbarian@gmail.com>
1 parent 5e67894 commit 69ea3a8

File tree

4 files changed

+180
-79
lines changed

4 files changed

+180
-79
lines changed

‎jlmap-fx/src/main/java/io/github/makbn/jlmap/fx/JLMapView.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public JLMapView(@NonNull JLMapProvider jlMapProvider,
7171
super();
7272
this.mapOption = JLMapOption.builder()
7373
.startCoordinate(startCoordinate)
74-
.JLMapProvider(jlMapProvider)
74+
.jlMapProvider(jlMapProvider)
7575
.additionalParameter(Set.of(new JLMapOption.Parameter("zoomControl",
7676
Objects.toString(showZoomController))))
7777
.build();

‎jlmap-fx/src/main/java/io/github/makbn/jlmap/fx/layer/JLUiLayer.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
import io.github.makbn.jlmap.engine.JLTransporter;
55
import io.github.makbn.jlmap.engine.JLWebEngine;
66
import io.github.makbn.jlmap.layer.leaflet.LeafletUILayerInt;
7-
import io.github.makbn.jlmap.model.JLLatLng;
8-
import io.github.makbn.jlmap.model.JLMarker;
9-
import io.github.makbn.jlmap.model.JLOptions;
10-
import io.github.makbn.jlmap.model.JLPopup;
7+
import io.github.makbn.jlmap.model.*;
118
import lombok.AccessLevel;
129
import lombok.experimental.FieldDefaults;
1310

@@ -24,6 +21,7 @@ public JLUiLayer(JLWebEngine<Object> engine, JLMapCallbackHandler callbackHandle
2421
super(engine, callbackHandler);
2522
this.transporter = () -> transport -> {
2623
// NO-OP
24+
return null;
2725
};
2826
}
2927

@@ -96,4 +94,9 @@ public boolean removePopup(String id) {
9694
.toString();
9795
return Boolean.parseBoolean(result);
9896
}
97+
98+
@Override
99+
public JLImageOverlay addImage(JLBounds bounds, String imageUrl, JLOptions options) {
100+
throw new UnsupportedOperationException();
101+
}
99102
}

‎jlmap-fx/src/main/java/io/github/makbn/jlmap/fx/layer/JLVectorLayer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public JLVectorLayer(JLWebEngine<Object> engine, JLMapCallbackHandler callbackHa
2222
super(engine, callbackHandler);
2323
this.transporter = () -> transport -> {
2424
// NO-OP
25+
return null;
2526
};
2627
}
2728

‎jlmap-vaadin/package.json‎

Lines changed: 171 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,173 @@
11
{
2-
"name" : "no-name",
3-
"license" : "UNLICENSED",
4-
"type" : "module",
5-
"dependencies" : { },
6-
"devDependencies" : { },
7-
"overrides" : {
8-
"@vaadin/a11y-base" : "24.8.4",
9-
"@vaadin/accordion" : "24.8.4",
10-
"@vaadin/app-layout" : "24.8.4",
11-
"@vaadin/avatar" : "24.8.4",
12-
"@vaadin/avatar-group" : "24.8.4",
13-
"@vaadin/button" : "24.8.4",
14-
"@vaadin/card" : "24.8.4",
15-
"@vaadin/checkbox" : "24.8.4",
16-
"@vaadin/checkbox-group" : "24.8.4",
17-
"@vaadin/combo-box" : "24.8.4",
18-
"@vaadin/component-base" : "24.8.4",
19-
"@vaadin/confirm-dialog" : "24.8.4",
20-
"@vaadin/context-menu" : "24.8.4",
21-
"@vaadin/custom-field" : "24.8.4",
22-
"@vaadin/date-picker" : "24.8.4",
23-
"@vaadin/date-time-picker" : "24.8.4",
24-
"@vaadin/details" : "24.8.4",
25-
"@vaadin/dialog" : "24.8.4",
26-
"@vaadin/email-field" : "24.8.4",
27-
"@vaadin/field-base" : "24.8.4",
28-
"@vaadin/field-highlighter" : "24.8.4",
29-
"@vaadin/form-layout" : "24.8.4",
30-
"@vaadin/grid" : "24.8.4",
31-
"@vaadin/horizontal-layout" : "24.8.4",
32-
"@vaadin/icon" : "24.8.4",
33-
"@vaadin/icons" : "24.8.4",
34-
"@vaadin/input-container" : "24.8.4",
35-
"@vaadin/integer-field" : "24.8.4",
36-
"@vaadin/item" : "24.8.4",
37-
"@vaadin/list-box" : "24.8.4",
38-
"@vaadin/lit-renderer" : "24.8.4",
39-
"@vaadin/login" : "24.8.4",
40-
"@vaadin/markdown" : "24.8.4",
41-
"@vaadin/master-detail-layout" : "24.8.4",
42-
"@vaadin/menu-bar" : "24.8.4",
43-
"@vaadin/message-input" : "24.8.4",
44-
"@vaadin/message-list" : "24.8.4",
45-
"@vaadin/multi-select-combo-box" : "24.8.4",
46-
"@vaadin/notification" : "24.8.4",
47-
"@vaadin/number-field" : "24.8.4",
48-
"@vaadin/overlay" : "24.8.4",
49-
"@vaadin/password-field" : "24.8.4",
50-
"@vaadin/popover" : "24.8.4",
51-
"@vaadin/progress-bar" : "24.8.4",
52-
"@vaadin/radio-group" : "24.8.4",
53-
"@vaadin/scroller" : "24.8.4",
54-
"@vaadin/select" : "24.8.4",
55-
"@vaadin/side-nav" : "24.8.4",
56-
"@vaadin/split-layout" : "24.8.4",
57-
"@vaadin/tabs" : "24.8.4",
58-
"@vaadin/tabsheet" : "24.8.4",
59-
"@vaadin/text-area" : "24.8.4",
60-
"@vaadin/text-field" : "24.8.4",
61-
"@vaadin/time-picker" : "24.8.4",
62-
"@vaadin/tooltip" : "24.8.4",
63-
"@vaadin/upload" : "24.8.4",
64-
"@vaadin/router" : "2.0.0",
65-
"@vaadin/vertical-layout" : "24.8.4",
66-
"@vaadin/virtual-list" : "24.8.4",
67-
"@vaadin/board" : "24.8.4",
68-
"@vaadin/charts" : "24.8.4",
69-
"@vaadin/cookie-consent" : "24.8.4",
70-
"@vaadin/crud" : "24.8.4",
71-
"@vaadin/dashboard" : "24.8.4",
72-
"@vaadin/grid-pro" : "24.8.4",
73-
"@vaadin/map" : "24.8.4",
74-
"@vaadin/rich-text-editor" : "24.8.4"
2+
"name": "no-name",
3+
"license": "UNLICENSED",
4+
"type": "module",
5+
"dependencies": {
6+
"@polymer/polymer": "3.5.2",
7+
"@vaadin/bundles": "24.8.4",
8+
"@vaadin/common-frontend": "0.0.19",
9+
"@vaadin/polymer-legacy-adapter": "24.8.4",
10+
"@vaadin/react-components": "24.8.4",
11+
"@vaadin/vaadin-development-mode-detector": "2.0.7",
12+
"@vaadin/vaadin-lumo-styles": "24.8.4",
13+
"@vaadin/vaadin-material-styles": "24.8.4",
14+
"@vaadin/vaadin-themable-mixin": "24.8.4",
15+
"@vaadin/vaadin-usage-statistics": "2.1.3",
16+
"construct-style-sheets-polyfill": "3.1.0",
17+
"date-fns": "2.29.3",
18+
"lit": "3.3.0",
19+
"react": "18.3.1",
20+
"react-dom": "18.3.1",
21+
"react-router": "7.6.1"
22+
},
23+
"devDependencies": {
24+
"@babel/preset-react": "7.27.1",
25+
"@preact/signals-react-transform": "0.5.1",
26+
"@rollup/plugin-replace": "6.0.2",
27+
"@rollup/pluginutils": "5.1.4",
28+
"@types/react": "18.3.23",
29+
"@types/react-dom": "18.3.7",
30+
"@vitejs/plugin-react": "4.5.0",
31+
"async": "3.2.6",
32+
"glob": "11.0.2",
33+
"magic-string": "0.30.17",
34+
"rollup-plugin-brotli": "3.1.0",
35+
"rollup-plugin-visualizer": "5.14.0",
36+
"strip-css-comments": "5.0.0",
37+
"transform-ast": "2.4.4",
38+
"typescript": "5.8.3",
39+
"vite": "6.3.5",
40+
"vite-plugin-checker": "0.9.3",
41+
"workbox-build": "7.3.0",
42+
"workbox-core": "7.3.0",
43+
"workbox-precaching": "7.3.0"
44+
},
45+
"overrides": {
46+
"@vaadin/a11y-base": "24.8.4",
47+
"@vaadin/accordion": "24.8.4",
48+
"@vaadin/app-layout": "24.8.4",
49+
"@vaadin/avatar": "24.8.4",
50+
"@vaadin/avatar-group": "24.8.4",
51+
"@vaadin/button": "24.8.4",
52+
"@vaadin/card": "24.8.4",
53+
"@vaadin/checkbox": "24.8.4",
54+
"@vaadin/checkbox-group": "24.8.4",
55+
"@vaadin/combo-box": "24.8.4",
56+
"@vaadin/component-base": "24.8.4",
57+
"@vaadin/confirm-dialog": "24.8.4",
58+
"@vaadin/context-menu": "24.8.4",
59+
"@vaadin/custom-field": "24.8.4",
60+
"@vaadin/date-picker": "24.8.4",
61+
"@vaadin/date-time-picker": "24.8.4",
62+
"@vaadin/details": "24.8.4",
63+
"@vaadin/dialog": "24.8.4",
64+
"@vaadin/email-field": "24.8.4",
65+
"@vaadin/field-base": "24.8.4",
66+
"@vaadin/field-highlighter": "24.8.4",
67+
"@vaadin/form-layout": "24.8.4",
68+
"@vaadin/grid": "24.8.4",
69+
"@vaadin/horizontal-layout": "24.8.4",
70+
"@vaadin/icon": "24.8.4",
71+
"@vaadin/icons": "24.8.4",
72+
"@vaadin/input-container": "24.8.4",
73+
"@vaadin/integer-field": "24.8.4",
74+
"@vaadin/item": "24.8.4",
75+
"@vaadin/list-box": "24.8.4",
76+
"@vaadin/lit-renderer": "24.8.4",
77+
"@vaadin/login": "24.8.4",
78+
"@vaadin/markdown": "24.8.4",
79+
"@vaadin/master-detail-layout": "24.8.4",
80+
"@vaadin/menu-bar": "24.8.4",
81+
"@vaadin/message-input": "24.8.4",
82+
"@vaadin/message-list": "24.8.4",
83+
"@vaadin/multi-select-combo-box": "24.8.4",
84+
"@vaadin/notification": "24.8.4",
85+
"@vaadin/number-field": "24.8.4",
86+
"@vaadin/overlay": "24.8.4",
87+
"@vaadin/password-field": "24.8.4",
88+
"@vaadin/popover": "24.8.4",
89+
"@vaadin/progress-bar": "24.8.4",
90+
"@vaadin/radio-group": "24.8.4",
91+
"@vaadin/scroller": "24.8.4",
92+
"@vaadin/select": "24.8.4",
93+
"@vaadin/side-nav": "24.8.4",
94+
"@vaadin/split-layout": "24.8.4",
95+
"@vaadin/tabs": "24.8.4",
96+
"@vaadin/tabsheet": "24.8.4",
97+
"@vaadin/text-area": "24.8.4",
98+
"@vaadin/text-field": "24.8.4",
99+
"@vaadin/time-picker": "24.8.4",
100+
"@vaadin/tooltip": "24.8.4",
101+
"@vaadin/upload": "24.8.4",
102+
"@vaadin/router": "2.0.0",
103+
"@vaadin/vertical-layout": "24.8.4",
104+
"@vaadin/virtual-list": "24.8.4",
105+
"@vaadin/board": "24.8.4",
106+
"@vaadin/charts": "24.8.4",
107+
"@vaadin/cookie-consent": "24.8.4",
108+
"@vaadin/crud": "24.8.4",
109+
"@vaadin/dashboard": "24.8.4",
110+
"@vaadin/grid-pro": "24.8.4",
111+
"@vaadin/map": "24.8.4",
112+
"@vaadin/rich-text-editor": "24.8.4",
113+
"@vaadin/bundles": "$@vaadin/bundles",
114+
"@vaadin/polymer-legacy-adapter": "$@vaadin/polymer-legacy-adapter",
115+
"@vaadin/vaadin-development-mode-detector": "$@vaadin/vaadin-development-mode-detector",
116+
"@vaadin/vaadin-usage-statistics": "$@vaadin/vaadin-usage-statistics",
117+
"@vaadin/react-components": "$@vaadin/react-components",
118+
"@vaadin/common-frontend": "$@vaadin/common-frontend",
119+
"react-dom": "$react-dom",
120+
"construct-style-sheets-polyfill": "$construct-style-sheets-polyfill",
121+
"lit": "$lit",
122+
"@polymer/polymer": "$@polymer/polymer",
123+
"react": "$react",
124+
"react-router": "$react-router",
125+
"date-fns": "$date-fns",
126+
"@vaadin/vaadin-themable-mixin": "$@vaadin/vaadin-themable-mixin",
127+
"@vaadin/vaadin-lumo-styles": "$@vaadin/vaadin-lumo-styles",
128+
"@vaadin/vaadin-material-styles": "$@vaadin/vaadin-material-styles"
129+
},
130+
"vaadin": {
131+
"dependencies": {
132+
"@polymer/polymer": "3.5.2",
133+
"@vaadin/bundles": "24.8.4",
134+
"@vaadin/common-frontend": "0.0.19",
135+
"@vaadin/polymer-legacy-adapter": "24.8.4",
136+
"@vaadin/react-components": "24.8.4",
137+
"@vaadin/vaadin-development-mode-detector": "2.0.7",
138+
"@vaadin/vaadin-lumo-styles": "24.8.4",
139+
"@vaadin/vaadin-material-styles": "24.8.4",
140+
"@vaadin/vaadin-themable-mixin": "24.8.4",
141+
"@vaadin/vaadin-usage-statistics": "2.1.3",
142+
"construct-style-sheets-polyfill": "3.1.0",
143+
"date-fns": "2.29.3",
144+
"lit": "3.3.0",
145+
"react": "18.3.1",
146+
"react-dom": "18.3.1",
147+
"react-router": "7.6.1"
148+
},
149+
"devDependencies": {
150+
"@babel/preset-react": "7.27.1",
151+
"@preact/signals-react-transform": "0.5.1",
152+
"@rollup/plugin-replace": "6.0.2",
153+
"@rollup/pluginutils": "5.1.4",
154+
"@types/react": "18.3.23",
155+
"@types/react-dom": "18.3.7",
156+
"@vitejs/plugin-react": "4.5.0",
157+
"async": "3.2.6",
158+
"glob": "11.0.2",
159+
"magic-string": "0.30.17",
160+
"rollup-plugin-brotli": "3.1.0",
161+
"rollup-plugin-visualizer": "5.14.0",
162+
"strip-css-comments": "5.0.0",
163+
"transform-ast": "2.4.4",
164+
"typescript": "5.8.3",
165+
"vite": "6.3.5",
166+
"vite-plugin-checker": "0.9.3",
167+
"workbox-build": "7.3.0",
168+
"workbox-core": "7.3.0",
169+
"workbox-precaching": "7.3.0"
170+
},
171+
"hash": "9aa687e4330807d7cec53bdf3fa017fae6f7003401b619efb6cde902fd9fabd3"
75172
}
76-
}
173+
}

0 commit comments

Comments
 (0)