# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /export/home/vbk/nbtrunk0813/serverplugins/sun/appsrv81/src/org/netbeans/modules/j2ee/sun/ide/j2ee/ui
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: AddInstanceVisualPlatformPanel.form
*** /export/home/vbk/nbtrunk0813/serverplugins/sun/appsrv81/src/org/netbeans/modules/j2ee/sun/ide/j2ee/ui/AddInstanceVisualPlatformPanel.form Base (1.9)
--- /export/home/vbk/nbtrunk0813/serverplugins/sun/appsrv81/src/org/netbeans/modules/j2ee/sun/ide/j2ee/ui/AddInstanceVisualPlatformPanel.form Locally Modified (Based On 1.9)
***************
*** 6,17 ****
      </Component>
    </NonVisualComponents>
    <Properties>
-     <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-       <Dimension value="null"/>
-     </Property>
-     <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-       <Dimension value="null"/>
-     </Property>
      <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
        <Dimension value="[0, 0]"/>
      </Property>
--- 6,11 ----
Index: AddInstanceVisualPlatformPanel.java
*** /export/home/vbk/nbtrunk0813/serverplugins/sun/appsrv81/src/org/netbeans/modules/j2ee/sun/ide/j2ee/ui/AddInstanceVisualPlatformPanel.java Base (1.13)
--- /export/home/vbk/nbtrunk0813/serverplugins/sun/appsrv81/src/org/netbeans/modules/j2ee/sun/ide/j2ee/ui/AddInstanceVisualPlatformPanel.java Locally Modified (Based On 1.13)
***************
*** 113,118 ****
--- 113,137 ----
          profileSelector.setModel(new javax.swing.DefaultComboBoxModel(profiles));
      }
      
+     String getHostname() {
+         String retVal = null;
+         boolean okay = true;
+         String tmp = (String) instanceSelector.getSelectedItem();
+         if (null != tmp) {
+             int colon = tmp.indexOf(':');
+             if (colon < 0) {
+                 ErrorManager.getDefault().log(ErrorManager.ERROR,
+                         NbBundle.getMessage(AddInstanceVisualPlatformPanel.class,
+                         "ERRMSG_PARSE_DOMAIN_DIR", tmp));
+                 okay = false;
+             }
+             if (okay) {
+                 retVal = tmp.substring(0,colon);
+             }
+         }
+         return retVal==null?"localhost":retVal;     // NOI18N    
+     }
+     
      String getDomainDir() {
          String retVal = null;
          boolean okay = true;
Index: AddDomainPlatformPanel.java
*** /export/home/vbk/nbtrunk0813/serverplugins/sun/appsrv81/src/org/netbeans/modules/j2ee/sun/ide/j2ee/ui/AddDomainPlatformPanel.java Base (1.13)
--- /export/home/vbk/nbtrunk0813/serverplugins/sun/appsrv81/src/org/netbeans/modules/j2ee/sun/ide/j2ee/ui/AddDomainPlatformPanel.java Locally Modified (Based On 1.13)
***************
*** 25,41 ****
--- 25,46 ----
  import java.io.File;
  import java.io.FileInputStream;
  import java.io.IOException;
+ import java.net.InetAddress;
+ import java.net.UnknownHostException;
  import java.util.Enumeration;
  import java.util.HashSet;
  import java.util.Iterator;
  import java.util.Properties;
  import java.util.Set;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
  import javax.swing.event.ChangeEvent;
  import javax.swing.event.ChangeListener;
  import org.netbeans.modules.j2ee.sun.api.Asenv;
  import org.netbeans.modules.j2ee.sun.api.ServerLocationManager;
  import org.openide.ErrorManager;
  import org.openide.WizardDescriptor;
+ import org.openide.util.Exceptions;
  import org.openide.util.HelpCtx;
  import org.openide.util.NbBundle;
  
***************
*** 193,198 ****
--- 198,205 ----
                          //File platformDir = (File) wiz.getProperty(AddDomainWizardIterator.PLATFORM_LOCATION);
                          Util.fillDescriptorFromDomainXml(wiz, domainDir);
                          // fill in the admin name and password from the asadminprefs file
+                         wiz.putProperty(AddDomainWizardIterator.HOST,
+                                 getAIVPP().getHostname());
                          String username = "admin";
                          String password = null;
                          File f = new File(System.getProperty("user.home")+"/.asadminprefs"); //NOI18N
***************
*** 284,298 ****
      
      private Object[] getServerList(File[] dirs,File location){
          java.util.List xmlList = new java.util.ArrayList();
!         Object retVal[];
!         for(int i=0; location != null && i<dirs.length; i++){
!             String hostPort = Util.getHostPort(dirs[i],location);
!             if(hostPort != null) {
!                 xmlList.add(
!                         NbBundle.getMessage(AddDomainPlatformPanel.class,
!                         "LBL_domainListEntry", new Object[] {hostPort,dirs[i].toString()}));
              }
!         }//for
          retVal = xmlList.toArray();
          return retVal;
      }
--- 291,324 ----
      
      private Object[] getServerList(File[] dirs,File location){
          java.util.List xmlList = new java.util.ArrayList();
!         java.lang.Object[] retVal;
!         java.lang.String fqhn = null;
!         
!         try     {
!             fqhn = java.net.InetAddress.getLocalHost().getCanonicalHostName();
!         } catch (UnknownHostException ex) {
!             Logger.getLogger(AddDomainPlatformPanel.class.getName()).log(Level.FINER, null, ex);
          }
!         for (int i = 0; location != null && i < dirs.length; i++) {
!             java.lang.String hostPort = org.netbeans.modules.j2ee.sun.ide.j2ee.ui.Util.getHostPort(dirs[i],
!                     location);
!             
!             if (hostPort != null) {
!                 int sepDex = hostPort.indexOf(':');
!                 java.lang.String portOnly = hostPort.substring(sepDex + 1);
!                 
!                 xmlList.add(org.openide.util.NbBundle.getMessage(org.netbeans.modules.j2ee.sun.ide.j2ee.ui.AddDomainPlatformPanel.class,
!                         "LBL_domainListEntry",
!                         new java.lang.Object[]{hostPort,
!                         dirs[i].toString()}));
!                 if (null != fqhn) {
!                     xmlList.add(org.openide.util.NbBundle.getMessage(org.netbeans.modules.j2ee.sun.ide.j2ee.ui.AddDomainPlatformPanel.class,
!                             "LBL_domainListEntry",
!                             new java.lang.Object[]{fqhn+":"+portOnly,
!                             dirs[i].toString()}));                    
!                 }
!             }
!         }
          retVal = xmlList.toArray();
          return retVal;
      }