aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/service
diff options
context:
space:
mode:
authorLyubomir Marinov <lyubomir.marinov@jitsi.org>2015-07-20 14:24:04 -0500
committerLyubomir Marinov <lyubomir.marinov@jitsi.org>2015-07-20 17:21:41 -0500
commitc18464caa817f6721b51badd00b7375863e04b61 (patch)
tree12b549c404d468d6e753aa46b895482919699b03 /src/net/java/sip/communicator/service
parent36fa64b302eccf7d322ecd29302de6f96134113a (diff)
downloadjitsi-c18464caa817f6721b51badd00b7375863e04b61.zip
jitsi-c18464caa817f6721b51badd00b7375863e04b61.tar.gz
jitsi-c18464caa817f6721b51badd00b7375863e04b61.tar.bz2
Avoids compiling (certain) classes from .plugin.desktop when compiling classes from .util.
Diffstat (limited to 'src/net/java/sip/communicator/service')
-rw-r--r--src/net/java/sip/communicator/service/gui/UIContact.java2
-rw-r--r--src/net/java/sip/communicator/service/gui/UIGroup.java5
2 files changed, 3 insertions, 4 deletions
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;
}