Author: dlanglais Date: 2010-03-03 18:08:42 +0100 (Wed, 03 Mar 2010) New Revision: 175 Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ColumnModel.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java Log: pr?\195?\169paration utilisation plugin BigHashMapV2 bien avanc?\195?\169. Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ColumnModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ColumnModel.java 2010-03-03 16:54:44 UTC (rev 174) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ColumnModel.java 2010-03-03 17:08:42 UTC (rev 175) @@ -1,11 +1,14 @@ package org.nuiton.mapstoragemanager.ui.gui; -import java.util.Iterator; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Set; import javax.swing.table.AbstractTableModel; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreeNode; -import org.nuiton.mapstoragemanager.plugins.OurHashMap2; +import org.nuiton.mapstoragemanager.plugins.BigTable; import static org.nuiton.i18n.I18n._; /** @@ -18,12 +21,12 @@ /** * columnNames. */ - private String[] titres; + private String[] columnNames; /** * data. */ - private String[][] data; + private Map<Integer, List<String>> data; /** * Constructor. @@ -32,25 +35,32 @@ */ public ColumnModel(final TreeNode parent, final DefaultMutableTreeNode node) { - String table = parent.toString(); - String column = node.toString(); + // table and column names. + String tableName = parent.toString(); + String columnName = node.toString(); + ApplicationEngine engine = ApplicationEngine.getInstance(); - OurHashMap2 testHashmap2 = (OurHashMap2) engine.getBigTable(); - titres = new String[2]; - titres[0] = _("table.keys"); - titres[1] = _("table.values"); + BigTable bigTable = engine.getBigTable(); + columnNames = new String[2]; + columnNames[0] = _("table.keys"); + columnNames[1] = _("table.values"); + + Set<String> tableKeys = bigTable.getKeys(tableName); + //content - Set<String> keySetTable = testHashmap2.getKeys(table, column); - Iterator i = keySetTable.iterator(); - data = new String[2][keySetTable.size()]; + data = new HashMap<Integer, List<String>>(); + data.put(0, new ArrayList<String>()); + data.put(1, new ArrayList<String>()); + int j = 0; - while (i.hasNext()) { - String key = (String) i.next(); - String value = testHashmap2.get(table, column, key); - data[0][j] = key; - data[1][j] = value; - j++; + for (String key : tableKeys) { + String value = bigTable.get(tableName, columnName, key); + if (value != null) { + data.get(0).add(j, key); + data.get(1).add(j, value); + j++; + } } } @@ -59,7 +69,7 @@ */ @Override public final Object getValueAt(final int rowIndex, final int colIndex) { - return data[colIndex][rowIndex]; + return data.get(colIndex).get(rowIndex); } /** @@ -67,7 +77,7 @@ */ @Override public final int getColumnCount() { - return titres.length; + return columnNames.length; } /** @@ -75,7 +85,7 @@ */ @Override public final int getRowCount() { - return data[0].length; + return data.get(0).size(); } /** @@ -83,7 +93,7 @@ */ @Override public final String getColumnName(final int col) { - return titres[col]; + return columnNames[col]; } /** Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java 2010-03-03 16:54:44 UTC (rev 174) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java 2010-03-03 17:08:42 UTC (rev 175) @@ -1,10 +1,9 @@ package org.nuiton.mapstoragemanager.ui.gui; -import java.util.Iterator; import java.util.Set; import javax.swing.table.AbstractTableModel; import javax.swing.tree.DefaultMutableTreeNode; -import org.nuiton.mapstoragemanager.plugins.OurHashMap2; +import org.nuiton.mapstoragemanager.plugins.BigTable; import static org.nuiton.i18n.I18n._; /** @@ -37,12 +36,12 @@ String table = node.toString(); ApplicationEngine engine = ApplicationEngine.getInstance(); - OurHashMap2 hashmap = (OurHashMap2) engine.getBigTable(); - Set<String> columnsNames = hashmap.getColumnsNames(table); + BigTable bigTable = engine.getBigTable(); + Set<String> columnsNames = bigTable.getColumnsNames(table); //content - Set<String> keySetTable = hashmap.getKeys(table); - Iterator<String> columnName = columnsNames.iterator(); + Set<String> tableKeys = bigTable.getKeys(table); +// Iterator<String> columnName = columnsNames.iterator(); /** * indexes @@ -53,23 +52,21 @@ if (showTableKeys) { titles = new String[columnsNames.size() + 1]; titles[0] = _("table.keys"); - data = new String[columnsNames.size() + 1][keySetTable.size()]; + data = new String[columnsNames.size() + 1][tableKeys.size()]; colIndex++; } else { titles = new String[columnsNames.size()]; - data = new String[columnsNames.size()][keySetTable.size()]; + data = new String[columnsNames.size()][tableKeys.size()]; } - while (columnName.hasNext()) { - String titreTemp = columnName.next(); - titles[colIndex] = titreTemp; + for (String columnName : columnsNames) { + + titles[colIndex] = columnName; + rowindex = 0; - Set<String> columnKeys = hashmap.getKeys(table, titles[colIndex]); - Iterator<String> columnKey = columnKeys.iterator(); - while (columnKey.hasNext()) { - String key = columnKey.next(); - String str = hashmap.get(table, titreTemp, key); + for (String key : tableKeys) { + String str = bigTable.get(table, columnName, key); if (showTableKeys) { data[0][rowindex] = key; }