no message

git-svn-id: https://svn.coded.pt/svn/SIPRP@107 bb69d46d-e84e-40c8-a05a-06db0d633741

trunk/siprp/importer/DataChooserWindow.java

@@ -19,21 +19,21 @@ import com.evolute.utils.ui.*;
 public class DataChooserWindow extends CustomJDialog
 {
 	private final String labels[];
-	private final String items[];
-	private final String empty[];
-	private final String allItems[][];
+	private final Object items[];
+	private final Object empty[];
+	private final Object allItems[][];
 	private final JComboBox combos[];
 	private final int preselected[];
 	
 	private boolean canceled = false;
 	
 	/** Creates a new instance of DataChooserWindow */
-	public DataChooserWindow( JFrame modalFrame, String names[], String data[][] )
+	public DataChooserWindow( JFrame modalFrame, String names[], Object data[][] )
 	{
 		this( modalFrame, names, data, null );
 	}
 	
-	public DataChooserWindow( JFrame modalFrame, String names[], String data[][], int selected[] )
+	public DataChooserWindow( JFrame modalFrame, String names[], Object data[][], int selected[] )
 	{
 		super( modalFrame, true );
 		labels = names;
@@ -161,7 +161,8 @@ public class DataChooserWindow extends CustomJDialog
 		{
 			return null;
 		}
-		Hashtable hash[] = new Hashtable[ allItems[ 0 ].length ];
+		Hashtable hash[] = new Hashtable[ allItems.length ];
+System.out.println( "Hash[] size: " + hash.length );
 		for( int j = 0; j < hash.length; ++j )
 		{
 			hash[ j ] = new Hashtable();

trunk/siprp/importer/Importer.java

@@ -41,7 +41,7 @@ public class Importer extends CustomJDialog
 	private Excel2DArray e2da;
 	private boolean canceled = false;
 	private DataChooserWindow dcw;
-	private String vals[][];
+	private Object vals[][];
 	private final int[] DEFAULT_SELECTION = new int[]{ 0, 2, 3, 1, -1, 4, 5, 7, 6, -1 };
 
 	public static final String NAMES[] = new String[]{
@@ -191,19 +191,19 @@ public class Importer extends CustomJDialog
 		if( multipleSelection )
 		{
 			int rows[] = table.getSelectedRows();
-			vals = new String[ rows.length ][];
+			vals = new Object[ rows.length ][];
 			for( int i = 0; i < rows.length; ++i )
 			{
 				Vector v = new Vector( Arrays.asList( e2da.getRow( rows[ i ] ) ) );
 				v.add( "" );
-				vals[ i ] = (String[]) v.toArray( new String[ v.size() ] );
+				vals[ i ] = (Object[]) v.toArray( new Object[ v.size() ] );
 			}
 		}
 		else
 		{
 			Vector v = new Vector( Arrays.asList( e2da.getRow( table.getSelectedRow() ) ) );
 			v.add( "" );
-			vals = new String[][] { ( String[] )v.toArray( new String[ v.size() ] ) };
+			vals = new Object[][] { ( Object[] )v.toArray( new Object[ v.size() ] ) };
 		}
 		
 /*