--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java	Tue Oct 18 14:25:50 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java	Tue Oct 18 15:00:43 2011 +0000
@@ -32,6 +32,7 @@
         "SELECT km, w FROM wst_w_values " +
         "WHERE wst_id = :wst_id AND column_pos = :column_pos";
 
+    /** Query to get name for wst_id and column_pos. */
     public static final String SQL_SELECT_NAME =
         "SELECT name " +
         "FROM wst_columns "+
@@ -74,18 +75,13 @@
     }
 
 
-    /**
-     * Get WKms from db.
-     * @param column the position columns value
-     * @param wst_id database id of the wst
-     * @return according WKms.
-     */
-    public static WKms getWKmsUncached(int column, int wst_id) {
-        log.debug("WKmsFactory.getWKmsUncached c/" + column + ", wst_id/" + wst_id);
+    /** Get name for a WKms. */
+    public static String getWKmsName(int column, int wst_id) {
+        log.debug("WKmsFactory.getWKmsName c/" + column + ", wst_id/" + wst_id);
+
+        String name = null;
         Session session = SessionHolder.HOLDER.get();
 
-        String name = "todo";
-
         SQLQuery nameQuery = session.createSQLQuery(SQL_SELECT_NAME)
             .addScalar("name", StandardBasicTypes.STRING);
         nameQuery.setInteger("wst_id",     wst_id);
@@ -96,8 +92,22 @@
             name = names.get(0);
         }
 
-        WKmsImpl wkms = new WKmsImpl(name);
+        return name;
+    }
 
+
+    /**
+     * Get WKms from db.
+     * @param column the position columns value
+     * @param wst_id database id of the wst
+     * @return according WKms.
+     */
+    public static WKms getWKmsUncached(int column, int wst_id) {
+        log.debug("WKmsFactory.getWKmsUncached c/" + column + ", wst_id/" + wst_id);
+
+        WKmsImpl wkms = new WKmsImpl(getWKmsName(column, wst_id));
+
+        Session session = SessionHolder.HOLDER.get();
         SQLQuery sqlQuery = session.createSQLQuery(SQL_SELECT_WS)
             .addScalar("km", StandardBasicTypes.DOUBLE)
             .addScalar("w",  StandardBasicTypes.DOUBLE);