--- a/artifacts/src/main/java/org/dive4elements/river/exports/WaterlevelExporter.java	Sun Apr 28 15:14:30 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/WaterlevelExporter.java	Sun Apr 28 15:23:01 2013 +0200
@@ -43,7 +43,7 @@
 import org.dive4elements.river.artifacts.access.FixRealizingAccess;
 import org.dive4elements.river.artifacts.access.RangeAccess;
 import org.dive4elements.river.artifacts.FixationArtifact;
-import org.dive4elements.river.artifacts.FLYSArtifact;
+import org.dive4elements.river.artifacts.D4EArtifact;
 import org.dive4elements.river.artifacts.WINFOArtifact;
 import org.dive4elements.river.artifacts.model.CalculationResult;
 import org.dive4elements.river.artifacts.model.Segment;
@@ -285,11 +285,11 @@
     protected void writeCSVData(CSVWriter writer) {
         logger.info("WaterlevelExporter.writeData");
 
-        WQ_MODE mode    = RiverUtils.getWQMode((FLYSArtifact)master);
+        WQ_MODE mode    = RiverUtils.getWQMode((D4EArtifact)master);
         boolean atGauge = mode == WQ_MODE.QGAUGE || mode == WQ_MODE.WGAUGE;
         boolean isQ     = mode == WQ_MODE.QGAUGE || mode == WQ_MODE.QFREE;
         RiverUtils.WQ_INPUT input
-            = RiverUtils.getWQInputMode((FLYSArtifact)master);
+            = RiverUtils.getWQInputMode((D4EArtifact)master);
 
         writeCSVMeta(writer);
         writeCSVHeader(writer, atGauge, isQ);
@@ -309,7 +309,7 @@
 
         CallMeta meta = context.getMeta();
 
-        FLYSArtifact flys = (FLYSArtifact) master;
+        D4EArtifact flys = (D4EArtifact) master;
 
         writer.writeNext(new String[] {
             Resources.getMsg(
@@ -434,7 +434,7 @@
     ) {
         logger.info("WaterlevelExporter.writeCSVHeader");
 
-        String unit = RiverUtils.getRiver((FLYSArtifact) master).getWstUnit().getName();
+        String unit = RiverUtils.getRiver((D4EArtifact) master).getWstUnit().getName();
 
         if (atGauge) {
             writer.writeNext(new String[] {
@@ -480,7 +480,7 @@
     }
 
 
-    private void writeRow4(CSVWriter writer, double wqkm[], FLYSArtifact flys) {
+    private void writeRow4(CSVWriter writer, double wqkm[], D4EArtifact flys) {
         NumberFormat kmf = getKmFormatter();
         NumberFormat wf  = getWFormatter();
         NumberFormat qf  = getQFormatter();
@@ -496,7 +496,7 @@
 
     /** Write an csv-row at gauge location. */
     private void writeRow6(CSVWriter writer, double wqkm[], String wOrQDesc,
-        FLYSArtifact flys, String gaugeName) {
+        D4EArtifact flys, String gaugeName) {
         NumberFormat kmf = getKmFormatter();
         NumberFormat wf  = getWFormatter();
         NumberFormat qf  = getQFormatter();
@@ -535,7 +535,7 @@
         int      size   = wqkms.size();
         double[] result = new double[3];
 
-        FLYSArtifact flys       = (FLYSArtifact) master;
+        D4EArtifact flys       = (D4EArtifact) master;
         List<Gauge>  gauges     = RiverUtils.getGauges(flys);
         Gauge        gauge      = RiverUtils.getGauge(flys);
         String       gaugeName  = gauge.getName();
@@ -743,7 +743,7 @@
     protected WKmsJRDataSource createJRData() {
         WKmsJRDataSource source = new WKmsJRDataSource();
 
-        WQ_MODE mode    = RiverUtils.getWQMode((FLYSArtifact)master);
+        WQ_MODE mode    = RiverUtils.getWQMode((D4EArtifact)master);
         boolean atGauge = mode == WQ_MODE.QGAUGE || mode == WQ_MODE.WGAUGE;
         boolean isQ     = mode == WQ_MODE.QGAUGE || mode == WQ_MODE.QFREE;
 
@@ -759,7 +759,7 @@
     protected void addMetaData(WKmsJRDataSource source) {
         CallMeta meta = context.getMeta();
 
-        FLYSArtifact flys = (FLYSArtifact) master;
+        D4EArtifact flys = (D4EArtifact) master;
 
         source.addMetaData ("river", RiverUtils.getRivername(flys));
 
@@ -800,7 +800,7 @@
         int      size   = wqkms.size();
         double[] result = new double[3];
 
-        FLYSArtifact flys       = (FLYSArtifact) master;
+        D4EArtifact flys       = (D4EArtifact) master;
         Gauge        gauge      = RiverUtils.getGauge(flys);
         String       gaugeName  = gauge.getName();
         String       desc       = "";