diff options
Diffstat (limited to 'src')
76 files changed, 329 insertions, 212 deletions
diff --git a/src/net/java/sip/communicator/impl/argdelegation/argdelegation.manifest.mf b/src/net/java/sip/communicator/impl/argdelegation/argdelegation.manifest.mf index ba896e7..2c01428 100644 --- a/src/net/java/sip/communicator/impl/argdelegation/argdelegation.manifest.mf +++ b/src/net/java/sip/communicator/impl/argdelegation/argdelegation.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/audionotifier/audionotifier.manifest.mf b/src/net/java/sip/communicator/impl/audionotifier/audionotifier.manifest.mf index a2d19d7..701fb72 100644 --- a/src/net/java/sip/communicator/impl/audionotifier/audionotifier.manifest.mf +++ b/src/net/java/sip/communicator/impl/audionotifier/audionotifier.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/browserlauncher/browserlauncher.manifest.mf b/src/net/java/sip/communicator/impl/browserlauncher/browserlauncher.manifest.mf index 9fce4ab..2739c07 100644 --- a/src/net/java/sip/communicator/impl/browserlauncher/browserlauncher.manifest.mf +++ b/src/net/java/sip/communicator/impl/browserlauncher/browserlauncher.manifest.mf @@ -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
\ No newline at end of file + com.apple.eio diff --git a/src/net/java/sip/communicator/impl/callhistory/callhistory.manifest.mf b/src/net/java/sip/communicator/impl/callhistory/callhistory.manifest.mf index 34fecf1..b8db32f 100644 --- a/src/net/java/sip/communicator/impl/callhistory/callhistory.manifest.mf +++ b/src/net/java/sip/communicator/impl/callhistory/callhistory.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf b/src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf index 47761ca..36d3dba 100644 --- a/src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf +++ b/src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf b/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf index bbd3da8..91de5df 100644 --- a/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf +++ b/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/growlnotification/growlnotification.manifest.mf b/src/net/java/sip/communicator/impl/growlnotification/growlnotification.manifest.mf index 94e87f7..c8b5a53 100644 --- a/src/net/java/sip/communicator/impl/growlnotification/growlnotification.manifest.mf +++ b/src/net/java/sip/communicator/impl/growlnotification/growlnotification.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/LabelTableCellRenderer.java b/src/net/java/sip/communicator/impl/gui/customcontrols/LabelTableCellRenderer.java index 1182b4b..254c407 100644 --- a/src/net/java/sip/communicator/impl/gui/customcontrols/LabelTableCellRenderer.java +++ b/src/net/java/sip/communicator/impl/gui/customcontrols/LabelTableCellRenderer.java @@ -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 class LabelTableCellRenderer extends JLabel } 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; diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java index c295c82..165bde9 100644 --- a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java @@ -122,7 +122,7 @@ public class AccountsConfigurationPanel /**
* 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 @@ public class AccountsConfigurationPanel * 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 class AccountsConfigurationPanel 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;
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/AccountSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/call/AccountSelectorBox.java index 3839364..c5fad84 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/AccountSelectorBox.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/AccountSelectorBox.java @@ -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 @@ import net.java.sip.communicator.util.swing.*; * 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 class AccountSelectorBox /** * 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 class AccountSelectorBox /** * 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 class AccountSelectorBox /** * Updates the protocol account status. - * + * * @param pps the protocol provider service to update */ public void updateAccountStatus(ProtocolProviderService pps) @@ -236,14 +236,14 @@ public class AccountSelectorBox 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 class AccountSelectorBox /** * Returns the protocol menu. - * + * * @return the protocol menu */ public SIPCommMenu getMenu() @@ -264,7 +264,7 @@ public class AccountSelectorBox /** * 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 class AccountSelectorBox /** * 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 class AccountSelectorBox /** * 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 class AccountSelectorBox /** * Returns the first registered protocol provider. - * + * * @return the first registered protocol provider. */ private ProtocolProviderService findFirstRegisteredProvider() diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java index a47986c..9d38360 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java @@ -30,7 +30,7 @@ import org.osgi.framework.*; /** * 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 @@ public class ConferenceChatManager /** * 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 class ConferenceChatManager /** * 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 class ConferenceChatManager { 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 class ConferenceChatManager } /** - * + * * @param chatRoomWrapper * @param chatRoom */ @@ -553,7 +553,7 @@ public class ConferenceChatManager /** * 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 class ConferenceChatManager /** * 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 class ConferenceChatManager /** * 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 class ConferenceChatManager /** * 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 class ConferenceChatManager /** * Leaves the given <tt>ChatRoom</tt>. - * + * * @param chatRoom the <tt>ChatRoom</tt> to leave. */ public void leaveChatRoom(ChatRoomWrapper chatRoomWrapper) @@ -737,7 +737,7 @@ public class ConferenceChatManager /** * 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 class ConferenceChatManager /** * 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 class ConferenceChatManager /** * 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 class ConferenceChatManager /** * 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 class ConferenceChatManager /** * 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 class ConferenceChatManager /** * Removes the given <tt>ChatRoomListChangeListener</tt>. - * + * * @param l the listener to remove. */ public void removeChatRoomListChangeListener(ChatRoomListChangeListener l) @@ -829,7 +829,7 @@ public class ConferenceChatManager /** * 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 class ConferenceChatManager * 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 @@ public class ConferenceChatManager { 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 @@ public class ConferenceChatManager if(e.getErrorCode() == OperationFailedException.AUTHENTICATION_FAILED) - { + { return AUTHENTICATION_FAILED; } else if(e.getErrorCode() diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java index ec47b7c..5a6b8f2 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java @@ -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 @@ public class ContactRightButtonMenu //Initialize the addSubcontact menu. Iterator providers = mainFrame.getProtocolProviders(); - if(providers.hasNext()) + if(providers.hasNext()) { JLabel infoLabel = new JLabel( GuiActivator.getResources() @@ -199,7 +199,7 @@ public class ContactRightButtonMenu this.addSubcontactMenu.addSeparator(); } - while (providers.hasNext()) + while (providers.hasNext()) { ProtocolProviderService pps = (ProtocolProviderService)providers.next(); @@ -207,7 +207,7 @@ public class ContactRightButtonMenu String protocolName = pps.getProtocolName(); JMenuItem menuItem = new JMenuItem(pps.getAccountID() - .getUserID(), + .getDisplayName(), new ImageIcon(createAccountStatusImage(pps))); menuItem.setName(addSubcontactPrefix + protocolName); @@ -219,7 +219,7 @@ public class ContactRightButtonMenu //Initialize moveTo menu. Iterator groups = this.mainFrame.getAllGroups(); - if(groups.hasNext()) + if(groups.hasNext()) { JLabel infoLabel = new JLabel( GuiActivator.getResources() @@ -232,7 +232,7 @@ public class ContactRightButtonMenu this.moveToMenu.addSeparator(); } - while (groups.hasNext()) + while (groups.hasNext()) { MetaContactGroup group = (MetaContactGroup)groups.next(); @@ -247,7 +247,7 @@ public class ContactRightButtonMenu //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 @@ public class ContactRightButtonMenu 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 @@ public class ContactRightButtonMenu this.add(sendMessageItem); this.add(sendSmsItem); - if (callContactMenu.getItemCount() > 1) + if (callContactMenu.getItemCount() > 1) { this.add(callContactMenu); } @@ -339,7 +339,7 @@ public class ContactRightButtonMenu this.addSeparator(); this.add(viewHistoryItem); - + this.initPluginComponents(); this.sendMessageItem.setName("sendMessage"); @@ -407,8 +407,8 @@ public class ContactRightButtonMenu PluginComponent component = (PluginComponent) GuiActivator .bundleContext.getService(serRefs[i]);; - component.setCurrentContact(contactItem); - + component.setCurrentContact(contactItem); + if (component.getComponent() == null) continue; @@ -427,7 +427,7 @@ public class ContactRightButtonMenu 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 @@ public class ContactRightButtonMenu ); dialog.setVisible(true); - + dialog.requestFocusInFiled(); } else if (itemName.equalsIgnoreCase("viewHistory")) @@ -565,7 +565,7 @@ public class ContactRightButtonMenu try { - if(group != null) + if(group != null) { mainFrame.getContactList(). moveMetaContact(contactItem, group); @@ -622,16 +622,16 @@ public class ContactRightButtonMenu { 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 @@ public class ContactRightButtonMenu } return null; } - + /** * Removes a contact from a meta contact in a separate thread. */ @@ -703,11 +703,11 @@ public class ContactRightButtonMenu 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 @@ public class ContactRightButtonMenu } } } - + /** * 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 class ContactRightButtonMenu { 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 @@ public class ContactRightButtonMenu } 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 class ContactRightButtonMenu public void run() { - if(metaContact != null) + if(metaContact != null) { mainFrame.getContactList() .moveContact(contactToMove, metaContact); @@ -889,17 +889,17 @@ public class ContactRightButtonMenu 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 class ContactRightButtonMenu 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 class ContactRightButtonMenu * @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 @@ public class ContactRightButtonMenu 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 @@ public class ContactRightButtonMenu } return img; } - + /** * Obtains the status icon for the given protocol contact and * adds to it the account index information. @@ -1024,7 +1024,7 @@ public class ContactRightButtonMenu protoContact.getProtocolProvider()); Image img = null; - if(index > 0) + if(index > 0) { BufferedImage buffImage = new BufferedImage( 22, 16, BufferedImage.TYPE_INT_ARGB); diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java index 8d7f8e4..9c04b07 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java @@ -33,7 +33,7 @@ import org.osgi.framework.*; * 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 @@ public class GroupRightButtonMenu 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 class GroupRightButtonMenu 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 @@ public class GroupRightButtonMenu ); 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 class GroupRightButtonMenu 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 class GroupRightButtonMenu * @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 @@ public class GroupRightButtonMenu ImageLoader.getBytesInImage(pps.getProtocolIcon() .getIcon(ProtocolIcon.ICON_SIZE_16x16))); } - + int index = mainFrame.getProviderIndex(pps); Image img = null; @@ -352,7 +352,7 @@ public class GroupRightButtonMenu } return img; } - + /** * The <tt>AccountMenuItem</tt> is a <tt>JMenuItem</tt> that stores a * <tt>ProtocolProviderService</tt> in it. @@ -360,14 +360,14 @@ public class GroupRightButtonMenu 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; diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java b/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java index 85d0231..a370d2b 100644 --- a/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java @@ -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 @@ import net.java.sip.communicator.util.*; * 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 class PresenceStatusMenu 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 class PresenceStatusMenu /** * Selects the given status in the status menu. - * + * * @param status the status to select */ public void setSelectedStatus(PresenceStatus status) @@ -244,7 +244,7 @@ public class PresenceStatusMenu /** * Returns the Offline status in this selector box. - * + * * @return the Offline status in this selector box */ public PresenceStatus getOfflineStatus() @@ -254,7 +254,7 @@ public class PresenceStatusMenu /** * Returns the Online status in this selector box. - * + * * @return the Online status in this selector box */ public PresenceStatus getOnlineStatus() @@ -264,7 +264,7 @@ public class PresenceStatusMenu /** * Returns the status that is currently selected. - * + * * @return the status that is currently selected */ public PresenceStatus getLastSelectedStatus() diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java b/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java index 0555c4d..5a465e7 100644 --- a/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java @@ -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 class SimpleStatusMenu .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 class SimpleStatusMenu 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)); diff --git a/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf b/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf index 60dcc82..ca3caad 100644 --- a/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf +++ b/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/history/history.manifest.mf b/src/net/java/sip/communicator/impl/history/history.manifest.mf index 7a9d072..6f62db7 100644 --- a/src/net/java/sip/communicator/impl/history/history.manifest.mf +++ b/src/net/java/sip/communicator/impl/history/history.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/keybindings/keybindings.manifest.mf b/src/net/java/sip/communicator/impl/keybindings/keybindings.manifest.mf index 3fb715f..dfacbec 100644 --- a/src/net/java/sip/communicator/impl/keybindings/keybindings.manifest.mf +++ b/src/net/java/sip/communicator/impl/keybindings/keybindings.manifest.mf @@ -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
\ No newline at end of file +Export-Package: net.java.sip.communicator.service.keybindings diff --git a/src/net/java/sip/communicator/impl/media/media.manifest.mf b/src/net/java/sip/communicator/impl/media/media.manifest.mf index aae28d2..c6a5da1 100644 --- a/src/net/java/sip/communicator/impl/media/media.manifest.mf +++ b/src/net/java/sip/communicator/impl/media/media.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/msghistory/msghistory.manifest.mf b/src/net/java/sip/communicator/impl/msghistory/msghistory.manifest.mf index 1f60719..7f824fe 100644 --- a/src/net/java/sip/communicator/impl/msghistory/msghistory.manifest.mf +++ b/src/net/java/sip/communicator/impl/msghistory/msghistory.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf b/src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf index e8378f4..af7d319 100644 --- a/src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf +++ b/src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/notification/notification.manifest.mf b/src/net/java/sip/communicator/impl/notification/notification.manifest.mf index 400458d..ad3aedc 100644 --- a/src/net/java/sip/communicator/impl/notification/notification.manifest.mf +++ b/src/net/java/sip/communicator/impl/notification/notification.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/protocol/dict/dict.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/dict/dict.provider.manifest.mf index a9d53a2..f624039 100644 --- a/src/net/java/sip/communicator/impl/protocol/dict/dict.provider.manifest.mf +++ b/src/net/java/sip/communicator/impl/protocol/dict/dict.provider.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/protocol/gibberish/gibberish.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/gibberish/gibberish.provider.manifest.mf index 4bb0210..ec9208e 100644 --- a/src/net/java/sip/communicator/impl/protocol/gibberish/gibberish.provider.manifest.mf +++ b/src/net/java/sip/communicator/impl/protocol/gibberish/gibberish.provider.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/protocol/icq/icq.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/icq/icq.provider.manifest.mf index a0fda28..53e2262 100644 --- a/src/net/java/sip/communicator/impl/protocol/icq/icq.provider.manifest.mf +++ b/src/net/java/sip/communicator/impl/protocol/icq/icq.provider.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf index b11d55b..54658da 100644 --- a/src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf +++ b/src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf @@ -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
\ No newline at end of file + net.java.sip.communicator.service.protocol.event diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf index 780867b..21872f6 100755 --- a/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf +++ b/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf @@ -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
\ No newline at end of file + org.w3c.dom diff --git a/src/net/java/sip/communicator/impl/protocol/mock/mock.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/mock/mock.provider.manifest.mf index 90d5c1e..a751ec9 100644 --- a/src/net/java/sip/communicator/impl/protocol/mock/mock.provider.manifest.mf +++ b/src/net/java/sip/communicator/impl/protocol/mock/mock.provider.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/protocol/msn/msn.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/msn/msn.provider.manifest.mf index b95425c..02cffa3 100755 --- a/src/net/java/sip/communicator/impl/protocol/msn/msn.provider.manifest.mf +++ b/src/net/java/sip/communicator/impl/protocol/msn/msn.provider.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/protocol/rss/rss.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/rss/rss.provider.manifest.mf index 554def3..bfe586e 100644 --- a/src/net/java/sip/communicator/impl/protocol/rss/rss.provider.manifest.mf +++ b/src/net/java/sip/communicator/impl/protocol/rss/rss.provider.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/protocol/sip/SipAccountID.java b/src/net/java/sip/communicator/impl/protocol/sip/SipAccountID.java index 3534309..2c55a4d 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/SipAccountID.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/SipAccountID.java @@ -25,7 +25,7 @@ public class SipAccountID /** * 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 class SipAccountID /** * 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 class SipAccountID { 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; + } } diff --git a/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf index c0cefad..de745bb 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf +++ b/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf index d36636b..5118be3 100644 --- a/src/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf +++ b/src/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf index d956708..eb422c5 100644 --- a/src/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf +++ b/src/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/protocol/zeroconf/zeroconf.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/zeroconf/zeroconf.provider.manifest.mf index d256c49..eac9ede 100644 --- a/src/net/java/sip/communicator/impl/protocol/zeroconf/zeroconf.provider.manifest.mf +++ b/src/net/java/sip/communicator/impl/protocol/zeroconf/zeroconf.provider.manifest.mf @@ -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
\ No newline at end of file + net.java.sip.communicator.service.protocol.event diff --git a/src/net/java/sip/communicator/impl/resources/resourcemanagement.manifest.mf b/src/net/java/sip/communicator/impl/resources/resourcemanagement.manifest.mf index 83e5a97..47f9f11 100644 --- a/src/net/java/sip/communicator/impl/resources/resourcemanagement.manifest.mf +++ b/src/net/java/sip/communicator/impl/resources/resourcemanagement.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/impl/sparkle/sparkle.manifest.mf b/src/net/java/sip/communicator/impl/sparkle/sparkle.manifest.mf index 498e389..2bfc04d 100644 --- a/src/net/java/sip/communicator/impl/sparkle/sparkle.manifest.mf +++ b/src/net/java/sip/communicator/impl/sparkle/sparkle.manifest.mf @@ -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
\ No newline at end of file + net.java.sip.communicator.util diff --git a/src/net/java/sip/communicator/impl/systray/systray.manifest.mf b/src/net/java/sip/communicator/impl/systray/systray.manifest.mf index aa4b520..c97e127 100644 --- a/src/net/java/sip/communicator/impl/systray/systray.manifest.mf +++ b/src/net/java/sip/communicator/impl/systray/systray.manifest.mf @@ -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,
diff --git a/src/net/java/sip/communicator/launcher/SIPCommunicator.java b/src/net/java/sip/communicator/launcher/SIPCommunicator.java index de6b145..2cc3350 100644 --- a/src/net/java/sip/communicator/launcher/SIPCommunicator.java +++ b/src/net/java/sip/communicator/launcher/SIPCommunicator.java @@ -118,7 +118,7 @@ public class SIPCommunicator //there was no error, continue; System.setOut(new ScStdOut(System.out)); - Main.main(args); + Main.main(new String[0]); } /** diff --git a/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf b/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf index f1ae175..6281899 100644 --- a/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf +++ b/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf @@ -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
\ No newline at end of file + javax.swing.border
diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf index 41da269..157df55 100644 --- a/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf +++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf @@ -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
\ No newline at end of file + javax.swing.border diff --git a/src/net/java/sip/communicator/plugin/autoaway/autoaway.manifest.mf b/src/net/java/sip/communicator/plugin/autoaway/autoaway.manifest.mf index feed9c0..2113cf7 100644 --- a/src/net/java/sip/communicator/plugin/autoaway/autoaway.manifest.mf +++ b/src/net/java/sip/communicator/plugin/autoaway/autoaway.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf b/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf index e22e173..c3d57ef 100755 --- a/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf +++ b/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/plugin/callhistoryform/callhistoryform.manifest.mf b/src/net/java/sip/communicator/plugin/callhistoryform/callhistoryform.manifest.mf index 69ed48b..09e9468 100644 --- a/src/net/java/sip/communicator/plugin/callhistoryform/callhistoryform.manifest.mf +++ b/src/net/java/sip/communicator/plugin/callhistoryform/callhistoryform.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/plugin/chatalerter/chatalerter.manifest.mf b/src/net/java/sip/communicator/plugin/chatalerter/chatalerter.manifest.mf index a98d4d1..3e1afa9 100644 --- a/src/net/java/sip/communicator/plugin/chatalerter/chatalerter.manifest.mf +++ b/src/net/java/sip/communicator/plugin/chatalerter/chatalerter.manifest.mf @@ -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
\ No newline at end of file + javax.swing
diff --git a/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf b/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf index e3a4bfc..c508e73 100644 --- a/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf +++ b/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf @@ -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
\ No newline at end of file + javax.swing.border
diff --git a/src/net/java/sip/communicator/plugin/defaultresourcepack/defaultresourcepack.manifest.mf b/src/net/java/sip/communicator/plugin/defaultresourcepack/defaultresourcepack.manifest.mf index 182caf1..5b1a4e4 100644 --- a/src/net/java/sip/communicator/plugin/defaultresourcepack/defaultresourcepack.manifest.mf +++ b/src/net/java/sip/communicator/plugin/defaultresourcepack/defaultresourcepack.manifest.mf @@ -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 diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf index 0166229..fb61b3b 100644 --- a/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf +++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf b/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf index 26d4992..0248b3c 100644 --- a/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf +++ b/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf b/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf index be3709a..3bdd7f8 100644 --- a/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf +++ b/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf index 4ebcd1f..01caa2c 100644 --- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf +++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf index f85b003..26ada2b 100644 --- a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf +++ b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf @@ -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,
diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf index 7a1dec1..b5e1723 100644 --- a/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf +++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf @@ -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
\ No newline at end of file + javax.swing.border diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf index 02e5d96..adceb04 100644 --- a/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf +++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf index 4ff5349..763f72b 100755 --- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf +++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf b/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf index 6787861..32f57fd 100644 --- a/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf +++ b/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/plugin/mailbox/mailbox.manifest.mf b/src/net/java/sip/communicator/plugin/mailbox/mailbox.manifest.mf index 89e15e4..2f65efd 100644 --- a/src/net/java/sip/communicator/plugin/mailbox/mailbox.manifest.mf +++ b/src/net/java/sip/communicator/plugin/mailbox/mailbox.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf index b70f82a..bb88367 100755 --- a/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf +++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/PluginTableModel.java b/src/net/java/sip/communicator/plugin/pluginmanager/PluginTableModel.java index 29b5443..a3e989e 100644 --- a/src/net/java/sip/communicator/plugin/pluginmanager/PluginTableModel.java +++ b/src/net/java/sip/communicator/plugin/pluginmanager/PluginTableModel.java @@ -14,30 +14,30 @@ import org.osgi.framework.*; /** * 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 class PluginTableModel extends AbstractTableModel { showSystem = showSystemBundles; } - + if(bundles == null) return 0; else @@ -59,14 +59,14 @@ public class PluginTableModel extends AbstractTableModel 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 class PluginTableModel extends AbstractTableModel { 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 class PluginTableModel extends AbstractTableModel { 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 class PluginTableModel extends AbstractTableModel 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 class PluginTableModel extends AbstractTableModel 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 class PluginTableModel extends AbstractTableModel public boolean isShowSystemBundles() { boolean showSystem; - + synchronized (showSystemBundlesSync) { showSystem = showSystemBundles; } - + return showSystem; } @@ -200,9 +203,9 @@ public class PluginTableModel extends AbstractTableModel 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 @@ public class PluginTableModel extends AbstractTableModel Arrays.sort(this.bundles, bundleComparator); } -}
\ No newline at end of file +} diff --git a/src/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf b/src/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf index fdc32da..1136fca 100644 --- a/src/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf +++ b/src/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf @@ -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
\ No newline at end of file + org.xml.sax.helpers diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf index fb4829f..14be1ac 100644 --- a/src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf +++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/plugin/simpleaccreg/simpleaccreg.manifest.mf b/src/net/java/sip/communicator/plugin/simpleaccreg/simpleaccreg.manifest.mf index aa379ff..046588c 100644 --- a/src/net/java/sip/communicator/plugin/simpleaccreg/simpleaccreg.manifest.mf +++ b/src/net/java/sip/communicator/plugin/simpleaccreg/simpleaccreg.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf index 09b4a1a..e997b83 100755 --- a/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf +++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf index c50ebd5..e89a9a7 100644 --- a/src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf +++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/plugin/updatechecker/updatecheck.manifest.mf b/src/net/java/sip/communicator/plugin/updatechecker/updatecheck.manifest.mf index eb16831..14be15d 100644 --- a/src/net/java/sip/communicator/plugin/updatechecker/updatecheck.manifest.mf +++ b/src/net/java/sip/communicator/plugin/updatechecker/updatecheck.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf b/src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf index d0802e5..5e00896 100644 --- a/src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf +++ b/src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf @@ -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
\ No newline at end of file + javax.swing.border diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf index a9418de..ae55407 100644 --- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf +++ b/src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf index 6710544..676ddc3 100644 --- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf +++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/service/argdelegation/argdelegation.manifest.mf b/src/net/java/sip/communicator/service/argdelegation/argdelegation.manifest.mf index 1e97f1a..d665aa5 100644 --- a/src/net/java/sip/communicator/service/argdelegation/argdelegation.manifest.mf +++ b/src/net/java/sip/communicator/service/argdelegation/argdelegation.manifest.mf @@ -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 diff --git a/src/net/java/sip/communicator/service/contacteventhandler/contact.event.handler.manifest.mf b/src/net/java/sip/communicator/service/contacteventhandler/contact.event.handler.manifest.mf index 506aad7..f272967 100644 --- a/src/net/java/sip/communicator/service/contacteventhandler/contact.event.handler.manifest.mf +++ b/src/net/java/sip/communicator/service/contacteventhandler/contact.event.handler.manifest.mf @@ -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 diff --git a/src/net/java/sip/communicator/service/contactlist/contactlist.manifest.mf b/src/net/java/sip/communicator/service/contactlist/contactlist.manifest.mf index 4c798c8..604ebd8 100755 --- a/src/net/java/sip/communicator/service/contactlist/contactlist.manifest.mf +++ b/src/net/java/sip/communicator/service/contactlist/contactlist.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/service/gui/gui.manifest.mf b/src/net/java/sip/communicator/service/gui/gui.manifest.mf index 824f6d9..798546d 100644 --- a/src/net/java/sip/communicator/service/gui/gui.manifest.mf +++ b/src/net/java/sip/communicator/service/gui/gui.manifest.mf @@ -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 diff --git a/src/net/java/sip/communicator/service/protocol/AccountID.java b/src/net/java/sip/communicator/service/protocol/AccountID.java index 3da08a9..b88d207 100644 --- a/src/net/java/sip/communicator/service/protocol/AccountID.java +++ b/src/net/java/sip/communicator/service/protocol/AccountID.java @@ -128,7 +128,7 @@ public abstract class AccountID /** * 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() { @@ -136,6 +136,24 @@ public abstract class AccountID } /** + * 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 * be unique for differing accounts. diff --git a/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf b/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf index c2faf0c..adc0837 100644 --- a/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf +++ b/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf @@ -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, diff --git a/src/net/java/sip/communicator/service/version/version.manifest.mf b/src/net/java/sip/communicator/service/version/version.manifest.mf index c405486..26352b5 100755 --- a/src/net/java/sip/communicator/service/version/version.manifest.mf +++ b/src/net/java/sip/communicator/service/version/version.manifest.mf @@ -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 diff --git a/src/net/java/sip/communicator/util/util.manifest.mf b/src/net/java/sip/communicator/util/util.manifest.mf index 67709da..30f6c30 100644 --- a/src/net/java/sip/communicator/util/util.manifest.mf +++ b/src/net/java/sip/communicator/util/util.manifest.mf @@ -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, |