Move the export logic of networks to DirectObservation

integratedmodelling · Jan 30, 2024 · 1f103f0 · 1f103f0
1 parent b47b531
commit 1f103f0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/.../java/org/integratedmodelling/klab/components/runtime/observations/DirectObservation.java b/.../java/org/integratedmodelling/klab/components/runtime/observations/DirectObservation.java
@@ -254,4 +254,15 @@ public String dump() {
 //		return configurationCache;
 //	}
 
+    @Override
+    public boolean is(Class< ? > cls) {
+        Class< ? > clazz = getOriginatingPattern().getClass();
+        return cls.isAssignableFrom(clazz);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T as(Class< ? > cls) {
+        return (T) getOriginatingPattern();
+    }
 }
diff --git a/klab.engine/src/main/java/org/integratedmodelling/klab/provenance/Artifact.java b/klab.engine/src/main/java/org/integratedmodelling/klab/provenance/Artifact.java
@@ -247,13 +247,7 @@ public void setGenerator(Activity generator) {
 	 */
 	@Override
 	public boolean is(Class<?> cls) {
-        if (this instanceof DirectObservation) {
-            Class< ? > clazz = ((DirectObservation) this).getOriginatingPattern().getClass();
-            if (cls.isAssignableFrom(clazz)) {
-                return true;
-            }
-        }
-        return false;
+        return peers.get(cls) != null;
 	}
 
 	/**
@@ -263,9 +257,6 @@ public boolean is(Class<?> cls) {
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T> T as(Class<?> cls) {
-        if (this instanceof DirectObservation) {
-            return (T) ((DirectObservation)this).getOriginatingPattern();
-        }
         return (T) peers.get(cls);
 	}