Formatting improvements

Signed-off-by: Mark Herwege <mark.herwege@telenet.be>

Author: mherwege

bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.xtext

@@ -58,7 +58,7 @@ Image:
 Video:
     'Video' (('item=' item=ItemRef) | ('label=' label=(ID | STRING)) |
     ('icon=' icon=Icon) | ('icon=' IconRules=IconRuleList) | ('staticIcon=' staticIcon=Icon) |
-    ('url=' url=STRING) & ('encoding=' encoding=STRING) |
+    ('url=' url=STRING) | ('encoding=' encoding=STRING) |
     ('labelcolor=' labelColor=ColorArrayList) |
     ('valuecolor=' valueColor=ColorArrayList) |
     ('iconcolor=' iconColor=ColorArrayList) |
@@ -169,8 +169,8 @@ Buttongrid:
 Button:
     'Button' (('item=' item=ItemRef) | ('label=' label=(ID | STRING)) |
     ('icon=' icon=Icon) | ('icon=' IconRules=IconRuleList) | ('staticIcon=' staticIcon=Icon) |
-    ('row=' row=INT) & ('column=' column=INT) & (stateless?='stateless') |
-    ('click=' cmd=Command) & ('release=' releaseCmd=Command) |
+    ('row=' row=INT) | ('column=' column=INT) | (stateless?='stateless') |
+    ('click=' cmd=Command) | ('release=' releaseCmd=Command) |
     ('labelcolor=' labelColor=ColorArrayList) |
     ('valuecolor=' valueColor=ColorArrayList) |
     ('iconcolor=' iconColor=ColorArrayList) |

bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapRuntimeModule.xtend

@@ -23,6 +23,8 @@ import com.google.inject.Binder
 import com.google.inject.name.Names
 import org.openhab.core.model.sitemap.formatting.SitemapFormatter
 import org.eclipse.xtext.formatting.IFormatter
+import org.openhab.core.model.sitemap.formatting.SitemapIndentationInformation
+import org.eclipse.xtext.formatting.IIndentationInformation
 
 /** 
  * Use this class to register components to be used at runtime / without the Equinox extension registry.
@@ -36,6 +38,11 @@ class SitemapRuntimeModule extends org.openhab.core.model.sitemap.AbstractSitema
         return SitemapFormatter
     }
 
+    override void configure(Binder binder) {
+        super.configure(binder)
+        binder.bind(IIndentationInformation).to(SitemapIndentationInformation)
+    }
+
     override void configureUseIndexFragmentsForLazyLinking(Binder binder) {
         binder.bind(Boolean.TYPE).annotatedWith(Names.named(LazyURIEncoder.USE_INDEXED_FRAGMENTS_BINDING)).toInstance(
             Boolean.FALSE)

bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/formatting/SitemapFormatter.xtend

@@ -28,9 +28,9 @@ class SitemapFormatter extends AbstractDeclarativeFormatter {
     @Inject extension SitemapGrammarAccess
 
     override protected void configureFormatting(FormattingConfig c) {
-        c.wrappedLineIndentation = 1
-        c.autoLinewrap = 120
-        
+        c.wrappedLineIndentation = 4
+        c.autoLinewrap = 200
+
         c.setLinewrap(1, 1, 2).before(widgetRule)
 
         c.setIndentationIncrement.after("{")

bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/formatting/SitemapIndentationInformation.java

@@ -0,0 +1,10 @@
+package org.openhab.core.model.sitemap.formatting;
+
+import org.eclipse.xtext.formatting.IIndentationInformation;
+
+public class SitemapIndentationInformation implements IIndentationInformation {
+    @Override
+    public String getIndentString() {
+        return "  "; // 2 spaces
+    }
+}