web ui custom y-axis min max value; bugfix gradle build file correct …

…library source

.project

@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -19,5 +24,6 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>
 </projectDescription>

build.gradle

@@ -112,7 +112,7 @@ task clean_package(type: Delete) {
 
 task copy_lib(type: Copy) {
 	description 'copy folder lib to package'
-	from files(configurations.runtime)
+	from files(configurations.runtimeClasspath)
     into 'package/lib'
 }
 

config/caldern/region.ini

@@ -4,4 +4,4 @@ CALDERN = Caldern
 
 [region_view_time_range]
 
-CALDERN = [2017, 2019]
+CALDERN = [2017, 2020]

dsl/src_generated/tsdb/dsl/Formula.tokens

@@ -1,63 +1,63 @@
-T__0=1
-T__1=2
-T__2=3
-T__3=4
-T__4=5
-T__5=6
-T__6=7
-T__7=8
-T__8=9
-T__9=10
-T__10=11
-T__11=12
-T__12=13
-T__13=14
-T__14=15
-T__15=16
-T__16=17
-T__17=18
-T__18=19
-T__19=20
-T__20=21
-LPAREN=22
-RPAREN=23
 ADD=24
+UNDERSCORE=30
+LETTER=31
+T__19=2
+T__15=6
+T__16=5
+T__17=4
+T__18=3
+T__11=10
+T__3=18
+T__12=9
+T__2=19
+T__13=8
+T__1=20
+T__14=7
+T__0=21
+WS=33
+T__10=11
 SUB=25
+T__9=12
+T__8=13
+T__7=14
+T__6=15
 MUL=26
+T__5=16
+T__4=17
+LPAREN=22
+RPAREN=23
+DIGIT=32
 DIV=27
-POINT=28
 POW=29
-UNDERSCORE=30
-LETTER=31
-DIGIT=32
-WS=33
-'IF'=1
-'THEN'=2
-'ELSE'=3
-'?'=4
-':'=5
-'OR'=6
-'||'=7
-'|'=8
-'AND'=9
-'&&'=10
-'&'=11
-'NOT'=12
-'!'=13
-'<'=14
-'>'=15
-'<='=16
-'>='=17
-'=='=18
-'='=19
-'!='=20
-'<>'=21
-'('=22
-')'=23
-'+'=24
+POINT=28
+T__20=1
 '-'=25
-'*'=26
-'/'=27
+'+'=24
+')'=23
+'<>'=20
+'!'=18
+'OR'=15
+'_'=30
+'>'=14
+'=='=7
+'<'=8
+'|'=10
+'>='=4
+':'=3
 '.'=28
+'*'=26
+'('=22
+'&'=21
+'<='=17
+'THEN'=19
+'?'=16
 '^'=29
-'_'=30
+'='=11
+'NOT'=12
+'IF'=13
+'&&'=9
+'AND'=5
+'||'=6
+'!='=2
+'ELSE'=1
+'/'=27

dsl/src_generated/tsdb/dsl/FormulaBaseVisitor.java

@@ -1,5 +1,6 @@
-// Generated from Formula.g4 by ANTLR 4.7
+// Generated from Formula.g4 by ANTLR 4.4
 package tsdb.dsl;
+import org.antlr.v4.runtime.misc.NotNull;
 import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
 
 /**
@@ -17,152 +18,152 @@ public class FormulaBaseVisitor<T> extends AbstractParseTreeVisitor<T> implement
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitExpression(FormulaParser.ExpressionContext ctx) { return visitChildren(ctx); }
+	@Override public T visitExpression_op(@NotNull FormulaParser.Expression_opContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitExpression_op(FormulaParser.Expression_opContext ctx) { return visitChildren(ctx); }
+	@Override public T visitIdentifier(@NotNull FormulaParser.IdentifierContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitConditional(FormulaParser.ConditionalContext ctx) { return visitChildren(ctx); }
+	@Override public T visitExpression(@NotNull FormulaParser.ExpressionContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitPredicate_expression(FormulaParser.Predicate_expressionContext ctx) { return visitChildren(ctx); }
+	@Override public T visitPredicate_factor(@NotNull FormulaParser.Predicate_factorContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitPredicate_term(FormulaParser.Predicate_termContext ctx) { return visitChildren(ctx); }
+	@Override public T visitConditional(@NotNull FormulaParser.ConditionalContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitPredicate_factor(FormulaParser.Predicate_factorContext ctx) { return visitChildren(ctx); }
+	@Override public T visitPredicate_term(@NotNull FormulaParser.Predicate_termContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitPredicate_atom(FormulaParser.Predicate_atomContext ctx) { return visitChildren(ctx); }
+	@Override public T visitScientific(@NotNull FormulaParser.ScientificContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitLess(FormulaParser.LessContext ctx) { return visitChildren(ctx); }
+	@Override public T visitLess(@NotNull FormulaParser.LessContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitGreater(FormulaParser.GreaterContext ctx) { return visitChildren(ctx); }
+	@Override public T visitGreater_equal(@NotNull FormulaParser.Greater_equalContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitLess_equal(FormulaParser.Less_equalContext ctx) { return visitChildren(ctx); }
+	@Override public T visitEqual(@NotNull FormulaParser.EqualContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitGreater_equal(FormulaParser.Greater_equalContext ctx) { return visitChildren(ctx); }
+	@Override public T visitTerm_op(@NotNull FormulaParser.Term_opContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitEqual(FormulaParser.EqualContext ctx) { return visitChildren(ctx); }
+	@Override public T visitNumber(@NotNull FormulaParser.NumberContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitNot_equal(FormulaParser.Not_equalContext ctx) { return visitChildren(ctx); }
+	@Override public T visitPredicate_atom(@NotNull FormulaParser.Predicate_atomContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitTerm(FormulaParser.TermContext ctx) { return visitChildren(ctx); }
+	@Override public T visitNot_equal(@NotNull FormulaParser.Not_equalContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitTerm_op(FormulaParser.Term_opContext ctx) { return visitChildren(ctx); }
+	@Override public T visitParameter(@NotNull FormulaParser.ParameterContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitFactor(FormulaParser.FactorContext ctx) { return visitChildren(ctx); }
+	@Override public T visitVariable(@NotNull FormulaParser.VariableContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitAtom(FormulaParser.AtomContext ctx) { return visitChildren(ctx); }
+	@Override public T visitTerm(@NotNull FormulaParser.TermContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitScientific(FormulaParser.ScientificContext ctx) { return visitChildren(ctx); }
+	@Override public T visitPredicate_expression(@NotNull FormulaParser.Predicate_expressionContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitNumber(FormulaParser.NumberContext ctx) { return visitChildren(ctx); }
+	@Override public T visitFactor(@NotNull FormulaParser.FactorContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitVariable(FormulaParser.VariableContext ctx) { return visitChildren(ctx); }
+	@Override public T visitAtom(@NotNull FormulaParser.AtomContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitParameter(FormulaParser.ParameterContext ctx) { return visitChildren(ctx); }
+	@Override public T visitGreater(@NotNull FormulaParser.GreaterContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitIdentifier(FormulaParser.IdentifierContext ctx) { return visitChildren(ctx); }
+	@Override public T visitLess_equal(@NotNull FormulaParser.Less_equalContext ctx) { return visitChildren(ctx); }
 }