Commits patches for the following issues:

#482 Overly complex plugin manager (work in progress)
    #448 Show complete SIP adddress when displaying account
    #510 switch to the latest version of Felix (Richard actually did most of the work here.)
cusax-fix
Emil Ivov 17 years ago
parent 3c848a3f11
commit 3f5206ff01

@ -1665,6 +1665,7 @@ javax.swing.event, javax.swing.border"/>
<attribute name="Export-Package" value="org.apache.log4j"/>
<attribute name="Bundle-Name" value="Apache log4j logging system"/>
<attribute name="Bundle-Description" value="Logging system."/>
<attribute name="System-Bundle" value="yes"/>
</manifest>
</jar>
</target>
@ -1928,6 +1929,7 @@ javax.swing.event, javax.swing.border"/>
<attribute name="Bundle-Name" value="ZRTP4J"/>
<attribute name="Bundle-Description" value="ZRTP for Java library."/>
<attribute name="Bundle-Version" value="1.4.0"/>
<attribute name="System-Bundle" value="yes"/>
</manifest>
</jar>
</target>

Binary file not shown.

@ -1,7 +1,7 @@
#
# Framework config properties.
#
org.osgi.framework.system.packages= org.osgi.framework; ; version=1.3.0, \
org.osgi.framework.system.packages.extra= org.osgi.framework; ; version=1.3.0, \
javax.swing; \
javax.swing.event; \
javax.swing.table; \
@ -74,7 +74,8 @@ felix.auto.start.30= \
felix.auto.start.40= \
reference:file:sc-bundles/configuration.jar \
reference:file:sc-bundles/resourcemanager.jar \
reference:file:sc-bundles/jfontchooserlib.jar
reference:file:sc-bundles/jfontchooserlib.jar \
reference:file:sc-bundles/browserlauncher.jar
felix.auto.start.42= \
reference:file:sc-bundles/defaultresources.jar
@ -88,11 +89,16 @@ felix.auto.start.45= \
felix.auto.start.49= \
reference:file:sc-bundles/zrtp4j.jar \
reference:file:sc-bundles/protocol.jar
reference:file:sc-bundles/protocol.jar
#the contact list service depends on protocol.jar
#some protocol implementations however depend on the contact list
#so make sure load the procotol service first, the contact list next
# and the implementations only after
felix.auto.start.50= \
reference:file:sc-bundles/browserlauncher.jar \
reference:file:sc-bundles/contactlist.jar \
reference:file:sc-bundles/contactlist.jar
felix.auto.start.52= \
reference:file:sc-bundles/media.jar \
reference:file:sc-bundles/protocol-icq.jar \
reference:file:sc-bundles/protocol-sip.jar \
@ -169,9 +175,9 @@ felix.auto.start.80= \
# file:lib/bundle/architectureviewer1.1.jar
#Specify the directory where oscar should deploy its bundles
#felix.cache.profiledir=sip-communicator.bin
felix.cache.profiledir=${net.java.sip.communicator.SC_HOME_DIR_LOCATION}/${net.java.sip.communicator.SC_HOME_DIR_NAME}/sip-communicator.bin
org.osgi.framework.storage=${net.java.sip.communicator.SC_HOME_DIR_LOCATION}/${net.java.sip.communicator.SC_HOME_DIR_NAME}/sip-communicator.bin
org.osgi.framework.startlevel=100
felix.startlevel.framework=100
felix.startlevel.bundle=100
#

Binary file not shown.

@ -128,7 +128,7 @@ felix.auto.start.100= \
reference:file:sc-bundles/slick-runner.jar
#Specify the directory where oscar should deploy its bundles
felix.cache.profiledir=sip-communicator.utest.bin
org.osgi.framework.storage=sip-communicator.utest.bin
felix.startlevel.framework=100
felix.startlevel.bundle=100

@ -2,6 +2,7 @@ Bundle-Name: JFontChooser
Bundle-Description: A library containing a Java Font Chooser
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: javax.swing,
javax.swing.border,
javax.swing.event,

@ -2,6 +2,7 @@ Bundle-Name: Smack Lib Provider
Bundle-Description: Smack Lib Provider
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: javax.net.ssl,
javax.xml.parsers,
javax.xml.transform,

@ -588,8 +588,8 @@
token="org.osgi.framework.system.packages="
value="org.osgi.framework.system.packages= com.growl;"/>
<replaceregexp file="${macosx.resrc.dir}/felix.client.run.properties"
match="^felix.cache.profiledir=\$\{user.home\}/.sip-communicator/sip-communicator.bin"
replace="felix.cache.profiledir=$\{user.home\}/Library/Application Support/${application.name}/sip-communicator.bin"
match="^org.osgi.framework.storage=\$\{user.home\}/.sip-communicator/sip-communicator.bin"
replace="org.osgi.framework.storage=$\{user.home\}/Library/Application Support/${application.name}/sip-communicator.bin"
flags="m"/>
<echo file="${macosx.resrc.dir}/felix.client.run.properties"
append="true">felix.auto.start.80= reference:file:sc-bundles/growlnotification.jar

@ -77,7 +77,7 @@ endif
rm debian/$(PACKAGE_NAME)/usr/lib/sip-communicator/lib/bundle/junit.jar
# Make felix deploy its bundles in ~/.felix/sip-communicator.bin
sed -i -e "s/felix.cache.profiledir=sip-communicator.bin/felix.cache.profile=sip-communicator.bin/" debian/$(PACKAGE_NAME)/usr/lib/sip-communicator/lib/felix.client.run.properties
sed -i -e "s/org.osgi.framework.storage=sip-communicator.bin/felix.cache.profile=sip-communicator.bin/" debian/$(PACKAGE_NAME)/usr/lib/sip-communicator/lib/felix.client.run.properties
# Build i386 files here.

@ -3,6 +3,7 @@ Bundle-Name: Argument Delegation
Bundle-Description: A bundle that delegates invocation arguments to register handler services
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.util,
net.java.sip.communicator.util.launchutils,

@ -3,6 +3,7 @@ Bundle-Name: Audio Notifier
Bundle-Description: An implementation of the AudioNotifier service.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-Package: net.java.sip.communicator.service.audionotifier
Import-Package: org.osgi.framework,
net.java.sip.communicator.util,

@ -3,8 +3,9 @@ Bundle-Name: Browser Launcher
Bundle-Description: An implementation of the BrowserLauncher service.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-Package: net.java.sip.communicator.service.browserlauncher
Import-Package: org.osgi.framework,
net.java.sip.communicator.util,
net.java.sip.communicator.service.browserlauncher,
com.apple.eio
com.apple.eio

@ -3,6 +3,7 @@ Bundle-Name: Call History Service Provider
Bundle-Description: A bundle that implements the call history package.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.fileaccess,
net.java.sip.communicator.service.history,

@ -4,8 +4,6 @@ Bundle-Description: An implementation of the MetaContactList service.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-Package: net.java.sip.communicator.service.contactlist,
net.java.sip.communicator.service.contactlist.event
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.fileaccess,
net.java.sip.communicator.service.configuration,

@ -3,6 +3,7 @@ Bundle-Name: File Access Service Provider
Bundle-Description: A bundle that implements the file access package.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
org.apache.felix.servicebinder,
org.xml.sax,

@ -3,6 +3,7 @@ Bundle-Name: Growl Notification Service Provider
Bundle-Description: A bundle that implements the Growl notification package.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.util,
net.java.sip.communicator.service.protocol,

@ -25,7 +25,7 @@ public class LabelTableCellRenderer extends JLabel
implements TableCellRenderer
{
public LabelTableCellRenderer()
{
{
this.setHorizontalAlignment(JLabel.LEFT);
this.setOpaque(true);
this.setBorder(BorderFactory.createEmptyBorder(0, 8, 0, 0));
@ -43,7 +43,7 @@ public Component getTableCellRendererComponent(JTable table, Object value,
}
else if (value instanceof ProtocolProviderService) {
ProtocolProviderService pps = (ProtocolProviderService)value;
this.setText(pps.getAccountID().getUserID());
this.setText(pps.getAccountID().getDisplayName());
}
else if (value instanceof MetaContactGroup) {
MetaContactGroup group = (MetaContactGroup) value;

@ -122,7 +122,7 @@ private void accountsInit()
/**
* Handles the <tt>ActionEvent</tt> triggered when user clicks on on the
* buttons. Shows the account registration wizard when user clicks on "New".
*
*
* @param evt the action event that has just occurred.
*/
public void actionPerformed(ActionEvent evt)
@ -147,7 +147,7 @@ else if (sourceButton.equals(saveButton))
* Implements the <tt>ServiceListener</tt> method. Verifies whether the
* passed event concerns a <tt>ProtocolProviderService</tt> and adds the
* corresponding UI controls.
*
*
* @param event The <tt>ServiceEvent</tt> object.
*/
public void serviceChanged(ServiceEvent event)
@ -241,7 +241,7 @@ public AccountPanel(ProtocolProviderService protocolProvider)
this.add(protocolLabel, constraints);
this.accountLabel.setText(protocolProvider.getAccountID()
.getUserID());
.getDisplayName());
constraints.insets = new Insets(0, 0, 0, 0);
constraints.gridx = 1;
constraints.gridy = 0;

@ -1,6 +1,6 @@
/*
* SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
*
*
* Distributable under LGPL license. See terms of license at gnu.org.
*/
package net.java.sip.communicator.impl.gui.main.call;
@ -25,9 +25,9 @@
* support telephony operation set and is meant to be used by user to select the
* account, which he/she would like to use when calling. The selected account
* could be changed at any time.
*
*
* By default the most connected account is selected.
*
*
* @author Yana Stamcheva
*/
public class AccountSelectorBox
@ -63,15 +63,15 @@ public AccountSelectorBox(MainCallPanel parentPanel)
/**
* Adds an account to this account selector box. The account is represented
* by its protocol provider.
*
*
* @param pps the protocol provider for the added account
*/
public void addAccount(ProtocolProviderService pps)
{
Image img = createAccountStatusImage(pps);
JMenuItem menuItem =
new JMenuItem(pps.getAccountID().getUserID(), new ImageIcon(img));
JMenuItem menuItem = new JMenuItem(pps.getAccountID().getDisplayName(),
new ImageIcon(img));
menuItem.addActionListener(this);
this.accountsTable.put(pps, menuItem);
@ -131,7 +131,7 @@ public void actionPerformed(ActionEvent e)
/**
* Obtains the status icon for the given protocol contact and adds to it the
* account index information.
*
*
* @param pps the protocol provider for which to create the image
* @return the indexed status image
*/
@ -190,7 +190,7 @@ public Image createAccountStatusImage(ProtocolProviderService pps)
/**
* Updates the protocol account status.
*
*
* @param pps the protocol provider service to update
*/
public void updateAccountStatus(ProtocolProviderService pps)
@ -236,14 +236,14 @@ public void setSelected(ProtocolProviderService pps, ImageIcon icon)
this.selectedProvider = pps;
this.menu.setSelected(new SelectedObject(icon, pps));
this.menu.setToolTipText(pps.getAccountID().getUserID());
this.menu.setToolTipText(pps.getAccountID().getDisplayName());
this.parentCallPanel.setCallProvider(pps);
}
/**
* Sets the selected contact to the given proto contact.
*
*
* @param pps the protocol provider to select
*/
public void setSelected(ProtocolProviderService pps)
@ -253,7 +253,7 @@ public void setSelected(ProtocolProviderService pps)
/**
* Returns the protocol menu.
*
*
* @return the protocol menu
*/
public SIPCommMenu getMenu()
@ -264,7 +264,7 @@ public SIPCommMenu getMenu()
/**
* Returns TRUE if the account corresponding to the given protocol provider
* is already contained in this selector box, otherwise returns FALSE.
*
*
* @param pps the protocol provider service for the account
* @return TRUE if the account corresponding to the given protocol provider
* is already contained in this selector box, otherwise returns
@ -277,7 +277,7 @@ public boolean containsAccount(ProtocolProviderService pps)
/**
* Returns the number of accounts contained in this account selector box.
*
*
* @return the number of accounts contained in this account selector box
*/
public int getAccountsNumber()
@ -287,7 +287,7 @@ public int getAccountsNumber()
/**
* Removes the given account from this account selector box.
*
*
* @param pps the protocol provider service corresponding to the account to
* remove
*/
@ -305,7 +305,7 @@ public void removeAccount(ProtocolProviderService pps)
/**
* Returns the first registered protocol provider.
*
*
* @return the first registered protocol provider.
*/
private ProtocolProviderService findFirstRegisteredProvider()

@ -30,7 +30,7 @@
/**
* The <tt>ConferenceChatManager</tt> is the one that manages chat room
* invitations.
*
*
* @author Yana Stamcheva
*/
public class ConferenceChatManager
@ -52,7 +52,7 @@ public class ConferenceChatManager
/**
* Creates an instance of <tt>ConferenceChatManager</tt>, by passing to it
* the main application window object.
*
*
* @param mainFrame the main application window
*/
public ConferenceChatManager()
@ -401,7 +401,7 @@ else if (evt.getEventType().equals(
/**
* Called to accept an incoming invitation. Adds the invitation chat room
* to the list of chat rooms and joins it.
*
*
* @param invitation the invitation to accept.
*/
public void acceptInvitation(ChatRoomInvitation invitation)
@ -417,7 +417,7 @@ public void acceptInvitation(ChatRoomInvitation invitation)
/**
* Rejects the given invitation with the specified reason.
*
*
* @param multiUserChatOpSet the operation set to use for rejecting the
* invitation
* @param invitation the invitation to reject
@ -429,11 +429,11 @@ public void rejectInvitation( OperationSetMultiUserChat multiUserChatOpSet,
{
multiUserChatOpSet.rejectInvitation(invitation, reason);
}
/**
* Joins the given chat room with the given password and manages all the
* exceptions that could occur during the join process.
*
*
* @param chatRoomWrapper the chat room to join.
* @param nickMame the nickname we choose for the given chat room.
* @param password the password.
@ -529,7 +529,7 @@ public ChatRoomWrapper createChatRoom(
}
/**
*
*
* @param chatRoomWrapper
* @param chatRoom
*/
@ -553,7 +553,7 @@ public void joinChatRoom(ChatRoomWrapper chatRoomWrapper)
/**
* Removes the given chat room from the UI.
*
*
* @param chatRoomWrapper the chat room to remove.
*/
public void removeChatRoom(ChatRoomWrapper chatRoomWrapper)
@ -572,7 +572,7 @@ public void removeChatRoom(ChatRoomWrapper chatRoomWrapper)
/**
* Joins the given chat room and manages all the exceptions that could
* occur during the join process.
*
*
* @param chatRoom the chat room to join
*/
public void joinChatRoom(ChatRoom chatRoom)
@ -601,7 +601,7 @@ public void joinChatRoom(ChatRoom chatRoom)
/**
* Joins the given chat room and manages all the exceptions that could
* occur during the join process.
*
*
* @param chatRoom the chat room to join
*/
public void joinChatRoom( ChatRoom chatRoom,
@ -631,7 +631,7 @@ public void joinChatRoom( ChatRoom chatRoom,
/**
* Joins the room with the given name though the given chat room provider.
*
*
* @param chatRoomName the name of the room to join.
* @param chatRoomProvider the chat room provider to join through.
*/
@ -673,7 +673,7 @@ public void joinChatRoom( String chatRoomName,
/**
* Leaves the given <tt>ChatRoom</tt>.
*
*
* @param chatRoom the <tt>ChatRoom</tt> to leave.
*/
public void leaveChatRoom(ChatRoomWrapper chatRoomWrapper)
@ -737,7 +737,7 @@ public List<String> getExistingChatRooms(
/**
* Checks if there's an open history window for the given chat room.
*
*
* @param chatRoomWrapper the chat room wrapper to check for
* @return TRUE if there's an opened history window for the given chat room,
* FALSE otherwise.
@ -750,7 +750,7 @@ public boolean containsHistoryWindowForChatRoom(
/**
* Returns the history window for the given chat room.
*
*
* @param chatRoomWrapper the chat room wrapper to search for
* @return the history window for the given chat room
*/
@ -763,7 +763,7 @@ public HistoryWindow getHistoryWindowForChatRoom(
/**
* Adds a history window for a given chat room in the table of opened
* history windows.
*
*
* @param chatRoomWrapper the chat room wrapper to add
* @param historyWindow the history window to add
*/
@ -775,7 +775,7 @@ public void addHistoryWindowForChatRoom(ChatRoomWrapper chatRoomWrapper,
/**
* Removes the history window for the given chat room.
*
*
* @param chatRoomWrapper the chat room wrapper to remove the history window
*/
public void removeHistoryWindowForChatRoom(ChatRoomWrapper chatRoomWrapper)
@ -786,7 +786,7 @@ public void removeHistoryWindowForChatRoom(ChatRoomWrapper chatRoomWrapper)
/**
* Adds the given <tt>ChatRoomListChangeListener</tt> that will listen for
* all changes of the chat room list data model.
*
*
* @param l the listener to add.
*/
public void addChatRoomListChangeListener(ChatRoomListChangeListener l)
@ -799,7 +799,7 @@ public void addChatRoomListChangeListener(ChatRoomListChangeListener l)
/**
* Removes the given <tt>ChatRoomListChangeListener</tt>.
*
*
* @param l the listener to remove.
*/
public void removeChatRoomListChangeListener(ChatRoomListChangeListener l)
@ -829,7 +829,7 @@ private void fireChatRoomListChanedEvent( ChatRoomWrapper chatRoomWrapper,
/**
* Closes the chat corresponding to the given chat room wrapper, if such
* exists.
*
*
* @param chatRoomWrapper the chat room wrapper for which we search a chat
* to close.
*/
@ -858,7 +858,7 @@ public void run()
* Handles <tt>ServiceEvent</tt>s triggered by adding or removing a
* ProtocolProviderService. Updates the list of available chat rooms and
* chat room servers.
*
*
* @param event The event to handle.
*/
public void serviceChanged(ServiceEvent event)
@ -916,7 +916,7 @@ private class JoinChatRoomTask extends SwingWorker<String, Object>
{
private static final String SUCCESS = "Success";
private static final String AUTHENTICATION_FAILED
private static final String AUTHENTICATION_FAILED
= "AuthenticationFailed";
private static final String REGISTRATION_REQUIRED
@ -972,7 +972,7 @@ else if (nickName != null)
if(e.getErrorCode()
== OperationFailedException.AUTHENTICATION_FAILED)
{
{
return AUTHENTICATION_FAILED;
}
else if(e.getErrorCode()

@ -44,7 +44,7 @@ public class ContactRightButtonMenu
ContactListListener
{
private Logger logger = Logger.getLogger(ContactRightButtonMenu.class);
private static final String allContactsString
= GuiActivator.getResources().getI18NString("service.gui.ALL_CONTACTS");
@ -186,7 +186,7 @@ private void init()
//Initialize the addSubcontact menu.
Iterator providers = mainFrame.getProtocolProviders();
if(providers.hasNext())
if(providers.hasNext())
{
JLabel infoLabel = new JLabel(
GuiActivator.getResources()
@ -199,7 +199,7 @@ private void init()
this.addSubcontactMenu.addSeparator();
}
while (providers.hasNext())
while (providers.hasNext())
{
ProtocolProviderService pps
= (ProtocolProviderService)providers.next();
@ -207,7 +207,7 @@ private void init()
String protocolName = pps.getProtocolName();
JMenuItem menuItem = new JMenuItem(pps.getAccountID()
.getUserID(),
.getDisplayName(),
new ImageIcon(createAccountStatusImage(pps)));
menuItem.setName(addSubcontactPrefix + protocolName);
@ -219,7 +219,7 @@ private void init()
//Initialize moveTo menu.
Iterator groups = this.mainFrame.getAllGroups();
if(groups.hasNext())
if(groups.hasNext())
{
JLabel infoLabel = new JLabel(
GuiActivator.getResources()
@ -232,7 +232,7 @@ private void init()
this.moveToMenu.addSeparator();
}
while (groups.hasNext())
while (groups.hasNext())
{
MetaContactGroup group = (MetaContactGroup)groups.next();
@ -247,7 +247,7 @@ private void init()
//Initialize removeContact menu.
Iterator contacts = contactItem.getContacts();
if (contactItem.getContactCount() > 1)
if (contactItem.getContactCount() > 1)
{
JMenuItem allItem = new JMenuItem(allContactsString);
JMenuItem allItem1 = new JMenuItem(allContactsString);
@ -264,43 +264,43 @@ private void init()
this.moveSubcontactMenu.addSeparator();
}
while (contacts.hasNext())
while (contacts.hasNext())
{
Contact contact = (Contact)contacts.next();
ProtocolProviderService protocolProvider
= contact.getProtocolProvider();
String contactDisplayName = contact.getDisplayName();
JMenuItem contactItem = new JMenuItem(contactDisplayName);
JMenuItem contactItem1 = new JMenuItem(contactDisplayName);
Icon protocolIcon = new ImageIcon(
createContactStatusImage(contact));
contactItem.setIcon(protocolIcon);
contactItem1.setIcon(protocolIcon);
contactItem.setName(removeContactPrefix + contact.getAddress()
+ protocolProvider.getProtocolName());
contactItem1.setName(moveSubcontactPrefix + contact.getAddress()
+ protocolProvider.getProtocolName());
contactItem.addActionListener(this);
contactItem1.addActionListener(this);
this.removeContactMenu.add(contactItem);
this.moveSubcontactMenu.add(contactItem1);
// add all the contacts that support telephony to the call menu
if (contact.getProtocolProvider().getOperationSet(
OperationSetBasicTelephony.class) != null)
{
JMenuItem callContactItem = new JMenuItem(contactDisplayName);
callContactItem.setIcon(protocolIcon);
callContactItem.setName(callContactPrefix + contact.getAddress()
callContactItem.setName(callContactPrefix + contact.getAddress()
+ protocolProvider.getProtocolName());
callContactItem.addActionListener(this);
this.callContactMenu.add(callContactItem);
@ -312,7 +312,7 @@ private void init()
this.add(sendMessageItem);
this.add(sendSmsItem);
if (callContactMenu.getItemCount() > 1)
if (callContactMenu.getItemCount() > 1)
{
this.add(callContactMenu);
}
@ -339,7 +339,7 @@ private void init()
this.addSeparator();
this.add(viewHistoryItem);
this.initPluginComponents();
this.sendMessageItem.setName("sendMessage");
@ -407,8 +407,8 @@ private void initPluginComponents()
PluginComponent component = (PluginComponent) GuiActivator
.bundleContext.getService(serRefs[i]);;
component.setCurrentContact(contactItem);
component.setCurrentContact(contactItem);
if (component.getComponent() == null)
continue;
@ -427,7 +427,7 @@ private void initMnemonics()
this.sendMessageItem.setMnemonic(
GuiActivator.getResources()
.getI18nMnemonic("service.gui.SEND_MESSAGE"));
if (callContactMenu.getItemCount() > 1)
if (callContactMenu.getItemCount() > 1)
{
this.callContactMenu.setMnemonic(GuiActivator.getResources()
.getI18nMnemonic("service.gui.CALL"));
@ -526,7 +526,7 @@ else if (itemName.equalsIgnoreCase("renameContact"))
);
dialog.setVisible(true);
dialog.requestFocusInFiled();
}
else if (itemName.equalsIgnoreCase("viewHistory"))
@ -565,7 +565,7 @@ else if (itemName.startsWith(moveToPrefix))
try
{
if(group != null)
if(group != null)
{
mainFrame.getContactList().
moveMetaContact(contactItem, group);
@ -622,16 +622,16 @@ else if (itemName.startsWith(callContactPrefix))
{
cont = getContactFromMetaContact(
itemName.substring(callContactPrefix.length()));
callContact(cont);
}
}
/**
* Calls the given contact
* Calls the given contact
* @param contact the contact to call
*/
private void callContact(Contact contact)
private void callContact(Contact contact)
{
if (contact != null)
{
@ -671,7 +671,7 @@ private Contact getContactFromMetaContact(String itemID)
}
return null;
}
/**
* Removes a contact from a meta contact in a separate thread.
*/
@ -703,11 +703,11 @@ public void run()
int returnCode = dialog.showDialog();
if (returnCode == MessageDialog.OK_RETURN_CODE)
if (returnCode == MessageDialog.OK_RETURN_CODE)
{
mainFrame.getContactList().removeContact(contact);
}
else if (returnCode == MessageDialog.OK_DONT_ASK_CODE)
else if (returnCode == MessageDialog.OK_DONT_ASK_CODE)
{
mainFrame.getContactList().removeContact(contact);
@ -729,13 +729,13 @@ else if (returnCode == MessageDialog.OK_DONT_ASK_CODE)
}
}
}
/**
* Removes a contact from a meta contact in a separate thread.
*/
private class RemoveAllContactsThread extends Thread
{
public void run()
public void run()
{
if(Constants.REMOVE_CONTACT_ASK)
{
@ -810,18 +810,18 @@ public void protocolContactClicked(ContactListEvent evt)
{
this.moveContact(evt.getSourceContact());
}
/**
* Moves the previously chosen sub-contact in the given toMetaContact.
*
*
* @param toMetaContact the MetaContact, where to move the previously
* chosen sub-contact.
*/
private void moveContact(MetaContact toMetaContact)
{
{
this.moveDialog.dispose();
if(toMetaContact.equals(contactItem))
if(toMetaContact.equals(contactItem))
{
new ErrorDialog(this.mainFrame,
GuiActivator.getResources()
@ -833,21 +833,21 @@ private void moveContact(MetaContact toMetaContact)
}
else {
guiContactList.removeExcContactListListener(this);
guiContactList.setCursor(
Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
if(moveAllContacts)
if(moveAllContacts)
{
new MoveAllSubcontactsThread(toMetaContact).start();
}
else if(contactToMove != null)
else if(contactToMove != null)
{
new MoveSubcontactThread(toMetaContact).start();
}
}
}
/**
* Moves the previously chosen contact in the given meta group or meta
* contact.
@ -870,7 +870,7 @@ public MoveSubcontactThread(MetaContactGroup metaGroup)
public void run()
{
if(metaContact != null)
if(metaContact != null)
{
mainFrame.getContactList()
.moveContact(contactToMove, metaContact);
@ -889,17 +889,17 @@ public void run()
private class MoveAllSubcontactsThread extends Thread
{
private MetaContact metaContact;
public MoveAllSubcontactsThread(MetaContact metaContact)
{
this.metaContact = metaContact;
}
public void run()
{
Iterator i = contactItem.getContacts();
while(i.hasNext())
while(i.hasNext())
{
Contact contact = (Contact) i.next();
mainFrame.getContactList()
@ -942,14 +942,14 @@ public void pluginComponentAdded(PluginComponentEvent event)
public void pluginComponentRemoved(PluginComponentEvent event)
{
PluginComponent c = event.getPluginComponent();
if(c.getContainer()
.equals(Container.CONTAINER_CONTACT_RIGHT_BUTTON_MENU))
{
this.remove((Component) c.getComponent());
}
}
/**
* Obtains the status icon for the given protocol contact and
* adds to it the account index information.
@ -957,17 +957,17 @@ public void pluginComponentRemoved(PluginComponentEvent event)
* @return the indexed status image
*/
public Image createAccountStatusImage(ProtocolProviderService pps)
{
{
Image statusImage;
OperationSetPresence presence
= this.mainFrame.getProtocolPresenceOpSet(pps);
if(presence != null)
{
statusImage = ImageLoader.getBytesInImage(
presence.getPresenceStatus().getStatusIcon());
presence.getPresenceStatus().getStatusIcon());
}
else if (pps.isRegistered())
{
@ -985,7 +985,7 @@ else if (pps.isRegistered())
int index = mainFrame.getProviderIndex(pps);
Image img = null;
if(index > 0)
if(index > 0)
{
BufferedImage buffImage = new BufferedImage(
22, 16, BufferedImage.TYPE_INT_ARGB);
@ -1008,7 +1008,7 @@ else if (pps.isRegistered())
}
return img;
}
/**
* Obtains the status icon for the given protocol contact and
* adds to it the account index information.
@ -1024,7 +1024,7 @@ public Image createContactStatusImage(Contact protoContact)
protoContact.getProtocolProvider());
Image img = null;
if(index > 0)
if(index > 0)
{
BufferedImage buffImage = new BufferedImage(
22, 16, BufferedImage.TYPE_INT_ARGB);

@ -33,7 +33,7 @@
* The GroupRightButtonMenu is the menu, opened when user clicks with the
* right mouse button on a group in the contact list. Through this menu the
* user could add a contact to a group.
*
*
* @author Yana Stamcheva
*/
public class GroupRightButtonMenu
@ -45,83 +45,83 @@ public class GroupRightButtonMenu
private SIPCommMenu addContactMenu = new SIPCommMenu(
GuiActivator.getResources().getI18NString("service.gui.ADD_CONTACT"));
private JMenuItem removeGroupItem = new JMenuItem(
GuiActivator.getResources().getI18NString("service.gui.REMOVE_GROUP"),
new ImageIcon(ImageLoader.getImage(ImageLoader.DELETE_16x16_ICON)));
private JMenuItem renameGroupItem = new JMenuItem(
GuiActivator.getResources().getI18NString("service.gui.RENAME_GROUP"),
new ImageIcon(ImageLoader.getImage(ImageLoader.RENAME_16x16_ICON)));
private MetaContactGroup group;
private MainFrame mainFrame;
/**
* Creates an instance of GroupRightButtonMenu.
*
* @param mainFrame The parent <tt>MainFrame</tt> window.
*
* @param mainFrame The parent <tt>MainFrame</tt> window.
* @param group The <tt>MetaContactGroup</tt> for which the menu is opened.
*/
public GroupRightButtonMenu(MainFrame mainFrame,
MetaContactGroup group) {
this.group = group;
this.mainFrame = mainFrame;
this.addContactMenu.setIcon(new ImageIcon(ImageLoader
.getImage(ImageLoader.ADD_CONTACT_16x16_ICON)));
this.add(addContactMenu);
Iterator providers = mainFrame.getProtocolProviders();
while(providers.hasNext()) {
ProtocolProviderService pps
ProtocolProviderService pps
= (ProtocolProviderService)providers.next();
boolean isHidden =
boolean isHidden =
pps.getAccountID().getAccountProperties().
get(ProtocolProviderFactory.IS_PROTOCOL_HIDDEN) != null;
if(isHidden)
continue;
String protocolName = pps.getProtocolName();
AccountMenuItem menuItem = new AccountMenuItem(pps,
new ImageIcon(createAccountStatusImage(pps)));
menuItem.setName(protocolName);
menuItem.addActionListener(this);
this.addContactMenu.add(menuItem);
}
this.addSeparator();
this.add(renameGroupItem);
this.add(removeGroupItem);
this.renameGroupItem.setName("renameGroup");
this.removeGroupItem.setName("removeGroup");
this.addContactMenu.setMnemonic(GuiActivator.getResources()
.getI18nMnemonic("service.gui.ADD_CONTACT"));
this.renameGroupItem.setMnemonic(GuiActivator.getResources()
.getI18nMnemonic("service.gui.RENAME_GROUP"));
this.removeGroupItem.setMnemonic(GuiActivator.getResources()
.getI18nMnemonic("service.gui.REMOVE_GROUP"));
this.renameGroupItem.addActionListener(this);
this.removeGroupItem.addActionListener(this);
this.initPluginComponents();
}
private void initPluginComponents()
{
// Search for plugin components registered through the OSGI bundle
@ -160,7 +160,7 @@ private void initPluginComponents()
GuiActivator.getUIService().addPluginComponentListener(this);
}
/**
* Handles the <tt>ActionEvent</tt>. The choosen menu item should correspond
* to an account, where the new contact will be added. We obtain here the
@ -171,15 +171,15 @@ public void actionPerformed(ActionEvent e) {
JMenuItem item = (JMenuItem)e.getSource();
String itemText = item.getText();
String itemName = item.getName();
if(itemName.equals("removeGroup"))
{
if(group != null)
{
if(group != null)
new RemoveGroupThread(group).start();
}
else if(itemName.equals("service.gui.RENAME_GROUP"))
{
RenameGroupDialog dialog = new RenameGroupDialog(
mainFrame, group);
@ -191,35 +191,35 @@ else if(itemName.equals("service.gui.RENAME_GROUP"))
);
dialog.setVisible(true);
dialog.requestFocusInFiled();
}
else if(item instanceof AccountMenuItem)
{
ProtocolProviderService pps
ProtocolProviderService pps
= ((AccountMenuItem)item).getProtocolProvider();
AddContactDialog dialog = new AddContactDialog(
mainFrame, group, pps);
dialog.setLocation(
Toolkit.getDefaultToolkit().getScreenSize().width/2
Toolkit.getDefaultToolkit().getScreenSize().width/2
- 250,
Toolkit.getDefaultToolkit().getScreenSize().height/2
Toolkit.getDefaultToolkit().getScreenSize().height/2
- 100
);
dialog.showDialog();
}
}
/**
* Removes a group from the contact list in a separate thread.
*/
private class RemoveGroupThread extends Thread
{
private MetaContactGroup group;
public RemoveGroupThread(MetaContactGroup group) {
this.group = group;
}
@ -294,7 +294,7 @@ public void pluginComponentRemoved(PluginComponentEvent event)
this.remove((Component) c.getComponent());
}
}
/**
* Obtains the status icon for the given protocol contact and
* adds to it the account index information.
@ -302,17 +302,17 @@ public void pluginComponentRemoved(PluginComponentEvent event)
* @return the indexed status image
*/
public Image createAccountStatusImage(ProtocolProviderService pps)
{
{
Image statusImage;
OperationSetPresence presence
= this.mainFrame.getProtocolPresenceOpSet(pps);
if(presence != null)
{
statusImage = ImageLoader.getBytesInImage(
presence.getPresenceStatus().getStatusIcon());
presence.getPresenceStatus().getStatusIcon());
}
else if (pps.isRegistered())
{
@ -326,7 +326,7 @@ else if (pps.isRegistered())
ImageLoader.getBytesInImage(pps.getProtocolIcon()
.getIcon(ProtocolIcon.ICON_SIZE_16x16)));
}
int index = mainFrame.getProviderIndex(pps);
Image img = null;
@ -352,7 +352,7 @@ else if (pps.isRegistered())
}
return img;
}
/**
* The <tt>AccountMenuItem</tt> is a <tt>JMenuItem</tt> that stores a
* <tt>ProtocolProviderService</tt> in it.
@ -360,14 +360,14 @@ else if (pps.isRegistered())
private class AccountMenuItem extends JMenuItem
{
private ProtocolProviderService pps;
public AccountMenuItem(ProtocolProviderService pps, Icon icon)
{
super(pps.getAccountID().getUserID(), icon);
super(pps.getAccountID().getDisplayName(), icon);
this.pps = pps;
}
public ProtocolProviderService getProtocolProvider()
{
return pps;

@ -1,6 +1,6 @@
/*
* SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
*
*
* Distributable under LGPL license. See terms of license at gnu.org.
*/
package net.java.sip.communicator.impl.gui.main.presence;
@ -24,7 +24,7 @@
* The <tt>StatusSelectorBox</tt> is a <tt>SIPCommMenu</tt> that contains
* the list of statuses for a protocol provider. This is where the user could
* select its status.
*
*
* @author Yana Stamcheva
*/
public class PresenceStatusMenu
@ -52,7 +52,7 @@ public class PresenceStatusMenu
/**
* Creates an instance of <tt>StatusSelectorBox</tt> and initializes the
* selector box with data.
*
*
* @param mainFrame The main application window.
* @param protocolProvider The protocol provider.
* @param accountIndex If we have more than one account for a protocol, each
@ -61,7 +61,7 @@ public class PresenceStatusMenu
public PresenceStatusMenu( MainFrame mainFrame,
ProtocolProviderService protocolProvider)
{
super(protocolProvider.getAccountID().getUserID(),
super(protocolProvider.getAccountID().getDisplayName(),
new ImageIcon(protocolProvider
.getProtocolIcon().getIcon(ProtocolIcon.ICON_SIZE_16x16)));
@ -76,12 +76,12 @@ public PresenceStatusMenu( MainFrame mainFrame,
this.statusIterator = this.presence.getSupportedStatusSet();
String tooltip =
"<html><b>" + protocolProvider.getAccountID().getUserID()
"<html><b>" + protocolProvider.getAccountID().getDisplayName()
+ "</b><br>Connecting</html>";
this.setToolTipText(tooltip);
titleLabel = new JLabel(protocolProvider.getAccountID().getUserID());
titleLabel = new JLabel(protocolProvider.getAccountID().getDisplayName());
titleLabel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
titleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD));
@ -222,7 +222,7 @@ public void updateStatus(Object presenceStatus)
/**
* Selects the given status in the status menu.
*
*
* @param status the status to select
*/
public void setSelectedStatus(PresenceStatus status)
@ -244,7 +244,7 @@ public void setSelectedStatus(PresenceStatus status)
/**
* Returns the Offline status in this selector box.
*
*
* @return the Offline status in this selector box
*/
public PresenceStatus getOfflineStatus()
@ -254,7 +254,7 @@ public PresenceStatus getOfflineStatus()
/**
* Returns the Online status in this selector box.
*
*
* @return the Online status in this selector box
*/
public PresenceStatus getOnlineStatus()
@ -264,7 +264,7 @@ public PresenceStatus getOnlineStatus()
/**
* Returns the status that is currently selected.
*
*
* @return the status that is currently selected
*/
public PresenceStatus getLastSelectedStatus()

@ -61,7 +61,7 @@ public class SimpleStatusMenu
public SimpleStatusMenu(MainFrame mainFrame,
ProtocolProviderService protocolProvider)
{
super(protocolProvider.getAccountID().getUserID(),
super(protocolProvider.getAccountID().getDisplayName(),
new ImageIcon(protocolProvider
.getProtocolIcon().getIcon(ProtocolIcon.ICON_SIZE_16x16)));
@ -78,7 +78,7 @@ public SimpleStatusMenu(MainFrame mainFrame,
.getIcon(ProtocolIcon.ICON_SIZE_16x16))));
String tooltip = "<html><b>"
+ protocolProvider.getAccountID().getUserID()
+ protocolProvider.getAccountID().getDisplayName()
+ "</b><br>Offline</html>";
this.setToolTipText(tooltip);
@ -89,7 +89,8 @@ public SimpleStatusMenu(MainFrame mainFrame,
onlineItem.addActionListener(this);
offlineItem.addActionListener(this);
titleLabel = new JLabel(protocolProvider.getAccountID().getUserID());
titleLabel = new JLabel(protocolProvider
.getAccountID().getDisplayName());
titleLabel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
titleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD));

@ -3,6 +3,7 @@ Bundle-Name: UI Service Provider Implementation
Bundle-Description: An implementation of the UI service.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.audionotifier,
net.java.sip.communicator.service.browserlauncher,

@ -3,6 +3,7 @@ Bundle-Name: History Service Provider
Bundle-Description: A bundle that implements the history package.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
org.apache.felix.servicebinder,
net.java.sip.communicator.service.configuration,

@ -3,9 +3,10 @@ Bundle-Name: Keybindings
Bundle-Description: Provides management and persistence of keyboard shortcuts.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.util,
net.java.sip.communicator.service.fileaccess,
net.java.sip.communicator.service.gui,
javax.swing
Export-Package: net.java.sip.communicator.service.keybindings
Export-Package: net.java.sip.communicator.service.keybindings

@ -3,6 +3,7 @@ Bundle-Name: Media Service Implementation
Bundle-Description: A bundle that offers Media capture and presentation capabilities.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
org.bouncycastle.jce.provider,
org.xml.sax,

@ -3,6 +3,7 @@ Bundle-Name: Message History Service Provider
Bundle-Description: A bundle that implements the message history package.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.configuration,
net.java.sip.communicator.service.resources,

@ -3,6 +3,7 @@ Bundle-Name: Network address managment service
Bundle-Description: A bundle that provide a gesture of the ip addresses. prospere est le toi du pain d'epice
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: net.java.sip.communicator.service.configuration,
net.java.sip.communicator.service.configuration.event,
net.java.sip.communicator.util,

@ -3,6 +3,7 @@ Bundle-Name: Notifications
Bundle-Description: An implementation of the Notification service.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-Package: net.java.sip.communicator.service.notification,
net.java.sip.communicator.service.notification.event
Import-Package: org.osgi.framework,

@ -3,6 +3,7 @@ Bundle-Name: Dict Protocol Provider
Bundle-Description: A bundle providing support for the Dict protocol.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 1.0.0
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.contactlist,
net.java.sip.communicator.service.configuration,

@ -3,6 +3,7 @@ Bundle-Name: Gibberish Protocol Provider
Bundle-Description: A bundle providing support for the Gibberish protocol.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.resources,
net.java.sip.communicator.service.configuration,

@ -3,6 +3,7 @@ Bundle-Name: ICQ Protocol Provider Implementation
Bundle-Description: An ICQ/AIM implementation of the Protocol Provider Service.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
javax.net,
sun.misc,

@ -3,10 +3,11 @@ Bundle-Name: Irc Protocol Provider
Bundle-Description: A bundle providing support for the Irc protocol.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.configuration,
net.java.sip.communicator.service.configuration.event,
net.java.sip.communicator.service.resources,
net.java.sip.communicator.util,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.event
net.java.sip.communicator.service.protocol.event

@ -3,6 +3,7 @@ Bundle-Name: Jabber Protocol Provider Implementation
Bundle-Description: An Jabber implementation of the Protocol Provider Service.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
org.jivesoftware.smack,
org.jivesoftware.smack.packet,
@ -31,4 +32,4 @@ Import-Package: org.osgi.framework,
org.xmlpull.v1,
org.xmlpull.mxp1,
javax.xml.parsers,
org.w3c.dom
org.w3c.dom

@ -2,6 +2,7 @@ Bundle-Name: MockProvider
Bundle-Description: Mock provider service.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: net.java.sip.communicator.service.contactlist,
net.java.sip.communicator.service.contactlist.event,
org.osgi.framework,

@ -3,6 +3,7 @@ Bundle-Name: Msn Protocol Provider Implementation
Bundle-Description: An Msn implementation of the Protocol Provider Service.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
javax.net.ssl,
javax.swing,

@ -3,6 +3,7 @@ Bundle-Name: Rss Protocol Provider
Bundle-Description: A bundle providing support for the Rss protocol.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
org.apache.log4j,
org.xml.sax,

@ -25,7 +25,7 @@ private static String getUserIDWithoutServerName(String userID)
/**
* Creates a SIP account id from the specified ide and account properties.
*
*
* @param userID the user id part of the SIP uri identifying this contact.
* @param accountProperties any other properties necessary for the account.
* @param serverName the name of the server that the user belongs to.
@ -67,7 +67,7 @@ public String getAccountAddress()
/**
* Adds a property to the map of properties for this account identifier.
*
*
* @param key the key of the property
* @param value the property value
*/
@ -75,4 +75,38 @@ public void putProperty(Object key, Object value)
{
accountProperties.put(key, value);
}
/**
* The reason we need to override this method here comes from the fact
* that the user id that is standardly returned by the parent method
* is not sufficient for the user to distinguish this account from other
* sip accounts with the same user name. Besides we also need to handle
* the case of registrar-less accounts.
*
* @return A String that can be showed to users when referring to this
* account.
*/
public String getDisplayName()
{
String returnValue = getUserID();
String protocolName = (String)getAccountProperties()
.get(ProtocolProviderFactory.PROTOCOL);
String service = getService();
if (service == null || service.trim().length() == 0)
{
// this is apparently a no registrar account
protocolName = "RegistrarLess " + protocolName;
}
else
{
returnValue += "@" + service;
}
if (protocolName != null && protocolName.trim().length() > 0)
returnValue += " (" + protocolName + ")";
return returnValue;
}
}

@ -3,6 +3,7 @@ Bundle-Name: SIP Communicator SIP Protocol Provider
Bundle-Description: A bundle that implements the Protocol Provider package over SIP.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
org.w3c.dom,
net.java.sip.communicator.service.configuration,

@ -3,6 +3,7 @@ Bundle-Name: SSH Protocol Provider
Bundle-Description: A bundle providing support for the SSH protocol.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
javax.crypto,
javax.crypto.interfaces,

@ -3,6 +3,7 @@ Bundle-Name: Yahoo Protocol Provider Implementation
Bundle-Description: An Yahoo implementation of the Protocol Provider Service.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
javax.net.ssl,
javax.swing,

@ -3,10 +3,11 @@ Bundle-Name: Zeroconf Protocol Provider
Bundle-Description: A bundle providing support for the Zeroconf protocol.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.configuration,
net.java.sip.communicator.service.configuration.event,
net.java.sip.communicator.service.resources,
net.java.sip.communicator.util,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.event
net.java.sip.communicator.service.protocol.event

@ -3,6 +3,7 @@ Bundle-Name: Resource Management Service
Bundle-Description: The plugin managing images and languages resource packs.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-Package: net.java.sip.communicator.service.resources
Import-Package: org.osgi.framework,
net.java.sip.communicator.util,

@ -3,5 +3,6 @@ Bundle-Name: Sparkle Auto-Update Service Provider
Bundle-Description: A bundle that launches the Sparkle framework.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.util
net.java.sip.communicator.util

@ -3,6 +3,7 @@ Bundle-Name: Systray
Bundle-Description: Systray.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-Package: net.java.sip.communicator.service.systray,
net.java.sip.communicator.service.systray.event
Import-Package: org.osgi.framework,

@ -118,7 +118,7 @@ else if(lockResult == SipCommunicatorLock.SUCCESS)
//there was no error, continue;
System.setOut(new ScStdOut(System.out));
Main.main(args);
Main.main(new String[0]);
}
/**

@ -3,6 +3,7 @@ Bundle-Name: Contact Info
Bundle-Description: A plug-in that can set cross protocol account info.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.browserlauncher,
net.java.sip.communicator.service.contactlist,
@ -27,4 +28,4 @@ Import-Package: org.osgi.framework,
javax.swing.filechooser,
javax.swing.tree,
javax.swing.undo,
javax.swing.border
javax.swing.border

@ -3,6 +3,7 @@ Bundle-Name: AIM account registration wizard
Bundle-Description: AIM account registration wizard.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.browserlauncher,
net.java.sip.communicator.service.configuration,
@ -31,4 +32,4 @@ Import-Package: org.osgi.framework,
javax.swing.filechooser,
javax.swing.tree,
javax.swing.undo,
javax.swing.border
javax.swing.border

@ -3,6 +3,7 @@ Bundle-Name: AutoAwayPlugin
Bundle-Description: A bundle that would automatically put your protocols in the away status after you've been idle for a certain amount of time.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.2
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.configuration,
net.java.sip.communicator.service.gui,

@ -3,6 +3,7 @@ Bundle-Name: Branding plugin
Bundle-Description: Branding plugin.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.browserlauncher,
net.java.sip.communicator.service.resources,

@ -3,6 +3,7 @@ Bundle-Name: Extended Call History Search
Bundle-Description: An Extended Call History Search
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.callhistory,
net.java.sip.communicator.service.configuration,

@ -3,10 +3,11 @@ Bundle-Name: Chat Alerter
Bundle-Description: A plug-in that alerts for new messages by flashing the window in the taskbar.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.util,
net.java.sip.communicator.service.gui,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.event,
com.apple.cocoa.application,
javax.swing
javax.swing

@ -3,6 +3,7 @@ Bundle-Name: Contact Info
Bundle-Description: A plug-in that can show cross protocol user info.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.browserlauncher,
net.java.sip.communicator.service.contactlist,
@ -26,4 +27,4 @@ Import-Package: org.osgi.framework,
javax.swing.filechooser,
javax.swing.tree,
javax.swing.undo,
javax.swing.border
javax.swing.border

@ -3,6 +3,7 @@ Bundle-Name: Default Resource Pack
Bundle-Description: The plugin offering default images and languages.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.util,
net.java.sip.communicator.service.resources

@ -3,6 +3,7 @@ Bundle-Name: Dict account registration wizard
Bundle-Description: Dict account registration wizard.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.dict4j,
net.java.sip.communicator.service.browserlauncher,

@ -3,6 +3,7 @@ Bundle-Name: Example plugin
Bundle-Description: An example showing how to make plugins for the ui.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.contactlist,
net.java.sip.communicator.service.contactlist.event,

@ -3,6 +3,7 @@ Bundle-Name: General config plugin
Bundle-Description: The plugin offering general configuration page.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.configuration,
net.java.sip.communicator.service.contactlist,

@ -3,6 +3,7 @@ Bundle-Name: Gibberish account registration wizard
Bundle-Description: Gibberish account registration wizard.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.browserlauncher,
net.java.sip.communicator.service.configuration,

@ -3,6 +3,7 @@ Bundle-Name: Google Talk account registration wizard
Bundle-Description: Google Talk account registration wizard.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.browserlauncher,
net.java.sip.communicator.service.configuration,

@ -3,6 +3,7 @@ Bundle-Name: ICQ account registration wizard
Bundle-Description: ICQ account registration wizard.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.browserlauncher,
net.java.sip.communicator.service.configuration,
@ -30,4 +31,4 @@ Import-Package: org.osgi.framework,
javax.swing.filechooser,
javax.swing.tree,
javax.swing.undo,
javax.swing.border
javax.swing.border

@ -3,6 +3,7 @@ Bundle-Name: IRC account registration wizard
Bundle-Description: IRC account registration wizard.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.browserlauncher,
net.java.sip.communicator.service.configuration,

@ -3,6 +3,7 @@ Bundle-Name: Jabber account registration wizard
Bundle-Description: Jabber account registration wizard.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.browserlauncher,
net.java.sip.communicator.service.configuration,

@ -3,6 +3,7 @@ Bundle-Name: Keybinding Chooser
Bundle-Description: Provides configuring UI for keyboard shortcuts.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.gui,
net.java.sip.communicator.service.keybindings,

@ -3,6 +3,7 @@ Bundle-Name: Mailbox
Bundle-Description: A bundle that implements the Mailbox Package.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.configuration,
net.java.sip.communicator.service.contactlist,

@ -3,6 +3,7 @@ Bundle-Name: Msn account registration wizard
Bundle-Description: Msn account registration wizard.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.browserlauncher,
net.java.sip.communicator.service.configuration,

@ -14,30 +14,30 @@
/**
* The <tt>TableModel</tt> of the table containing all plug-ins.
*
*
* @author Yana Stamcheva
*/
public class PluginTableModel extends AbstractTableModel
{
private BundleContext bundleContext = PluginManagerActivator.bundleContext;
private boolean showSystemBundles;
private Object showSystemBundlesSync = new Object();
private Bundle[] bundles = null;
private BundleComparator bundleComparator = new BundleComparator();
/**
* Create an instance of <tt>PluginTableModel</tt>
* Create an instance of <tt>PluginTableModel</tt>
*/
public PluginTableModel()
{
refreshSortedBundlesList();
}
/**
* Returns the count of table rows.
* @return int the count of table rows
@ -49,7 +49,7 @@ public int getRowCount()
{
showSystem = showSystemBundles;
}
if(bundles == null)
return 0;
else
@ -59,14 +59,14 @@ public int getRowCount()
else
{
int bundlesSize = 0;
for (int i = 0; i < bundles.length; i ++)
{
Bundle bundle = bundles[i];
Object sysBundleProp
= bundle.getHeaders().get("System-Bundle");
if(sysBundleProp == null || !sysBundleProp.equals("yes"))
bundlesSize++;
}
@ -89,11 +89,11 @@ public boolean contains(Bundle bundle)
{
showSystem = showSystemBundles;
}
for (int i = 0; i < bundles.length; i ++)
{
Bundle b = bundles[i];
if(b.equals(bundle))
{
if(showSystem)
@ -102,18 +102,18 @@ public boolean contains(Bundle bundle)
{
Object sysBundleProp
= bundle.getHeaders().get("System-Bundle");
if(sysBundleProp == null || !sysBundleProp.equals("yes"))
return true;
else
return false;
}
}
}
}
return false;
return false;
}
/**
* Returns the count of table columns.
* @return int the count of table columns
@ -150,17 +150,20 @@ public Object getValueAt(int row, int column)
for(int i = 0; i < bundles.length; i++)
{
Object sysBundleProp
= bundles[i].getHeaders().get("System-Bundle");
//ignore if this is a system bundle
if(sysBundleProp != null && sysBundleProp.equals("yes"))
continue;
if(bundleCounter == row)
return bundles[i];
Object sysBundleProp
= bundles[i+1].getHeaders().get("System-Bundle");
if(sysBundleProp == null || !sysBundleProp.equals("yes"))
bundleCounter++;
bundleCounter++;
}
}
return null;
}
@ -172,7 +175,7 @@ public void update()
refreshSortedBundlesList();
fireTableDataChanged();
}
/**
* Returns TRUE if system bundles are show, FALSE - otherwise.
* @return TRUE if system bundles are show, FALSE - otherwise
@ -180,12 +183,12 @@ public void update()
public boolean isShowSystemBundles()
{
boolean showSystem;
synchronized (showSystemBundlesSync)
{
showSystem = showSystemBundles;
}
return showSystem;
}
@ -200,9 +203,9 @@ public void setShowSystemBundles(boolean showSystemBundles)
this.showSystemBundles = showSystemBundles;
}
}
/**
* Syncs the content of the bundle list with the bundles currently
* Syncs the content of the bundle list with the bundles currently
* available in the bundle context and sorts it again.
*/
private void refreshSortedBundlesList()
@ -211,4 +214,4 @@ private void refreshSortedBundlesList()
Arrays.sort(this.bundles, bundleComparator);
}
}
}

@ -3,6 +3,7 @@ Bundle-Name: Integrated profiler plugin
Bundle-Description: A bundle that provides profile cpu and memory of the running app.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.util,
net.java.sip.communicator.service.contactlist,
@ -18,4 +19,4 @@ Import-Package: org.osgi.framework,
javax.xml.parsers,
org.xml.sax,
org.xml.sax.ext,
org.xml.sax.helpers
org.xml.sax.helpers

@ -3,6 +3,7 @@ Bundle-Name: Rss account registration wizard
Bundle-Description: Rss account registration wizard.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.browserlauncher,
net.java.sip.communicator.service.configuration,

@ -3,6 +3,7 @@ Bundle-Name: Simple account registration form
Bundle-Description: Simple account registration form.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.util,
net.java.sip.communicator.service.resources,

@ -3,6 +3,7 @@ Bundle-Name: SIP account registration wizard
Bundle-Description: SIP account registration wizard.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.browserlauncher,
net.java.sip.communicator.service.configuration,

@ -3,6 +3,7 @@ Bundle-Name: SSH account registration wizard
Bundle-Description: SSH account registration wizard.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.browserlauncher,
net.java.sip.communicator.service.configuration,

@ -3,6 +3,7 @@ Bundle-Name: UpdateCheckPlugin
Bundle-Description: A bundle that implements the UpdateCheck Plugin Package.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.browserlauncher,
net.java.sip.communicator.service.gui,

@ -3,6 +3,7 @@ Bundle-Name: Whiteboard plugin
Bundle-Description: A whiteboard for SIP-Communicator.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.contactlist,
net.java.sip.communicator.service.contactlist.event,
@ -27,4 +28,4 @@ Import-Package: org.osgi.framework,
javax.swing.filechooser,
javax.swing.tree,
javax.swing.undo,
javax.swing.border
javax.swing.border

@ -3,6 +3,7 @@ Bundle-Name: Yahoo account registration wizard
Bundle-Description: Yahoo account registration wizard.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.browserlauncher,
net.java.sip.communicator.service.configuration,

@ -3,6 +3,7 @@ Bundle-Name: Zeroconf account registration wizard
Bundle-Description: Zeroconf account registration wizard.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.browserlauncher,
net.java.sip.communicator.service.configuration,

@ -2,4 +2,5 @@ Bundle-Name: Argument Delegation Service
Bundle-Description: A service that allows bundles to register as handlers for specific command line arguments
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-Package: net.java.sip.communicator.service.argdelegation

@ -2,6 +2,7 @@ Bundle-Name: Contact Event Handler service
Bundle-Description: Contact Event Handler service
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.protocol
Export-Package: net.java.sip.communicator.service.contacteventhandler

@ -2,6 +2,7 @@ Bundle-Name: Contactlist Service Interfaces
Bundle-Description: Contactlist Service.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.protocol
Export-Package: net.java.sip.communicator.service.contactlist,

@ -2,5 +2,6 @@ Bundle-Name: UI Service
Bundle-Description: The User Interface Service.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-Package: net.java.sip.communicator.service.gui,
net.java.sip.communicator.service.gui.event

@ -128,13 +128,31 @@ protected AccountID( String userID,
/**
* Returns the user id associated with this account.
*
* @return A String identyfying the user inside this particular service.
* @return A String identifying the user inside this particular service.
*/
public String getUserID()
{
return userID;
}
/**
* Returns a name that can be displayed to the user when referring to this
* account.
*
* @return A String identifying the user inside this particular service.
*/
public String getDisplayName()
{
String returnValue = getUserID();
String protocolName = (String)getAccountProperties()
.get(ProtocolProviderFactory.PROTOCOL);
if (protocolName != null && protocolName.trim().length() > 0)
returnValue += " (" + protocolName + ")";
return returnValue;
}
/**
* Returns a String uniquely idnetifying this account, guaranteed to remain
* the same accross multiple installations of the same account and to always

@ -3,6 +3,7 @@ Bundle-Name: Protocol Provider Service
Bundle-Description: Protocol Provider Service.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.configuration,
net.java.sip.communicator.util,

@ -2,4 +2,5 @@ Bundle-Name: Version Service Implementation
Bundle-Description: Version Service Implementation.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-Package: net.java.sip.communicator.service.version

@ -3,6 +3,7 @@ Bundle-Name: SIP Communicator Utility Packages
Bundle-Description: A bundle that export packages with utility classes.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.xml.sax,
org.w3c.dom,
org.osgi.framework,

@ -2,6 +2,7 @@ Bundle-Name: The JUnit Framework
Bundle-Description: A bundle that exports junit packages
Bundle-Vendor: JUnit and sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-Package: junit,
junit.framework,
junit.swingui,

@ -3,6 +3,7 @@ Bundle-Name: Call History Service Implementation Compatibility Kit
Bundle-Description: A Service Implementation Compatibility Kit for the History Service
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: junit.framework,
net.java.sip.communicator.slick.history,
net.java.sip.communicator.service.history.records,

@ -3,6 +3,7 @@ Bundle-Name: Configuration Service Implementation Compatibility Kit
Bundle-Description: A Service Implementation Compatibility Kit for the Configuration Service
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: junit.framework,
net.java.sip.communicator.service.configuration,
net.java.sip.communicator.service.configuration.event,

@ -3,6 +3,7 @@ Bundle-Name: MetaContactListServiceLick
Bundle-Description: An SLI compatibility kit for the MetaContactList service.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: net.java.sip.communicator.service.contactlist,
net.java.sip.communicator.service.contactlist.event,
org.osgi.framework,

@ -3,6 +3,7 @@ Bundle-Name: File Access Service Implementation Compatibility Kit
Bundle-Description: A Service Implementation Compatibility Kit for the File Access Services
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: junit.framework,
net.java.sip.communicator.slick.fileaccess,
net.java.sip.communicator.service.fileaccess,

@ -3,6 +3,7 @@ Bundle-Name: History Service Implementation Compatibility Kit
Bundle-Description: A Service Implementation Compatibility Kit for the History Service
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: junit.framework,
net.java.sip.communicator.slick.history,
net.java.sip.communicator.service.history.records,

@ -3,6 +3,7 @@ Bundle-Name: Media Service Implementation Compatibility Kit
Bundle-Description: A Service Implementation Compatibility Kit for the Media Service
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
junit.framework,
net.java.sip.communicator.service.configuration,

@ -3,6 +3,7 @@ Bundle-Name: History Service Implementation Compatibility Kit
Bundle-Description: A Service Implementation Compatibility Kit for the History Service
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: junit.framework,
net.java.sip.communicator.slick.history,
net.java.sip.communicator.service.history.records,

@ -3,6 +3,7 @@ Bundle-Name: Network Address Manager Service Implementation Compatibility Kit
Bundle-Description: A Service Implementation Compatibility Kit for the Network Adress Manager Service
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: net.java.sip.communicator.util,
net.java.stun4j.client,
net.java.sip.communicator.service.netaddr,

@ -3,6 +3,7 @@ Bundle-Name: Gibberish Protocol Provider Service Leveraging Implementation Compa
Bundle-Description: A Service Leveraging Implementation Compatibility Kit for the Gibberish implementation of the ProtocolProvider Service
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: net.java.sip.communicator.service.configuration,
net.java.sip.communicator.service.configuration.event,
junit.framework,

@ -3,6 +3,7 @@ Bundle-Name: ICQ Protocol Provider Service Leveraging Implementation Compatibili
Bundle-Description: A Service Leveraging Implementation Compatibility Kit for the ICQ implementation of the ProtocolProvider Service
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: junit.framework,
javax.net,
net.java.sip.communicator.service.configuration,

@ -3,6 +3,7 @@ Bundle-Name: Jabber Protocol Provider Service Leveraging Implementation Compatib
Bundle-Description: A Service Leveraging Implementation Compatibility Kit for the Jabber implementation of the ProtocolProvider Service
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: net.java.sip.communicator.service.configuration,
net.java.sip.communicator.service.configuration.event,
junit.framework,

@ -3,6 +3,7 @@ Bundle-Name: Msn Protocol Provider Service Leveraging Implementation Compatibili
Bundle-Description: A Service Leveraging Implementation Compatibility Kit for the Msn implementation of the ProtocolProvider Service
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: net.java.sip.communicator.service.configuration,
net.java.sip.communicator.service.configuration.event,
junit.framework,

@ -3,10 +3,11 @@ Bundle-Name: RSS Protocol Provider Service Leveraging Implementation Compatibili
Bundle-Description: A Service Leveraging Implementation Compatibility Kit for the RSS implementation of the ProtocolProvider Service
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: net.java.sip.communicator.service.configuration,
net.java.sip.communicator.service.configuration.event,
junit.framework,
org.osgi.framework,
net.java.sip.communicator.util,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.event
net.java.sip.communicator.service.protocol.event

@ -3,6 +3,7 @@ Bundle-Name: SIP Communicator SIP Protocol Provider SLICK
Bundle-Description: A bundle that contains all tests for the SIP implementation of the Protocol Provider Service.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: net.java.sip.communicator.service.configuration,
net.java.sip.communicator.service.configuration.event,
junit.framework,

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save