X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.simulation%2Fsrc%2Forg%2Fsimantics%2Fsimulation%2Fdata%2FDatasourceAdapter.java;h=1b6f9b6f8ea9e4fa58c1764e59d2b12719630e84;hb=refs%2Fchanges%2F38%2F238%2F2;hp=b345fd6e83397a8fa0f8cb8dc0e9d8bab4c02c7d;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.simulation/src/org/simantics/simulation/data/DatasourceAdapter.java b/bundles/org.simantics.simulation/src/org/simantics/simulation/data/DatasourceAdapter.java
index b345fd6e8..1b6f9b6f8 100644
--- a/bundles/org.simantics.simulation/src/org/simantics/simulation/data/DatasourceAdapter.java
+++ b/bundles/org.simantics.simulation/src/org/simantics/simulation/data/DatasourceAdapter.java
@@ -1,212 +1,212 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in
- * Industry THTH ry.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.simulation.data;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.Executor;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.simantics.databoard.Bindings;
-import org.simantics.databoard.accessor.error.AccessorException;
-import org.simantics.databoard.binding.Binding;
-import org.simantics.databoard.binding.NumberBinding;
-import org.simantics.databoard.type.Datatype;
-import org.simantics.history.Collector;
-import org.simantics.history.HistoryException;
-import org.simantics.history.util.subscription.SubscriptionItem;
-import org.simantics.simulation.data.Datasource.DatasourceListener;
-import org.simantics.utils.datastructures.Triple;
-
-/**
- * This adapter reads data from Datasource and writes to an open Subscription.
- * This class is used as a listener. 
- * 
- * @author Toni Kalajainen <toni.kalajainen@semantum.fi>
- */
-public class DatasourceAdapter implements DatasourceListener {
-
-	protected Logger logger = Logger.getLogger( DatasourceAdapter.class.toString() );
-	protected Collector session;
-	protected boolean loaded = false;
-	protected List<VariableHandle> handles = new ArrayList<VariableHandle>();
-	protected List<String> ids = new ArrayList<String>();
-	protected List<Binding> bindings = new ArrayList<Binding>();
-
-	/**
-	 * Variables whose {@link VariableHandle#getValue()} has previously failed
-	 * and has been reported to have failed through {@link #logger}. Resetting
-	 * the adapter will also reset this set.
-	 */
-	protected Set<String> failedIds = new HashSet<String>();
-
-	protected Lock stepLock = new ReentrantLock();
-	
-	/**
-	 * Create new adapter. Subscribed items are read from collector. 
-	 * 
-	 * @param subscription
-	 */
-	public DatasourceAdapter(Collector subscription) {
-		this.session = subscription;
-	}
-	
-	public void setSubscriptionSession(Collector session) {
-		this.session = session;
-	}
-	
-	public Collector getSubscriptionSession() {
-		return session;
-	}
-	
-	public void flush() throws HistoryException {
-		session.flush();
-	}
-
-	/**
-	 * @return the lock that is used for synchronizing each
-	 *         {@link #onStep(Datasource)} invocation. The lock can be used
-	 *         elsewhere to guarantee that history collection steps are not
-	 *         taken meanwhile. For example, while setting up history
-	 *         collection.
-	 */
-	public Lock stepLock() {
-		return stepLock;
-	}
-
-	/**
-	 * Reset internal caches. Call this when subscribed items in collector
-	 * have changed.
-	 */
-	public void reset() {
-		for (VariableHandle h : handles) if (h!=null) h.dispose();
-		bindings.clear();
-		handles.clear();
-		ids.clear();
-		failedIds.clear();
-		loaded = false;
-	}
-
-	protected void load(Datasource source) {
-		reset();
-
-		// Read ids		
-		SubscriptionItem[] items = session.getItems();
-		Set<String> idSet = new HashSet<String>(items.length);
-		for (SubscriptionItem bean : items) {
-			String variableId = (String) bean.getFieldUnchecked("variableId");
-			if (!idSet.add( variableId )) continue;
-			Datatype variableType = source.getType( variableId );
-			if (variableType == null) continue;
-			Binding valueBinding = Bindings.getBinding( variableType );
-			VariableHandle handle = source.openHandle( bean, variableId, valueBinding );
-			handles.add( handle );
-			ids.add( variableId );
-			bindings.add( valueBinding );
-		}
-		loaded = true;
-	}
-
-	protected void list(Collection<Triple<String,Binding,Object>> result, Collection<GraphHandle> graphHandles) {
-	    
-        int c = ids.size();
-        for (int i=0; i<c; i++) {
-            String key = ids.get(i);
-            VariableHandle handle = handles.get(i);
-            Object value = null;
-            if (handle != null) {
-                if (handle instanceof GraphHandle) {
-                    graphHandles.add((GraphHandle)handle);
-                } else {
-                    try {
-                        value = handle.getValue();
-                        Binding binding = bindings.get(i);
-                        result.add(Triple.make(key, binding, value));
-                    } catch (AccessorException e) {
-                        if (failedIds.add(key))
-                            logger.log(Level.SEVERE, e.toString(), e);
-                        continue;
-                    }
-                }
-            } else {
-                Binding binding = bindings.get(i);
-                result.add(Triple.make(key, binding, value));
-            }
-        }
-	}
-	
-	@Override
-    public void onStep(Datasource source) {
-        stepLock.lock();
-        try {
-            NumberBinding timeBinding = Bindings.DOUBLE;
-            Object time = source.getTime( timeBinding );
-            session.beginStep( timeBinding, time );
-
-            if (!loaded) load( source );
-
-            try {
-
-                int c = ids.size();
-                for (int i=0; i<c; i++) {
-                    String key = ids.get(i);
-                    VariableHandle handle = handles.get(i);
-                    Object value = null;
-                    if (handle != null) {
-                        try {
-                            value = handle.getValue();
-                        } catch (AccessorException e) {
-                            if (failedIds.add(key))
-                                logger.log(Level.SEVERE, e.toString(), e);
-                            continue;
-                        }
-                        Binding binding = handle.binding();
-                        try {
-                            session.setValue( key, binding, value );
-                        } catch (HistoryException e) {
-                            logger.log(Level.SEVERE, e.toString(), e);
-                        }
-                    } else {
-                        Binding binding = bindings.get(i);
-                        if (binding != null) { 
-                            session.setValue( key, binding, value );
-                        }                       
-                    }
-                }
-
-            } finally {
-                try {
-                    session.endStep();
-                } catch (HistoryException e) {
-                    logger.log(Level.SEVERE, e.toString(), e);
-                }
-            }
-        } catch (HistoryException e) {
-            logger.log(Level.SEVERE, e.toString(), e);
-        } finally {
-            stepLock.unlock();
-        }
-    }
-
-	@Override
-	public Executor getExecutor() {
-		return null;
-	}
-	
-
-}
+/*******************************************************************************
+ * Copyright (c) 2007, 2011 Association for Decentralized Information Management in
+ * Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.simulation.data;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.Executor;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.simantics.databoard.Bindings;
+import org.simantics.databoard.accessor.error.AccessorException;
+import org.simantics.databoard.binding.Binding;
+import org.simantics.databoard.binding.NumberBinding;
+import org.simantics.databoard.type.Datatype;
+import org.simantics.history.Collector;
+import org.simantics.history.HistoryException;
+import org.simantics.history.util.subscription.SubscriptionItem;
+import org.simantics.simulation.data.Datasource.DatasourceListener;
+import org.simantics.utils.datastructures.Triple;
+
+/**
+ * This adapter reads data from Datasource and writes to an open Subscription.
+ * This class is used as a listener. 
+ * 
+ * @author Toni Kalajainen <toni.kalajainen@semantum.fi>
+ */
+public class DatasourceAdapter implements DatasourceListener {
+
+	protected Logger logger = Logger.getLogger( DatasourceAdapter.class.toString() );
+	protected Collector session;
+	protected boolean loaded = false;
+	protected List<VariableHandle> handles = new ArrayList<VariableHandle>();
+	protected List<String> ids = new ArrayList<String>();
+	protected List<Binding> bindings = new ArrayList<Binding>();
+
+	/**
+	 * Variables whose {@link VariableHandle#getValue()} has previously failed
+	 * and has been reported to have failed through {@link #logger}. Resetting
+	 * the adapter will also reset this set.
+	 */
+	protected Set<String> failedIds = new HashSet<String>();
+
+	protected Lock stepLock = new ReentrantLock();
+	
+	/**
+	 * Create new adapter. Subscribed items are read from collector. 
+	 * 
+	 * @param subscription
+	 */
+	public DatasourceAdapter(Collector subscription) {
+		this.session = subscription;
+	}
+	
+	public void setSubscriptionSession(Collector session) {
+		this.session = session;
+	}
+	
+	public Collector getSubscriptionSession() {
+		return session;
+	}
+	
+	public void flush() throws HistoryException {
+		session.flush();
+	}
+
+	/**
+	 * @return the lock that is used for synchronizing each
+	 *         {@link #onStep(Datasource)} invocation. The lock can be used
+	 *         elsewhere to guarantee that history collection steps are not
+	 *         taken meanwhile. For example, while setting up history
+	 *         collection.
+	 */
+	public Lock stepLock() {
+		return stepLock;
+	}
+
+	/**
+	 * Reset internal caches. Call this when subscribed items in collector
+	 * have changed.
+	 */
+	public void reset() {
+		for (VariableHandle h : handles) if (h!=null) h.dispose();
+		bindings.clear();
+		handles.clear();
+		ids.clear();
+		failedIds.clear();
+		loaded = false;
+	}
+
+	protected void load(Datasource source) {
+		reset();
+
+		// Read ids		
+		SubscriptionItem[] items = session.getItems();
+		Set<String> idSet = new HashSet<String>(items.length);
+		for (SubscriptionItem bean : items) {
+			String variableId = (String) bean.getFieldUnchecked("variableId");
+			if (!idSet.add( variableId )) continue;
+			Datatype variableType = source.getType( variableId );
+			if (variableType == null) continue;
+			Binding valueBinding = Bindings.getBinding( variableType );
+			VariableHandle handle = source.openHandle( bean, variableId, valueBinding );
+			handles.add( handle );
+			ids.add( variableId );
+			bindings.add( valueBinding );
+		}
+		loaded = true;
+	}
+
+	protected void list(Collection<Triple<String,Binding,Object>> result, Collection<GraphHandle> graphHandles) {
+	    
+        int c = ids.size();
+        for (int i=0; i<c; i++) {
+            String key = ids.get(i);
+            VariableHandle handle = handles.get(i);
+            Object value = null;
+            if (handle != null) {
+                if (handle instanceof GraphHandle) {
+                    graphHandles.add((GraphHandle)handle);
+                } else {
+                    try {
+                        value = handle.getValue();
+                        Binding binding = bindings.get(i);
+                        result.add(Triple.make(key, binding, value));
+                    } catch (AccessorException e) {
+                        if (failedIds.add(key))
+                            logger.log(Level.SEVERE, e.toString(), e);
+                        continue;
+                    }
+                }
+            } else {
+                Binding binding = bindings.get(i);
+                result.add(Triple.make(key, binding, value));
+            }
+        }
+	}
+	
+	@Override
+    public void onStep(Datasource source) {
+        stepLock.lock();
+        try {
+            NumberBinding timeBinding = Bindings.DOUBLE;
+            Object time = source.getTime( timeBinding );
+            session.beginStep( timeBinding, time );
+
+            if (!loaded) load( source );
+
+            try {
+
+                int c = ids.size();
+                for (int i=0; i<c; i++) {
+                    String key = ids.get(i);
+                    VariableHandle handle = handles.get(i);
+                    Object value = null;
+                    if (handle != null) {
+                        try {
+                            value = handle.getValue();
+                        } catch (AccessorException e) {
+                            if (failedIds.add(key))
+                                logger.log(Level.SEVERE, e.toString(), e);
+                            continue;
+                        }
+                        Binding binding = handle.binding();
+                        try {
+                            session.setValue( key, binding, value );
+                        } catch (HistoryException e) {
+                            logger.log(Level.SEVERE, e.toString(), e);
+                        }
+                    } else {
+                        Binding binding = bindings.get(i);
+                        if (binding != null) { 
+                            session.setValue( key, binding, value );
+                        }                       
+                    }
+                }
+
+            } finally {
+                try {
+                    session.endStep();
+                } catch (HistoryException e) {
+                    logger.log(Level.SEVERE, e.toString(), e);
+                }
+            }
+        } catch (HistoryException e) {
+            logger.log(Level.SEVERE, e.toString(), e);
+        } finally {
+            stepLock.unlock();
+        }
+    }
+
+	@Override
+	public Executor getExecutor() {
+		return null;
+	}
+	
+
+}