6 files changed, 17 insertions, 15 deletions
diff --git a/src/main/src/conf/ConfigConnectionBean.java b/src/main/src/conf/ConfigConnectionBean.java
index b43b56f..0597480 100644
--- a/src/main/src/conf/ConfigConnectionBean.java
+++ b/src/main/src/conf/ConfigConnectionBean.java
@@ -27,7 +27,7 @@ import data.io.sql.SQLConnectionWrapper.DBMSType;
  */
 public class ConfigConnectionBean {
 	
-	public enum ConnectionType { jdbc, ldap }
+	public enum ConnectionType { JDBC, LDAP }
 	
 	private String id;
 	private ConnectionType type;
diff --git a/src/main/src/conf/ConfigDestBean.java b/src/main/src/conf/ConfigDestBean.java
index 2d9b2f7..d3c12fb 100644
--- a/src/main/src/conf/ConfigDestBean.java
+++ b/src/main/src/conf/ConfigDestBean.java
@@ -24,10 +24,10 @@ package conf;
  * Generated Configuration Bean
  */
 public class ConfigDestBean {
-	public enum DestinationKind { ldap };
+	public enum DestKind { LDAP };
 	
 	private String name;
-	private DestinationKind kind;
+	private DestKind kind;
 	private String conn;
 	private String attr;
 	private String base;
@@ -39,10 +39,10 @@ public class ConfigDestBean {
 	public void setName(String name) {
 		this.name = name;
 	}
-	public DestinationKind getKind() {
+	public DestKind getKind() {
 		return kind;
 	}
-	public void setKind(DestinationKind kind) {
+	public void setKind(DestKind kind) {
 		this.kind = kind;
 	}
 	public String getConn() {
diff --git a/src/main/src/conf/ConfigRootBean.java b/src/main/src/conf/ConfigRootBean.java
index acbbd49..eac7793 100644
--- a/src/main/src/conf/ConfigRootBean.java
+++ b/src/main/src/conf/ConfigRootBean.java
@@ -51,6 +51,8 @@ public class ConfigRootBean {
 	
 
 	public static <T> String listDump(List<T> list, int ident) {
+		if ( list == null ) return "{}";
+		
 		StringBuffer buf = new StringBuffer();
 		buf.append('{');
 		for (T item : list) {
diff --git a/src/main/src/conf/ConfigSourceBean.java b/src/main/src/conf/ConfigSourceBean.java
index cf01dce..893d41a 100644
--- a/src/main/src/conf/ConfigSourceBean.java
+++ b/src/main/src/conf/ConfigSourceBean.java
@@ -28,7 +28,7 @@ import data.filters.MVDataCombiner;
 public class ConfigSourceBean {
 
 	//TODO : fixed_csv ?
-	public enum SourceKind { csv, ldap, sorted_csv, sql };
+	public enum SourceKind { FIXED_CSV, FIXED_CSV_SORTED, LDAP, SQL };
 	
 	private String name;
 	private SourceKind kind;
diff --git a/src/main/src/data/io/SSSyncConnectionsFactory.java b/src/main/src/data/io/SSSyncConnectionsFactory.java
index 07f19e9..0eab7a2 100644
--- a/src/main/src/data/io/SSSyncConnectionsFactory.java
+++ b/src/main/src/data/io/SSSyncConnectionsFactory.java
@@ -42,11 +42,11 @@ public class SSSyncConnectionsFactory {
 		
 		for ( ConfigConnectionBean conn : confConn.getConnections() ) {
 			switch (conn.getType()) {
-			case jdbc:
+			case JDBC:
 				SQLConnectionWrapper connSQL = new SQLConnectionWrapper(conn.getDbms(), conn.getHost(), conn.getPort(), conn.getRess(), conn.getUser(), conn.getPass(), conn.getDb());
 				connections.putConnSQL(conn.getId(), connSQL);
 				break;
-			case ldap:
+			case LDAP:
 				LDAPConnectionWrapper connLDAP = new LDAPConnectionWrapper(conn.getHost(), conn.getPort(), conn.getBind(), conn.getPass());
 				connections.putConnLDAP(conn.getId(), connLDAP);
 				break;
diff --git a/src/main/src/sync/SSSyncTasksFactory.java b/src/main/src/sync/SSSyncTasksFactory.java
index a91b3fa..4f7cfd6 100644
--- a/src/main/src/sync/SSSyncTasksFactory.java
+++ b/src/main/src/sync/SSSyncTasksFactory.java
@@ -118,18 +118,18 @@ public class SSSyncTasksFactory {
 	private static MVDataReader _makeSrcReader(ConnectionsHolder connections, ConfigSourceBean confSource, String taskName) throws Exception {
 		MVDataReader reader=null;
 		switch (confSource.getKind()) {
-		case csv:
+		case FIXED_CSV:
 			reader = new CSVDataReader(confSource.getName(), new FileReader(confSource.getPath()), false);
 			break;
-		case ldap:
+		case FIXED_CSV_SORTED:
+			reader = new CSVDataReader(confSource.getName(), new FileReader(confSource.getPath()), true);
+			break;
+		case LDAP:
 			LDAPConnectionWrapper ldapConnBuilder = connections.getLDAPConnectionBuilder(confSource.getConn());
 			//FIXME if conf error, getLDAPConnectionBuilder could return null
 			reader = ldapConnBuilder.newFlatReader(confSource.getName(), confSource.getBase(), confSource.getAttr(), confSource.getLookahead()); 
 			break;
-		case sorted_csv:
-			reader = new CSVDataReader(confSource.getName(), new FileReader(confSource.getPath()), true);
-			break;
-		case sql:
+		case SQL:
 			SQLConnectionWrapper sqlConnBuilder = connections.getSQLConnectionBuilder(confSource.getConn());
 			//FIXME if conf error, getSQLConnectionBuilder could return null
 			//TODO We assume the query config item is a filepath. It isn't checked anywhere.
@@ -156,7 +156,7 @@ public class SSSyncTasksFactory {
 		MVDataWriter writer = null;
 		
 		switch ( confDest.getKind() ) {
-		case ldap:
+		case LDAP:
 			LDAPConnectionWrapper builder = connections.getLDAPConnectionBuilder(confDest.getConn());
 			reader = builder.newFlatReader(confDest.getName()+"_reader", confDest.getBase(), confDest.getAttr(), confDest.getLookahead());
 			writer = builder.newFlatWriter(confDest.getBase(), confDest.getAttr());