[Mapstoragemanager-commits] r158 - trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap

2 Mar 2010

Author: dlanglais
Date: 2010-03-02 13:10:28 +0100 (Tue, 02 Mar 2010)
New Revision: 158

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/Cell.java
   trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java
   trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java
   trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java
   trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java
   trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java
   trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java
   trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java
   trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java
   trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java
   trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java
Log:
correction checkstyle sur le plugin MSM-BigHashMap



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 11:24:35 UTC (rev 157)
+++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java	2010-03-02 12:10:28 UTC (rev 158)
@@ -39,7 +39,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 +49,7 @@
      * {@inheritDoc}
      */
     @Override
-    public void selectTable(String table) {
+    public final void selectTable(final String table) {
         // Not used
         //this.currentTable = tables.get(table);
     }
@@ -58,7 +58,7 @@
      * {@inheritDoc}
      */
     @Override
-    public void createTable(String table) {
+    public final void createTable(final String table) {
         this.tables.put(table, new TableImpl());
     }
 
@@ -66,15 +66,16 @@
      * {@inheritDoc}
      */
     @Override
-    public void deleteTable(String table) {
+    public final void deleteTable(final String table) {
         this.tables.remove(table);
+        a = a;
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
-    public Set<String> getTablesNames() {
+    public final Set<String> getTablesNames() {
         return this.tables.keySet();
     }
 
@@ -82,7 +83,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, null);
     }
 
@@ -90,7 +91,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 +99,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 +107,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 +116,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 +125,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 +134,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,Object> rowContent = row.getRowContent();
-        Map<String,String> rowMap = new HashMap<String,String>();
+        Map<String, Object> 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 +153,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 +161,7 @@
      * {@inheritDoc}
      */
     @Override
-    public String getPluginName() {
+    public final String getPluginName() {
         return this.getClass().getSimpleName();
     }
 

Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java
===================================================================
--- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java	2010-03-02 11:24:35 UTC (rev 157)
+++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java	2010-03-02 12:10:28 UTC (rev 158)
@@ -31,17 +31,20 @@
 
     /**
      * hashCode().
-     * @return
+     * @return hashCode.
      */
     int hashCode();
 
     /**
      * equals().
+     * @param o the object to compare
+     * @return true if instance equals to object o.
      */
     boolean equals(Object o);
 
     /**
      * toString().
+     * @return a string representation of the cell.
      */
     String toString();
 }

Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java
===================================================================
--- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java	2010-03-02 11:24:35 UTC (rev 157)
+++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java	2010-03-02 12:10:28 UTC (rev 158)
@@ -10,7 +10,6 @@
  * So a cell store objects and its version.
  * @param <T> The type of the stored objects.
  * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet.
- * @licence GPL.
  */
 public class CellImpl<T> implements Cell<T> {
 
@@ -31,7 +30,7 @@
      * Constructor with object.
      * @param t The object to store.
      */
-    public CellImpl(T t) {
+    public CellImpl(final T t) {
         this.cell = new HashMap<Long, T>();
         this.put(t);
     }
@@ -40,7 +39,7 @@
      * {@inheritDoc}
      */
     public final void put(final T t) {
-        cell.put((long)cell.size(), t);
+        cell.put((long) cell.size(), t);
         //cell.put(System.currentTimeMillis(), t);
     }
 
@@ -70,9 +69,9 @@
     /**
      * {@inheritDoc}
      */
-    public int hashCode() {
+    public final int hashCode() {
         int hash = 0;
-        if (! this.cell.isEmpty()) {
+        if (!this.cell.isEmpty()) {
             hash = this.get().hashCode();
         }
         return hash;
@@ -83,12 +82,12 @@
      * //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) {
+    public final boolean equals(final Object o) {
         boolean equals = false;
         if (o instanceof CellImpl) {
             CellImpl another = (CellImpl) o;
-            if(this.cell.size() == another.cell.size()) {
-                if(this.cell.isEmpty()) {
+            if (this.cell.size() == another.cell.size()) {
+                if (this.cell.isEmpty()) {
                     equals = true;
                 } else {
                     equals = this.get().equals(another.get());
@@ -100,9 +99,9 @@
     /**
      * {@inheritDoc}
      */
-    public String toString() {
+    public final String toString() {
         String ret = "";
-        if (! this.cell.isEmpty()) {
+        if (!this.cell.isEmpty()) {
             ret = ((T) this.get()).toString();
         }
         return ret;

Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java
===================================================================
--- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java	2010-03-02 11:24:35 UTC (rev 157)
+++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java	2010-03-02 12:10:28 UTC (rev 158)
@@ -11,15 +11,15 @@
 public interface Column<T> {
 
     /**
-     * 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>
      */
     T 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".
      */
@@ -40,17 +40,20 @@
 
     /**
      * hashCode().
-     * @return
+     * @return hashCode.
      */
     int hashCode();
 
     /**
      * equals().
+     * @param o the object to compare
+     * @return true if instance equals to object o.
      */
     boolean equals(Object o);
 
     /**
      * toString().
+     * @return a string representation of the column.
      */
     String toString();
 

Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java
===================================================================
--- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java	2010-03-02 11:24:35 UTC (rev 157)
+++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java	2010-03-02 12:10:28 UTC (rev 158)
@@ -9,7 +9,6 @@
  * Classe Column.
  * @param <T> Type de contenu des cellules.
  * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet.
- * @licence GPL.
  */
 public class ColumnImpl<T> implements Column<T> {
 
@@ -47,10 +46,10 @@
      * {@inheritDoc}
      */
     public final void put(final String key, final Object content) {
-        if(this.column.keySet().contains(key)) {
-            this.column.get(key).put((T)content);
+        if (this.column.keySet().contains(key)) {
+            this.column.get(key).put((T) content);
         } else {
-            this.column.put(key, new CellImpl<T>((T)content));
+            this.column.put(key, new CellImpl<T>((T) content));
         }
     }
 
@@ -66,7 +65,7 @@
      */
     public final int hashCode() {
         int hash = 0;
-        for(Cell c : column.values()) {
+        for (Cell c : column.values()) {
             hash += c.hashCode();
         }
         return hash;
@@ -75,10 +74,10 @@
     /**
      * {@inheritDoc}
      */
-    public boolean equals(Object o) {
+    public final boolean equals(final Object o) {
         boolean equals = false;
         if (o instanceof Column) {
-            
+
             ColumnImpl other = (ColumnImpl) o;
 
             equals = other.column.equals(this.column);
@@ -103,7 +102,7 @@
     /**
      * {@inheritDoc}
      */
-    public Set<String> getKeys() {
+    public final Set<String> getKeys() {
         return this.column.keySet();
     }
 }

Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java
===================================================================
--- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java	2010-03-02 11:24:35 UTC (rev 157)
+++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java	2010-03-02 12:10:28 UTC (rev 158)
@@ -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-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java
===================================================================
--- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java	2010-03-02 11:24:35 UTC (rev 157)
+++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java	2010-03-02 12:10:28 UTC (rev 158)
@@ -24,8 +24,7 @@
      * @param struct the row structure
      * @param content the row content
      */
-    public RowImpl(final Structure struct,
-        final Map<String, Object> content) {
+    public RowImpl(final Structure struct, final Map<String, Object> content) {
         this.rowStructure = struct;
         this.rowContent = new HashMap<String, Object>();
         for (String columnName : struct.getColumnsNames()) {
@@ -36,14 +35,14 @@
     /**
      * {@inheritDoc}
      */
-    public Structure getRowStructure() {
+    public final Structure getRowStructure() {
         return rowStructure;
     }
 
     /**
      * {@inheritDoc}
      */
-    public Map<String, Object> getRowContent() {
+    public final Map<String, Object> getRowContent() {
         return rowContent;
     }
 
@@ -59,7 +58,7 @@
     /**
      * {@inheritDoc}
      */
-    public Object getContent(String columnName) {
+    public final Object getContent(final String columnName) {
         return rowContent.get(columnName);
     }
 }

Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java
===================================================================
--- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java	2010-03-02 11:24:35 UTC (rev 157)
+++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java	2010-03-02 12:10:28 UTC (rev 158)
@@ -44,7 +44,7 @@
 
     /**
      * Permit to verify if this is equals to another object.
-     * @param another the object to compare
+     * @param o the object to compare
      * @return true if this is equals to <b>another</b>
      */
     boolean equals(Object o);

Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java
===================================================================
--- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java	2010-03-02 11:24:35 UTC (rev 157)
+++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java	2010-03-02 12:10:28 UTC (rev 158)
@@ -61,8 +61,8 @@
      */
     public final int hashCode() {
         int hash = 0;
-        if ( ! structure.isEmpty()) {
-            for (String key : structure.keySet() ) {
+        if (!structure.isEmpty()) {
+            for (String key : structure.keySet()) {
                 hash += key.hashCode();
                 hash += structure.get(key).hashCode();
             }
@@ -73,10 +73,10 @@
     /**
      * {@inheritDoc}
      */
-    public final boolean equals(Object o) {
+    public final boolean equals(final Object o) {
         boolean equals = false;
         if (o instanceof StructureImpl) {
-            
+
             StructureImpl another = (StructureImpl) o;
 
             equals = this.structure.equals(another.structure);

Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java
===================================================================
--- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java	2010-03-02 11:24:35 UTC (rev 157)
+++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java	2010-03-02 12:10:28 UTC (rev 158)
@@ -14,7 +14,7 @@
      * Create a column in the table.
      * @param columnName the column name
      * @param columnClass the column class
-     * @param <columnClass> generics to spécify the class of the stored objects.
+     * @param <columnClass> generics to sp�cify the class of the stored objects.
      */
     <columnClass> void createColumn(final String columnName,
         final Class<?> columnClass);

Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java
===================================================================
--- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java	2010-03-02 11:24:35 UTC (rev 157)
+++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java	2010-03-02 12:10:28 UTC (rev 158)
@@ -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 {
 
@@ -63,7 +62,7 @@
     /**
      * {@inheritDoc}
      */
-    public void deleteRow(final String key) {
+    public final void deleteRow(final String key) {
         for (Column column : tableColumns.values()) {
             column.delete(key);
         }
@@ -72,37 +71,39 @@
     /**
      * {@inheritDoc}
      */
-    public void put(String columnName, String key, Object o) {
+    public final void put(final String columnName, final String key,
+            final Object o) {
         this.tableColumns.get(columnName).put(key, o);
     }
 
     /**
      * {@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-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java
===================================================================
--- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java	2010-03-02 11:24:35 UTC (rev 157)
+++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java	2010-03-02 12:10:28 UTC (rev 158)
@@ -1,6 +1,6 @@
 package org.nuiton.mapstoragemanager.plugins.bighashmap;
 /**
- * package BigHashMap.
- * Permet la représentation sous forme de hashMap d'une base de données selon
- * la spécification bigTable.
+ * @package BigHashMap.
+ * Permet la repr�sentation sous forme de hashMap d'une base de donn�es selon
+ * la sp�cification bigTable.
  */

    

[Mapstoragemanager-commits] r158 - trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap

dlanglais＠users.nuiton.org