diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Semantics.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Semantics.java index f05c59679..101165083 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Semantics.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Semantics.java @@ -17,12 +17,12 @@ import org.eclipse.jdt.annotation.Nullable; import org.openhab.core.items.Item; import org.openhab.core.model.script.engine.action.ActionDoc; import org.openhab.core.model.script.internal.engine.action.SemanticsActionService; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.Location; +import org.openhab.core.semantics.Point; +import org.openhab.core.semantics.Property; import org.openhab.core.semantics.SemanticTags; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.Location; -import org.openhab.core.semantics.model.Point; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.Tag; +import org.openhab.core.semantics.Tag; /** * The static methods of this class are made available as functions in the scripts. This allows a script to use diff --git a/bundles/org.openhab.core.semantics/model/generateTagClasses.groovy b/bundles/org.openhab.core.semantics/model/generateTagClasses.groovy index 94acb2063..213227e24 100755 --- a/bundles/org.openhab.core.semantics/model/generateTagClasses.groovy +++ b/bundles/org.openhab.core.semantics/model/generateTagClasses.groovy @@ -69,9 +69,9 @@ def createTagSetClass(def line, String tagSet) { file.write("package org.openhab.core.semantics.model." + pkg + ";\n\n") file.write("import org.eclipse.jdt.annotation.NonNullByDefault;\n") if (!parent) { - file.write("import org.openhab.core.semantics.model." + type + ";\n") + file.write("import org.openhab.core.semantics." + type + ";\n") } - file.write("""import org.openhab.core.semantics.model.TagInfo; + file.write("""import org.openhab.core.semantics.TagInfo; /** * This class defines a ${label}. @@ -104,7 +104,7 @@ import java.util.Set; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Location; +import org.openhab.core.semantics.Location; /** * This class provides a stream of all defined locations. @@ -142,7 +142,7 @@ import java.util.Set; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.Equipment; /** * This class provides a stream of all defined equipments. @@ -180,7 +180,7 @@ import java.util.Set; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Point; +import org.openhab.core.semantics.Point; /** * This class provides a stream of all defined points. @@ -218,7 +218,7 @@ import java.util.Set; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.Property; /** * This class provides a stream of all defined properties. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Equipment.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/Equipment.java similarity index 95% rename from bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Equipment.java rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/Equipment.java index 8c6718cb5..4186a6025 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Equipment.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/Equipment.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.core.semantics.model; +package org.openhab.core.semantics; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Location.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/Location.java similarity index 95% rename from bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Location.java rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/Location.java index 982f2f10c..b978194e2 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Location.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/Location.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.core.semantics.model; +package org.openhab.core.semantics; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Point.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/Point.java similarity index 95% rename from bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Point.java rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/Point.java index 8d8bcfb9a..c4698d737 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Point.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/Point.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.core.semantics.model; +package org.openhab.core.semantics; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Property.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/Property.java similarity index 93% rename from bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Property.java rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/Property.java index 443da26ce..a7a3d43de 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Property.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/Property.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.core.semantics.model; +package org.openhab.core.semantics; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java index 2d314bf4f..78d1aa11a 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java @@ -26,12 +26,6 @@ import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.openhab.core.items.Item; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.Location; -import org.openhab.core.semantics.model.Point; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.Tag; -import org.openhab.core.semantics.model.TagInfo; import org.openhab.core.semantics.model.equipment.Equipments; import org.openhab.core.semantics.model.location.Locations; import org.openhab.core.semantics.model.point.Measurement; diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsPredicates.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsPredicates.java index 1d9eae594..7bb963004 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsPredicates.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsPredicates.java @@ -16,11 +16,6 @@ import java.util.function.Predicate; import org.eclipse.jdt.annotation.NonNullByDefault; import org.openhab.core.items.Item; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.Location; -import org.openhab.core.semantics.model.Point; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.Tag; /** * This class provides predicates that allow filtering item streams with regards to their semantics. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsService.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsService.java index 207223b5d..272e17427 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsService.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsService.java @@ -17,7 +17,6 @@ import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; import org.openhab.core.items.Item; -import org.openhab.core.semantics.model.Location; /** * This interface defines a service, which offers functionality regarding semantic tags. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Tag.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/Tag.java similarity index 93% rename from bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Tag.java rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/Tag.java index 062ae7560..1c7daa380 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Tag.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/Tag.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.core.semantics.model; +package org.openhab.core.semantics; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/TagInfo.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/TagInfo.java similarity index 95% rename from bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/TagInfo.java rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/TagInfo.java index ace578309..d0f4886f5 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/TagInfo.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/TagInfo.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.core.semantics.model; +package org.openhab.core.semantics; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsMetadataProvider.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsMetadataProvider.java index 71fb49232..ad3f834a4 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsMetadataProvider.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsMetadataProvider.java @@ -29,13 +29,13 @@ import org.openhab.core.items.ItemRegistryChangeListener; import org.openhab.core.items.Metadata; import org.openhab.core.items.MetadataKey; import org.openhab.core.items.MetadataProvider; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.Location; +import org.openhab.core.semantics.Point; +import org.openhab.core.semantics.Property; import org.openhab.core.semantics.SemanticTags; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.Location; -import org.openhab.core.semantics.model.Point; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.Tag; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Tag; +import org.openhab.core.semantics.TagInfo; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsServiceImpl.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsServiceImpl.java index 028e75b20..4d8fca97a 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsServiceImpl.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsServiceImpl.java @@ -27,13 +27,13 @@ import org.openhab.core.items.ItemRegistry; import org.openhab.core.items.Metadata; import org.openhab.core.items.MetadataKey; import org.openhab.core.items.MetadataRegistry; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.Location; +import org.openhab.core.semantics.Point; import org.openhab.core.semantics.SemanticTags; import org.openhab.core.semantics.SemanticsPredicates; import org.openhab.core.semantics.SemanticsService; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.Location; -import org.openhab.core.semantics.model.Point; -import org.openhab.core.semantics.model.Tag; +import org.openhab.core.semantics.Tag; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/AlarmSystem.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/AlarmSystem.java index 8ddc73862..2dda474e3 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/AlarmSystem.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/AlarmSystem.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Alarm System. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/BackDoor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/BackDoor.java index 30b96d18f..ecc67a169 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/BackDoor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/BackDoor.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Back Door. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Battery.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Battery.java index df459ef25..a3bc3541e 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Battery.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Battery.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Battery. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Blinds.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Blinds.java index f81b4435d..c1022d372 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Blinds.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Blinds.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Blinds. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Boiler.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Boiler.java index d4f0ca9b1..1aeb06ef2 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Boiler.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Boiler.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Boiler. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Camera.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Camera.java index d4a6b50fe..b99826c63 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Camera.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Camera.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Camera. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Car.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Car.java index 097c00291..627968779 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Car.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Car.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Car. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CeilingFan.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CeilingFan.java index 5d0da162b..fc06726cf 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CeilingFan.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CeilingFan.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Ceiling Fan. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CellarDoor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CellarDoor.java index 0305c0c0c..90a26fa6a 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CellarDoor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CellarDoor.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Cellar Door. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CleaningRobot.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CleaningRobot.java index da22c510b..f1a7298d7 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CleaningRobot.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CleaningRobot.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Cleaning Robot. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Dishwasher.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Dishwasher.java index 7a7b62b86..7147d2cb2 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Dishwasher.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Dishwasher.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Dishwasher. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Door.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Door.java index a4873c728..d3fdd8e73 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Door.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Door.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Door. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Doorbell.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Doorbell.java index 02b5b6469..74cee46a6 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Doorbell.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Doorbell.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Doorbell. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Dryer.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Dryer.java index 1d794e4d8..3e96f14f5 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Dryer.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Dryer.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Dryer. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Equipments.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Equipments.java index d2f56d6f4..029247d7f 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Equipments.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Equipments.java @@ -17,7 +17,7 @@ import java.util.Set; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.Equipment; /** * This class provides a stream of all defined equipments. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Fan.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Fan.java index 545a64565..7987aa861 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Fan.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Fan.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Fan. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Freezer.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Freezer.java index 3210f4672..d5d6cc34d 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Freezer.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Freezer.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Freezer. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/FrontDoor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/FrontDoor.java index 6f155c105..8fd984230 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/FrontDoor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/FrontDoor.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Front Door. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/GarageDoor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/GarageDoor.java index 7106f545d..8f796fa84 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/GarageDoor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/GarageDoor.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Garage Door. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Gate.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Gate.java index 970c60e8f..924e05a4e 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Gate.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Gate.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Gate. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/HVAC.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/HVAC.java index 5f961c5e7..cbfe67756 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/HVAC.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/HVAC.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a HVAC. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/InnerDoor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/InnerDoor.java index 352dc5671..8525a0841 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/InnerDoor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/InnerDoor.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Inner Door. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Inverter.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Inverter.java index e6c7f709b..9e2b4ba7c 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Inverter.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Inverter.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Inverter. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/KitchenHood.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/KitchenHood.java index 1efcbfb45..4f4abedc1 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/KitchenHood.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/KitchenHood.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Kitchen Hood. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/LawnMower.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/LawnMower.java index 02ae173e0..eb17e52b8 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/LawnMower.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/LawnMower.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Lawn Mower. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/LightStripe.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/LightStripe.java index 8211b7637..2145fef1a 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/LightStripe.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/LightStripe.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Light Stripe. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lightbulb.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lightbulb.java index 1f8c78bd4..1fba5a72c 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lightbulb.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lightbulb.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Lightbulb. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lock.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lock.java index 00ac787fa..8bc7430f3 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lock.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lock.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Lock. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/MotionDetector.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/MotionDetector.java index 524041e3b..f18f24a14 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/MotionDetector.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/MotionDetector.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Motion Detector. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/NetworkAppliance.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/NetworkAppliance.java index f8287da19..9e96934a9 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/NetworkAppliance.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/NetworkAppliance.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Network Appliance. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Oven.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Oven.java index e3bb99009..56b9f4b49 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Oven.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Oven.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Oven. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/PowerOutlet.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/PowerOutlet.java index e2df97de6..d90cd0a76 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/PowerOutlet.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/PowerOutlet.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Power Outlet. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Projector.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Projector.java index bdd45ad3e..8a0e8e41f 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Projector.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Projector.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Projector. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Pump.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Pump.java index f12e8e523..c267cbcbf 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Pump.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Pump.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Pump. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RadiatorControl.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RadiatorControl.java index 35ff30880..89f57d48a 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RadiatorControl.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RadiatorControl.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Radiator Control. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Receiver.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Receiver.java index ec3370654..dfb25a43f 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Receiver.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Receiver.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Receiver. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Refrigerator.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Refrigerator.java index a7db01a9e..568d8be63 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Refrigerator.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Refrigerator.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Refrigerator. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RemoteControl.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RemoteControl.java index b1e1393a7..d1498f1a1 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RemoteControl.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RemoteControl.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Remote Control. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Screen.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Screen.java index 9c85881eb..ea9221079 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Screen.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Screen.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Screen. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Sensor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Sensor.java index 0771f2821..610016db3 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Sensor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Sensor.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Sensor. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/SideDoor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/SideDoor.java index bf1e7c8f2..2146681a3 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/SideDoor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/SideDoor.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Side Door. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Siren.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Siren.java index 4b6635952..82181b250 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Siren.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Siren.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Siren. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Smartphone.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Smartphone.java index 9351e357f..24c017bfe 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Smartphone.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Smartphone.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Smartphone. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/SmokeDetector.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/SmokeDetector.java index ebed1c716..1418ab44f 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/SmokeDetector.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/SmokeDetector.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Smoke Detector. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Speaker.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Speaker.java index e4018bea5..9b04e5b70 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Speaker.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Speaker.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Speaker. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Television.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Television.java index 6aaeeed00..541840149 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Television.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Television.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Television. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Valve.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Valve.java index 80e6c2c87..df101b35b 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Valve.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Valve.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Valve. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/VoiceAssistant.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/VoiceAssistant.java index 1bfa48f39..3dbe9fa01 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/VoiceAssistant.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/VoiceAssistant.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Voice Assistant. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WallSwitch.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WallSwitch.java index 940b243d5..c4e53d2bb 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WallSwitch.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WallSwitch.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Wall Switch. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WashingMachine.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WashingMachine.java index ff72da122..585176974 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WashingMachine.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WashingMachine.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Washing Machine. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WeatherService.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WeatherService.java index 619c7fbbd..f9221d221 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WeatherService.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WeatherService.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Weather Service. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WebService.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WebService.java index 2d6439fee..931bc7aa1 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WebService.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WebService.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Web Service. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WhiteGood.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WhiteGood.java index 130ef272b..e47df9e93 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WhiteGood.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WhiteGood.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a White Good. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Window.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Window.java index 570f840b6..ba6340e83 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Window.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Window.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Equipment; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Equipment; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Window. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Apartment.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Apartment.java index b63310dec..5383bd50a 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Apartment.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Apartment.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Apartment. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Attic.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Attic.java index 09a2cccca..6be75770c 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Attic.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Attic.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Attic. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Basement.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Basement.java index d15cddc17..0b4e9d5c2 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Basement.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Basement.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Basement. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bathroom.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bathroom.java index d737b3e1d..210a38f6c 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bathroom.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bathroom.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Bathroom. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bedroom.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bedroom.java index 5001c3c51..edad8fe42 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bedroom.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bedroom.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Bedroom. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/BoilerRoom.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/BoilerRoom.java index 4548dc0b1..d6a58d7ab 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/BoilerRoom.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/BoilerRoom.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Boiler Room. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Building.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Building.java index a1ef09546..58fc75c55 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Building.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Building.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Building. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Carport.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Carport.java index ac352a8e6..b0c9a8af5 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Carport.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Carport.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Carport. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Cellar.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Cellar.java index 63281f6cb..f4559931d 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Cellar.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Cellar.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Cellar. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Corridor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Corridor.java index 8066fdd53..4cea3152d 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Corridor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Corridor.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Corridor. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/DiningRoom.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/DiningRoom.java index 2fa80b205..60fe915aa 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/DiningRoom.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/DiningRoom.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Dining Room. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Driveway.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Driveway.java index 739c9c81f..b3f44051e 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Driveway.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Driveway.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Driveway. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Entry.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Entry.java index cfdfc5d2b..91dca5f91 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Entry.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Entry.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Entry. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/FamilyRoom.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/FamilyRoom.java index 9a4ebf467..b7be6868e 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/FamilyRoom.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/FamilyRoom.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Family Room. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/FirstFloor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/FirstFloor.java index 42498786e..320cc5d52 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/FirstFloor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/FirstFloor.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a First Floor. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Floor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Floor.java index ce2a85c38..1a01b29c5 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Floor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Floor.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Floor. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garage.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garage.java index 874a31781..35e1725f6 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garage.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garage.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Garage. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garden.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garden.java index 47683f5c4..b2cc9656b 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garden.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garden.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Garden. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/GroundFloor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/GroundFloor.java index dcb89223b..b27773054 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/GroundFloor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/GroundFloor.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Ground Floor. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/GuestRoom.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/GuestRoom.java index 16227d898..1dfe2cf98 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/GuestRoom.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/GuestRoom.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Guest Room. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/House.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/House.java index dbec6096d..ea0dc7e3e 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/House.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/House.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a House. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Indoor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Indoor.java index a76da0836..da3f79eea 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Indoor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Indoor.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Location; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Location; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Indoor. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Kitchen.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Kitchen.java index 0bb55037f..4eb760efa 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Kitchen.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Kitchen.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Kitchen. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/LaundryRoom.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/LaundryRoom.java index 0e8695eee..5cc130560 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/LaundryRoom.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/LaundryRoom.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Laundry Room. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/LivingRoom.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/LivingRoom.java index 271634a0e..ead10cceb 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/LivingRoom.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/LivingRoom.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Living Room. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Locations.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Locations.java index cb3d32ab6..07d6c7c6e 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Locations.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Locations.java @@ -17,7 +17,7 @@ import java.util.Set; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Location; +import org.openhab.core.semantics.Location; /** * This class provides a stream of all defined locations. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Office.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Office.java index 551ba3bcf..e82448ce1 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Office.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Office.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Office. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Outdoor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Outdoor.java index fce9259ba..7d5fa7e4b 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Outdoor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Outdoor.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Location; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Location; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Outdoor. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Patio.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Patio.java index 55b03931d..a41a71f5e 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Patio.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Patio.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Patio. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Porch.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Porch.java index e6afcd3fd..eddbf7afb 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Porch.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Porch.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Porch. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Room.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Room.java index 08f37ad1e..138932642 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Room.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Room.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Room. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/SecondFloor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/SecondFloor.java index 8cf46c4d8..4bcd8b26e 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/SecondFloor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/SecondFloor.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Second Floor. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Shed.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Shed.java index c1b50d4de..7ac59b4fd 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Shed.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Shed.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Shed. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/SummerHouse.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/SummerHouse.java index 0da11bfe0..0f5d08daa 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/SummerHouse.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/SummerHouse.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Summer House. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Terrace.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Terrace.java index 8378136ba..6d947d5e9 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Terrace.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Terrace.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Terrace. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/ThirdFloor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/ThirdFloor.java index 87f6fafe5..37fc557b8 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/ThirdFloor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/ThirdFloor.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Third Floor. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Veranda.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Veranda.java index a5fbc8776..ed18ffeb7 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Veranda.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Veranda.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Veranda. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Alarm.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Alarm.java index ac533b687..3f4ab6814 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Alarm.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Alarm.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Point; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Point; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Alarm. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Control.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Control.java index 50270bed7..5d22d76fc 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Control.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Control.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Point; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Point; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Control. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/LowBattery.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/LowBattery.java index 1ff8e867b..7a531adbc 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/LowBattery.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/LowBattery.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a LowBattery. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Measurement.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Measurement.java index b99811957..20014747c 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Measurement.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Measurement.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Point; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Point; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Measurement. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenLevel.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenLevel.java index 71ea5e40e..ed860bb69 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenLevel.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenLevel.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a OpenLevel. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenState.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenState.java index 3f403c2c7..cbed27f63 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenState.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenState.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a OpenState. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Points.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Points.java index 66b2740b3..4d6c6da2f 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Points.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Points.java @@ -17,7 +17,7 @@ import java.util.Set; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Point; +import org.openhab.core.semantics.Point; /** * This class provides a stream of all defined points. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Setpoint.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Setpoint.java index b4a4f135d..2dbbe2486 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Setpoint.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Setpoint.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Point; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Point; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Setpoint. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Status.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Status.java index b7d947d03..a0e3dc5a8 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Status.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Status.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Point; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Point; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Status. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Switch.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Switch.java index 6f51098f7..df0d31f36 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Switch.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Switch.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Switch. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tampered.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tampered.java index 51d07fc05..2ed7e4866 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tampered.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tampered.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Tampered. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tilt.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tilt.java index 234b269f0..e83d7c9c0 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tilt.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tilt.java @@ -13,7 +13,7 @@ package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Tilt. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO.java index 290b74b7f..423606817 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a CO. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO2.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO2.java index bae5e10fa..56df6e0f1 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO2.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO2.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a CO2. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/ColorTemperature.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/ColorTemperature.java index 6f3d4ad67..787260212 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/ColorTemperature.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/ColorTemperature.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Color Temperature. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Current.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Current.java index 6592149c7..b43333c99 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Current.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Current.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Current. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Duration.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Duration.java index c4511725c..58c2b8897 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Duration.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Duration.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Duration. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Energy.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Energy.java index 643aa0c3e..6e4f6d119 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Energy.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Energy.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Energy. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Frequency.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Frequency.java index 2a8cb5ee1..05f611ba6 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Frequency.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Frequency.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Frequency. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Gas.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Gas.java index 2ee4b3cc1..bbe4861ba 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Gas.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Gas.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Gas. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Humidity.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Humidity.java index b6991c1a5..f5436ac90 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Humidity.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Humidity.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Humidity. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Level.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Level.java index 103f55b61..dde86f8b4 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Level.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Level.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Level. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Light.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Light.java index c4dcb8f14..530ef3b66 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Light.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Light.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Light. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Noise.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Noise.java index 298035070..0c99ecb99 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Noise.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Noise.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Noise. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Oil.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Oil.java index 62152ff5e..40255923f 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Oil.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Oil.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Oil. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Opening.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Opening.java index ca42190cd..2c2d11a7b 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Opening.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Opening.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Opening. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Power.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Power.java index f6cca5782..4960757b2 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Power.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Power.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Power. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Presence.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Presence.java index 092f74a05..661469681 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Presence.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Presence.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Presence. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Pressure.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Pressure.java index 239bc6fd3..1c476c276 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Pressure.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Pressure.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Pressure. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Properties.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Properties.java index d05917fb5..91aa3fb55 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Properties.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Properties.java @@ -17,7 +17,7 @@ import java.util.Set; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.Property; /** * This class provides a stream of all defined properties. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Rain.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Rain.java index d9cab768f..04885c5a8 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Rain.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Rain.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Rain. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Smoke.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Smoke.java index fbf7159d9..19acf1290 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Smoke.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Smoke.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Smoke. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/SoundVolume.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/SoundVolume.java index d2b0a0f39..c90be67a2 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/SoundVolume.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/SoundVolume.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Sound Volume. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Temperature.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Temperature.java index 209047d9f..4ee1947c1 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Temperature.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Temperature.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Temperature. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Timestamp.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Timestamp.java index 00af3904b..3dde94d3c 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Timestamp.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Timestamp.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Timestamp. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Ultraviolet.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Ultraviolet.java index fb608f3b6..3cb07bd43 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Ultraviolet.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Ultraviolet.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Ultraviolet. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Vibration.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Vibration.java index cfbdb2525..facdbef08 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Vibration.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Vibration.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Vibration. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Voltage.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Voltage.java index 08d5ac374..455d9ba93 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Voltage.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Voltage.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Voltage. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Water.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Water.java index 1371af070..ab37463e4 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Water.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Water.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Water. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Wind.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Wind.java index 427308845..fdcd7296c 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Wind.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Wind.java @@ -13,8 +13,8 @@ package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.semantics.model.Property; -import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.Property; +import org.openhab.core.semantics.TagInfo; /** * This class defines a Wind. diff --git a/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/SemanticTagsTest.java b/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/SemanticTagsTest.java index c3e19f8ce..f5416cfd4 100644 --- a/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/SemanticTagsTest.java +++ b/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/SemanticTagsTest.java @@ -21,7 +21,6 @@ import org.junit.jupiter.api.Test; import org.openhab.core.items.GenericItem; import org.openhab.core.items.GroupItem; import org.openhab.core.library.CoreItemFactory; -import org.openhab.core.semantics.model.Location; import org.openhab.core.semantics.model.equipment.CleaningRobot; import org.openhab.core.semantics.model.location.Bathroom; import org.openhab.core.semantics.model.location.Kitchen;