SLING-4145 - removing DistributionEvent subclass of Event, moving getTopic to DistributionEventType
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1637825 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/distribution/event/DistributionEvent.java b/src/main/java/org/apache/sling/distribution/event/DistributionEvent.java
deleted file mode 100644
index 964fa86..0000000
--- a/src/main/java/org/apache/sling/distribution/event/DistributionEvent.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-package org.apache.sling.distribution.event;
-
-import java.util.Dictionary;
-
-import org.osgi.service.event.Event;
-
-/**
- * A distribution related event
- */
-public class DistributionEvent extends Event {
-
- public static final String EVENT_TOPIC = "org/apache/sling/distribution/event";
-
- public DistributionEvent(DistributionEventType type, Dictionary<?, ?> properties) {
- super(getTopic(type), properties);
- }
-
- /**
- * get the topic for a certain event type
- *
- * @param type the {@link DistributionEventType} to get the topic for
- * @return the topic for the given event type
- */
- public static String getTopic(DistributionEventType type) {
- return EVENT_TOPIC + '/' + type.name();
- }
-}
diff --git a/src/main/java/org/apache/sling/distribution/event/DistributionEventType.java b/src/main/java/org/apache/sling/distribution/event/DistributionEventType.java
index b424f73..03259e2 100644
--- a/src/main/java/org/apache/sling/distribution/event/DistributionEventType.java
+++ b/src/main/java/org/apache/sling/distribution/event/DistributionEventType.java
@@ -61,6 +61,20 @@
/**
* event for agent deleted
*/
- AGENT_DELETED
+ AGENT_DELETED;
+
+ /**
+ * common event topic base for distribution events
+ */
+ public static final String EVENT_TOPIC = "org/apache/sling/distribution/event";
+
+ /**
+ * get the event topic for this event type
+ *
+ * @return the event topic
+ */
+ public String getTopic() {
+ return EVENT_TOPIC + "/" + name();
+ }
}
