Mapstoragemanager-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- 329 discussions
r169 - in trunk: msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2
by dlanglais＠users.nuiton.org 03 Mar '10
by dlanglais＠users.nuiton.org 03 Mar '10
03 Mar '10
Author: dlanglais
Date: 2010-03-03 13:24:09 +0100 (Wed, 03 Mar 2010)
New Revision: 169
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/BigHashMapV2.java
Log:
modification mineure (catch NoSuchElementException).
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-03 12:06:20 UTC (rev 168)
+++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-03-03 12:24:09 UTC (rev 169)
@@ -2,6 +2,7 @@
import java.util.HashMap;
import java.util.Map;
+import java.util.NoSuchElementException;
import java.util.Properties;
import java.util.Set;
import org.nuiton.mapstoragemanager.plugins.BigTable;
@@ -111,7 +112,11 @@
@Override
public final String get(final String table, final String column,
final String key) {
- return this.tables.get(table).get(column, key).toString();
+ try {
+ return this.tables.get(table).get(column, key).toString();
+ } catch (NoSuchElementException e) {
+ return null;
+ }
}
/**
@@ -120,7 +125,11 @@
@Override
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();
+ try {
+ return this.tables.get(table).get(column, key, version).toString();
+ } catch (NoSuchElementException e) {
+ return null;
+ }
}
/**
Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java
===================================================================
--- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-03 12:06:20 UTC (rev 168)
+++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-03 12:24:09 UTC (rev 169)
@@ -2,6 +2,7 @@
import java.util.HashMap;
import java.util.Map;
+import java.util.NoSuchElementException;
import java.util.Properties;
import java.util.Set;
import org.nuiton.mapstoragemanager.plugins.BigTable;
@@ -111,7 +112,11 @@
@Override
public final String get(final String table, final String column,
final String key) {
- return this.tables.get(table).get(column, key);
+ try {
+ return this.tables.get(table).get(column, key);
+ } catch (NoSuchElementException e) {
+ return null;
+ }
}
/**
@@ -120,7 +125,11 @@
@Override
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);
+ try {
+ return this.tables.get(table).get(column, key, version);
+ } catch (NoSuchElementException e) {
+ return null;
+ }
}
/**
1
0
r168 - in trunk: msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2 msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2
by dlanglais＠users.nuiton.org 03 Mar '10
by dlanglais＠users.nuiton.org 03 Mar '10
03 Mar '10
Author: dlanglais
Date: 2010-03-03 13:06:20 +0100 (Wed, 03 Mar 2010)
New Revision: 168
Modified:
trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java
trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.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/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java
Log:
Correction mineure (retourne String au lieu de Object sur deux m?\195?\169thodes de Table).
Modified: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java
===================================================================
--- trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-03-03 11:32:16 UTC (rev 167)
+++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-03-03 12:06:20 UTC (rev 168)
@@ -285,8 +285,12 @@
*/
assertEquals(expectedString1, tableActual.get("String", "string1"));
assertEquals(expectedString2, tableActual.get("String", "string2"));
+// assertEquals(null, tableActual.get("String", "integer1"));
+// assertEquals(null, tableActual.get("String", "integer2"));
assertEquals(expectedInteger1, tableActual.get("Integer", "integer1"));
assertEquals(expectedInteger2, tableActual.get("Integer", "integer2"));
+// assertEquals(null, tableActual.get("String", "integer1"));
+// assertEquals(null, tableActual.get("String", "integer2"));
}
/**
Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java
===================================================================
--- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-03 11:32:16 UTC (rev 167)
+++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-03 12:06:20 UTC (rev 168)
@@ -111,7 +111,7 @@
@Override
public final String get(final String table, final String column,
final String key) {
- return this.tables.get(table).get(column, key).toString();
+ return this.tables.get(table).get(column, key);
}
/**
@@ -120,7 +120,7 @@
@Override
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();
+ return this.tables.get(table).get(column, key, version);
}
/**
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-03 11:32:16 UTC (rev 167)
+++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Table.java 2010-03-03 12:06:20 UTC (rev 168)
@@ -59,7 +59,7 @@
* @param key the key
* @return return the object stored
*/
- Object get(final String columnName, final String key);
+ String get(final String columnName, final String key);
/**
* Get an object from the table.
@@ -70,7 +70,7 @@
* @param version the version wanted
* @return return the object stored
*/
- Object get(final String columnName, final String key, final long version);
+ String get(final String columnName, final String key, final long version);
/**
* Get the keys of the table.
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-03 11:32:16 UTC (rev 167)
+++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java 2010-03-03 12:06:20 UTC (rev 168)
@@ -98,14 +98,14 @@
/**
* {@inheritDoc}
*/
- public final Object get(final String columnName, final String key) {
+ public final String get(final String columnName, final String key) {
return this.tableColumns.get(columnName).get(key);
}
/**
* {@inheritDoc}
*/
- public final Object get(final String columnName, final String key,
+ public final String get(final String columnName, final String key,
final long version) {
return this.tableColumns.get(columnName).get(key, version);
}
Modified: trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java
===================================================================
--- trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java 2010-03-03 11:32:16 UTC (rev 167)
+++ trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java 2010-03-03 12:06:20 UTC (rev 168)
@@ -295,8 +295,12 @@
*/
assertEquals(expectedString1, tableActual.get("String", "string1"));
assertEquals(expectedString2, tableActual.get("String", "string2"));
+// assertEquals(null, tableActual.get("String", "integer1"));
+// assertEquals(null, tableActual.get("String", "integer2"));
assertEquals(expectedInteger1, tableActual.get("Integer", "integer1"));
assertEquals(expectedInteger2, tableActual.get("Integer", "integer2"));
+// assertEquals(null, tableActual.get("String", "integer1"));
+// assertEquals(null, tableActual.get("String", "integer2"));
}
/**
1
0
r167 - in trunk: msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2 msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2
by dlanglais＠users.nuiton.org 03 Mar '10
by dlanglais＠users.nuiton.org 03 Mar '10
03 Mar '10
Author: dlanglais
Date: 2010-03-03 12:32:16 +0100 (Wed, 03 Mar 2010)
New Revision: 167
Modified:
trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java
trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java
trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java
Log:
Corrections mineures (code inutile).
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-03 07:28:16 UTC (rev 166)
+++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-03-03 11:32:16 UTC (rev 167)
@@ -66,15 +66,14 @@
Object content = tableColumns.get(columnName).get(key);
-// LOG.info(columnName + ' ' + key + ' ' + content);
+ LOG.trace(columnName + ' ' + key + ' ' + content);
if (content != null) {
rowContent.put(columnName, content);
- } else {
- rowContent.put(columnName, null);
}
} catch (NoSuchElementException e) {
LOG.trace(e, e);
+ LOG.trace(columnName + ' ' + key + ' ' + null);
}
}
return new RowImpl(tableStructure, rowContent);
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-03 07:28:16 UTC (rev 166)
+++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java 2010-03-03 11:32:16 UTC (rev 167)
@@ -65,15 +65,14 @@
String content = tableColumns.get(columnName).get(key);
-// LOG.info(columnName + ' ' + key + ' ' + content);
+ LOG.trace(columnName + ' ' + key + ' ' + content);
if (content != null) {
rowContent.put(columnName, content);
- } else {
- rowContent.put(columnName, null);
}
} catch (NoSuchElementException e) {
LOG.trace(e, e);
+ LOG.trace(columnName + ' ' + key + ' ' + null);
}
}
return new RowImpl(tableStructure, rowContent);
Modified: trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java
===================================================================
--- trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java 2010-03-03 07:28:16 UTC (rev 166)
+++ trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java 2010-03-03 11:32:16 UTC (rev 167)
@@ -568,11 +568,11 @@
rowInteger1 = tableActual.getRow("integer1");
rowInteger2 = tableActual.getRow("integer2");
- LOG.trace(rowString1.toString() + '\n'
+ LOG.info(rowString1.toString() + '\n'
+ rowString2.toString() + '\n'
+ rowInteger1.toString() + '\n'
+ rowInteger2.toString());
- LOG.trace(rowString1Content.toString() + '\n'
+ LOG.info(rowString1Content.toString() + '\n'
+ rowString2Content.toString() + '\n'
+ rowInteger1Content.toString() + '\n'
+ rowInteger2Content.toString());
1
0
Author: dlanglais
Date: 2010-03-03 08:28:16 +0100 (Wed, 03 Mar 2010)
New Revision: 166
Added:
trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMapTest.java
trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2Test.java
Modified:
trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java
trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java
trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLTest.java
trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java
trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java
Log:
Am?\195?\169lioration qualit?\195?\169, modification test getPluginName() -> couverture am?\195?\169lior?\195?\169e.
Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java
===================================================================
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-02 20:30:27 UTC (rev 165)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-03 07:28:16 UTC (rev 166)
@@ -6,6 +6,7 @@
import java.net.URLClassLoader;
import java.util.Collection;
import java.util.HashMap;
+import java.util.Map;
import java.util.ServiceLoader;
import java.util.Set;
@@ -33,7 +34,7 @@
/**
* Map Identifiant - BigTable implementation.
*/
- private HashMap<String, BigTable> plugins = new HashMap<String, BigTable>();
+ private Map<String, BigTable> plugins = new HashMap<String, BigTable>();
/**
* Class constructor.
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 20:30:27 UTC (rev 165)
+++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-03-03 07:28:16 UTC (rev 166)
@@ -74,7 +74,7 @@
rowContent.put(columnName, null);
}
} catch (NoSuchElementException e) {
- LOG.trace(e);
+ LOG.trace(e, e);
}
}
return new RowImpl(tableStructure, rowContent);
Added: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMapTest.java
===================================================================
--- trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMapTest.java (rev 0)
+++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMapTest.java 2010-03-03 07:28:16 UTC (rev 166)
@@ -0,0 +1,32 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.nuiton.mapstoragemanager.plugins.bighashmap;
+
+import junit.framework.TestCase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.nuiton.mapstoragemanager.plugins.Plugin;
+
+/**
+ *
+ * @author Dorian Langlais
+ */
+public class BigHashMapTest extends TestCase {
+
+ /**
+ * Logger.
+ */
+ private static final Log LOG = LogFactory.getLog(BigHashMapTest.class);
+
+ public void testGetPluginName() {
+ Plugin bigHashMap = new BigHashMap();
+ String expectedPluginName = bigHashMap.getClass().getSimpleName();
+ String actualPluginName = bigHashMap.getPluginName();
+ LOG.info("pluginName : {expected,'" + expectedPluginName
+ + "'} - {actual,'" + actualPluginName + "'}");
+ assertEquals(expectedPluginName, actualPluginName);
+ }
+}
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 20:30:27 UTC (rev 165)
+++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java 2010-03-03 07:28:16 UTC (rev 166)
@@ -73,7 +73,7 @@
rowContent.put(columnName, null);
}
} catch (NoSuchElementException e) {
- LOG.trace(e);
+ LOG.trace(e, e);
}
}
return new RowImpl(tableStructure, rowContent);
Added: trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2Test.java
===================================================================
--- trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2Test.java (rev 0)
+++ trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2Test.java 2010-03-03 07:28:16 UTC (rev 166)
@@ -0,0 +1,32 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.nuiton.mapstoragemanager.plugins.bighashmapv2;
+
+import junit.framework.TestCase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.nuiton.mapstoragemanager.plugins.Plugin;
+
+/**
+ *
+ * @author Dorian Langlais
+ */
+public class BigHashMapV2Test extends TestCase {
+
+ /**
+ * Logger.
+ */
+ private static final Log LOG = LogFactory.getLog(TableTest.class);
+
+ public void testGetPluginName() {
+ Plugin bigHashMapV2 = new BigHashMapV2();
+ String expectedPluginName = bigHashMapV2.getClass().getSimpleName();
+ String actualPluginName = bigHashMapV2.getPluginName();
+ LOG.info("pluginName : {expected,'" + expectedPluginName
+ + "'} - {actual,'" + actualPluginName + "'}");
+ assertEquals(expectedPluginName, actualPluginName);
+ }
+}
Modified: trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLTest.java
===================================================================
--- trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLTest.java 2010-03-02 20:30:27 UTC (rev 165)
+++ trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLTest.java 2010-03-03 07:28:16 UTC (rev 166)
@@ -283,10 +283,13 @@
exportTest.delete();
}
+ /**
+ * Test of getPluginName().
+ */
public void testGetPluginName() {
Plugin toXML = new ToXML();
String expectedPluginName = toXML.getClass().getSimpleName();
- String actualPluginName = toXML.getClass().getSimpleName();
+ String actualPluginName = toXML.getPluginName();
LOG.info("pluginName : {expected,'" + expectedPluginName
+ "'} - {actual,'" + actualPluginName + "'}");
assertEquals(expectedPluginName, actualPluginName);
Modified: trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java
===================================================================
--- trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java 2010-03-02 20:30:27 UTC (rev 165)
+++ trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java 2010-03-03 07:28:16 UTC (rev 166)
@@ -265,10 +265,13 @@
}
}
+ /**
+ * Test of getPluginName().
+ */
public void testGetPluginName() {
Plugin fromXML = new FromXML();
String expectedPluginName = fromXML.getClass().getSimpleName();
- String actualPluginName = fromXML.getClass().getSimpleName();
+ String actualPluginName = fromXML.getPluginName();
LOG.info("pluginName : {expected,'" + expectedPluginName
+ "'} - {actual,'" + actualPluginName + "'}");
assertEquals(expectedPluginName, actualPluginName);
1
0
Author: dlanglais
Date: 2010-03-02 21:30:27 +0100 (Tue, 02 Mar 2010)
New Revision: 165
Removed:
trunk/DEADJOE
Log:
Suppression fichier DEADJOE...
Deleted: trunk/DEADJOE
===================================================================
--- trunk/DEADJOE 2010-03-02 16:02:38 UTC (rev 164)
+++ trunk/DEADJOE 2010-03-02 20:30:27 UTC (rev 165)
@@ -1,48 +0,0 @@
-
-*** Ces fichiers modifi�s �taient ouvert dans JOE quand il a quitt� le Tue Mar 2 12:03:47 2010
-*** JOE a quitt� suite � la fermeture du terminal
-
-*** Fichier '(Sans nom)'
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.2.tmp
-svn-commit.tmp
-
-*** Ces fichiers modifi�s �taient ouvert dans JOE quand il a quitt� le Tue Mar 2 12:11:05 2010
-*** JOE a quitt� suite � la fermeture du terminal
-
-*** Fichier '(Sans nom)'
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.2.tmp
-svn-commit.tmp
-
-*** Ces fichiers modifi�s �taient ouvert dans JOE quand il a quitt� le Tue Mar 2 16:46:03 2010
-*** JOE a quitt� suite � la fermeture du terminal
-
-*** Fichier '(Sans nom)'
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.2.tmp
-svn-commit.tmp
-svn-commit.tmp
-svn-commit.tmp
1
0
r164 - in trunk: . msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/fromto msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/tofrom
by dlanglais＠users.nuiton.org 02 Mar '10
by dlanglais＠users.nuiton.org 02 Mar '10
02 Mar '10
Author: dlanglais
Date: 2010-03-02 17:02:38 +0100 (Tue, 02 Mar 2010)
New Revision: 164
Added:
trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/fromto/
trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/fromto/FromToXML.java
trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/tofrom/
trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/tofrom/ToFromXML.java
Modified:
trunk/DEADJOE
trunk/pom.xml
Log:
Pr?\195?\169paration d'ajout de test d'import/export de base bigtable.
Modified: trunk/DEADJOE
===================================================================
--- trunk/DEADJOE 2010-03-02 15:04:24 UTC (rev 163)
+++ trunk/DEADJOE 2010-03-02 16:02:38 UTC (rev 164)
@@ -30,3 +30,19 @@
svn-commit.tmp
svn-commit.2.tmp
svn-commit.tmp
+
+*** Ces fichiers modifi�s �taient ouvert dans JOE quand il a quitt� le Tue Mar 2 16:46:03 2010
+*** JOE a quitt� suite � la fermeture du terminal
+
+*** Fichier '(Sans nom)'
+svn-commit.tmp
+svn-commit.tmp
+svn-commit.tmp
+svn-commit.tmp
+svn-commit.tmp
+svn-commit.tmp
+svn-commit.tmp
+svn-commit.2.tmp
+svn-commit.tmp
+svn-commit.tmp
+svn-commit.tmp
Added: trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/fromto/FromToXML.java
===================================================================
--- trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/fromto/FromToXML.java (rev 0)
+++ trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/fromto/FromToXML.java 2010-03-02 16:02:38 UTC (rev 164)
@@ -0,0 +1,11 @@
+package org.nuiton.mapstoragemanager.plugins.fromto;
+
+/**
+ * First, import a bigtable from a xml file,
+ * then, export in into a second file.
+ * finally, verify that the content of the two files are equivalents.
+ * @author E054030D
+ */
+public class FromToXML {
+
+}
Added: trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/tofrom/ToFromXML.java
===================================================================
--- trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/tofrom/ToFromXML.java (rev 0)
+++ trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/tofrom/ToFromXML.java 2010-03-02 16:02:38 UTC (rev 164)
@@ -0,0 +1,11 @@
+package org.nuiton.mapstoragemanager.plugins.tofrom;
+
+/**
+ * First, export a bigtable into a xml file,
+ * Secondly, import bigtable from this file,
+ * finally, verify that the exported and imported bigtable base are equivalents.
+ * @author E054030D
+ */
+public class ToFromXML {
+
+}
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-03-02 15:04:24 UTC (rev 163)
+++ trunk/pom.xml 2010-03-02 16:02:38 UTC (rev 164)
@@ -104,7 +104,7 @@
<properties>
<projectId>mapstoragemanager</projectId>
- <jaxx.version>2.0.0-beta-6-SNAPSHOT</jaxx.version>
+ <jaxx.version>2.0.0-beta-5</jaxx.version>
<nuitonutils.version>1.1.0</nuitonutils.version>
<i18n.version>1.0.1</i18n.version>
@@ -179,7 +179,7 @@
</dependencyManagement>
<build>
-
+
<plugins>
<!-- <plugin>
@@ -348,7 +348,7 @@
</pluginRepository>
</pluginRepositories>
-
+
<!--<reporting>
<plugins>
<plugin>
1
0
Author: dlanglais
Date: 2010-03-02 16:04:24 +0100 (Tue, 02 Mar 2010)
New Revision: 163
Added:
trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java
Removed:
trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMap.java
Modified:
trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java
trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java
trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java
trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java
trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLTest.java
trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java
Log:
Nouveaux tests sur les tables dans BigHashMap et BigHashMapV2 : getColumnsNames() et getRow().
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 13:31:59 UTC (rev 162)
+++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-03-02 15:04:24 UTC (rev 163)
@@ -3,7 +3,10 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
+import java.util.NoSuchElementException;
import java.util.Set;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Class Table.
@@ -13,6 +16,11 @@
public class TableImpl implements Table {
/**
+ * Logger.
+ */
+ private static final Log LOG = LogFactory.getLog(TableImpl.class);
+
+ /**
* Table.
* hashMap with key as column name and value, a colum of the table.
*/
@@ -54,7 +62,20 @@
public final Row getRow(final String key) {
Map<String, Object> rowContent = new HashMap<String, Object>();
for (String columnName : tableStructure.getColumnsNames()) {
- rowContent.put(columnName, tableColumns.get(columnName).get(key));
+ try {
+
+ Object content = tableColumns.get(columnName).get(key);
+
+// LOG.info(columnName + ' ' + key + ' ' + content);
+
+ if (content != null) {
+ rowContent.put(columnName, content);
+ } else {
+ rowContent.put(columnName, null);
+ }
+ } catch (NoSuchElementException e) {
+ LOG.trace(e);
+ }
}
return new RowImpl(tableStructure, rowContent);
}
Modified: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java
===================================================================
--- trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-03-02 13:31:59 UTC (rev 162)
+++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-03-02 15:04:24 UTC (rev 163)
@@ -496,4 +496,124 @@
LOG.trace("Exception levée correctement.");
}
}
+
+ /**
+ * We create a new Table, with two columns.
+ * We put objects in this columns.
+ * We get the rows and verify that the content is good.
+ */
+ public void testGetRow() {
+
+ /**
+ * We create object to put
+ */
+ String expectedString1 = new String("string1");
+ String expectedString2 = new String("string2");
+ Integer expectedInteger1 = new Integer(1);
+ Integer expectedInteger2 = new Integer(2);
+ /**
+ * We create the table and columns.
+ */
+ tableActual = new TableImpl();
+ tableActual.createColumn("String", String.class);
+ tableActual.createColumn("Integer", Integer.class);
+
+ Map<String,Object> rowString1Content;
+ Map<String,Object> rowString2Content;
+ Map<String,Object> rowInteger1Content;
+ Map<String,Object> rowInteger2Content;
+ Row rowString1;
+ Row rowString2;
+ Row rowInteger1;
+ Row rowInteger2;
+ /**
+ * We put objects in the table.
+ */
+ {
+ rowString1Content = new HashMap<String, Object>();
+ rowString2Content = new HashMap<String, Object>();
+ rowInteger1Content = new HashMap<String, Object>();
+ rowInteger2Content = new HashMap<String, Object>();
+
+ tableActual.put("String", "string1", expectedString1);
+ tableActual.put("String", "string2", expectedString2);
+ tableActual.put("Integer", "integer1", expectedInteger1);
+ tableActual.put("Integer", "integer2", expectedInteger2);
+ }
+ /**
+ * We get rows.
+ */
+ {
+ rowString1Content.put("String", expectedString1);
+ rowString1Content.put("Integer", null);
+ rowString2Content.put("String", expectedString2);
+ rowString2Content.put("Integer", null);
+ rowInteger1Content.put("Integer", expectedInteger1);
+ rowInteger1Content.put("String", null);
+ rowInteger2Content.put("Integer", expectedInteger2);
+ rowInteger2Content.put("String", null);
+
+ rowString1 = tableActual.getRow("string1");
+ rowString2 = tableActual.getRow("string2");
+ rowInteger1 = tableActual.getRow("integer1");
+ rowInteger2 = tableActual.getRow("integer2");
+
+ LOG.trace(rowString1.toString() + '\n'
+ + rowString2.toString() + '\n'
+ + rowInteger1.toString() + '\n'
+ + rowInteger2.toString());
+ LOG.trace(rowString1Content.toString() + '\n'
+ + rowString2Content.toString() + '\n'
+ + rowInteger1Content.toString() + '\n'
+ + rowInteger2Content.toString());
+ }
+
+ /**
+ * We verify row content.
+ */
+ {
+ assertEquals(rowString1Content, rowString1.getRowContent());
+ assertEquals(rowString2Content, rowString2.getRowContent());
+ assertEquals(rowInteger1Content, rowInteger1.getRowContent());
+ assertEquals(rowInteger2Content, rowInteger2.getRowContent());
+ }
+ }
+
+ /**
+ * We create a new Table, with two columns.
+ * We put objects in this columns.
+ * We get the rows and verify that the content is good.
+ */
+ public void testGestColumnsNames() {
+
+ /**
+ * We create the table and columns.
+ */
+ tableActual = new TableImpl();
+ Set<String> columnsNamesExpected = new HashSet<String>();
+ /**
+ * Table with zero column.
+ */
+ {
+ assertEquals(columnsNamesExpected, tableActual.getColumnsNames());
+ }
+
+ /**
+ * Table with one column.
+ */
+ {
+ tableActual.createColumn("String", String.class);
+ columnsNamesExpected.add("String");
+ assertEquals(columnsNamesExpected, tableActual.getColumnsNames());
+ }
+
+ /**
+ * Table with two columns.
+ */
+ {
+ tableActual.createColumn("Integer", Integer.class);
+ columnsNamesExpected.add("Integer");
+ assertEquals(columnsNamesExpected, tableActual.getColumnsNames());
+ }
+ }
}
Deleted: 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:31:59 UTC (rev 162)
+++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMap.java 2010-03-02 15:04:24 UTC (rev 163)
@@ -1,160 +0,0 @@
-package org.nuiton.mapstoragemanager.plugins.bighashmapv2;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import org.nuiton.mapstoragemanager.plugins.BigTable;
-
-/**
- * Implementation of bigTable with hashMap.
- * @author Dorian Langlais
- *
- */
-public class BigHashMap implements BigTable {
-
- /**
- * tables.
- * hashMap with value is table, and key its name.
- */
- private Map<String, Table> tables;
-
- /**
- * Default constructor.
- */
- public BigHashMap() {
- this.tables = new HashMap<String, Table>();
- // Not used
- //currentTable = null;
- }
-
- /**
- * {@inheritDoc}
- * Create a new HashMap database.
- */
- @Override
- public final boolean connect(final Properties properties) {
- //throw new UnsupportedOperationException("Not supported yet.");
- new BigHashMap();
- return true;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public final void selectTable(final String table) {
- // Not used
- //this.currentTable = tables.get(table);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public final void createTable(final String table) {
- this.tables.put(table, new TableImpl());
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public final void deleteTable(final String table) {
- this.tables.remove(table);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public final Set<String> getTablesNames() {
- return this.tables.keySet();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public final void createColumn(final String table, final String column) {
- this.tables.get(table).createColumn(column);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public final void deleteColumn(final String table, final String column) {
- this.tables.get(table).deleteColumn(column);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public final Set<String> getColumnsNames(final String table) {
- return this.tables.get(table).getColumnsNames();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public final void put(final String table, final String column,
- final String key, final String content) {
- this.tables.get(table).put(column, key, content);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public final String get(final String table, final String column,
- final String key) {
- return this.tables.get(table).get(column, key).toString();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- 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();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- 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>();
-
- for (String rowKey : rowContent.keySet()) {
- String rowValue = rowContent.get(rowKey).toString();
- rowMap.put(rowKey, rowValue);
- }
- return rowMap;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public final Set<String> getKeys(final String table) {
- return this.tables.get(table).getKeys();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public final String getPluginName() {
- return this.getClass().getSimpleName();
- }
-}
Copied: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java (from rev 162, trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMap.java)
===================================================================
--- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java (rev 0)
+++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-02 15:04:24 UTC (rev 163)
@@ -0,0 +1,160 @@
+package org.nuiton.mapstoragemanager.plugins.bighashmapv2;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import org.nuiton.mapstoragemanager.plugins.BigTable;
+
+/**
+ * Implementation of bigTable with hashMap.
+ * @author Dorian Langlais
+ *
+ */
+public class BigHashMapV2 implements BigTable {
+
+ /**
+ * tables.
+ * hashMap with value is table, and key its name.
+ */
+ private Map<String, Table> tables;
+
+ /**
+ * Default constructor.
+ */
+ public BigHashMapV2() {
+ this.tables = new HashMap<String, Table>();
+ // Not used
+ //currentTable = null;
+ }
+
+ /**
+ * {@inheritDoc}
+ * Create a new HashMap database.
+ */
+ @Override
+ public final boolean connect(final Properties properties) {
+ //throw new UnsupportedOperationException("Not supported yet.");
+ new BigHashMapV2();
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public final void selectTable(final String table) {
+ // Not used
+ //this.currentTable = tables.get(table);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public final void createTable(final String table) {
+ this.tables.put(table, new TableImpl());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public final void deleteTable(final String table) {
+ this.tables.remove(table);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public final Set<String> getTablesNames() {
+ return this.tables.keySet();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public final void createColumn(final String table, final String column) {
+ this.tables.get(table).createColumn(column);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public final void deleteColumn(final String table, final String column) {
+ this.tables.get(table).deleteColumn(column);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public final Set<String> getColumnsNames(final String table) {
+ return this.tables.get(table).getColumnsNames();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public final void put(final String table, final String column,
+ final String key, final String content) {
+ this.tables.get(table).put(column, key, content);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public final String get(final String table, final String column,
+ final String key) {
+ return this.tables.get(table).get(column, key).toString();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ 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();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ 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>();
+
+ for (String rowKey : rowContent.keySet()) {
+ String rowValue = rowContent.get(rowKey).toString();
+ rowMap.put(rowKey, rowValue);
+ }
+ return rowMap;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public final Set<String> getKeys(final String table) {
+ return this.tables.get(table).getKeys();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public final String getPluginName() {
+ return this.getClass().getSimpleName();
+ }
+}
Property changes on: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java
___________________________________________________________________
Added: svn:mergeinfo
+
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:31:59 UTC (rev 162)
+++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java 2010-03-02 15:04:24 UTC (rev 163)
@@ -3,7 +3,10 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
+import java.util.NoSuchElementException;
import java.util.Set;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Class Table.
@@ -13,6 +16,11 @@
public class TableImpl implements Table {
/**
+ * Logger.
+ */
+ private static final Log LOG = LogFactory.getLog(TableImpl.class);
+
+ /**
* Table.
* hashMap with key as column name and value, a colum of the table.
*/
@@ -53,7 +61,20 @@
public final Row getRow(final String key) {
Map<String, String> rowContent = new HashMap<String, String>();
for (String columnName : tableStructure.getColumnsNames()) {
- rowContent.put(columnName, tableColumns.get(columnName).get(key));
+ try {
+
+ String content = tableColumns.get(columnName).get(key);
+
+// LOG.info(columnName + ' ' + key + ' ' + content);
+
+ if (content != null) {
+ rowContent.put(columnName, content);
+ } else {
+ rowContent.put(columnName, null);
+ }
+ } catch (NoSuchElementException e) {
+ LOG.trace(e);
+ }
}
return new RowImpl(tableStructure, rowContent);
}
Modified: trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java
===================================================================
--- trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java 2010-03-02 13:31:59 UTC (rev 162)
+++ trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java 2010-03-02 15:04:24 UTC (rev 163)
@@ -506,4 +506,124 @@
LOG.trace("Exception levée correctement.");
}
}
+
+ /**
+ * We create a new Table, with two columns.
+ * We put objects in this columns.
+ * We get the rows and verify that the content is good.
+ */
+ public void testGetRow() {
+
+ /**
+ * We create object to put
+ */
+ String expectedString1 = new String("string1");
+ String expectedString2 = new String("string2");
+ String expectedInteger1 = new String("1");
+ String expectedInteger2 = new String("2");
+ /**
+ * We create the table and columns.
+ */
+ tableActual = new TableImpl();
+ tableActual.createColumn("String");
+ tableActual.createColumn("Integer");
+
+ Map<String,Object> rowString1Content;
+ Map<String,Object> rowString2Content;
+ Map<String,Object> rowInteger1Content;
+ Map<String,Object> rowInteger2Content;
+ Row rowString1;
+ Row rowString2;
+ Row rowInteger1;
+ Row rowInteger2;
+ /**
+ * We put objects in the table.
+ */
+ {
+ rowString1Content = new HashMap<String, Object>();
+ rowString2Content = new HashMap<String, Object>();
+ rowInteger1Content = new HashMap<String, Object>();
+ rowInteger2Content = new HashMap<String, Object>();
+
+ tableActual.put("String", "string1", expectedString1);
+ tableActual.put("String", "string2", expectedString2);
+ tableActual.put("Integer", "integer1", expectedInteger1);
+ tableActual.put("Integer", "integer2", expectedInteger2);
+ }
+ /**
+ * We get rows.
+ */
+ {
+ rowString1Content.put("String", expectedString1);
+ rowString1Content.put("Integer", null);
+ rowString2Content.put("String", expectedString2);
+ rowString2Content.put("Integer", null);
+ rowInteger1Content.put("Integer", expectedInteger1);
+ rowInteger1Content.put("String", null);
+ rowInteger2Content.put("Integer", expectedInteger2);
+ rowInteger2Content.put("String", null);
+
+ rowString1 = tableActual.getRow("string1");
+ rowString2 = tableActual.getRow("string2");
+ rowInteger1 = tableActual.getRow("integer1");
+ rowInteger2 = tableActual.getRow("integer2");
+
+ LOG.trace(rowString1.toString() + '\n'
+ + rowString2.toString() + '\n'
+ + rowInteger1.toString() + '\n'
+ + rowInteger2.toString());
+ LOG.trace(rowString1Content.toString() + '\n'
+ + rowString2Content.toString() + '\n'
+ + rowInteger1Content.toString() + '\n'
+ + rowInteger2Content.toString());
+ }
+
+ /**
+ * We verify row content.
+ */
+ {
+ assertEquals(rowString1Content, rowString1.getRowContent());
+ assertEquals(rowString2Content, rowString2.getRowContent());
+ assertEquals(rowInteger1Content, rowInteger1.getRowContent());
+ assertEquals(rowInteger2Content, rowInteger2.getRowContent());
+ }
+ }
+
+ /**
+ * We create a new Table, with two columns.
+ * We put objects in this columns.
+ * We get the rows and verify that the content is good.
+ */
+ public void testGestColumnsNames() {
+
+ /**
+ * We create the table and columns.
+ */
+ tableActual = new TableImpl();
+ Set<String> columnsNamesExpected = new HashSet<String>();
+ /**
+ * Table with zero column.
+ */
+ {
+ assertEquals(columnsNamesExpected, tableActual.getColumnsNames());
+ }
+
+ /**
+ * Table with one column.
+ */
+ {
+ tableActual.createColumn("String");
+ columnsNamesExpected.add("String");
+ assertEquals(columnsNamesExpected, tableActual.getColumnsNames());
+ }
+
+ /**
+ * Table with two columns.
+ */
+ {
+ tableActual.createColumn("Integer");
+ columnsNamesExpected.add("Integer");
+ assertEquals(columnsNamesExpected, tableActual.getColumnsNames());
+ }
+ }
}
Modified: trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLTest.java
===================================================================
--- trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLTest.java 2010-03-02 13:31:59 UTC (rev 162)
+++ trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLTest.java 2010-03-02 15:04:24 UTC (rev 163)
@@ -19,7 +19,8 @@
import org.nuiton.mapstoragemanager.plugins.Exporter;
import org.nuiton.mapstoragemanager.plugins.BigTable;
import org.nuiton.mapstoragemanager.plugins.AssertJdomElement;
-import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMap;
+import org.nuiton.mapstoragemanager.plugins.Plugin;
+import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2;
import org.nuiton.mapstoragemanager.plugins.getFile;
/**
@@ -62,7 +63,7 @@
/********************************
* Creation of the database. *
********************************/
- BigTable nbt = new BigHashMap();
+ BigTable nbt = new BigHashMapV2();
Element database = new Element("database");
expected.addContent(database);
@@ -252,7 +253,7 @@
* @param args args.
*/
public static void main(String[] args) {
- BigTable bt = new BigHashMap();
+ BigTable bt = new BigHashMapV2();
bt.createTable("table1");
bt.createTable("table2");
@@ -281,4 +282,13 @@
exporter.exportTo(bt,exportTest);
exportTest.delete();
}
+
+ public void testGetPluginName() {
+ Plugin toXML = new ToXML();
+ String expectedPluginName = toXML.getClass().getSimpleName();
+ String actualPluginName = toXML.getClass().getSimpleName();
+ LOG.info("pluginName : {expected,'" + expectedPluginName
+ + "'} - {actual,'" + actualPluginName + "'}");
+ assertEquals(expectedPluginName, actualPluginName);
+ }
}
Modified: trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java
===================================================================
--- trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java 2010-03-02 13:31:59 UTC (rev 162)
+++ trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java 2010-03-02 15:04:24 UTC (rev 163)
@@ -16,7 +16,8 @@
import org.apache.commons.logging.LogFactory;
import org.nuiton.mapstoragemanager.plugins.Importer;
import org.nuiton.mapstoragemanager.plugins.BigTable;
-import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMap;
+import org.nuiton.mapstoragemanager.plugins.Plugin;
+import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2;
import org.nuiton.mapstoragemanager.plugins.getFile;
/**
@@ -45,7 +46,7 @@
// import fiveTables.
Importer importer = new FromXML();
- BigTable bigTable = new BigHashMap();
+ BigTable bigTable = new BigHashMapV2();
importer.importFrom(bigTable, fiveTables);
@@ -86,7 +87,7 @@
// import fiveTables.
Importer importer = new FromXML();
- BigTable bigTable = new BigHashMap();
+ BigTable bigTable = new BigHashMapV2();
importer.importFrom(bigTable, twoTablesFiveColumns);
@@ -143,7 +144,7 @@
// import fiveTables.
Importer importer = new FromXML();
- BigTable bigTable = new BigHashMap();
+ BigTable bigTable = new BigHashMapV2();
importer.importFrom(bigTable, twoTablesFiveColumns);
@@ -263,4 +264,13 @@
}
}
}
+
+ public void testGetPluginName() {
+ Plugin fromXML = new FromXML();
+ String expectedPluginName = fromXML.getClass().getSimpleName();
+ String actualPluginName = fromXML.getClass().getSimpleName();
+ LOG.info("pluginName : {expected,'" + expectedPluginName
+ + "'} - {actual,'" + actualPluginName + "'}");
+ assertEquals(expectedPluginName, actualPluginName);
+ }
}
1
0
r162 - in trunk: msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap msm-bighashmapV2 msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2 msm-fromtoXML msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer
by dlanglais＠users.nuiton.org 02 Mar '10
by dlanglais＠users.nuiton.org 02 Mar '10
02 Mar '10
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.
*/
1
0
r161 - in trunk: . msm msm/src/main/java/org/nuiton/mapstoragemanager msm/src/main/java/org/nuiton/mapstoragemanager/core msm/src/main/java/org/nuiton/mapstoragemanager/plugins msm/src/main/java/org/nuiton/mapstoragemanager/ui msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui msm/src/main/resources msm/src/main/resources/i18n
by fgilet＠users.nuiton.org 02 Mar '10
by fgilet＠users.nuiton.org 02 Mar '10
02 Mar '10
Author: fgilet
Date: 2010-03-02 14:15:33 +0100 (Tue, 02 Mar 2010)
New Revision: 161
Added:
trunk/msm/src/main/java/org/nuiton/mapstoragemanager/package-info.java
trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/package-info.java
trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/package-info.java
Modified:
trunk/msm/pom.xml
trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java
trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java
trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java
trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.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
trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Plugin.java
trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java
trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx
trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java
trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ColumnModel.java
trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMModel.java
trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java
trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java
trunk/msm/src/main/resources/i18n/msm-en_GB.properties
trunk/msm/src/main/resources/i18n/msm-fr_FR.properties
trunk/msm/src/main/resources/msm.properties
trunk/pom.xml
Log:
CheckStyle fait!
Modified: trunk/msm/pom.xml
===================================================================
--- trunk/msm/pom.xml 2010-03-02 12:38:58 UTC (rev 160)
+++ trunk/msm/pom.xml 2010-03-02 13:15:33 UTC (rev 161)
@@ -146,19 +146,19 @@
<jaxx.helpTarget>src/main/help</jaxx.helpTarget-->
</properties>
-
+
<packaging>jar</packaging>
<!--<properties>
- main class in jar
+ main class in jar
<maven.jar.main.class>org.nuiton.mapstoragemanager.Main</maven.jar.main.class>
<jaxx.version>2.0.0-beta-3</jaxx.version>
<lutinutil.version>1.1.2</lutinutil.version>
<i18n.version>1.0.1</i18n.version>
- jaxx
+ jaxx
<jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon>
<jaxx.addProjectClassPath>true</jaxx.addProjectClassPath>
<jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath>
@@ -183,7 +183,7 @@
</includes>
</resource>
</resources>
-
+
<plugins>
<plugin>
Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java
===================================================================
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-03-02 12:38:58 UTC (rev 160)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-03-02 13:15:33 UTC (rev 161)
@@ -7,31 +7,39 @@
import org.nuiton.i18n.I18n;
import org.nuiton.mapstoragemanager.ui.MainUI;
-import javax.swing.*;
import java.util.Locale;
+import javax.swing.SwingUtilities;
import static org.nuiton.i18n.I18n.n_;
+import static org.nuiton.i18n.I18n._;
/**
* Created: 21 janv. 2010
*
* @author Tony Chemit <chemit(a)codelutin.com> Copyright Code Lutin
* @version $Revision: 4 $
- * <p/>
- * Mise a jour: $Date: 2010-01-21 15:24:35 +0100 (jeu., 21 janv. 2010) $ par :
- * $Author: tchemit $
+ * <p/>
+ * Mise a jour: $Date: 2010-01-21 15:24:35 +0100 (jeu., 21 janv. 2010) $ par :
+ * $Author: tchemit $
*/
public final class Main {
/**
- * Logger
+ * Logger.
*/
- private static Log log = LogFactory.getLog(Main.class);
+ private static final Log LOG = LogFactory.getLog(Main.class);
- public static Locale locale = Locale.FRANCE;
+ /**
+ * Locale.
+ */
+ private static Locale locale = Locale.FRANCE;
- private Main(String... args){
- try{
+ /**
+ * Main private.
+ * @param args arguments.
+ */
+ private Main(final String... args) {
+ try {
I18n.setUniqueBundleName("mapstoragemanager-i18n");
I18n.init(locale);
@@ -39,7 +47,7 @@
SwingUtil.initNimbusLoookAndFeel();
} catch (Exception e) {
// could not find nimbus look-and-feel
- log.warn("Could not find nimbus look-and-feel");
+ LOG.warn("Could not find nimbus look-and-feel");
}
// init config
@@ -48,7 +56,7 @@
// chargement de la configuration des uis
SwingUtil.loadUIConfig(MsmConfig.APPLICATION_PROPERTIES, null);
-
+
final MainUI ui = MainUI.getInstance();
SwingUtilities.invokeLater(new Runnable() {
@@ -62,34 +70,51 @@
} catch (Exception e) {
ErrorDialogUI.showError(e);
- log.error(e.getMessage(), e);
+ LOG.error(e.getMessage(), e);
System.exit(1);
}
}
-
- public static void main(String... args) {
+
+ /**
+ * Main.
+ * @param args arguments.
+ */
+ public static void main(final String... args) {
new Main(args);
-
}
- public static void setLocale(Locale locale){
- Main.locale = locale;
- MainUI.getInstance().dispose();
- Main.main();
- }
-
+ /**
+ * Init ui.
+ */
private void init() {
MainUI ui = MainUI.getInstance();
Locale localeTemp = Main.locale;
- if (localeTemp.equals(Locale.FRANCE)){
+ if (localeTemp.equals(Locale.FRANCE)) {
ui.getMenuFileLanguageFR().setEnabled(false);
- } else if (localeTemp.equals(Locale.UK)){
+ } else if (localeTemp.equals(Locale.UK)) {
ui.getMenuFileLanguageUK().setEnabled(false);
}
- String message = n_("messageEntry");
+ n_("messageEntry");
+ String message = _("messageEntry");
ui.displayMessage(message, 1);
+ }
+ /**
+ * Setter locale.
+ * @param newlocale the new locale.
+ */
+ public static void setLocale(final Locale newlocale) {
+ Main.locale = newlocale;
+ MainUI.getInstance().dispose();
+ Main.main();
+ }
+ /**
+ * Getter locale.
+ * @return locale the current locale.
+ */
+ public Locale getLocale() {
+ return locale;
}
}
Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java
===================================================================
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java 2010-03-02 12:38:58 UTC (rev 160)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java 2010-03-02 13:15:33 UTC (rev 161)
@@ -2,8 +2,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.nuiton.util.Version;
-import org.nuiton.util.VersionUtil;
import java.io.IOException;
import java.io.InputStream;
@@ -19,16 +17,19 @@
public class MsmConfig extends org.nuiton.util.ApplicationConfig {
/**
- * to use log facility, just put in your code: log.info(\"...\");
+ * to use log facility, just put in your code: log.info(\"...\").
*/
- static private Log log = LogFactory.getLog(MsmConfig.class);
-
+ private static final Log LOG = LogFactory.getLog(MsmConfig.class);
+
/**
- * le fichier de configuration de l'application avec les informations sur
- * le projet (version, license,...) et la configuration des ui (icons, ...)
+ * configuration's file with information on project (version, licence, ...).
+ * and the ui's configuration (icons, ...).
*/
public static final String APPLICATION_PROPERTIES = "/msm.properties";
+ /**
+ * Constructor.
+ */
public MsmConfig() {
//setConfigFileName(APPLICATION_PROPERTIES);
@@ -43,8 +44,8 @@
for (Object k : p.keySet()) {
String key = k + "";
Object value = p.get(k);
- if (log.isDebugEnabled()) {
- log.debug("install properties " + k + " : " + value);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("install properties " + k + " : " + value);
}
setDefaultOption(key, "" + value);
}
Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java
===================================================================
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-02 12:38:58 UTC (rev 160)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-02 13:15:33 UTC (rev 161)
@@ -15,8 +15,8 @@
import org.nuiton.mapstoragemanager.plugins.BigTable;
/**
- * @author Crieloue Gilles
- * This class loads the BigTable implementations
+ * @author Crieloue Gilles.
+ * This class loads the BigTable implementations.
*/
public class BigTableLoader extends URLClassLoader {
@@ -31,7 +31,7 @@
private ServiceLoader<BigTable> bigTableSetLoader;
/**
- * Map Identifiant - BigTable implementation
+ * Map Identifiant - BigTable implementation.
*/
private HashMap<String, BigTable> plugins = new HashMap<String, BigTable>();
@@ -52,7 +52,7 @@
try {
this.addURL(file.toURI().toURL());
} catch (MalformedURLException e) {
- LOG.error(e.toString(),e);
+ LOG.error(e.toString(), e);
}
}
}
@@ -63,10 +63,10 @@
* Identifiant for the plugin
*/
- //TODO: define better identifiants
+ //define better identifiants
int pluginNumber = 0;
- for (BigTable bigTableImpl : bigTableSetLoader){
- plugins.put("BigTable"+pluginNumber, bigTableImpl);
+ for (BigTable bigTableImpl : bigTableSetLoader) {
+ plugins.put("BigTable" + pluginNumber, bigTableImpl);
pluginNumber++;
}
}
@@ -110,7 +110,7 @@
* @param id the identifiant
* @return the BigTable
*/
- public BigTable getBigTable(String id){
+ public final BigTable getBigTable(final String id) {
return plugins.get(id);
}
@@ -118,15 +118,15 @@
* Returns all the BigTable implementations loaded.
* @return all the BigTable implementations loaded
*/
- public Collection<BigTable> getAllBigTable(){
+ public final Collection<BigTable> getAllBigTable() {
return plugins.values();
}
-
+
/**
* Returns all the BigTable implementations names.
* @return all the BigTable implementations names
*/
- public Set<String> getAllBigTableNames(){
- return plugins.keySet();
+ public final Set<String> getAllBigTableNames() {
+ return plugins.keySet();
}
}
Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java
===================================================================
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-03-02 12:38:58 UTC (rev 160)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-03-02 13:15:33 UTC (rev 161)
@@ -17,20 +17,27 @@
*/
private static final Log LOG = LogFactory.getLog(TestServiceLoader.class);
+ /**
+ * Constructor.
+ */
private TestServiceLoader() {
try {
BigTableLoader p =
new BigTableLoader("plugins", this.getClass().getClassLoader());
LOG.info(p.getBigTable());
} catch (MalformedURLException e) {
- // TODO Auto-generated catch block
+ //Auto-generated catch block
//e.printStackTrace();
- LOG.error(e.toString(),e);
+ LOG.error(e.toString(), e);
}
}
+ /**
+ * Main.
+ * @param args arguments
+ */
public static void main(final String[] args) {
new TestServiceLoader();
}
-}
\ No newline at end of file
+}
Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/package-info.java
===================================================================
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/package-info.java (rev 0)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/package-info.java 2010-03-02 13:15:33 UTC (rev 161)
@@ -0,0 +1,5 @@
+/**
+ * Package org.nuiton.mapstoragemanager.
+ * contains main class and application's configuration.
+ */
+package org.nuiton.mapstoragemanager;
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 12:38:58 UTC (rev 160)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java 2010-03-02 13:15:33 UTC (rev 161)
@@ -104,16 +104,16 @@
* -> get the content with the version <b>version</b>.
* @param table the table name.
* @param column the column name.
- * @param key the key
- * @param version
+ * @param key the key.
+ * @param version the version.
* @return the content
*/
String get(String table, String column, String key, int version);
/**
- * Get the row identified by the key <b>key<b> from the table <b>table</b>
- * @param table the table name
- * @param key the key
+ * Get the row identified by the key <b>key</b> from the table <b>table</b>.
+ * @param table the table name.
+ * @param key the key.
* @return a Map with key is column's name and value is content's value.
*/
Map<String, String> getRow(String table, String key);
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 12:38:58 UTC (rev 160)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Exporter.java 2010-03-02 13:15:33 UTC (rev 161)
@@ -13,5 +13,5 @@
* @param bigTable the bigTable plugin.
* @param file the file in which export the content of the base.
*/
- void exportTo (final BigTable bigTable, final File file);
-}
\ No newline at end of file
+ void exportTo(final BigTable bigTable, final File 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 12:38:58 UTC (rev 160)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Importer.java 2010-03-02 13:15:33 UTC (rev 161)
@@ -13,5 +13,6 @@
* @param bigTable the bigTable plugin.
* @param file the file in which export the content of the base.
*/
- void importFrom (final BigTable bigTable, final File file);
-}
\ No newline at end of file
+ void importFrom(final BigTable bigTable, final File file);
+}
+
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 12:38:58 UTC (rev 160)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java 2010-03-02 13:15:33 UTC (rev 161)
@@ -8,39 +8,57 @@
import java.util.Properties;
import java.util.Set;
+
+/**
+ * Class OurHashMap2.
+ * @author E045231P
+ */
public class OurHashMap2 implements BigTable {
- private Map<String, ArrayList<String>> mapTable = new HashMap<String,ArrayList<String>>();
- private Map<String, ArrayList<String>> mapColumn = new HashMap<String, ArrayList<String>>();
- private Map<String, String> mapData = new HashMap<String,String>();
+ /**
+ * map table.
+ */
+ private Map<String, ArrayList<String>> mapTable =
+ new HashMap<String, ArrayList<String>>();
+ /**
+ * map column.
+ */
+ private Map<String, ArrayList<String>> mapColumn =
+ new HashMap<String, ArrayList<String>>();
+
+ /**
+ * map data.
+ */
+ private Map<String, String> mapData = new HashMap<String, String>();
+
@Override
- public boolean connect(Properties properties) {
+ public final boolean connect(final Properties properties) {
return true;
}
@Override
- public void selectTable(String table) {
+ public final void selectTable(final String table) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public void createTable(String table) {
+ public final void createTable(final String table) {
mapTable.put(table, new ArrayList<String>());
}
@Override
- public void deleteTable(String table) {
+ public final void deleteTable(final String table) {
mapTable.remove(table);
}
@Override
- public Set<String> getTablesNames() {
+ public final Set<String> getTablesNames() {
return mapTable.keySet();
}
@Override
- public void createColumn(String table, String column) {
+ public final void createColumn(final String table, final String column) {
// if the table exist and only if the column doesn't exist.
if (mapTable.containsKey(table) && !mapColumn.containsKey(column)) {
mapColumn.put(column, new ArrayList<String>());
@@ -49,31 +67,33 @@
}
@Override
- public void deleteColumn(String table, String column) {
+ public final void deleteColumn(final String table, final String column) {
// if the table exist and only if the column exist.
- if (mapTable.containsKey(table) &&
- mapTable.get(table).contains(column)) {
+ if (mapTable.containsKey(table)
+ && mapTable.get(table).contains(column)) {
mapTable.get(table).remove(column);
}
}
@Override
- public Set<String> getColumnsNames(String table) {
+ public final Set<String> getColumnsNames(final String table) {
Set<String> columnNames = new HashSet(mapTable.get(table));
return columnNames;
}
@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) {
// If the table and the column exist.
- if(mapTable.containsKey(table) && mapColumn.containsKey(column)) {
+ if (mapTable.containsKey(table) && mapColumn.containsKey(column)) {
mapColumn.get(column).add(key);
mapData.put(key, content);
}
}
@Override
- public String get(String table, String column, String key) {
+ public final String get(final String table, final String column,
+ final String key) {
String ret = "";
if (mapTable.containsKey(table)) {
if (mapColumn.containsKey(column)) {
@@ -88,23 +108,24 @@
}
@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 get(table, column, key);
- // TODO
}
@Override
- public Map<String, String> getRow(String table, String key) {
+ public final Map<String, String> getRow(final String table,
+ final String key) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<String> getKeys(String table) {
+ public final Set<String> getKeys(final String table) {
Set<String> tableKeys = new HashSet();
Set<String> tableColumns = new HashSet(mapTable.get(table));
Iterator<String> i = tableColumns.iterator();
// we get and add all the keys of the column to the keys of the table
- while(i.hasNext()){
+ while (i.hasNext()) {
String columnName = i.next();
ArrayList<String> columnKeys = mapColumn.get(columnName);
tableKeys.addAll(columnKeys);
@@ -112,7 +133,13 @@
return tableKeys;
}
- public Set<String> getKeys(String table, String column) {
+ /**
+ * getKeys.
+ * @param table the table.
+ * @param column the column.
+ * @return the set of key into a table.
+ */
+ public final Set<String> getKeys(final String table, final String column) {
Set<String> keys = new HashSet(mapColumn.get(column));
return keys;
}
@@ -120,8 +147,7 @@
/**
* {@inheritDoc}
*/
- @Override
- public String getPluginName() {
+ public final String getPluginName() {
return this.getClass().getSimpleName();
}
}
Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Plugin.java
===================================================================
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Plugin.java 2010-03-02 12:38:58 UTC (rev 160)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Plugin.java 2010-03-02 13:15:33 UTC (rev 161)
@@ -1,11 +1,14 @@
package org.nuiton.mapstoragemanager.plugins;
+/**
+ * Interface plugin.
+ * @author E045231P
+ */
public interface Plugin {
- /**
- * Returns the plugin name.
- * @return the plugin name
- */
- public String getPluginName();
-
+ /**
+ * Returns the plugin name.
+ * @return the plugin name
+ */
+ String getPluginName();
}
Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java
===================================================================
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java 2010-03-02 12:38:58 UTC (rev 160)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java 2010-03-02 13:15:33 UTC (rev 161)
@@ -1,5 +1,4 @@
-package org.nuiton.mapstoragemanager.plugins;
/**
* The plugins interfaces.
*/
-
+package org.nuiton.mapstoragemanager.plugins;
Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx
===================================================================
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-02 12:38:58 UTC (rev 160)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-02 13:15:33 UTC (rev 161)
@@ -7,6 +7,7 @@
import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine;
import javax.swing.tree.*;
import static org.nuiton.i18n.I18n.n_;
+ import static org.nuiton.i18n.I18n._;
import javax.swing.JLabel;
import org.nuiton.mapstoragemanager.MsmConfig;
@@ -75,7 +76,15 @@
this.getMessagesPanel().add(label);
}
+ /**
+ * Test.
+ */
+ public DefaultTreeModel getModelTree(){
+ n_("Empty");
+ return new DefaultTreeModel(new DefaultMutableTreeNode(_("Empty")));
+ }
+
]]>
</script>
@@ -138,7 +147,7 @@
<JSplitPane constraints='BorderLayout.CENTER' dividerLocation='200' >
<JScrollPane>
<JTree id='navigation'
- model='{new DefaultTreeModel(new DefaultMutableTreeNode(n_("Empty")))}' />
+ model='{getModelTree()}' />
</JScrollPane>
<JScrollPane>
<JPanel layout='{new BorderLayout()}'>
Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java
===================================================================
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-02 12:38:58 UTC (rev 160)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-02 13:15:33 UTC (rev 161)
@@ -8,34 +8,36 @@
import java.util.ResourceBundle;
import java.util.Set;
import javax.swing.JOptionPane;
+import javax.swing.JTree;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeModel;
import jaxx.runtime.swing.ErrorDialogUI;
+import jaxx.runtime.swing.Item;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.nuiton.mapstoragemanager.Main;
import org.nuiton.mapstoragemanager.MsmConfig;
import org.nuiton.mapstoragemanager.plugins.OurHashMap2;
import org.nuiton.mapstoragemanager.ui.MainUI;
-import static org.nuiton.i18n.I18n.n_;
import static org.nuiton.i18n.I18n._;
/**
* Engine Class with methods for application user interface.
- * @author Crieloue Gilles - Fages Amaury - Gilet Florent - Langlais Dorian
+ * @author Crieloue Gilles - Fages Amaury - Gilet Florent - Langlais Dorian
*/
-public class ApplicationEngine {
+public final class ApplicationEngine {
/**
* Logger.
*/
- private static final Log log = LogFactory.getLog(ApplicationEngine.class);
+ private static final Log LOG = LogFactory.getLog(ApplicationEngine.class);
/**
* current Locale.
*/
private Locale currentLocale;
-
+
/**
* ResourceBundle.
*/
@@ -54,15 +56,13 @@
/**
* Constructor.
*/
- private ApplicationEngine(){
-
+ private ApplicationEngine() {
+
ohm = new OurHashMap2();
ohm.createTable("table1");
ohm.createTable("table2");
-
ohm.createColumn("table1", "column1");
ohm.createColumn("table1", "column2");
-
ohm.createColumn("table2", "column3");
ohm.createColumn("table2", "column4");
ohm.createColumn("table2", "column5");
@@ -81,35 +81,32 @@
}
/**
- * Method to close the application.
+ * do nothing.
*/
- public final void close() {
- System.exit(0);
+ public void doSomething() {
}
/**
- * do nothing (for tests).
+ * Method to close the application.
*/
- public void doSomething() { }
+ public void close() {
+ System.exit(0);
+ }
/**
* Change language for internationalization.
* @param language the language
* @param country the country
*/
- public void setLocale(String language, String country) {
- Locale locale = new Locale(language,country);
+ public void setLocale(final String language, final String country) {
+ Locale locale = new Locale(language, country);
Main.setLocale(locale);
}
- /*public void setMainUI(MainUI application) {
- this.application = application;
- }*/
-
/**
* Show toolBar in order to connect.
*/
- public void showToolBar(){
+ public void showToolBar() {
MainUI ui = MainUI.getInstance();
ui.getToolBar().setVisible(true);
}
@@ -117,7 +114,7 @@
/**
* Hide toolBar in order to disconnect.
*/
- public void disposeToolBar(){
+ public void disposeToolBar() {
MainUI ui = MainUI.getInstance();
ui.getToolBar().setVisible(false);
clean(ui);
@@ -125,8 +122,9 @@
/**
* Clean the application.
+ * @param ui application's ui
*/
- public void clean(MainUI ui){
+ public void clean(final MainUI ui) {
ui.getNavigation().setVisible(false);
ui.getTableContent().setVisible(false);
ui.getTableName().setVisible(false);
@@ -136,13 +134,16 @@
/**
* Try to connect the user to a database.
*/
- public void connection(){
+ public void connection() {
MainUI ui = MainUI.getInstance();
//update menu
ui.getMenuDisconnect().setEnabled(true);
- String nameBase = ui.getNameBase().getSelectedJaxxItem().getValue().toString();
+
+
+ Item selectedItems = ui.getNameBase().getSelectedJaxxItem();
+ String nameBase = selectedItems.getValue().toString();
String login = ui.getLogin().getText();
char[] password = ui.getPassword().getPassword();
@@ -150,32 +151,35 @@
boolean goodUse = true;
goodUse = ohm.connect(new Properties());
- if(goodUse){
+ if (goodUse) {
//update tree
- ui.getNavigation().setModel(new MSMModel(nameBase));
- ui.getNavigation().addTreeSelectionListener(new MSMNavigationListener());
+ JTree tree = ui.getNavigation();
+ tree.setModel(new MSMModel(nameBase));
+ tree.addTreeSelectionListener(new MSMNavigationListener());
- DefaultMutableTreeNode root = (DefaultMutableTreeNode) ui.getNavigation().getModel().getRoot();
- DefaultTreeModel dtm = ((DefaultTreeModel) ui.getNavigation().getModel());
-
+ TreeModel model = tree.getModel();
+ DefaultMutableTreeNode root;
+ root = (DefaultMutableTreeNode) model.getRoot();
+ DefaultTreeModel dtm = ((DefaultTreeModel) tree.getModel());
Set<String> tableNames = ohm.getTablesNames();
-
-
Iterator i = tableNames.iterator();
- while(i.hasNext()){
+ while (i.hasNext()) {
- //display the node table
- String tableName = (String)i.next();
- DefaultMutableTreeNode tableNameToInsert = new DefaultMutableTreeNode(tableName);
- dtm.insertNodeInto(tableNameToInsert, root, root.getChildCount());
+ //display the node table
+ String tableName = (String) i.next();
+ DefaultMutableTreeNode tableNameInsert;
+ tableNameInsert = new DefaultMutableTreeNode(tableName);
+ dtm.insertNodeInto(tableNameInsert, root, root.getChildCount());
//display the node column
Set<String> columnNames = ohm.getColumnsNames(tableName);
Iterator i2 = columnNames.iterator();
- while(i2.hasNext()){
- String columnName = (String)i2.next();
- DefaultMutableTreeNode columnNameToInsert = new DefaultMutableTreeNode(columnName);
- dtm.insertNodeInto(columnNameToInsert, tableNameToInsert, tableNameToInsert.getChildCount());
+ while (i2.hasNext()) {
+ String columnName = (String) i2.next();
+ DefaultMutableTreeNode columnNameToInsert;
+ columnNameToInsert = new DefaultMutableTreeNode(columnName);
+ dtm.insertNodeInto(columnNameToInsert, tableNameInsert,
+ tableNameInsert.getChildCount());
}
@@ -183,9 +187,9 @@
ui.getNavigation().repaint();
ui.getNavigation().revalidate();
- }else{
+ } else {
//display error
- JOptionPane.showMessageDialog(null, n_("connectionError"));
+ JOptionPane.showMessageDialog(null, _("connectionError"));
}
}
@@ -195,7 +199,7 @@
* @return instance of the class
*/
public static ApplicationEngine getInstance() {
- if (instance == null){
+ if (instance == null) {
instance = new ApplicationEngine();
}
return instance;
@@ -204,7 +208,7 @@
/**
* Dispose engine.
*/
- public void dispose(){
+ public void dispose() {
instance = null;
}
@@ -212,7 +216,7 @@
* Show help.
*/
public void showHelp() {
- String message = n_("No help today, sorry !");
+ String message = _("no.help");
JOptionPane.showMessageDialog(null, message);
}
@@ -220,21 +224,24 @@
* Redirection to site.
*/
public void gotoSite() {
+
MainUI ui = MainUI.getInstance();
MsmConfig config = ui.getConfig();
URL siteURL = config.getOptionAsURL("application.site.url");
-
- log.info(_("jaxxdemo.message.goto.site", siteURL));
- if (log.isDebugEnabled()) {
- log.debug("goto " + siteURL);
+ LOG.info(_("jaxxdemo.message.goto.site", siteURL));
+
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("goto " + siteURL);
}
- if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
+
+ if (Desktop.isDesktopSupported()
+ && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
try {
Desktop.getDesktop().browse(siteURL.toURI());
} catch (Exception ex) {
- log.error(ex.getMessage(), ex);
+ LOG.error(ex.getMessage(), ex);
ErrorDialogUI.showError(ex);
}
}
@@ -257,19 +264,19 @@
//GETTERS AND SETTERS
/**
- *
- * @return
+ * Getter OurHashMap.
+ * @return ohm our hash map
*/
- public OurHashMap2 getOurHashMap(){
+ public OurHashMap2 getOurHashMap() {
return ohm;
}
/**
- *
- * @param ohm
+ * Setter OurHashMap.
+ * @param ourhashmap our hash map
*/
- public void setOurHashMap(OurHashMap2 ohm){
- this.ohm = ohm;
+ public void setOurHashMap(final OurHashMap2 ourhashmap) {
+ this.ohm = ourhashmap;
}
}
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-03-02 12:38:58 UTC (rev 160)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ColumnModel.java 2010-03-02 13:15:33 UTC (rev 161)
@@ -9,8 +9,8 @@
import static org.nuiton.i18n.I18n._;
/**
- * Model of a table content
- * @author E045231P
+ * Model of a table content.
+ * @author E045231P.
*/
public class ColumnModel extends AbstractTableModel {
@@ -27,8 +27,11 @@
/**
* Constructor.
+ * @param parent node's parent.
+ * @param node the selected node.
*/
- public ColumnModel(TreeNode parent, DefaultMutableTreeNode node) {
+ public ColumnModel(final TreeNode parent,
+ final DefaultMutableTreeNode node) {
String table = parent.toString();
String column = node.toString();
ApplicationEngine engine = ApplicationEngine.getInstance();
@@ -38,15 +41,15 @@
titres[1] = _("table.values");
//content
- Set<String> keySetTable = testHashmap2.getKeys(table,column);
+ Set<String> keySetTable = testHashmap2.getKeys(table, column);
Iterator i = keySetTable.iterator();
data = new String[2][keySetTable.size()];
- int j=0;
- while(i.hasNext()){
- String key = (String)i.next();
+ int j = 0;
+ while (i.hasNext()) {
+ String key = (String) i.next();
String value = testHashmap2.get(table, column, key);
- data[0][j]=key;
- data[1][j]=value;
+ data[0][j] = key;
+ data[1][j] = value;
j++;
}
}
@@ -55,7 +58,7 @@
* {@inheritDoc}
*/
@Override
- public Object getValueAt(int rowIndex, int colIndex) {
+ public final Object getValueAt(final int rowIndex, final int colIndex) {
return data[colIndex][rowIndex];
}
@@ -63,7 +66,7 @@
* {@inheritDoc}
*/
@Override
- public int getColumnCount() {
+ public final int getColumnCount() {
return titres.length;
}
@@ -71,7 +74,7 @@
* {@inheritDoc}
*/
@Override
- public int getRowCount() {
+ public final int getRowCount() {
return data[0].length;
}
@@ -79,7 +82,7 @@
* {@inheritDoc}
*/
@Override
- public String getColumnName(int col){
+ public final String getColumnName(final int col) {
return titres[col];
}
@@ -87,7 +90,7 @@
* {@inheritDoc}
*/
@Override
- public boolean isCellEditable(int row, int col) {
+ public final boolean isCellEditable(final int row, final int col) {
return false;
}
Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMModel.java
===================================================================
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMModel.java 2010-03-02 12:38:58 UTC (rev 160)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMModel.java 2010-03-02 13:15:33 UTC (rev 161)
@@ -9,12 +9,13 @@
*/
public class MSMModel extends DefaultTreeModel {
- public MSMModel(String value){
+ /**
+ * Constructor.
+ * @param name name of the root
+ */
+ public MSMModel(final String name) {
super(null);
- DefaultMutableTreeNode racine = new DefaultMutableTreeNode(value);
+ DefaultMutableTreeNode racine = new DefaultMutableTreeNode(name);
setRoot(racine);
}
-
-
-
}
Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java
===================================================================
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java 2010-03-02 12:38:58 UTC (rev 160)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java 2010-03-02 13:15:33 UTC (rev 161)
@@ -14,25 +14,30 @@
*/
public class MSMNavigationListener implements TreeSelectionListener {
+ /**
+ * {@inheritDoc}
+ */
@Override
- public void valueChanged(TreeSelectionEvent e) {
+ public final void valueChanged(final TreeSelectionEvent e) {
MainUI ui = MainUI.getInstance();
- DefaultMutableTreeNode node = (DefaultMutableTreeNode)ui.getNavigation().getLastSelectedPathComponent();
+ DefaultMutableTreeNode node;
+ node = (DefaultMutableTreeNode) ui.getNavigation().
+ getLastSelectedPathComponent();
ui.getTableContent().removeAll();
ui.getTableName().removeAll();
-
+
/* if nothing is selected */
if (node == null || node.isRoot()) {
return;
- } else if (node.isLeaf()){
+ } else if (node.isLeaf()) {
//we create a standard model of column
- ColumnModel model = new ColumnModel(node.getParent(),node);
+ ColumnModel model = new ColumnModel(node.getParent(), node);
JTable jTable = new JTable(model);
JScrollPane scrollPane = new JScrollPane(jTable);
jTable.setFillsViewportHeight(true);
-
+
//we check attributes and values of the select table
@@ -46,7 +51,7 @@
JScrollPane scrollPane = new JScrollPane(jTable);
jTable.setFillsViewportHeight(true);
-
+
//we check attributes and values of the select table
@@ -54,7 +59,8 @@
ui.getTableContent().add(scrollPane);
}
- ui.getTableName().add(new JLabel("<html><b><u>"+node.toString()+"</b></u></html>"));
+ ui.getTableName().add(new JLabel("<html><b><u>" + node.toString()
+ + "</b></u></html>"));
ui.getTableContent().repaint();
ui.getTableContent().revalidate();
ui.getTableName().repaint();
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-03-02 12:38:58 UTC (rev 160)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java 2010-03-02 13:15:33 UTC (rev 161)
@@ -8,7 +8,7 @@
import static org.nuiton.i18n.I18n._;
/**
- * Model of a table content
+ * Model of a table content.
* @author E045231P
*/
public class TableModel extends AbstractTableModel {
@@ -31,8 +31,9 @@
/**
* Constructor.
+ * @param node the selected node.
*/
- public TableModel(DefaultMutableTreeNode node) {
+ public TableModel(final DefaultMutableTreeNode node) {
String table = node.toString();
ApplicationEngine engine = ApplicationEngine.getInstance();
@@ -42,14 +43,14 @@
//content
Set<String> keySetTable = hashmap.getKeys(table);
Iterator<String> columnName = columnsNames.iterator();
-
+
/**
* indexes
*/
- int colIndex=0;
- int rowindex=0;
+ int colIndex = 0;
+ int rowindex = 0;
- if(showTableKeys) {
+ if (showTableKeys) {
titles = new String[columnsNames.size() + 1];
titles[0] = _("table.keys");
data = new String[columnsNames.size() + 1][keySetTable.size()];
@@ -60,16 +61,16 @@
}
- while(columnName.hasNext()){
+ while (columnName.hasNext()) {
String titreTemp = columnName.next();
titles[colIndex] = titreTemp;
Set<String> columnKeys = hashmap.getKeys(table, titles[colIndex]);
Iterator<String> columnKey = columnKeys.iterator();
- while(columnKey.hasNext()){
+ while (columnKey.hasNext()) {
String key = columnKey.next();
String str = hashmap.get(table, titreTemp, key);
- if(showTableKeys) {
+ if (showTableKeys) {
data[0][rowindex] = key;
}
data[colIndex][rowindex] = str;
@@ -83,7 +84,7 @@
* {@inheritDoc}
*/
@Override
- public Object getValueAt(int rowIndex, int colIndex) {
+ public final Object getValueAt(final int rowIndex, final int colIndex) {
return data[colIndex][rowIndex];
}
@@ -91,7 +92,7 @@
* {@inheritDoc}
*/
@Override
- public int getColumnCount() {
+ public final int getColumnCount() {
return titles.length;
}
@@ -99,7 +100,7 @@
* {@inheritDoc}
*/
@Override
- public int getRowCount() {
+ public final int getRowCount() {
return data[0].length;
}
@@ -107,7 +108,7 @@
* {@inheritDoc}
*/
@Override
- public String getColumnName(int col){
+ public final String getColumnName(final int col) {
return titles[col];
}
@@ -115,7 +116,7 @@
* {@inheritDoc}
*/
@Override
- public boolean isCellEditable(int row, int col) {
+ public final boolean isCellEditable(final int row, final int col) {
return false;
}
Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/package-info.java
===================================================================
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/package-info.java (rev 0)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/package-info.java 2010-03-02 13:15:33 UTC (rev 161)
@@ -0,0 +1,5 @@
+/**
+ * Package org.nuiton.mapstoragemanager.ui.gui
+ * contains all java files for actions on ui.
+ */
+package org.nuiton.mapstoragemanager.ui.gui;
Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/package-info.java
===================================================================
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/package-info.java (rev 0)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/package-info.java 2010-03-02 13:15:33 UTC (rev 161)
@@ -0,0 +1,5 @@
+/**
+ * Package org.nuiton.mapstoragemanager.ui.
+ * describe ui of MapStorageManager (css and jaxx files).
+ */
+package org.nuiton.mapstoragemanager.ui;
Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties
===================================================================
--- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-02 12:38:58 UTC (rev 160)
+++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-02 13:15:33 UTC (rev 161)
@@ -1,10 +1,7 @@
-Empty=
+Empty=Empty
Map\ Storage\ Manager=Map Storage Manager
-No\ help\ today,\ sorry\ \!=No help today, sorry \!
connectionError=The connection attempt to failed, please retry \!
jaxxdemo.message.goto.site=Visit site
-jaxxdemo.tree.component=
-keys=
login\ \:=Login
mapstoragemanager.action.aboutUs=About us
mapstoragemanager.action.aboutUs.tip=About Code Lutin
@@ -34,6 +31,7 @@
mapstoragemanager.action.visitSite.tip=
messageEntry=Welcome to MapStorageManager
name\ base\ \:=Name base
+no.help=No help today, sorry \!
ok=Validate
password\ \:=Password
table.keys=Keys
Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties
===================================================================
--- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-02 12:38:58 UTC (rev 160)
+++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-02 13:15:33 UTC (rev 161)
@@ -1,10 +1,7 @@
Empty=Vide
Map\ Storage\ Manager=Map Storage Manager
-No\ help\ today,\ sorry\ \!=Pas d'aide pour l'instant, d\u00E9sol\u00E9 \!
connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \!
jaxxdemo.message.goto.site=Visitez le site
-jaxxdemo.tree.component=
-keys=
login\ \:=Identifiant
mapstoragemanager.action.aboutUs=A propos
mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin
@@ -34,6 +31,7 @@
mapstoragemanager.action.visitSite.tip=
messageEntry=Bienvenue dans MapStorageManager
name\ base\ \:=Nom de la base
+no.help=Pas d'aide pour l'instant, d\u00E9sol\u00E9 \!
ok=Valider
password\ \:=Mot de passe
table.keys=Cl\u00E9s
Modified: trunk/msm/src/main/resources/msm.properties
===================================================================
--- trunk/msm/src/main/resources/msm.properties 2010-03-02 12:38:58 UTC (rev 160)
+++ trunk/msm/src/main/resources/msm.properties 2010-03-02 13:15:33 UTC (rev 161)
@@ -14,4 +14,4 @@
icon.action.i18n-uk=action-i18n-uk.png
icon.action.connect=action-connect.png
icon.action.disconnect=action-disconnect.png
-application.site.url=http\://www.nuiton.org/projects/show/mapstoragemanager
\ No newline at end of file
+application.site.url=http://www.nuiton.org/projects/show/mapstoragemanager
\ No newline at end of file
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-03-02 12:38:58 UTC (rev 160)
+++ trunk/pom.xml 2010-03-02 13:15:33 UTC (rev 161)
@@ -348,5 +348,15 @@
</pluginRepository>
</pluginRepositories>
-
+
+ <!--<reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>-->
+
+
</project>
1
0
Author: afages
Date: 2010-03-02 13:38:58 +0100 (Tue, 02 Mar 2010)
New Revision: 160
Added:
trunk/src/site/doc/analyse/projetMSM.rst
Removed:
trunk/src/site/doc/analyse/projetHBase.rst
Modified:
trunk/src/site/doc/analyse/msm.zargo
trunk/src/site/doc/analyse/usecase.rst
Log:
Modification analyse UML
Modified: trunk/src/site/doc/analyse/msm.zargo
===================================================================
(Binary files differ)
Deleted: trunk/src/site/doc/analyse/projetHBase.rst
===================================================================
--- trunk/src/site/doc/analyse/projetHBase.rst 2010-03-02 12:21:23 UTC (rev 159)
+++ trunk/src/site/doc/analyse/projetHBase.rst 2010-03-02 12:38:58 UTC (rev 160)
@@ -1,40 +0,0 @@
-// mardi 12 janvier 2010
-
-Technologies
-------------
-
- - UML
- - JAVA
- - JMX
- - Jaxx / Swing
- - HBase
- - XML
- - SVN
- - RST
- - Maven
-
-Contraintes
-------------
-
-- L'encodage des fichiers doit être en UTF-8.
-- La norme checkstyle de sun doit être utilisée pour le code java (http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html)
-- Pour les diagrammes UML, l'outil ArgoUML (v 0.28.1) doit être employé.
-- Utilisation de Maven2 pour la construction, génération du site web…
-- Couverture du code à 80%
-- Environnement de développement libre (Eclipse, Netbeans, Vim)
-- Utilisation de rst (ReStructuredText) pour la documentation
-- Projet sous licence GPL v3
-- Code source en anglais
-
-Définitions
------------
-
-HBase
-
-HMap
-
-RST
-
-
-
-
Copied: trunk/src/site/doc/analyse/projetMSM.rst (from rev 152, trunk/src/site/doc/analyse/projetHBase.rst)
===================================================================
--- trunk/src/site/doc/analyse/projetMSM.rst (rev 0)
+++ trunk/src/site/doc/analyse/projetMSM.rst 2010-03-02 12:38:58 UTC (rev 160)
@@ -0,0 +1,40 @@
+// mardi 12 janvier 2010
+
+Technologies
+------------
+
+ - UML
+ - JAVA
+ - JMX
+ - Jaxx / Swing
+ - HBase
+ - XML
+ - SVN
+ - RST
+ - Maven
+
+Contraintes
+------------
+
+- L'encodage des fichiers doit être en UTF-8.
+- La norme checkstyle de sun doit être utilisée pour le code java (http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html)
+- Pour les diagrammes UML, l'outil ArgoUML (v 0.28.1) doit être employé.
+- Utilisation de Maven2 pour la construction, génération du site web…
+- Couverture du code à 80%
+- Environnement de développement libre (Eclipse, Netbeans, Vim)
+- Utilisation de rst (ReStructuredText) pour la documentation
+- Projet sous licence GPL v3
+- Code source en anglais
+
+Définitions
+-----------
+
+HBase
+
+HMap
+
+RST
+
+
+
+
Modified: trunk/src/site/doc/analyse/usecase.rst
===================================================================
--- trunk/src/site/doc/analyse/usecase.rst 2010-03-02 12:21:23 UTC (rev 159)
+++ trunk/src/site/doc/analyse/usecase.rst 2010-03-02 12:38:58 UTC (rev 160)
@@ -33,7 +33,8 @@
- Use case : 12.Describe Table
- Goal in context : décrire la structure d'une table d'une base
-BigTable (Hbase, HashMap...) en affichant les différents éléments (colonnes, types...) graphiquement selon le plugin de la base.
+BigTable (Hbase, HashMap...) en affichant les différents éléments (colonnes, types...)
+graphiquement selon le plugin de la base.
- Scope : MSM -GUI/IHM
- Level : sous-fonctionnalité
- Primary actor : utilisateur de MSM
@@ -212,7 +213,8 @@
6) L'utilisateur traite la base
- Extensions :
2.a : l'utilisateur recherche le nom d'une base
-- Performance : la rapidité d'exécution est primordiale étant donné la fréquence d'exécution. Gestion des erreurs importante.
+- Performance : la rapidité d'exécution est primordiale étant donné la fréquence d'exécution.
+Gestion des erreurs importante.
Extend
------
1
0