Merge branch 'ConsoleAnnotations' into 'master'

cope.console @SuppressIsNotZero applied to Run#elapsed of Dispatcher and Schedule

See merge request exedio/cope!1942

Author: rw7

ivy/ivy.xml

@@ -84,6 +84,8 @@
 			<exclude org="org.checkerframework" module="checker-qual" />
 		</dependency>
 
+		<dependency org="com.exedio" name="copeconsole" rev="7827" conf="compile-annotations->annotations" />
+
 		<!-- idea -->
 		<dependency org="org.jetbrains" name="annotations" rev="22.0.0" conf="idea,compile-annotations->default; ide->sources"/>
 

lib/compile-annotations/exedio-cope-console-annotations.jar

@@ -767,7 +767,7 @@ private final class RunType
 			features.put("parent", parent);
 			features.put("date", date);
 			features.put("runs", runs);
-			features.put("elapsed", elapsed);
+			features.put("elapsed", elapsed, SuppressElements.isNotZero());
 			features.put("remaining", remaining);
 			features.put("limit", limit);
 			features.put("result", result, CustomAnnotatedElement.create(CopeSchemaNameElement.get("success")));

runtime/patternsrc/com/exedio/cope/pattern/Dispatcher.java

@@ -465,7 +465,7 @@ void onMount(final Schedule pattern, final Type<?> type)
 			features.put("until", until);
 			features.put("run",   run);
 			features.put("progress", progress);
-			features.put("elapsed", elapsed);
+			features.put("elapsed", elapsed, SuppressElements.isNotZero());
 			final Type<Run> runType = pattern.newSourceType(Run.class, Run::new, features, "Run");
 			this.mountIfMounted = new Mount(parent, runs, runType);
 		}

runtime/patternsrc/com/exedio/cope/pattern/Schedule.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2004-2015  exedio GmbH (www.exedio.com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package com.exedio.cope.pattern;
+
+import com.exedio.cope.console.annotations.SuppressIsNotZero;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Field;
+
+final class SuppressElements
+{
+	static AnnotatedElement isNotZero()
+	{
+		return isNotZero;
+	}
+
+	@SuppressIsNotZero
+	private static final Field isNotZero;
+
+	static
+	{
+		try
+		{
+			isNotZero = SuppressElements.class.getDeclaredField("isNotZero");
+		}
+		catch(final NoSuchFieldException e)
+		{
+			throw new RuntimeException(e);
+		}
+	}
+
+	private SuppressElements()
+	{
+		// prevent instantiation
+	}
+}