code cleanup to match expectations of static analysis tool (#151)

Signed-off-by: Kai Kreuzer <kai@openhab.org>
pull/153/head
Kai Kreuzer 2017-06-02 16:40:55 +02:00 committed by GitHub
parent 020b6e29ae
commit 14e503736c
41 changed files with 101 additions and 67 deletions

View File

@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="src/test/groovy"/>
<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
<classpathentry kind="output" path="target/test-classes"/>
</classpath>

View File

@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.source=1.8

View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: openHAB 1.x Compatibility Layer Tests
Bundle-SymbolicName: org.openhab.core.compat1x.test
Bundle-Version: 2.1.0.qualifier
Bundle-Vendor: openHAB.org
Bundle-Vendor: openHAB
Fragment-Host: org.openhab.core.compat1x
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: groovy.lang,

View File

@ -1,5 +1,6 @@
source.. = src/test/java/,\
src/test/groovy/
output.. = target/test-classes/
output.. = target/test-classes/,target/classes
bin.includes = META-INF/,\
.
.,\
about.html

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.9.2.jar"/>

View File

@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.source=1.8

View File

@ -4,7 +4,7 @@ Bundle-Name: openHAB 1.x Compatibility Layer
Bundle-SymbolicName: org.openhab.core.compat1x
Bundle-Version: 2.1.0.qualifier
Bundle-Activator: org.openhab.core.compat1x.internal.CompatibilityActivator
Bundle-Vendor: openHAB.org
Bundle-Vendor: openHAB
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: com.google.common.base,
javax.servlet,

View File

@ -2,5 +2,6 @@ output.. = target/classes/
bin.includes = META-INF/,\
.,\
lib/,\
OSGI-INF/
OSGI-INF/,\
about.html
source.. = src/main/java/

View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: openHAB Karaf Integration
Bundle-SymbolicName: org.openhab.core.karaf
Bundle-Version: 2.1.0.qualifier
Bundle-Vendor: openHAB.org
Bundle-Vendor: openHAB
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Karaf-Commands: org.openhab.core.karaf.internal.command
Service-Component: OSGI-INF/*.xml

View File

@ -2,5 +2,6 @@ output.. = target/classes/
bin.includes = META-INF/,\
.,\
OSGI-INF/,\
ESH-INF/
ESH-INF/,\
about.html
source.. = src/main/java/

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>

View File

@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.source=1.8

View File

@ -6,7 +6,7 @@ Ignore-Package: org.openhab.core.internal.items,org.openhab.core.inter
nal,org.openhab.core.internal.events
Bundle-Name: openHAB Core
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: openHAB.org
Bundle-Vendor: openHAB
Bundle-Version: 2.1.0.qualifier
Bundle-Activator: org.openhab.core.internal.CoreActivator
Bundle-ManifestVersion: 2

View File

@ -1,6 +1,7 @@
output.. = target/classes/
bin.includes = META-INF/,\
.,\
OSGI-INF/
OSGI-INF/,\
about.html
source.. = src/main/java/,\
src/main/resources/
src/main/resources/

View File

@ -1,18 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry exported="true" kind="lib" path="lib/bcprov-jdk15on-1.52.jar"/>
<classpathentry exported="true" kind="lib" path="lib/bcpkix-jdk15on-1.52.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry exported="true" kind="lib" path="lib/bcpkix-jdk15on-1.52.jar"/>
<classpathentry exported="true" kind="lib" path="lib/bcprov-jdk15on-1.52.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

View File

@ -0,0 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8

View File

@ -5,7 +5,7 @@ Bundle-SymbolicName: org.openhab.io.jetty.certificate;singleton:=true
Bundle-Version: 2.1.0.qualifier
Bundle-Activator: org.openhab.io.jetty.certificate.internal.CertificateGenerator
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: openHAB.org
Bundle-Vendor: openHAB
Bundle-Classpath: .,
lib/bcpkix-jdk15on-1.52.jar,
lib/bcprov-jdk15on-1.52.jar

View File

@ -1,4 +1,5 @@
source.. = src/main/java
output.. = target/classes
bin.includes = META-INF/,\
.
.,\
about.html

View File

@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

View File

@ -0,0 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8

View File

@ -17,3 +17,5 @@ Import-Package: com.google.gson,
org.slf4j
Service-Component: OSGI-INF/*.xml
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: openHAB
Bundle-ActivationPolicy: lazy

View File

@ -1,5 +1,6 @@
bin.includes = META-INF/,\
.,\
OSGI-INF/,\
swagger/
swagger/,\
about.html
source.. = src/main/java

View File

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="lib" path="lib/jl1.0.1.jar"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry exported="true" kind="lib" path="lib/jl1.0.1.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

View File

@ -0,0 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8

View File

@ -14,3 +14,4 @@ Fragment-Host: org.eclipse.smarthome.io.javasound
Bundle-ClassPath: lib/jl1.0.1.jar,
.
Bundle-ActivationPolicy: lazy
Bundle-Vendor: openHAB

View File

@ -1,5 +1,6 @@
bin.includes = META-INF/,\
.,\
OSGI-INF/,\
lib/jl1.0.1.jar
lib/jl1.0.1.jar,\
about.html
source.. = src/main/java

View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry exported="true" kind="lib" path="patch" sourcepath="patch"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

View File

@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.source=1.8

View File

@ -6,6 +6,7 @@ Bundle-Version: 2.1.0.qualifier
Fragment-Host: org.eclipse.smarthome.ui.basic
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ClassPath: patch/,.
Service-Component: OSGI-INF/dashboardtile.xml
Service-Component: OSGI-INF/*.xml
Import-Package: org.openhab.ui.dashboard
Bundle-Vendor: openHAB.org
Bundle-Vendor: openHAB
Bundle-ActivationPolicy: lazy

View File

@ -1,6 +1,7 @@
bin.includes = META-INF/,\
.,\
OSGI-INF/,\
patch/
patch/,\
about.html
output = target/classes/
source.. = src/main/java/

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

View File

@ -5,5 +5,7 @@ Bundle-SymbolicName: org.openhab.ui.classicui
Bundle-Version: 2.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ClassPath: .
Service-Component: OSGI-INF/dashboardtile.xml
Service-Component: OSGI-INF/*.xml
Import-Package: org.openhab.ui.dashboard
Bundle-Vendor: openHAB
Bundle-ActivationPolicy: lazy

View File

@ -1,5 +1,6 @@
bin.includes = META-INF/,\
.,\
OSGI-INF/
OSGI-INF/,\
about.html
output = target/classes/
source.. = src/main/java/

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="output" path="target/classes"/>

View File

@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.source=1.8

View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: openHAB Dashboard UI
Bundle-SymbolicName: org.openhab.ui.dashboard
Bundle-Version: 2.1.0.qualifier
Bundle-Vendor: openHAB.org
Bundle-Vendor: openHAB
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/*.xml
Import-Package: javax.servlet,

View File

@ -4,5 +4,6 @@ bin.includes = META-INF/,\
OSGI-INF/,\
web/,\
OSGI-INF/dashboardservice.xml,\
templates/
templates/,\
about.html
source.. = src/main/java/

View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry exported="true" kind="lib" path="patch" sourcepath="patch"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

View File

@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.source=1.8

View File

@ -7,3 +7,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Fragment-Host: org.eclipse.smarthome.ui.paper
Bundle-ClassPath: patch/,.
Import-Package: org.openhab.ui.dashboard
Bundle-Vendor: openHAB
Service-Component: OSGI-INF/*.xml
Bundle-ActivationPolicy: lazy

View File

@ -1,6 +1,7 @@
bin.includes = META-INF/,\
.,\
patch/web/,\
OSGI-INF/
OSGI-INF/,\
about.html
output = target/classes/
source.. = src/main/java/