- Copy problem fixed in chat write area.

- Long text formatting fixed
- Smilies are now moved to the formatting tool bar.
cusax-fix
Yana Stamcheva 18 years ago
parent 6f0df8bb1b
commit 413b840777

@ -41,7 +41,8 @@ org.osgi.framework.system.packages= org.osgi.framework; ; version=1.3.0, \
org.xml.sax.helpers; \
javax.crypto; \
javax.crypto.spec; \
javax.crypto.interfaces;
javax.crypto.interfaces; \
say.swing;
felix.auto.start.10= reference:file:lib/bundle/org.apache.felix.bundlerepository-1.0.0.jar \
reference:file:lib/bundle/org.apache.felix.servicebinder-0.9.0-SNAPSHOT.jar

Binary file not shown.

Before

Width:  |  Height:  |  Size: 540 B

After

Width:  |  Height:  |  Size: 329 B

@ -738,13 +738,8 @@ private String processSmilies(String message, String contentType)
StringBuffer msgBuffer = new StringBuffer();
boolean matchSuccessfull = false;
while (m.find())
{
if (!matchSuccessfull)
matchSuccessfull = true;
String matchGroup = m.group().trim();
String replacement = endPlainTextTag + "<IMG SRC='"

@ -579,7 +579,7 @@ public void addTextInWriteArea(String text){
* @return The text contained in the write area editor.
*/
public String getTextFromWriteArea(String mimeType)
{
{
if (mimeType.equals(
OperationSetBasicInstantMessaging.DEFAULT_MIME_TYPE))
{
@ -605,9 +605,11 @@ public void cut(){
public void copy(){
JEditorPane editorPane = this.conversationPanel.getChatEditorPane();
if (editorPane.getSelectedText() == null) {
if (editorPane.getSelectedText() == null)
{
editorPane = this.writeMessagePanel.getEditorPane();
}
editorPane.copy();
}

@ -520,7 +520,8 @@ private class OpenSmileyAction
{
public void actionPerformed(ActionEvent e)
{
menusPanel.getMainToolBar().getSmiliesSelectorBox().open();
getCurrentChatPanel().getChatWritePanel()
.getEditTextToolBar().getSmiliesSelectorBox().open();
}
}
@ -613,8 +614,8 @@ else if (writePanelRightMenu.isVisible())
writePanelRightMenu.setVisible(false);
}
else if (selectedMenu != null
//|| contactMenu.isPopupMenuVisible()
|| menusPanel.getMainToolBar().hasSelectedMenus())
|| getCurrentChatPanel().getChatWritePanel()
.getEditTextToolBar().hasSelectedMenus())
{
menuSelectionManager.clearSelectedPath();
}

@ -8,6 +8,7 @@
import java.awt.*;
import java.awt.event.*;
import java.io.*;
import javax.swing.*;
import javax.swing.event.*;
@ -53,7 +54,7 @@ public class ChatWritePanel
private int typingState = -1;
private HTMLEditorKit htmlEditor = new HTMLEditorKit();
private SIPCommHTMLEditorKit htmlEditor = new SIPCommHTMLEditorKit();
private WritePanelRightButtonMenu rightButtonMenu;
@ -82,7 +83,7 @@ public ChatWritePanel(ChatPanel panel)
this.editorPane.addKeyListener(this);
this.editorPane.addMouseListener(this);
this.editTextToolBar = new EditTextToolBar(editorPane);
this.editTextToolBar = new EditTextToolBar(this);
this.add(editTextToolBar, BorderLayout.NORTH);
this.add(scrollPane, BorderLayout.CENTER);
@ -415,10 +416,16 @@ public String getTextAsHtml()
{
String msgText = editorPane.getText();
String formattedString = extractFormattedText(msgText);
String formattedString = msgText.replaceAll(
"<html>|<head>|<body>|</html>|</head>|</body>", "");
return formattedString
formattedString = extractFormattedText(formattedString);
if (formattedString.endsWith("<BR>"))
formattedString = formattedString
.substring(0, formattedString.lastIndexOf("<BR>"));
return formattedString;
}
/**
@ -459,6 +466,36 @@ public void clearWriteArea()
}
}
/**
* Appends the given text to the end of the contained HTML document. This
* method is used to insert smilies when user selects a smiley from the
* menu.
*
* @param text the text to append.
*/
public void appendText(String text)
{
HTMLDocument doc = (HTMLDocument) editorPane.getDocument();
Element currentElement
= doc.getCharacterElement(editorPane.getCaretPosition());
try
{
doc.insertAfterEnd(currentElement, text);
}
catch (BadLocationException e)
{
logger.error("Insert in the HTMLDocument failed.", e);
}
catch (IOException e)
{
logger.error("Insert in the HTMLDocument failed.", e);
}
this.editorPane.setCaretPosition(doc.getLength());
}
/**
* Return all html paragraph content separated by <BR/> tags.
*
@ -467,23 +504,18 @@ public void clearWriteArea()
*/
private String extractFormattedText(String msgText)
{
int firstIndex = msgText.indexOf("<p");
if (firstIndex != -1)
{
int lastIndex = msgText.indexOf("</p>", firstIndex);
if (lastIndex < 0)
lastIndex = msgText.length();
String resultString = msgText.replaceAll("<p\\b[^>]*>", "");
int firstTagClosureIndex = msgText.indexOf('>', firstIndex);
String pString = msgText
.substring(firstTagClosureIndex+1, lastIndex).trim();
return pString + "<BR>"
+ extractFormattedText(msgText.substring(lastIndex+1));
}
return resultString.replaceAll("<\\/p>", "<BR>");
}
return "";
/**
* Returns the toolbar above the chat write area.
*
* @return the toolbar above the chat write area.
*/
public EditTextToolBar getEditTextToolBar()
{
return editTextToolBar;
}
}

@ -915,7 +915,10 @@ private void sendInstantMessage()
Message msg;
if (im.isContentTypeSupported("text/html")
&& htmlText.matches("(.*?)(<b|<i|<u|<font)(.*?)"))
&& (htmlText.indexOf("<b") > -1
|| htmlText.indexOf("<i") > -1
|| htmlText.indexOf("<u") > -1
|| htmlText.indexOf("<font") > -1))
{
msg = im.createMessage( htmlText.getBytes(),
"text/html",

@ -28,7 +28,7 @@
public class SmiliesSelectorBox extends JMenuBar
implements ActionListener
{
private ChatWindow chatWindow;
private ChatWritePanel chatWritePanel;
private ArrayList imageList;
@ -53,11 +53,11 @@ public class SmiliesSelectorBox extends JMenuBar
*
* @param imageList The pack of smiley icons.
*/
public SmiliesSelectorBox(ArrayList imageList, ChatWindow chatWindow)
public SmiliesSelectorBox(ArrayList imageList, ChatWritePanel writePanel)
{
this.imageList = imageList;
this.chatWindow = chatWindow;
this.chatWritePanel = writePanel;
this.selectorBox.setUI(new SIPCommChatSelectorMenuUI());
@ -143,19 +143,17 @@ public void actionPerformed(ActionEvent e)
JMenuItem smileyItem = (JMenuItem) e.getSource();
String buttonText = smileyItem.getToolTipText();
for (int i = 0; i < this.imageList.size(); i++) {
for (int i = 0; i < this.imageList.size(); i++)
{
Smiley smiley = (Smiley) this.imageList.get(i);
if (buttonText.equals(smiley.getSmileyStrings()[0])) {
ChatPanel chatPanel = this.chatWindow
.getCurrentChatPanel();
String smileyString = smiley.getSmileyStrings()[0];
chatPanel.addTextInWriteArea(
smiley.getSmileyStrings()[0] + " ");
if (buttonText.equals(smileyString))
{
chatWritePanel.appendText(smileyString);
chatPanel.requestFocusInWriteArea();
chatWritePanel.getEditorPane().requestFocus();
}
}
}

@ -8,13 +8,18 @@
import java.awt.*;
import java.awt.event.*;
import java.util.*;
import javax.swing.*;
import javax.swing.event.*;
import javax.swing.text.*;
import javax.swing.text.html.*;
import say.swing.*;
import net.java.sip.communicator.impl.gui.customcontrols.*;
import net.java.sip.communicator.impl.gui.i18n.*;
import net.java.sip.communicator.impl.gui.main.chat.*;
import net.java.sip.communicator.impl.gui.utils.*;
import net.java.sip.communicator.util.*;
@ -32,16 +37,12 @@ public class EditTextToolBar
{
private Logger logger = Logger.getLogger(EditTextToolBar.class);
private ColorLabel colorLabel = new ColorLabel();
private Integer[] fontSizeConstants =
new Integer[]
{ 9, 10, 11, 12, 13, 14, 18, 24, 36, 48, 64,
72, 96, 144, 288 };
private JComboBox fontSizeCombo = new JComboBox(fontSizeConstants);
private JComboBox fontNameCombo;
private ChatWritePanel chatWritePanel;
private JEditorPane chatEditorPane;
@ -51,90 +52,162 @@ public class EditTextToolBar
private Action underlineAction = new HTMLEditorKit.UnderlineAction();
private JButton fontButton = new JButton(
new ImageIcon(ImageLoader.getImage(ImageLoader.FONT_ICON)));
private SmiliesSelectorBox smiliesBox;
private JToggleButton boldButton;
private JToggleButton italicButton;
private JToggleButton underlineButton;
/**
* Creates an instance and constructs the <tt>EditTextToolBar</tt>.
*/
public EditTextToolBar(JEditorPane panel)
public EditTextToolBar(ChatWritePanel writePanel)
{
this.chatEditorPane = panel;
this.fontNameCombo = new JComboBox(getSystemFontFamilies());
this.fontSizeCombo.setEditable(true);
this.chatWritePanel = writePanel;
this.chatEditorPane = writePanel.getEditorPane();
this.setRollover(true);
this.setLayout(new FlowLayout(FlowLayout.LEFT, 2, 0));
this.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0));
this.fontSizeCombo.setPreferredSize(new Dimension(50, 21));
this.initStyleToolbarButtons();
colorLabel.setPreferredSize(new Dimension(21, 21));
this.addSeparator();
this.initToolbarButtons();
this.add(fontButton);
// this.initFontComboBoxes();
this.addSeparator();
this.add(fontNameCombo);
this.add(fontSizeCombo);
this.initColorLabel();
this.addSeparator();
this.add(colorLabel);
logger.trace("[GUI] Editor Pane font name: "
+ chatEditorPane.getFont().getName());
this.smiliesBox = new SmiliesSelectorBox(
ImageLoader.getDefaultSmiliesPack(), chatWritePanel);
fontNameCombo.setSelectedItem(chatEditorPane.getFont().getName());
fontSizeCombo.setSelectedItem(chatEditorPane.getFont().getSize());
this.smiliesBox.setName("smiley");
this.smiliesBox.setToolTipText(
Messages.getI18NString("insertSmiley").getText() + " Ctrl-M");
fontNameCombo.addItemListener(new ItemListener()
{
public void itemStateChanged(ItemEvent evt)
{
String fontName = (String) evt.getItem();
this.add(smiliesBox);
ActionEvent actionEvent =
new ActionEvent(chatEditorPane,
ActionEvent.ACTION_PERFORMED, "");
Action action =
new HTMLEditorKit.FontFamilyAction(fontName, fontName);
logger.trace("[GUI] Editor Pane font name: "
+ chatEditorPane.getFont().getName());
action.actionPerformed(actionEvent);
fontButton.setPreferredSize(new Dimension(25, 25));
chatEditorPane.requestFocus();
}
});
fontSizeCombo.addActionListener(new ActionListener()
fontButton.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
public void actionPerformed(ActionEvent event)
{
ActionEvent evt =
new ActionEvent(chatEditorPane,
ActionEvent.ACTION_PERFORMED, "");
Integer fontSize =
(Integer) fontSizeCombo.getSelectedItem();
Action action =
new HTMLEditorKit.FontSizeAction( fontSize.toString(),
fontSize.intValue());
action.actionPerformed(evt);
chatEditorPane.requestFocus();
JFontChooser fontChooser = new JFontChooser();
fontChooser.setSelectedFontFamily(
chatEditorPane.getFont().getFontName());
fontChooser.setSelectedFontSize(
chatEditorPane.getFont().getSize());
if (boldButton.isSelected())
fontChooser.setSelectedFontStyle(Font.BOLD);
else if (italicButton.isSelected())
fontChooser.setSelectedFontStyle(Font.ITALIC);
int result = fontChooser.showDialog(chatWritePanel);
if (result == JFontChooser.OK_OPTION)
{
String fontName = fontChooser.getSelectedFontFamily();
int fontSize = fontChooser.getSelectedFontSize();
int fontStyle = fontChooser.getSelectedFontStyle();
ActionEvent fontNameActionEvent
= new ActionEvent( chatEditorPane,
ActionEvent.ACTION_PERFORMED,
fontName);
Action action = new StyledEditorKit.FontFamilyAction(
fontName,
fontName);
action.actionPerformed(fontNameActionEvent);
ActionEvent fontSizeActionEvent
= new ActionEvent( chatEditorPane,
ActionEvent.ACTION_PERFORMED,
new Integer(fontSize).toString());
action =
new StyledEditorKit.FontSizeAction(
new Integer(fontSize).toString(),
fontSize);
action.actionPerformed(fontSizeActionEvent);
if (fontStyle == Font.BOLD)
{
if (!boldButton.isSelected())
boldButton.doClick();
if (italicButton.isSelected())
italicButton.doClick();
}
else if (fontStyle == Font.ITALIC)
{
if (!italicButton.isSelected())
italicButton.doClick();
if (boldButton.isSelected())
boldButton.doClick();
}
else if (fontStyle == (Font.BOLD + Font.ITALIC))
{
if (!boldButton.isSelected())
boldButton.doClick();
if (!italicButton.isSelected())
italicButton.doClick();
}
else
{
if (boldButton.isSelected())
boldButton.doClick();
if (italicButton.isSelected())
italicButton.doClick();
}
chatEditorPane.requestFocus();
}
}
});
}
/**
* Initializes the label that changes font color.
*/
private void initColorLabel()
{
final ColorLabel colorLabel = new ColorLabel();
colorLabel.setPreferredSize(new Dimension(21, 21));
colorLabel.setOpaque(true);
colorLabel.setBackground(Color.BLACK);
this.add(colorLabel);
colorLabel.addMouseListener(new MouseAdapter()
{
public void mousePressed(MouseEvent arg0)
{
Color newColor =
JColorChooser.showDialog(new JColorChooser(),
"Choose a colour", colorLabel.getBackground());
"Choose a colour",
colorLabel.getBackground());
colorLabel.setBackground(newColor);
@ -151,11 +224,49 @@ public void mousePressed(MouseEvent arg0)
chatEditorPane.requestFocus();
}
});
chatEditorPane.addCaretListener(new CaretListener()
{
public void caretUpdate(CaretEvent e)
{
selectColor(StyleConstants.Foreground, colorLabel);
}
});
chatEditorPane.addKeyListener(new KeyAdapter()
{
public void keyTyped(KeyEvent e)
{
if (chatWritePanel.getText().length() > 0)
{
Color currentColor
= (Color) ((HTMLEditorKit) chatEditorPane
.getEditorKit()).getInputAttributes().getAttribute(
StyleConstants.Foreground);
if (currentColor != null)
colorLabel.setBackground(currentColor);
else
colorLabel.setBackground(Color.BLACK);
}
}
});
chatEditorPane.addMouseListener(new MouseAdapter()
{
public void mouseClicked(MouseEvent e)
{
selectColor(StyleConstants.Foreground, colorLabel);
}
});
}
private void initToolbarButtons()
/**
* Initializes Bold, Italic and Underline toggle buttons.
*/
private void initStyleToolbarButtons()
{
JToggleButton boldButton =
this.boldButton =
initStyleToggleButton(boldAction, StyleConstants.Bold);
boldButton.setIcon(new ImageIcon(ImageLoader
@ -163,7 +274,7 @@ private void initToolbarButtons()
this.add(boldButton);
JToggleButton italicButton =
this.italicButton =
initStyleToggleButton(italicAction, StyleConstants.Italic);
italicButton.setIcon(new ImageIcon(ImageLoader
@ -171,7 +282,7 @@ private void initToolbarButtons()
this.add(italicButton);
JToggleButton underlineButton =
this.underlineButton =
initStyleToggleButton(underlineAction, StyleConstants.Underline);
underlineButton.setIcon(new ImageIcon(ImageLoader
@ -182,6 +293,13 @@ private void initToolbarButtons()
this.addBindings();
}
/**
* Initializes a toggle button.
*
* @param action the action to associate with the button
* @param styleConstant the style constant
* @return the toggle button with the associated action and style constant
*/
private JToggleButton initStyleToggleButton(final Action action,
final Object styleConstant)
{
@ -193,6 +311,7 @@ private JToggleButton initStyleToggleButton(final Action action,
public void actionPerformed(ActionEvent e)
{
action.actionPerformed(e);
chatEditorPane.requestFocus();
}
});
@ -208,11 +327,15 @@ public void caretUpdate(CaretEvent e)
{
public void keyTyped(KeyEvent e)
{
button.setSelected(((HTMLEditorKit) chatEditorPane
.getEditorKit()).getInputAttributes().containsAttribute(
styleConstant, true));
if (chatEditorPane.getText().length() > 0)
{
button.setSelected(((HTMLEditorKit) chatEditorPane
.getEditorKit()).getInputAttributes().containsAttribute(
styleConstant, true));
}
}
});
chatEditorPane.addMouseListener(new MouseAdapter()
{
public void mouseClicked(MouseEvent e)
@ -220,14 +343,6 @@ public void mouseClicked(MouseEvent e)
selectButton(styleConstant, button);
}
});
button.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
{
chatEditorPane.requestFocus();
}
});
return button;
}
@ -235,8 +350,8 @@ public void actionPerformed(ActionEvent e)
* Selects or deselects the given toggle button depending on the given
* <tt>styleConstant</tt>.
*
* @param styleConstant
* @param button
* @param styleConstant the style constant
* @param button the button to select
*/
private void selectButton( final Object styleConstant,
final JToggleButton button)
@ -266,7 +381,48 @@ private void selectButton( final Object styleConstant,
|| attributes.containsAttribute(styleConstant, true);
}
}
button.setSelected(selected);
if (chatEditorPane.getText().length() > 0)
button.setSelected(selected);
}
/**
* Selects the color corresponding to the current style attribute.
*
* @param styleConstant the style constant
* @param colorLabel the color label to select the color from
*/
private void selectColor( final Object styleConstant,
final JLabel colorLabel)
{
Object selectedAttribute = null;
if (chatEditorPane.getSelectedText() == null)
{
int index = chatEditorPane.getCaretPosition();
selectedAttribute =
((HTMLDocument) chatEditorPane.getDocument())
.getCharacterElement(index - 1).getAttributes()
.getAttribute(styleConstant);
}
else
{
for (int index = chatEditorPane.getSelectionStart();
index < chatEditorPane.getSelectionEnd(); index++)
{
AttributeSet attributes =
((HTMLDocument) chatEditorPane.getDocument())
.getCharacterElement(index).getAttributes();
if (attributes.getAttribute(styleConstant) != null)
selectedAttribute = attributes.getAttribute(styleConstant);
}
}
if (selectedAttribute != null)
colorLabel.setBackground((Color)selectedAttribute);
else
colorLabel.setBackground(Color.BLACK);
}
/**
@ -302,9 +458,12 @@ private String[] getSystemFontFamilies()
GraphicsEnvironment ge =
GraphicsEnvironment.getLocalGraphicsEnvironment();
return ge.getAvailableFontFamilyNames();
return ge.getAvailableFontFamilyNames(Locale.getDefault());
}
/**
*
*/
private class ColorLabel extends JLabel
{
public void paintComponent(Graphics g)
@ -316,4 +475,28 @@ public void paintComponent(Graphics g)
g.fillRoundRect(0, 0, getWidth(), getHeight(), 8, 8);
}
}
/**
* Returns the button used to show the list of smilies.
*
* @return the button used to show the list of smilies.
*/
public SmiliesSelectorBox getSmiliesSelectorBox()
{
return smiliesBox;
}
/**
* Returns TRUE if there are selected menus in this toolbar, otherwise
* returns FALSE.
* @return TRUE if there are selected menus in this toolbar, otherwise
* returns FALSE
*/
public boolean hasSelectedMenus()
{
if(smiliesBox.isMenuSelected())
return true;
return false;
}
}

@ -93,8 +93,6 @@ public class ExtendedMainToolBar
private static int DEFAULT_BUTTON_WIDTH
= GuiActivator.getResources().getSettingsInt("mainToolbarButtonWidth");
private SmiliesSelectorBox smiliesBox;
private ChatWindow messageWindow;
private Contact currentChatContact = null;
@ -108,12 +106,6 @@ public ExtendedMainToolBar(ChatWindow messageWindow)
{
this.messageWindow = messageWindow;
this.smiliesBox = new SmiliesSelectorBox(
ImageLoader.getDefaultSmiliesPack(), messageWindow);
this.smiliesBox.setText(Messages.getI18NString("smiley").getText());
this.smiliesBox.setRollover(true);
this.setRollover(true);
this.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
this.setPreferredSize(new Dimension(300, DEFAULT_BUTTON_HEIGHT));
@ -131,10 +123,6 @@ public ExtendedMainToolBar(ChatWindow messageWindow)
this.addSeparator();
this.add(smiliesBox);
this.addSeparator();
this.add(previousButton);
this.add(nextButton);
@ -170,10 +158,6 @@ public ExtendedMainToolBar(ChatWindow messageWindow)
this.pasteButton.setToolTipText(
Messages.getI18NString("paste").getText() + " Ctrl-P");
this.smiliesBox.setName("smiley");
this.smiliesBox.setToolTipText(
Messages.getI18NString("insertSmiley").getText() + " Ctrl-M");
this.previousButton.setName("previous");
this.previousButton.setToolTipText(
Messages.getI18NString("previous").getText());

@ -84,8 +84,6 @@ public class MainToolBar
private static int BUTTON_WIDTH
= GuiActivator.getResources().getSettingsInt("mainToolbarButtonWidth");
private SmiliesSelectorBox smiliesBox;
private ChatWindow messageWindow;
private Contact currentChatContact = null;
@ -106,9 +104,6 @@ public MainToolBar(ChatWindow messageWindow) {
this.messageWindow = messageWindow;
this.smiliesBox = new SmiliesSelectorBox(
ImageLoader.getDefaultSmiliesPack(), messageWindow);
this.setRollover(true);
this.setLayout(new FlowLayout(FlowLayout.LEFT, 3, 0));
this.setBorder(BorderFactory.createEmptyBorder(2, 2, 5, 2));
@ -124,10 +119,6 @@ public MainToolBar(ChatWindow messageWindow) {
this.addSeparator();
this.add(smiliesBox);
this.addSeparator();
this.add(previousButton);
this.add(nextButton);
@ -164,10 +155,6 @@ public MainToolBar(ChatWindow messageWindow) {
this.pasteButton.setToolTipText(
Messages.getI18NString("paste").getText() + " Ctrl-P");
this.smiliesBox.setName("smiley");
this.smiliesBox.setToolTipText(
Messages.getI18NString("insertSmiley").getText() + " Ctrl-M");
this.previousButton.setName("previous");
this.previousButton.setToolTipText(
Messages.getI18NString("previous").getText());
@ -365,16 +352,6 @@ else if (buttonText.equalsIgnoreCase("addContact"))
}
}
/**
* Returns the button used to show the list of smilies.
*
* @return the button used to show the list of smilies.
*/
public SmiliesSelectorBox getSmiliesSelectorBox()
{
return smiliesBox;
}
/**
* Returns the button used to show the history window.
*
@ -384,20 +361,6 @@ public ChatToolbarButton getHistoryButton()
{
return historyButton;
}
/**
* Returns TRUE if there are selected menus in this toolbar, otherwise
* returns FALSE.
* @return TRUE if there are selected menus in this toolbar, otherwise
* returns FALSE
*/
public boolean hasSelectedMenus()
{
if(smiliesBox.isMenuSelected())
return true;
return false;
}
/**
* Disables/Enables history arrow buttons depending on whether the

@ -145,17 +145,11 @@ public void actionPerformed(ActionEvent e) {
JMenuItem menuItem = (JMenuItem) e.getSource();
String itemName = menuItem.getName();
if (itemName.equals("newAccount")) {
AccountRegWizardContainerImpl wizard
= (AccountRegWizardContainerImpl)GuiActivator.getUIService()
.getAccountRegWizardContainer();
wizard.setTitle(
Messages.getI18NString("accountRegistrationWizard").getText());
wizard.newAccount();
if (itemName.equals("newAccount"))
{
NewAccountDialog dialog = new NewAccountDialog();
wizard.showDialog(false);
dialog.setVisible(true);
}
else if (itemName.equals("addContact")) {
AddContactWizard wizard = new AddContactWizard(parentWindow);

@ -40,4 +40,5 @@ Import-Package: org.osgi.framework,
javax.swing.undo,
javax.swing.border,
net.java.sip.communicator.service.audionotifier,
org.jdesktop.jdic.desktop
org.jdesktop.jdic.desktop,
say.swing

Loading…
Cancel
Save