From 5c93d7bd286db8bc7aaeedeca71bb897f7465c9a Mon Sep 17 00:00:00 2001 From: gojomo Date: Fri, 14 Aug 2009 21:31:11 +0000 Subject: [PATCH] Rename DecideResult.PASS to DecideResult.NONE for clarity * DecideResult.java + references PASS was confusable with ACCEPT; NONE better conveys "no decision" --- .../java/org/archive/modules/deciderules/DecideResult.java | 2 +- .../main/java/org/archive/modules/deciderules/DecideRule.java | 4 ++-- .../org/archive/modules/deciderules/DecideRuleSequence.java | 4 ++-- .../modules/deciderules/PathologicalPathDecideRule.java | 2 +- .../org/archive/modules/deciderules/PredicatedDecideRule.java | 2 +- .../modules/deciderules/PrerequisiteAcceptDecideRule.java | 2 +- .../org/archive/modules/deciderules/ScriptedDecideRule.java | 2 +- .../org/archive/modules/deciderules/SeedAcceptDecideRule.java | 2 +- .../modules/deciderules/surt/ScopePlusOneDecideRule.java | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/src/main/java/org/archive/modules/deciderules/DecideResult.java b/modules/src/main/java/org/archive/modules/deciderules/DecideResult.java index ebaf5dd8..b996303e 100644 --- a/modules/src/main/java/org/archive/modules/deciderules/DecideResult.java +++ b/modules/src/main/java/org/archive/modules/deciderules/DecideResult.java @@ -35,7 +35,7 @@ public enum DecideResult { ACCEPT, /** Indicates the URI was neither accepted nor rejected. */ - PASS, + NONE, /** Indicates the URI was rejected. */ REJECT; diff --git a/modules/src/main/java/org/archive/modules/deciderules/DecideRule.java b/modules/src/main/java/org/archive/modules/deciderules/DecideRule.java index e21ec972..4fa430d3 100644 --- a/modules/src/main/java/org/archive/modules/deciderules/DecideRule.java +++ b/modules/src/main/java/org/archive/modules/deciderules/DecideRule.java @@ -60,10 +60,10 @@ public abstract class DecideRule implements Serializable, HasKeyedProperties { public DecideResult decisionFor(ProcessorURI uri) { if (!getEnabled()) { - return DecideResult.PASS; + return DecideResult.NONE; } DecideResult result = innerDecide(uri); - if (result == DecideResult.PASS) { + if (result == DecideResult.NONE) { return result; } diff --git a/modules/src/main/java/org/archive/modules/deciderules/DecideRuleSequence.java b/modules/src/main/java/org/archive/modules/deciderules/DecideRuleSequence.java index 6c36de93..0b17b07a 100644 --- a/modules/src/main/java/org/archive/modules/deciderules/DecideRuleSequence.java +++ b/modules/src/main/java/org/archive/modules/deciderules/DecideRuleSequence.java @@ -39,7 +39,7 @@ public class DecideRuleSequence extends DecideRule { } public DecideResult innerDecide(ProcessorURI uri) { - DecideResult result = DecideResult.PASS; + DecideResult result = DecideResult.NONE; List rules = getRules(); int max = rules.size(); for (int i = 0; i < max; i++) { @@ -50,7 +50,7 @@ public class DecideRuleSequence extends DecideRule { LOGGER.finest("DecideRule #" + i + " " + rule.getClass().getName() + " returned " + r); } - if (r != DecideResult.PASS) { + if (r != DecideResult.NONE) { result = r; } } diff --git a/modules/src/main/java/org/archive/modules/deciderules/PathologicalPathDecideRule.java b/modules/src/main/java/org/archive/modules/deciderules/PathologicalPathDecideRule.java index 493e1267..726b5356 100644 --- a/modules/src/main/java/org/archive/modules/deciderules/PathologicalPathDecideRule.java +++ b/modules/src/main/java/org/archive/modules/deciderules/PathologicalPathDecideRule.java @@ -73,7 +73,7 @@ public class PathologicalPathDecideRule extends DecideRule { if (p.matcher(uri.getUURI().toString()).matches()) { return DecideResult.REJECT; } else { - return DecideResult.PASS; + return DecideResult.NONE; } } diff --git a/modules/src/main/java/org/archive/modules/deciderules/PredicatedDecideRule.java b/modules/src/main/java/org/archive/modules/deciderules/PredicatedDecideRule.java index d99ee5f7..079930b0 100644 --- a/modules/src/main/java/org/archive/modules/deciderules/PredicatedDecideRule.java +++ b/modules/src/main/java/org/archive/modules/deciderules/PredicatedDecideRule.java @@ -53,7 +53,7 @@ public abstract class PredicatedDecideRule extends DecideRule { if (evaluate(uri)) { return getDecision(); } - return DecideResult.PASS; + return DecideResult.NONE; } protected abstract boolean evaluate(ProcessorURI object); diff --git a/modules/src/main/java/org/archive/modules/deciderules/PrerequisiteAcceptDecideRule.java b/modules/src/main/java/org/archive/modules/deciderules/PrerequisiteAcceptDecideRule.java index 630af93f..988d3666 100644 --- a/modules/src/main/java/org/archive/modules/deciderules/PrerequisiteAcceptDecideRule.java +++ b/modules/src/main/java/org/archive/modules/deciderules/PrerequisiteAcceptDecideRule.java @@ -49,7 +49,7 @@ public class PrerequisiteAcceptDecideRule extends DecideRule { hopsPath.charAt(hopsPath.length()-1) == Hop.PREREQ.getHopChar()) { return DecideResult.ACCEPT; } - return DecideResult.PASS; + return DecideResult.NONE; } diff --git a/modules/src/main/java/org/archive/modules/deciderules/ScriptedDecideRule.java b/modules/src/main/java/org/archive/modules/deciderules/ScriptedDecideRule.java index b981044b..571d6626 100644 --- a/modules/src/main/java/org/archive/modules/deciderules/ScriptedDecideRule.java +++ b/modules/src/main/java/org/archive/modules/deciderules/ScriptedDecideRule.java @@ -133,7 +133,7 @@ implements ApplicationContextAware, InitializingBean { return (DecideResult)engine.eval("decisionFor(object)"); } catch (ScriptException e) { logger.log(Level.WARNING,e.getMessage(),e); - return DecideResult.PASS; + return DecideResult.NONE; } } } diff --git a/modules/src/main/java/org/archive/modules/deciderules/SeedAcceptDecideRule.java b/modules/src/main/java/org/archive/modules/deciderules/SeedAcceptDecideRule.java index 73060e9f..5646c8e4 100644 --- a/modules/src/main/java/org/archive/modules/deciderules/SeedAcceptDecideRule.java +++ b/modules/src/main/java/org/archive/modules/deciderules/SeedAcceptDecideRule.java @@ -48,6 +48,6 @@ public class SeedAcceptDecideRule extends DecideRule { if (uri.isSeed()) { return DecideResult.ACCEPT; } - return DecideResult.PASS; + return DecideResult.NONE; } } diff --git a/modules/src/main/java/org/archive/modules/deciderules/surt/ScopePlusOneDecideRule.java b/modules/src/main/java/org/archive/modules/deciderules/surt/ScopePlusOneDecideRule.java index 4b767207..7a9b4bce 100644 --- a/modules/src/main/java/org/archive/modules/deciderules/surt/ScopePlusOneDecideRule.java +++ b/modules/src/main/java/org/archive/modules/deciderules/surt/ScopePlusOneDecideRule.java @@ -87,7 +87,7 @@ public class ScopePlusOneDecideRule extends SurtPrefixedDecideRule { UURI via = uri.getVia(); if (via == null) { // If there is no via and the URL doesn't match scope,reject it - return DecideResult.PASS; + return DecideResult.NONE; } // If the via is within scope, accept it boolean result = isInScope (via, set); @@ -99,7 +99,7 @@ public class ScopePlusOneDecideRule extends SurtPrefixedDecideRule { return DecideResult.ACCEPT; } } - return DecideResult.PASS; + return DecideResult.NONE; } /**