Merge remote-tracking branch 'origin/master' into neon
diff --git a/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/impl/NameDistance.java b/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/impl/NameDistance.java
index 46727be..00a6a42 100644
--- a/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/impl/NameDistance.java
+++ b/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/impl/NameDistance.java
@@ -37,14 +37,14 @@
private static final String checkerName = "NameDistance";
/**
- * Creates a name distance checker with default threshold
+ * Creates a name distance checker with default threshold.
*/
public NameDistance() {
super(checkerName, getTags());
}
/**
- * Creates a name distance checker with the given priority
+ * Creates a name distance checker with the given priority.
* @param priority the priority
*/
public NameDistance(int priority) {
@@ -52,7 +52,7 @@
}
/**
- * Creates a name distance checker with the given priority and threshold
+ * Creates a name distance checker with the given priority and threshold.
* @param priority the priority
* @param threshold the threshold to use
*/
@@ -61,6 +61,34 @@
setThreshold(threshold);
}
+ /**
+ * Constructor with explicit tags.
+ * @param tags the tags identifying this checker
+ */
+ public NameDistance(Set<String> tags) {
+ super(checkerName, tags);
+ }
+
+ /**
+ * Constructor with explicit tags and priority.
+ * @param tags the tags identifying this checker
+ * @param priority the priority
+ */
+ public NameDistance(Set<String> tags, int priority) {
+ super(checkerName, tags, priority);
+ }
+
+ /**
+ * Constructor with explicit tags, priority and threshold.
+ * @param tags the tags identifying this checker
+ * @param priority the priority
+ * @param threshold the threshold to use
+ */
+ public NameDistance(Set<String> tags, int priority, int threshold) {
+ super(checkerName, tags, priority);
+ setThreshold(threshold);
+ }
+
private static Set<String> getTags() {
Set<String> tags = new HashSet<String>();
tags.add("fast");
diff --git a/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/impl/StateStatus.java b/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/impl/StateStatus.java
index ae751ed..e7c0204 100644
--- a/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/impl/StateStatus.java
+++ b/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/impl/StateStatus.java
@@ -30,7 +30,7 @@
*/
public class StateStatus extends Checker {
private Package systemViewPackage;
- private static final Logger logger = Logger.getLogger(StateStatus.class);
+ protected static final Logger logger = Logger.getLogger(StateStatus.class);
private final EntityUtil entityUtil = EntityUtil.getInstance();
private static final String checkerName = "StateStatus";
@@ -49,6 +49,23 @@
super(checkerName, getTags(), priority);
}
+ /**
+ * Constructor with explicit tags.
+ * @param tags the tags identifying this checker
+ */
+ public StateStatus(Set<String> tags) {
+ super(checkerName, tags);
+ }
+
+ /**
+ * Constructor with explicit tags and priority.
+ * @param tags the tags identifying this checker
+ * @param priority the priority
+ */
+ public StateStatus(Set<String> tags, int priority) {
+ super(checkerName, tags, priority);
+ }
+
private static Set<String> getTags() {
Set<String> tags = new HashSet<String>();
tags.add("fast");
@@ -94,7 +111,7 @@
* @param block
* @return list of errors
*/
- private List<CheckerMessage> checkForDeadStates(Class block) {
+ protected List<CheckerMessage> checkForDeadStates(Class block) {
List<CheckerMessage> errors = new ArrayList<CheckerMessage>();
final Set<StateMachine> stateMachines = entityUtil.getNominalStateMachines(block);