1 diff -Nbdru org/jivesoftware/smack/ConnectionConfiguration.java /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/ConnectionConfiguration.java

     2 --- org/jivesoftware/smack/ConnectionConfiguration.java	2009-06-26 21:11:24.609252239 +0200

     3 +++ /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/ConnectionConfiguration.java	2009-06-25 22:41:46.281648000 +0200

     4 @@ -63,7 +63,7 @@

     5       */

     6      private CallbackHandler callbackHandler;

     7  

     8 -    private boolean debuggerEnabled = XMPPConnection.DEBUG_ENABLED;

     9 +    private boolean debuggerEnabled = false;

    10  

    11      // Flag that indicates if a reconnection should be attempted when abruptly disconnected

    12      private boolean reconnectionAllowed = true;

    13 diff -Nbdru org/jivesoftware/smack/debugger/LiteDebugger.java /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/debugger/LiteDebugger.java

    14 --- org/jivesoftware/smack/debugger/LiteDebugger.java	2009-06-26 21:11:22.316252115 +0200

    15 +++ /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/debugger/LiteDebugger.java	1970-01-01 01:00:00.000000000 +0100

    16 @@ -1,336 +0,0 @@

    17 -/**

    18 - * $RCSfile$

    19 - * $Revision: 7071 $

    20 - * $Date: 2007-02-12 01:59:05 +0100 (Mon, 12 Feb 2007) $

    21 - *

    22 - * Copyright 2003-2007 Jive Software.

    23 - *

    24 - * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");

    25 - * you may not use this file except in compliance with the License.

    26 - * You may obtain a copy of the License at

    27 - *

    28 - *     http://www.apache.org/licenses/LICENSE-2.0

    29 - *

    30 - * Unless required by applicable law or agreed to in writing, software

    31 - * distributed under the License is distributed on an "AS IS" BASIS,

    32 - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    33 - * See the License for the specific language governing permissions and

    34 - * limitations under the License.

    35 - */

    36 -

    37 -package org.jivesoftware.smack.debugger;

    38 -

    39 -import java.awt.*;

    40 -import java.awt.datatransfer.*;

    41 -import java.awt.event.*;

    42 -import java.io.*;

    43 -

    44 -import javax.swing.*;

    45 -

    46 -import org.jivesoftware.smack.*;

    47 -import org.jivesoftware.smack.packet.*;

    48 -import org.jivesoftware.smack.util.*;

    49 -

    50 -/**

    51 - * The LiteDebugger is a very simple debugger that allows to debug sent, received and 

    52 - * interpreted messages.

    53 - * 

    54 - * @author Gaston Dombiak

    55 - */

    56 -public class LiteDebugger implements SmackDebugger {

    57 -

    58 -    private static final String NEWLINE = "\n";

    59 -

    60 -    private JFrame frame = null;

    61 -    private XMPPConnection connection = null;

    62 -

    63 -    private PacketListener listener = null;

    64 -

    65 -    private Writer writer;

    66 -    private Reader reader;

    67 -    private ReaderListener readerListener;

    68 -    private WriterListener writerListener;

    69 -

    70 -    public LiteDebugger(XMPPConnection connection, Writer writer, Reader reader) {

    71 -        this.connection = connection;

    72 -        this.writer = writer;

    73 -        this.reader = reader;

    74 -        createDebug();

    75 -    }

    76 -

    77 -    /**

    78 -     * Creates the debug process, which is a GUI window that displays XML traffic.

    79 -     */

    80 -    private void createDebug() {

    81 -        frame = new JFrame("Smack Debug Window -- " + connection.getServiceName() + ":" +

    82 -                connection.getPort());

    83 -

    84 -        // Add listener for window closing event 

    85 -        frame.addWindowListener(new WindowAdapter() {

    86 -            public void windowClosing(WindowEvent evt) {

    87 -                rootWindowClosing(evt);

    88 -            }

    89 -        });

    90 -

    91 -        // We'll arrange the UI into four tabs. The first tab contains all data, the second

    92 -        // client generated XML, the third server generated XML, and the fourth is packet

    93 -        // data from the server as seen by Smack.

    94 -        JTabbedPane tabbedPane = new JTabbedPane();

    95 -

    96 -        JPanel allPane = new JPanel();

    97 -        allPane.setLayout(new GridLayout(3, 1));

    98 -        tabbedPane.add("All", allPane);

    99 -

   100 -        // Create UI elements for client generated XML traffic.

   101 -        final JTextArea sentText1 = new JTextArea();

   102 -        final JTextArea sentText2 = new JTextArea();

   103 -        sentText1.setEditable(false);

   104 -        sentText2.setEditable(false);

   105 -        sentText1.setForeground(new Color(112, 3, 3));

   106 -        sentText2.setForeground(new Color(112, 3, 3));

   107 -        allPane.add(new JScrollPane(sentText1));

   108 -        tabbedPane.add("Sent", new JScrollPane(sentText2));

   109 -

   110 -        // Add pop-up menu.

   111 -        JPopupMenu menu = new JPopupMenu();

   112 -        JMenuItem menuItem1 = new JMenuItem("Copy");

   113 -        menuItem1.addActionListener(new ActionListener() {

   114 -            public void actionPerformed(ActionEvent e) {

   115 -                // Get the clipboard

   116 -                Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();

   117 -                // Set the sent text as the new content of the clipboard

   118 -                clipboard.setContents(new StringSelection(sentText1.getText()), null);

   119 -            }

   120 -        });

   121 -

   122 -        JMenuItem menuItem2 = new JMenuItem("Clear");

   123 -        menuItem2.addActionListener(new ActionListener() {

   124 -            public void actionPerformed(ActionEvent e) {

   125 -                sentText1.setText("");

   126 -                sentText2.setText("");

   127 -            }

   128 -        });

   129 -

   130 -        // Add listener to the text area so the popup menu can come up.

   131 -        MouseListener popupListener = new PopupListener(menu);

   132 -        sentText1.addMouseListener(popupListener);

   133 -        sentText2.addMouseListener(popupListener);

   134 -        menu.add(menuItem1);

   135 -        menu.add(menuItem2);

   136 -

   137 -        // Create UI elements for server generated XML traffic.

   138 -        final JTextArea receivedText1 = new JTextArea();

   139 -        final JTextArea receivedText2 = new JTextArea();

   140 -        receivedText1.setEditable(false);

   141 -        receivedText2.setEditable(false);

   142 -        receivedText1.setForeground(new Color(6, 76, 133));

   143 -        receivedText2.setForeground(new Color(6, 76, 133));

   144 -        allPane.add(new JScrollPane(receivedText1));

   145 -        tabbedPane.add("Received", new JScrollPane(receivedText2));

   146 -

   147 -        // Add pop-up menu.

   148 -        menu = new JPopupMenu();

   149 -        menuItem1 = new JMenuItem("Copy");

   150 -        menuItem1.addActionListener(new ActionListener() {

   151 -            public void actionPerformed(ActionEvent e) {

   152 -                // Get the clipboard

   153 -                Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();

   154 -                // Set the sent text as the new content of the clipboard

   155 -                clipboard.setContents(new StringSelection(receivedText1.getText()), null);

   156 -            }

   157 -        });

   158 -

   159 -        menuItem2 = new JMenuItem("Clear");

   160 -        menuItem2.addActionListener(new ActionListener() {

   161 -            public void actionPerformed(ActionEvent e) {

   162 -                receivedText1.setText("");

   163 -                receivedText2.setText("");

   164 -            }

   165 -        });

   166 -

   167 -        // Add listener to the text area so the popup menu can come up.

   168 -        popupListener = new PopupListener(menu);

   169 -        receivedText1.addMouseListener(popupListener);

   170 -        receivedText2.addMouseListener(popupListener);

   171 -        menu.add(menuItem1);

   172 -        menu.add(menuItem2);

   173 -

   174 -        // Create UI elements for interpreted XML traffic.

   175 -        final JTextArea interpretedText1 = new JTextArea();

   176 -        final JTextArea interpretedText2 = new JTextArea();

   177 -        interpretedText1.setEditable(false);

   178 -        interpretedText2.setEditable(false);

   179 -        interpretedText1.setForeground(new Color(1, 94, 35));

   180 -        interpretedText2.setForeground(new Color(1, 94, 35));

   181 -        allPane.add(new JScrollPane(interpretedText1));

   182 -        tabbedPane.add("Interpreted", new JScrollPane(interpretedText2));

   183 -

   184 -        // Add pop-up menu.

   185 -        menu = new JPopupMenu();

   186 -        menuItem1 = new JMenuItem("Copy");

   187 -        menuItem1.addActionListener(new ActionListener() {

   188 -            public void actionPerformed(ActionEvent e) {

   189 -                // Get the clipboard

   190 -                Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();

   191 -                // Set the sent text as the new content of the clipboard

   192 -                clipboard.setContents(new StringSelection(interpretedText1.getText()), null);

   193 -            }

   194 -        });

   195 -

   196 -        menuItem2 = new JMenuItem("Clear");

   197 -        menuItem2.addActionListener(new ActionListener() {

   198 -            public void actionPerformed(ActionEvent e) {

   199 -                interpretedText1.setText("");

   200 -                interpretedText2.setText("");

   201 -            }

   202 -        });

   203 -

   204 -        // Add listener to the text area so the popup menu can come up.

   205 -        popupListener = new PopupListener(menu);

   206 -        interpretedText1.addMouseListener(popupListener);

   207 -        interpretedText2.addMouseListener(popupListener);

   208 -        menu.add(menuItem1);

   209 -        menu.add(menuItem2);

   210 -

   211 -        frame.getContentPane().add(tabbedPane);

   212 -

   213 -        frame.setSize(550, 400);

   214 -        frame.setVisible(true);

   215 -

   216 -        // Create a special Reader that wraps the main Reader and logs data to the GUI.

   217 -        ObservableReader debugReader = new ObservableReader(reader);

   218 -        readerListener = new ReaderListener() {

   219 -                    public void read(String str) {

   220 -                        int index = str.lastIndexOf(">");

   221 -                        if (index != -1) {

   222 -                            receivedText1.append(str.substring(0, index + 1));

   223 -                            receivedText2.append(str.substring(0, index + 1));

   224 -                            receivedText1.append(NEWLINE);

   225 -                            receivedText2.append(NEWLINE);

   226 -                            if (str.length() > index) {

   227 -                                receivedText1.append(str.substring(index + 1));

   228 -                                receivedText2.append(str.substring(index + 1));

   229 -                            }

   230 -                        }

   231 -                        else {

   232 -                            receivedText1.append(str);

   233 -                            receivedText2.append(str);

   234 -                        }

   235 -                    }

   236 -                };

   237 -        debugReader.addReaderListener(readerListener);

   238 -

   239 -        // Create a special Writer that wraps the main Writer and logs data to the GUI.

   240 -        ObservableWriter debugWriter = new ObservableWriter(writer);

   241 -        writerListener = new WriterListener() {

   242 -                    public void write(String str) {

   243 -                        sentText1.append(str);

   244 -                        sentText2.append(str);

   245 -                        if (str.endsWith(">")) {

   246 -                            sentText1.append(NEWLINE);

   247 -                            sentText2.append(NEWLINE);

   248 -                        }

   249 -                    }

   250 -                };

   251 -        debugWriter.addWriterListener(writerListener);

   252 -

   253 -        // Assign the reader/writer objects to use the debug versions. The packet reader

   254 -        // and writer will use the debug versions when they are created.

   255 -        reader = debugReader;

   256 -        writer = debugWriter;

   257 -

   258 -        // Create a thread that will listen for all incoming packets and write them to

   259 -        // the GUI. This is what we call "interpreted" packet data, since it's the packet

   260 -        // data as Smack sees it and not as it's coming in as raw XML.

   261 -        listener = new PacketListener() {

   262 -            public void processPacket(Packet packet) {

   263 -                interpretedText1.append(packet.toXML());

   264 -                interpretedText2.append(packet.toXML());

   265 -                interpretedText1.append(NEWLINE);

   266 -                interpretedText2.append(NEWLINE);

   267 -            }

   268 -        };

   269 -    }

   270 -

   271 -    /**

   272 -     * Notification that the root window is closing. Stop listening for received and 

   273 -     * transmitted packets.

   274 -     * 

   275 -     * @param evt the event that indicates that the root window is closing 

   276 -     */

   277 -    public void rootWindowClosing(WindowEvent evt) {

   278 -        connection.removePacketListener(listener);

   279 -        ((ObservableReader)reader).removeReaderListener(readerListener);

   280 -        ((ObservableWriter)writer).removeWriterListener(writerListener);

   281 -    }

   282 -

   283 -    /**

   284 -     * Listens for debug window popup dialog events.

   285 -     */

   286 -    private class PopupListener extends MouseAdapter {

   287 -        JPopupMenu popup;

   288 -

   289 -        PopupListener(JPopupMenu popupMenu) {

   290 -            popup = popupMenu;

   291 -        }

   292 -

   293 -        public void mousePressed(MouseEvent e) {

   294 -            maybeShowPopup(e);

   295 -        }

   296 -

   297 -        public void mouseReleased(MouseEvent e) {

   298 -            maybeShowPopup(e);

   299 -        }

   300 -

   301 -        private void maybeShowPopup(MouseEvent e) {

   302 -            if (e.isPopupTrigger()) {

   303 -                popup.show(e.getComponent(), e.getX(), e.getY());

   304 -            }

   305 -        }

   306 -    }

   307 -

   308 -    public Reader newConnectionReader(Reader newReader) {

   309 -        ((ObservableReader)reader).removeReaderListener(readerListener);

   310 -        ObservableReader debugReader = new ObservableReader(newReader);

   311 -        debugReader.addReaderListener(readerListener);

   312 -        reader = debugReader;

   313 -        return reader;

   314 -    }

   315 -

   316 -    public Writer newConnectionWriter(Writer newWriter) {

   317 -        ((ObservableWriter)writer).removeWriterListener(writerListener);

   318 -        ObservableWriter debugWriter = new ObservableWriter(newWriter);

   319 -        debugWriter.addWriterListener(writerListener);

   320 -        writer = debugWriter;

   321 -        return writer;

   322 -    }

   323 -

   324 -    public void userHasLogged(String user) {

   325 -        boolean isAnonymous = "".equals(StringUtils.parseName(user));

   326 -        String title =

   327 -            "Smack Debug Window -- "

   328 -                + (isAnonymous ? "" : StringUtils.parseBareAddress(user))

   329 -                + "@"

   330 -                + connection.getServiceName()

   331 -                + ":"

   332 -                + connection.getPort();

   333 -        title += "/" + StringUtils.parseResource(user);

   334 -        frame.setTitle(title);

   335 -    }

   336 -

   337 -    public Reader getReader() {

   338 -        return reader;

   339 -    }

   340 -

   341 -    public Writer getWriter() {

   342 -        return writer;

   343 -    }

   344 -

   345 -    public PacketListener getReaderListener() {

   346 -        return listener;

   347 -    }

   348 -

   349 -    public PacketListener getWriterListener() {

   350 -        return null;

   351 -    }

   352 -}

   353 diff -Nbdru org/jivesoftware/smack/sasl/SASLGSSAPIMechanism.java /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/sasl/SASLGSSAPIMechanism.java

   354 --- org/jivesoftware/smack/sasl/SASLGSSAPIMechanism.java	2009-06-26 21:11:23.436473310 +0200

   355 +++ /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/sasl/SASLGSSAPIMechanism.java	2009-06-26 20:56:01.656252399 +0200

   356 @@ -25,8 +25,9 @@

   357  import java.io.IOException;

   358  import java.util.Map;

   359  import java.util.HashMap;

   360 -import javax.security.sasl.Sasl;

   361 -import javax.security.sasl.SaslClient;

   362 +

   363 +import security.javax.security.sasl.Sasl;

   364 +

   365  import javax.security.auth.callback.CallbackHandler;

   366  

   367  /**

   368 @@ -63,7 +64,7 @@

   369          String[] mechanisms = { getName() };

   370          Map props = new HashMap();

   371          props.put(Sasl.SERVER_AUTH,"TRUE");

   372 -        sc = Sasl.createSaslClient(mechanisms, username, "xmpp", host, props, cbh);

   373 +        sc = Sasl.createSaslClient(mechanisms, username, "xmpp", host, props, (javax.security.auth.callback.CallbackHandler)cbh);

   374          authenticate();

   375      }

   376  

   377 diff -Nbdru org/jivesoftware/smack/sasl/SASLMechanism.java /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/sasl/SASLMechanism.java

   378 --- org/jivesoftware/smack/sasl/SASLMechanism.java	2009-06-26 21:11:23.436473310 +0200

   379 +++ /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/sasl/SASLMechanism.java	2009-06-26 21:23:03.244251498 +0200

   380 @@ -20,23 +20,25 @@

   381  

   382  package org.jivesoftware.smack.sasl;

   383  

   384 -import org.jivesoftware.smack.XMPPException;

   385 -import org.jivesoftware.smack.SASLAuthentication;

   386 -import org.jivesoftware.smack.util.Base64;

   387 -

   388  import java.io.IOException;

   389 -import java.util.Map;

   390  import java.util.HashMap;

   391 -import javax.security.auth.callback.CallbackHandler;

   392 -import javax.security.auth.callback.UnsupportedCallbackException;

   393 +import java.util.Map;

   394 +

   395  import javax.security.auth.callback.Callback;

   396 -import javax.security.auth.callback.NameCallback;

   397 +import javax.security.auth.callback.CallbackHandler;

   398  import javax.security.auth.callback.PasswordCallback;

   399 -import javax.security.sasl.RealmCallback;

   400 -import javax.security.sasl.RealmChoiceCallback;

   401 -import javax.security.sasl.Sasl;

   402 -import javax.security.sasl.SaslClient;

   403 -import javax.security.sasl.SaslException;

   404 +import javax.security.auth.callback.UnsupportedCallbackException;

   405 +

   406 +import org.jivesoftware.smack.SASLAuthentication;

   407 +import org.jivesoftware.smack.XMPPException;

   408 +import org.jivesoftware.smack.util.Base64;

   409 +

   410 +import security.javax.security.auth.callback.NameCallback;

   411 +import security.javax.security.sasl.RealmCallback;

   412 +import security.javax.security.sasl.RealmChoiceCallback;

   413 +import security.javax.security.sasl.Sasl;

   414 +import security.javax.security.sasl.SaslClient;

   415 +import security.javax.security.sasl.SaslException;

   416  

   417  /**

   418   * Base class for SASL mechanisms. Subclasses must implement these methods:

   419 @@ -148,12 +150,13 @@

   420          } else {

   421              response = sc.evaluateChallenge(null);

   422          }

   423 -

   424 -        String authenticationText = Base64.encodeBytes(response,Base64.DONT_BREAK_LINES);

   425 +        String authenticationText = "";

   426 +        if (response != null) {

   427 +        authenticationText = Base64.encodeBytes(response,Base64.DONT_BREAK_LINES);

   428          if(authenticationText.equals("")) {

   429              authenticationText = "=";

   430          }

   431 -

   432 +        }

   433          stanza.append("<response xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");

   434          stanza.append(authenticationText);

   435          stanza.append("</response>");

   436 diff -Nbdru org/jivesoftware/smack/SASLAuthentication.java /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/SASLAuthentication.java

   437 --- org/jivesoftware/smack/SASLAuthentication.java	2009-06-26 21:11:24.597252589 +0200

   438 +++ /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/SASLAuthentication.java	2009-06-26 21:31:16.445251493 +0200

   439 @@ -84,17 +84,15 @@

   440  

   441          // Register SASL mechanisms supported by Smack

   442          registerSASLMechanism("EXTERNAL", SASLExternalMechanism.class);

   443 -        registerSASLMechanism("GSSAPI", SASLGSSAPIMechanism.class);

   444          registerSASLMechanism("DIGEST-MD5", SASLDigestMD5Mechanism.class);

   445          registerSASLMechanism("CRAM-MD5", SASLCramMD5Mechanism.class);

   446          registerSASLMechanism("PLAIN", SASLPlainMechanism.class);

   447          registerSASLMechanism("ANONYMOUS", SASLAnonymous.class);

   448  

   449 -        supportSASLMechanism("GSSAPI",0);

   450 -        supportSASLMechanism("DIGEST-MD5",1);

   451 -        supportSASLMechanism("CRAM-MD5",2);

   452 -        supportSASLMechanism("PLAIN",3);

   453 -        supportSASLMechanism("ANONYMOUS",4);

   454 +        supportSASLMechanism("DIGEST-MD5",0);

   455 +        supportSASLMechanism("CRAM-MD5",1);

   456 +        supportSASLMechanism("PLAIN",2);

   457 +        supportSASLMechanism("ANONYMOUS",3);

   458  

   459      }

   460  

   461 diff -Nbdru org/jivesoftware/smack/util/DNSUtil.java /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/util/DNSUtil.java

   462 --- org/jivesoftware/smack/util/DNSUtil.java	2009-06-26 21:11:24.585252398 +0200

   463 +++ /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/util/DNSUtil.java	2009-06-26 00:41:16.932251881 +0200

   464 @@ -22,12 +22,6 @@

   465  import java.util.Hashtable;

   466  import java.util.Map;

   467  

   468 -import javax.naming.NamingEnumeration;

   469 -import javax.naming.directory.Attribute;

   470 -import javax.naming.directory.Attributes;

   471 -import javax.naming.directory.DirContext;

   472 -import javax.naming.directory.InitialDirContext;

   473 -

   474  /**

   475   * Utilty class to perform DNS lookups for XMPP services.

   476   *

   477 @@ -41,13 +35,13 @@

   478       */

   479      private static Map cache = new Cache(100, 1000*60*10);

   480  

   481 -    private static DirContext context;

   482 +//    private static DirContext context;

   483  

   484      static {

   485          try {

   486              Hashtable env = new Hashtable();

   487              env.put("java.naming.factory.initial", "com.sun.jndi.dns.DnsContextFactory");

   488 -            context = new InitialDirContext(env);

   489 + //           context = new InitialDirContext(env);

   490          }

   491          catch (Exception e) {

   492              // Ignore.

   493 @@ -79,65 +73,8 @@

   494       *      server can be reached at for the specified domain.

   495       */

   496      public static HostAddress resolveXMPPDomain(String domain) {

   497 -        if (context == null) {

   498              return new HostAddress(domain, 5222);

   499          }

   500 -        String key = "c" + domain;

   501 -        // Return item from cache if it exists.

   502 -        if (cache.containsKey(key)) {

   503 -            HostAddress address = (HostAddress)cache.get(key);

   504 -            if (address != null) {

   505 -                return address;

   506 -            }

   507 -        }

   508 -        String bestHost = domain;

   509 -        int bestPort = 5222;

   510 -        int bestPriority = 0;

   511 -        int bestWeight = 0;

   512 -        try {

   513 -            Attributes dnsLookup = context.getAttributes("_xmpp-client._tcp." + domain, new String[]{"SRV"});

   514 -            Attribute srvAttribute = dnsLookup.get("SRV");

   515 -            NamingEnumeration srvRecords = srvAttribute.getAll();

   516 -            while(srvRecords.hasMore()) {

   517 -				String srvRecord = (String) srvRecords.next();

   518 -	            String [] srvRecordEntries = srvRecord.split(" ");

   519 -	            int priority = Integer.parseInt(srvRecordEntries[srvRecordEntries.length - 4]);

   520 -	            int port = Integer.parseInt(srvRecordEntries[srvRecordEntries.length-2]);

   521 -	            int weight = Integer.parseInt(srvRecordEntries[srvRecordEntries.length - 3]);

   522 -	            String host = srvRecordEntries[srvRecordEntries.length-1];

   523 -	            

   524 -	            // Randomize the weight.

   525 -	            weight *= Math.random() * weight;

   526 -	            

   527 -	            if ((bestPriority == 0) || (priority < bestPriority)) {

   528 -	            	// Choose a server with the lowest priority.

   529 -	            	bestPriority = priority;

   530 -	            	bestWeight = weight;

   531 -	            	bestHost = host;

   532 -	            	bestPort = port;

   533 -	            } else if (priority == bestPriority) {

   534 -	            	// When we have like priorities then randomly choose a server based on its weight

   535 -	            	// The weights were randomized above.

   536 -	            	if (weight > bestWeight) {

   537 -	            		bestWeight = weight;

   538 -	            		bestHost = host;

   539 -	            		bestPort = port;

   540 -	            	}

   541 -	            }

   542 -			}

   543 -        }

   544 -        catch (Exception e) {

   545 -            // Ignore.

   546 -        }

   547 -        // Host entries in DNS should end with a ".".

   548 -        if (bestHost.endsWith(".")) {

   549 -        	bestHost = bestHost.substring(0, bestHost.length()-1);

   550 -        }

   551 -        HostAddress address = new HostAddress(bestHost, bestPort);

   552 -        // Add item to cache.

   553 -        cache.put(key, address);

   554 -        return address;

   555 -    }

   556  

   557      /**

   558       * Returns the host name and port that the specified XMPP server can be

   559 @@ -157,50 +94,8 @@

   560       *      server can be reached at for the specified domain.

   561       */

   562      public static HostAddress resolveXMPPServerDomain(String domain) {

   563 -        if (context == null) {

   564              return new HostAddress(domain, 5269);

   565          }

   566 -        String key = "s" + domain;

   567 -        // Return item from cache if it exists.

   568 -        if (cache.containsKey(key)) {

   569 -            HostAddress address = (HostAddress)cache.get(key);

   570 -            if (address != null) {

   571 -                return address;

   572 -            }

   573 -        }

   574 -        String host = domain;

   575 -        int port = 5269;

   576 -        try {

   577 -            Attributes dnsLookup =

   578 -                    context.getAttributes("_xmpp-server._tcp." + domain, new String[]{"SRV"});

   579 -            String srvRecord = (String)dnsLookup.get("SRV").get();

   580 -            String [] srvRecordEntries = srvRecord.split(" ");

   581 -            port = Integer.parseInt(srvRecordEntries[srvRecordEntries.length-2]);

   582 -            host = srvRecordEntries[srvRecordEntries.length-1];

   583 -        }

   584 -        catch (Exception e) {

   585 -            // Attempt lookup with older "jabber" name.

   586 -            try {

   587 -                Attributes dnsLookup =

   588 -                        context.getAttributes("_jabber._tcp." + domain, new String[]{"SRV"});

   589 -                String srvRecord = (String)dnsLookup.get("SRV").get();

   590 -                String [] srvRecordEntries = srvRecord.split(" ");

   591 -                port = Integer.parseInt(srvRecordEntries[srvRecordEntries.length-2]);

   592 -                host = srvRecordEntries[srvRecordEntries.length-1];

   593 -            }

   594 -            catch (Exception e2) {

   595 -                // Ignore.

   596 -            }

   597 -        }

   598 -        // Host entries in DNS should end with a ".".

   599 -        if (host.endsWith(".")) {

   600 -            host = host.substring(0, host.length()-1);

   601 -        }

   602 -        HostAddress address = new HostAddress(host, port);

   603 -        // Add item to cache.

   604 -        cache.put(key, address);

   605 -        return address;

   606 -    }

   607  

   608      /**

   609       * Encapsulates a hostname and port.

   610 diff -Nbdru org/jivesoftware/smack/util/PacketParserUtils.java /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/util/PacketParserUtils.java

   611 --- org/jivesoftware/smack/util/PacketParserUtils.java	2009-06-26 21:11:24.585252398 +0200

   612 +++ /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/util/PacketParserUtils.java	2009-06-25 22:34:41.252416000 +0200

   613 @@ -25,7 +25,7 @@

   614  import org.jivesoftware.smack.provider.ProviderManager;

   615  import org.xmlpull.v1.XmlPullParser;

   616  

   617 -import java.beans.PropertyDescriptor;

   618 +//import java.beans.PropertyDescriptor;

   619  import java.io.ByteArrayInputStream;

   620  import java.io.ObjectInputStream;

   621  import java.util.ArrayList;

   622 @@ -428,26 +428,26 @@

   623      {

   624          boolean done = false;

   625          Object object = objectClass.newInstance();

   626 -        while (!done) {

   627 -            int eventType = parser.next();

   628 -            if (eventType == XmlPullParser.START_TAG) {

   629 -                String name = parser.getName();

   630 -                String stringValue = parser.nextText();

   631 -                PropertyDescriptor descriptor = new PropertyDescriptor(name, objectClass);

   632 -                // Load the class type of the property.

   633 -                Class propertyType = descriptor.getPropertyType();

   634 -                // Get the value of the property by converting it from a

   635 -                // String to the correct object type.

   636 -                Object value = decode(propertyType, stringValue);

   637 -                // Set the value of the bean.

   638 -                descriptor.getWriteMethod().invoke(object, value);

   639 -            }

   640 -            else if (eventType == XmlPullParser.END_TAG) {

   641 -                if (parser.getName().equals(elementName)) {

   642 -                    done = true;

   643 -                }

   644 -            }

   645 -        }

   646 +//        while (!done) {

   647 +//            int eventType = parser.next();

   648 +//            if (eventType == XmlPullParser.START_TAG) {

   649 +//                String name = parser.getName();

   650 +//                String stringValue = parser.nextText();

   651 +//                PropertyDescriptor descriptor = new PropertyDescriptor(name, objectClass);

   652 +//                // Load the class type of the property.

   653 +//                Class propertyType = descriptor.getPropertyType();

   654 +//                // Get the value of the property by converting it from a

   655 +//                // String to the correct object type.

   656 +//                Object value = decode(propertyType, stringValue);

   657 +//                // Set the value of the bean.

   658 +//                descriptor.getWriteMethod().invoke(object, value);

   659 +//            }

   660 +//            else if (eventType == XmlPullParser.END_TAG) {

   661 +//                if (parser.getName().equals(elementName)) {

   662 +//                    done = true;

   663 +//                }

   664 +//            }

   665 +//        }

   666          return object;

   667      }

   668  

   669 diff -Nbdru org/jivesoftware/smack/XMPPConnection.java /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/XMPPConnection.java

   670 --- org/jivesoftware/smack/XMPPConnection.java	2009-06-26 21:11:24.601252412 +0200

   671 +++ /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/XMPPConnection.java	2009-06-25 22:34:41.252416000 +0200

   672 @@ -1082,7 +1082,7 @@

   673                      catch (Exception ex) {

   674                          try {

   675                              debuggerClass =

   676 -                                    Class.forName("org.jivesoftware.smack.debugger.LiteDebugger");

   677 +                                    Class.forName("org.jivesoftware.smack.debugger.ConsoleDebugger");

   678                          }

   679                          catch (Exception ex2) {

   680                              ex2.printStackTrace();

   681 diff -Nbdru org/jivesoftware/smackx/debugger/EnhancedDebugger.java /home/nikita/devel/beem-ui/src/org/jivesoftware/smackx/debugger/EnhancedDebugger.java

   682 --- org/jivesoftware/smackx/debugger/EnhancedDebugger.java	2009-06-26 21:11:18.348252001 +0200

   683 +++ /home/nikita/devel/beem-ui/src/org/jivesoftware/smackx/debugger/EnhancedDebugger.java	1970-01-01 01:00:00.000000000 +0100

   684 @@ -1,1005 +0,0 @@

   685 -/**

   686 - * $RCSfile$

   687 - * $Revision: 11024 $

   688 - * $Date: 2009-06-04 13:58:25 +0200 (Thu, 04 Jun 2009) $

   689 - *

   690 - * Copyright 2003-2007 Jive Software.

   691 - *

   692 - * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");

   693 - * you may not use this file except in compliance with the License.

   694 - * You may obtain a copy of the License at

   695 - *

   696 - *     http://www.apache.org/licenses/LICENSE-2.0

   697 - *

   698 - * Unless required by applicable law or agreed to in writing, software

   699 - * distributed under the License is distributed on an "AS IS" BASIS,

   700 - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

   701 - * See the License for the specific language governing permissions and

   702 - * limitations under the License.

   703 - */

   704 -

   705 -package org.jivesoftware.smackx.debugger;

   706 -

   707 -import org.jivesoftware.smack.ConnectionListener;

   708 -import org.jivesoftware.smack.PacketListener;

   709 -import org.jivesoftware.smack.XMPPConnection;

   710 -import org.jivesoftware.smack.debugger.SmackDebugger;

   711 -import org.jivesoftware.smack.packet.IQ;

   712 -import org.jivesoftware.smack.packet.Message;

   713 -import org.jivesoftware.smack.packet.Packet;

   714 -import org.jivesoftware.smack.packet.Presence;

   715 -import org.jivesoftware.smack.util.*;

   716 -

   717 -import javax.swing.*;

   718 -import javax.swing.event.ListSelectionEvent;

   719 -import javax.swing.event.ListSelectionListener;

   720 -import javax.swing.table.DefaultTableModel;

   721 -import javax.swing.text.BadLocationException;

   722 -import javax.xml.transform.*;

   723 -import javax.xml.transform.stream.StreamResult;

   724 -import javax.xml.transform.stream.StreamSource;

   725 -import java.awt.*;

   726 -import java.awt.datatransfer.Clipboard;

   727 -import java.awt.datatransfer.StringSelection;

   728 -import java.awt.event.ActionEvent;

   729 -import java.awt.event.ActionListener;

   730 -import java.awt.event.MouseAdapter;

   731 -import java.awt.event.MouseEvent;

   732 -import java.io.Reader;

   733 -import java.io.StringReader;

   734 -import java.io.StringWriter;

   735 -import java.io.Writer;

   736 -import java.net.URL;

   737 -import java.text.SimpleDateFormat;

   738 -import java.util.Date;

   739 -

   740 -/**

   741 - * The EnhancedDebugger is a debugger that allows to debug sent, received and interpreted messages

   742 - * but also provides the ability to send ad-hoc messages composed by the user.<p>

   743 - * <p/>

   744 - * A new EnhancedDebugger will be created for each connection to debug. All the EnhancedDebuggers

   745 - * will be shown in the same debug window provided by the class EnhancedDebuggerWindow.

   746 - *

   747 - * @author Gaston Dombiak

   748 - */

   749 -public class EnhancedDebugger implements SmackDebugger {

   750 -

   751 -    private static final String NEWLINE = "\n";

   752 -

   753 -    private static ImageIcon packetReceivedIcon;

   754 -    private static ImageIcon packetSentIcon;

   755 -    private static ImageIcon presencePacketIcon;

   756 -    private static ImageIcon iqPacketIcon;

   757 -    private static ImageIcon messagePacketIcon;

   758 -    private static ImageIcon unknownPacketTypeIcon;

   759 -

   760 -    {

   761 -        URL url;

   762 -        // Load the image icons 

   763 -        url =

   764 -                Thread.currentThread().getContextClassLoader().getResource("images/nav_left_blue.png");

   765 -        if (url != null) {

   766 -            packetReceivedIcon = new ImageIcon(url);

   767 -        }

   768 -        url =

   769 -                Thread.currentThread().getContextClassLoader().getResource("images/nav_right_red.png");

   770 -        if (url != null) {

   771 -            packetSentIcon = new ImageIcon(url);

   772 -        }

   773 -        url =

   774 -                Thread.currentThread().getContextClassLoader().getResource("images/photo_portrait.png");

   775 -        if (url != null) {

   776 -            presencePacketIcon = new ImageIcon(url);

   777 -        }

   778 -        url =

   779 -                Thread.currentThread().getContextClassLoader().getResource(

   780 -                        "images/question_and_answer.png");

   781 -        if (url != null) {

   782 -            iqPacketIcon = new ImageIcon(url);

   783 -        }

   784 -        url = Thread.currentThread().getContextClassLoader().getResource("images/message.png");

   785 -        if (url != null) {

   786 -            messagePacketIcon = new ImageIcon(url);

   787 -        }

   788 -        url = Thread.currentThread().getContextClassLoader().getResource("images/unknown.png");

   789 -        if (url != null) {

   790 -            unknownPacketTypeIcon = new ImageIcon(url);

   791 -        }

   792 -    }

   793 -

   794 -    private DefaultTableModel messagesTable = null;

   795 -    private JTextArea messageTextArea = null;

   796 -    private JFormattedTextField userField = null;

   797 -    private JFormattedTextField statusField = null;

   798 -

   799 -    private XMPPConnection connection = null;

   800 -

   801 -    private PacketListener packetReaderListener = null;

   802 -    private PacketListener packetWriterListener = null;

   803 -    private ConnectionListener connListener = null;

   804 -

   805 -    private Writer writer;

   806 -    private Reader reader;

   807 -    private ReaderListener readerListener;

   808 -    private WriterListener writerListener;

   809 -

   810 -    private Date creationTime = new Date();

   811 -

   812 -    // Statistics variables

   813 -    private DefaultTableModel statisticsTable = null;

   814 -    private int sentPackets = 0;

   815 -    private int receivedPackets = 0;

   816 -    private int sentIQPackets = 0;

   817 -    private int receivedIQPackets = 0;

   818 -    private int sentMessagePackets = 0;

   819 -    private int receivedMessagePackets = 0;

   820 -    private int sentPresencePackets = 0;

   821 -    private int receivedPresencePackets = 0;

   822 -    private int sentOtherPackets = 0;

   823 -    private int receivedOtherPackets = 0;

   824 -

   825 -    JTabbedPane tabbedPane;

   826 -

   827 -    public EnhancedDebugger(XMPPConnection connection, Writer writer, Reader reader) {

   828 -        this.connection = connection;

   829 -        this.writer = writer;

   830 -        this.reader = reader;

   831 -        createDebug();

   832 -        EnhancedDebuggerWindow.addDebugger(this);

   833 -    }

   834 -

   835 -    /**

   836 -     * Creates the debug process, which is a GUI window that displays XML traffic.

   837 -     */

   838 -    private void createDebug() {

   839 -        // We'll arrange the UI into six tabs. The first tab contains all data, the second

   840 -        // client generated XML, the third server generated XML, the fourth allows to send 

   841 -        // ad-hoc messages and the fifth contains connection information.

   842 -        tabbedPane = new JTabbedPane();

   843 -

   844 -        // Add the All Packets, Sent, Received and Interpreted panels

   845 -        addBasicPanels();

   846 -

   847 -        // Add the panel to send ad-hoc messages

   848 -        addAdhocPacketPanel();

   849 -

   850 -        // Add the connection information panel

   851 -        addInformationPanel();

   852 -

   853 -        // Create a thread that will listen for all incoming packets and write them to

   854 -        // the GUI. This is what we call "interpreted" packet data, since it's the packet

   855 -        // data as Smack sees it and not as it's coming in as raw XML.

   856 -        packetReaderListener = new PacketListener() {

   857 -            SimpleDateFormat dateFormatter = new SimpleDateFormat("hh:mm:ss aaa");

   858 -

   859 -            public void processPacket(final Packet packet) {

   860 -                SwingUtilities.invokeLater(new Runnable() {

   861 -                    public void run() {

   862 -                        addReadPacketToTable(dateFormatter, packet);

   863 -                    }

   864 -                });

   865 -

   866 -            }

   867 -        };

   868 -

   869 -        // Create a thread that will listen for all outgoing packets and write them to

   870 -        // the GUI.

   871 -        packetWriterListener = new PacketListener() {

   872 -            SimpleDateFormat dateFormatter = new SimpleDateFormat("hh:mm:ss aaa");

   873 -

   874 -            public void processPacket(final Packet packet) {

   875 -                SwingUtilities.invokeLater(new Runnable() {

   876 -                    public void run() {

   877 -                        addSentPacketToTable(dateFormatter, packet);

   878 -                    }

   879 -                });

   880 -

   881 -            }

   882 -        };

   883 -

   884 -        // Create a thread that will listen for any connection closed event

   885 -        connListener = new ConnectionListener() {

   886 -            public void connectionClosed() {

   887 -                SwingUtilities.invokeLater(new Runnable() {

   888 -                    public void run() {

   889 -                        statusField.setValue("Closed");

   890 -                        EnhancedDebuggerWindow.connectionClosed(EnhancedDebugger.this);

   891 -                    }

   892 -                });

   893 -

   894 -            }

   895 -

   896 -            public void connectionClosedOnError(final Exception e) {

   897 -                SwingUtilities.invokeLater(new Runnable() {

   898 -                    public void run() {

   899 -                        statusField.setValue("Closed due to an exception");

   900 -                        EnhancedDebuggerWindow.connectionClosedOnError(EnhancedDebugger.this, e);

   901 -                    }

   902 -                });

   903 -

   904 -            }

   905 -            public void reconnectingIn(final int seconds){

   906 -                SwingUtilities.invokeLater(new Runnable() {

   907 -                    public void run() {

   908 -                        statusField.setValue("Attempt to reconnect in " + seconds + " seconds");

   909 -                    }

   910 -                });

   911 -            }

   912 -

   913 -            public void reconnectionSuccessful() {

   914 -                SwingUtilities.invokeLater(new Runnable() {

   915 -                    public void run() {

   916 -                        statusField.setValue("Reconnection stablished");

   917 -                        EnhancedDebuggerWindow.connectionEstablished(EnhancedDebugger.this);

   918 -                    }

   919 -                });

   920 -            }

   921 -

   922 -            public void reconnectionFailed(Exception e) {

   923 -                SwingUtilities.invokeLater(new Runnable() {

   924 -                    public void run() {

   925 -                        statusField.setValue("Reconnection failed");

   926 -                    }

   927 -                });

   928 -            }

   929 -        };

   930 -    }

   931 -

   932 -    private void addBasicPanels() {

   933 -        JSplitPane allPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);

   934 -        allPane.setOneTouchExpandable(true);

   935 -

   936 -        messagesTable =

   937 -                new DefaultTableModel(

   938 -                        new Object[]{"Hide", "Timestamp", "", "", "Message", "Id", "Type", "To", "From"},

   939 -                        0) {

   940 -        			private static final long serialVersionUID = 8136121224474217264L;

   941 -					public boolean isCellEditable(int rowIndex, int mColIndex) {

   942 -                        return false;

   943 -                    }

   944 -

   945 -                    public Class getColumnClass(int columnIndex) {

   946 -                        if (columnIndex == 2 || columnIndex == 3) {

   947 -                            return Icon.class;

   948 -                        }

   949 -                        return super.getColumnClass(columnIndex);

   950 -                    }

   951 -

   952 -                };

   953 -        JTable table = new JTable(messagesTable);

   954 -        // Allow only single a selection

   955 -        table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);

   956 -        // Hide the first column

   957 -        table.getColumnModel().getColumn(0).setMaxWidth(0);

   958 -        table.getColumnModel().getColumn(0).setMinWidth(0);

   959 -        table.getTableHeader().getColumnModel().getColumn(0).setMaxWidth(0);

   960 -        table.getTableHeader().getColumnModel().getColumn(0).setMinWidth(0);

   961 -        // Set the column "timestamp" size

   962 -        table.getColumnModel().getColumn(1).setMaxWidth(300);

   963 -        table.getColumnModel().getColumn(1).setPreferredWidth(70);

   964 -        // Set the column "direction" icon size

   965 -        table.getColumnModel().getColumn(2).setMaxWidth(50);

   966 -        table.getColumnModel().getColumn(2).setPreferredWidth(30);

   967 -        // Set the column "packet type" icon size

   968 -        table.getColumnModel().getColumn(3).setMaxWidth(50);

   969 -        table.getColumnModel().getColumn(3).setPreferredWidth(30);

   970 -        // Set the column "Id" size

   971 -        table.getColumnModel().getColumn(5).setMaxWidth(100);

   972 -        table.getColumnModel().getColumn(5).setPreferredWidth(55);

   973 -        // Set the column "type" size

   974 -        table.getColumnModel().getColumn(6).setMaxWidth(200);

   975 -        table.getColumnModel().getColumn(6).setPreferredWidth(50);

   976 -        // Set the column "to" size

   977 -        table.getColumnModel().getColumn(7).setMaxWidth(300);

   978 -        table.getColumnModel().getColumn(7).setPreferredWidth(90);

   979 -        // Set the column "from" size

   980 -        table.getColumnModel().getColumn(8).setMaxWidth(300);

   981 -        table.getColumnModel().getColumn(8).setPreferredWidth(90);

   982 -        // Create a table listener that listen for row selection events

   983 -        SelectionListener selectionListener = new SelectionListener(table);

   984 -        table.getSelectionModel().addListSelectionListener(selectionListener);

   985 -        table.getColumnModel().getSelectionModel().addListSelectionListener(selectionListener);

   986 -        allPane.setTopComponent(new JScrollPane(table));

   987 -        messageTextArea = new JTextArea();

   988 -        messageTextArea.setEditable(false);

   989 -        // Add pop-up menu.

   990 -        JPopupMenu menu = new JPopupMenu();

   991 -        JMenuItem menuItem1 = new JMenuItem("Copy");

   992 -        menuItem1.addActionListener(new ActionListener() {

   993 -            public void actionPerformed(ActionEvent e) {

   994 -                // Get the clipboard

   995 -                Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();

   996 -                // Set the sent text as the new content of the clipboard

   997 -                clipboard.setContents(new StringSelection(messageTextArea.getText()), null);

   998 -            }

   999 -        });

  1000 -        menu.add(menuItem1);

  1001 -        // Add listener to the text area so the popup menu can come up.

  1002 -        messageTextArea.addMouseListener(new PopupListener(menu));

  1003 -        allPane.setBottomComponent(new JScrollPane(messageTextArea));

  1004 -        allPane.setDividerLocation(150);

  1005 -

  1006 -        tabbedPane.add("All Packets", allPane);

  1007 -        tabbedPane.setToolTipTextAt(0, "Sent and received packets processed by Smack");

  1008 -

  1009 -        // Create UI elements for client generated XML traffic.

  1010 -        final JTextArea sentText = new JTextArea();

  1011 -        sentText.setWrapStyleWord(true);

  1012 -        sentText.setLineWrap(true);

  1013 -        sentText.setEditable(false);

  1014 -        sentText.setForeground(new Color(112, 3, 3));

  1015 -        tabbedPane.add("Raw Sent Packets", new JScrollPane(sentText));

  1016 -        tabbedPane.setToolTipTextAt(1, "Raw text of the sent packets");

  1017 -

  1018 -        // Add pop-up menu.

  1019 -        menu = new JPopupMenu();

  1020 -        menuItem1 = new JMenuItem("Copy");

  1021 -        menuItem1.addActionListener(new ActionListener() {

  1022 -            public void actionPerformed(ActionEvent e) {

  1023 -                // Get the clipboard

  1024 -                Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();

  1025 -                // Set the sent text as the new content of the clipboard

  1026 -                clipboard.setContents(new StringSelection(sentText.getText()), null);

  1027 -            }

  1028 -        });

  1029 -

  1030 -        JMenuItem menuItem2 = new JMenuItem("Clear");

  1031 -        menuItem2.addActionListener(new ActionListener() {

  1032 -            public void actionPerformed(ActionEvent e) {

  1033 -                sentText.setText("");

  1034 -            }

  1035 -        });

  1036 -

  1037 -        // Add listener to the text area so the popup menu can come up.

  1038 -        sentText.addMouseListener(new PopupListener(menu));

  1039 -        menu.add(menuItem1);

  1040 -        menu.add(menuItem2);

  1041 -

  1042 -        // Create UI elements for server generated XML traffic.

  1043 -        final JTextArea receivedText = new JTextArea();

  1044 -        receivedText.setWrapStyleWord(true);

  1045 -        receivedText.setLineWrap(true);

  1046 -        receivedText.setEditable(false);

  1047 -        receivedText.setForeground(new Color(6, 76, 133));

  1048 -        tabbedPane.add("Raw Received Packets", new JScrollPane(receivedText));

  1049 -        tabbedPane.setToolTipTextAt(

  1050 -                2,

  1051 -                "Raw text of the received packets before Smack process them");

  1052 -

  1053 -        // Add pop-up menu.

  1054 -        menu = new JPopupMenu();

  1055 -        menuItem1 = new JMenuItem("Copy");

  1056 -        menuItem1.addActionListener(new ActionListener() {

  1057 -            public void actionPerformed(ActionEvent e) {

  1058 -                // Get the clipboard

  1059 -                Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();

  1060 -                // Set the sent text as the new content of the clipboard

  1061 -                clipboard.setContents(new StringSelection(receivedText.getText()), null);

  1062 -            }

  1063 -        });

  1064 -

  1065 -        menuItem2 = new JMenuItem("Clear");

  1066 -        menuItem2.addActionListener(new ActionListener() {

  1067 -            public void actionPerformed(ActionEvent e) {

  1068 -                receivedText.setText("");

  1069 -            }

  1070 -        });

  1071 -

  1072 -        // Add listener to the text area so the popup menu can come up.

  1073 -        receivedText.addMouseListener(new PopupListener(menu));

  1074 -        menu.add(menuItem1);

  1075 -        menu.add(menuItem2);

  1076 -

  1077 -        // Create a special Reader that wraps the main Reader and logs data to the GUI.

  1078 -        ObservableReader debugReader = new ObservableReader(reader);

  1079 -        readerListener = new ReaderListener() {

  1080 -            public void read(final String str) {

  1081 -                SwingUtilities.invokeLater(new Runnable() {

  1082 -                    public void run() {

  1083 -                        if (EnhancedDebuggerWindow.PERSISTED_DEBUGGER &&

  1084 -                                !EnhancedDebuggerWindow.getInstance().isVisible()) {

  1085 -                            // Do not add content if the parent is not visible

  1086 -                            return;

  1087 -                        }

  1088 -

  1089 -                        int index = str.lastIndexOf(">");

  1090 -                        if (index != -1) {

  1091 -                            if (receivedText.getLineCount() >= EnhancedDebuggerWindow.MAX_TABLE_ROWS)

  1092 -                            {

  1093 -                                try {

  1094 -                                    receivedText.replaceRange("", 0, receivedText.getLineEndOffset(0));

  1095 -                                }

  1096 -                                catch (BadLocationException e) {

  1097 -                                    e.printStackTrace();

  1098 -                                }

  1099 -                            }

  1100 -                            receivedText.append(str.substring(0, index + 1));

  1101 -                            receivedText.append(NEWLINE);

  1102 -                            if (str.length() > index) {

  1103 -                                receivedText.append(str.substring(index + 1));

  1104 -                            }

  1105 -                        }

  1106 -                        else {

  1107 -                            receivedText.append(str);

  1108 -                        }

  1109 -                    }

  1110 -                });

  1111 -            }

  1112 -        };

  1113 -        debugReader.addReaderListener(readerListener);

  1114 -

  1115 -        // Create a special Writer that wraps the main Writer and logs data to the GUI.

  1116 -        ObservableWriter debugWriter = new ObservableWriter(writer);

  1117 -        writerListener = new WriterListener() {

  1118 -            public void write(final String str) {

  1119 -                SwingUtilities.invokeLater(new Runnable() {

  1120 -                    public void run() {

  1121 -                        if (EnhancedDebuggerWindow.PERSISTED_DEBUGGER &&

  1122 -                                !EnhancedDebuggerWindow.getInstance().isVisible()) {

  1123 -                            // Do not add content if the parent is not visible

  1124 -                            return;

  1125 -                        }

  1126 -

  1127 -                        if (sentText.getLineCount() >= EnhancedDebuggerWindow.MAX_TABLE_ROWS) {

  1128 -                            try {

  1129 -                                sentText.replaceRange("", 0, sentText.getLineEndOffset(0));

  1130 -                            }

  1131 -                            catch (BadLocationException e) {

  1132 -                                e.printStackTrace();

  1133 -                            }

  1134 -                        }

  1135 -