--- a/src/main/java/de/intevation/lada/importer/laf/LafParser.java	Mon Jul 04 14:31:18 2016 +0200
+++ b/src/main/java/de/intevation/lada/importer/laf/LafParser.java	Fri Jul 08 15:32:36 2016 +0200
@@ -17,9 +17,9 @@
 import org.apache.log4j.Logger;
 
 import de.intevation.lada.importer.ReportItem;
-import de.intevation.lada.model.land.LMessung;
-import de.intevation.lada.model.land.LOrtszuordnung;
-import de.intevation.lada.model.land.LProbe;
+import de.intevation.lada.model.land.Messung;
+import de.intevation.lada.model.land.Ortszuordnung;
+import de.intevation.lada.model.land.Probe;
 import de.intevation.lada.util.auth.UserInfo;
 import de.intevation.lada.validation.Validator;
 import de.intevation.lada.validation.Violation;
@@ -183,8 +183,8 @@
      * @param auth  The authentication information.
      */
     private void writeAll(UserInfo userInfo) {
-        String probeId = producer.getProbeTranslation().getProbeIdAlt() == null ?
-            "probeId" : producer.getProbeTranslation().getProbeIdAlt().toString();
+        String probeId = producer.getProbe().getIdAlt() == null ?
+            "probeId" : producer.getProbe().getIdAlt().toString();
         Violation violation = validateProbe(producer.getProbe());
         if (violation.hasErrors()) {
             ReportItem err = new ReportItem("validation", violation.getErrors(), null);
@@ -193,13 +193,13 @@
             this.appendErrors(probeId, errs);
             return;
         }
-        boolean p = writer.writeProbe(userInfo, producer.getProbe(), producer.getProbeTranslation());
+        boolean p = writer.writeProbe(userInfo, producer.getProbe());
         if (!p) {
             this.errors.put(probeId, writer.getErrors());
             return;
         }
         writer.writeProbenKommentare(userInfo, producer.getProbenKommentare());
-        for (LMessung messung: producer.getMessungen().keySet()) {
+        for (Messung messung: producer.getMessungen()) {
             messung.setProbeId(producer.getProbe().getId());
             Violation mViolation = messungValidator.validate(messung);
             if (mViolation.hasErrors()) {
@@ -209,13 +209,13 @@
                 this.appendErrors(probeId, mErrs);
                 continue;
             }
-            boolean m = writer.writeMessungen(userInfo, messung, producer.getMessungen().get(messung));
+            boolean m = writer.writeMessungen(userInfo, messung);
             if (!m) {
                 return;
             }
         }
         writer.writeOrte(userInfo, producer.getOrte());
-        for (LOrtszuordnung ort: producer.getLOrte()) {
+        for (Ortszuordnung ort: producer.getOrtszuordnungen()) {
             Violation oViolation = ortValidator.validate(ort);
             if (oViolation.hasErrors()) {
                 ReportItem oErr = new ReportItem("validation", oViolation.getErrors(), null);
@@ -224,7 +224,7 @@
                 this.appendErrors(probeId, oErrs);
                 continue;
             }
-            writer.writeLOrte(userInfo, ort);
+            writer.writeOrtszuordung(userInfo, ort);
         }
         writer.writeMessungKommentare(userInfo, producer.getMessungsKommentare());
         writer.writeMesswerte(userInfo, producer.getMesswerte());
@@ -235,7 +235,7 @@
             warns.add(warn);
             this.appendWarnings(probeId, warns);
         }
-        for (LMessung messung: producer.getMessungen().keySet()) {
+        for (Messung messung: producer.getMessungen()) {
             Violation mViolation = messungValidator.validate(messung);
             if (mViolation.hasWarnings()) {
                 ReportItem mWarn = new ReportItem("validation", mViolation.getWarnings(), null);
@@ -251,7 +251,7 @@
      *
      * @param probe The probe object to validate.
      */
-    private Violation validateProbe(LProbe probe) {
+    private Violation validateProbe(Probe probe) {
         return probeValidator.validate(probe);
     }