Skip to content

Commit 7d6271b

Browse files
committed
SitemapValidator: change all error() to warning() to maintain current loading behavior
Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
1 parent 6c35d27 commit 7d6271b

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/validation/SitemapValidator.xtend

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class SitemapValidator extends AbstractSitemapValidator {
5050
return;
5151
}
5252
if (w instanceof Button) {
53-
error("Frames should not contain Button, Button is allowed only in Buttongrid",
53+
warning("Frames should not contain Button, Button is allowed only in Buttongrid",
5454
SitemapPackage.Literals.FRAME.getEStructuralFeature(SitemapPackage.FRAME__CHILDREN));
5555
return;
5656
}
@@ -64,7 +64,7 @@ class SitemapValidator extends AbstractSitemapValidator {
6464

6565
for (Widget w : sitemap.children) {
6666
if (w instanceof Button) {
67-
error("Sitemap should not contain Button, Button is allowed only in Buttongrid",
67+
warning("Sitemap should not contain Button, Button is allowed only in Buttongrid",
6868
SitemapPackage.Literals.SITEMAP.getEStructuralFeature(SitemapPackage.SITEMAP__NAME));
6969
return;
7070
}
@@ -74,7 +74,7 @@ class SitemapValidator extends AbstractSitemapValidator {
7474
containsOtherWidgets = true
7575
}
7676
if (containsFrames && containsOtherWidgets) {
77-
error("Sitemap should contain either only frames or none at all",
77+
warning("Sitemap should contain either only frames or none at all",
7878
SitemapPackage.Literals.SITEMAP.getEStructuralFeature(SitemapPackage.SITEMAP__NAME));
7979
return
8080
}
@@ -95,7 +95,7 @@ class SitemapValidator extends AbstractSitemapValidator {
9595
var containsOtherWidgets = false
9696
for (Widget w : widget.children) {
9797
if (w instanceof Button) {
98-
error("Linkable widget should not contain Button, Button is allowed only in Buttongrid",
98+
warning("Linkable widget should not contain Button, Button is allowed only in Buttongrid",
9999
SitemapPackage.Literals.FRAME.getEStructuralFeature(SitemapPackage.LINKABLE_WIDGET__CHILDREN));
100100
return;
101101
}
@@ -105,7 +105,7 @@ class SitemapValidator extends AbstractSitemapValidator {
105105
containsOtherWidgets = true
106106
}
107107
if (containsFrames && containsOtherWidgets) {
108-
error("Linkable widget should contain either only frames or none at all",
108+
warning("Linkable widget should contain either only frames or none at all",
109109
SitemapPackage.Literals.FRAME.getEStructuralFeature(SitemapPackage.LINKABLE_WIDGET__CHILDREN));
110110
return
111111
}
@@ -116,12 +116,12 @@ class SitemapValidator extends AbstractSitemapValidator {
116116
def void checkWidgetsInButtongrid(Buttongrid grid) {
117117
val nb = grid.getButtons.size()
118118
if (nb > 0 && grid.item === null) {
119-
error("To use the \"buttons\" parameter in a Buttongrid, the \"item\" parameter is required",
119+
warning("To use the \"buttons\" parameter in a Buttongrid, the \"item\" parameter is required",
120120
SitemapPackage.Literals.BUTTONGRID.getEStructuralFeature(SitemapPackage.BUTTONGRID__ITEM));
121121
}
122122
for (Widget w : grid.children) {
123123
if (!(w instanceof Button)) {
124-
error("Buttongrid must contain only Button",
124+
warning("Buttongrid must contain only Button",
125125
SitemapPackage.Literals.BUTTONGRID.getEStructuralFeature(SitemapPackage.BUTTONGRID__CHILDREN));
126126
return;
127127
}
@@ -131,25 +131,25 @@ class SitemapValidator extends AbstractSitemapValidator {
131131
@Check
132132
def void checkSetpoints(Setpoint sp) {
133133
if (BigDecimal.ZERO == sp.step) {
134-
error("Setpoint on item '" + sp.item + "' has step size of 0",
134+
warning("Setpoint on item '" + sp.item + "' has step size of 0",
135135
SitemapPackage.Literals.SETPOINT.getEStructuralFeature(SitemapPackage.SETPOINT__STEP));
136136
}
137137

138138
if (sp.step !== null && sp.step < BigDecimal.ZERO) {
139-
error("Setpoint on item '" + sp.item + "' has negative step size",
139+
warning("Setpoint on item '" + sp.item + "' has negative step size",
140140
SitemapPackage.Literals.SETPOINT.getEStructuralFeature(SitemapPackage.SETPOINT__STEP));
141141
}
142142

143143
if (sp.minValue !== null && sp.maxValue !== null && sp.minValue > sp.maxValue) {
144-
error("Setpoint on item '" + sp.item + "' has larger minValue than maxValue",
144+
warning("Setpoint on item '" + sp.item + "' has larger minValue than maxValue",
145145
SitemapPackage.Literals.SETPOINT.getEStructuralFeature(SitemapPackage.SETPOINT__MIN_VALUE));
146146
}
147147
}
148148

149149
@Check
150150
def void checkColortemperaturepicker(Colortemperaturepicker ctp) {
151151
if (ctp.minValue !== null && ctp.maxValue !== null && ctp.minValue > ctp.maxValue) {
152-
error("Colortemperaturepicker on item '" + ctp.item + "' has larger minValue than maxValue",
152+
warning("Colortemperaturepicker on item '" + ctp.item + "' has larger minValue than maxValue",
153153
SitemapPackage.Literals.COLORTEMPERATUREPICKER.getEStructuralFeature(SitemapPackage.COLORTEMPERATUREPICKER__MIN_VALUE));
154154
}
155155
}
@@ -159,7 +159,7 @@ class SitemapValidator extends AbstractSitemapValidator {
159159
if (i.inputHint !== null && !ALLOWED_HINTS.contains(i.inputHint)) {
160160
val node = NodeModelUtils.getNode(i)
161161
val line = node.getStartLine()
162-
error("Input on item '" + i.item + "' has invalid inputHint '" + i.inputHint + "' at line " + line,
162+
warning("Input on item '" + i.item + "' has invalid inputHint '" + i.inputHint + "' at line " + line,
163163
SitemapPackage.Literals.INPUT.getEStructuralFeature(SitemapPackage.INPUT__INPUT_HINT))
164164
}
165165
}
@@ -169,7 +169,7 @@ class SitemapValidator extends AbstractSitemapValidator {
169169
if (i.interpolation !== null && !ALLOWED_INTERPOLATION.contains(i.interpolation)) {
170170
val node = NodeModelUtils.getNode(i)
171171
val line = node.getStartLine()
172-
error("Input on item '" + i.item + "' has invalid interpolation '" + i.interpolation + "' at line " + line,
172+
warning("Input on item '" + i.item + "' has invalid interpolation '" + i.interpolation + "' at line " + line,
173173
SitemapPackage.Literals.INPUT.getEStructuralFeature(SitemapPackage.CHART__INTERPOLATION))
174174
}
175175
}

0 commit comments

Comments
 (0)