refactoring (remove duplication of IMediatorEventListener)
diff --git a/plugins/org.eclipse.actf.visualization.lowvision/src/org/eclipse/actf/visualization/lowvision/ui/internal/PartControlLowVision.java b/plugins/org.eclipse.actf.visualization.lowvision/src/org/eclipse/actf/visualization/lowvision/ui/internal/PartControlLowVision.java
index cc55f8c..82c95dd 100644
--- a/plugins/org.eclipse.actf.visualization.lowvision/src/org/eclipse/actf/visualization/lowvision/ui/internal/PartControlLowVision.java
+++ b/plugins/org.eclipse.actf.visualization.lowvision/src/org/eclipse/actf/visualization/lowvision/ui/internal/PartControlLowVision.java
@@ -20,9 +20,7 @@
import java.util.Map;
import java.util.Vector;
-import org.eclipse.actf.mediator.IMediatorEventListener;
import org.eclipse.actf.mediator.Mediator;
-import org.eclipse.actf.mediator.MediatorEvent;
import org.eclipse.actf.model.ui.IModelService;
import org.eclipse.actf.model.ui.ImagePositionInfo;
import org.eclipse.actf.model.ui.ModelServiceImageCreator;
@@ -55,7 +53,7 @@
import org.w3c.dom.Document;
public class PartControlLowVision implements ISelectionListener,
- IVisualizationConst, IMediatorEventListener {
+ IVisualizationConst {
private static final CheckResultLowVision dummyResult = new CheckResultLowVision();
@@ -269,8 +267,6 @@
e.printStackTrace();
}
- Mediator.getInstance().addMediatorEventListener(this);
-
}
public void saveReport() {
@@ -621,22 +617,8 @@
setHighlightPositions(result);
}
- public void modelserviceChanged(MediatorEvent event) {
- lowVisionView.setCurrentModelService(event.getModelServiceHolder()
- .getModelService());
- }
-
- public void modelserviceInputChanged(MediatorEvent event) {
- lowVisionView.setCurrentModelService(event.getModelServiceHolder()
- .getModelService());
- }
-
- public void reportChanged(MediatorEvent event) {
-
- }
-
- public void reportGeneratorChanged(MediatorEvent event) {
-
+ public void setCurrentModelService(IModelService modelService) {
+ lowVisionView.setCurrentModelService(modelService);
}
}
diff --git a/plugins/org.eclipse.actf.visualization.lowvision/src/org/eclipse/actf/visualization/lowvision/ui/views/LowVisionView.java b/plugins/org.eclipse.actf.visualization.lowvision/src/org/eclipse/actf/visualization/lowvision/ui/views/LowVisionView.java
index 4c88156..9239b8e 100644
--- a/plugins/org.eclipse.actf.visualization.lowvision/src/org/eclipse/actf/visualization/lowvision/ui/views/LowVisionView.java
+++ b/plugins/org.eclipse.actf.visualization.lowvision/src/org/eclipse/actf/visualization/lowvision/ui/views/LowVisionView.java
@@ -26,18 +26,16 @@
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.part.ViewPart;
-
public class LowVisionView extends ViewPart implements IVisualizationView {
public static final String ID = LowVisionView.class.getName();
-
- private PartControlLowVision partRightLowVision;
-
- private IBaseLabelProvider baseLabelProvider = new ResultTableLabelProviderLV();
- private ResultTableSorterLV viewerSorter = new ResultTableSorterLV();
-
- public LowVisionView() {
+ private PartControlLowVision partRightLowVision;
+
+ private IBaseLabelProvider baseLabelProvider = new ResultTableLabelProviderLV();
+ private ResultTableSorterLV viewerSorter = new ResultTableSorterLV();
+
+ public LowVisionView() {
super();
}
@@ -45,19 +43,19 @@
setSite(site);
setStatusLine();
}
-
-
public void createPartControl(Composite parent) {
partRightLowVision = new PartControlLowVision(this, parent);
- //TODO
- getSite().getPage().addSelectionListener(DetailedReportView.ID, partRightLowVision);
-// ((IViewSite)getSite()).getActionBars().setGlobalActionHandler("visualizationAction", new Action(){
-// public void run() {
-// partRightLowVision.doSimulate();
-// }
-// }
-// );
+ // TODO
+ getSite().getPage().addSelectionListener(DetailedReportView.ID,
+ partRightLowVision);
+ // ((IViewSite)getSite()).getActionBars().setGlobalActionHandler("visualizationAction",
+ // new Action(){
+ // public void run() {
+ // partRightLowVision.doSimulate();
+ // }
+ // }
+ // );
}
@@ -65,64 +63,73 @@
}
public void setStatusMessage(String statusMessage) {
- IContributionItem[] items = getViewSite().getActionBars().getStatusLineManager().getItems();
+ IContributionItem[] items = getViewSite().getActionBars()
+ .getStatusLineManager().getItems();
for (int i = 0; i < items.length; i++) {
- if (null != items[i] && items[i].getId().equals(VisualizationStatusLineContributionItem.ID + ID)) {
- ((VisualizationStatusLineContributionItem) items[i]).setStatusMessage(statusMessage);
+ if (null != items[i]
+ && items[i].getId().equals(
+ VisualizationStatusLineContributionItem.ID + ID)) {
+ ((VisualizationStatusLineContributionItem) items[i])
+ .setStatusMessage(statusMessage);
}
}
}
public void setInfoMessage(String infoMessage) {
- IContributionItem[] items = getViewSite().getActionBars().getStatusLineManager().getItems();
+ IContributionItem[] items = getViewSite().getActionBars()
+ .getStatusLineManager().getItems();
for (int i = 0; i < items.length; i++) {
- if (null != items[i] && items[i].getId().equals(VisualizationStatusLineContributionItem.ID + ID)) {
- ((VisualizationStatusLineContributionItem) items[i]).setInfoMessage(infoMessage);
+ if (null != items[i]
+ && items[i].getId().equals(
+ VisualizationStatusLineContributionItem.ID + ID)) {
+ ((VisualizationStatusLineContributionItem) items[i])
+ .setInfoMessage(infoMessage);
}
}
}
-
+
private void setStatusLine() {
- getViewSite().getActionBars().getStatusLineManager().add(new VisualizationStatusLineContributionItem(ID));
+ getViewSite().getActionBars().getStatusLineManager().add(
+ new VisualizationStatusLineContributionItem(ID));
}
- public IBaseLabelProvider getLabelProvider() {
- return baseLabelProvider;
- }
+ public IBaseLabelProvider getLabelProvider() {
+ return baseLabelProvider;
+ }
- public ViewerSorter getTableSorter() {
- viewerSorter.reset();
- return viewerSorter;
- }
+ public ViewerSorter getTableSorter() {
+ viewerSorter.reset();
+ return viewerSorter;
+ }
- public int getResultTableMode() {
- return MODE_LOWVISION;
- }
-
- public void doVisualize(){
- if(partRightLowVision!=null){
- partRightLowVision.doSimulate();
- }
- }
+ public int getResultTableMode() {
+ return MODE_LOWVISION;
+ }
+
+ public void doVisualize() {
+ if (partRightLowVision != null) {
+ partRightLowVision.doSimulate();
+ }
+ }
public void modelserviceChanged(MediatorEvent event) {
- // TODO Auto-generated method stub
-
+ partRightLowVision.setCurrentModelService(event.getModelServiceHolder()
+ .getModelService());
}
public void modelserviceInputChanged(MediatorEvent event) {
- // TODO Auto-generated method stub
-
+ partRightLowVision.setCurrentModelService(event.getModelServiceHolder()
+ .getModelService());
}
public void reportChanged(MediatorEvent event) {
// TODO Auto-generated method stub
-
+
}
public void reportGeneratorChanged(MediatorEvent event) {
// TODO Auto-generated method stub
-
+
}
}
