[Nightly Build] Remove JDK 1.6 annotations

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@13302 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/openfire/pubsub/PubSubModule.java

@@ -503,29 +503,24 @@ public class PubSubModule extends BasicModule implements ServerItemsProvider, Di
         return serviceEnabled;
     }
 
-	@Override
     public void joinedCluster() {
         // Disable the service until we know that we are the senior cluster member
 		// enableService(false);
     }
 
-	@Override
     public void joinedCluster(byte[] nodeID) {
         // Do nothing
     }
 
-	@Override
     public void leftCluster() {
         // Offer the service when not running in a cluster
 		// enableService(true);
     }
 
-	@Override
     public void leftCluster(byte[] nodeID) {
         // Do nothing
     }
 
-	@Override
     public void markedAsSeniorClusterMember() {
         // Offer the service since we are the senior cluster member
 		// enableService(true);

src/java/org/jivesoftware/openfire/pubsub/cluster/CancelSubscriptionTask.java

@@ -18,7 +18,6 @@ public class CancelSubscriptionTask extends SubscriptionTask
 		super(subscription);
 	}
 
-	@Override
 	public void run()
 	{
 		log.debug("[TASK] Cancel Subscription : {}", toString());

src/java/org/jivesoftware/openfire/pubsub/cluster/FlushTask.java

@@ -14,24 +14,20 @@ public class FlushTask implements ClusterTask
 	{
 	}
 
-	@Override
 	public void run()
 	{
         PubSubPersistenceManager.flushPendingItems(false); // just this member
 	}
 
-	@Override
 	public Object getResult()
 	{
 		return null;
 	}
 
-	@Override
 	public void writeExternal(ObjectOutput out) throws IOException
 	{
 	}
 
-	@Override
 	public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
 	{
 	}

src/java/org/jivesoftware/openfire/pubsub/cluster/ModifySubscriptionTask.java

@@ -19,7 +19,6 @@ public class ModifySubscriptionTask extends SubscriptionTask
 		super(subscription);
 	}
 
-	@Override
 	public void run()
 	{
 		log.debug("[TASK] Modify subscription : {}", toString());

src/java/org/jivesoftware/openfire/pubsub/cluster/NewSubscriptionTask.java

@@ -21,7 +21,6 @@ public class NewSubscriptionTask extends SubscriptionTask
 		super(subscription);
 	}
 
-	@Override
 	public void run()
 	{
 		log.debug("[TASK] New subscription : {}", toString());

src/java/org/jivesoftware/openfire/pubsub/cluster/NodeChangeTask.java

@@ -37,13 +37,11 @@ public abstract class NodeChangeTask implements ClusterTask
 		nodeId = node.getNodeID();
 	}
 
-	@Override
 	public void writeExternal(ObjectOutput out) throws IOException
 	{
 		ExternalizableUtil.getInstance().writeSafeUTF(out, nodeId);
 	}
 
-	@Override
 	public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
 	{
 		nodeId = ExternalizableUtil.getInstance().readSafeUTF(in);

src/java/org/jivesoftware/openfire/pubsub/cluster/NodeTask.java

@@ -52,20 +52,17 @@ public abstract class NodeTask implements ClusterTask
 		}
 	}
 
-	@Override
 	public Object getResult()
 	{
 		return null;
 	}
 
-	@Override
 	public void writeExternal(ObjectOutput out) throws IOException
 	{
 		ExternalizableUtil.getInstance().writeSafeUTF(out, nodeId);
 		ExternalizableUtil.getInstance().writeSafeUTF(out, serviceId);
 	}
 
-	@Override
 	public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
 	{
 		nodeId = ExternalizableUtil.getInstance().readSafeUTF(in);

src/java/org/jivesoftware/openfire/pubsub/cluster/RefreshNodeTask.java

@@ -26,7 +26,6 @@ public class RefreshNodeTask extends NodeTask
 		super(node);
 	}
 
-	@Override
 	public void run()
 	{
 		log.debug("[TASK] Refreshing node - nodeID: {}", getNodeId());

src/java/org/jivesoftware/openfire/pubsub/cluster/RemoveNodeTask.java

@@ -23,7 +23,6 @@ public class RemoveNodeTask extends NodeTask
         super(node);
     }
 
-    @Override
     public void run()
     {
 		log.debug("[TASK] Removing node - nodeID: {}", getNodeId());

src/java/org/jivesoftware/util/cache/DefaultLocalCacheStrategy.java

@@ -105,7 +105,6 @@ public class DefaultLocalCacheStrategy implements CacheFactoryStrategy {
     public void updateCacheStats(Map<String, Cache> caches) {
     }
 
-	@Override
 	public String getPluginName() {
 		return "local";
 	}

src/plugins/hazelcast/src/java/com/jivesoftware/util/cache/CacheListener.java

@@ -46,22 +46,18 @@ class CacheListener implements EntryListener {
         this.cacheName = cacheName;
     }
 
-    @Override
     public void entryAdded(EntryEvent event) {
         handleMapEvent(event, false);
     }
 
-    @Override
     public void entryUpdated(EntryEvent event) {
         handleMapEvent(event, false);
     }
 
-    @Override
     public void entryRemoved(EntryEvent event) {
         handleMapEvent(event, true);
     }
 
-    @Override
     public void entryEvicted(EntryEvent event) {
         handleMapEvent(event, true);
     }

src/plugins/hazelcast/src/java/com/jivesoftware/util/cache/ClusterListener.java

@@ -412,7 +412,6 @@ public class ClusterListener implements MembershipListener, LifecycleListener {
      */
     private class DirectedPresenceListener implements EntryListener {
 
-		@Override
         public void entryAdded(EntryEvent event) {
 			byte[] nodeID = event.getMember().getUuid().getBytes();
             // Ignore events origintated from this JVM
@@ -438,7 +437,6 @@ public class ClusterListener implements MembershipListener, LifecycleListener {
             }
         }
 
-		@Override
         public void entryUpdated(EntryEvent event) {
 			byte[] nodeID = event.getMember().getUuid().getBytes();
             // Ignore events originated from this JVM
@@ -468,7 +466,6 @@ public class ClusterListener implements MembershipListener, LifecycleListener {
             }
         }
 
-		@Override
         public void entryRemoved(EntryEvent event) {
             if (event.getValue() == null && ((Collection)event.getOldValue()).isEmpty()) {
                 // Nothing to remove
@@ -500,7 +497,6 @@ public class ClusterListener implements MembershipListener, LifecycleListener {
             return Collections.emptySet();
         }
 
-		@Override
 		public void entryEvicted(EntryEvent event) {
 			entryRemoved(event);
 		}
@@ -511,7 +507,6 @@ public class ClusterListener implements MembershipListener, LifecycleListener {
      */
     private class ComponentCacheListener implements EntryListener {
 
-		@Override
         public void entryAdded(EntryEvent event) {
             Object newValue = event.getValue();
             if (newValue != null) {
@@ -525,7 +520,6 @@ public class ClusterListener implements MembershipListener, LifecycleListener {
             }
         }
 
-		@Override
         public void entryUpdated(EntryEvent event) {
             // Remove any trace to the component that was added/deleted to some node
             String domain = event.getKey().toString();
@@ -538,7 +532,6 @@ public class ClusterListener implements MembershipListener, LifecycleListener {
             entryAdded(event);
         }
 
-		@Override
         public void entryRemoved(EntryEvent event) {
             Object newValue = event.getValue();
             if (newValue != null) {
@@ -552,7 +545,6 @@ public class ClusterListener implements MembershipListener, LifecycleListener {
             }
         }
 
-		@Override
 		public void entryEvicted(EntryEvent event) {
 			entryRemoved(event);
 		}
@@ -615,7 +607,6 @@ public class ClusterListener implements MembershipListener, LifecycleListener {
         done = true;
     }
 
-	@Override
 	public void memberAdded(MembershipEvent event) {
     	// local member only
         if (event.getMember().localMember()) { // We left and re-joined the cluster
@@ -630,7 +621,6 @@ public class ClusterListener implements MembershipListener, LifecycleListener {
         		new HazelcastClusterNodeInfo(event.getMember(), cluster.getClusterTime()));
 	}
 
-	@Override
 	public void memberRemoved(MembershipEvent event) {
         byte[] nodeID = event.getMember().getUuid().getBytes();
 
@@ -667,7 +657,6 @@ public class ClusterListener implements MembershipListener, LifecycleListener {
 		return new ArrayList<ClusterNodeInfo>(clusterNodesInfo.values());
 	}
 
-	@Override
 	public void stateChanged(LifecycleEvent event) {
 		if (event.getState().equals(LifecycleState.SHUTDOWN)) {
 			leaveCluster();

src/plugins/hazelcast/src/java/com/jivesoftware/util/cache/ClusteredCacheFactory.java

@@ -219,7 +219,6 @@ public class ClusteredCacheFactory implements CacheFactoryStrategy {
      * Note that this method does not provide the result set for the given
      * task, as the task is run asynchronously across the cluster.
      */
-    @Override
     public void doClusterTask(final ClusterTask task) {
         Set<Member> members = new TreeSet<Member>();
         Member current = cluster.getLocalMember();
@@ -243,7 +242,6 @@ public class ClusteredCacheFactory implements CacheFactoryStrategy {
      * Note that this method does not provide the result set for the given
      * task, as the task is run asynchronously across the cluster.
      */
-    @Override
     public boolean doClusterTask(final ClusterTask task, byte[] nodeID) {
     	Member target = null;
     	for(Member member: cluster.getMembers()) {
@@ -268,7 +266,6 @@ public class ClusteredCacheFactory implements CacheFactoryStrategy {
      * Note that this method blocks for up to MAX_CLUSTER_EXECUTION_TIME
      * (seconds) until the task is run on all members.
      */
-    @Override
     public Collection<Object> doSynchronousClusterTask(ClusterTask task, boolean includeLocalMember) {
         Set<Member> members = new HashSet<Member>();
         Member current = cluster.getLocalMember();
@@ -303,7 +300,6 @@ public class ClusteredCacheFactory implements CacheFactoryStrategy {
      * Note that this method blocks for up to MAX_CLUSTER_EXECUTION_TIME
      * (seconds) until the task is run on the given member.
      */
-    @Override
     public Object doSynchronousClusterTask(ClusterTask task, byte[] nodeID) {
     	Member target = null;
     	for(Member member: cluster.getMembers()) {
@@ -360,7 +356,6 @@ public class ClusteredCacheFactory implements CacheFactoryStrategy {
         }
     }
 
-	@Override
 	public String getPluginName() {
 		return "hazelcast";
 	}
@@ -414,7 +409,6 @@ public class ClusteredCacheFactory implements CacheFactoryStrategy {
     		this.task = task;
     	}
 
-    	@Override
         public Object call() {
             task.run();
             logger.debug("CallableTask[" + task.getClass().getName() + "] result: " + task.getResult());

src/plugins/hazelcast/src/java/com/jivesoftware/util/cluster/NodeRuntimeStats.java

@@ -75,7 +75,7 @@ public class NodeRuntimeStats {
      */
     public static class NodeInfoTask implements ClusterTask {
     	private Object result = null;
-		@Override
+    	
 		public void run() {
             // Get runtime stats - mem and time:
             Runtime runtime = Runtime.getRuntime();
@@ -87,17 +87,14 @@ public class NodeRuntimeStats {
             result = new NodeInfo(CacheFactory.getClusterMemberID(), free, total, max, time);
 		}
 
-		@Override
 		public void writeExternal(ObjectOutput out) throws IOException {
 			ExternalizableUtil.getInstance().writeSerializable(out, (NodeInfo) result);
 		}
 		
-		@Override
 		public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
 			result = ExternalizableUtil.getInstance().readSerializable(in);
 		}
 
-		@Override
 		public Object getResult() { return result; }
     	
     }