summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Drossel2008-07-09 10:39:25 (EDT)
committerCarsten Drossel2008-07-09 10:39:25 (EDT)
commit7658cd297274202353847c0e242072923b3edfaf (patch)
treeee9e2b450cdf622b1536c1d350f16fe62390fe2a
parenta8f222d6abfaea533faedf2fd215ed040b4cd052 (diff)
downloadorg.eclipse.riena-7658cd297274202353847c0e242072923b3edfaf.zip
org.eclipse.riena-7658cd297274202353847c0e242072923b3edfaf.tar.gz
org.eclipse.riena-7658cd297274202353847c0e242072923b3edfaf.tar.bz2
changed NavigationNodePresentationFactory so that it can be instantiated: necessary because it will have to be replaced for SCP applications (with business context)
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/ApplicationModel.java8
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationNodePresentationFactory.java14
2 files changed, 11 insertions, 11 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 6751c17..93d9b6f 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,6 +12,7 @@ package org.eclipse.riena.navigation.model;
import org.eclipse.riena.navigation.IApplicationModel;
import org.eclipse.riena.navigation.IApplicationModelListener;
+import org.eclipse.riena.navigation.INavigationNodePresentationFactory;
import org.eclipse.riena.navigation.ISubApplication;
/**
@@ -54,6 +55,11 @@ public class ApplicationModel extends NavigationNode<IApplicationModel, ISubAppl
}
protected void initializeNavigationProcessor() {
- setNavigationProcessor(new NavigationProcessor(new NavigationNodePresentationFactory()));
+ setNavigationProcessor(new NavigationProcessor(createNavigationNodePresentationFactory()));
}
+
+ protected INavigationNodePresentationFactory createNavigationNodePresentationFactory() {
+ return new NavigationNodePresentationFactory();
+ }
+
}
diff --git a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationNodePresentationFactory.java b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationNodePresentationFactory.java
index 28c9eda..dab730e 100644
--- a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationNodePresentationFactory.java
+++ b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationNodePresentationFactory.java
@@ -26,12 +26,12 @@ public class NavigationNodePresentationFactory implements INavigationNodePresent
private static NavigationNodePresentationFactory factory;
- /**
- * Constructor (private). no instance allowed.
- */
- private NavigationNodePresentationFactory() {
+ public NavigationNodePresentationFactory() {
// TODO Auto-generated constructor stub
+ // instantiation of this class would populate instance variable
+ // <code>webBrowserCreator</code>
+
NodePresentationData target = new NodePresentationData();
Inject.extension(ID).useType(INavigationNodePresentationDefiniton.class).into(target).andStart(
Activator.getDefault().getContext());
@@ -54,12 +54,6 @@ public class NavigationNodePresentationFactory implements INavigationNodePresent
}
private INavigationNodePresentationDefiniton getPresentationDefinition(String targetId) {
- if (factory == null) {
- // side effect:
- // instantiation of this class would populate instance variable
- // <code>webBrowserCreator</code>
- factory = new NavigationNodePresentationFactory();
- }
// TODO EAC: get presentation definition for targetId