summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Drossel2008-08-22 10:52:28 (EDT)
committerCarsten Drossel2008-08-22 10:52:28 (EDT)
commited9f15c1092c6eb28b701ab76f0a2f88c0fe0500 (patch)
tree1bf03919f9ca5a053519caac4dae8317ed286ba7
parent66dbca096ac1de98cb12d867a5d14431a6c3fd1e (diff)
downloadorg.eclipse.riena-ed9f15c1092c6eb28b701ab76f0a2f88c0fe0500.zip
org.eclipse.riena-ed9f15c1092c6eb28b701ab76f0a2f88c0fe0500.tar.gz
org.eclipse.riena-ed9f15c1092c6eb28b701ab76f0a2f88c0fe0500.tar.bz2
removed interface for ID object - using the Pojo directly instead
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/application/SwtExampleApplication.java2
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/NavigateSubModuleController.java2
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/NavigationSubModuleController.java2
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/ComboAndListNodeBuilder.java8
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/NavigateNodeBuilder.java8
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/NavigationSubApplicationNodeBuilder.java8
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/PlaygroundNodeBuilder.java8
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/SharedViewsNodeBuilder.java8
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/TableTextAndTreeNodeBuilder.java8
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/UIProcessNodeBuilder.java8
-rw-r--r--org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/presentation/SwtPresentationManager.java4
-rw-r--r--org.eclipse.riena.navigation.ui/src/org/eclipse/riena/navigation/ui/application/AbstractApplication.java2
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationArgumentListener.java2
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationNode.java16
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationNodeBuilder.java6
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationNodeId.java39
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationProcessor.java6
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/IPresentationProviderService.java6
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/ITypeDefinition.java2
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/NavigationArgument.java10
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/NavigationNodeId.java (renamed from org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationNodeId.java)27
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/ApplicationModel.java6
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/ModuleGroupNode.java4
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/ModuleNode.java6
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationNode.java30
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationProcessor.java12
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/PresentationProviderService.java21
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/SubApplicationNode.java6
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/SubModuleNode.java6
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/NavigationProcessorTest.java1
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/TestSecondModuleGroupNodeBuilder.java7
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/TestSecondSubApplicationNodeBuilder.java6
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/presentation/SwtPresentationManagerTest.java2
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/views/SubModuleViewTest.java2
34 files changed, 132 insertions, 159 deletions
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/application/SwtExampleApplication.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/application/SwtExampleApplication.java
index e5ae607..37834ad 100644
--- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/application/SwtExampleApplication.java
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/application/SwtExampleApplication.java
@@ -14,8 +14,8 @@ import org.eclipse.riena.core.util.StringUtils;
import org.eclipse.riena.internal.example.client.Activator;
import org.eclipse.riena.navigation.IApplicationModel;
import org.eclipse.riena.navigation.ISubApplicationNode;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.model.ApplicationModel;
-import org.eclipse.riena.navigation.model.NavigationNodeId;
import org.eclipse.riena.navigation.model.SubApplicationNode;
import org.eclipse.riena.navigation.ui.controllers.ApplicationController;
import org.eclipse.riena.navigation.ui.swt.application.SwtApplication;
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/NavigateSubModuleController.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/NavigateSubModuleController.java
index 7d0c9ef..e0f319c 100644
--- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/NavigateSubModuleController.java
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/NavigateSubModuleController.java
@@ -11,7 +11,7 @@
package org.eclipse.riena.example.client.controllers;
import org.eclipse.riena.navigation.ISubModuleNode;
-import org.eclipse.riena.navigation.model.NavigationNodeId;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.ui.controllers.SubModuleController;
import org.eclipse.riena.ui.ridgets.IActionListener;
import org.eclipse.riena.ui.ridgets.IActionRidget;
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/NavigationSubModuleController.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/NavigationSubModuleController.java
index d21a1da..7c6a52c 100644
--- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/NavigationSubModuleController.java
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/NavigationSubModuleController.java
@@ -15,9 +15,9 @@ import org.eclipse.riena.navigation.IModuleNode;
import org.eclipse.riena.navigation.INavigationNode;
import org.eclipse.riena.navigation.ISubApplicationNode;
import org.eclipse.riena.navigation.ISubModuleNode;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.model.ModuleGroupNode;
import org.eclipse.riena.navigation.model.ModuleNode;
-import org.eclipse.riena.navigation.model.NavigationNodeId;
import org.eclipse.riena.navigation.model.SubModuleNode;
import org.eclipse.riena.navigation.ui.controllers.SubApplicationController;
import org.eclipse.riena.navigation.ui.controllers.SubModuleController;
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/ComboAndListNodeBuilder.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/ComboAndListNodeBuilder.java
index bf6aa45..61a5cf7 100644
--- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/ComboAndListNodeBuilder.java
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/ComboAndListNodeBuilder.java
@@ -13,12 +13,12 @@ package org.eclipse.riena.example.client.navigation.model;
import org.eclipse.riena.navigation.IModuleGroupNode;
import org.eclipse.riena.navigation.IModuleNode;
import org.eclipse.riena.navigation.INavigationNodeBuilder;
-import org.eclipse.riena.navigation.INavigationNodeId;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.ISubModuleNode;
import org.eclipse.riena.navigation.NavigationArgument;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.model.ModuleGroupNode;
import org.eclipse.riena.navigation.model.ModuleNode;
-import org.eclipse.riena.navigation.model.NavigationNodeId;
import org.eclipse.riena.navigation.model.SubModuleNode;
/**
@@ -27,10 +27,10 @@ import org.eclipse.riena.navigation.model.SubModuleNode;
public class ComboAndListNodeBuilder implements INavigationNodeBuilder {
/**
- * @see org.eclipse.riena.navigation.INavigationNodeBuilder#buildNode(org.eclipse.riena.navigation.INavigationNodeId,
+ * @see org.eclipse.riena.navigation.INavigationNodeBuilder#buildNode(org.eclipse.riena.navigation.NavigationNodeId,
* org.eclipse.riena.navigation.NavigationArgument)
*/
- public IModuleGroupNode buildNode(INavigationNodeId presentationId, NavigationArgument navigationArgument) {
+ public IModuleGroupNode buildNode(NavigationNodeId presentationId, NavigationArgument navigationArgument) {
IModuleGroupNode node = new ModuleGroupNode(presentationId);
IModuleNode module = new ModuleNode(null, "Combo&List"); //$NON-NLS-1$
node.addChild(module);
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/NavigateNodeBuilder.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/NavigateNodeBuilder.java
index 2b9baf5..2f1d6c5 100644
--- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/NavigateNodeBuilder.java
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/NavigateNodeBuilder.java
@@ -14,12 +14,12 @@ import org.eclipse.riena.example.client.application.ExampleIcons;
import org.eclipse.riena.navigation.IModuleGroupNode;
import org.eclipse.riena.navigation.IModuleNode;
import org.eclipse.riena.navigation.INavigationNode;
-import org.eclipse.riena.navigation.INavigationNodeId;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.ISubModuleNode;
import org.eclipse.riena.navigation.NavigationArgument;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.model.ModuleGroupNode;
import org.eclipse.riena.navigation.model.ModuleNode;
-import org.eclipse.riena.navigation.model.NavigationNodeId;
import org.eclipse.riena.navigation.model.SubModuleNode;
/**
@@ -28,10 +28,10 @@ import org.eclipse.riena.navigation.model.SubModuleNode;
public class NavigateNodeBuilder extends NavigationNodeBuilder {
/**
- * @see org.eclipse.riena.navigation.INavigationNodeBuilder#buildNode(org.eclipse.riena.navigation.INavigationNodeId,
+ * @see org.eclipse.riena.navigation.INavigationNodeBuilder#buildNode(org.eclipse.riena.navigation.NavigationNodeId,
* org.eclipse.riena.navigation.NavigationArgument)
*/
- public INavigationNode<?> buildNode(INavigationNodeId nodeId, NavigationArgument navigationArgument) {
+ public INavigationNode<?> buildNode(NavigationNodeId nodeId, NavigationArgument navigationArgument) {
IModuleGroupNode moduleGroup = new ModuleGroupNode(nodeId);
moduleGroup.setPresentWithSingleModule(false);
IModuleNode module = new ModuleNode(null, "Navigate"); //$NON-NLS-1$
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/NavigationSubApplicationNodeBuilder.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/NavigationSubApplicationNodeBuilder.java
index d46121f..4feda3f 100644
--- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/NavigationSubApplicationNodeBuilder.java
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/NavigationSubApplicationNodeBuilder.java
@@ -14,13 +14,13 @@ import org.eclipse.riena.example.client.application.ExampleIcons;
import org.eclipse.riena.navigation.IModuleGroupNode;
import org.eclipse.riena.navigation.IModuleNode;
import org.eclipse.riena.navigation.INavigationNode;
-import org.eclipse.riena.navigation.INavigationNodeId;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.ISubApplicationNode;
import org.eclipse.riena.navigation.ISubModuleNode;
import org.eclipse.riena.navigation.NavigationArgument;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.model.ModuleGroupNode;
import org.eclipse.riena.navigation.model.ModuleNode;
-import org.eclipse.riena.navigation.model.NavigationNodeId;
import org.eclipse.riena.navigation.model.SubApplicationNode;
import org.eclipse.riena.navigation.model.SubModuleNode;
import org.eclipse.riena.navigation.ui.swt.presentation.SwtPresentationManager;
@@ -29,10 +29,10 @@ import org.eclipse.riena.navigation.ui.swt.presentation.SwtPresentationManagerAc
public class NavigationSubApplicationNodeBuilder extends NavigationNodeBuilder {
/**
- * @see org.eclipse.riena.navigation.INavigationNodeBuilder#buildNode(org.eclipse.riena.navigation.INavigationNodeId,
+ * @see org.eclipse.riena.navigation.INavigationNodeBuilder#buildNode(org.eclipse.riena.navigation.NavigationNodeId,
* org.eclipse.riena.navigation.NavigationArgument)
*/
- public INavigationNode<?> buildNode(INavigationNodeId navigationNodeId, NavigationArgument navigationArgument) {
+ public INavigationNode<?> buildNode(NavigationNodeId navigationNodeId, NavigationArgument navigationArgument) {
SwtPresentationManager presentation = SwtPresentationManagerAccessor.getManager();
ISubApplicationNode subApplication = new SubApplicationNode(navigationNodeId, "Navigation"); //$NON-NLS-1$
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/PlaygroundNodeBuilder.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/PlaygroundNodeBuilder.java
index eebf977..51f33d6 100644
--- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/PlaygroundNodeBuilder.java
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/PlaygroundNodeBuilder.java
@@ -14,12 +14,12 @@ import org.eclipse.riena.navigation.IModuleGroupNode;
import org.eclipse.riena.navigation.IModuleNode;
import org.eclipse.riena.navigation.INavigationNode;
import org.eclipse.riena.navigation.INavigationNodeBuilder;
-import org.eclipse.riena.navigation.INavigationNodeId;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.ISubModuleNode;
import org.eclipse.riena.navigation.NavigationArgument;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.model.ModuleGroupNode;
import org.eclipse.riena.navigation.model.ModuleNode;
-import org.eclipse.riena.navigation.model.NavigationNodeId;
import org.eclipse.riena.navigation.model.SubModuleNode;
/**
@@ -28,10 +28,10 @@ import org.eclipse.riena.navigation.model.SubModuleNode;
public class PlaygroundNodeBuilder implements INavigationNodeBuilder {
/**
- * @see org.eclipse.riena.navigation.INavigationNodeBuilder#buildNode(org.eclipse.riena.navigation.INavigationNodeId,
+ * @see org.eclipse.riena.navigation.INavigationNodeBuilder#buildNode(org.eclipse.riena.navigation.NavigationNodeId,
* org.eclipse.riena.navigation.NavigationArgument)
*/
- public INavigationNode<?> buildNode(INavigationNodeId navigationNodeId, NavigationArgument navigationArgument) {
+ public INavigationNode<?> buildNode(NavigationNodeId navigationNodeId, NavigationArgument navigationArgument) {
IModuleGroupNode moduleGroup = new ModuleGroupNode(navigationNodeId);
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/SharedViewsNodeBuilder.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/SharedViewsNodeBuilder.java
index 0901f17..4f63cc9 100644
--- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/SharedViewsNodeBuilder.java
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/SharedViewsNodeBuilder.java
@@ -14,21 +14,21 @@ import org.eclipse.riena.example.client.application.ExampleIcons;
import org.eclipse.riena.navigation.IModuleGroupNode;
import org.eclipse.riena.navigation.IModuleNode;
import org.eclipse.riena.navigation.INavigationNode;
-import org.eclipse.riena.navigation.INavigationNodeId;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.ISubModuleNode;
import org.eclipse.riena.navigation.NavigationArgument;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.model.ModuleGroupNode;
import org.eclipse.riena.navigation.model.ModuleNode;
-import org.eclipse.riena.navigation.model.NavigationNodeId;
import org.eclipse.riena.navigation.model.SubModuleNode;
public class SharedViewsNodeBuilder extends NavigationNodeBuilder {
/**
- * @see org.eclipse.riena.navigation.INavigationNodeBuilder#buildNode(org.eclipse.riena.navigation.INavigationNodeId,
+ * @see org.eclipse.riena.navigation.INavigationNodeBuilder#buildNode(org.eclipse.riena.navigation.NavigationNodeId,
* org.eclipse.riena.navigation.NavigationArgument)
*/
- public INavigationNode<?> buildNode(INavigationNodeId navigationNodeId, NavigationArgument navigationArgument) {
+ public INavigationNode<?> buildNode(NavigationNodeId navigationNodeId, NavigationArgument navigationArgument) {
IModuleGroupNode moduleGroup = new ModuleGroupNode(navigationNodeId);
IModuleNode sharedViewModule = new ModuleNode(null, "Shared View Demo"); //$NON-NLS-1$
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/TableTextAndTreeNodeBuilder.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/TableTextAndTreeNodeBuilder.java
index e2d391d..dc50fdd 100644
--- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/TableTextAndTreeNodeBuilder.java
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/TableTextAndTreeNodeBuilder.java
@@ -13,12 +13,12 @@ package org.eclipse.riena.example.client.navigation.model;
import org.eclipse.riena.navigation.IModuleGroupNode;
import org.eclipse.riena.navigation.IModuleNode;
import org.eclipse.riena.navigation.INavigationNodeBuilder;
-import org.eclipse.riena.navigation.INavigationNodeId;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.ISubModuleNode;
import org.eclipse.riena.navigation.NavigationArgument;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.model.ModuleGroupNode;
import org.eclipse.riena.navigation.model.ModuleNode;
-import org.eclipse.riena.navigation.model.NavigationNodeId;
import org.eclipse.riena.navigation.model.SubModuleNode;
/**
@@ -27,10 +27,10 @@ import org.eclipse.riena.navigation.model.SubModuleNode;
public class TableTextAndTreeNodeBuilder implements INavigationNodeBuilder {
/**
- * @see org.eclipse.riena.navigation.INavigationNodeBuilder#buildNode(org.eclipse.riena.navigation.INavigationNodeId,
+ * @see org.eclipse.riena.navigation.INavigationNodeBuilder#buildNode(org.eclipse.riena.navigation.NavigationNodeId,
* org.eclipse.riena.navigation.NavigationArgument)
*/
- public IModuleGroupNode buildNode(INavigationNodeId presentationId, NavigationArgument navigationArgument) {
+ public IModuleGroupNode buildNode(NavigationNodeId presentationId, NavigationArgument navigationArgument) {
IModuleGroupNode node = new ModuleGroupNode(presentationId);
IModuleNode module = new ModuleNode(null, "Table,Text&Tree"); //$NON-NLS-1$
node.addChild(module);
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/UIProcessNodeBuilder.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/UIProcessNodeBuilder.java
index eddd000..009efdd 100644
--- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/UIProcessNodeBuilder.java
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/UIProcessNodeBuilder.java
@@ -14,12 +14,12 @@ import org.eclipse.riena.navigation.IModuleGroupNode;
import org.eclipse.riena.navigation.IModuleNode;
import org.eclipse.riena.navigation.INavigationNode;
import org.eclipse.riena.navigation.INavigationNodeBuilder;
-import org.eclipse.riena.navigation.INavigationNodeId;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.ISubModuleNode;
import org.eclipse.riena.navigation.NavigationArgument;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.model.ModuleGroupNode;
import org.eclipse.riena.navigation.model.ModuleNode;
-import org.eclipse.riena.navigation.model.NavigationNodeId;
import org.eclipse.riena.navigation.model.SubModuleNode;
/**
@@ -28,10 +28,10 @@ import org.eclipse.riena.navigation.model.SubModuleNode;
public class UIProcessNodeBuilder implements INavigationNodeBuilder {
/**
- * @see org.eclipse.riena.navigation.INavigationNodeBuilder#buildNode(org.eclipse.riena.navigation.INavigationNodeId,
+ * @see org.eclipse.riena.navigation.INavigationNodeBuilder#buildNode(org.eclipse.riena.navigation.NavigationNodeId,
* org.eclipse.riena.navigation.NavigationArgument)
*/
- public INavigationNode<?> buildNode(INavigationNodeId navigationNodeId, NavigationArgument navigationArgument) {
+ public INavigationNode<?> buildNode(NavigationNodeId navigationNodeId, NavigationArgument navigationArgument) {
IModuleGroupNode moduleGroup = new ModuleGroupNode(navigationNodeId);
IModuleNode uiProcessModule = new ModuleNode(null, "UIProcess"); //$NON-NLS-1$
diff --git a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/presentation/SwtPresentationManager.java b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/presentation/SwtPresentationManager.java
index 9e1848b..2cb5e84 100644
--- a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/presentation/SwtPresentationManager.java
+++ b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/presentation/SwtPresentationManager.java
@@ -16,7 +16,7 @@ import java.util.Map;
import org.eclipse.riena.navigation.IAction;
import org.eclipse.riena.navigation.INavigationNode;
-import org.eclipse.riena.navigation.INavigationNodeId;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.IPresentationProviderService;
import org.eclipse.riena.navigation.ISubModuleNode;
import org.eclipse.riena.navigation.listener.SubModuleNodeListener;
@@ -51,7 +51,7 @@ public class SwtPresentationManager {
public SwtViewId getSwtViewId(INavigationNode<?> pNode) {
SwtViewId swtViewId = views.get(pNode);
if (swtViewId == null) {
- INavigationNodeId nodeId = pNode.getNodeId();
+ NavigationNodeId nodeId = pNode.getNodeId();
if (nodeId != null) {
String viewId = (String) getPresentationProviderService().provideView(nodeId);
boolean isViewShared = getPresentationProviderService().isViewShared(nodeId);
diff --git a/org.eclipse.riena.navigation.ui/src/org/eclipse/riena/navigation/ui/application/AbstractApplication.java b/org.eclipse.riena.navigation.ui/src/org/eclipse/riena/navigation/ui/application/AbstractApplication.java
index 6df7bc7..c6dc55b 100644
--- a/org.eclipse.riena.navigation.ui/src/org/eclipse/riena/navigation/ui/application/AbstractApplication.java
+++ b/org.eclipse.riena.navigation.ui/src/org/eclipse/riena/navigation/ui/application/AbstractApplication.java
@@ -21,8 +21,8 @@ import org.eclipse.riena.navigation.IModuleNode;
import org.eclipse.riena.navigation.INavigationNode;
import org.eclipse.riena.navigation.ISubApplicationNode;
import org.eclipse.riena.navigation.ISubModuleNode;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.model.ApplicationModel;
-import org.eclipse.riena.navigation.model.NavigationNodeId;
import org.eclipse.riena.ui.core.resource.IIconManager;
import org.eclipse.riena.ui.core.uiprocess.ProgressProviderBridge;
diff --git a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationArgumentListener.java b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationArgumentListener.java
index 98a76a5..043f421 100644
--- a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationArgumentListener.java
+++ b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationArgumentListener.java
@@ -14,7 +14,7 @@ package org.eclipse.riena.navigation;
* Listener for changes performed on an argument Object that was passed to
* another node as part of an NavigationArgument during a navigation.
*
- * @see INavigationNode#navigate(INavigationNodeId, NavigationArgument)
+ * @see INavigationNode#navigate(NavigationNodeId, NavigationArgument)
*/
public interface INavigationArgumentListener {
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 80b5b0d..d66988a 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
@@ -203,7 +203,7 @@ public interface INavigationNode<C extends INavigationNode<?>> extends ITypecast
* @return A node with the specified ID that is either this node or a
* descendant of this node or null if no such node exists
*/
- INavigationNode<?> findNode(INavigationNodeId nodeId);
+ INavigationNode<?> findNode(NavigationNodeId nodeId);
/**
* @param pChild
@@ -395,10 +395,10 @@ public interface INavigationNode<C extends INavigationNode<?>> extends ITypecast
* targets in the application model tree and to associated sub module nodes
* with their views.
*
- * @see #navigate(INavigationNodeId)
+ * @see #navigate(NavigationNodeId)
* @return The ID that identifies the node in the application model tree.
*/
- INavigationNodeId getNodeId();
+ NavigationNodeId getNodeId();
/**
* Sets the ID of the node.
@@ -406,7 +406,7 @@ public interface INavigationNode<C extends INavigationNode<?>> extends ITypecast
* @param nodeId
* The ID that identifies the node in the application model tree.
*/
- void setNodeId(INavigationNodeId nodeId);
+ void setNodeId(NavigationNodeId nodeId);
/**
* Creates the specified navigation node and adds it to the application
@@ -418,7 +418,7 @@ public interface INavigationNode<C extends INavigationNode<?>> extends ITypecast
* does not exist.
* @see INavigationNodeBuilder
*/
- void create(INavigationNodeId targetId);
+ void create(NavigationNodeId targetId);
/**
* Creates the specified navigation node (if it does not already exist) and
@@ -430,7 +430,7 @@ public interface INavigationNode<C extends INavigationNode<?>> extends ITypecast
* it does not exist.
* @see INavigationNodeBuilder
*/
- void navigate(INavigationNodeId targetId);
+ void navigate(NavigationNodeId targetId);
/**
* Creates the specified navigation node (if it does not already exist) and
@@ -445,13 +445,13 @@ public interface INavigationNode<C extends INavigationNode<?>> extends ITypecast
* Contains information passed on to the target node and/or used
* during its creation.
*/
- void navigate(INavigationNodeId targetId, NavigationArgument argument);
+ void navigate(NavigationNodeId targetId, NavigationArgument argument);
/**
* Undoes the last navigate to this node i.e. activates the last source node
* of a navigate(..)-call that lead to the activation of this node.
*
- * @see #navigate(INavigationNodeId)
+ * @see #navigate(NavigationNodeId)
*/
void navigateBack();
diff --git a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationNodeBuilder.java b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationNodeBuilder.java
index 8317a7d..983212d 100644
--- a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationNodeBuilder.java
+++ b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationNodeBuilder.java
@@ -23,8 +23,8 @@ public interface INavigationNodeBuilder {
* navigate(..) or create(..)-calls and a new node will be build every time.
* This may be desired though.
*
- * @see INavigationNode#navigate(INavigationNodeId)
- * @see INavigationNode#create(INavigationNodeId)
+ * @see INavigationNode#navigate(NavigationNodeId)
+ * @see INavigationNode#create(NavigationNodeId)
* @param nodeId
* The ID of the node to create.
* @param navigationArgument
@@ -32,6 +32,6 @@ public interface INavigationNodeBuilder {
* be null.
* @return The created node or subtree root node.
*/
- INavigationNode<?> buildNode(INavigationNodeId nodeId, NavigationArgument navigationArgument);
+ INavigationNode<?> buildNode(NavigationNodeId nodeId, NavigationArgument navigationArgument);
}
diff --git a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationNodeId.java b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationNodeId.java
deleted file mode 100644
index aa28575..0000000
--- a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/INavigationNodeId.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 compeople AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * compeople AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.riena.navigation;
-
-/**
- * An ID that identifies a node in the application model tree. The ID is used to
- * find navigate targets and to associated sub module nodes with their views.
- */
-public interface INavigationNodeId {
-
- /**
- * Returns the type of a node. Nodes of the same type are created using the
- * same node builder. Sub module nodes of the same type use the same type of
- * view. Both is configured using extensions (NavigationNodeType and
- * SubModuleType). This typeId is used to find the right extension.
- *
- * @see INavigationNodeBuilder
- * @return The type ID of a navigation node.
- */
- String getTypeId();
-
- /**
- * The optional instance ID is used to differentiate between nodes of the
- * same type. E.g. two nodes representing employees that have the same type
- * ID could use the social security number as instance ID.
- *
- * @return The instance ID of a navigation node.
- */
- String getInstanceId();
-
-}
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 df4c1eb..6b2158e 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
@@ -56,7 +56,7 @@ public interface INavigationProcessor extends INavigationHistory, INavigationHis
* used to create the target node if it does not exist.
* @see INavigationNodeBuilder
*/
- void create(INavigationNode<?> sourceNode, INavigationNodeId targetId);
+ void create(INavigationNode<?> sourceNode, NavigationNodeId targetId);
/**
* Navigates from the specified source node to the specified target node.
@@ -73,14 +73,14 @@ public interface INavigationProcessor extends INavigationHistory, INavigationHis
* during its creation.
* @see INavigationNodeBuilder
*/
- void navigate(INavigationNode<?> sourceNode, INavigationNodeId targetId, NavigationArgument argument);
+ void navigate(INavigationNode<?> sourceNode, NavigationNodeId targetId, NavigationArgument argument);
/**
* Undoes the last navigate to the specified target node i.e. activates the
* last source node of a navigate(..)-call that lead to the activation of
* the target node.
*
- * @see #navigate(INavigationNode, INavigationNodeId, NavigationArgument)
+ * @see #navigate(INavigationNode, NavigationNodeId, NavigationArgument)
*/
void navigateBack(INavigationNode<?> targetNode);
}
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 dd02f55..cf1ff40 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
@@ -28,7 +28,7 @@ public interface IPresentationProviderService {
* @param argument
* @return
*/
- INavigationNode<?> provideNode(INavigationNode<?> sourceNode, INavigationNodeId targetId,
+ INavigationNode<?> provideNode(INavigationNode<?> sourceNode, NavigationNodeId targetId,
NavigationArgument argument);
/**
@@ -37,7 +37,7 @@ public interface IPresentationProviderService {
*
* @return the view id of the matching view
*/
- Object provideView(INavigationNodeId targetId);
+ Object provideView(NavigationNodeId targetId);
/**
* Returns the view controller for the work area presentation for the given
@@ -49,7 +49,7 @@ public interface IPresentationProviderService {
* Return true if the specified view should be a shared view, false
* otherwise
*/
- boolean isViewShared(INavigationNodeId targetId);
+ boolean isViewShared(NavigationNodeId targetId);
/**
* Perform some housekeeping
diff --git a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/ITypeDefinition.java b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/ITypeDefinition.java
index c61131a..02037cb 100644
--- a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/ITypeDefinition.java
+++ b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/ITypeDefinition.java
@@ -17,7 +17,7 @@ public interface ITypeDefinition {
/**
* @return The type part of the ID of a navigation node.
- * @see INavigationNodeId#getTypeId()
+ * @see NavigationNodeId#getTypeId()
*/
String getTypeId();
}
diff --git a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/NavigationArgument.java b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/NavigationArgument.java
index 2916f27..a7d5036 100644
--- a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/NavigationArgument.java
+++ b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/NavigationArgument.java
@@ -14,11 +14,11 @@ package org.eclipse.riena.navigation;
* Contains additional information for a navigation passed on to the target node
* and/or used during its creation.
*
- * @see INavigationNode#navigate(INavigationNodeId, NavigationArgument)
+ * @see INavigationNode#navigate(NavigationNodeId, NavigationArgument)
*/
public class NavigationArgument {
private Object argument;
- private INavigationNodeId parentNodeId;
+ private NavigationNodeId parentNodeId;
private INavigationArgumentListener argumentListener;
/**
@@ -27,7 +27,7 @@ public class NavigationArgument {
* @param parentNodeId
*/
public NavigationArgument(Object argument, INavigationArgumentListener argumentListener,
- INavigationNodeId parentNodeId) {
+ NavigationNodeId parentNodeId) {
super();
this.argument = argument;
this.argumentListener = argumentListener;
@@ -70,7 +70,7 @@ public class NavigationArgument {
/**
* @return the parentNodeId
*/
- public INavigationNodeId getParentNodeId() {
+ public NavigationNodeId getParentNodeId() {
return parentNodeId;
}
@@ -78,7 +78,7 @@ public class NavigationArgument {
* @param parentNodeId
* the parentNodeId to set
*/
- public void setParentNode(INavigationNodeId parentNodeId) {
+ public void setParentNode(NavigationNodeId parentNodeId) {
this.parentNodeId = parentNodeId;
}
diff --git a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationNodeId.java b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/NavigationNodeId.java
index fd8e901..827dbeb 100644
--- a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/NavigationNodeId.java
+++ b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/NavigationNodeId.java
@@ -8,14 +8,13 @@
* Contributors:
* compeople AG - initial API and implementation
*******************************************************************************/
-package org.eclipse.riena.navigation.model;
-
-import org.eclipse.riena.navigation.INavigationNodeId;
+package org.eclipse.riena.navigation;
/**
- * ID of a navigation node.
+ * An ID that identifies a node in the application model tree. The ID is used to
+ * find navigate targets and to associated sub module nodes with their views.
*/
-public class NavigationNodeId implements INavigationNodeId {
+public class NavigationNodeId {
private String instanceId;
private String typeId;
@@ -31,14 +30,24 @@ public class NavigationNodeId implements INavigationNodeId {
}
/**
- * @see org.eclipse.riena.navigation.INavigationNodeId#getTypeId()
+ * Returns the type of a node. Nodes of the same type are created using the
+ * same node builder. Sub module nodes of the same type use the same type of
+ * view. Both is configured using extensions (NavigationNodeType and
+ * SubModuleType). This typeId is used to find the right extension.
+ *
+ * @see INavigationNodeBuilder
+ * @return The type ID of a navigation node.
*/
public String getTypeId() {
return typeId;
}
/**
- * @see org.eclipse.riena.navigation.INavigationNodeId#getInstanceId()
+ * The optional instance ID is used to differentiate between nodes of the
+ * same type. E.g. two nodes representing employees that have the same type
+ * ID could use the social security number as instance ID.
+ *
+ * @return The instance ID of a navigation node.
*/
public String getInstanceId() {
return instanceId;
@@ -49,11 +58,11 @@ public class NavigationNodeId implements INavigationNodeId {
*/
@Override
public boolean equals(Object other) {
- if (other instanceof INavigationNodeId) {
+ if (other instanceof NavigationNodeId) {
if (!getClass().equals(other.getClass())) {
return false;
}
- INavigationNodeId otherId = (INavigationNodeId) other;
+ NavigationNodeId otherId = (NavigationNodeId) other;
return equals(typeId, otherId.getTypeId()) && equals(instanceId, otherId.getInstanceId());
}
return false;
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 baa2761..8c8023c 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,7 @@ package org.eclipse.riena.navigation.model;
import org.eclipse.riena.navigation.IApplicationModel;
import org.eclipse.riena.navigation.INavigationHistoryListener;
-import org.eclipse.riena.navigation.INavigationNodeId;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.ISubApplicationNode;
import org.eclipse.riena.navigation.listener.IApplicationModelListener;
@@ -38,7 +38,7 @@ public class ApplicationModel extends NavigationNode<IApplicationModel, ISubAppl
* @param nodeId
* Identifies the node in the application model tree.
*/
- public ApplicationModel(INavigationNodeId nodeId) {
+ public ApplicationModel(NavigationNodeId nodeId) {
super(nodeId);
initializeNavigationProcessor();
}
@@ -52,7 +52,7 @@ public class ApplicationModel extends NavigationNode<IApplicationModel, ISubAppl
* @param label
* Label of the application displayed in the title bar.
*/
- public ApplicationModel(INavigationNodeId nodeId, String label) {
+ public ApplicationModel(NavigationNodeId nodeId, String label) {
this(nodeId);
setLabel(label);
}
diff --git a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/ModuleGroupNode.java b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/ModuleGroupNode.java
index 98faa81..b03da5c 100644
--- a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/ModuleGroupNode.java
+++ b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/ModuleGroupNode.java
@@ -12,7 +12,7 @@ package org.eclipse.riena.navigation.model;
import org.eclipse.riena.navigation.IModuleGroupNode;
import org.eclipse.riena.navigation.IModuleNode;
-import org.eclipse.riena.navigation.INavigationNodeId;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.listener.IModuleGroupNodeListener;
/**
@@ -36,7 +36,7 @@ public class ModuleGroupNode extends NavigationNode<IModuleGroupNode, IModuleNod
* @param nodeId
* Identifies the node in the application model tree.
*/
- public ModuleGroupNode(INavigationNodeId nodeId) {
+ public ModuleGroupNode(NavigationNodeId nodeId) {
super(nodeId);
}
diff --git a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/ModuleNode.java b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/ModuleNode.java
index 407ec91..0caef06 100644
--- a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/ModuleNode.java
+++ b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/ModuleNode.java
@@ -12,7 +12,7 @@ package org.eclipse.riena.navigation.model;
import org.eclipse.riena.navigation.IModuleNode;
import org.eclipse.riena.navigation.INavigationNode;
-import org.eclipse.riena.navigation.INavigationNodeId;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.ISubModuleNode;
import org.eclipse.riena.navigation.listener.IModuleNodeListener;
@@ -39,7 +39,7 @@ public class ModuleNode extends NavigationNode<IModuleNode, ISubModuleNode, IMod
* @param nodeId
* Identifies the node in the application model tree.
*/
- public ModuleNode(INavigationNodeId nodeId) {
+ public ModuleNode(NavigationNodeId nodeId) {
super(nodeId);
initialize();
}
@@ -52,7 +52,7 @@ public class ModuleNode extends NavigationNode<IModuleNode, ISubModuleNode, IMod
* @param label
* Label of the module displayed in the modules title bar.
*/
- public ModuleNode(INavigationNodeId nodeId, String label) {
+ public ModuleNode(NavigationNodeId nodeId, String label) {
super(nodeId, label);
initialize();
}
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 3e85ad6..c928fca 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
@@ -26,7 +26,7 @@ import org.eclipse.riena.core.marker.Markable;
import org.eclipse.riena.navigation.IAction;
import org.eclipse.riena.navigation.INavigationContext;
import org.eclipse.riena.navigation.INavigationNode;
-import org.eclipse.riena.navigation.INavigationNodeId;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.INavigationProcessor;
import org.eclipse.riena.navigation.IPresentation;
import org.eclipse.riena.navigation.ISimpleNavigationNodeListener;
@@ -49,7 +49,7 @@ import org.eclipse.riena.navigation.listener.INavigationNodeListenerable;
public abstract class NavigationNode<S extends INavigationNode<C>, C extends INavigationNode<?>, L extends INavigationNodeListener<S, C>>
extends TypecastingObject implements INavigationNode<C>, INavigationNodeListenerable<S, C, L> {
- private INavigationNodeId nodeId;
+ private NavigationNodeId nodeId;
private State state;
private String label;
private String icon;
@@ -71,7 +71,7 @@ public abstract class NavigationNode<S extends INavigationNode<C>, C extends INa
* @param nodeId
* Identifies the node in the application model tree.
*/
- public NavigationNode(INavigationNodeId nodeId) {
+ public NavigationNode(NavigationNodeId nodeId) {
super();
setNodeId(nodeId);
@@ -94,7 +94,7 @@ public abstract class NavigationNode<S extends INavigationNode<C>, C extends INa
* @param pLabel
* The label of the node.
*/
- public NavigationNode(INavigationNodeId nodeId, String pLabel) {
+ public NavigationNode(NavigationNodeId nodeId, String pLabel) {
this(nodeId);
setLabel(pLabel);
}
@@ -283,9 +283,9 @@ public abstract class NavigationNode<S extends INavigationNode<C>, C extends INa
}
/**
- * @see org.eclipse.riena.navigation.INavigationNode#findNode(org.eclipse.riena.navigation.INavigationNodeId)
+ * @see org.eclipse.riena.navigation.INavigationNode#findNode(org.eclipse.riena.navigation.NavigationNodeId)
*/
- public INavigationNode<?> findNode(INavigationNodeId nodeId) {
+ public INavigationNode<?> findNode(NavigationNodeId nodeId) {
if (getNodeId() != null && getNodeId().equals(nodeId)) {
return this;
}
@@ -897,24 +897,24 @@ public abstract class NavigationNode<S extends INavigationNode<C>, C extends INa
}
/**
- * @see org.eclipse.riena.navigation.INavigationNode#create(org.eclipse.riena.navigation.INavigationNodeId)
+ * @see org.eclipse.riena.navigation.INavigationNode#create(org.eclipse.riena.navigation.NavigationNodeId)
*/
- public void create(INavigationNodeId targetId) {
+ public void create(NavigationNodeId targetId) {
getNavigationProcessor().create(this, targetId);
}
/**
- * @see org.eclipse.riena.navigation.INavigationNode#navigate(org.eclipse.riena.navigation.INavigationNodeId)
+ * @see org.eclipse.riena.navigation.INavigationNode#navigate(org.eclipse.riena.navigation.NavigationNodeId)
*/
- public void navigate(INavigationNodeId targetId) {
+ public void navigate(NavigationNodeId targetId) {
navigate(targetId, null);
}
/**
- * @see org.eclipse.riena.navigation.INavigationNode#navigate(org.eclipse.riena.navigation.INavigationNodeId,
+ * @see org.eclipse.riena.navigation.INavigationNode#navigate(org.eclipse.riena.navigation.NavigationNodeId,
* org.eclipse.riena.navigation.NavigationArgument)
*/
- public void navigate(INavigationNodeId targetId, NavigationArgument argument) {
+ public void navigate(NavigationNodeId targetId, NavigationArgument argument) {
getNavigationProcessor().navigate(this, targetId, argument);
}
@@ -948,14 +948,14 @@ public abstract class NavigationNode<S extends INavigationNode<C>, C extends INa
/**
* @see org.eclipse.riena.navigation.INavigationNode#getNodeId()
*/
- public INavigationNodeId getNodeId() {
+ public NavigationNodeId getNodeId() {
return nodeId;
}
/**
- * @see org.eclipse.riena.navigation.INavigationNode#setNodeId(org.eclipse.riena.navigation.INavigationNodeId)
+ * @see org.eclipse.riena.navigation.INavigationNode#setNodeId(org.eclipse.riena.navigation.NavigationNodeId)
*/
- public void setNodeId(INavigationNodeId nodeId) {
+ public void setNodeId(NavigationNodeId nodeId) {
this.nodeId = nodeId;
}
}
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 7a1c407..11afac6 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
@@ -27,7 +27,7 @@ import org.eclipse.riena.navigation.INavigationHistory;
import org.eclipse.riena.navigation.INavigationHistoryEvent;
import org.eclipse.riena.navigation.INavigationHistoryListener;
import org.eclipse.riena.navigation.INavigationNode;
-import org.eclipse.riena.navigation.INavigationNodeId;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.INavigationProcessor;
import org.eclipse.riena.navigation.IPresentationProviderService;
import org.eclipse.riena.navigation.ISubModuleNode;
@@ -176,18 +176,18 @@ public class NavigationProcessor implements INavigationProcessor, INavigationHis
/**
* @see org.eclipse.riena.navigation.INavigationProcessor#create(org.eclipse.riena.navigation.INavigationNode,
- * org.eclipse.riena.navigation.INavigationNodeId)
+ * org.eclipse.riena.navigation.NavigationNodeId)
*/
- public void create(INavigationNode<?> sourceNode, INavigationNodeId targetId) {
+ public void create(INavigationNode<?> sourceNode, NavigationNodeId targetId) {
provideNode(sourceNode, targetId, null);
}
/**
* @see org.eclipse.riena.navigation.INavigationProcessor#navigate(org.eclipse.riena.navigation.INavigationNode,
- * org.eclipse.riena.navigation.INavigationNodeId,
+ * org.eclipse.riena.navigation.NavigationNodeId,
* org.eclipse.riena.navigation.NavigationArgument)
*/
- public void navigate(INavigationNode<?> sourceNode, INavigationNodeId targetId, NavigationArgument argument) {
+ public void navigate(INavigationNode<?> sourceNode, NavigationNodeId targetId, NavigationArgument argument) {
INavigationNode<?> targetNode = provideNode(sourceNode, targetId, argument);
if (targetNode == null) {
return;
@@ -202,7 +202,7 @@ public class NavigationProcessor implements INavigationProcessor, INavigationHis
}
}
- private INavigationNode<?> provideNode(INavigationNode<?> sourceNode, INavigationNodeId targetId,
+ private INavigationNode<?> provideNode(INavigationNode<?> sourceNode, NavigationNodeId targetId,
NavigationArgument argument) {
INavigationNode<?> targetNode = getPresentationDefinitionService().provideNode(sourceNode, targetId, argument);
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 da6df76..2c47abe 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
@@ -16,12 +16,13 @@ import org.eclipse.riena.internal.navigation.Activator;
import org.eclipse.riena.navigation.ApplicationModelFailure;
import org.eclipse.riena.navigation.INavigationNode;
import org.eclipse.riena.navigation.INavigationNodeBuilder;
-import org.eclipse.riena.navigation.INavigationNodeId;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.INavigationNodeTypeDefiniton;
import org.eclipse.riena.navigation.IPresentationProviderService;
import org.eclipse.riena.navigation.ISubModuleTypeDefinition;
import org.eclipse.riena.navigation.ITypeDefinition;
import org.eclipse.riena.navigation.NavigationArgument;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.ui.ridgets.viewcontroller.IController;
import org.osgi.service.log.LogService;
@@ -61,11 +62,11 @@ public class PresentationProviderService implements IPresentationProviderService
/**
* @see org.eclipse.riena.navigation.IPresentationProviderService#createNode(org.eclipse.riena.navigation.INavigationNode,
- * org.eclipse.riena.navigation.INavigationNodeId,
+ * org.eclipse.riena.navigation.NavigationNodeId,
* org.eclipse.riena.navigation.NavigationArgument)
*/
@SuppressWarnings("unchecked")
- public INavigationNode<?> provideNode(INavigationNode<?> sourceNode, INavigationNodeId targetId,
+ public INavigationNode<?> provideNode(INavigationNode<?> sourceNode, NavigationNodeId targetId,
NavigationArgument argument) {
INavigationNode<?> targetNode = findNode(getRootNode(sourceNode), targetId);
if (targetNode == null) {
@@ -98,7 +99,7 @@ public class PresentationProviderService implements IPresentationProviderService
* @param targetId
* @param builder
*/
- protected void prepareNavigationNodeBuilder(INavigationNodeId targetId, INavigationNodeBuilder builder) {
+ protected void prepareNavigationNodeBuilder(NavigationNodeId targetId, INavigationNodeBuilder builder) {
// can be overwritten by subclass
}
@@ -124,7 +125,7 @@ public class PresentationProviderService implements IPresentationProviderService
* @param targetId
* @return
*/
- protected INavigationNodeTypeDefiniton getNavigationNodeTypeDefinition(INavigationNodeId targetId) {
+ protected INavigationNodeTypeDefiniton getNavigationNodeTypeDefinition(NavigationNodeId targetId) {
if (targetNN == null || targetNN.getData().length == 0 || targetId == null) {
return null;
} else {
@@ -155,7 +156,7 @@ public class PresentationProviderService implements IPresentationProviderService
* @param targetId
* @return
*/
- protected INavigationNode<?> findNode(INavigationNode<?> node, INavigationNodeId targetId) {
+ protected INavigationNode<?> findNode(INavigationNode<?> node, NavigationNodeId targetId) {
if (targetId == null) {
return null;
}
@@ -176,9 +177,9 @@ public class PresentationProviderService implements IPresentationProviderService
* view id for the given navigationNodeId
*
* @see org.eclipse.riena.navigation.IPresentationProviderService#createView
- * (org.eclipse.riena.navigation.INavigationNodeId)
+ * (org.eclipse.riena.navigation.NavigationNodeId)
*/
- public Object provideView(INavigationNodeId nodeId) {
+ public Object provideView(NavigationNodeId nodeId) {
ISubModuleTypeDefinition subModuleTypeDefinition = getSubModuleTypeDefinition(nodeId.getTypeId());
if (subModuleTypeDefinition != null) {
return subModuleTypeDefinition.getView();
@@ -202,9 +203,9 @@ public class PresentationProviderService implements IPresentationProviderService
}
/**
- * @see org.eclipse.riena.navigation.IPresentationProviderService#isViewShared(org.eclipse.riena.navigation.INavigationNodeId)
+ * @see org.eclipse.riena.navigation.IPresentationProviderService#isViewShared(org.eclipse.riena.navigation.NavigationNodeId)
*/
- public boolean isViewShared(INavigationNodeId targetId) {
+ public boolean isViewShared(NavigationNodeId targetId) {
ISubModuleTypeDefinition subModuleTypeDefinition = getSubModuleTypeDefinition(targetId.getTypeId());
if (subModuleTypeDefinition != null) {
diff --git a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/SubApplicationNode.java b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/SubApplicationNode.java
index 0fc856b..a6f3f35 100644
--- a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/SubApplicationNode.java
+++ b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/SubApplicationNode.java
@@ -11,7 +11,7 @@
package org.eclipse.riena.navigation.model;
import org.eclipse.riena.navigation.IModuleGroupNode;
-import org.eclipse.riena.navigation.INavigationNodeId;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.ISubApplicationNode;
import org.eclipse.riena.navigation.listener.ISubApplicationNodeListener;
@@ -36,7 +36,7 @@ public class SubApplicationNode extends
* @param nodeId
* Identifies the node in the application model tree.
*/
- public SubApplicationNode(INavigationNodeId nodeId) {
+ public SubApplicationNode(NavigationNodeId nodeId) {
super(nodeId);
}
@@ -49,7 +49,7 @@ public class SubApplicationNode extends
* Label of the sub application displayed on the sub applications
* tab.
*/
- public SubApplicationNode(INavigationNodeId nodeId, String label) {
+ public SubApplicationNode(NavigationNodeId nodeId, String label) {
super(nodeId, label);
}
diff --git a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/SubModuleNode.java b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/SubModuleNode.java
index f55d910..3b85f33 100644
--- a/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/SubModuleNode.java
+++ b/org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/SubModuleNode.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.riena.navigation.model;
-import org.eclipse.riena.navigation.INavigationNodeId;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.ISubModuleNode;
import org.eclipse.riena.navigation.listener.ISubModuleNodeListener;
@@ -33,7 +33,7 @@ public class SubModuleNode extends NavigationNode<ISubModuleNode, ISubModuleNode
* @param nodeId
* Identifies the node in the application model tree.
*/
- public SubModuleNode(INavigationNodeId nodeId) {
+ public SubModuleNode(NavigationNodeId nodeId) {
super(nodeId);
}
@@ -46,7 +46,7 @@ public class SubModuleNode extends NavigationNode<ISubModuleNode, ISubModuleNode
* Label of the sub module displayed in the sub modules title
* bar.
*/
- public SubModuleNode(INavigationNodeId nodeId, String label) {
+ public SubModuleNode(NavigationNodeId nodeId, String label) {
super(nodeId, label);
}
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/NavigationProcessorTest.java b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/NavigationProcessorTest.java
index 6f1e5fc..3d529af 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/NavigationProcessorTest.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/NavigationProcessorTest.java
@@ -15,6 +15,7 @@ import org.eclipse.riena.navigation.IModuleGroupNode;
import org.eclipse.riena.navigation.IModuleNode;
import org.eclipse.riena.navigation.ISubApplicationNode;
import org.eclipse.riena.navigation.ISubModuleNode;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.tests.RienaTestCase;
/**
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/TestSecondModuleGroupNodeBuilder.java b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/TestSecondModuleGroupNodeBuilder.java
index b865dc5..305389e 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/TestSecondModuleGroupNodeBuilder.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/TestSecondModuleGroupNodeBuilder.java
@@ -14,17 +14,18 @@ import org.eclipse.riena.navigation.IModuleGroupNode;
import org.eclipse.riena.navigation.IModuleNode;
import org.eclipse.riena.navigation.INavigationNode;
import org.eclipse.riena.navigation.INavigationNodeBuilder;
-import org.eclipse.riena.navigation.INavigationNodeId;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.ISubModuleNode;
import org.eclipse.riena.navigation.NavigationArgument;
+import org.eclipse.riena.navigation.NavigationNodeId;
public class TestSecondModuleGroupNodeBuilder implements INavigationNodeBuilder {
/**
- * @see org.eclipse.riena.navigation.INavigationNodeBuilder#buildNode(org.eclipse.riena.navigation.INavigationNodeId,
+ * @see org.eclipse.riena.navigation.INavigationNodeBuilder#buildNode(org.eclipse.riena.navigation.NavigationNodeId,
* org.eclipse.riena.navigation.NavigationArgument)
*/
- public INavigationNode<?> buildNode(INavigationNodeId navigationNodeId, NavigationArgument navigationArgument) {
+ public INavigationNode<?> buildNode(NavigationNodeId navigationNodeId, NavigationArgument navigationArgument) {
IModuleGroupNode moduleGroup = new ModuleGroupNode(navigationNodeId);
IModuleNode module = new ModuleNode(
new NavigationNodeId("org.eclipse.riena.navigation.model.test.secondModule"));
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/TestSecondSubApplicationNodeBuilder.java b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/TestSecondSubApplicationNodeBuilder.java
index c87245a..9379afc 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/TestSecondSubApplicationNodeBuilder.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/TestSecondSubApplicationNodeBuilder.java
@@ -12,17 +12,17 @@ package org.eclipse.riena.navigation.model;
import org.eclipse.riena.navigation.INavigationNode;
import org.eclipse.riena.navigation.INavigationNodeBuilder;
-import org.eclipse.riena.navigation.INavigationNodeId;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.ISubApplicationNode;
import org.eclipse.riena.navigation.NavigationArgument;
public class TestSecondSubApplicationNodeBuilder implements INavigationNodeBuilder {
/**
- * @see org.eclipse.riena.navigation.INavigationNodeBuilder#buildNode(org.eclipse.riena.navigation.INavigationNodeId,
+ * @see org.eclipse.riena.navigation.INavigationNodeBuilder#buildNode(org.eclipse.riena.navigation.NavigationNodeId,
* org.eclipse.riena.navigation.NavigationArgument)
*/
- public INavigationNode<?> buildNode(INavigationNodeId navigationNodeId, NavigationArgument navigationArgument) {
+ public INavigationNode<?> buildNode(NavigationNodeId navigationNodeId, NavigationArgument navigationArgument) {
ISubApplicationNode subApplication = new SubApplicationNode(navigationNodeId);
return subApplication;
}
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/presentation/SwtPresentationManagerTest.java b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/presentation/SwtPresentationManagerTest.java
index 1976f55..4ee3ef5 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/presentation/SwtPresentationManagerTest.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/presentation/SwtPresentationManagerTest.java
@@ -11,7 +11,7 @@
package org.eclipse.riena.navigation.ui.swt.presentation;
import org.eclipse.riena.navigation.ISubModuleNode;
-import org.eclipse.riena.navigation.model.NavigationNodeId;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.model.SubModuleNode;
import org.eclipse.riena.tests.RienaTestCase;
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/views/SubModuleViewTest.java b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/views/SubModuleViewTest.java
index 4ef7c65..69b9dc2 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/views/SubModuleViewTest.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/views/SubModuleViewTest.java
@@ -13,9 +13,9 @@ package org.eclipse.riena.navigation.ui.swt.views;
import org.eclipse.riena.navigation.IApplicationModel;
import org.eclipse.riena.navigation.IModuleNode;
import org.eclipse.riena.navigation.ISubModuleNode;
+import org.eclipse.riena.navigation.NavigationNodeId;
import org.eclipse.riena.navigation.model.ApplicationModel;
import org.eclipse.riena.navigation.model.ModuleNode;
-import org.eclipse.riena.navigation.model.NavigationNodeId;
import org.eclipse.riena.navigation.model.SubModuleNode;
import org.eclipse.riena.navigation.ui.controllers.ModuleController;
import org.eclipse.riena.navigation.ui.controllers.SubModuleController;