fix some occurences of openHAB instead of Eclipse SmartHome

Signed-off-by: Markus Rathgeb <[email protected]>

bundles/core/org.eclipse.smarthome.core.autoupdate/.project

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>org.eclipse.smarthome.core.autoupdate</name>
-	<comment>This is the Auto-Update binding of the open Home Automation Bus (openHAB)</comment>
+	<comment>This is the Auto-Update binding of Eclipse SmartHome</comment>
 	<projects>
 	</projects>
 	<buildSpec>

bundles/core/org.eclipse.smarthome.core.binding.xml/.project

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>org.eclipse.smarthome.core.binding.xml</name>
-	<comment>This is the runtime binding XML component of the open Home Automation Bus (openHAB)</comment>
+	<comment>This is the runtime binding XML component of Eclipse SmartHome</comment>
 	<projects>
 	</projects>
 	<buildSpec>

bundles/core/org.eclipse.smarthome.core.persistence/.project

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>org.eclipse.smarthome.core.persistence</name>
-	<comment>This is the persistence component of the open Home Automation Bus (openHAB)</comment>
+	<comment>This is the persistence component of Eclipse SmartHome</comment>
 	<projects>
 	</projects>
 	<buildSpec>

bundles/core/org.eclipse.smarthome.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/PersistenceService.java

@@ -12,7 +12,7 @@
 import org.eclipse.smarthome.core.items.Item;
 
 /**
- * A persistence service which can be used to store data from openHAB.
+ * A persistence service which can be used to store data from Eclipse SmartHome.
  * This must not necessarily be a local database, a persistence service
  * can also be cloud-based or a simply data-export facility (e.g.
  * for sending data to an IoT (Internet of Things) service.

bundles/core/org.eclipse.smarthome.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/QueryablePersistenceService.java

@@ -13,7 +13,7 @@
 
 /**
  * A queryable persistence service which can be used to store and retrieve
- * data from openHAB. This is most likely some kind of database system.
+ * data from Eclipse SmartHome. This is most likely some kind of database system.
  *
  * @author Kai Kreuzer - Initial contribution and API
  * @author Chris Jackson - Added getItems method

bundles/core/org.eclipse.smarthome.core.scheduler/.project

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>org.eclipse.smarthome.core.scheduler</name>
-	<comment>This is the Scheduler bundle of the open Home Automation Bus (openHAB)</comment>
+	<comment>This is the Scheduler bundle of Eclipse SmartHome</comment>
 	<projects>
 	</projects>
 	<buildSpec>

bundles/core/org.eclipse.smarthome.core.test/META-INF/MANIFEST.MF

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Tests for the openHAB Core
+Bundle-Name: Tests for the Eclipse SmartHome Core
 Bundle-SymbolicName: org.eclipse.smarthome.core.test
 Bundle-Version: 0.9.0.qualifier
 Bundle-Vendor: Eclipse.org/SmartHome

bundles/core/org.eclipse.smarthome.core.thing.test/src/test/groovy/org/eclipse/smarthome/core/thing/binding/BindingBaseClassesOSGiTest.groovy

@@ -5,15 +5,6 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-
-
-/**
- * Copyright (c) 2014-2015 openHAB UG (haftungsbeschraenkt) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- */
 package org.eclipse.smarthome.core.thing.binding
 
 import static org.hamcrest.CoreMatchers.*

bundles/core/org.eclipse.smarthome.core.thing.xml/.project

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>org.eclipse.smarthome.core.thing.xml</name>
-	<comment>This is the runtime Thing XML component of the open Home Automation Bus (openHAB)</comment>
+	<comment>This is the runtime Thing XML component of Eclipse SmartHome</comment>
 	<projects>
 	</projects>
 	<buildSpec>

bundles/core/org.eclipse.smarthome.core.thing/.project

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>org.eclipse.smarthome.core.thing</name>
-	<comment>This is the runtime component of the open Home Automation Bus (openHAB)</comment>
+	<comment>This is the core thing component of Eclipse SmartHome</comment>
 	<projects>
 	</projects>
 	<buildSpec>

bundles/core/org.eclipse.smarthome.core.transform/.project

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>org.eclipse.smarthome.core.transform</name>
-	<comment>This is the transformation bundle of the open Home Automation Bus (openHAB)</comment>
+	<comment>This is the transformation bundle of Eclipse SmartHome</comment>
 	<projects>
 	</projects>
 	<buildSpec>

bundles/core/org.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/items/Item.java

@@ -11,14 +11,16 @@
 import java.util.Locale;
 import java.util.Set;
 
+import org.eclipse.smarthome.core.library.types.OnOffType;
+import org.eclipse.smarthome.core.library.types.PercentType;
 import org.eclipse.smarthome.core.types.Command;
 import org.eclipse.smarthome.core.types.State;
 import org.eclipse.smarthome.core.types.StateDescription;
 import org.eclipse.smarthome.core.types.UnDefType;
 
 /**
  * <p>
- * This interface defines the core features of an openHAB item.
+ * This interface defines the core features of an Eclipse SmartHome item.
  * </p>
  * <p>
  * Item instances are used for all stateful services and are especially important for the {@link ItemRegistry}.
@@ -31,29 +33,29 @@ public interface Item {
 
     /**
      * returns the current state of the item
-     * 
+     *
      * @return the current state
      */
     public State getState();
 
     /**
      * returns the current state of the item as a specific type
-     * 
+     *
      * @return the current state in the requested type or
      *         null, if state cannot be provided as the requested type
      */
     public State getStateAs(Class<? extends State> typeClass);
 
     /**
      * returns the name of the item
-     * 
+     *
      * @return the name of the item
      */
     public String getName();
 
     /**
      * returns the item type as defined by {@link ItemFactory}s
-     * 
+     *
      * @return the item type
      */
     public String getType();
@@ -66,13 +68,14 @@ public interface Item {
      * Imagine e.g. a dimmer device: It's status could be 0%, 10%, 50%, 100%, but also OFF or ON and maybe UNDEFINED. So
      * the accepted data types would be in this case {@link PercentType}, {@link OnOffType} and {@link UnDefType}
      * </p>
-     * 
+     *
      * <p>
      * The order of data types denotes the order of preference. So in case a state needs to be converted
      * in order to be accepted, it will be attempted to convert it to a type from top to bottom. Therefore
      * the type with the least information loss should be on top of the list - in the example above the
      * {@link PercentType} carries more information than the {@link OnOffType}, hence it is listed first.
      * </p>
+     * 
      * @return a list of data types that can be used to update the item state
      */
     public List<Class<? extends State>> getAcceptedDataTypes();
@@ -85,21 +88,21 @@ public interface Item {
      * Imagine e.g. a dimmer device: You could ask it to dim to 0%, 10%, 50%, 100%, but also to turn OFF or ON. So the
      * accepted command types would be in this case {@link PercentType}, {@link OnOffType}
      * </p>
-     * 
+     *
      * @return a list of all command types that can be used for this item
      */
     public List<Class<? extends Command>> getAcceptedCommandTypes();
 
     /**
      * Returns a list of the names of the groups this item belongs to.
-     * 
+     *
      * @return list of item group names
      */
     public List<String> getGroupNames();
 
     /**
      * Returns a set of tags. If the item is not tagged, an empty set is returned.
-     * 
+     *
      * @return set of tags.
      */
     public Set<String> getTags();
@@ -113,7 +116,7 @@ public interface Item {
 
     /**
      * Returns true if the item's tags contains the specific tag, otherwise false.
-     * 
+     *
      * @param tag - a tag whose presence in the item's tags is to be tested.
      * @return true if the item's tags contains the specific tag, otherwise false.
      */

bundles/core/org.eclipse.smarthome.core/src/main/java/org/eclipse/smarthome/core/types/TypeParser.java

@@ -12,7 +12,7 @@
 import java.util.List;
 
 /**
- * This is a helper class that helps parsing a string into an openHAB type (state or command).
+ * This is a helper class that helps parsing a string into an Eclipse SmartHome type (state or command).
  *
  * @author Kai Kreuzer - Initial contribution and API
  *
@@ -22,7 +22,8 @@ public final class TypeParser {
     /**
      * No instances allowed.
      */
-    private TypeParser() {}
+    private TypeParser() {
+    }
 
     private static final String CORE_LIBRARY_PACKAGE = "org.eclipse.smarthome.core.library.types.";
 
@@ -55,7 +56,7 @@ public static Type parseType(String typeName, String input) {
      * Example: The type list is OnOffType.class,StringType.class. The string "ON" is now accepted by the OnOffType and
      * thus OnOffType.ON will be returned (and not a StringType with value "ON").
      * </p>
-     * 
+     *
      * @param types possible types of the state to consider
      * @param s the string to parse
      * @return the corresponding State instance or <code>null</code>
@@ -65,8 +66,9 @@ public static State parseState(List<Class<? extends State>> types, String s) {
             try {
                 Method valueOf = type.getMethod("valueOf", String.class);
                 State state = (State) valueOf.invoke(type, s);
-                if (state != null)
+                if (state != null) {
                     return state;
+                }
             } catch (NoSuchMethodException e) {
             } catch (IllegalArgumentException e) {
             } catch (IllegalAccessException e) {
@@ -85,7 +87,7 @@ public static State parseState(List<Class<? extends State>> types, String s) {
      * Example: The type list is OnOffType.class,StringType.class. The string "ON" is now accepted by the OnOffType and
      * thus OnOffType.ON will be returned (and not a StringType with value "ON").
      * </p>
-     * 
+     *
      * @param types possible types of the command to consider
      * @param s the string to parse
      * @return the corresponding Command instance or <code>null</code>
@@ -95,8 +97,9 @@ public static Command parseCommand(List<Class<? extends Command>> types, String
             try {
                 Method valueOf = type.getMethod("valueOf", String.class);
                 Command value = (Command) valueOf.invoke(type, s);
-                if (value != null)
+                if (value != null) {
                     return value;
+                }
             } catch (NoSuchMethodException e) {
             } catch (IllegalArgumentException e) {
             } catch (IllegalAccessException e) {

bundles/io/org.eclipse.smarthome.io.console.eclipse/src/main/java/org/eclipse/smarthome/io/console/eclipse/internal/ConsoleSupportEclipse.java

@@ -24,7 +24,7 @@
 import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
 
 /**
- * This class provides access to openHAB functionality through the OSGi console
+ * This class provides access to Eclipse SmartHome functionality through the OSGi console
  * of Equinox. Unfortunately, there these command providers are not standardized
  * for OSGi, so we need different implementations for different OSGi containers.
  *

bundles/io/org.eclipse.smarthome.io.console/.project

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>org.eclipse.smarthome.io.console</name>
-	<comment>This is the runtime component of the open Home Automation Bus (openHAB)</comment>
+	<comment>This is the console core of Eclipse SmartHome</comment>
 	<projects>
 	</projects>
 	<buildSpec>

bundles/io/org.eclipse.smarthome.io.monitor/.project

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>org.eclipse.smarthome.io.monitor</name>
-	<comment>This is the runtime component of the open Home Automation Bus (openHAB)</comment>
+	<comment>This is the I/O monitor of Eclipse SmartHome</comment>
 	<projects>
 	</projects>
 	<buildSpec>

bundles/io/org.eclipse.smarthome.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/persistence/PersistenceResource.java

@@ -5,14 +5,6 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-/**
-* Copyright (c) 2010-2013, openHAB.org and others.
-*
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
-*/
 package org.eclipse.smarthome.io.rest.core.persistence;
 
 import java.util.ArrayList;

bundles/io/org.eclipse.smarthome.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttConnectionObserver.java

@@ -5,13 +5,6 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-/**
-w * Copyright (c) 2014-2015 openHAB UG (haftungsbeschraenkt) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- */
 package org.eclipse.smarthome.io.transport.mqtt;
 
 /**

bundles/model/org.eclipse.smarthome.model.item/META-INF/MANIFEST.MF

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse SmartHome Item Model
-Bundle-Vendor: openHABorg
+Bundle-Vendor: Eclipse.org/SmartHome
 Bundle-Version: 0.9.0.qualifier
 Bundle-SymbolicName: org.eclipse.smarthome.model.item;singleton:=true
 Require-Bundle: org.eclipse.xtext,

bundles/model/org.eclipse.smarthome.model.rule.runtime/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleEngineImpl.java

@@ -53,7 +53,7 @@
 import com.google.inject.Injector;
 
 /**
- * This class is the core of the openHAB rule engine.
+ * This class is the core of the Eclipse SmartHome rule engine.
  * It listens to changes to the rules folder, evaluates the trigger conditions of the rules and
  * schedules them for execution dependent on their triggering conditions.
  *
@@ -342,8 +342,8 @@ protected synchronized void executeRules(Iterable<Rule> rules, State oldState) {
     }
 
     /**
-     * we need to be able to deactivate the rule execution, otherwise the openHAB designer
-     * would also execute the rules.
+     * we need to be able to deactivate the rule execution, otherwise the Eclipse SmartHome designer would also execute
+     * the rules.
      *
      * @return true, if rules should be executed, false otherwise
      */

bundles/model/org.eclipse.smarthome.model.script/src/org/eclipse/smarthome/model/script/actions/BusEvent.java

@@ -26,7 +26,7 @@
 
 /**
  * The static methods of this class are made available as functions in the scripts.
- * This gives direct write access to the openHAB event bus from within scripts.
+ * This gives direct write access to the Eclipse SmartHome event bus from within scripts.
  * Items should not be updated directly (setting the state property), but updates should
  * be sent to the bus, so that all interested bundles are notified.
  *

bundles/model/org.eclipse.smarthome.model.script/src/org/eclipse/smarthome/model/script/engine/Script.java

@@ -10,7 +10,7 @@
 import org.eclipse.xtext.xbase.interpreter.IEvaluationContext;
 
 /**
- * This interface is implemented by openHAB scripts.
+ * This interface is implemented by Eclipse SmartHome scripts.
  *
  * @author Kai Kreuzer - Initial contribution and API
  *
@@ -22,15 +22,15 @@ public interface Script {
 
     /**
      * Executes the script instance and returns the execution result
-     * 
+     *
      * @return the execution result or <code>null</code>, if the script does not have a return value
      * @throws ScriptExecutionException if an error occurs during the execution
      */
     public Object execute() throws ScriptExecutionException;
 
     /**
      * Executes the script instance with a given evaluation context and returns the execution result
-     * 
+     *
      * @param evaluationContext the evaluation context is a map of variables (name, object)
      *            that should be available during the script execution
      * @return the execution result or <code>null</code>, if the script does not have a return value

bundles/model/org.eclipse.smarthome.model.script/src/org/eclipse/smarthome/model/script/engine/ScriptEngine.java

@@ -10,8 +10,8 @@
 import org.eclipse.xtext.xbase.XExpression;
 
 /**
- * The script engine is the main entrypoint for openHAB script use. It can build {@link Script} instances
- * from simple strings. These scripts can then be executed by the caller.
+ * The script engine is the main entrypoint for Eclipse SmartHome script use. It can build {@link Script} instances from
+ * simple strings. These scripts can then be executed by the caller.
  *
  * @author Kai Kreuzer - Initial contribution and API
  *