diff options
author | Uwe Stieber | 2015-06-24 14:37:32 +0000 |
---|---|---|
committer | Uwe Stieber | 2015-06-24 14:37:54 +0000 |
commit | 4c5d3ab5fa55ddec1c5584ef56171f9e849b9e80 (patch) | |
tree | 3b5146c9e44591c1fd2ad8a8c968f03c0e0f7dc5 /target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core | |
parent | ef294e08edad1a450011218f509a950a9ea51d68 (diff) | |
download | org.eclipse.tcf-4c5d3ab5fa55ddec1c5584ef56171f9e849b9e80.tar.gz org.eclipse.tcf-4c5d3ab5fa55ddec1c5584ef56171f9e849b9e80.tar.xz org.eclipse.tcf-4c5d3ab5fa55ddec1c5584ef56171f9e849b9e80.zip |
Target Explorer: Remove unnecessary thread checks getting the peer model from a runtime model
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core')
-rw-r--r-- | target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/model/RuntimeModel.java | 49 |
1 files changed, 38 insertions, 11 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/model/RuntimeModel.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/model/RuntimeModel.java index f22accefa..37ffe6972 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/model/RuntimeModel.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/model/RuntimeModel.java @@ -14,7 +14,6 @@ import static org.eclipse.tcf.te.tcf.locator.model.ModelManager.getPeerModel; import java.beans.PropertyChangeEvent; import java.io.File; import java.util.List; -import java.util.concurrent.atomic.AtomicReference; import org.eclipse.core.runtime.Assert; import org.eclipse.tcf.protocol.IChannel; @@ -80,24 +79,39 @@ public final class RuntimeModel extends ContainerModelNode implements IRuntimeMo return new Delegate(); } + /* (non-Javadoc) + * @see org.eclipse.tcf.te.runtime.properties.PropertiesContainer#checkThreadAccess() + */ @Override protected boolean checkThreadAccess() { return Protocol.isDispatchThread(); } + /* (non-Javadoc) + * @see org.eclipse.tcf.protocol.IChannel.IChannelListener#onChannelOpened() + */ @Override public void onChannelOpened() { } + /* (non-Javadoc) + * @see org.eclipse.tcf.protocol.IChannel.IChannelListener#congestionLevel(int) + */ @Override public void congestionLevel(int level) { } + /* (non-Javadoc) + * @see org.eclipse.tcf.protocol.IChannel.IChannelListener#onChannelClosed(java.lang.Throwable) + */ @Override public void onChannelClosed(Throwable error) { ModelManager.disposeRuntimeModel(fPeerNode); } + /* (non-Javadoc) + * @see org.eclipse.tcf.te.tcf.core.model.interfaces.IModel#dispose() + */ @Override public void dispose() { Assert.isTrue(checkThreadAccess(), "Illegal Thread Access"); //$NON-NLS-1$ @@ -105,13 +119,18 @@ public final class RuntimeModel extends ContainerModelNode implements IRuntimeMo fRoot.setContent(new FSTreeNode[0], false); } + /* (non-Javadoc) + * @see org.eclipse.tcf.te.tcf.core.model.interfaces.IModel#isDisposed() + */ @Override public boolean isDisposed() { Assert.isTrue(checkThreadAccess(), "Illegal Thread Access"); //$NON-NLS-1$ return fFileSystem == null; } - + /* (non-Javadoc) + * @see org.eclipse.tcf.te.tcf.core.model.interfaces.IModel#getService(java.lang.Class) + */ @Override @SuppressWarnings("unchecked") public <V extends IModelService> V getService(Class<V> serviceInterface) { @@ -119,38 +138,46 @@ public final class RuntimeModel extends ContainerModelNode implements IRuntimeMo return (V)getAdapter(serviceInterface); } + /* (non-Javadoc) + * @see org.eclipse.tcf.te.tcf.filesystem.core.interfaces.runtime.IRuntimeModel#getDelegate() + */ @Override public Delegate getDelegate() { return fDelegate; } + /* (non-Javadoc) + * @see org.eclipse.tcf.te.runtime.properties.PropertiesContainer#getAdapter(java.lang.Class) + */ @Override public Object getAdapter(Class adapter) { if (IPeerNode.class.isAssignableFrom(adapter) || IConnectable.class.isAssignableFrom(adapter)) { - final AtomicReference<IPeerNode> peerNode = new AtomicReference<IPeerNode>(); - Protocol.invokeAndWait(new Runnable() { - @Override - public void run() { - peerNode.set(getPeerNode()); - } - }); - return peerNode.get(); + return getPeerNode(); } return super.getAdapter(adapter); } + /* (non-Javadoc) + * @see org.eclipse.tcf.te.tcf.core.model.interfaces.IModel#setFactory(org.eclipse.tcf.te.runtime.model.interfaces.factory.IFactory) + */ @Override public void setFactory(IFactory factory) { } + /* (non-Javadoc) + * @see org.eclipse.tcf.te.tcf.core.model.interfaces.IModel#getFactory() + */ @Override public IFactory getFactory() { return Factory.getInstance(); } + /* (non-Javadoc) + * @see org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerNodeProvider#getPeerNode() + */ @Override - public IPeerNode getPeerNode() { + public final IPeerNode getPeerNode() { return fPeerNode; } |