Author: dlanglais Date: 2010-03-02 14:31:59 +0100 (Tue, 02 Mar 2010) New Revision: 162 Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java trunk/msm-bighashmapV2/pom.xml trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMap.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Cell.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/CellImpl.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Column.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/ColumnImpl.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Row.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/RowImpl.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Structure.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Table.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/package-info.java trunk/msm-fromtoXML/pom.xml trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/package-info.java trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/package-info.java Log: checkstyle... Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-03-02 13:15:33 UTC (rev 161) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-03-02 13:31:59 UTC (rev 162) @@ -7,7 +7,7 @@ import org.nuiton.mapstoragemanager.plugins.BigTable; /** - * Interface listant les méthodes nécéssaires sur une base de données. + * Implementation of bigTable with hashMap. * @author Dorian Langlais * */ @@ -18,12 +18,6 @@ * hashMap with value is table, and key its name. */ private Map<String, Table> tables; - /** - * currentTable. - * the table which is selected. - */ - // Not used - //private Table currentTable; /** * Default constructor. Modified: trunk/msm-bighashmapV2/pom.xml =================================================================== --- trunk/msm-bighashmapV2/pom.xml 2010-03-02 13:15:33 UTC (rev 161) +++ trunk/msm-bighashmapV2/pom.xml 2010-03-02 13:31:59 UTC (rev 162) @@ -175,8 +175,31 @@ </plugins> </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + <encoding>${project.build.sourceEncoding}</encoding> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.2</version> + <configuration> + <encoding>${project.build.sourceEncoding}</encoding> + </configuration> + </plugin> + </plugins> </build> - + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> </project> + Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMap.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMap.java 2010-03-02 13:15:33 UTC (rev 161) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMap.java 2010-03-02 13:31:59 UTC (rev 162) @@ -7,7 +7,7 @@ import org.nuiton.mapstoragemanager.plugins.BigTable; /** - * Interface listant les méthodes nécéssaires sur une base de données. + * Implementation of bigTable with hashMap. * @author Dorian Langlais * */ @@ -18,12 +18,6 @@ * hashMap with value is table, and key its name. */ private Map<String, Table> tables; - /** - * currentTable. - * the table which is selected. - */ - // Not used - //private Table currentTable; /** * Default constructor. @@ -39,7 +33,7 @@ * Create a new HashMap database. */ @Override - public boolean connect(Properties properties) { + public final boolean connect(final Properties properties) { //throw new UnsupportedOperationException("Not supported yet."); new BigHashMap(); return true; @@ -49,7 +43,7 @@ * {@inheritDoc} */ @Override - public void selectTable(String table) { + public final void selectTable(final String table) { // Not used //this.currentTable = tables.get(table); } @@ -58,7 +52,7 @@ * {@inheritDoc} */ @Override - public void createTable(String table) { + public final void createTable(final String table) { this.tables.put(table, new TableImpl()); } @@ -66,7 +60,7 @@ * {@inheritDoc} */ @Override - public void deleteTable(String table) { + public final void deleteTable(final String table) { this.tables.remove(table); } @@ -74,7 +68,7 @@ * {@inheritDoc} */ @Override - public Set<String> getTablesNames() { + public final Set<String> getTablesNames() { return this.tables.keySet(); } @@ -82,7 +76,7 @@ * {@inheritDoc} */ @Override - public void createColumn(String table, String column) { + public final void createColumn(final String table, final String column) { this.tables.get(table).createColumn(column); } @@ -90,7 +84,7 @@ * {@inheritDoc} */ @Override - public void deleteColumn(String table, String column) { + public final void deleteColumn(final String table, final String column) { this.tables.get(table).deleteColumn(column); } @@ -98,7 +92,7 @@ * {@inheritDoc} */ @Override - public Set<String> getColumnsNames(String table) { + public final Set<String> getColumnsNames(final String table) { return this.tables.get(table).getColumnsNames(); } @@ -106,7 +100,8 @@ * {@inheritDoc} */ @Override - public void put(String table, String column, String key, String content) { + public final void put(final String table, final String column, + final String key, final String content) { this.tables.get(table).put(column, key, content); } @@ -114,7 +109,8 @@ * {@inheritDoc} */ @Override - public String get(String table, String column, String key) { + public final String get(final String table, final String column, + final String key) { return this.tables.get(table).get(column, key).toString(); } @@ -122,7 +118,8 @@ * {@inheritDoc} */ @Override - public String get(String table, String column, String key, int version) { + public final String get(final String table, final String column, + final String key, final int version) { return this.tables.get(table).get(column, key, version).toString(); } @@ -130,14 +127,15 @@ * {@inheritDoc} */ @Override - public Map<String, String> getRow(String table, String key) { - + public final Map<String, String> getRow(final String table, + final String key) { + Row row = this.tables.get(table).getRow(key); - Map<String,String> rowContent = row.getRowContent(); - Map<String,String> rowMap = new HashMap<String,String>(); + Map<String, String> rowContent = row.getRowContent(); + Map<String, String> rowMap = new HashMap<String, String>(); - for(String rowKey : rowContent.keySet()) { + for (String rowKey : rowContent.keySet()) { String rowValue = rowContent.get(rowKey).toString(); rowMap.put(rowKey, rowValue); } @@ -148,7 +146,7 @@ * {@inheritDoc} */ @Override - public Set<String> getKeys(String table) { + public final Set<String> getKeys(final String table) { return this.tables.get(table).getKeys(); } @@ -156,7 +154,7 @@ * {@inheritDoc} */ @Override - public String getPluginName() { + public final String getPluginName() { return this.getClass().getSimpleName(); } } Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Cell.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Cell.java 2010-03-02 13:15:33 UTC (rev 161) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Cell.java 2010-03-02 13:31:59 UTC (rev 162) @@ -27,19 +27,9 @@ */ String get(Long t); -// /** -// * hashCode(). -// * @return -// */ -// int hashCode(); -// -// /** -// * equals(). -// */ -// boolean equals(Object o); - /** * toString(). + * @return a string representation of the cell. */ String toString(); } Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/CellImpl.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/CellImpl.java 2010-03-02 13:15:33 UTC (rev 161) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/CellImpl.java 2010-03-02 13:31:59 UTC (rev 162) @@ -9,7 +9,6 @@ * A cell contain different version of a content. * So a cell store String and its version. * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. - * @licence GPL. */ public class CellImpl implements Cell { @@ -30,7 +29,7 @@ * Constructor with object. * @param t The object to store. */ - public CellImpl(String t) { + public CellImpl(final String t) { this.cell = new HashMap<Long, String>(); this.put(t); } @@ -39,7 +38,7 @@ * {@inheritDoc} */ public final void put(final String t) { - cell.put((long)cell.size(), t); + cell.put((long) cell.size(), t); //cell.put(System.currentTimeMillis(), t); } @@ -66,45 +65,12 @@ return cell.get(max); } -// /** -// * {@inheritDoc} -// */ -// public int hashCode() { -// if (! this.cell.isEmpty()) { -// return this.get().hashCode(); -// } else { -// return 0; -// } -// } -// -// /** -// * {@inheritDoc} -// * //TODO : we consider only the last item... but it will be better to -// * //TODO verify all the "versions" of the cell. -// */ -// public boolean equals(Object o) { -// if (o instanceof CellImpl) { -// CellImpl another = (CellImpl) o; -// if(this.cell.size() == another.cell.size()) { -// if(this.cell.isEmpty()) { -// return true; -// } else { -// return this.get().equals(another.get()); -// } -// } else { -// return false; -// } -// } else { -// return false; -// } -// } - /** * {@inheritDoc} */ - public String toString() { + public final String toString() { String ret = ""; - if (! this.cell.isEmpty()) { + if (!this.cell.isEmpty()) { ret = this.get(); } return ret; Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Column.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Column.java 2010-03-02 13:15:33 UTC (rev 161) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Column.java 2010-03-02 13:31:59 UTC (rev 162) @@ -9,15 +9,15 @@ public interface Column { /** - * Get the object which has key <b>key</key>. + * Get the object which has key <b>key</b>. * @param key the key. * @return the object stored at the line identified by <b>key</b> */ String get(String key); /** - * Get the object which has key <b>key</key> and version <b>version</b>. - * @param key + * Get the object which has key <b>key</b> and version <b>version</b>. + * @param key the key * @param version the version wanted (it can be timestamp, number..). * @return The object corresponding to the "version". */ @@ -36,19 +36,9 @@ */ void delete(String key); -// /** -// * hashCode(). -// * @return -// */ -// int hashCode(); -// -// /** -// * equals(). -// */ -// boolean equals(Object o); - /** * toString(). + * @return a string representation of the column. */ String toString(); Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/ColumnImpl.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/ColumnImpl.java 2010-03-02 13:15:33 UTC (rev 161) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/ColumnImpl.java 2010-03-02 13:31:59 UTC (rev 162) @@ -8,7 +8,6 @@ /** * Classe Column. * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. - * @licence GPL. */ public class ColumnImpl implements Column { @@ -46,7 +45,7 @@ * {@inheritDoc} */ public final void put(final String key, final String content) { - if(this.column.keySet().contains(key)) { + if (this.column.keySet().contains(key)) { this.column.get(key).put(content); } else { this.column.put(key, new CellImpl(content)); @@ -60,32 +59,6 @@ this.column.remove(key); } -// /** -// * {@inheritDoc} -// */ -// public final int hashCode() { -// int hash = 0; -// for(Cell c : column.values()) { -// hash += c.hashCode(); -// } -// return hash; -// } -// -// /** -// * {@inheritDoc} -// */ -// public boolean equals(Object o) { -// if (o instanceof Column) { -// -// ColumnImpl other = (ColumnImpl) o; -// -// return other.column.equals(this.column); -// -// } else { -// return false; -// } -// } - /** * {@inheritDoc} */ @@ -102,7 +75,7 @@ /** * {@inheritDoc} */ - public Set<String> getKeys() { + public final Set<String> getKeys() { return this.column.keySet(); } } Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Row.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Row.java 2010-03-02 13:15:33 UTC (rev 161) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Row.java 2010-03-02 13:31:59 UTC (rev 162) @@ -3,7 +3,7 @@ import java.util.Map; /** - * Interface to present the methods on a Row + * Interface to present the methods on a Row. * @author Dorian Langlais * */ Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/RowImpl.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/RowImpl.java 2010-03-02 13:15:33 UTC (rev 161) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/RowImpl.java 2010-03-02 13:31:59 UTC (rev 162) @@ -36,14 +36,14 @@ /** * {@inheritDoc} */ - public Structure getRowStructure() { + public final Structure getRowStructure() { return rowStructure; } /** * {@inheritDoc} */ - public Map<String, String> getRowContent() { + public final Map<String, String> getRowContent() { return rowContent; } @@ -59,7 +59,7 @@ /** * {@inheritDoc} */ - public String getContent(String columnName) { + public final String getContent(final String columnName) { return rowContent.get(columnName); } } Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Structure.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Structure.java 2010-03-02 13:15:33 UTC (rev 161) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Structure.java 2010-03-02 13:31:59 UTC (rev 162) @@ -28,22 +28,9 @@ */ void deleteColumn(String columnName); -// /** -// * get the hashCode of the structure. -// * @return return the hashCode of the structure. -// */ -// int hashCode(); -// -// /** -// * Permit to verify if this is equals to another object. -// * @param another the object to compare -// * @return true if this is equals to <b>another</b> -// */ -// boolean equals(Object o); - /** * toString(). - * @return + * @return a string representation of the structure. */ String toString(); } Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Table.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Table.java 2010-03-02 13:15:33 UTC (rev 161) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Table.java 2010-03-02 13:31:59 UTC (rev 162) @@ -13,7 +13,7 @@ /** * Create a column in the table. * @param columnName the column name - * @param <columnClass> generics to spécify the class of the stored objects. + * @param <columnClass> generics to specify the class of the stored objects. */ <columnClass> void createColumn(final String columnName); Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java 2010-03-02 13:15:33 UTC (rev 161) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java 2010-03-02 13:31:59 UTC (rev 162) @@ -9,7 +9,6 @@ * Class Table. * Implements the interface Table. * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. - * @licence GPL. */ public class TableImpl implements Table { @@ -62,7 +61,7 @@ /** * {@inheritDoc} */ - public void deleteRow(final String key) { + public final void deleteRow(final String key) { for (Column column : tableColumns.values()) { column.delete(key); } @@ -71,37 +70,39 @@ /** * {@inheritDoc} */ - public void put(String columnName, String key, String content) { + public final void put(final String columnName, final String key, + final String content) { this.tableColumns.get(columnName).put(key, content); } /** * {@inheritDoc} */ - public Object get(String columnName, String key) { + public final Object get(final String columnName, final String key) { return this.tableColumns.get(columnName).get(key); } /** * {@inheritDoc} */ - public Object get(String columnName, String key, long version) { + public final Object get(final String columnName, final String key, + final long version) { return this.tableColumns.get(columnName).get(key, version); } /** * {@inheritDoc} */ - public Set<String> getColumnsNames() { + public final Set<String> getColumnsNames() { return this.tableColumns.keySet(); } /** * {@inheritDoc} */ - public Set<String> getKeys() { + public final Set<String> getKeys() { Set<String> keys = new HashSet<String>(); - for(Column col : this.tableColumns.values()){ + for (Column col : this.tableColumns.values()) { keys.addAll(col.getKeys()); } return keys; Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/package-info.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/package-info.java 2010-03-02 13:15:33 UTC (rev 161) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/package-info.java 2010-03-02 13:31:59 UTC (rev 162) @@ -1,6 +1,6 @@ package org.nuiton.mapstoragemanager.plugins.bighashmapv2; /** - * package BigHashMap. + * @package BigHashMap. * Permet la représentation sous forme de hashMap d'une base de données selon * la spécification bigTable. */ Modified: trunk/msm-fromtoXML/pom.xml =================================================================== --- trunk/msm-fromtoXML/pom.xml 2010-03-02 13:15:33 UTC (rev 161) +++ trunk/msm-fromtoXML/pom.xml 2010-03-02 13:31:59 UTC (rev 162) @@ -208,8 +208,30 @@ </plugins> </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + <encoding>${project.build.sourceEncoding}</encoding> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.2</version> + <configuration> + <encoding>${project.build.sourceEncoding}</encoding> + </configuration> + </plugin> + </plugins> </build> - + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> </project> @@ -218,3 +240,4 @@ + Modified: trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java =================================================================== --- trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-02 13:15:33 UTC (rev 161) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-02 13:31:59 UTC (rev 162) @@ -38,7 +38,7 @@ * {@inheritDoc} */ @Override - public void exportTo(BigTable bigTable, File file) { + public final void exportTo(final BigTable bigTable, final File file) { Element database = new Element("database"); document = new Document(database); @@ -56,7 +56,7 @@ * @param bigTable the bigTable. * @param database the database Element. */ - private void forEachTable(final BigTable bigTable, Element database) { + private void forEachTable(final BigTable bigTable, final Element database) { // the tables name. Set<String> tablesNames = bigTable.getTablesNames(); @@ -80,7 +80,7 @@ * @param bigTable the bigTable. * @param table the table Element. */ - private void forEachColumn(final BigTable bigTable, Element table) { + private void forEachColumn(final BigTable bigTable, final Element table) { // the table name. String tableName = table.getAttributeValue("tableName"); @@ -96,7 +96,7 @@ // we add the column to the table. table.addContent(column); - + // we search the cells of the table. forEachCell(bigTable, column); } @@ -107,7 +107,7 @@ * @param bigTable the bigTable. * @param column the column Element. */ - private void forEachCell(final BigTable bigTable, Element column) { + private void forEachCell(final BigTable bigTable, final Element column) { // the table name. String tableName = column.getParentElement().getAttributeValue("tableName"); @@ -117,11 +117,11 @@ // the table keys. Set<String> keys = bigTable.getKeys(tableName); - String content = ""; + String content; for (String key : keys) { - try{ - content = bigTable.get(tableName, columnName, key); - if ( ! "".equals(content)) { + try { + content = bigTable.get(tableName, columnName, key); + if (!"".equals(content)) { // new cell Element. Element cell = new Element("cell"); @@ -139,11 +139,9 @@ // we add the value to the cell. cell.addContent(value); } - } - catch (NoSuchElementException e) { + } catch (NoSuchElementException e) { LOG.trace(e, e); } - } } @@ -164,7 +162,7 @@ * Method to save the file. * @param file the file in which we save the database. */ - private static void save(File file) { + private static void save(final File file) { try { XMLOutputter output = new XMLOutputter(Format.getPrettyFormat()); FileOutputStream fos = new FileOutputStream(file); @@ -179,7 +177,7 @@ * {@inheritDoc} */ @Override - public String getPluginName() { + public final String getPluginName() { return this.getClass().getSimpleName(); } } Modified: trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/package-info.java =================================================================== --- trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/package-info.java 2010-03-02 13:15:33 UTC (rev 161) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/package-info.java 2010-03-02 13:31:59 UTC (rev 162) @@ -1,5 +1,5 @@ package org.nuiton.mapstoragemanager.plugins.exporter; /** - * package exporter. - * Permet l'export dans un format XML d'une base bigtable. + * @package exporter. + * Export bigtable database in xml files. */ Modified: trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java =================================================================== --- trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java 2010-03-02 13:15:33 UTC (rev 161) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java 2010-03-02 13:31:59 UTC (rev 162) @@ -37,7 +37,7 @@ * {@inheritDoc} */ @Override - public void importFrom(BigTable bigTable, File file) { + public final void importFrom(final BigTable bigTable, final File file) { try { open(file); @@ -58,7 +58,7 @@ * @param bigTable the bigTable. * @param database the database Element. */ - private void forEachTable(BigTable bigTable, final Element database) { + private void forEachTable(final BigTable bigTable, final Element database) { // the table elements. List<Element> tables = database.getChildren("table"); @@ -77,7 +77,7 @@ * @param bigTable the bigTable. * @param table the table Element. */ - private void forEachColumn(BigTable bigTable, final Element table) { + private void forEachColumn(final BigTable bigTable, final Element table) { // the table name. String tableName = table.getAttributeValue("tableName"); @@ -99,7 +99,7 @@ * @param bigTable the bigTable. * @param column the column Element. */ - private void forEachCell(BigTable bigTable, final Element column) { + private void forEachCell(final BigTable bigTable, final Element column) { // the table name. String tableName = column.getParentElement().getAttributeValue("tableName"); @@ -135,8 +135,9 @@ /** * Method to load the jdom document of the file. * @param file the file from which the database is saved. + * @throws IOException IOException */ - private static void open(File file) throws IOException { + private static void open(final File file) throws IOException { //On crée une instance de SAXBuilder SAXBuilder saxBuilder = new SAXBuilder(); try { @@ -151,7 +152,7 @@ * {@inheritDoc} */ @Override - public String getPluginName() { + public final String getPluginName() { return this.getClass().getSimpleName(); } } Modified: trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/package-info.java =================================================================== --- trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/package-info.java 2010-03-02 13:15:33 UTC (rev 161) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/package-info.java 2010-03-02 13:31:59 UTC (rev 162) @@ -1,6 +1,5 @@ package org.nuiton.mapstoragemanager.plugins.importer; /** - * package importer. - * Permet l'import dans une base bigtable du contenu d'une base bigtable stockée - * dans un fichier XML. + * @package importer. + * Import bigtable database from xml files. */