Rename BaseConsumer to Consumer

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@708866 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java
index 7c306e1e078bb753b79b61954bbe5c46856f5da7..b6ae1db527382c745c2ba0dfe46bd1491482077a 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java
@@ -33,7 +33,7 @@ import org.apache.maven.archiva.configuration.FileTypes;
  * @version $Id$
  */
 public abstract class AbstractMonitoredConsumer
-    implements BaseConsumer
+    implements Consumer
 {
     private Set<ConsumerMonitor> monitors = new HashSet<ConsumerMonitor>();
     

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ArchivaArtifactConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ArchivaArtifactConsumer.java
index 2090517426a2ce690416594364129b09d926705f..61393e30fbdf6539dabda2d009857c38f9df4783 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ArchivaArtifactConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ArchivaArtifactConsumer.java
@@ -29,7 +29,7 @@ import java.util.List;
  * @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
  * @version $Id$
  */
-public interface ArchivaArtifactConsumer extends BaseConsumer
+public interface ArchivaArtifactConsumer extends Consumer
 {
     /**
      * Get the list of included file patterns for this consumer.

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java
deleted file mode 100644 (file)
index 2f32f1f..0000000
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.apache.maven.archiva.consumers;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * BaseConsumer - the base set of methods for a consumer. 
- *
- * @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
- * @version $Id$
- */
-public abstract interface BaseConsumer
-{
-    /**
-     * This is the id for the consumer.
-     * 
-     * @return the consumer id.
-     */
-    public String getId();
-    
-    /**
-     * The human readable description for this consumer.
-     * 
-     * @return the human readable description for this consumer.
-     */
-    public String getDescription();
-    
-    /**
-     * Flag indicating permanance of consumer. (if it can be disabled or not)
-     * 
-     * @return true indicating that consumer is permanent and cannot be disabled. 
-     */
-    public boolean isPermanent();
-
-    /**
-     * Add a consumer monitor to the consumer.
-     * 
-     * @param monitor the monitor to add.
-     */
-    public void addConsumerMonitor( ConsumerMonitor monitor );
-    
-    /**
-     * Remove a consumer monitor.
-     * 
-     * @param monitor the monitor to remove.
-     */
-    public void removeConsumerMonitor( ConsumerMonitor monitor );
-}

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java
new file mode 100644 (file)
index 0000000..cffbb11
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java
@@ -0,0 +1,64 @@
+package org.apache.maven.archiva.consumers;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Consumer - the base set of methods for a consumer.
+ *
+ * @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public abstract interface Consumer
+{
+    /**
+     * This is the id for the consumer.
+     * 
+     * @return the consumer id.
+     */
+    public String getId();
+    
+    /**
+     * The human readable description for this consumer.
+     * 
+     * @return the human readable description for this consumer.
+     */
+    public String getDescription();
+    
+    /**
+     * Flag indicating permanance of consumer. (if it can be disabled or not)
+     * 
+     * @return true indicating that consumer is permanent and cannot be disabled. 
+     */
+    public boolean isPermanent();
+
+    /**
+     * Add a consumer monitor to the consumer.
+     * 
+     * @param monitor the monitor to add.
+     */
+    public void addConsumerMonitor( ConsumerMonitor monitor );
+    
+    /**
+     * Remove a consumer monitor.
+     * 
+     * @param monitor the monitor to remove.
+     */
+    public void removeConsumerMonitor( ConsumerMonitor monitor );
+}

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ConsumerMonitor.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ConsumerMonitor.java
index 9714147645f7a2f1c6514e3527deca730e5b0d6d..4feb01a1dda5b48fa9eef0aa4bf6e95fe1f9c4d2 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ConsumerMonitor.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ConsumerMonitor.java
@@ -34,7 +34,7 @@ public interface ConsumerMonitor
      * @param type the type of error.
      * @param message the message about the error.
      */
-    public void consumerError( BaseConsumer consumer, String type, String message );
+    public void consumerError( Consumer consumer, String type, String message );
     
     /**
      * A consumer warning event.
@@ -43,7 +43,7 @@ public interface ConsumerMonitor
      * @param type the type of warning.
      * @param message the message about the warning.
      */
-    public void consumerWarning( BaseConsumer consumer, String type, String message );
+    public void consumerWarning( Consumer consumer, String type, String message );
 
     /**
      * A consumer informational event.
@@ -51,5 +51,5 @@ public interface ConsumerMonitor
      * @param consumer the consumer that caused the informational message.
      * @param message the message.
      */
-    public void consumerInfo( BaseConsumer consumer, String message );
+    public void consumerInfo( Consumer consumer, String message );
 }

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java
index 9b23e17137972d7abe7a98ce2c1beb1b0971fc51..2dca8be7b5c6b42a5a321c862372071e3c0535e2 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java
@@ -30,7 +30,7 @@ import java.util.List;
  * @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
  * @version $Id$
  */
-public interface RepositoryContentConsumer extends BaseConsumer
+public interface RepositoryContentConsumer extends Consumer
 {
     /**
      * Get the list of included file patterns for this consumer.

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/functors/PermanentConsumerPredicate.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/functors/PermanentConsumerPredicate.java
index 92b9e3a551deafde50910a7ce995c851aba1ccd3..512becc56a8c8d4f030ccc4bf43d3b2061e835cb 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/functors/PermanentConsumerPredicate.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/functors/PermanentConsumerPredicate.java
@@ -20,7 +20,7 @@ package org.apache.maven.archiva.consumers.functors;
  */
 
 import org.apache.commons.collections.Predicate;
-import org.apache.maven.archiva.consumers.BaseConsumer;
+import org.apache.maven.archiva.consumers.Consumer;
 
 /**
  * Selects Consumers that are flaged as 'permanent'. 
@@ -36,9 +36,9 @@ public class PermanentConsumerPredicate
     {
         boolean satisfies = false;
 
-        if ( object instanceof BaseConsumer )
+        if ( object instanceof Consumer )
         {
-            BaseConsumer consumer = (BaseConsumer) object;
+            Consumer consumer = (Consumer) object;
             satisfies = consumer.isPermanent();
         }