diff options
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src')
3 files changed, 10 insertions, 10 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/activator/CoreBundleActivator.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/activator/CoreBundleActivator.java index 4ed4c1d8e..d837fc36f 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/activator/CoreBundleActivator.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/activator/CoreBundleActivator.java @@ -12,9 +12,9 @@ package org.eclipse.tcf.te.tcf.processes.core.activator; import org.eclipse.core.runtime.Plugin; import org.eclipse.tcf.protocol.Protocol; import org.eclipse.tcf.te.runtime.tracing.TraceHandler; -import org.eclipse.tcf.te.tcf.locator.interfaces.IModelListener; +import org.eclipse.tcf.te.tcf.locator.interfaces.IPeerModelListener; import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel; -import org.eclipse.tcf.te.tcf.locator.model.Model; +import org.eclipse.tcf.te.tcf.locator.model.ModelManager; import org.eclipse.tcf.te.tcf.processes.core.model.listener.ModelListener; import org.osgi.framework.BundleContext; @@ -27,7 +27,7 @@ public class CoreBundleActivator extends Plugin { // The trace handler instance private static volatile TraceHandler traceHandler; // The locator model listener instance - /* default */ IModelListener listener; + /* default */ IPeerModelListener listener; // The shared instance private static CoreBundleActivator plugin; @@ -88,7 +88,7 @@ public class CoreBundleActivator extends Plugin { public void run() { if (listener == null) return; // Register the model listener with the locator model - Model.getPeerModel().addListener(listener); + ModelManager.getPeerModel().addListener(listener); } }; @@ -108,7 +108,7 @@ public class CoreBundleActivator extends Plugin { Runnable runnable = new Runnable() { @Override public void run() { - IPeerModel model = Model.getPeerModel(true); + IPeerModel model = ModelManager.getPeerModel(true); if (model != null) model.removeListener(listener); listener = null; } diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/model/listener/ModelListener.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/model/listener/ModelListener.java index 216609e9d..938b3dbb7 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/model/listener/ModelListener.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/model/listener/ModelListener.java @@ -22,16 +22,16 @@ import org.eclipse.tcf.te.tcf.processes.core.model.ModelManager; public class ModelListener extends ModelAdapter { /* (non-Javadoc) - * @see org.eclipse.tcf.te.tcf.locator.listener.ModelAdapter#locatorModelChanged(org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel, org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerNode, boolean) + * @see org.eclipse.tcf.te.tcf.locator.listener.ModelAdapter#modelChanged(org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel, org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerNode, boolean) */ @Override - public void locatorModelChanged(IPeerModel model, IPeerNode peer, boolean added) { + public void modelChanged(final IPeerModel model, final IPeerNode peerNode, final boolean added) { Assert.isTrue(Protocol.isDispatchThread(), "Illegal Thread Access"); //$NON-NLS-1$ - if (peer == null) return; + if (peerNode == null) return; if (!added) { // Dispose possibly associated models - ModelManager.disposeRuntimeModel(peer); + ModelManager.disposeRuntimeModel(peerNode); } } } diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/model/runtime/RuntimeModel.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/model/runtime/RuntimeModel.java index 5bccafe5a..a36cf47e3 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/model/runtime/RuntimeModel.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/model/runtime/RuntimeModel.java @@ -41,7 +41,7 @@ import org.eclipse.tcf.te.tcf.processes.core.model.runtime.services.RuntimeModel /** - * Model implementation dealing with Processes at runtime. + * ModelManager implementation dealing with Processes at runtime. */ public final class RuntimeModel extends ContainerModelNode implements IRuntimeModel, IFilterable { // Flag to mark the model disposed |