Renamed a few packages to internal in the sample bundles. (eclipse-ar…

…chived#4304) See openhab/static-code-analysis#100 Signed-off-by: VelinYordanov <velin.iordanov@gmail.com>
sjsf · Sep 22, 2017 · 8da1e67 · 8da1e67
1 parent 1f84857
commit 8da1e67
Show file tree

Hide file tree

Showing 24 changed files with 52 additions and 57 deletions.
diff --git a/...es/automation/org.eclipse.smarthome.automation.sample.extension.java/META-INF/MANIFEST.MF b/...es/automation/org.eclipse.smarthome.automation.sample.extension.java/META-INF/MANIFEST.MF
@@ -1,13 +1,8 @@
 Manifest-Version: 1.0
-Bundle-Activator: org.eclipse.smarthome.automation.sample.extension.java
- .Activator
 Bundle-ManifestVersion: 2
-Bundle-Name: Eclipse SmartHome Automation Sample Extension Java - Welcom
- e Home Application
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-SymbolicName: org.eclipse.smarthome.automation.sample.extension.j
- ava
-Bundle-Vendor: Eclipse.org/SmartHome
+Bundle-Name: Eclipse SmartHome Automation Sample Extension Java - Welcome Home Application
+Bundle-SymbolicName: org.eclipse.smarthome.automation.sample.extension.java
+Bundle-Activator: org.eclipse.smarthome.automation.sample.extension.java.internal.Activator
 Bundle-Version: 0.9.0.qualifier
 Import-Package: 
  org.apache.commons.lang,

diff --git a/...tion/sample/extension/java/Activator.java → ...le/extension/java/internal/Activator.java b/...tion/sample/extension/java/Activator.java → ...le/extension/java/internal/Activator.java
@@ -5,11 +5,11 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.sample.extension.java;
+package org.eclipse.smarthome.automation.sample.extension.java.internal;
 
-import org.eclipse.smarthome.automation.sample.extension.java.handler.WelcomeHomeHandlerFactory;
-import org.eclipse.smarthome.automation.sample.extension.java.template.WelcomeHomeTemplateProvider;
-import org.eclipse.smarthome.automation.sample.extension.java.type.WelcomeHomeModuleTypeProvider;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.handler.WelcomeHomeHandlerFactory;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.template.WelcomeHomeTemplateProvider;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.type.WelcomeHomeModuleTypeProvider;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 

diff --git a/...e/extension/java/WelcomeHomeCommands.java → ...on/java/internal/WelcomeHomeCommands.java b/...e/extension/java/WelcomeHomeCommands.java → ...on/java/internal/WelcomeHomeCommands.java
@@ -5,19 +5,19 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.sample.extension.java;
+package org.eclipse.smarthome.automation.sample.extension.java.internal;
 
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.smarthome.automation.sample.extension.java.handler.WelcomeHomeHandlerFactory;
-import org.eclipse.smarthome.automation.sample.extension.java.handler.WelcomeHomeTriggerHandler;
-import org.eclipse.smarthome.automation.sample.extension.java.template.AirConditionerRuleTemplate;
-import org.eclipse.smarthome.automation.sample.extension.java.type.StateConditionType;
-import org.eclipse.smarthome.automation.sample.extension.java.type.TemperatureConditionType;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.handler.WelcomeHomeHandlerFactory;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.handler.WelcomeHomeTriggerHandler;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.template.AirConditionerRuleTemplate;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.type.StateConditionType;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.type.TemperatureConditionType;
 import org.eclipse.smarthome.config.core.Configuration;
 import org.eclipse.smarthome.io.console.Console;
 import org.eclipse.smarthome.io.console.extensions.AbstractConsoleCommandExtension;

diff --git a/...ension/java/WelcomeHomeRulesProvider.java → ...va/internal/WelcomeHomeRulesProvider.java b/...ension/java/WelcomeHomeRulesProvider.java → ...va/internal/WelcomeHomeRulesProvider.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.sample.extension.java;
+package org.eclipse.smarthome.automation.sample.extension.java.internal;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -20,11 +20,11 @@
 import org.eclipse.smarthome.automation.Rule;
 import org.eclipse.smarthome.automation.RuleProvider;
 import org.eclipse.smarthome.automation.Trigger;
-import org.eclipse.smarthome.automation.sample.extension.java.template.AirConditionerRuleTemplate;
-import org.eclipse.smarthome.automation.sample.extension.java.type.LightsTriggerType;
-import org.eclipse.smarthome.automation.sample.extension.java.type.StateConditionType;
-import org.eclipse.smarthome.automation.sample.extension.java.type.TemperatureConditionType;
-import org.eclipse.smarthome.automation.sample.extension.java.type.WelcomeHomeActionType;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.template.AirConditionerRuleTemplate;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.type.LightsTriggerType;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.type.StateConditionType;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.type.TemperatureConditionType;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.type.WelcomeHomeActionType;
 import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
 import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
 import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;

diff --git a/...n/java/handler/StateConditionHandler.java → ...ternal/handler/StateConditionHandler.java b/...n/java/handler/StateConditionHandler.java → ...ternal/handler/StateConditionHandler.java
@@ -5,14 +5,14 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.sample.extension.java.handler;
+package org.eclipse.smarthome.automation.sample.extension.java.internal.handler;
 
 import java.util.Map;
 
 import org.eclipse.smarthome.automation.Condition;
 import org.eclipse.smarthome.automation.handler.BaseModuleHandler;
 import org.eclipse.smarthome.automation.handler.ConditionHandler;
-import org.eclipse.smarthome.automation.sample.extension.java.type.StateConditionType;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.type.StateConditionType;
 
 /**
  * This class serves to handle the Condition types provided by this application. It is used to help the RuleEngine

diff --git a/.../handler/TemperatureConditionHandler.java → .../handler/TemperatureConditionHandler.java b/.../handler/TemperatureConditionHandler.java → .../handler/TemperatureConditionHandler.java
@@ -5,14 +5,14 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.sample.extension.java.handler;
+package org.eclipse.smarthome.automation.sample.extension.java.internal.handler;
 
 import java.util.Map;
 
 import org.eclipse.smarthome.automation.Condition;
 import org.eclipse.smarthome.automation.handler.BaseModuleHandler;
 import org.eclipse.smarthome.automation.handler.ConditionHandler;
-import org.eclipse.smarthome.automation.sample.extension.java.type.TemperatureConditionType;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.type.TemperatureConditionType;
 
 /**
  * This class serves to handle the Condition types provided by this application. It is used to help the RuleEngine

diff --git a/...ava/handler/WelcomeHomeActionHandler.java → ...nal/handler/WelcomeHomeActionHandler.java b/...ava/handler/WelcomeHomeActionHandler.java → ...nal/handler/WelcomeHomeActionHandler.java
@@ -5,14 +5,14 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.sample.extension.java.handler;
+package org.eclipse.smarthome.automation.sample.extension.java.internal.handler;
 
 import java.util.Map;
 
 import org.eclipse.smarthome.automation.Action;
 import org.eclipse.smarthome.automation.handler.ActionHandler;
 import org.eclipse.smarthome.automation.handler.BaseModuleHandler;
-import org.eclipse.smarthome.automation.sample.extension.java.type.WelcomeHomeActionType;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.type.WelcomeHomeActionType;
 import org.eclipse.smarthome.config.core.Configuration;
 
 /**

diff --git a/...va/handler/WelcomeHomeHandlerFactory.java → ...al/handler/WelcomeHomeHandlerFactory.java b/...va/handler/WelcomeHomeHandlerFactory.java → ...al/handler/WelcomeHomeHandlerFactory.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.sample.extension.java.handler;
+package org.eclipse.smarthome.automation.sample.extension.java.internal.handler;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -21,11 +21,11 @@
 import org.eclipse.smarthome.automation.handler.BaseModuleHandlerFactory;
 import org.eclipse.smarthome.automation.handler.ModuleHandler;
 import org.eclipse.smarthome.automation.handler.ModuleHandlerFactory;
-import org.eclipse.smarthome.automation.sample.extension.java.type.AirConditionerTriggerType;
-import org.eclipse.smarthome.automation.sample.extension.java.type.LightsTriggerType;
-import org.eclipse.smarthome.automation.sample.extension.java.type.StateConditionType;
-import org.eclipse.smarthome.automation.sample.extension.java.type.TemperatureConditionType;
-import org.eclipse.smarthome.automation.sample.extension.java.type.WelcomeHomeActionType;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.type.AirConditionerTriggerType;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.type.LightsTriggerType;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.type.StateConditionType;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.type.TemperatureConditionType;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.type.WelcomeHomeActionType;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 import org.slf4j.Logger;

diff --git a/...va/handler/WelcomeHomeTriggerHandler.java → ...al/handler/WelcomeHomeTriggerHandler.java b/...va/handler/WelcomeHomeTriggerHandler.java → ...al/handler/WelcomeHomeTriggerHandler.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.sample.extension.java.handler;
+package org.eclipse.smarthome.automation.sample.extension.java.internal.handler;
 
 import java.util.Map;
 

diff --git a/.../template/AirConditionerRuleTemplate.java → .../template/AirConditionerRuleTemplate.java b/.../template/AirConditionerRuleTemplate.java → .../template/AirConditionerRuleTemplate.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.sample.extension.java.template;
+package org.eclipse.smarthome.automation.sample.extension.java.internal.template;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -18,11 +18,11 @@
 import org.eclipse.smarthome.automation.Condition;
 import org.eclipse.smarthome.automation.Trigger;
 import org.eclipse.smarthome.automation.Visibility;
-import org.eclipse.smarthome.automation.sample.extension.java.WelcomeHomeRulesProvider;
-import org.eclipse.smarthome.automation.sample.extension.java.type.AirConditionerTriggerType;
-import org.eclipse.smarthome.automation.sample.extension.java.type.StateConditionType;
-import org.eclipse.smarthome.automation.sample.extension.java.type.TemperatureConditionType;
-import org.eclipse.smarthome.automation.sample.extension.java.type.WelcomeHomeActionType;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.WelcomeHomeRulesProvider;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.type.AirConditionerTriggerType;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.type.StateConditionType;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.type.TemperatureConditionType;
+import org.eclipse.smarthome.automation.sample.extension.java.internal.type.WelcomeHomeActionType;
 import org.eclipse.smarthome.automation.template.RuleTemplate;
 import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
 import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;

diff --git a/...template/WelcomeHomeTemplateProvider.java → ...template/WelcomeHomeTemplateProvider.java b/...template/WelcomeHomeTemplateProvider.java → ...template/WelcomeHomeTemplateProvider.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.sample.extension.java.template;
+package org.eclipse.smarthome.automation.sample.extension.java.internal.template;
 
 import java.util.Collection;
 import java.util.Collections;

diff --git a/.../java/type/AirConditionerTriggerType.java → ...ernal/type/AirConditionerTriggerType.java b/.../java/type/AirConditionerTriggerType.java → ...ernal/type/AirConditionerTriggerType.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.sample.extension.java.type;
+package org.eclipse.smarthome.automation.sample.extension.java.internal.type;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...xtension/java/type/LightsTriggerType.java → ...java/internal/type/LightsTriggerType.java b/...xtension/java/type/LightsTriggerType.java → ...java/internal/type/LightsTriggerType.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.sample.extension.java.type;
+package org.eclipse.smarthome.automation.sample.extension.java.internal.type;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...tension/java/type/StateConditionType.java → ...ava/internal/type/StateConditionType.java b/...tension/java/type/StateConditionType.java → ...ava/internal/type/StateConditionType.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.sample.extension.java.type;
+package org.eclipse.smarthome.automation.sample.extension.java.internal.type;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...n/java/type/TemperatureConditionType.java → ...ternal/type/TemperatureConditionType.java b/...n/java/type/TemperatureConditionType.java → ...ternal/type/TemperatureConditionType.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.sample.extension.java.type;
+package org.eclipse.smarthome.automation.sample.extension.java.internal.type;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...sion/java/type/WelcomeHomeActionType.java → .../internal/type/WelcomeHomeActionType.java b/...sion/java/type/WelcomeHomeActionType.java → .../internal/type/WelcomeHomeActionType.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.sample.extension.java.type;
+package org.eclipse.smarthome.automation.sample.extension.java.internal.type;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...a/type/WelcomeHomeModuleTypeProvider.java → ...l/type/WelcomeHomeModuleTypeProvider.java b/...a/type/WelcomeHomeModuleTypeProvider.java → ...l/type/WelcomeHomeModuleTypeProvider.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.sample.extension.java.type;
+package org.eclipse.smarthome.automation.sample.extension.java.internal.type;
 
 import java.util.Collection;
 import java.util.Collections;

diff --git a/...ternal/sample/json/handler/Activator.java → ...mple/json/internal/handler/Activator.java b/...ternal/sample/json/handler/Activator.java → ...mple/json/internal/handler/Activator.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.internal.sample.json.handler;
+package org.eclipse.smarthome.automation.internal.sample.json.internal.handler;
 
 import org.eclipse.smarthome.automation.handler.ModuleHandlerFactory;
 import org.osgi.framework.BundleActivator;

diff --git a/...ple/json/handler/SampleActionHandler.java → ...internal/handler/SampleActionHandler.java b/...ple/json/handler/SampleActionHandler.java → ...internal/handler/SampleActionHandler.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.internal.sample.json.handler;
+package org.eclipse.smarthome.automation.internal.sample.json.internal.handler;
 
 import java.util.Map;
 

diff --git a/.../json/handler/SampleConditionHandler.java → ...ernal/handler/SampleConditionHandler.java b/.../json/handler/SampleConditionHandler.java → ...ernal/handler/SampleConditionHandler.java
@@ -17,7 +17,7 @@
  *    ProSyst Software GmbH - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.smarthome.automation.internal.sample.json.handler;
+package org.eclipse.smarthome.automation.internal.sample.json.internal.handler;
 
 import java.util.Map;
 

diff --git a/...le/json/handler/SampleHandlerFactory.java → ...nternal/handler/SampleHandlerFactory.java b/...le/json/handler/SampleHandlerFactory.java → ...nternal/handler/SampleHandlerFactory.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.internal.sample.json.handler;
+package org.eclipse.smarthome.automation.internal.sample.json.internal.handler;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/...handler/SampleHandlerFactoryCommands.java → ...handler/SampleHandlerFactoryCommands.java b/...handler/SampleHandlerFactoryCommands.java → ...handler/SampleHandlerFactoryCommands.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.internal.sample.json.handler;
+package org.eclipse.smarthome.automation.internal.sample.json.internal.handler;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/...le/json/handler/SampleTriggerHandler.java → ...nternal/handler/SampleTriggerHandler.java b/...le/json/handler/SampleTriggerHandler.java → ...nternal/handler/SampleTriggerHandler.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.internal.sample.json.handler;
+package org.eclipse.smarthome.automation.internal.sample.json.internal.handler;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...automation/sample/rest/api/Activator.java → ...n/sample/rest/api/internal/Activator.java b/...automation/sample/rest/api/Activator.java → ...n/sample/rest/api/internal/Activator.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.automation.sample.rest.api;
+package org.eclipse.smarthome.automation.sample.rest.api.internal;
 
 import java.io.IOException;
 import java.net.URL;