--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/Datacage.java	Sun Apr 28 15:14:30 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/Datacage.java	Sun Apr 28 15:23:01 2013 +0200
@@ -36,7 +36,7 @@
 import org.dive4elements.artifacts.ArtifactDatabase;
 import org.dive4elements.artifacts.ArtifactDatabaseException;
 
-import org.dive4elements.river.artifacts.FLYSArtifact;
+import org.dive4elements.river.artifacts.D4EArtifact;
 
 import org.dive4elements.artifacts.common.utils.LRUCache;
 
@@ -122,12 +122,12 @@
             Date     artifactCreated,
             Artifact artifact
         ) {
-            if (!(artifact instanceof FLYSArtifact)) {
+            if (!(artifact instanceof D4EArtifact)) {
                 log.warn("ignoring none FLYS artifacts");
                 return;
             }
 
-            FLYSArtifact flysArtifact = (FLYSArtifact)artifact;
+            D4EArtifact flysArtifact = (D4EArtifact)artifact;
 
             Integer uId = getUserId(userId);
             Integer cId = getCollectionId(
@@ -173,7 +173,7 @@
         protected void storeArtifact(
             final String       artifactId,
             Integer            collectionId,
-            final FLYSArtifact artifact,
+            final D4EArtifact artifact,
             final Date         artifactCreated
         ) {
             Integer aId = getId(artifacts, artifactId, SQL_ARTIFACT_BY_GID);
@@ -500,12 +500,12 @@
             return;
         }
 
-        if (!(artifact instanceof FLYSArtifact)) {
-            log.warn("need FLYSArtifact here (have " + artifact.getClass() + ")");
+        if (!(artifact instanceof D4EArtifact)) {
+            log.warn("need D4EArtifact here (have " + artifact.getClass() + ")");
             return;
         }
 
-        final FLYSArtifact flys = (FLYSArtifact)artifact;
+        final D4EArtifact flys = (D4EArtifact)artifact;
 
         final int [] res = new int[1];
 
@@ -547,12 +547,12 @@
         GlobalContext context
     ) {
         log.debug("storedArtifact");
-        if (!(artifact instanceof FLYSArtifact)) {
-            log.warn("need FLYSArtifact here but have a " + artifact.getClass());
+        if (!(artifact instanceof D4EArtifact)) {
+            log.warn("need D4EArtifact here but have a " + artifact.getClass());
             return;
         }
 
-        final FLYSArtifact flys = (FLYSArtifact)artifact;
+        final D4EArtifact flys = (D4EArtifact)artifact;
 
         final Integer [] res = new Integer[1];
 
@@ -886,7 +886,7 @@
 
     protected void storeData(
         final int     artifactId,
-        FLYSArtifact  artifact
+        D4EArtifact  artifact
     ) {
         final Collection<StateData> data = artifact.getAllData();
 
@@ -938,7 +938,7 @@
 
     protected void storeOuts(
         final int          artifactId,
-        final FLYSArtifact artifact,
+        final D4EArtifact artifact,
         GlobalContext      context
     ) {
         final List<Output> outs = artifact.getOutputs(context);