Author: dlanglais Date: 2010-03-02 12:24:35 +0100 (Tue, 02 Mar 2010) New Revision: 157 Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMap.java trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Exporter.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Importer.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java Log: l'interface BigTable implemente plugin, r?\195?\169percussion sur les plugins Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java 2010-03-02 11:13:24 UTC (rev 156) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java 2010-03-02 11:24:35 UTC (rev 157) @@ -8,7 +8,7 @@ * The interface for all the BigTable implementations. * @author Dorian Langlais */ -public interface BigTable { +public interface BigTable extends Plugin { /** * Connects to the database. Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Exporter.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Exporter.java 2010-03-02 11:13:24 UTC (rev 156) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Exporter.java 2010-03-02 11:24:35 UTC (rev 157) @@ -6,7 +6,7 @@ * The interface for the exporter implementations. * @author Dorian Langlais */ -public interface Exporter { +public interface Exporter extends Plugin { /** * Export the content of a "bigTable" in a file. Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Importer.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Importer.java 2010-03-02 11:13:24 UTC (rev 156) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Importer.java 2010-03-02 11:24:35 UTC (rev 157) @@ -6,7 +6,7 @@ * The interface for the importer implementations. * @author Dorian Langlais */ -public interface Importer { +public interface Importer extends Plugin { /** * Import the content of a file in a "bigTable". Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java 2010-03-02 11:13:24 UTC (rev 156) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java 2010-03-02 11:24:35 UTC (rev 157) @@ -116,4 +116,12 @@ Set<String> keys = new HashSet(mapColumn.get(column)); return keys; } + + /** + * {@inheritDoc} + */ + @Override + public String getPluginName() { + return this.getClass().getSimpleName(); + } } 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:13:24 UTC (rev 156) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-03-02 11:24:35 UTC (rev 157) @@ -38,6 +38,7 @@ * {@inheritDoc} * Create a new HashMap database. */ + @Override public boolean connect(Properties properties) { //throw new UnsupportedOperationException("Not supported yet."); new BigHashMap(); @@ -47,6 +48,7 @@ /** * {@inheritDoc} */ + @Override public void selectTable(String table) { // Not used //this.currentTable = tables.get(table); @@ -55,6 +57,7 @@ /** * {@inheritDoc} */ + @Override public void createTable(String table) { this.tables.put(table, new TableImpl()); } @@ -62,6 +65,7 @@ /** * {@inheritDoc} */ + @Override public void deleteTable(String table) { this.tables.remove(table); } @@ -69,6 +73,7 @@ /** * {@inheritDoc} */ + @Override public Set<String> getTablesNames() { return this.tables.keySet(); } @@ -76,6 +81,7 @@ /** * {@inheritDoc} */ + @Override public void createColumn(String table, String column) { this.tables.get(table).createColumn(column, null); } @@ -83,6 +89,7 @@ /** * {@inheritDoc} */ + @Override public void deleteColumn(String table, String column) { this.tables.get(table).deleteColumn(column); } @@ -90,6 +97,7 @@ /** * {@inheritDoc} */ + @Override public Set<String> getColumnsNames(String table) { return this.tables.get(table).getColumnsNames(); } @@ -97,6 +105,7 @@ /** * {@inheritDoc} */ + @Override public void put(String table, String column, String key, String content) { this.tables.get(table).put(column, key, content); } @@ -104,6 +113,7 @@ /** * {@inheritDoc} */ + @Override public String get(String table, String column, String key) { return this.tables.get(table).get(column, key).toString(); } @@ -111,6 +121,7 @@ /** * {@inheritDoc} */ + @Override public String get(String table, String column, String key, int version) { return this.tables.get(table).get(column, key, version).toString(); } @@ -118,6 +129,7 @@ /** * {@inheritDoc} */ + @Override public Map<String, String> getRow(String table, String key) { Row row = this.tables.get(table).getRow(key); @@ -135,8 +147,17 @@ /** * {@inheritDoc} */ + @Override public Set<String> getKeys(String table) { return this.tables.get(table).getKeys(); } + /** + * {@inheritDoc} + */ + @Override + public String getPluginName() { + return this.getClass().getSimpleName(); + } + } 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 11:13:24 UTC (rev 156) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMap.java 2010-03-02 11:24:35 UTC (rev 157) @@ -38,6 +38,7 @@ * {@inheritDoc} * Create a new HashMap database. */ + @Override public boolean connect(Properties properties) { //throw new UnsupportedOperationException("Not supported yet."); new BigHashMap(); @@ -47,6 +48,7 @@ /** * {@inheritDoc} */ + @Override public void selectTable(String table) { // Not used //this.currentTable = tables.get(table); @@ -55,6 +57,7 @@ /** * {@inheritDoc} */ + @Override public void createTable(String table) { this.tables.put(table, new TableImpl()); } @@ -62,6 +65,7 @@ /** * {@inheritDoc} */ + @Override public void deleteTable(String table) { this.tables.remove(table); } @@ -69,6 +73,7 @@ /** * {@inheritDoc} */ + @Override public Set<String> getTablesNames() { return this.tables.keySet(); } @@ -76,6 +81,7 @@ /** * {@inheritDoc} */ + @Override public void createColumn(String table, String column) { this.tables.get(table).createColumn(column); } @@ -83,6 +89,7 @@ /** * {@inheritDoc} */ + @Override public void deleteColumn(String table, String column) { this.tables.get(table).deleteColumn(column); } @@ -90,6 +97,7 @@ /** * {@inheritDoc} */ + @Override public Set<String> getColumnsNames(String table) { return this.tables.get(table).getColumnsNames(); } @@ -97,6 +105,7 @@ /** * {@inheritDoc} */ + @Override public void put(String table, String column, String key, String content) { this.tables.get(table).put(column, key, content); } @@ -104,6 +113,7 @@ /** * {@inheritDoc} */ + @Override public String get(String table, String column, String key) { return this.tables.get(table).get(column, key).toString(); } @@ -111,6 +121,7 @@ /** * {@inheritDoc} */ + @Override public String get(String table, String column, String key, int version) { return this.tables.get(table).get(column, key, version).toString(); } @@ -118,6 +129,7 @@ /** * {@inheritDoc} */ + @Override public Map<String, String> getRow(String table, String key) { Row row = this.tables.get(table).getRow(key); @@ -135,8 +147,16 @@ /** * {@inheritDoc} */ + @Override public Set<String> getKeys(String table) { return this.tables.get(table).getKeys(); } + /** + * {@inheritDoc} + */ + @Override + public String getPluginName() { + return this.getClass().getSimpleName(); + } } 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 11:13:24 UTC (rev 156) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-02 11:24:35 UTC (rev 157) @@ -174,4 +174,12 @@ LOG.error(ex, ex); } } + + /** + * {@inheritDoc} + */ + @Override + public String getPluginName() { + return this.getClass().getSimpleName(); + } } 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 11:13:24 UTC (rev 156) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java 2010-03-02 11:24:35 UTC (rev 157) @@ -7,11 +7,8 @@ import java.io.File; import java.io.IOException; import java.util.List; -import java.util.NoSuchElementException; -import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jdom.Attribute; import org.jdom.Document; import org.jdom.Element; import org.jdom.JDOMException; @@ -149,4 +146,12 @@ LOG.error(ex, ex); } } + + /** + * {@inheritDoc} + */ + @Override + public String getPluginName() { + return this.getClass().getSimpleName(); + } } 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-03-02 11:13:24 UTC (rev 156) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-02 11:24:35 UTC (rev 157) @@ -68,6 +68,7 @@ /** * {@inheritDoc} */ + @Override public boolean connect(Properties properties) { throw new UnsupportedOperationException("Not supported yet."); } @@ -75,6 +76,7 @@ /** * {@inheritDoc} */ + @Override public void createTable(String table) { HTableDescriptor hTableDescriptor = new HTableDescriptor(table); try { @@ -88,6 +90,7 @@ /** * {@inheritDoc} */ + @Override public void deleteTable(String table) { try { // to delete a table, we have to disable it. @@ -102,6 +105,7 @@ /** * {@inheritDoc} */ + @Override public Set<String> getTablesNames() { Set<String> tablesNames = new HashSet<String>(); try { @@ -121,6 +125,7 @@ /** * {@inheritDoc} */ + @Override public void createColumn(String table, String column) { HColumnDescriptor hColumnDescriptor = new HColumnDescriptor(column); try { @@ -134,6 +139,7 @@ /** * {@inheritDoc} */ + @Override public void deleteColumn(String table, String column) { try { hBaseAdmin.deleteColumn(table, column); @@ -146,6 +152,7 @@ /** * {@inheritDoc} */ + @Override public Set<String> getColumnsNames(String table) { Set<String> columnsNames = new HashSet<String>(); try { @@ -179,6 +186,7 @@ /** * {@inheritDoc} */ + @Override public void put(String table, String column, String key, String content) { try { Put put = new Put(key.getBytes()); @@ -199,6 +207,7 @@ /** * {@inheritDoc} */ + @Override public String get(String table, String column, String key) { String ret = ""; try { @@ -224,6 +233,7 @@ /** * {@inheritDoc} */ + @Override public String get(String table, String column, String key, int version) { String ret = ""; try { @@ -251,6 +261,7 @@ /** * {@inheritDoc} */ + @Override public Map<String, String> getRow(String table, String key) { Map<String, String> ret = new HashMap<String, String>(); try { @@ -281,6 +292,7 @@ /** * {@inheritDoc} */ + @Override public Set<String> getKeys(String table) { Set<String> ret = new HashSet<String>(); try { @@ -304,6 +316,7 @@ /** * {@inheritDoc} */ + @Override public void selectTable(String table) { try { selectedTable = new HTable(config, table); @@ -311,4 +324,12 @@ LOG.error(ex, ex); } } + + /** + * {@inheritDoc} + */ + @Override + public String getPluginName() { + return this.getClass().getSimpleName(); + } }