Infra improvements

bom/openhab-ui/pom.xml

@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
  <modelVersion>4.0.0</modelVersion>
 

bom/pom.xml

@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
  <modelVersion>4.0.0</modelVersion>
 

bundles/org.openhab.ui.basic/pom.xml

@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
  <modelVersion>4.0.0</modelVersion>
 

bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/WebAppActivator.java

@@ -43,5 +43,4 @@ public void stop(BundleContext bc) throws Exception {
  public static BundleContext getContext() {
  return context;
  }
-
 }

bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/AbstractWidgetRenderer.java

@@ -28,8 +28,8 @@
 import org.openhab.core.i18n.LocaleProvider;
 import org.openhab.core.i18n.TranslationProvider;
 import org.openhab.core.library.types.QuantityType;
-import org.openhab.core.types.State;
 import org.openhab.core.model.sitemap.sitemap.Widget;
+import org.openhab.core.types.State;
 import org.openhab.core.ui.items.ItemUIRegistry;
 import org.openhab.ui.basic.internal.WebAppActivator;
 import org.openhab.ui.basic.internal.WebAppConfig;

bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/ChartRenderer.java

@@ -146,5 +146,4 @@ protected void setItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  protected void unsetItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  super.unsetItemUIRegistry(ItemUIRegistry);
  }
-
 }

bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/ColorpickerRenderer.java

@@ -15,9 +15,9 @@
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.emf.common.util.EList;
 import org.openhab.core.library.types.HSBType;
-import org.openhab.core.types.State;
 import org.openhab.core.model.sitemap.sitemap.Colorpicker;
 import org.openhab.core.model.sitemap.sitemap.Widget;
+import org.openhab.core.types.State;
 import org.openhab.core.ui.items.ItemUIRegistry;
 import org.openhab.ui.basic.internal.servlet.WebAppServlet;
 import org.openhab.ui.basic.render.RenderException;
@@ -119,5 +119,4 @@ protected void setItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  protected void unsetItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  super.unsetItemUIRegistry(ItemUIRegistry);
  }
-
 }

bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/FrameRenderer.java

@@ -94,5 +94,4 @@ protected void setItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  protected void unsetItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  super.unsetItemUIRegistry(ItemUIRegistry);
  }
-
 }

bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/ImageRenderer.java

@@ -18,9 +18,9 @@
 import org.eclipse.emf.common.util.EList;
 import org.openhab.core.library.types.RawType;
 import org.openhab.core.library.types.StringType;
-import org.openhab.core.types.State;
 import org.openhab.core.model.sitemap.sitemap.Image;
 import org.openhab.core.model.sitemap.sitemap.Widget;
+import org.openhab.core.types.State;
 import org.openhab.core.ui.items.ItemUIRegistry;
 import org.openhab.ui.basic.render.RenderException;
 import org.openhab.ui.basic.render.WidgetRenderer;
@@ -116,5 +116,4 @@ protected void setItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  protected void unsetItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  super.unsetItemUIRegistry(ItemUIRegistry);
  }
-
 }

bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/MapviewRenderer.java

@@ -15,9 +15,9 @@
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.emf.common.util.EList;
 import org.openhab.core.library.types.PointType;
-import org.openhab.core.types.State;
 import org.openhab.core.model.sitemap.sitemap.Mapview;
 import org.openhab.core.model.sitemap.sitemap.Widget;
+import org.openhab.core.types.State;
 import org.openhab.core.ui.items.ItemUIRegistry;
 import org.openhab.ui.basic.render.RenderException;
 import org.openhab.ui.basic.render.WidgetRenderer;
@@ -105,5 +105,4 @@ protected void setItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  protected void unsetItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  super.unsetItemUIRegistry(ItemUIRegistry);
  }
-
 }

bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/SelectionRenderer.java

@@ -18,13 +18,13 @@
 import org.openhab.core.items.ItemNotFoundException;
 import org.openhab.core.library.items.NumberItem;
 import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.model.sitemap.sitemap.Mapping;
+import org.openhab.core.model.sitemap.sitemap.Selection;
+import org.openhab.core.model.sitemap.sitemap.Widget;
 import org.openhab.core.types.CommandDescription;
 import org.openhab.core.types.CommandOption;
 import org.openhab.core.types.State;
 import org.openhab.core.types.util.UnitUtils;
-import org.openhab.core.model.sitemap.sitemap.Mapping;
-import org.openhab.core.model.sitemap.sitemap.Selection;
-import org.openhab.core.model.sitemap.sitemap.Widget;
 import org.openhab.core.ui.items.ItemUIRegistry;
 import org.openhab.ui.basic.render.RenderException;
 import org.openhab.ui.basic.render.WidgetRenderer;
@@ -165,5 +165,4 @@ protected void setItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  protected void unsetItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  super.unsetItemUIRegistry(ItemUIRegistry);
  }
-
 }

bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/SetpointRenderer.java

@@ -17,9 +17,9 @@
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.emf.common.util.EList;
 import org.openhab.core.library.types.DecimalType;
-import org.openhab.core.types.State;
 import org.openhab.core.model.sitemap.sitemap.Setpoint;
 import org.openhab.core.model.sitemap.sitemap.Widget;
+import org.openhab.core.types.State;
 import org.openhab.core.ui.items.ItemUIRegistry;
 import org.openhab.ui.basic.render.RenderException;
 import org.openhab.ui.basic.render.WidgetRenderer;
@@ -125,5 +125,4 @@ protected void setItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  protected void unsetItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  super.unsetItemUIRegistry(ItemUIRegistry);
  }
-
 }

bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/SliderRenderer.java

@@ -116,5 +116,4 @@ protected void setItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  protected void unsetItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  super.unsetItemUIRegistry(ItemUIRegistry);
  }
-
 }

bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/SwitchRenderer.java

@@ -22,13 +22,13 @@
 import org.openhab.core.library.items.SwitchItem;
 import org.openhab.core.library.types.OnOffType;
 import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.model.sitemap.sitemap.Mapping;
+import org.openhab.core.model.sitemap.sitemap.Switch;
+import org.openhab.core.model.sitemap.sitemap.Widget;
 import org.openhab.core.types.CommandDescription;
 import org.openhab.core.types.CommandOption;
 import org.openhab.core.types.State;
 import org.openhab.core.types.util.UnitUtils;
-import org.openhab.core.model.sitemap.sitemap.Mapping;
-import org.openhab.core.model.sitemap.sitemap.Switch;
-import org.openhab.core.model.sitemap.sitemap.Widget;
 import org.openhab.core.ui.items.ItemUIRegistry;
 import org.openhab.ui.basic.render.RenderException;
 import org.openhab.ui.basic.render.WidgetRenderer;
@@ -196,5 +196,4 @@ protected void setItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  protected void unsetItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  super.unsetItemUIRegistry(ItemUIRegistry);
  }
-
 }

bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/TextRenderer.java

@@ -78,5 +78,4 @@ protected void setItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  protected void unsetItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  super.unsetItemUIRegistry(ItemUIRegistry);
  }
-
 }

bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/VideoRenderer.java

@@ -17,9 +17,9 @@
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.emf.common.util.EList;
 import org.openhab.core.library.types.StringType;
-import org.openhab.core.types.State;
 import org.openhab.core.model.sitemap.sitemap.Video;
 import org.openhab.core.model.sitemap.sitemap.Widget;
+import org.openhab.core.types.State;
 import org.openhab.core.ui.items.ItemUIRegistry;
 import org.openhab.ui.basic.render.RenderException;
 import org.openhab.ui.basic.render.WidgetRenderer;
@@ -118,5 +118,4 @@ protected void setItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  protected void unsetItemUIRegistry(ItemUIRegistry ItemUIRegistry) {
  super.unsetItemUIRegistry(ItemUIRegistry);
  }
-
 }

bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/servlet/BaseServlet.java

@@ -1,40 +1,39 @@
-/**
- * Copyright (c) 2010-2020 Contributors to the openHAB project
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package org.openhab.ui.basic.internal.servlet;
-
-import org.openhab.core.items.ItemRegistry;
-import org.openhab.core.io.http.servlet.SmartHomeBundleServlet;
-
-/**
- * This is the base servlet class for other servlet in the Basic UI.
- *
- * @author Thomas.Eichstaedt-Engelen
- */
-public abstract class BaseServlet extends SmartHomeBundleServlet {
-
- private static final long serialVersionUID = -4012800772403491132L;
-
- /** the root path of this web application */
- public static final String WEBAPP_ALIAS = "/basicui";
-
- protected ItemRegistry itemRegistry;
-
- public void setItemRegistry(ItemRegistry itemRegistry) {
- this.itemRegistry = itemRegistry;
- }
-
- public void unsetItemRegistry(ItemRegistry itemRegistry) {
- this.itemRegistry = null;
- }
-
-}
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.ui.basic.internal.servlet;
+
+import org.openhab.core.io.http.servlet.SmartHomeBundleServlet;
+import org.openhab.core.items.ItemRegistry;
+
+/**
+ * This is the base servlet class for other servlet in the Basic UI.
+ *
+ * @author Thomas.Eichstaedt-Engelen
+ */
+public abstract class BaseServlet extends SmartHomeBundleServlet {
+
+ private static final long serialVersionUID = -4012800772403491132L;
+
+ /** the root path of this web application */
+ public static final String WEBAPP_ALIAS = "/basicui";
+
+ protected ItemRegistry itemRegistry;
+
+ public void setItemRegistry(ItemRegistry itemRegistry) {
+ this.itemRegistry = itemRegistry;
+ }
+
+ public void unsetItemRegistry(ItemRegistry itemRegistry) {
+ this.itemRegistry = null;
+ }
+}