X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.simulation%2Fsrc%2Forg%2Fsimantics%2Fsimulation%2Fdata%2FAbstractDatasource.java;h=7b6e791daafbc8489e4c3c75f699b46d472bf0bb;hb=b000e272429e157638c0384878b07b8dcd758472;hp=3814b6c1638228f70ab600306434f9aec833df37;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.simulation/src/org/simantics/simulation/data/AbstractDatasource.java b/bundles/org.simantics.simulation/src/org/simantics/simulation/data/AbstractDatasource.java index 3814b6c16..7b6e791da 100644 --- a/bundles/org.simantics.simulation/src/org/simantics/simulation/data/AbstractDatasource.java +++ b/bundles/org.simantics.simulation/src/org/simantics/simulation/data/AbstractDatasource.java @@ -1,62 +1,62 @@ -/******************************************************************************* - * Copyright (c) 2007 VTT Technical Research Centre of Finland and others. - * 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.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -import org.simantics.utils.datastructures.ListenerList; - -/** - * @author Toni Kalajainen - */ -public abstract class AbstractDatasource implements Datasource { - - protected ListenerList listeners = new ListenerList(DatasourceListener.class); - protected Lock readLock, writeLock; - - public AbstractDatasource() { -// ReentrantReadWriteLock l = new ReentrantReadWriteLock(); -// this.readLock = l.readLock(); -// this.writeLock = l.writeLock(); - this.readLock = this.writeLock = new ReentrantLock(); - } - - @Override - public void addListener(DatasourceListener listener) { - listeners.add(listener); - } - - @Override - public void removeListener(DatasourceListener listener) { - listeners.remove(listener); - } - - protected void notifyStep() { - for (final DatasourceListener l : listeners.getListeners()) { - if (l.getExecutor() == null) { - l.onStep( AbstractDatasource.this ); - } else { - l.getExecutor().execute(new Runnable() { - public void run() { - l.onStep(AbstractDatasource.this); - } - }); - } - } - } - - @Override - public Lock readLock() { - return readLock; - } - -} +/******************************************************************************* + * Copyright (c) 2007 VTT Technical Research Centre of Finland and others. + * 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.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + +import org.simantics.utils.datastructures.ListenerList; + +/** + * @author Toni Kalajainen + */ +public abstract class AbstractDatasource implements Datasource { + + protected ListenerList listeners = new ListenerList<>(DatasourceListener.class); + protected Lock readLock, writeLock; + + public AbstractDatasource() { +// ReentrantReadWriteLock l = new ReentrantReadWriteLock(); +// this.readLock = l.readLock(); +// this.writeLock = l.writeLock(); + this.readLock = this.writeLock = new ReentrantLock(); + } + + @Override + public void addListener(DatasourceListener listener) { + listeners.add(listener); + } + + @Override + public void removeListener(DatasourceListener listener) { + listeners.remove(listener); + } + + protected void notifyStep(Datasource source) { + for (DatasourceListener l : listeners.getListeners()) { + if (l.getExecutor() == null) { + l.onStep( source ); + } else { + l.getExecutor().execute(() -> l.onStep(source)); + } + } + } + + protected void notifyStep() { + notifyStep(AbstractDatasource.this); + } + + @Override + public Lock readLock() { + return readLock; + } + +}