summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Drossel2008-07-22 11:22:47 (EDT)
committerCarsten Drossel2008-07-22 11:22:47 (EDT)
commit5e227692e1849f7f89062528d7192f82b7627ea9 (patch)
tree1ec1f9f2e572161fd3bcd5ac28f8deeb8728f67a
parent1dc9208739b65e30f30cd0027b2767da812b836a (diff)
downloadorg.eclipse.riena-5e227692e1849f7f89062528d7192f82b7627ea9.zip
org.eclipse.riena-5e227692e1849f7f89062528d7192f82b7627ea9.tar.gz
org.eclipse.riena-5e227692e1849f7f89062528d7192f82b7627ea9.tar.bz2
added additional optional arguments to navigate method - passed on to the node builder and others involved in creating and initializing the navigation target
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/Open2NavigationNodeBuilder.java2
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/Open3NavigationNodeBuilder.java2
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationNode.java2
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationNodeProvider.java2
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationProcessor.java2
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/IPresentationProviderService.java2
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationNode.java7
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationProcessor.java11
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/PresentationProviderService.java13
9 files changed, 21 insertions, 22 deletions
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/Open2NavigationNodeBuilder.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/Open2NavigationNodeBuilder.java
index 06b5458..58f6fdd 100644
--- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/Open2NavigationNodeBuilder.java
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/Open2NavigationNodeBuilder.java
@@ -26,7 +26,7 @@ public class Open2NavigationNodeBuilder implements INavigationNodeProvider {
/**
* @see org.eclipse.riena.navigation.INavigationNodeProvider#buildNode()
*/
- public IModuleGroupNode buildNode(INavigationNodeId presentationId) {
+ public IModuleGroupNode buildNode(INavigationNodeId presentationId, Object... arguments) {
ModuleGroupNode node = new ModuleGroupNode("New Group");
node.setPresentationId(presentationId);
IModuleNode module = new ModuleNode("New Module");
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/Open3NavigationNodeBuilder.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/Open3NavigationNodeBuilder.java
index b0732af..e8e2726 100644
--- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/Open3NavigationNodeBuilder.java
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/Open3NavigationNodeBuilder.java
@@ -27,7 +27,7 @@ public class Open3NavigationNodeBuilder implements INavigationNodeProvider {
/**
* @see org.eclipse.riena.navigation.INavigationNodeProvider#buildNode()
*/
- public IModuleGroupNode buildNode(INavigationNodeId presentationId) {
+ public IModuleGroupNode buildNode(INavigationNodeId presentationId, Object... arguments) {
ModuleGroupNode node = new ModuleGroupNode("New Group");
node.setPresentationId(presentationId);
IModuleNode module = new ModuleNode("New Module");
diff --git a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationNode.java b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationNode.java
index 2de2f95..ce97bd2 100644
--- a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationNode.java
+++ b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationNode.java
@@ -383,6 +383,6 @@ public interface INavigationNode<C extends INavigationNode<?>> extends ITypecast
* Refers to an extension point describing the target node.
* @see INavigationNodeProvider
*/
- void navigate(INavigationNodeId targetId);
+ void navigate(INavigationNodeId targetId, Object... arguments);
}
diff --git a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationNodeProvider.java b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationNodeProvider.java
index c59ca3f..6b47e32 100644
--- a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationNodeProvider.java
+++ b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationNodeProvider.java
@@ -18,6 +18,6 @@ package org.eclipse.riena.navigation;
*/
public interface INavigationNodeProvider {
- INavigationNode<?> buildNode(INavigationNodeId INavigationNodeId);
+ INavigationNode<?> buildNode(INavigationNodeId INavigationNodeId, Object... arguments);
}
diff --git a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationProcessor.java b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationProcessor.java
index 203f56b..4ff3bac 100644
--- a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationProcessor.java
+++ b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationProcessor.java
@@ -25,6 +25,6 @@ public interface INavigationProcessor {
void create(INavigationNode<?> sourceNode, INavigationNodeId targetId);
- void navigate(INavigationNode<?> sourceNode, INavigationNodeId targetId);
+ void navigate(INavigationNode<?> sourceNode, INavigationNodeId targetId, Object... arguments);
}
diff --git a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/IPresentationProviderService.java b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/IPresentationProviderService.java
index dc4df35..2c219ec 100644
--- a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/IPresentationProviderService.java
+++ b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/IPresentationProviderService.java
@@ -30,7 +30,7 @@ public interface IPresentationProviderService {
* @return
*/
- INavigationNode<?> createNode(INavigationNode<?> sourceNode, INavigationNodeId targetId);
+ INavigationNode<?> createNode(INavigationNode<?> sourceNode, INavigationNodeId targetId, Object... arguments);
/**
* Return an instance of a view
diff --git a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationNode.java b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationNode.java
index 9cacd38..de13725 100644
--- a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationNode.java
+++ b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationNode.java
@@ -785,10 +785,11 @@ public abstract class NavigationNode<S extends INavigationNode<C>, C extends INa
}
/**
- * @see org.eclipse.riena.navigation.INavigationNode#navigate(org.eclipse.riena.navigation.INavigationNodeId)
+ * @see org.eclipse.riena.navigation.INavigationNode#navigate(org.eclipse.riena.navigation.INavigationNodeId,
+ * java.lang.Object[])
*/
- public void navigate(INavigationNodeId targetId) {
- getNavigationProcessor().navigate(this, targetId);
+ public void navigate(INavigationNodeId targetId, Object... arguments) {
+ getNavigationProcessor().navigate(this, targetId, arguments);
}
/**
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 901b8b7..5d26df3 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
@@ -113,17 +113,18 @@ public class NavigationProcessor implements INavigationProcessor {
/**
* @see org.eclipse.riena.navigation.INavigationProcessor#navigate(org.eclipse.riena.navigation.INavigationNode,
- * org.eclipse.riena.navigation.INavigationNodeId)
+ * org.eclipse.riena.navigation.INavigationNodeId, java.lang.Object[])
*/
- public void navigate(INavigationNode<?> sourceNode, INavigationNodeId targetId) {
+ public void navigate(INavigationNode<?> sourceNode, INavigationNodeId targetId, Object... arguments) {
- INavigationNode<?> targetNode = createTarget(sourceNode, targetId);
+ INavigationNode<?> targetNode = createTarget(sourceNode, targetId, arguments);
targetNode.activate();
}
- private INavigationNode<?> createTarget(INavigationNode<?> sourceNode, INavigationNodeId targetId) {
- INavigationNode<?> targetNode = getPresentationDefinitionService().createNode(sourceNode, targetId);
+ private INavigationNode<?> createTarget(INavigationNode<?> sourceNode, INavigationNodeId targetId,
+ Object... arguments) {
+ INavigationNode<?> targetNode = getPresentationDefinitionService().createNode(sourceNode, targetId, arguments);
return targetNode;
}
diff --git a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/PresentationProviderService.java b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/PresentationProviderService.java
index 3a6d03e..97d5989 100644
--- a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/PresentationProviderService.java
+++ b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/PresentationProviderService.java
@@ -56,21 +56,18 @@ public class PresentationProviderService implements IPresentationProviderService
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.riena.navigation.IPresentationProviderService#createNode
- * (org.eclipse.riena.navigation.INavigationNode,
- * org.eclipse.riena.navigation.INavigationNodeId)
+ /**
+ * @see org.eclipse.riena.navigation.IPresentationProviderService#createNode(org.eclipse.riena.navigation.INavigationNode,
+ * org.eclipse.riena.navigation.INavigationNodeId, java.lang.Object[])
*/
- public INavigationNode<?> createNode(INavigationNode<?> sourceNode, INavigationNodeId targetId) {
+ public INavigationNode<?> createNode(INavigationNode<?> sourceNode, INavigationNodeId targetId, Object... arguments) {
INavigationNode<?> targetNode = findNode(getRootNode(sourceNode), targetId);
if (targetNode == null) {
INavigationNodePresentationDefiniton presentationDefinition = getPresentationDefinitionNN(targetId);
if (presentationDefinition != null) {
INavigationNodeProvider builder = presentationDefinition.createNodeProvider();
- targetNode = builder.buildNode(targetId);
+ targetNode = builder.buildNode(targetId, arguments);
INavigationNode parentNode = createNode(sourceNode, new NavigationNodeId(presentationDefinition
.getParentPresentationId()));