Skip to content

Commit 6fcfc6f

Browse files
patricksepatrickse
committed
Fixed Style Checker Problems
1 parent 9225171 commit 6fcfc6f

23 files changed

+846
-700
lines changed

‎.classpath

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" path="src/main/java"/>
4-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
5-
<attributes>
6-
<attribute name="maven.pomderived" value="true"/>
7-
</attributes>
8-
</classpathentry>
4+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
95
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
106
<classpathentry exported="true" kind="lib" path="lib/socket.io-client-0.8.1.jar"/>
117
<classpathentry exported="true" kind="lib" path="lib/engine.io-client-0.8.1.jar"/>

‎.settings/org.eclipse.jdt.apt.core.prefs

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.apt.aptEnabled=false

‎.settings/org.eclipse.jdt.core.prefs

+1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ org.eclipse.jdt.core.compiler.compliance=1.8
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
77
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
8+
org.eclipse.jdt.core.compiler.processAnnotations=disabled
89
org.eclipse.jdt.core.compiler.source=1.8

‎.vscode/settings.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"java.configuration.updateBuildConfiguration": "interactive"
3+
}

‎ESH-INF/binding/binding.xml

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<binding:binding id="volumio2"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xmlns:binding="http://eclipse.org/smarthome/schemas/binding/v1.0.0"
5-
xsi:schemaLocation="http://eclipse.org/smarthome/schemas/binding/v1.0.0 http://eclipse.org/smarthome/schemas/binding-1.0.0.xsd">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:binding="http://eclipse.org/smarthome/schemas/binding/v1.0.0"
5+
xsi:schemaLocation="http://eclipse.org/smarthome/schemas/binding/v1.0.0 http://eclipse.org/smarthome/schemas/binding-1.0.0.xsd">
66

7-
<name>Volumio2 Binding</name>
8-
<description>This is the binding for Volumio2 devices</description>
9-
<author>Patrick Sernetz</author>
7+
<name>Volumio2 Binding</name>
8+
<description>This is the binding for Volumio2 devices</description>
9+
<author>Patrick Sernetz</author>
1010

11-
<config-description>
12-
<parameter name="callbackUrl" type="text">
13-
<label>Callback URL</label>
14-
<description>URL to use for playing notification sounds, e.g. http://192.168.0.2:8080</description>
15-
<required>false</required>
16-
</parameter>
17-
</config-description>
11+
<config-description>
12+
<parameter name="callbackUrl" type="text">
13+
<label>Callback URL</label>
14+
<description>URL to use for playing notification sounds, e.g. http://192.168.0.2:8080</description>
15+
<required>false</required>
16+
</parameter>
17+
</config-description>
1818

19-
</binding:binding>
19+
</binding:binding>

‎ESH-INF/thing/thing-types.xml

+137-137
Original file line numberDiff line numberDiff line change
@@ -1,150 +1,150 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<thing:thing-descriptions bindingId="volumio2"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xmlns:thing="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0"
5-
xsi:schemaLocation="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0 http://eclipse.org/smarthome/schemas/thing-description-1.0.0.xsd">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:thing="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0"
5+
xsi:schemaLocation="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0 http://eclipse.org/smarthome/schemas/thing-description-1.0.0.xsd">
66

7-
<!-- Volumio Thing Type -->
8-
<thing-type id="player">
9-
<label>Volumio2 Player</label>
10-
<description>A Volumio2 Player</description>
7+
<!-- Volumio Thing Type -->
8+
<thing-type id="player">
9+
<label>Volumio2 Player</label>
10+
<description>A Volumio2 Player</description>
1111

12-
<channels>
13-
<channel id="title" typeId="title"/>
14-
<channel id="artist" typeId="artist"/>
15-
<channel id="album" typeId="album"/>
16-
<channel id="volume" typeId="volume"/>
17-
<channel id="player" typeId="player"/>
12+
<channels>
13+
<channel id="title" typeId="title"/>
14+
<channel id="artist" typeId="artist"/>
15+
<channel id="album" typeId="album"/>
16+
<channel id="volume" typeId="volume"/>
17+
<channel id="player" typeId="player"/>
1818
<!-- <channel id="albumArt" typeId="albumArt"/> -->
19-
<channel id="trackType" typeId="trackType"/>
20-
<channel id="playRadioStream" typeId="playRadioStream"/>
21-
<channel id="playPlaylist" typeId="playPlaylist"/>
22-
<channel id="clearQueue" typeId="clearQueue"/>
23-
<channel id="playURI" typeId="playURI"/>
24-
<channel id="playFile" typeId="playFile"/>
25-
<channel id="random" typeId="playRandom"/>
26-
<channel id="repeat" typeId="playRepeat"/>
27-
</channels>
28-
29-
<config-description>
30-
<parameter name="hostname" type="text" required="true">
31-
<label>Hostname</label>
32-
<description>The hostname of your volumio2 device</description>
33-
</parameter>
34-
<parameter name="port" type="integer" required="true">
35-
<label>Port</label>
36-
<description>The port of your volumio2 device (default is 3000)</description>
37-
<default>3000</default>
38-
</parameter>
39-
<parameter name="protocol" type="text" required="true">
40-
<label>Protocol</label>
41-
<description>The protocol of your volumio2 device (default is http)</description>
42-
<limitToOptions>true</limitToOptions>
43-
<options>
44-
<option value="http">http</option>
45-
<option value="https">https</option>
46-
</options>
47-
</parameter>
48-
<parameter name="timeout" type="integer" required="true">
49-
<label>Timeout</label>
50-
<description>Connection-Timeout in ms</description>
51-
<default>5000</default>
52-
<advanced>true</advanced>
53-
</parameter>
54-
</config-description>
55-
56-
</thing-type>
19+
<channel id="trackType" typeId="trackType"/>
20+
<channel id="playRadioStream" typeId="playRadioStream"/>
21+
<channel id="playPlaylist" typeId="playPlaylist"/>
22+
<channel id="clearQueue" typeId="clearQueue"/>
23+
<channel id="playURI" typeId="playURI"/>
24+
<channel id="playFile" typeId="playFile"/>
25+
<channel id="random" typeId="playRandom"/>
26+
<channel id="repeat" typeId="playRepeat"/>
27+
</channels>
28+
29+
<config-description>
30+
<parameter name="hostname" type="text" required="true">
31+
<label>Hostname</label>
32+
<description>The hostname of your volumio2 device</description>
33+
</parameter>
34+
<parameter name="port" type="integer" required="true">
35+
<label>Port</label>
36+
<description>The port of your volumio2 device (default is 3000)</description>
37+
<default>3000</default>
38+
</parameter>
39+
<parameter name="protocol" type="text" required="true">
40+
<label>Protocol</label>
41+
<description>The protocol of your volumio2 device (default is http)</description>
42+
<limitToOptions>true</limitToOptions>
43+
<options>
44+
<option value="http">http</option>
45+
<option value="https">https</option>
46+
</options>
47+
</parameter>
48+
<parameter name="timeout" type="integer" required="true">
49+
<label>Timeout</label>
50+
<description>Connection-Timeout in ms</description>
51+
<default>5000</default>
52+
<advanced>true</advanced>
53+
</parameter>
54+
</config-description>
55+
56+
</thing-type>
5757

58-
<channel-type id="title">
59-
<item-type>String</item-type>
60-
<label>Current Title</label>
61-
<description>Title of the song currently playing</description>
62-
<state readOnly="true"/>
63-
</channel-type>
64-
65-
<channel-type id="artist">
66-
<item-type>String</item-type>
67-
<label>Current Artist</label>
68-
<description>Name of the artist currently playing</description>
69-
<state readOnly="true"/>
70-
</channel-type>
71-
72-
<channel-type id="album">
73-
<item-type>String</item-type>
74-
<label>Current Album</label>
75-
<description>Name of the album currently playing</description>
76-
<state readOnly="true"/>
77-
</channel-type>
78-
79-
<channel-type id="volume">
80-
<item-type>Dimmer</item-type>
81-
<label>Volume</label>
82-
<description>Set or get the master volume</description>
83-
<category>SoundVolume</category>
84-
<state max="100" min="0" step="10"/>
85-
</channel-type>
86-
87-
<channel-type id="player">
88-
<item-type>Player</item-type>
89-
<label>State</label>
90-
<description>The State channel contains state of the Volumio2 Player</description>
91-
<category>Player</category>
92-
</channel-type>
58+
<channel-type id="title">
59+
<item-type>String</item-type>
60+
<label>Current Title</label>
61+
<description>Title of the song currently playing</description>
62+
<state readOnly="true"/>
63+
</channel-type>
64+
65+
<channel-type id="artist">
66+
<item-type>String</item-type>
67+
<label>Current Artist</label>
68+
<description>Name of the artist currently playing</description>
69+
<state readOnly="true"/>
70+
</channel-type>
71+
72+
<channel-type id="album">
73+
<item-type>String</item-type>
74+
<label>Current Album</label>
75+
<description>Name of the album currently playing</description>
76+
<state readOnly="true"/>
77+
</channel-type>
78+
79+
<channel-type id="volume">
80+
<item-type>Dimmer</item-type>
81+
<label>Volume</label>
82+
<description>Set or get the master volume</description>
83+
<category>SoundVolume</category>
84+
<state max="100" min="0" step="10"/>
85+
</channel-type>
86+
87+
<channel-type id="player">
88+
<item-type>Player</item-type>
89+
<label>State</label>
90+
<description>The State channel contains state of the Volumio2 Player</description>
91+
<category>Player</category>
92+
</channel-type>
9393

94-
<channel-type id="albumArt" advanced="true">
95-
<item-type>Image</item-type>
96-
<label>Cover Art</label>
97-
<description>Cover Art for the currently played track</description>
98-
<state readOnly="true"/>
99-
</channel-type>
100-
101-
<channel-type id="trackType" advanced="true">
102-
<item-type>String</item-type>
103-
<label>trackType</label>
104-
<description>Tracktype of the currently played track</description>
105-
<state readOnly="true"/>
106-
</channel-type>
94+
<channel-type id="albumArt" advanced="true">
95+
<item-type>Image</item-type>
96+
<label>Cover Art</label>
97+
<description>Cover Art for the currently played track</description>
98+
<state readOnly="true"/>
99+
</channel-type>
100+
101+
<channel-type id="trackType" advanced="true">
102+
<item-type>String</item-type>
103+
<label>trackType</label>
104+
<description>Tracktype of the currently played track</description>
105+
<state readOnly="true"/>
106+
</channel-type>
107107

108-
<channel-type id="playRadioStream" advanced="true">
109-
<item-type>String</item-type>
110-
<label>Play radio stream</label>
111-
<description>Play the given radio stream</description>
112-
</channel-type>
113-
114-
<channel-type id="playPlaylist" advanced="true">
115-
<item-type>String</item-type>
116-
<label>Play playlist</label>
117-
<description>Playback a playlist identifed by its name</description>
118-
</channel-type>
119-
120-
<channel-type id="clearQueue" advanced="true">
121-
<item-type>Switch</item-type>
122-
<label>Clear queue</label>
123-
<description>Clear the current queue</description>
124-
</channel-type>
108+
<channel-type id="playRadioStream" advanced="true">
109+
<item-type>String</item-type>
110+
<label>Play radio stream</label>
111+
<description>Play the given radio stream</description>
112+
</channel-type>
113+
114+
<channel-type id="playPlaylist" advanced="true">
115+
<item-type>String</item-type>
116+
<label>Play playlist</label>
117+
<description>Playback a playlist identifed by its name</description>
118+
</channel-type>
119+
120+
<channel-type id="clearQueue" advanced="true">
121+
<item-type>Switch</item-type>
122+
<label>Clear queue</label>
123+
<description>Clear the current queue</description>
124+
</channel-type>
125125

126-
<channel-type id="playRandom" advanced="true">
127-
<item-type>Switch</item-type>
128-
<label>Random</label>
129-
<description>Activate random mode</description>
130-
</channel-type>
126+
<channel-type id="playRandom" advanced="true">
127+
<item-type>Switch</item-type>
128+
<label>Random</label>
129+
<description>Activate random mode</description>
130+
</channel-type>
131131

132-
<channel-type id="playRepeat" advanced="true">
133-
<item-type>Switch</item-type>
134-
<label>Repeat</label>
135-
<description>Activate repeat mode</description>
136-
</channel-type>
132+
<channel-type id="playRepeat" advanced="true">
133+
<item-type>Switch</item-type>
134+
<label>Repeat</label>
135+
<description>Activate repeat mode</description>
136+
</channel-type>
137137

138-
<channel-type id="playURI" advanced="true">
139-
<item-type>String</item-type>
140-
<label>Play URI</label>
141-
<description>Play the stream at given uri</description>
142-
</channel-type>
143-
144-
<channel-type id="playFile" advanced="true">
145-
<item-type>String</item-type>
146-
<label>Play file</label>
147-
<description>Play a file, located on your Volumio2 device at the given absolute path, e.g. "mnt/INTERNAL/song.mp3"</description>
148-
</channel-type>
138+
<channel-type id="playURI" advanced="true">
139+
<item-type>String</item-type>
140+
<label>Play URI</label>
141+
<description>Play the stream at given uri</description>
142+
</channel-type>
143+
144+
<channel-type id="playFile" advanced="true">
145+
<item-type>String</item-type>
146+
<label>Play file</label>
147+
<description>Play a file, located on your Volumio2 device at the given absolute path, e.g. "mnt/INTERNAL/song.mp3"</description>
148+
</channel-type>
149149

150150
</thing:thing-descriptions>

‎OSGI-INF/volumio2HandlerFactory.xml

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2014-2016 by the respective copyright holders.
5-
All rights reserved. This program and the accompanying materials
6-
are made available under the terms of the Eclipse Public License v1.0
7-
which accompanies this distribution, and is available at
8-
http://www.eclipse.org/legal/epl-v10.html
4+
Copyright (c) 2014-2018 by the respective copyright holders.
5+
All rights reserved. This program and the accompanying materials
6+
are made available under the terms of the Eclipse Public License v1.0
7+
which accompanies this distribution, and is available at
8+
http://www.eclipse.org/legal/epl-v10.html
99
1010
-->
1111
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.openhab.binding.volumio2.internal.Volumio2HandlerFactory">
1212

13-
<implementation class="org.openhab.binding.volumio2.internal.Volumio2HandlerFactory"/>
13+
<implementation class="org.openhab.binding.volumio2.internal.Volumio2HandlerFactory"/>
1414

15-
<service>
16-
<provide interface="org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory"/>
17-
</service>
18-
19-
<!--
20-
<reference bind="setAudioHTTPServer" cardinality="1..1" interface="org.eclipse.smarthome.core.audio.AudioHTTPServer" name="AudioHTTPServer" policy="static" unbind="unsetAudioHTTPServer"/>
21-
-->
22-
</scr:component>
15+
<service>
16+
<provide interface="org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory"/>
17+
</service>
18+
19+
<!--
20+
<reference bind="setAudioHTTPServer" cardinality="1..1" interface="org.eclipse.smarthome.core.audio.AudioHTTPServer" name="AudioHTTPServer" policy="static" unbind="unsetAudioHTTPServer"/>
21+
-->
22+
</scr:component>

0 commit comments

Comments
 (0)