OF-418 - Original patch had @Override annotations on interface that shouldn't...

OF-418 - Original patch had @Override annotations on interface that shouldn't be there - removed these. Removed unnecessary public abstract declarations on interface.

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

src/java/org/jivesoftware/openfire/roster/DefaultRosterItemProvider.java

@@ -80,7 +80,6 @@ public class DefaultRosterItemProvider implements RosterItemProvider {
     /* (non-Javadoc)
 	 * @see org.jivesoftware.openfire.roster.RosterItemProvider#createItem(java.lang.String, org.jivesoftware.openfire.roster.RosterItem)
 	 */
-    @Override
 	public RosterItem createItem(String username, RosterItem item)
             throws UserAlreadyExistsException
     {
@@ -115,7 +114,6 @@ public class DefaultRosterItemProvider implements RosterItemProvider {
     /* (non-Javadoc)
 	 * @see org.jivesoftware.openfire.roster.RosterItemProvider#updateItem(java.lang.String, org.jivesoftware.openfire.roster.RosterItem)
 	 */
-    @Override
 	public void updateItem(String username, RosterItem item) throws UserNotFoundException {
         Connection con = null;
         PreparedStatement pstmt = null;
@@ -151,7 +149,6 @@ public class DefaultRosterItemProvider implements RosterItemProvider {
     /* (non-Javadoc)
 	 * @see org.jivesoftware.openfire.roster.RosterItemProvider#deleteItem(java.lang.String, long)
 	 */
-    @Override
 	public void deleteItem(String username, long rosterItemID) {
         // Only try to remove the user if they exist in the roster already:
         Connection con = null;
@@ -183,7 +180,6 @@ public class DefaultRosterItemProvider implements RosterItemProvider {
     /* (non-Javadoc)
 	 * @see org.jivesoftware.openfire.roster.RosterItemProvider#getUsernames(java.lang.String)
 	 */
-    @Override
 	public Iterator<String> getUsernames(String jid) {
         List<String> answer = new ArrayList<String>();
         Connection con = null;
@@ -210,7 +206,6 @@ public class DefaultRosterItemProvider implements RosterItemProvider {
     /* (non-Javadoc)
 	 * @see org.jivesoftware.openfire.roster.RosterItemProvider#getItemCount(java.lang.String)
 	 */
-    @Override
 	public int getItemCount(String username) {
         int count = 0;
         Connection con = null;
@@ -237,7 +232,6 @@ public class DefaultRosterItemProvider implements RosterItemProvider {
     /* (non-Javadoc)
 	 * @see org.jivesoftware.openfire.roster.RosterItemProvider#getItems(java.lang.String)
 	 */
-    @Override
 	public Iterator<RosterItem> getItems(String username) {
         LinkedList<RosterItem> itemList = new LinkedList<RosterItem>();
         Map<Long, RosterItem> itemsByID = new HashMap<Long, RosterItem>();

src/java/org/jivesoftware/openfire/roster/RosterItemProvider.java

@@ -22,7 +22,7 @@ public interface RosterItemProvider {
     * @return the new roster item.
     * @throws UserAlreadyExistsException if a roster item with the username already exists.
     */
-    public abstract RosterItem createItem(String username, RosterItem item)
+    RosterItem createItem(String username, RosterItem item)
             throws UserAlreadyExistsException;
 
     /**
@@ -35,7 +35,7 @@ public interface RosterItemProvider {
      * @param item   The roster item to update
      * @throws UserNotFoundException If no entry could be found to update
      */
-    public abstract void updateItem(String username, RosterItem item)
+    void updateItem(String username, RosterItem item)
             throws UserNotFoundException;
 
     /**
@@ -47,7 +47,7 @@ public interface RosterItemProvider {
     * @param username the long ID of the user/chatbot that owns the roster item
     * @param rosterItemID The roster item to delete
     */
-    public abstract void deleteItem(String username, long rosterItemID);
+    void deleteItem(String username, long rosterItemID);
 
     /**
     * Returns an iterator on the usernames whose roster includes the specified JID.
@@ -55,7 +55,7 @@ public interface RosterItemProvider {
     * @param jid the jid that the rosters should include.
     * @return an iterator on the usernames whose roster includes the specified JID.
     */
-    public abstract Iterator<String> getUsernames(String jid);
+    Iterator<String> getUsernames(String jid);
 
     /**
     * Obtain a count of the number of roster items available for the given user.
@@ -63,7 +63,7 @@ public interface RosterItemProvider {
     * @param username the username of the user/chatbot that owns the roster items
     * @return The number of roster items available for the user
     */
-    public abstract int getItemCount(String username);
+    int getItemCount(String username);
 
     /**
     * Retrieve an iterator of RosterItems for the given user.<p>
@@ -75,6 +75,6 @@ public interface RosterItemProvider {
     * @param username the username of the user/chatbot that owns the roster items
     * @return An iterator of all RosterItems owned by the user
 	*/
-	public abstract Iterator<RosterItem> getItems(String username);
+	Iterator<RosterItem> getItems(String username);
 
 }
\ No newline at end of file