Review #3

kgoderis · Feb 28, 2016 · 165f29f · 165f29f
1 parent 20b07a0
commit 165f29f
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 38 deletions.
diff --git a/addons/binding/org.openhab.binding.rme/ESH-INF/binding/binding.xml b/addons/binding/org.openhab.binding.rme/ESH-INF/binding/binding.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<binding:binding id="rme"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns:binding="http://eclipse.org/smarthome/schemas/binding/v1.0.0"
-        xsi:schemaLocation="http://eclipse.org/smarthome/schemas/binding/v1.0.0 http://eclipse.org/smarthome/schemas/binding-1.0.0.xsd">
+<binding:binding id="rme" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:binding="http://eclipse.org/smarthome/schemas/binding/v1.0.0"
+	xsi:schemaLocation="http://eclipse.org/smarthome/schemas/binding/v1.0.0 http://eclipse.org/smarthome/schemas/binding-1.0.0.xsd">
 
-    <name>RME Binding</name>
-    <description>This is the binding for RME Rain Manager.</description>
-    <author>Karel Goderis</author>
+	<name>RME Binding</name>
+	<description>This is the binding for RME Rain Manager.</description>
+	<author>Karel Goderis</author>
 
 </binding:binding>
diff --git a/addons/binding/org.openhab.binding.rme/ESH-INF/thing/rme.xml b/addons/binding/org.openhab.binding.rme/ESH-INF/thing/rme.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<thing:thing-descriptions bindingId="rme"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<thing:thing-descriptions bindingId="rme" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:thing="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0"
 	xsi:schemaLocation="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0 http://eclipse.org/smarthome/schemas/thing-description-1.0.0.xsd">
 
@@ -14,25 +13,25 @@
 			<channel id="mode" typeId="mode" />
 			<channel id="source" typeId="source" />
 			<channel id="exitpump" typeId="statusflag">
-			     <label>Exit Pump Active</label>
+				<label>Exit Pump Active</label>
 			</channel>
 			<channel id="entrypump" typeId="statusflag">
-			     <label>Entry Pump Active</label>
+				<label>Entry Pump Active</label>
 			</channel>
 			<channel id="waterexchange" typeId="statusflag">
-			     <label>Water Exchange Active</label>
+				<label>Water Exchange Active</label>
 			</channel>
 			<channel id="cisternsupplyalarm" typeId="statusflag">
-			     <label>Cistern Supply Alarm</label>
+				<label>Cistern Supply Alarm</label>
 			</channel>
 			<channel id="overflowalarm" typeId="statusflag">
-			     <label>Overflow Alarm</label>
+				<label>Overflow Alarm</label>
 			</channel>
 			<channel id="cisternblockedalarm" typeId="statusflag">
-			      <label>Cistern Blocked Alarm</label>
+				<label>Cistern Blocked Alarm</label>
 			</channel>
 			<channel id="filtercleaning" typeId="statusflag">
-			       <label>Filter Cleaning Required</label>
+				<label>Filter Cleaning Required</label>
 			</channel>
 		</channels>
 
@@ -59,37 +58,37 @@
 		<label>Operation Mode</label>
 		<description>Indicates the operation mode of the RME Rain Manager</description>
 		<state readOnly="true">
-	       <options>
-	           <option value="Automatic">Automatic</option>
-	            <option value="Manual">Manual</option>
-	       </options>
-        </state>
+			<options>
+				<option value="Automatic">Automatic</option>
+				<option value="Manual">Manual</option>
+			</options>
+		</state>
 	</channel-type>
-	
-		<!-- Operation Mode Channel Type -->
+
+	<!-- Operation Mode Channel Type -->
 	<channel-type id="source">
 		<item-type>String</item-type>
 		<label>Water Source</label>
 		<description>Indicates water source used to supply water, e.g cistern or city</description>
-        <state readOnly="true">
-           <options>
-               <option value="Rain">Rain</option>
-                <option value="City">City</option>
-           </options>
-        </state>
-     </channel-type>
+		<state readOnly="true">
+			<options>
+				<option value="Rain">Rain</option>
+				<option value="City">City</option>
+			</options>
+		</state>
+	</channel-type>
 
 	<!-- Status Flag Channel Type -->
 	<channel-type id="statusflag" advanced="true">
 		<item-type>Switch</item-type>
 		<label>Status Flag</label>
 		<description>Status Flag of an RME operational parameter, e.g ON if set, OFF if unset</description>
-        <state readOnly="true">
-           <options>
-               <option value="ON">ON</option>
-                <option value="OFF">OFF</option>
-           </options>
-         </state>
-    </channel-type>
+		<state readOnly="true">
+			<options>
+				<option value="ON">ON</option>
+				<option value="OFF">OFF</option>
+			</options>
+		</state>
+	</channel-type>
 
 </thing:thing-descriptions>
diff --git a/addons/binding/org.openhab.binding.rme/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.rme/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@ Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ClassPath: .
 Import-Package: com.google.common.collect,
+ gnu.io,
  org.apache.commons.io,
  org.apache.commons.lang,
  org.eclipse.smarthome.config.core,
@@ -18,4 +19,3 @@ Import-Package: com.google.common.collect,
 Service-Component: OSGI-INF/*.xml
 Export-Package: org.openhab.binding.rme,
  org.openhab.binding.rme.handler
-Require-Bundle: org.openhab.io.transport.serial