From 6f4c0ba204c24d49a7b7f90cdc13b2f423c72185 Mon Sep 17 00:00:00 2001
From: Lukas Ladenberger <lukas.ladenberger@googlemail.com>
Date: Tue, 27 Nov 2012 15:29:38 +0100
Subject: [PATCH] removed observer from outline view
---
.../de/bmotionstudio/gef/editor/model/BControl.java | 12 ++++++------
.../gef/editor/part/BControlTreeEditPart.java | 9 ++++-----
.../gef/editor/part/BMSTreeEditPartFactory.java | 11 +++++------
3 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BControl.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BControl.java
index 8013e19f..30078bbe 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BControl.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BControl.java
@@ -476,9 +476,9 @@ public abstract class BControl implements IAdaptable, Cloneable {
public void addObserver(Observer observer) {
observers.put(observer.getID(), (Observer) observer);
- for (IObserverListener listener : getObserverListener()) {
- listener.addedObserver(this, observer);
- }
+ // for (IObserverListener listener : getObserverListener()) {
+ // listener.addedObserver(this, observer);
+ // }
}
public void removeObserver(Observer observer) {
@@ -489,9 +489,9 @@ public abstract class BControl implements IAdaptable, Cloneable {
if (hasObserver(observerID))
observers.get(observerID).beforeDelete(this);
observers.remove(observerID);
- for (IObserverListener listener : getObserverListener()) {
- listener.removedObserver(this);
- }
+ // for (IObserverListener listener : getObserverListener()) {
+ // listener.removedObserver(this);
+ // }
}
public Map<String, SchedulerEvent> getEvents() {
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BControlTreeEditPart.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BControlTreeEditPart.java
index 6adcbe06..dc2f797b 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BControlTreeEditPart.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BControlTreeEditPart.java
@@ -25,7 +25,6 @@ import de.bmotionstudio.gef.editor.EditorImageRegistry;
import de.bmotionstudio.gef.editor.editpolicy.BMSDeletePolicy;
import de.bmotionstudio.gef.editor.model.BConnection;
import de.bmotionstudio.gef.editor.model.BControl;
-import de.bmotionstudio.gef.editor.model.ObserverRootVirtualTreeNode;
import de.bmotionstudio.gef.editor.model.Visualization;
import de.bmotionstudio.gef.editor.observer.IObserverListener;
import de.bmotionstudio.gef.editor.observer.Observer;
@@ -74,8 +73,8 @@ public class BControlTreeEditPart extends BMSAbstractTreeEditPart implements
}
}
- if (!(getModel() instanceof Visualization))
- toShowElements.add(new ObserverRootVirtualTreeNode(c));
+ // if (!(getModel() instanceof Visualization))
+ // toShowElements.add(new ObserverRootVirtualTreeNode(c));
}
@@ -87,7 +86,7 @@ public class BControlTreeEditPart extends BMSAbstractTreeEditPart implements
if (!isActive()) {
super.activate();
((BControl) getModel()).addPropertyChangeListener(this);
- ((BControl) getModel()).addObserverListener(this);
+ // ((BControl) getModel()).addObserverListener(this);
}
}
@@ -95,7 +94,7 @@ public class BControlTreeEditPart extends BMSAbstractTreeEditPart implements
if (isActive()) {
super.deactivate();
((BControl) getModel()).removePropertyChangeListener(this);
- ((BControl) getModel()).removeObserverListener(this);
+ // ((BControl) getModel()).removeObserverListener(this);
}
}
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BMSTreeEditPartFactory.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BMSTreeEditPartFactory.java
index 77445144..93336446 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BMSTreeEditPartFactory.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BMSTreeEditPartFactory.java
@@ -14,9 +14,7 @@ import org.eclipse.gef.EditPartFactory;
import de.bmotionstudio.gef.editor.BMotionEditorPlugin;
import de.bmotionstudio.gef.editor.IBControlService;
import de.bmotionstudio.gef.editor.model.BControl;
-import de.bmotionstudio.gef.editor.model.ObserverRootVirtualTreeNode;
import de.bmotionstudio.gef.editor.model.Visualization;
-import de.bmotionstudio.gef.editor.observer.Observer;
public class BMSTreeEditPartFactory implements EditPartFactory {
@@ -43,11 +41,12 @@ public class BMSTreeEditPartFactory implements EditPartFactory {
e.printStackTrace();
}
- } else if (model instanceof Observer) {
- part = new ObserverTreeEditPart();
- } else if (model instanceof ObserverRootVirtualTreeNode) {
- part = new ObserverRootTreeEditpart();
}
+ // else if (model instanceof Observer) {
+ // part = new ObserverTreeEditPart();
+ // } else if (model instanceof ObserverRootVirtualTreeNode) {
+ // part = new ObserverRootTreeEditpart();
+ // }
if (part != null)
part.setModel(model);
--
GitLab