From 8a20d38b337f6a02d0577ee36beb0ec6eb975b86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20M=C3=A4rcker?= Date: Fri, 4 Sep 2020 12:43:09 +0200 Subject: [PATCH] Simplify class Interval By making Interval generic, the code is simplified. Please note that restricting the generic type to is not possible yet, as this breaks code dealing with type Object only. --- prism/src/prism/Interval.java | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/prism/src/prism/Interval.java b/prism/src/prism/Interval.java index 59fc486247..0640e13733 100644 --- a/prism/src/prism/Interval.java +++ b/prism/src/prism/Interval.java @@ -28,41 +28,25 @@ /** * This class stores an interval of numerical values. + * + * @param Type of the interval */ -public class Interval +public class Interval { // Lower/upper value - public Object lower; - public Object upper; - + public T lower; + public T upper; + /** * Construct an Interval. - * (lower and upper should be of the same type: Integer or Double) - */ - public Interval(Object lower, Object upper) - { - this.lower = lower; - this.upper = upper; - } - - /** - * Construct an integer Interval. + * Both bounds lower and upper should be of the same type. */ - public Interval(Integer lower, Integer upper) + public Interval(T lower, T upper) { this.lower = lower; this.upper = upper; } - - /** - * Construct a double Interval. - */ - public Interval(Double lower, Double upper) - { - this.lower = lower; - this.upper = upper; - } - + @Override public String toString() {