demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 13:21:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Align I18nProviderImpl and thing description XSD (#4233)

Browse Source 
Signed-off-by: Jan N. Klug <github@klug.nrw>
This commit is contained in:
J-N-K 2024-05-18 13:08:22 +02:00 committed by GitHub
parent 88c5a0849f
commit 73f4722b91
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd
View File

@ -154,23 +154,21 @@
<xs:enumeration value="Image"/>
<xs:enumeration value="Location"/>
<xs:enumeration value="Number"/>
<xs:enumeration value="Number:Intensity"/>
<xs:enumeration value="Number:Acceleration"/>
<xs:enumeration value="Number:AmountOfSubstance"/>
<xs:enumeration value="Number:Angle"/>
<xs:enumeration value="Number:AngularAcceleration"/>
<xs:enumeration value="Number:AngularVelocity"/>
<xs:enumeration value="Number:Area"/>
<xs:enumeration value="Number:ArealDensity"/>
<xs:enumeration value="Number:CatalyticActivity"/>
<xs:enumeration value="Number:Currency"/>
<xs:enumeration value="Number:DataAmount"/>
<xs:enumeration value="Number:DataRate"/>
<xs:enumeration value="Number:DataTransferRate"/>
<xs:enumeration value="Number:Density"/>
<xs:enumeration value="Number:Dimensionless"/>
<xs:enumeration value="Number:Duration"/>
<xs:enumeration value="Number:DynamicViscosity"/>
<xs:enumeration value="Number:ElectricCapacitance"/>
<xs:enumeration value="Number:ElectricCharge"/>
<xs:enumeration value="Number:ElectricConductance"/>
<xs:enumeration value="Number:ElectricConductivity"/>
<xs:enumeration value="Number:ElectricCurrent"/>
<xs:enumeration value="Number:ElectricInductance"/>
<xs:enumeration value="Number:ElectricPotential"/>
@ -181,14 +179,13 @@
<xs:enumeration value="Number:Force"/>
<xs:enumeration value="Number:Frequency"/>
<xs:enumeration value="Number:Illuminance"/>
<xs:enumeration value="Number:KinematicViscosity"/>
<xs:enumeration value="Number:Intensity"/>
<xs:enumeration value="Number:Length"/>
<xs:enumeration value="Number:LuminousFlux"/>
<xs:enumeration value="Number:LuminousIntensity"/>
<xs:enumeration value="Number:MagneticFlux"/>
<xs:enumeration value="Number:MagneticFluxDensity"/>
<xs:enumeration value="Number:Mass"/>
<xs:enumeration value="Number:MassFlowRate"/>
<xs:enumeration value="Number:Power"/>
<xs:enumeration value="Number:Pressure"/>
<xs:enumeration value="Number:RadiationDoseAbsorbed"/>
@ -198,11 +195,8 @@
<xs:enumeration value="Number:SolidAngle"/>
<xs:enumeration value="Number:Speed"/>
<xs:enumeration value="Number:Temperature"/>
<xs:enumeration value="Number:Torque"/>
<xs:enumeration value="Number:Velocity"/>
<xs:enumeration value="Number:Time"/>
<xs:enumeration value="Number:Volume"/>
<xs:enumeration value="Number:VolumetricDensity"/>
<xs:enumeration value="Number:VolumetricFlowRate"/>
<xs:enumeration value="Player"/>
<xs:enumeration value="Rollershutter"/>

4
bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/I18nProviderImpl.java
View File

@ -414,6 +414,7 @@ public class I18nProviderImpl
addDefaultUnit(dimensionMap, ElectricResistance.class, Units.OHM);
addDefaultUnit(dimensionMap, EmissionIntensity.class, Units.GRAM_PER_KILOWATT_HOUR);
addDefaultUnit(dimensionMap, Energy.class, Units.KILOWATT_HOUR);
addDefaultUnit(dimensionMap, EnergyPrice.class, CurrencyUnits.BASE_ENERGY_PRICE);
addDefaultUnit(dimensionMap, Force.class, Units.NEWTON);
addDefaultUnit(dimensionMap, Frequency.class, Units.HERTZ);
addDefaultUnit(dimensionMap, Illuminance.class, Units.LUX);
@ -426,12 +427,11 @@ public class I18nProviderImpl
addDefaultUnit(dimensionMap, Mass.class, SIUnits.KILOGRAM, ImperialUnits.POUND);
addDefaultUnit(dimensionMap, Power.class, Units.WATT);
addDefaultUnit(dimensionMap, Pressure.class, HECTO(SIUnits.PASCAL), ImperialUnits.INCH_OF_MERCURY);
addDefaultUnit(dimensionMap, EnergyPrice.class, CurrencyUnits.BASE_ENERGY_PRICE);
addDefaultUnit(dimensionMap, RadiationDoseAbsorbed.class, Units.GRAY);
addDefaultUnit(dimensionMap, RadiationDoseEffective.class, Units.SIEVERT);
addDefaultUnit(dimensionMap, RadiationSpecificActivity.class, Units.BECQUEREL_PER_CUBIC_METRE);
addDefaultUnit(dimensionMap, Radioactivity.class, Units.BECQUEREL);
addDefaultUnit(dimensionMap, SolidAngle.class, Units.STERADIAN);
addDefaultUnit(dimensionMap, RadiationSpecificActivity.class, Units.BECQUEREL_PER_CUBIC_METRE);
addDefaultUnit(dimensionMap, Speed.class, SIUnits.KILOMETRE_PER_HOUR, ImperialUnits.MILES_PER_HOUR);
addDefaultUnit(dimensionMap, Temperature.class, SIUnits.CELSIUS, ImperialUnits.FAHRENHEIT);
addDefaultUnit(dimensionMap, Time.class, Units.SECOND);