[Mc4j-cvs] mc4j/src/org/mc4j/console/connection/wizard/advanced AdvancedPanel.java,1.2,1.3

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/wizard/advanced
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20162/src/org/mc4j/console/connection/wizard/advanced

Modified Files:
	AdvancedPanel.java 
Log Message:
Merging EMS into head for the 2.0 release work

Index: AdvancedPanel.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/wizard/advanced/AdvancedPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AdvancedPanel.java	5 Oct 2004 05:15:59 -0000	1.2
--- AdvancedPanel.java	12 Apr 2006 19:14:06 -0000	1.3
***************
*** 17,27 ****
  package org.mc4j.console.connection.wizard.advanced;
  
! import java.util.HashMap;
  import java.util.Iterator;
  import java.util.Map;
  import java.util.Vector;
  
- import javax.swing.table.DefaultTableModel;
- 
  
  
--- 17,26 ----
  package org.mc4j.console.connection.wizard.advanced;
  
! import javax.swing.table.DefaultTableModel;
  import java.util.Iterator;
  import java.util.Map;
+ import java.util.Properties;
  import java.util.Vector;
  
  
  
***************
*** 53,62 ****
      }
  
!     public Map getProperties() {
!         Map properties = new HashMap();
          DefaultTableModel model = (DefaultTableModel) this.propertyTable.getModel();
          Vector data = model.getDataVector();
!         for (Iterator iterator = data.iterator(); iterator.hasNext();) {
!             Vector vector = (Vector) iterator.next();
              String key = (String) vector.get(0);
              String value = (String) vector.get(0);
--- 52,61 ----
      }
  
!     public Properties getProperties() {
!         Properties properties = new Properties();
          DefaultTableModel model = (DefaultTableModel) this.propertyTable.getModel();
          Vector data = model.getDataVector();
!         for (Object aData : data) {
!             Vector vector = (Vector) aData;
              String key = (String) vector.get(0);
              String value = (String) vector.get(0);