Author: dlanglais Date: 2010-02-19 03:52:53 +0100 (Fri, 19 Feb 2010) New Revision: 108 Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java Log: qualit?\195?\169 : - ajout d'accolades pour les if/else ; - unused import sur HBase (?\195?\160 supprimer... ?) ; Je ne sais pas si il serait utile d'ajouter des exceptions levables par nos plugins, type : - chercher quelque chose sur une table qui n'existe pas ? -> throw new NoSuchTableException(tablename); -> throw new NoSuchColumnException(columnname); -> ... 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-19 02:37:19 UTC (rev 107) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java 2010-02-19 02:52:53 UTC (rev 108) @@ -26,23 +26,32 @@ */ @Override public Object getValueAt(int rowIndex, int colIndex) { - if(rowIndex==0) - if( colIndex==0) return "1"; else return ""; - else - if(colIndex>rowIndex) return ""; - else - if (colIndex==rowIndex) return "1"; - else - if (colIndex==0) return "1"; - else{ - int i = Integer.parseInt((String)getValueAt(rowIndex-1, colIndex-1)); - int j = Integer.parseInt((String)getValueAt(rowIndex-1, colIndex)); - return Integer.toString(i+j); + if (rowIndex == 0) { + if (colIndex == 0) { + return "1"; + } else { + return ""; } - - //return data(rowIndex,colIndex); - - + } else { + if (colIndex > rowIndex) { + return ""; + } else { + if (colIndex == rowIndex) { + return "1"; + } else { + if (colIndex == 0) { + return "1"; + } else { + int i = Integer.parseInt((String) getValueAt(rowIndex - 1, colIndex - 1)); + int j = Integer.parseInt((String) getValueAt(rowIndex - 1, colIndex)); + return Integer.toString(i + j); + } + + //return data(rowIndex,colIndex); + + } + } + } } /** Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-02-19 02:37:19 UTC (rev 107) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-02-19 02:52:53 UTC (rev 108) @@ -8,7 +8,7 @@ import org.nuiton.mapstoragemanager.plugins.BigTable; import org.apache.hadoop.hbase.HBaseConfiguration; -import org.apache.hadoop.hbase.client.Get; +//import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result;