diff options
Diffstat (limited to 'src/main/src/conf')
-rw-r--r-- | src/main/src/conf/ConfigConnectionBean.java | 2 | ||||
-rw-r--r-- | src/main/src/conf/ConfigDestBean.java | 8 | ||||
-rw-r--r-- | src/main/src/conf/ConfigRootBean.java | 2 | ||||
-rw-r--r-- | src/main/src/conf/ConfigSourceBean.java | 2 |
4 files changed, 8 insertions, 6 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; |