From 97c72b534e0466e07b41b562085bc966a29d4ed8 Mon Sep 17 00:00:00 2001 From: Joachim Klein Date: Fri, 9 Sep 2016 08:34:22 +0000 Subject: [PATCH] prism.UndefinedConstants: provide additional method removeConstants(Collection constNames) Refactor removeConstants(String[] constNames) to use that method as well. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11796 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/prism/UndefinedConstants.java | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/prism/src/prism/UndefinedConstants.java b/prism/src/prism/UndefinedConstants.java index 8179f7fa..29825a1e 100644 --- a/prism/src/prism/UndefinedConstants.java +++ b/prism/src/prism/UndefinedConstants.java @@ -27,6 +27,8 @@ package prism; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; import java.util.List; import java.util.Vector; @@ -240,14 +242,24 @@ public class UndefinedConstants /** * Remove some constants. This is used if you decide that you do not want to treat - * some constants as undefined once you have created the UndefinedConstants object. - * @return how many constants were actually removed. + * some constants as undefined once you have created the UndefinedConstants object. + * @return how many constants were actually removed. */ public int removeConstants(String constNames[]) { - int removed = 0, n = constNames.length; - for (int i = 0; i < n; i++) { - if (removeConstant(constNames[i])) + return removeConstants(Arrays.asList(constNames)); + } + + /** + * Remove some constants. This is used if you decide that you do not want to treat + * some constants as undefined once you have created the UndefinedConstants object. + * @return how many constants were actually removed. + */ + public int removeConstants(Collection constNames) + { + int removed = 0; + for (String name : constNames) { + if (removeConstant(name)) removed++; } return removed;