removd ext input and program channels and fixed utf-8 encoding in i18…

…n properties
sprehn · May 26, 2017 · f60846e · f60846e
1 parent d43a47b
commit f60846e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/addons/binding/org.openhab.binding.connectsdk/ESH-INF/i18n/connectsdk_de_DE.properties b/addons/binding/org.openhab.binding.connectsdk/ESH-INF/i18n/connectsdk_de_DE.properties
@@ -4,20 +4,20 @@ binding.connectsdk.description = Connect SDK Binding
 
 # thing types
 thing-type.connectsdk.WebOSTV.label = WebOS TV
-thing-type.connectsdk.sample.description = LG WebOS fähiger Smart TV
+thing-type.connectsdk.WebOSTV.description = LG WebOS fähiger Smart TV
 
 # channel types
-channel-type.connectsdk.volumeChannelType.label = Lautstärke
-channel-type.connectsdk.volumeChannelType.description = TV Lautstärke
+channel-type.connectsdk.volumeChannelType.label = Lautstärke
+channel-type.connectsdk.volumeChannelType.description = TV Lautstärke
 
-channel-type.connectsdk.volumeUpChannelType.label = Lautstärke +
+channel-type.connectsdk.volumeUpChannelType.label = Lautstärke +
 channel-type.connectsdk.volumeUpChannelType.description = Lauter
 
-channel-type.connectsdk.volumeDownChannelType.label = Lautstärke -
+channel-type.connectsdk.volumeDownChannelType.label = Lautstärke -
 channel-type.connectsdk.volumeDownChannelType.description = Leiser
 
 channel-type.connectsdk.powerChannelType.label = An/Aus
-channel-type.connectsdk.powerChannelType.description = TV An/Aus
+channel-type.connectsdk.powerChannelType.description = TV kann über dieses Binding nur ausgeschaltet werden.
 
 channel-type.connectsdk.muteChannelType.label = Stumm
 channel-type.connectsdk.muteChannelType.description = Stumm
@@ -37,8 +37,8 @@ channel-type.connectsdk.channelNameChannelType.description = Kanal Name
 channel-type.connectsdk.toastChannelType.label = Toast
 channel-type.connectsdk.toastChannelType.description = Toast Nachricht
 
-channel-type.connectsdk.programChannelType.label = Programm
-channel-type.connectsdk.programChannelType.description = Aktueller Programm Name
+#channel-type.connectsdk.programChannelType.label = Programm
+#channel-type.connectsdk.programChannelType.description = Aktueller Programm Name
 
 #channel-type.connectsdk.externalInputChannelType.label = 
 #channel-type.connectsdk.externalInputChannelType.description = 

diff --git a/addons/binding/org.openhab.binding.connectsdk/ESH-INF/thing/thing-types.xml b/addons/binding/org.openhab.binding.connectsdk/ESH-INF/thing/thing-types.xml
@@ -18,8 +18,8 @@
 			<channel id="channelUp" typeId="channelUpChannelType" />
 			<channel id="channelDown" typeId="channelDownChannelType" />
 			<channel id="channelName" typeId="channelNameChannelType" />
-			<channel id="program" typeId="programChannelType" />
-			<channel id="externalInput" typeId="externalInputChannelType" />
+			<!-- channel id="program" typeId="programChannelType" />
+			<channel id="externalInput" typeId="externalInputChannelType" / -->
             <channel id="toast" typeId="toastChannelType" />			
 			<channel id="mediaForward" typeId="mediaForwardChannelType" />
 			<channel id="mediaPause" typeId="mediaPauseChannelType" />
@@ -50,7 +50,7 @@
 	<channel-type id="powerChannelType">
 		<item-type>Switch</item-type>
 		<label>Power</label>
-		<description>Current Power Setting</description>
+		<description>Via this binding TV can only be powered off, not on.</description>
 		<category>PowerOutlet</category>
 	</channel-type>
 	<channel-type id="muteChannelType">
@@ -60,10 +60,9 @@
 		<category>Switch</category>
 	</channel-type>
 	<channel-type id="channelChannelType">
-		<item-type>Number</item-type>
+		<item-type>String</item-type>
 		<label>Channel</label>
-		<description>Current Channel Number</description>
-		<state min="0" step="1"></state>
+		<description>Current Channel</description>
 	</channel-type>
 
 	<channel-type id="toastChannelType">
@@ -96,7 +95,7 @@
 		<description>Current Channel Name</description>
 		<state readOnly="true" />
 	</channel-type>
-	<channel-type id="programChannelType">
+	<!-- channel-type id="programChannelType">
 		<item-type>String</item-type>
 		<label>Program</label>
 		<description>Current Program Name</description>
@@ -105,7 +104,7 @@
 	<channel-type id="externalInputChannelType">
 		<item-type>String</item-type>
 		<label>External Input</label>
-	</channel-type>
+	</channel-type -->
 	<channel-type id="mediaForwardChannelType">
 		<item-type>Switch</item-type>
 		<label>Forward</label>

diff --git a/...ng.connectsdk/src/main/java/org/openhab/binding/connectsdk/handler/ConnectSDKHandler.java b/...ng.connectsdk/src/main/java/org/openhab/binding/connectsdk/handler/ConnectSDKHandler.java
@@ -43,13 +43,14 @@ public class ConnectSDKHandler extends BaseThingHandler implements ConnectableDe
     private DiscoveryManager discoveryManager;
 
     // ChannelID to CommandHandler Map
+    // .put(CHANNEL_EXT_INPUT, new ExternalInputControlInput())
+    // .put(CHANNEL_PROGRAM, new TVControlProgram())
     private final Map<String, ChannelHandler> channelHandlers = ImmutableMap.<String, ChannelHandler>builder()
             .put(CHANNEL_VOLUME, new VolumeControlVolume()).put(CHANNEL_VOLUME_UP, new VolumeControlUp())
             .put(CHANNEL_VOLUME_DOWN, new VolumeControlDown()).put(CHANNEL_POWER, new PowerControlPower())
             .put(CHANNEL_MUTE, new VolumeControlMute()).put(CHANNEL_CHANNEL, new TVControlChannel())
             .put(CHANNEL_CHANNEL_UP, new TVControlUp()).put(CHANNEL_CHANNEL_DOWN, new TVControlDown())
-            .put(CHANNEL_CHANNEL_NAME, new TVControlChannelName()).put(CHANNEL_PROGRAM, new TVControlProgram())
-            .put(CHANNEL_EXT_INPUT, new ExternalInputControlInput()).put(CHANNEL_APP_LAUCHER, new LauncherApplication())
+            .put(CHANNEL_CHANNEL_NAME, new TVControlChannelName()).put(CHANNEL_APP_LAUCHER, new LauncherApplication())
             .put(CHANNEL_MEDIA_FORWARD, new MediaControlForward()).put(CHANNEL_MEDIA_PAUSE, new MediaControlPause())
             .put(CHANNEL_MEDIA_PLAY, new MediaControlPlay()).put(CHANNEL_MEDIA_REWIND, new MediaControlRewind())
             .put(CHANNEL_MEDIA_STOP, new MediaControlStop()).put(CHANNEL_MEDIA_STATE, new MediaControlPlayState())