From 554ff2fe82e453f6ac5728baa9552207e8fbf071 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Tue, 29 Oct 2019 23:33:17 +0100 Subject: [PATCH] Upgrade to Xtext 2.19, LSP4J 0.8.0 and fix LSP server Every connection to the LSP server failed because it always threw a org.eclipse.smarthome.model.ide.SitemapIdeSetup NoClassDefFoundError. Which is caused by the SitemapIdeSetup residing in a package that is split between both the org.openhab.core.model.item.ide and the org.openhab.core.model.sitemap.ide bundles. The SitemapIdeSetup class is also using classes from the org.eclipse.smarthome.model package which is also a package split between the org.openhab.core.model.items and org.openhab.core.model.sitemap bundles. After renaming the packages used for the sitemap classes the NoClassDefFoundError is resolved and LSP works properly again. Many imports were updated for the model sitemap model package changes. Fixes #1030 Signed-off-by: Wouter Born --- bom/compile-model/pom.xml | 4 +- bom/runtime/pom.xml | 22 +++++----- .../internal/item/DefaultSitemapProvider.java | 12 ++--- .../sitemap/SitemapSubscriptionService.java | 6 +-- .../sitemap/internal/PageChangeListener.java | 10 ++--- .../sitemap/internal/SitemapResource.java | 34 +++++++------- .../sitemap/internal/SitemapResourceTest.java | 8 ++-- .../model/lsp/internal/RegistryProvider.java | 2 +- .../model/ide/SitemapIdeModule.xtend | 23 ---------- .../smarthome/model/ide/SitemapIdeSetup.xtend | 32 -------------- .../model/sitemap/ide/SitemapIdeModule.xtend | 11 +++++ .../model/sitemap/ide/SitemapIdeSetup.xtend | 20 +++++++++ .../internal/SitemapRuntimeActivator.java | 2 +- .../org.openhab.core.model.sitemap/bnd.bnd | 24 +++++----- .../org.openhab.core.model.sitemap/plugin.xml | 4 +- .../org.openhab.core.model.sitemap/pom.xml | 2 +- .../model/{ => sitemap}/GenerateSitemap.mwe2 | 4 +- .../model/{ => sitemap}/Sitemap.properties | 2 +- .../model/{ => sitemap}/Sitemap.xtext | 2 +- .../model/sitemap/SitemapProvider.java | 2 + .../{ => sitemap}/SitemapRuntimeModule.xtend | 6 +-- .../SitemapStandaloneSetup.xtend | 2 +- .../formatting/SitemapFormatter.xtend | 2 +- .../generator/SitemapGenerator.xtend | 2 +- .../sitemap/internal/SitemapProviderImpl.java | 2 +- .../scoping/SitemapScopeProvider.xtend | 2 +- .../serializer/SitemapSemanticSequencer.xtend | 2 +- .../SitemapSyntacticSequencer.xtend | 2 +- .../validation/SitemapValidator.xtend | 14 +++--- .../valueconverter/SitemapConverters.java | 2 +- .../ui/internal/items/ItemUIRegistryImpl.java | 22 +++++----- .../internal/proxy/ProxyServletService.java | 8 ++-- .../smarthome/ui/items/ItemUIProvider.java | 2 +- .../smarthome/ui/items/ItemUIRegistry.java | 6 +-- .../items/ItemUIRegistryImplTest.java | 14 +++--- .../proxy/ProxyServletServiceTest.java | 8 ++-- .../openhab-core/src/main/feature/feature.xml | 6 +-- .../openhab-tp/src/main/feature/feature.xml | 44 ++++++++++--------- .../itest.bndrun | 3 +- .../itest.bndrun | 28 ++++++------ .../itest.bndrun | 30 +++++++------ .../itest.bndrun | 29 ++++++------ .../itest.bndrun | 28 ++++++------ .../itest.bndrun | 29 ++++++------ .../itest.bndrun | 28 ++++++------ .../org.openhab.core.voice.tests/itest.bndrun | 8 ++-- pom.xml | 2 +- 47 files changed, 275 insertions(+), 282 deletions(-) delete mode 100644 bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/ide/SitemapIdeModule.xtend delete mode 100644 bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/ide/SitemapIdeSetup.xtend create mode 100644 bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/sitemap/ide/SitemapIdeModule.xtend create mode 100644 bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/sitemap/ide/SitemapIdeSetup.xtend rename bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/{ => sitemap}/GenerateSitemap.mwe2 (92%) rename bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/{ => sitemap}/Sitemap.properties (53%) rename bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/{ => sitemap}/Sitemap.xtext (98%) rename bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/{ => sitemap}/SitemapRuntimeModule.xtend (83%) rename bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/{ => sitemap}/SitemapStandaloneSetup.xtend (96%) rename bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/{ => sitemap}/formatting/SitemapFormatter.xtend (96%) rename bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/{ => sitemap}/generator/SitemapGenerator.xtend (95%) rename bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/{ => sitemap}/scoping/SitemapScopeProvider.xtend (92%) rename bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/{ => sitemap}/serializer/SitemapSemanticSequencer.xtend (90%) rename bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/{ => sitemap}/serializer/SitemapSyntacticSequencer.xtend (90%) rename bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/{ => sitemap}/validation/SitemapValidator.xtend (88%) rename bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/{ => sitemap}/valueconverter/SitemapConverters.java (97%) diff --git a/bom/compile-model/pom.xml b/bom/compile-model/pom.xml index f5ac399ce53..a3b18513382 100644 --- a/bom/compile-model/pom.xml +++ b/bom/compile-model/pom.xml @@ -17,8 +17,8 @@ 2.12.0 2.11.0 - 1.4.0 - 2.10.0 + 1.5.0 + 2.11.0 diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index 6d72b6dd346..02c59c8275d 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -718,7 +718,7 @@ com.google.guava guava - 21.0 + 27.1-jre compile @@ -756,31 +756,31 @@ org.eclipse.xtend org.eclipse.xtend.lib - 2.17.0 + 2.19.0 compile org.eclipse.xtend org.eclipse.xtend.lib.macro - 2.17.0 + 2.19.0 compile org.eclipse.xtext org.eclipse.xtext - 2.17.0 + 2.19.0 compile org.eclipse.xtext org.eclipse.xtext.common.types - 2.17.0 + 2.19.0 compile org.eclipse.xtext org.eclipse.xtext.ide - 2.17.0 + 2.19.0 compile @@ -792,25 +792,25 @@ org.eclipse.xtext org.eclipse.xtext.util - 2.17.0 + 2.19.0 compile org.eclipse.xtext org.eclipse.xtext.xbase - 2.17.0 + 2.19.0 compile org.eclipse.xtext org.eclipse.xtext.xbase.ide - 2.17.0 + 2.19.0 compile org.eclipse.xtext org.eclipse.xtext.xbase.lib - 2.17.0 + 2.19.0 compile @@ -858,7 +858,7 @@ org.ow2.asm asm - 7.0 + 7.1 compile diff --git a/bundles/org.openhab.core.boot/src/main/java/org/openhab/core/internal/item/DefaultSitemapProvider.java b/bundles/org.openhab.core.boot/src/main/java/org/openhab/core/internal/item/DefaultSitemapProvider.java index 6035f06bda5..2b129e0f3bb 100644 --- a/bundles/org.openhab.core.boot/src/main/java/org/openhab/core/internal/item/DefaultSitemapProvider.java +++ b/bundles/org.openhab.core.boot/src/main/java/org/openhab/core/internal/item/DefaultSitemapProvider.java @@ -20,13 +20,13 @@ import org.eclipse.smarthome.core.thing.ThingRegistry; import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry; import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener; -import org.eclipse.smarthome.model.sitemap.Sitemap; -import org.eclipse.smarthome.model.sitemap.SitemapFactory; import org.eclipse.smarthome.model.sitemap.SitemapProvider; -import org.eclipse.smarthome.model.sitemap.impl.DefaultImpl; -import org.eclipse.smarthome.model.sitemap.impl.FrameImpl; -import org.eclipse.smarthome.model.sitemap.impl.SitemapImpl; -import org.eclipse.smarthome.model.sitemap.impl.TextImpl; +import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap; +import org.eclipse.smarthome.model.sitemap.sitemap.SitemapFactory; +import org.eclipse.smarthome.model.sitemap.sitemap.impl.DefaultImpl; +import org.eclipse.smarthome.model.sitemap.sitemap.impl.FrameImpl; +import org.eclipse.smarthome.model.sitemap.sitemap.impl.SitemapImpl; +import org.eclipse.smarthome.model.sitemap.sitemap.impl.TextImpl; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/SitemapSubscriptionService.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/SitemapSubscriptionService.java index 20c3bdf2c9b..e69446fe80f 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/SitemapSubscriptionService.java +++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/SitemapSubscriptionService.java @@ -36,10 +36,10 @@ import org.eclipse.smarthome.io.rest.sitemap.internal.SitemapEvent; import org.eclipse.smarthome.model.core.EventType; import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener; -import org.eclipse.smarthome.model.sitemap.LinkableWidget; -import org.eclipse.smarthome.model.sitemap.Sitemap; import org.eclipse.smarthome.model.sitemap.SitemapProvider; -import org.eclipse.smarthome.model.sitemap.Widget; +import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget; +import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap; +import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/PageChangeListener.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/PageChangeListener.java index 9781181d8a3..449def45073 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/PageChangeListener.java +++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/PageChangeListener.java @@ -32,11 +32,11 @@ import org.eclipse.smarthome.core.types.State; import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTOMapper; import org.eclipse.smarthome.io.rest.sitemap.SitemapSubscriptionService.SitemapSubscriptionCallback; -import org.eclipse.smarthome.model.sitemap.Chart; -import org.eclipse.smarthome.model.sitemap.ColorArray; -import org.eclipse.smarthome.model.sitemap.Frame; -import org.eclipse.smarthome.model.sitemap.VisibilityRule; -import org.eclipse.smarthome.model.sitemap.Widget; +import org.eclipse.smarthome.model.sitemap.sitemap.Chart; +import org.eclipse.smarthome.model.sitemap.sitemap.ColorArray; +import org.eclipse.smarthome.model.sitemap.sitemap.Frame; +import org.eclipse.smarthome.model.sitemap.sitemap.VisibilityRule; +import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.eclipse.smarthome.ui.items.ItemUIRegistry; /** diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResource.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResource.java index d01e76c2f0f..834b1741811 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResource.java +++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResource.java @@ -62,24 +62,24 @@ import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTOMapper; import org.eclipse.smarthome.io.rest.sitemap.SitemapSubscriptionService; import org.eclipse.smarthome.io.rest.sitemap.SitemapSubscriptionService.SitemapSubscriptionCallback; -import org.eclipse.smarthome.model.sitemap.Chart; -import org.eclipse.smarthome.model.sitemap.ColorArray; -import org.eclipse.smarthome.model.sitemap.Frame; -import org.eclipse.smarthome.model.sitemap.Image; -import org.eclipse.smarthome.model.sitemap.LinkableWidget; -import org.eclipse.smarthome.model.sitemap.List; -import org.eclipse.smarthome.model.sitemap.Mapping; -import org.eclipse.smarthome.model.sitemap.Mapview; -import org.eclipse.smarthome.model.sitemap.Selection; -import org.eclipse.smarthome.model.sitemap.Setpoint; -import org.eclipse.smarthome.model.sitemap.Sitemap; import org.eclipse.smarthome.model.sitemap.SitemapProvider; -import org.eclipse.smarthome.model.sitemap.Slider; -import org.eclipse.smarthome.model.sitemap.Switch; -import org.eclipse.smarthome.model.sitemap.Video; -import org.eclipse.smarthome.model.sitemap.VisibilityRule; -import org.eclipse.smarthome.model.sitemap.Webview; -import org.eclipse.smarthome.model.sitemap.Widget; +import org.eclipse.smarthome.model.sitemap.sitemap.Chart; +import org.eclipse.smarthome.model.sitemap.sitemap.ColorArray; +import org.eclipse.smarthome.model.sitemap.sitemap.Frame; +import org.eclipse.smarthome.model.sitemap.sitemap.Image; +import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget; +import org.eclipse.smarthome.model.sitemap.sitemap.List; +import org.eclipse.smarthome.model.sitemap.sitemap.Mapping; +import org.eclipse.smarthome.model.sitemap.sitemap.Mapview; +import org.eclipse.smarthome.model.sitemap.sitemap.Selection; +import org.eclipse.smarthome.model.sitemap.sitemap.Setpoint; +import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap; +import org.eclipse.smarthome.model.sitemap.sitemap.Slider; +import org.eclipse.smarthome.model.sitemap.sitemap.Switch; +import org.eclipse.smarthome.model.sitemap.sitemap.Video; +import org.eclipse.smarthome.model.sitemap.sitemap.VisibilityRule; +import org.eclipse.smarthome.model.sitemap.sitemap.Webview; +import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.glassfish.jersey.media.sse.EventOutput; import org.glassfish.jersey.media.sse.OutboundEvent; diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResourceTest.java b/bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResourceTest.java index 7c26b5bee9b..48994ac54fa 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResourceTest.java +++ b/bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResourceTest.java @@ -42,11 +42,11 @@ import org.eclipse.smarthome.core.types.Command; import org.eclipse.smarthome.core.types.State; import org.eclipse.smarthome.io.rest.LocaleService; -import org.eclipse.smarthome.model.sitemap.ColorArray; -import org.eclipse.smarthome.model.sitemap.Sitemap; import org.eclipse.smarthome.model.sitemap.SitemapProvider; -import org.eclipse.smarthome.model.sitemap.VisibilityRule; -import org.eclipse.smarthome.model.sitemap.Widget; +import org.eclipse.smarthome.model.sitemap.sitemap.ColorArray; +import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap; +import org.eclipse.smarthome.model.sitemap.sitemap.VisibilityRule; +import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.eclipse.smarthome.test.java.JavaTest; import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.junit.Before; diff --git a/bundles/org.openhab.core.model.lsp/src/main/java/org/eclipse/smarthome/model/lsp/internal/RegistryProvider.java b/bundles/org.openhab.core.model.lsp/src/main/java/org/eclipse/smarthome/model/lsp/internal/RegistryProvider.java index 2e25a04879a..bfee755ba27 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/java/org/eclipse/smarthome/model/lsp/internal/RegistryProvider.java +++ b/bundles/org.openhab.core.model.lsp/src/main/java/org/eclipse/smarthome/model/lsp/internal/RegistryProvider.java @@ -17,12 +17,12 @@ import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl; import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; import org.eclipse.smarthome.model.ide.ItemsIdeSetup; -import org.eclipse.smarthome.model.ide.SitemapIdeSetup; import org.eclipse.smarthome.model.persistence.ide.PersistenceIdeSetup; import org.eclipse.smarthome.model.rule.ide.RulesIdeSetup; import org.eclipse.smarthome.model.script.ScriptServiceUtil; import org.eclipse.smarthome.model.script.engine.ScriptEngine; import org.eclipse.smarthome.model.script.ide.ScriptIdeSetup; +import org.eclipse.smarthome.model.sitemap.ide.SitemapIdeSetup; import org.eclipse.smarthome.model.thing.ide.ThingIdeSetup; import org.eclipse.xtext.XtextPackage; import org.eclipse.xtext.resource.FileExtensionProvider; diff --git a/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/ide/SitemapIdeModule.xtend b/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/ide/SitemapIdeModule.xtend deleted file mode 100644 index 58c0ab25da9..00000000000 --- a/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/ide/SitemapIdeModule.xtend +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright (c) 2010-2019 Contributors to the openHAB project - * - * See the NOTICE file(s) distributed with this work for additional - * information. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0 - * - * SPDX-License-Identifier: EPL-2.0 - */ -/* - * generated by Xtext 2.12.0 - */ -package org.eclipse.smarthome.model.ide - - -/** - * Use this class to register ide components. - */ -class SitemapIdeModule extends AbstractSitemapIdeModule { -} diff --git a/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/ide/SitemapIdeSetup.xtend b/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/ide/SitemapIdeSetup.xtend deleted file mode 100644 index ec2fb4b4697..00000000000 --- a/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/ide/SitemapIdeSetup.xtend +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Copyright (c) 2010-2019 Contributors to the openHAB project - * - * See the NOTICE file(s) distributed with this work for additional - * information. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0 - * - * SPDX-License-Identifier: EPL-2.0 - */ -/* - * generated by Xtext 2.12.0 - */ -package org.eclipse.smarthome.model.ide - -import com.google.inject.Guice -import org.eclipse.smarthome.model.SitemapRuntimeModule -import org.eclipse.smarthome.model.SitemapStandaloneSetup -import org.eclipse.xtext.util.Modules2 - -/** - * Initialization support for running Xtext languages as language servers. - */ -class SitemapIdeSetup extends SitemapStandaloneSetup { - - override createInjector() { - Guice.createInjector(Modules2.mixin(new SitemapRuntimeModule, new SitemapIdeModule)) - } - -} diff --git a/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/sitemap/ide/SitemapIdeModule.xtend b/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/sitemap/ide/SitemapIdeModule.xtend new file mode 100644 index 00000000000..b484e311815 --- /dev/null +++ b/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/sitemap/ide/SitemapIdeModule.xtend @@ -0,0 +1,11 @@ +/* + * generated by Xtext 2.19.0 + */ +package org.eclipse.smarthome.model.sitemap.ide + + +/** + * Use this class to register ide components. + */ +class SitemapIdeModule extends AbstractSitemapIdeModule { +} diff --git a/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/sitemap/ide/SitemapIdeSetup.xtend b/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/sitemap/ide/SitemapIdeSetup.xtend new file mode 100644 index 00000000000..fa2128237c2 --- /dev/null +++ b/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/sitemap/ide/SitemapIdeSetup.xtend @@ -0,0 +1,20 @@ +/* + * generated by Xtext 2.19.0 + */ +package org.eclipse.smarthome.model.sitemap.ide + +import com.google.inject.Guice +import org.eclipse.smarthome.model.sitemap.SitemapRuntimeModule +import org.eclipse.smarthome.model.sitemap.SitemapStandaloneSetup +import org.eclipse.xtext.util.Modules2 + +/** + * Initialization support for running Xtext languages as language servers. + */ +class SitemapIdeSetup extends SitemapStandaloneSetup { + + override createInjector() { + Guice.createInjector(Modules2.mixin(new SitemapRuntimeModule, new SitemapIdeModule)) + } + +} diff --git a/bundles/org.openhab.core.model.sitemap.runtime/src/org/eclipse/smarthome/model/sitemap/runtime/internal/SitemapRuntimeActivator.java b/bundles/org.openhab.core.model.sitemap.runtime/src/org/eclipse/smarthome/model/sitemap/runtime/internal/SitemapRuntimeActivator.java index ea72c4c016e..829222c9248 100644 --- a/bundles/org.openhab.core.model.sitemap.runtime/src/org/eclipse/smarthome/model/sitemap/runtime/internal/SitemapRuntimeActivator.java +++ b/bundles/org.openhab.core.model.sitemap.runtime/src/org/eclipse/smarthome/model/sitemap/runtime/internal/SitemapRuntimeActivator.java @@ -12,8 +12,8 @@ */ package org.eclipse.smarthome.model.sitemap.runtime.internal; -import org.eclipse.smarthome.model.SitemapStandaloneSetup; import org.eclipse.smarthome.model.core.ModelParser; +import org.eclipse.smarthome.model.sitemap.SitemapStandaloneSetup; import org.osgi.service.component.annotations.Component; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.model.sitemap/bnd.bnd b/bundles/org.openhab.core.model.sitemap/bnd.bnd index 57dae4e9505..0f8beebd055 100644 --- a/bundles/org.openhab.core.model.sitemap/bnd.bnd +++ b/bundles/org.openhab.core.model.sitemap/bnd.bnd @@ -1,16 +1,16 @@ Bundle-SymbolicName: ${project.artifactId} -Export-Package: org.eclipse.smarthome.model,\ - org.eclipse.smarthome.model.formatting,\ - org.eclipse.smarthome.model.generator,\ - org.eclipse.smarthome.model.parser.antlr,\ - org.eclipse.smarthome.model.parser.antlr.internal,\ - org.eclipse.smarthome.model.scoping,\ - org.eclipse.smarthome.model.serializer,\ - org.eclipse.smarthome.model.services,\ - org.eclipse.smarthome.model.sitemap,\ - org.eclipse.smarthome.model.sitemap.impl,\ - org.eclipse.smarthome.model.sitemap.util,\ - org.eclipse.smarthome.model.validation +Export-Package: org.eclipse.smarthome.model.sitemap,\ + org.eclipse.smarthome.model.sitemap.formatting,\ + org.eclipse.smarthome.model.sitemap.generator,\ + org.eclipse.smarthome.model.sitemap.parser.antlr,\ + org.eclipse.smarthome.model.sitemap.parser.antlr.internal,\ + org.eclipse.smarthome.model.sitemap.scoping,\ + org.eclipse.smarthome.model.sitemap.serializer,\ + org.eclipse.smarthome.model.sitemap.services,\ + org.eclipse.smarthome.model.sitemap.sitemap,\ + org.eclipse.smarthome.model.sitemap.sitemap.impl,\ + org.eclipse.smarthome.model.sitemap.sitemap.util,\ + org.eclipse.smarthome.model.sitemap.validation Import-Package: org.apache.commons.lang,\ org.apache.log4j,\ org.eclipse.jdt.annotation;resolution:=optional,\ diff --git a/bundles/org.openhab.core.model.sitemap/plugin.xml b/bundles/org.openhab.core.model.sitemap/plugin.xml index 74e883211be..97e86ccb1c0 100644 --- a/bundles/org.openhab.core.model.sitemap/plugin.xml +++ b/bundles/org.openhab.core.model.sitemap/plugin.xml @@ -5,8 +5,8 @@ diff --git a/bundles/org.openhab.core.model.sitemap/pom.xml b/bundles/org.openhab.core.model.sitemap/pom.xml index 95b087125ed..42a0bca59bf 100644 --- a/bundles/org.openhab.core.model.sitemap/pom.xml +++ b/bundles/org.openhab.core.model.sitemap/pom.xml @@ -52,7 +52,7 @@ org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher false - file://${project.basedir}/src/org/eclipse/smarthome/model/GenerateSitemap.mwe2 + file://${project.basedir}/src/org/eclipse/smarthome/model/sitemap/GenerateSitemap.mwe2 -p rootPath=/${project.basedir}/.. diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/GenerateSitemap.mwe2 b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/GenerateSitemap.mwe2 similarity index 92% rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/GenerateSitemap.mwe2 rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/GenerateSitemap.mwe2 index b7028a348b1..e6be9976fa8 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/GenerateSitemap.mwe2 +++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/GenerateSitemap.mwe2 @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -module org.eclipse.smarthome.model.GenerateSitemap +module org.eclipse.smarthome.model.sitemap.GenerateSitemap import org.eclipse.xtext.xtext.generator.* import org.eclipse.xtext.xtext.generator.model.project.* var rootPath = ".." var projectName = "org.openhab.core.model.sitemap" -var languageName = "org.eclipse.smarthome.model.Sitemap" +var languageName = "org.eclipse.smarthome.model.sitemap.Sitemap" var fileExtensions = "sitemap" var generateXtendStub = true var encoding = "UTF-8" diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/Sitemap.properties b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/Sitemap.properties similarity index 53% rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/Sitemap.properties rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/Sitemap.properties index 8d83c4f4588..ce789b8c333 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/Sitemap.properties +++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/Sitemap.properties @@ -1,3 +1,3 @@ -grammarURI=classpath:/org/openhab/model/Sitemap.xtext +grammarURI=classpath:/org/openhab/model/sitemap/Sitemap.xtext file.extensions=sitemap projectName=org.eclipse.smarthome.model.sitemap diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/Sitemap.xtext b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/Sitemap.xtext similarity index 98% rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/Sitemap.xtext rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/Sitemap.xtext index 026ba283ace..5ec68369221 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/Sitemap.xtext +++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/Sitemap.xtext @@ -1,4 +1,4 @@ -grammar org.eclipse.smarthome.model.Sitemap with org.eclipse.xtext.common.Terminals +grammar org.eclipse.smarthome.model.sitemap.Sitemap with org.eclipse.xtext.common.Terminals import "http://www.eclipse.org/emf/2002/Ecore" as ecore generate sitemap "http://www.eclipse.org/smarthome/model/Sitemap" diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapProvider.java b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapProvider.java index dd4c062061a..aab431bc23f 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapProvider.java +++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapProvider.java @@ -14,9 +14,11 @@ import java.util.Set; + import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener; +import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap; @NonNullByDefault public interface SitemapProvider { diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/SitemapRuntimeModule.xtend b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapRuntimeModule.xtend similarity index 83% rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/SitemapRuntimeModule.xtend rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapRuntimeModule.xtend index 18b489a29a9..b5a14670a6b 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/SitemapRuntimeModule.xtend +++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapRuntimeModule.xtend @@ -14,9 +14,9 @@ package /* * generated by Xtext */ -org.eclipse.smarthome.model +org.eclipse.smarthome.model.sitemap -import org.eclipse.smarthome.model.valueconverter.SitemapConverters +import org.eclipse.smarthome.model.sitemap.valueconverter.SitemapConverters import org.eclipse.xtext.conversion.IValueConverterService import org.eclipse.xtext.linking.lazy.LazyURIEncoder import com.google.inject.Binder @@ -25,7 +25,7 @@ import com.google.inject.name.Names /** * Use this class to register components to be used at runtime / without the Equinox extension registry. */ -class SitemapRuntimeModule extends org.eclipse.smarthome.model.AbstractSitemapRuntimeModule { +class SitemapRuntimeModule extends org.eclipse.smarthome.model.sitemap.AbstractSitemapRuntimeModule { override Class bindIValueConverterService() { return SitemapConverters } diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/SitemapStandaloneSetup.xtend b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapStandaloneSetup.xtend similarity index 96% rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/SitemapStandaloneSetup.xtend rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapStandaloneSetup.xtend index f77ea428881..b733a6057f3 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/SitemapStandaloneSetup.xtend +++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapStandaloneSetup.xtend @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model +package org.eclipse.smarthome.model.sitemap import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.resource.Resource diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/formatting/SitemapFormatter.xtend b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/formatting/SitemapFormatter.xtend similarity index 96% rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/formatting/SitemapFormatter.xtend rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/formatting/SitemapFormatter.xtend index b443317304a..f400b9c1915 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/formatting/SitemapFormatter.xtend +++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/formatting/SitemapFormatter.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext */ -package org.eclipse.smarthome.model.formatting +package org.eclipse.smarthome.model.sitemap.formatting import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter import org.eclipse.xtext.formatting.impl.FormattingConfig diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/generator/SitemapGenerator.xtend b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/generator/SitemapGenerator.xtend similarity index 95% rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/generator/SitemapGenerator.xtend rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/generator/SitemapGenerator.xtend index 20bc588f296..3a9b40be708 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/generator/SitemapGenerator.xtend +++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/generator/SitemapGenerator.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.generator +package org.eclipse.smarthome.model.sitemap.generator import org.eclipse.emf.ecore.resource.Resource import org.eclipse.xtext.generator.AbstractGenerator diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/internal/SitemapProviderImpl.java b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/internal/SitemapProviderImpl.java index b615fdfb44a..8506e30e23d 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/internal/SitemapProviderImpl.java +++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/internal/SitemapProviderImpl.java @@ -25,7 +25,7 @@ import org.eclipse.smarthome.model.core.EventType; import org.eclipse.smarthome.model.core.ModelRepository; import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener; -import org.eclipse.smarthome.model.sitemap.Sitemap; +import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap; import org.eclipse.smarthome.model.sitemap.SitemapProvider; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/scoping/SitemapScopeProvider.xtend b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/scoping/SitemapScopeProvider.xtend similarity index 92% rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/scoping/SitemapScopeProvider.xtend rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/scoping/SitemapScopeProvider.xtend index 346924964c8..fa6eda10ef3 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/scoping/SitemapScopeProvider.xtend +++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/scoping/SitemapScopeProvider.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext */ -package org.eclipse.smarthome.model.scoping +package org.eclipse.smarthome.model.sitemap.scoping /** * This class contains custom scoping description. diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/serializer/SitemapSemanticSequencer.xtend b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/serializer/SitemapSemanticSequencer.xtend similarity index 90% rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/serializer/SitemapSemanticSequencer.xtend rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/serializer/SitemapSemanticSequencer.xtend index 6e62544ebfc..99f84474075 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/serializer/SitemapSemanticSequencer.xtend +++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/serializer/SitemapSemanticSequencer.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.serializer +package org.eclipse.smarthome.model.sitemap.serializer class SitemapSemanticSequencer extends AbstractSitemapSemanticSequencer { diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/serializer/SitemapSyntacticSequencer.xtend b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/serializer/SitemapSyntacticSequencer.xtend similarity index 90% rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/serializer/SitemapSyntacticSequencer.xtend rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/serializer/SitemapSyntacticSequencer.xtend index 59313855aa8..7c14985f900 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/serializer/SitemapSyntacticSequencer.xtend +++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/serializer/SitemapSyntacticSequencer.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.serializer +package org.eclipse.smarthome.model.sitemap.serializer class SitemapSyntacticSequencer extends AbstractSitemapSyntacticSequencer { diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/validation/SitemapValidator.xtend b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/validation/SitemapValidator.xtend similarity index 88% rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/validation/SitemapValidator.xtend rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/validation/SitemapValidator.xtend index 2926fe2fde6..363b9ccb3ab 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/validation/SitemapValidator.xtend +++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/validation/SitemapValidator.xtend @@ -13,15 +13,15 @@ /* * generated by Xtext */ -package org.eclipse.smarthome.model.validation +package org.eclipse.smarthome.model.sitemap.validation -import org.eclipse.smarthome.model.sitemap.Frame -import org.eclipse.smarthome.model.sitemap.LinkableWidget -import org.eclipse.smarthome.model.sitemap.Sitemap -import org.eclipse.smarthome.model.sitemap.SitemapPackage -import org.eclipse.smarthome.model.sitemap.Widget +import org.eclipse.smarthome.model.sitemap.sitemap.Frame +import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget +import org.eclipse.smarthome.model.sitemap.sitemap.Setpoint +import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap +import org.eclipse.smarthome.model.sitemap.sitemap.SitemapPackage +import org.eclipse.smarthome.model.sitemap.sitemap.Widget import org.eclipse.xtext.validation.Check -import org.eclipse.smarthome.model.sitemap.Setpoint import java.math.BigDecimal //import org.eclipse.xtext.validation.Check diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/valueconverter/SitemapConverters.java b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/valueconverter/SitemapConverters.java similarity index 97% rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/valueconverter/SitemapConverters.java rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/valueconverter/SitemapConverters.java index 83f6d37cb6c..bdc36a63be1 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/valueconverter/SitemapConverters.java +++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/valueconverter/SitemapConverters.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.valueconverter; +package org.eclipse.smarthome.model.sitemap.valueconverter; import java.util.regex.Pattern; diff --git a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImpl.java b/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImpl.java index 6601027654d..b7f9e27efea 100644 --- a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImpl.java +++ b/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImpl.java @@ -74,17 +74,17 @@ import org.eclipse.smarthome.core.types.Type; import org.eclipse.smarthome.core.types.UnDefType; import org.eclipse.smarthome.core.types.util.UnitUtils; -import org.eclipse.smarthome.model.sitemap.ColorArray; -import org.eclipse.smarthome.model.sitemap.Default; -import org.eclipse.smarthome.model.sitemap.Group; -import org.eclipse.smarthome.model.sitemap.LinkableWidget; -import org.eclipse.smarthome.model.sitemap.Mapping; -import org.eclipse.smarthome.model.sitemap.Sitemap; -import org.eclipse.smarthome.model.sitemap.SitemapFactory; -import org.eclipse.smarthome.model.sitemap.Slider; -import org.eclipse.smarthome.model.sitemap.Switch; -import org.eclipse.smarthome.model.sitemap.VisibilityRule; -import org.eclipse.smarthome.model.sitemap.Widget; +import org.eclipse.smarthome.model.sitemap.sitemap.ColorArray; +import org.eclipse.smarthome.model.sitemap.sitemap.Default; +import org.eclipse.smarthome.model.sitemap.sitemap.Group; +import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget; +import org.eclipse.smarthome.model.sitemap.sitemap.Mapping; +import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap; +import org.eclipse.smarthome.model.sitemap.sitemap.SitemapFactory; +import org.eclipse.smarthome.model.sitemap.sitemap.Slider; +import org.eclipse.smarthome.model.sitemap.sitemap.Switch; +import org.eclipse.smarthome.model.sitemap.sitemap.VisibilityRule; +import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.eclipse.smarthome.ui.internal.UIActivator; import org.eclipse.smarthome.ui.items.ItemUIProvider; import org.eclipse.smarthome.ui.items.ItemUIRegistry; diff --git a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletService.java b/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletService.java index 3bc341a6a46..c75a8e43603 100644 --- a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletService.java +++ b/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletService.java @@ -34,10 +34,10 @@ import org.eclipse.smarthome.core.library.types.StringType; import org.eclipse.smarthome.core.types.State; import org.eclipse.smarthome.model.core.ModelRepository; -import org.eclipse.smarthome.model.sitemap.Image; -import org.eclipse.smarthome.model.sitemap.Sitemap; -import org.eclipse.smarthome.model.sitemap.Video; -import org.eclipse.smarthome.model.sitemap.Widget; +import org.eclipse.smarthome.model.sitemap.sitemap.Image; +import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap; +import org.eclipse.smarthome.model.sitemap.sitemap.Video; +import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; diff --git a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/items/ItemUIProvider.java b/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/items/ItemUIProvider.java index fa06446ad39..f64e0046349 100644 --- a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/items/ItemUIProvider.java +++ b/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/items/ItemUIProvider.java @@ -15,7 +15,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.model.sitemap.Widget; +import org.eclipse.smarthome.model.sitemap.sitemap.Widget; /** * This interface describes the methods that need to be implemented by a provider that diff --git a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/items/ItemUIRegistry.java b/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/items/ItemUIRegistry.java index 28f8789c92d..17afc8801b4 100644 --- a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/items/ItemUIRegistry.java +++ b/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/items/ItemUIRegistry.java @@ -22,9 +22,9 @@ import org.eclipse.smarthome.core.items.ItemRegistry; import org.eclipse.smarthome.core.library.types.QuantityType; import org.eclipse.smarthome.core.types.State; -import org.eclipse.smarthome.model.sitemap.LinkableWidget; -import org.eclipse.smarthome.model.sitemap.Sitemap; -import org.eclipse.smarthome.model.sitemap.Widget; +import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget; +import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap; +import org.eclipse.smarthome.model.sitemap.sitemap.Widget; /** * This interface is used by a service which combines the core item registry diff --git a/bundles/org.openhab.core.ui/src/test/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImplTest.java b/bundles/org.openhab.core.ui/src/test/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImplTest.java index f1cbce2faa5..ba92fcd37bb 100644 --- a/bundles/org.openhab.core.ui/src/test/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImplTest.java +++ b/bundles/org.openhab.core.ui/src/test/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImplTest.java @@ -40,13 +40,13 @@ import org.eclipse.smarthome.core.types.StateOption; import org.eclipse.smarthome.core.types.UnDefType; import org.eclipse.smarthome.core.types.util.UnitUtils; -import org.eclipse.smarthome.model.sitemap.ColorArray; -import org.eclipse.smarthome.model.sitemap.Mapping; -import org.eclipse.smarthome.model.sitemap.Sitemap; -import org.eclipse.smarthome.model.sitemap.SitemapFactory; -import org.eclipse.smarthome.model.sitemap.Slider; -import org.eclipse.smarthome.model.sitemap.Switch; -import org.eclipse.smarthome.model.sitemap.Widget; +import org.eclipse.smarthome.model.sitemap.sitemap.ColorArray; +import org.eclipse.smarthome.model.sitemap.sitemap.Mapping; +import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap; +import org.eclipse.smarthome.model.sitemap.sitemap.SitemapFactory; +import org.eclipse.smarthome.model.sitemap.sitemap.Slider; +import org.eclipse.smarthome.model.sitemap.sitemap.Switch; +import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.eclipse.smarthome.ui.items.ItemUIProvider; import org.junit.Before; import org.junit.Test; diff --git a/bundles/org.openhab.core.ui/src/test/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletServiceTest.java b/bundles/org.openhab.core.ui/src/test/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletServiceTest.java index 4ad0dccc0ce..465ead531d1 100644 --- a/bundles/org.openhab.core.ui/src/test/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletServiceTest.java +++ b/bundles/org.openhab.core.ui/src/test/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletServiceTest.java @@ -29,10 +29,10 @@ import org.eclipse.smarthome.core.library.types.StringType; import org.eclipse.smarthome.core.types.UnDefType; import org.eclipse.smarthome.model.core.ModelRepository; -import org.eclipse.smarthome.model.sitemap.Image; -import org.eclipse.smarthome.model.sitemap.Sitemap; -import org.eclipse.smarthome.model.sitemap.Switch; -import org.eclipse.smarthome.model.sitemap.Video; +import org.eclipse.smarthome.model.sitemap.sitemap.Image; +import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap; +import org.eclipse.smarthome.model.sitemap.sitemap.Switch; +import org.eclipse.smarthome.model.sitemap.sitemap.Video; import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.junit.Before; import org.junit.Test; diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml index dd2eaa4f52c..48fc0cc0c64 100644 --- a/features/karaf/openhab-core/src/main/feature/feature.xml +++ b/features/karaf/openhab-core/src/main/feature/feature.xml @@ -25,7 +25,7 @@ openhab.tp-gson - openhab.tp;filter:="(&(feature=xtext)(version>=2.17.0)(!(version>=2.18.0)))" + openhab.tp;filter:="(&(feature=xtext)(version>=2.19.0)(!(version>=2.20.0)))" openhab.tp-xtext openhab.tp;filter:="(feature=jax-rs)" @@ -379,10 +379,10 @@ - openhab.tp;filter:="(&(feature=xtext-ide)(version>=2.17.0)(!(version>=2.18.0)))" + openhab.tp;filter:="(&(feature=xtext-ide)(version>=2.19.0)(!(version>=2.20.0)))" openhab.tp-xtext-ide - openhab.tp;filter:="(&(feature=lsp4j)(version>=0.6.0)(!(version>=0.7.0)))" + openhab.tp;filter:="(&(feature=lsp4j)(version>=0.8.0)(!(version>=0.9.0)))" openhab.tp-lsp4j openhab-core-model-item-ide diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml index 66b9b262566..0c8c7265c2a 100644 --- a/features/karaf/openhab-tp/src/main/feature/feature.xml +++ b/features/karaf/openhab-tp/src/main/feature/feature.xml @@ -176,9 +176,9 @@ - openhab.tp;feature=lsp4j;version=0.6.0 - mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.6.0 - mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.6.0 + openhab.tp;feature=lsp4j;version=0.8.0 + mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.8.0 + mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.8.0 openhab.tp-gson openhab.tp-xtext @@ -215,51 +215,55 @@ - openhab.tp;feature=xtext;version=2.17.0 + openhab.tp;feature=xtext;version=2.19.0 - mvn:org.eclipse.xtext/org.eclipse.xtext/2.17.0 + mvn:org.eclipse.xtext/org.eclipse.xtext/2.19.0 + + mvn:io.github.classgraph/classgraph/4.8.35 mvn:org.eclipse.emf/org.eclipse.emf.common/2.12.0 mvn:org.eclipse.emf/org.eclipse.emf.ecore/2.12.0 mvn:org.eclipse.emf/org.eclipse.emf.ecore.change/2.11.0 mvn:org.eclipse.emf/org.eclipse.emf.ecore.xmi/2.12.0 - mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/2.17.0 + mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/2.19.0 mvn:javax.annotation/javax.annotation-api/1.2 - mvn:org.eclipse.xtext/org.eclipse.xtext.xbase/2.17.0 - mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.17.0 - mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.17.0 - mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.17.0 - mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.17.0 - mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.17.0 + mvn:org.eclipse.xtext/org.eclipse.xtext.xbase/2.19.0 + mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.19.0 + mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.19.0 + mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.19.0 + mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.19.0 + mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.19.0 - mvn:com.google.guava/guava/21.0 + mvn:com.google.guava/failureaccess/1.0.1 + mvn:com.google.guava/guava/27.1-jre mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_2 + mvn:de.maggu2810.p2redist/com.google.inject/3.0.0.v201312141243 mvn:de.maggu2810.p2redist/org.antlr.runtime/3.2.0.v201101311130 - mvn:org.eclipse.platform/org.eclipse.equinox.common/3.9.0 - mvn:org.eclipse.platform/org.eclipse.equinox.registry/3.6.100 - mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.6.100 + mvn:org.eclipse.platform/org.eclipse.equinox.common/3.10.400 + mvn:org.eclipse.platform/org.eclipse.equinox.registry/3.8.400 + mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.9.0 - mvn:org.ow2.asm/asm/7.0 + mvn:org.ow2.asm/asm/7.1 - openhab.tp;feature=xtext-ide;version=2.17.0 + openhab.tp;feature=xtext-ide;version=2.19.0 openhab.tp-xtext - mvn:org.eclipse.xtext/org.eclipse.xtext.ide/2.17.0 - mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.17.0 + mvn:org.eclipse.xtext/org.eclipse.xtext.ide/2.19.0 + mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.19.0