code review nits (inherited, renaming, package level control)

Author: Krystof Tulinger

test/org/opensolaris/opengrok/condition/ConditionalRun.java

@@ -24,6 +24,7 @@
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -33,8 +34,9 @@
  * Repeatable annotation for automatic test skipping.
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.METHOD, ElementType.TYPE})
+@Target(value = {ElementType.METHOD, ElementType.TYPE, ElementType.PACKAGE})
 @Repeatable(ConditionalRunRepeatable.class)
+@Inherited
 @Documented
 public @interface ConditionalRun {
 

test/org/opensolaris/opengrok/condition/ConditionalRunRepeatable.java

@@ -24,6 +24,7 @@
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -36,7 +37,8 @@
  */
 @Retention(value = RUNTIME)
 @Documented
-@Target(value = {ElementType.METHOD, ElementType.TYPE})
+@Inherited
+@Target(value = {ElementType.METHOD, ElementType.TYPE, ElementType.PACKAGE})
 public @interface ConditionalRunRepeatable {
 
     ConditionalRun[] value();

test/org/opensolaris/opengrok/condition/ConditionalRunRule.java

@@ -121,13 +121,13 @@ public boolean isSatisfied() {
     protected static class IgnoreConditionCreator {
 
         private final Class<?> mTestClass;
-        private final List<Class<? extends RunCondition>> conditionType;
+        private final List<Class<? extends RunCondition>> conditionTypes;
 
         public IgnoreConditionCreator(Class<?> aTestClass, ConditionalRun[] annotation) {
             this.mTestClass = aTestClass;
-            this.conditionType = new ArrayList<>(annotation.length);
+            this.conditionTypes = new ArrayList<>(annotation.length);
             for (int i = 0; i < annotation.length; i++) {
-                this.conditionType.add(i, annotation[i].condition());
+                this.conditionTypes.add(i, annotation[i].condition());
             }
         }
 
@@ -148,7 +148,7 @@ private RunCondition createCondition() throws Exception {
              * Run through the list of classes implementing RunCondition and
              * create a new class from it.
              */
-            for (Class<? extends RunCondition> clazz : conditionType) {
+            for (Class<? extends RunCondition> clazz : conditionTypes) {
                 if (result == null) {
                     result = new CompositeCondition();
                 }
@@ -162,7 +162,7 @@ private RunCondition createCondition() throws Exception {
         }
 
         private void checkConditionType() {
-            for (Class<? extends RunCondition> clazz : conditionType) {
+            for (Class<? extends RunCondition> clazz : conditionTypes) {
                 if (!isConditionTypeStandalone(clazz) && !isConditionTypeDeclaredInTarget(clazz)) {
                     String msg
                             = "Conditional class '%s' is a member class "