summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Drossel2008-08-06 04:29:42 (EDT)
committerCarsten Drossel2008-08-06 04:29:42 (EDT)
commit724a6d36d6381fb897d4588649d3c55b8c0f5b79 (patch)
tree6884e6d566e9a0f8d5b3702b2d46dd6dc3a9b983
parent5f2ab32c79c6ae3465457366ed06a4c427cbe466 (diff)
downloadorg.eclipse.riena-724a6d36d6381fb897d4588649d3c55b8c0f5b79.zip
org.eclipse.riena-724a6d36d6381fb897d4588649d3c55b8c0f5b79.tar.gz
org.eclipse.riena-724a6d36d6381fb897d4588649d3c55b8c0f5b79.tar.bz2
fixed broken examples after changes to use view controller from extension point
-rw-r--r--org.eclipse.riena.example.client/plugin.xml11
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/application/SwtExampleApplication.java4
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/CustomerDetailSubModuleController.java6
3 files changed, 15 insertions, 6 deletions
diff --git a/org.eclipse.riena.example.client/plugin.xml b/org.eclipse.riena.example.client/plugin.xml
index e7978a4..91f900a 100644
--- a/org.eclipse.riena.example.client/plugin.xml
+++ b/org.eclipse.riena.example.client/plugin.xml
@@ -344,11 +344,20 @@
<extension
point="org.eclipse.riena.navigation.WorkAreaPresentation">
<workAreaPresentation
+ presentationId="org.eclipse.riena.example.customerDetail"
+ view="org.eclipse.riena.example.client.views.CustomerDetailSubModuleView"
+ viewController="org.eclipse.riena.example.client.controllers.CustomerDetailSubModuleController">
+ </workAreaPresentation>
+ </extension>
+ <extension
+ point="org.eclipse.riena.navigation.WorkAreaPresentation">
+ <workAreaPresentation
presentationId="org.eclipse.riena.example.navigation"
view="org.eclipse.riena.example.client.views.NavigationSubModuleView"
viewController="org.eclipse.riena.example.client.controllers.NavigationSubModuleController">
</workAreaPresentation>
- </extension> <extension
+ </extension>
+ <extension
point="org.eclipse.riena.navigation.WorkAreaPresentation">
<workAreaPresentation
presentationId="org.eclipse.riena.example.buttons"
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 1f556c3..4459885 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
@@ -80,7 +80,7 @@ public class SwtExampleApplication extends SwtApplication {
SubApplicationNode subApplication = null;
IModuleGroupNode moduleGroup = null;
IModuleNode module = null;
- ISubModuleNode subModule = null;
+ SubModuleNode subModule = null;
SwtPresentationManager presentation = SwtPresentationManagerAccessor.getManager();
@@ -119,8 +119,8 @@ public class SwtExampleApplication extends SwtApplication {
module.addChild(subModule);
/* NEW */
subModule = new SubModuleNode("Navigation"); //$NON-NLS-1$
+ subModule.setPresentationId(new NavigationNodeId("org.eclipse.riena.example.navigation")); //$NON-NLS-1$
presentation.registerView(NavigationSubModuleView.ID, false);
- presentation.present(subModule, NavigationSubModuleView.ID);
module.addChild(subModule);
moduleGroup = new ModuleGroupNode("Group 1.2"); //$NON-NLS-1$
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/CustomerDetailSubModuleController.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/CustomerDetailSubModuleController.java
index 9ba1cae..3c9b476 100644
--- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/CustomerDetailSubModuleController.java
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/CustomerDetailSubModuleController.java
@@ -13,9 +13,9 @@ package org.eclipse.riena.example.client.controllers;
import org.eclipse.riena.example.client.application.IExampleIcons;
import org.eclipse.riena.internal.example.client.Activator;
import org.eclipse.riena.navigation.ISubModuleNode;
+import org.eclipse.riena.navigation.model.NavigationNodeId;
import org.eclipse.riena.navigation.model.SubModuleNode;
import org.eclipse.riena.navigation.ui.controllers.SubModuleController;
-import org.eclipse.riena.navigation.ui.swt.presentation.SwtPresentationManagerAccessor;
/**
* Controller for the customer detail view
@@ -33,11 +33,11 @@ public class CustomerDetailSubModuleController extends SubModuleController {
@Override
public void afterBind() {
super.afterBind();
- ISubModuleNode newNode = new SubModuleNode("dynamically added node"); //$NON-NLS-1$
+ SubModuleNode newNode = new SubModuleNode("dynamically added node"); //$NON-NLS-1$
// TODO do it like swtExampleApplication ..
String iconPath = Activator.PLUGIN_ID.concat(":").concat(IExampleIcons.ICON_FILE); //$NON-NLS-1$
newNode.setIcon(iconPath);
- SwtPresentationManagerAccessor.getManager().present(newNode, "customerDetailView"); //$NON-NLS-1$
+ newNode.setPresentationId(new NavigationNodeId("org.eclipse.riena.example.customerDetail")); //$NON-NLS-1$
getNavigationNode().addChild(newNode);
}
}