Avoids compiling (certain) classes from .plugin.desktop when compiling classes from .util.

3 files changed, 11 insertions, 12 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java
index 1baad8d..bfe2fd3 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java
@@ -1143,7 +1143,7 @@ public class ContactListTreeCellRenderer
 
         // The list of the contact actions
         // we will create a button for every action
-        Collection<SIPCommButton> contactActions
+        Collection<? extends JButton> contactActions
             = uiContact.getContactCustomActionButtons();
 
         int lastGridX = gridX;
@@ -1179,7 +1179,7 @@ public class ContactListTreeCellRenderer
 
         // The list of the actions
         // we will create a button for every action
-        Collection<SIPCommButton> contactActions
+        Collection<? extends JButton> contactActions
             = uiGroup.getCustomActionButtons();
 
         int lastGridX = gridX;
@@ -1236,17 +1236,17 @@ public class ContactListTreeCellRenderer
      * @return the new grid X coordinate after adding all the buttons
      */
     private int initGroupActionButtons(
-        Collection<SIPCommButton> contactActionButtons,
+        Collection<? extends JButton> contactActionButtons,
         int gridX,
         int xBounds)
     {
         // Reinit the labels to take the whole horizontal space.
         addLabels(gridX + contactActionButtons.size());
 
-        Iterator<SIPCommButton> actionsIter = contactActionButtons.iterator();
+        Iterator<? extends JButton> actionsIter = contactActionButtons.iterator();
         while (actionsIter.hasNext())
         {
-            final SIPCommButton actionButton = actionsIter.next();
+            final SIPCommButton actionButton = (SIPCommButton) actionsIter.next();
 
             // We need to explicitly remove the buttons from the tooltip manager,
             // because we're going to manager the tooltip ourselves in the
@@ -1276,17 +1276,17 @@ public class ContactListTreeCellRenderer
      * @return the new grid X coordiante after adding all the buttons
      */
     private int initContactActionButtons(
-        Collection<SIPCommButton> contactActionButtons,
+        Collection<? extends JButton> contactActionButtons,
         int gridX,
         int xBounds)
     {
         // Reinit the labels to take the whole horizontal space.
         addLabels(gridX + contactActionButtons.size());
 
-        Iterator<SIPCommButton> actionsIter = contactActionButtons.iterator();
+        Iterator<? extends JButton> actionsIter = contactActionButtons.iterator();
         while (actionsIter.hasNext())
         {
-            final SIPCommButton actionButton = actionsIter.next();
+            final SIPCommButton actionButton = (SIPCommButton) actionsIter.next();
 
             // We need to explicitly remove the buttons from the tooltip manager,
             // because we're going to manager the tooltip ourselves in the
diff --git a/src/net/java/sip/communicator/service/gui/UIContact.java b/src/net/java/sip/communicator/service/gui/UIContact.java
index 3b20de5..cb6cac9 100644
--- a/src/net/java/sip/communicator/service/gui/UIContact.java
+++ b/src/net/java/sip/communicator/service/gui/UIContact.java
@@ -138,7 +138,7 @@ public abstract class UIContact
      *
      * @return a list of all custom action buttons for this notification contact
      */
-    public abstract Collection<SIPCommButton> getContactCustomActionButtons();
+    public abstract Collection<? extends JButton> getContactCustomActionButtons();
 
     /**
      * Returns the preferred height of this group in the contact list.
diff --git a/src/net/java/sip/communicator/service/gui/UIGroup.java b/src/net/java/sip/communicator/service/gui/UIGroup.java
index d19a177..e5caa9c 100644
--- a/src/net/java/sip/communicator/service/gui/UIGroup.java
+++ b/src/net/java/sip/communicator/service/gui/UIGroup.java
@@ -17,10 +17,9 @@
  */
 package net.java.sip.communicator.service.gui;
 
-import net.java.sip.communicator.plugin.desktoputil.*;
-
 import java.awt.*;
 import java.util.*;
+import javax.swing.*;
 
 /**
  * The <tt>UIGroup</tt> represents the user interface contact list group.
@@ -164,7 +163,7 @@ public abstract class UIGroup
      *
      * @return a list of all custom action buttons for this group
      */
-    public Collection<SIPCommButton> getCustomActionButtons()
+    public Collection<? extends JButton> getCustomActionButtons()
     {
         return null;
     }