Author: dlanglais Date: 2010-02-28 18:46:09 +0100 (Sun, 28 Feb 2010) New Revision: 148 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: J'ai l?\195?\169g?\195?\168rement modifi?\195?\169 TableModel pour tout de m?\195?\170me afficher (ou non) les cl?\195?\169s de la table (d?\195?\169sactivable ?\195?\160 l'aide d'un bool?\195?\169en). Il est dommage d'avoir supprim?\195?\169 les commentaires javadoc, j'ai rajout?\195?\169 les commentaires h?\195?\169rit?\195?\169s. 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-02-28 17:23:08 UTC (rev 147) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ColumnModel.java 2010-02-28 17:46:09 UTC (rev 148) @@ -55,26 +55,41 @@ } } + /** + * {@inheritDoc} + */ @Override public Object getValueAt(int rowIndex, int colIndex) { return data[colIndex][rowIndex]; } + /** + * {@inheritDoc} + */ @Override public int getColumnCount() { return titres.length; } + /** + * {@inheritDoc} + */ @Override public int getRowCount() { return data[0].length; } + /** + * {@inheritDoc} + */ @Override public String getColumnName(int col){ return titres[col]; } + /** + * {@inheritDoc} + */ @Override public boolean isCellEditable(int row, int col) { return false; 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-02-28 17:23:08 UTC (rev 147) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java 2010-02-28 17:46:09 UTC (rev 148) @@ -31,6 +31,11 @@ String[][] data; /** + * Show the keys in the table or not. + */ + private static boolean showTableKeys = true; + + /** * Constructor. */ public TableModel(DefaultMutableTreeNode node) { @@ -39,49 +44,82 @@ OurHashMap2 hashmap = engine.getOurHashMap(); Set<String> columnsNames = hashmap.getColumnsNames(table); - titles = new String[columnsNames.size()]; //content - Set<String> keySetTable = hashmap.getKeys(table); - Iterator i = columnsNames.iterator(); + Set<String> keySetTable = hashmap.getKeys(table); + Iterator<String> columnName = columnsNames.iterator(); + + /** + * indexes + */ int colIndex=0; int rowindex=0; - data = new String[columnsNames.size()][keySetTable.size()]; - while(i.hasNext()){ - String titreTemp = (String)i.next(); + + if(showTableKeys) { + titles = new String[columnsNames.size() + 1]; + titles[0] = "Keys"; + data = new String[columnsNames.size() + 1][keySetTable.size()]; + colIndex++; + } else { + titles = new String[columnsNames.size()]; + data = new String[columnsNames.size()][keySetTable.size()]; + } + + + while(columnName.hasNext()){ + String titreTemp = columnName.next(); titles[colIndex] = titreTemp; Set<String> columnKeys = hashmap.getKeys(table, titles[colIndex]); - Iterator<String> i2 = columnKeys.iterator(); - while(i2.hasNext()){ - String str = hashmap.get(table,titreTemp,(String)i2.next()); - data[colIndex][rowindex]=str; + Iterator<String> columnKey = columnKeys.iterator(); + while(columnKey.hasNext()){ + String key = columnKey.next(); + String str = hashmap.get(table, titreTemp, key); + if(showTableKeys) { + data[0][rowindex] = key; + } + data[colIndex][rowindex] = str; rowindex++; } colIndex++; } } + /** + * {@inheritDoc} + */ @Override public Object getValueAt(int rowIndex, int colIndex) { return data[colIndex][rowIndex]; } - + + /** + * {@inheritDoc} + */ @Override public int getColumnCount() { return titles.length; } + /** + * {@inheritDoc} + */ @Override public int getRowCount() { return data[0].length; } - + + /** + * {@inheritDoc} + */ @Override public String getColumnName(int col){ return titles[col]; } + /** + * {@inheritDoc} + */ @Override public boolean isCellEditable(int row, int col) { return false;