mirror of
https://github.com/danieldemus/openhab-core.git
synced 2025-01-25 11:45:49 +01:00
Renamed Yahoo to ACME (#2304)
* Rename Yahoo to ACME * Remove Paper UI references Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
This commit is contained in:
Christoph Weitkamp
GitHub
parent
ebe090132c
commit
c80719fefa
@ -23,7 +23,7 @@ Future plans:
|
||||
|
||||
## Discovery
|
||||
|
||||
The Things provided by this bundle do not require discovery but can all be set up manually using PaperUI.
|
||||
The Things provided by this bundle do not require discovery but can all be set up manually using the UI.
|
||||
|
||||
## Bundle Configuration
|
||||
|
||||
|
||||
@ -35,7 +35,7 @@ import org.osgi.service.cm.ConfigurationAdmin;
|
||||
*/
|
||||
public class BindingInfoI18nTest extends JavaOSGiTest {
|
||||
|
||||
private static final String TEST_BUNDLE_NAME = "yahooweather.bundle";
|
||||
private static final String TEST_BUNDLE_NAME = "acmeweather.bundle";
|
||||
|
||||
private BindingInfoRegistry bindingInfoRegistry;
|
||||
private BindingInstaller bindingInstaller;
|
||||
@ -54,9 +54,9 @@ public class BindingInfoI18nTest extends JavaOSGiTest {
|
||||
BindingInfo bindingInfo = bindingInfos.iterator().next();
|
||||
|
||||
assertThat(bindingInfo, is(notNullValue()));
|
||||
assertThat(bindingInfo.getName(), is("Yahoo Wetter Binding"));
|
||||
assertThat(bindingInfo.getName(), is("ACME Wetter Binding"));
|
||||
assertThat(bindingInfo.getDescription(), is(
|
||||
"Das Yahoo Wetter Binding stellt verschiedene Wetterdaten wie die Temperatur, die Luftfeuchtigkeit und den Luftdruck für konfigurierbare Orte vom yahoo Wetterdienst bereit"));
|
||||
"Das ACME Wetter Binding stellt verschiedene Wetterdaten wie die Temperatur, die Luftfeuchtigkeit und den Luftdruck für konfigurierbare Orte vom ACME Wetterdienst bereit"));
|
||||
});
|
||||
}
|
||||
|
||||
@ -67,9 +67,9 @@ public class BindingInfoI18nTest extends JavaOSGiTest {
|
||||
BindingInfo bindingInfo = bindingInfos.iterator().next();
|
||||
|
||||
assertThat(bindingInfo, is(notNullValue()));
|
||||
assertThat(bindingInfo.getName(), is("Yahoo Weer Binding"));
|
||||
assertThat(bindingInfo.getName(), is("ACME Weer Binding"));
|
||||
assertThat(bindingInfo.getDescription(), is(
|
||||
"De Yahoo Weer Binding biedt verschillende meteorologische gegevens zoals temperatuur, vochtigheid en luchtdruk voor configureerbare locaties uit yahoo weerdienst klaar"));
|
||||
"De ACME Weer Binding biedt verschillende meteorologische gegevens zoals temperatuur, vochtigheid en luchtdruk voor configureerbare locaties uit ACME weerdienst klaar"));
|
||||
});
|
||||
}
|
||||
|
||||
@ -80,9 +80,9 @@ public class BindingInfoI18nTest extends JavaOSGiTest {
|
||||
BindingInfo bindingInfo = bindingInfos.iterator().next();
|
||||
|
||||
assertThat(bindingInfo, is(notNullValue()));
|
||||
assertThat(bindingInfo.getName(), is("YahooWeather Binding"));
|
||||
assertThat(bindingInfo.getName(), is("ACME Weather Binding"));
|
||||
assertThat(bindingInfo.getDescription(), is(
|
||||
"The Yahoo Weather Binding requests the Yahoo Weather Service to show the current temperature, humidity and pressure."));
|
||||
"The ACME Weather Binding requests the ACME Weather Service to show the current temperature, humidity and pressure."));
|
||||
});
|
||||
}
|
||||
|
||||
@ -116,9 +116,9 @@ public class BindingInfoI18nTest extends JavaOSGiTest {
|
||||
Set<BindingInfo> bindingInfos = bindingInfoRegistry.getBindingInfos(null);
|
||||
BindingInfo bindingInfo = bindingInfos.iterator().next();
|
||||
assertThat(bindingInfo, is(notNullValue()));
|
||||
assertThat(bindingInfo.getName(), is("Yahoo Wetter Binding"));
|
||||
assertThat(bindingInfo.getName(), is("ACME Wetter Binding"));
|
||||
assertThat(bindingInfo.getDescription(), is(
|
||||
"Das Yahoo Wetter Binding stellt verschiedene Wetterdaten wie die Temperatur, die Luftfeuchtigkeit und den Luftdruck für konfigurierbare Orte vom yahoo Wetterdienst bereit"));
|
||||
"Das ACME Wetter Binding stellt verschiedene Wetterdaten wie die Temperatur, die Luftfeuchtigkeit und den Luftdruck für konfigurierbare Orte vom ACME Wetterdienst bereit"));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<binding:binding id="yahooweather" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
<binding:binding id="acmeweather" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns:binding="https://openhab.org/schemas/binding/v1.0.0"
|
||||
xsi:schemaLocation="https://openhab.org/schemas/binding/v1.0.0 https://openhab.org/schemas/binding-1.0.0.xsd">
|
||||
|
||||
<name>YahooWeather Binding</name>
|
||||
<description>The Yahoo Weather Binding requests the Yahoo Weather Service to show the current temperature, humidity and
|
||||
<name>ACME Weather Binding</name>
|
||||
<description>The ACME Weather Binding requests the ACME Weather Service to show the current temperature, humidity and
|
||||
pressure.</description>
|
||||
|
||||
</binding:binding>
|
||||
@ -0,0 +1,2 @@
|
||||
binding.acmeweather.name = ACME Wetter Binding
|
||||
binding.acmeweather.description = Das ACME Wetter Binding stellt verschiedene Wetterdaten wie die Temperatur, die Luftfeuchtigkeit und den Luftdruck für konfigurierbare Orte vom ACME Wetterdienst bereit
|
||||
@ -0,0 +1,2 @@
|
||||
binding.acmeweather.name = ACME Weer Binding
|
||||
binding.acmeweather.description = De ACME Weer Binding biedt verschillende meteorologische gegevens zoals temperatuur, vochtigheid en luchtdruk voor configureerbare locaties uit ACME weerdienst klaar
|
||||
@ -1,3 +0,0 @@
|
||||
# binding
|
||||
binding.yahooweather.name = Yahoo Wetter Binding
|
||||
binding.yahooweather.description = Das Yahoo Wetter Binding stellt verschiedene Wetterdaten wie die Temperatur, die Luftfeuchtigkeit und den Luftdruck für konfigurierbare Orte vom yahoo Wetterdienst bereit
|
||||
@ -1,4 +0,0 @@
|
||||
# translate.google.de
|
||||
# :-)
|
||||
binding.yahooweather.name = Yahoo Weer Binding
|
||||
binding.yahooweather.description = De Yahoo Weer Binding biedt verschillende meteorologische gegevens zoals temperatuur, vochtigheid en luchtdruk voor configureerbare locaties uit yahoo weerdienst klaar
|
||||
@ -40,7 +40,7 @@ import org.openhab.core.test.java.JavaOSGiTest;
|
||||
*/
|
||||
public class ConfigDescriptionI18nTest extends JavaOSGiTest {
|
||||
|
||||
private static final String TEST_BUNDLE_NAME = "yahooweather.bundle";
|
||||
private static final String TEST_BUNDLE_NAME = "acmeweather.bundle";
|
||||
|
||||
private ConfigDescriptionProvider configDescriptionProvider;
|
||||
|
||||
|
||||
@ -164,7 +164,7 @@ public class GenericItemProviderTest extends JavaOSGiTest {
|
||||
assertThat(items, hasSize(0));
|
||||
|
||||
String model = "Group Weather [TAG1]\n" + "Group Weather_Chart (Weather)\n"
|
||||
+ "Number Weather_Temperature \"Outside Temperature [%.1f °C]\" <temperature> (Weather_Chart) [TAG1, TAG2] { channel=\"yahooweather:weather:berlin:temperature\" }\n"
|
||||
+ "Number Weather_Temperature \"Outside Temperature [%.1f °C]\" <temperature> (Weather_Chart) [TAG1, TAG2] { channel=\"acmeweather:weather:berlin:temperature\" }\n"
|
||||
+ "Number Weather_Temp_Max \"Todays Maximum [%.1f °C]\" <temperature> (Weather_Chart)\n"
|
||||
+ "Number Weather_Temp_Min \"Todays Minimum [%.1f °C]\" <temperature> (Weather_Chart)\n"
|
||||
+ "Number Weather_Chart_Period \"Chart Period\"\n"
|
||||
|
||||
@ -38,7 +38,7 @@ import org.openhab.core.thing.xml.test.LoadedTestBundle.StuffAddition;
|
||||
public class ThingTypeI18nTest extends JavaOSGiTest {
|
||||
|
||||
private LoadedTestBundle loadedTestBundle() throws Exception {
|
||||
return new LoadedTestBundle("yahooweather.bundle", bundleContext, this::getService,
|
||||
return new LoadedTestBundle("acmeweather.bundle", bundleContext, this::getService,
|
||||
new StuffAddition().thingTypes(2));
|
||||
}
|
||||
|
||||
@ -63,13 +63,13 @@ public class ThingTypeI18nTest extends JavaOSGiTest {
|
||||
try (final AutoCloseable unused = loadedTestBundle()) {
|
||||
Collection<ThingType> thingTypes = thingTypeProvider.getThingTypes(Locale.GERMAN);
|
||||
|
||||
ThingType weatherType = thingTypes.stream().filter(it -> "yahooweather:weather".equals(it.toString()))
|
||||
ThingType weatherType = thingTypes.stream().filter(it -> "acmeweather:weather".equals(it.toString()))
|
||||
.findFirst().get();
|
||||
assertNotNull(weatherType);
|
||||
|
||||
assertThat(weatherType.getLabel(), is("Wetterinformation"));
|
||||
assertThat(weatherType.getDescription(),
|
||||
is("Stellt verschiedene Wetterdaten vom Yahoo Wetterdienst bereit"));
|
||||
is("Stellt verschiedene Wetterdaten vom ACME Wetterdienst bereit"));
|
||||
}
|
||||
}
|
||||
|
||||
@ -79,7 +79,7 @@ public class ThingTypeI18nTest extends JavaOSGiTest {
|
||||
Collection<ThingType> thingTypes = thingTypeProvider.getThingTypes(Locale.GERMAN);
|
||||
|
||||
ThingType weatherGroupType = thingTypes.stream()
|
||||
.filter(it -> "yahooweather:weather-with-group".equals(it.toString())).findFirst().get();
|
||||
.filter(it -> "acmeweather:weather-with-group".equals(it.toString())).findFirst().get();
|
||||
assertNotNull(weatherGroupType);
|
||||
|
||||
ChannelGroupType channelGroupType = channelGroupTypeRegistry.getChannelGroupType(
|
||||
@ -97,7 +97,7 @@ public class ThingTypeI18nTest extends JavaOSGiTest {
|
||||
Collection<ThingType> thingTypes = thingTypeProvider.getThingTypes(Locale.GERMAN);
|
||||
|
||||
ThingType weatherGroupType = thingTypes.stream()
|
||||
.filter(it -> "yahooweather:weather-with-group".equals(it.toString())).findFirst().get();
|
||||
.filter(it -> "acmeweather:weather-with-group".equals(it.toString())).findFirst().get();
|
||||
assertNotNull(weatherGroupType);
|
||||
assertThat(weatherGroupType.getChannelGroupDefinitions().size(), is(2));
|
||||
|
||||
@ -126,7 +126,7 @@ public class ThingTypeI18nTest extends JavaOSGiTest {
|
||||
Collection<ThingType> thingTypes = thingTypeProvider.getThingTypes(Locale.GERMAN);
|
||||
|
||||
ThingType weatherGroupType = thingTypes.stream()
|
||||
.filter(it -> "yahooweather:weather-with-group".equals(it.toString())).findFirst().get();
|
||||
.filter(it -> "acmeweather:weather-with-group".equals(it.toString())).findFirst().get();
|
||||
assertNotNull(weatherGroupType);
|
||||
assertEquals(2, weatherGroupType.getChannelGroupDefinitions().size());
|
||||
|
||||
@ -170,7 +170,7 @@ public class ThingTypeI18nTest extends JavaOSGiTest {
|
||||
try (final AutoCloseable unused = loadedTestBundle()) {
|
||||
Collection<ThingType> thingTypes = thingTypeProvider.getThingTypes(Locale.GERMAN);
|
||||
|
||||
ThingType weatherType = thingTypes.stream().filter(it -> "yahooweather:weather".equals(it.toString()))
|
||||
ThingType weatherType = thingTypes.stream().filter(it -> "acmeweather:weather".equals(it.toString()))
|
||||
.findFirst().get();
|
||||
assertNotNull(weatherType);
|
||||
assertThat(weatherType.getChannelDefinitions().size(), is(2));
|
||||
@ -193,7 +193,7 @@ public class ThingTypeI18nTest extends JavaOSGiTest {
|
||||
try (final AutoCloseable unused = loadedTestBundle()) {
|
||||
Collection<ThingType> thingTypes = thingTypeProvider.getThingTypes(Locale.GERMAN);
|
||||
|
||||
ThingType weatherType = thingTypes.stream().filter(it -> "yahooweather:weather".equals(it.toString()))
|
||||
ThingType weatherType = thingTypes.stream().filter(it -> "acmeweather:weather".equals(it.toString()))
|
||||
.findFirst().get();
|
||||
assertNotNull(weatherType);
|
||||
assertThat(weatherType.getChannelDefinitions().size(), is(2));
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
|
||||
xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
|
||||
|
||||
<!-- YahooWeather Binding -->
|
||||
<thing-type id="wireless-router">
|
||||
<label>Simple wireless router</label>
|
||||
<description>Simple wireless router</description>
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
|
||||
xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
|
||||
|
||||
<!-- YahooWeather Binding -->
|
||||
<thing-type id="wireless-router">
|
||||
<label>Simple wireless router</label>
|
||||
<description>Simple wireless router</description>
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
thing-type.acmeweather.weather.label = Wetterinformation
|
||||
|
||||
channel-group-type.acmeweather.forecast.label = Wetterinformation mit Gruppe
|
||||
channel-group-type.acmeweather.forecast.description = Wetterinformation mit Gruppe Beschreibung.
|
||||
|
||||
thing-type.acmeweather.weather-with-group.group.forecastToday.label = Wettervorhersage heute
|
||||
thing-type.acmeweather.weather-with-group.group.forecastToday.description = Wettervorhersage für den heutigen Tag.
|
||||
thing-type.acmeweather.weather-with-group.group.forecastTomorrow.label = Wettervorhersage morgen
|
||||
thing-type.acmeweather.weather-with-group.group.forecastTomorrow.description = Wettervorhersage für den morgigen Tag.
|
||||
|
||||
channel-type.acmeweather.temperature.label = Temperatur
|
||||
channel-type.acmeweather.temperature.description = Temperatur in Grad Celsius (Metrisch) oder Fahrenheit (Imperial).
|
||||
channel-type.acmeweather.temperature.state.pattern = %d Grad Celsius
|
||||
channel-type.acmeweather.temperature.state.option.VALUE = Mein String
|
||||
|
||||
thing-type.acmeweather.weather.channel.minTemperature.label = Min. Temperatur
|
||||
thing-type.acmeweather.weather.channel.minTemperature.description = Minimale Temperatur in Grad Celsius (Metrisch) oder Fahrenheit (Imperial).
|
||||
|
||||
channel-group-type.acmeweather.forecast.channel.minTemperature.label = Min. Temperatur
|
||||
channel-group-type.acmeweather.forecast.channel.minTemperature.description = Minimale vorhergesagte Temperatur in Grad Celsius (Metrisch) oder Fahrenheit (Imperial).
|
||||
channel-group-type.acmeweather.forecast.channel.maxTemperature.label = Max. Temperatur
|
||||
channel-group-type.acmeweather.forecast.channel.maxTemperature.description = Maximale vorhergesagte Temperatur in Grad Celsius (Metrisch) oder Fahrenheit (Imperial).
|
||||
|
||||
CUSTOM_KEY= Stellt verschiedene Wetterdaten vom ACME Wetterdienst bereit
|
||||
@ -1,10 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<thing:thing-descriptions bindingId="yahooweather"
|
||||
<thing:thing-descriptions bindingId="acmeweather"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
|
||||
xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
|
||||
|
||||
<!-- YahooWeather Binding -->
|
||||
<!-- ACME Weather Binding -->
|
||||
<thing-type id="weather">
|
||||
<label>Weather Information *</label>
|
||||
<description>@text/CUSTOM_KEY</description>
|
||||
@ -18,7 +18,7 @@
|
||||
</channels>
|
||||
</thing-type>
|
||||
|
||||
<!-- YahooWeather Binding with group -->
|
||||
<!-- ACME Weather Binding with group -->
|
||||
<thing-type id="weather-with-group">
|
||||
<label>Weather Information with Group</label>
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
thing-type.yahooweather.weather.label = Wetterinformation
|
||||
|
||||
channel-group-type.yahooweather.forecast.label = Wetterinformation mit Gruppe
|
||||
channel-group-type.yahooweather.forecast.description = Wetterinformation mit Gruppe Beschreibung.
|
||||
|
||||
thing-type.yahooweather.weather-with-group.group.forecastToday.label = Wettervorhersage heute
|
||||
thing-type.yahooweather.weather-with-group.group.forecastToday.description = Wettervorhersage für den heutigen Tag.
|
||||
thing-type.yahooweather.weather-with-group.group.forecastTomorrow.label = Wettervorhersage morgen
|
||||
thing-type.yahooweather.weather-with-group.group.forecastTomorrow.description = Wettervorhersage für den morgigen Tag.
|
||||
|
||||
channel-type.yahooweather.temperature.label = Temperatur
|
||||
channel-type.yahooweather.temperature.description = Temperatur in Grad Celsius (Metrisch) oder Fahrenheit (Imperial).
|
||||
channel-type.yahooweather.temperature.state.pattern = %d Grad Celsius
|
||||
channel-type.yahooweather.temperature.state.option.VALUE = Mein String
|
||||
|
||||
thing-type.yahooweather.weather.channel.minTemperature.label = Min. Temperatur
|
||||
thing-type.yahooweather.weather.channel.minTemperature.description = Minimale Temperatur in Grad Celsius (Metrisch) oder Fahrenheit (Imperial).
|
||||
|
||||
channel-group-type.yahooweather.forecast.channel.minTemperature.label = Min. Temperatur
|
||||
channel-group-type.yahooweather.forecast.channel.minTemperature.description = Minimale vorhergesagte Temperatur in Grad Celsius (Metrisch) oder Fahrenheit (Imperial).
|
||||
channel-group-type.yahooweather.forecast.channel.maxTemperature.label = Max. Temperatur
|
||||
channel-group-type.yahooweather.forecast.channel.maxTemperature.description = Maximale vorhergesagte Temperatur in Grad Celsius (Metrisch) oder Fahrenheit (Imperial).
|
||||
|
||||
CUSTOM_KEY= Stellt verschiedene Wetterdaten vom Yahoo Wetterdienst bereit
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
_Give some details about what this binding is meant for - a protocol, system, specific device._
|
||||
|
||||
_If possible, provide some resources like pictures, a YouTube video, etc. to give an impression of what can be done with this binding. You can place such resources into a `doc` folder next to this README.md._
|
||||
_If possible, provide some resources like pictures, a video, etc. to give an impression of what can be done with this binding. You can place such resources into a `doc` folder next to this README.md._
|
||||
|
||||
#[[##]]# Supported Things
|
||||
|
||||
@ -19,10 +19,10 @@ _Describe the available auto-discovery features here. Mention for what it works
|
||||
_If your binding requires or supports general configuration settings, please create a folder ```cfg``` and place the configuration file ```<bindingId>.cfg``` inside it. In this section, you should link to this file and provide some information about the options. The file could e.g. look like:_
|
||||
|
||||
```
|
||||
# Configuration for the Philips Hue Binding
|
||||
# Configuration for the ${bindingIdCamelCase} Binding
|
||||
#
|
||||
# Default secret key for the pairing of the Philips Hue Bridge.
|
||||
# It has to be between 10-40 (alphanumeric) characters
|
||||
# Default secret key for the pairing of the ${bindingIdCamelCase} Thing.
|
||||
# It has to be between 10-40 (alphanumeric) characters.
|
||||
# This may be changed by the user for security reasons.
|
||||
secret=openHABSecret
|
||||
```
|
||||
@ -33,7 +33,7 @@ _If your binding does not offer any generic configurations, you can remove this
|
||||
|
||||
#[[##]]# Thing Configuration
|
||||
|
||||
_Describe what is needed to manually configure a thing, either through the (Paper) UI or via a thing-file. This should be mainly about its mandatory and optional configuration parameters. A short example entry for a thing file can help!_
|
||||
_Describe what is needed to manually configure a thing, either through the UI or via a thing-file. This should be mainly about its mandatory and optional configuration parameters. A short example entry for a thing file can help!_
|
||||
|
||||
_Note that it is planned to generate some part of this based on the XML files within ```src/main/resources/OH-INF/thing``` of your binding._
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user