Merge branch 'v0.17.x_bugfix' into v0.17.x

integrity-tf · Oct 15, 2018 · 5b24a80 · 5b24a80
2 parents ddccfc3 + 0151eb4
commit 5b24a80
Show file tree

Hide file tree

Showing 11 changed files with 550 additions and 606 deletions.
diff --git a/de.gebit.integrity.docgen/src/de/gebit/integrity/docgen/html/PackageIndexView.java b/de.gebit.integrity.docgen/src/de/gebit/integrity/docgen/html/PackageIndexView.java
@@ -10,6 +10,7 @@
 import java.util.Collection;
 
 import de.gebit.integrity.docgen.IntegrityPackage;
+import htmlflow.HtmlWriter;
 import htmlflow.elements.HtmlA;
 import htmlflow.elements.HtmlBody;
 import htmlflow.elements.HtmlDiv;
@@ -58,7 +59,7 @@ public PackageIndexView(Collection<IntegrityPackage> somePackages, boolean aRela
 		tempSearchFormButton.addAttr("id", "searchbutton");
 		tempSearchFormButton.addAttr("type", "button");
 		tempSearchFormButton.addAttr("value", "Search");
-		tempSearchForm.addChild(tempSearchFormInput);
+		tempSearchForm.addChild((HtmlWriter<?>) tempSearchFormInput);
 		tempSearchForm.addChild(tempSearchFormButton);
 
 		tempMainContainerDiv.div().idAttr("searchresults");

diff --git a/...integrity.dsl.ui/src-gen/de/gebit/integrity/ui/contentassist/antlr/internal/InternalDSL.g b/...integrity.dsl.ui/src-gen/de/gebit/integrity/ui/contentassist/antlr/internal/InternalDSL.g
@@ -18251,7 +18251,7 @@ RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))*
 
 RULE_ML_COMMENT : '/*' ~('*') ( options {greedy=false;} : . )*'*/';
 
-RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
+RULE_SL_COMMENT : '//' ~(('\n'|'\r'))*;
 
 RULE_SL_VISIBLE_COMMENT : '-- ' ~(('\n'|'\r'))*;