summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Drossel2008-07-21 07:29:29 (EDT)
committerCarsten Drossel2008-07-21 07:29:29 (EDT)
commit5442fb4c91c5049bbd26e7f91fc476e5b0aa1ee5 (patch)
tree8ab169d9a29a1047e177cccbcd710c8cde196da1
parentd309209c0b24a27765ce18dc8bfb10b35fef7bee (diff)
downloadorg.eclipse.riena-5442fb4c91c5049bbd26e7f91fc476e5b0aa1ee5.zip
org.eclipse.riena-5442fb4c91c5049bbd26e7f91fc476e5b0aa1ee5.tar.gz
org.eclipse.riena-5442fb4c91c5049bbd26e7f91fc476e5b0aa1ee5.tar.bz2
not storing the presentation provider service to allow to override it
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/ApplicationModel.java10
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationProcessor.java16
2 files changed, 9 insertions, 17 deletions
diff --git a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/ApplicationModel.java b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/ApplicationModel.java
index fbd951b..74a9f5f 100644
--- a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/ApplicationModel.java
+++ b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/ApplicationModel.java
@@ -12,7 +12,6 @@ package org.eclipse.riena.navigation.model;
import org.eclipse.riena.navigation.IApplicationModel;
import org.eclipse.riena.navigation.IApplicationModelListener;
-import org.eclipse.riena.navigation.IPresentationProviderService;
import org.eclipse.riena.navigation.ISubApplication;
/**
@@ -55,14 +54,7 @@ public class ApplicationModel extends NavigationNode<IApplicationModel, ISubAppl
}
protected void initializeNavigationProcessor() {
- setNavigationProcessor(new NavigationProcessor(getPresentationDefinitionService()));
- }
-
- protected IPresentationProviderService getPresentationDefinitionService() {
-
- // TODO: handling if no service found ???
- return PresentationProviderServiceAccessor.current().getPresentationProviderService();
-
+ setNavigationProcessor(new NavigationProcessor());
}
}
diff --git a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationProcessor.java b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationProcessor.java
index d19098d..fbb6a7a 100644
--- a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationProcessor.java
+++ b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationProcessor.java
@@ -29,13 +29,6 @@ import org.eclipse.riena.navigation.ISubModuleNode;
*/
public class NavigationProcessor implements INavigationProcessor {
- private IPresentationProviderService presentationProviderService;
-
- public NavigationProcessor(IPresentationProviderService service) {
- super();
- this.presentationProviderService = service;
- }
-
/**
* @see org.eclipse.riena.navigation.INavigationProcessor#activate(org.eclipse.riena.navigation.INavigationNode)
*/
@@ -116,11 +109,18 @@ public class NavigationProcessor implements INavigationProcessor {
*/
public void navigate(INavigationNode<?> sourceNode, INavigationNodeId targetId) {
- INavigationNode<?> targetNode = presentationProviderService.createNode(sourceNode, targetId);
+ INavigationNode<?> targetNode = getPresentationDefinitionService().createNode(sourceNode, targetId);
targetNode.activate();
}
+ protected IPresentationProviderService getPresentationDefinitionService() {
+
+ // TODO: handling if no service found ???
+ return PresentationProviderServiceAccessor.current().getPresentationProviderService();
+
+ }
+
/**
* Ascertain the correct node to dispose. If e.g. the first module in a
* Group is disposed, than the whole group has to be disposed