[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine:[8712] VASSAL-src/trunk/src/VASSAL/chat/ ServerAddressBook.java

[<uck...@us...>]

Revision: 8712
          http://sourceforge.net/p/vassalengine/svn/8712
Author:   uckelman
Date:     2013-05-17 21:21:02 +0000 (Fri, 17 May 2013)
Log Message:
-----------
Merged Brent-3.2-p2p@8711.

Bug 10170: Incorrect LAN address reported under Linux 
* Remove Work in Progress

Modified Paths:
--------------
    VASSAL-src/trunk/src/VASSAL/chat/ServerAddressBook.java

Modified: VASSAL-src/trunk/src/VASSAL/chat/ServerAddressBook.java
===================================================================
--- VASSAL-src/trunk/src/VASSAL/chat/ServerAddressBook.java	2013-05-17 21:13:10 UTC (rev 8711)
+++ VASSAL-src/trunk/src/VASSAL/chat/ServerAddressBook.java	2013-05-17 21:21:02 UTC (rev 8712)
@@ -78,7 +78,7 @@
   protected static final String P2P_MODE_KEY = P2PClientFactory.P2P_MODE_KEY;
   protected static final String P2P_SERVER_MODE = P2PClientFactory.P2P_SERVER_MODE;
   protected static final String P2P_CLIENT_MODE = P2PClientFactory.P2P_CLIENT_MODE;
-  protected static final String PRIVATE_TYPE = PrivateClientFactory.PRIVATE_TYPE;
+  // protected static final String PRIVATE_TYPE = PrivateClientFactory.PRIVATE_TYPE;
   protected static final String TYPE_KEY = ChatServerFactory.TYPE_KEY;
   protected static final String DESCRIPTION_KEY = "description"; //$NON-NLS-1$
   protected final int LEAF_ICON_SIZE = IconFamily.SMALL;
@@ -480,13 +480,13 @@
       public void actionPerformed(ActionEvent arg0) {
         addEntry(new JabberEntry());        
       }});
-    final JMenuItem privateItem = new JMenuItem(Resources.getString("ServerAddressBook.private_server"));
-    privateItem.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent arg0) {
-        addEntry(new PrivateEntry());        
-      }});
+//    final JMenuItem privateItem = new JMenuItem(Resources.getString("ServerAddressBook.private_server"));
+//    privateItem.addActionListener(new ActionListener() {
+//      public void actionPerformed(ActionEvent arg0) {
+//        addEntry(new PrivateEntry());        
+//      }});
     popup.add(p2pItem);
-    popup.add(privateItem);
+//    popup.add(privateItem);
     popup.add(jabItem);
     popup.show(addButton, 0, 0);
   }
@@ -1032,68 +1032,68 @@
    * Address Book entry for a Private VASSAL server
    *
    */
-  private class PrivateEntry extends AddressBookEntry {
-    
-    private JTextField serverPort = new JTextField();
-    private JTextField serverIp = new JTextField();
-    
-    public PrivateEntry() {
-      this(new Properties());
-      setDescription(Resources.getString("ServerAddressBook.private_server")); //$NON-NLS-1$
-      setType(PRIVATE_TYPE);
-      setProperty(PrivateClientFactory.PORT, "5050"); //$NON-NLS-1$
-    }
-
-    public PrivateEntry(Properties props) {
-      super(props);
-    }
-
-    public String toString() {
-      return Resources.getString("ServerAddressBook.private_server") + " [" + getDescription() + "]";
-    }
-    
-    public String getDescription() {
-      return super.getDescription() + " " + getProperty(PrivateClientFactory.URL) + ":" + getProperty(PrivateClientFactory.PORT);
-    }
-
-    protected String getIconName() {
-      return "VASSAL-private"; //$NON-NLS-1$
-    }
-
-    protected boolean isRemovable() {
-      return true;
-    }
-
-    protected boolean isEditable() {
-      return true;
-    }
-
-    protected boolean isDescriptionEditable() {
-      return true;
-    }
-
-    protected void addAdditionalControls(JComponent c, boolean enabled) {
-      serverIp.setEditable(enabled);
-      c.add(new JLabel(Resources.getString("ServerAddressBook.server_ip"))); //$NON-NLS-1$
-      c.add(serverIp, "wrap, growx, push"); //$NON-NLS-1$
-      
-      serverPort.setEditable(enabled);
-      c.add(new JLabel(Resources.getString("ServerAddressBook.server_port"))); //$NON-NLS-1$
-      c.add(serverPort, "wrap, growx, push"); //$NON-NLS-1$
-    }
-
-    protected void getAdditionalProperties(Properties props) {
-      props.setProperty(PrivateClientFactory.URL, serverIp.getText());
-      props.setProperty(PrivateClientFactory.PORT, serverPort.getText());
-      props.setProperty(TYPE_KEY, PRIVATE_TYPE);
-    }
-
-    protected void setAdditionalProperties(Properties props) {
-      serverIp.setText(props.getProperty(PrivateClientFactory.URL));
-      serverPort.setText(props.getProperty(PrivateClientFactory.PORT));
-    }
-
-  }
+//  private class PrivateEntry extends AddressBookEntry {
+//    
+//    private JTextField serverPort = new JTextField();
+//    private JTextField serverIp = new JTextField();
+//    
+//    public PrivateEntry() {
+//      this(new Properties());
+//      setDescription(Resources.getString("ServerAddressBook.private_server")); //$NON-NLS-1$
+//      setType(PRIVATE_TYPE);
+//      setProperty(PrivateClientFactory.PORT, "5050"); //$NON-NLS-1$
+//    }
+//
+//    public PrivateEntry(Properties props) {
+//      super(props);
+//    }
+//
+//    public String toString() {
+//      return Resources.getString("ServerAddressBook.private_server") + " [" + getDescription() + "]";
+//    }
+//    
+//    public String getDescription() {
+//      return super.getDescription() + " " + getProperty(PrivateClientFactory.URL) + ":" + getProperty(PrivateClientFactory.PORT);
+//    }
+//
+//    protected String getIconName() {
+//      return "VASSAL-private"; //$NON-NLS-1$
+//    }
+//
+//    protected boolean isRemovable() {
+//      return true;
+//    }
+//
+//    protected boolean isEditable() {
+//      return true;
+//    }
+//
+//    protected boolean isDescriptionEditable() {
+//      return true;
+//    }
+//
+//    protected void addAdditionalControls(JComponent c, boolean enabled) {
+//      serverIp.setEditable(enabled);
+//      c.add(new JLabel(Resources.getString("ServerAddressBook.server_ip"))); //$NON-NLS-1$
+//      c.add(serverIp, "wrap, growx, push"); //$NON-NLS-1$
+//      
+//      serverPort.setEditable(enabled);
+//      c.add(new JLabel(Resources.getString("ServerAddressBook.server_port"))); //$NON-NLS-1$
+//      c.add(serverPort, "wrap, growx, push"); //$NON-NLS-1$
+//    }
+//
+//    protected void getAdditionalProperties(Properties props) {
+//      props.setProperty(PrivateClientFactory.URL, serverIp.getText());
+//      props.setProperty(PrivateClientFactory.PORT, serverPort.getText());
+//      props.setProperty(TYPE_KEY, PRIVATE_TYPE);
+//    }
+//
+//    protected void setAdditionalProperties(Properties props) {
+//      serverIp.setText(props.getProperty(PrivateClientFactory.URL));
+//      serverPort.setText(props.getProperty(PrivateClientFactory.PORT));
+//    }
+//
+//  }
   
   /**
    * Address Book Entry for a Peer to Peer connection 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one unified framework. Download a free trial.
http://p.sf.net/sfu/alienvault_d2d
_______________________________________________
vassalengine-svn mailing list
vas...@li...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn