summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Drossel2008-08-06 08:41:50 (EDT)
committerCarsten Drossel2008-08-06 08:41:50 (EDT)
commit667b41c03a1d852717cc5505db925f02916c7e6d (patch)
treebb56a4fed6d1a88342b0b94836e692f0c9440ff8
parent512beb1abb50be30eeb041f7c63f0d3dd8edf1fe (diff)
downloadorg.eclipse.riena-667b41c03a1d852717cc5505db925f02916c7e6d.zip
org.eclipse.riena-667b41c03a1d852717cc5505db925f02916c7e6d.tar.gz
org.eclipse.riena-667b41c03a1d852717cc5505db925f02916c7e6d.tar.bz2
removed all createController() methods in example to use controller from extension point
-rw-r--r--org.eclipse.riena.example.client/plugin.xml16
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/CustomerDetailSubModuleController.java4
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/SharedViewDemoSubModuleController.java4
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/UIProcessDemoSubModuleController.java4
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/ValidationSubModuleController.java4
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/CustomerDetailSubModuleView.java11
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/SharedViewDemoSubModuleView.java6
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/UIProcessDemoSubModuleView.java (renamed from org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/UiProcessDemoSubModuleView.java)10
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/ValidationSubModuleView.java6
9 files changed, 27 insertions, 38 deletions
diff --git a/org.eclipse.riena.example.client/plugin.xml b/org.eclipse.riena.example.client/plugin.xml
index 68f910b..6886ca7 100644
--- a/org.eclipse.riena.example.client/plugin.xml
+++ b/org.eclipse.riena.example.client/plugin.xml
@@ -47,9 +47,9 @@
</view>
<view
allowMultiple="true"
- class="org.eclipse.riena.example.client.views.UiProcessDemoSubModuleView"
- id="org.eclipse.riena.example.client.views.UiProcessDemoSubModuleView"
- name="org.eclipse.riena.example.client.views.UiProcessDemoSubModuleView">
+ class="org.eclipse.riena.example.client.views.UIProcessDemoSubModuleView"
+ id="org.eclipse.riena.example.client.views.UIProcessDemoSubModuleView"
+ name="org.eclipse.riena.example.client.views.UIProcessDemoSubModuleView">
</view>
<view
allowMultiple="true"
@@ -377,7 +377,7 @@
point="org.eclipse.riena.navigation.WorkAreaPresentation">
<workAreaPresentation
presentationId="org.eclipse.riena.example.uiProcess"
- view="org.eclipse.riena.example.client.views.UiProcessDemoSubModuleView"
+ view="org.eclipse.riena.example.client.views.UIProcessDemoSubModuleView"
viewController="org.eclipse.riena.example.client.controllers.UIProcessDemoSubModuleController">
</workAreaPresentation>
</extension>
@@ -393,14 +393,6 @@
<extension
point="org.eclipse.riena.navigation.WorkAreaPresentation">
<workAreaPresentation
- presentationId="org.eclipse.riena.example.sharedView"
- view="org.eclipse.riena.example.client.views.UiProcessDemoSubModuleView"
- viewController="org.eclipse.riena.example.client.controllers.UIProcessDemoSubModuleController">
- </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">
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 3c9b476..6c63de7 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
@@ -22,6 +22,10 @@ import org.eclipse.riena.navigation.ui.controllers.SubModuleController;
*/
public class CustomerDetailSubModuleController extends SubModuleController {
+ public CustomerDetailSubModuleController() {
+ this(null);
+ }
+
public CustomerDetailSubModuleController(ISubModuleNode navigationNode) {
super(navigationNode);
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/SharedViewDemoSubModuleController.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/SharedViewDemoSubModuleController.java
index f299b3f..6c8be62 100644
--- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/SharedViewDemoSubModuleController.java
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/SharedViewDemoSubModuleController.java
@@ -7,6 +7,10 @@ import org.eclipse.riena.ui.ridgets.ITextFieldRidget;
public class SharedViewDemoSubModuleController extends SubModuleController {
+ public SharedViewDemoSubModuleController() {
+ this(null);
+ }
+
public SharedViewDemoSubModuleController(ISubModuleNode navigationNode) {
super(navigationNode);
bean = new TxtBean();
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/UIProcessDemoSubModuleController.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/UIProcessDemoSubModuleController.java
index e36aaf4..bb0b2f9 100644
--- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/UIProcessDemoSubModuleController.java
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/UIProcessDemoSubModuleController.java
@@ -27,6 +27,10 @@ public class UIProcessDemoSubModuleController extends SubModuleController {
private boolean registered;
+ public UIProcessDemoSubModuleController() {
+ this(null);
+ }
+
public UIProcessDemoSubModuleController(ISubModuleNode navigationNode) {
super(navigationNode);
}
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/ValidationSubModuleController.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/ValidationSubModuleController.java
index 559c078..d391481 100644
--- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/ValidationSubModuleController.java
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/ValidationSubModuleController.java
@@ -61,6 +61,10 @@ public class ValidationSubModuleController extends SubModuleController {
private ITextFieldRidget lblDate;
private ITextFieldRidget lblEmail;
+ public ValidationSubModuleController() {
+ this(null);
+ }
+
public ValidationSubModuleController(ISubModuleNode navigationNode) {
super(navigationNode);
}
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/CustomerDetailSubModuleView.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/CustomerDetailSubModuleView.java
index b2128d4..9cf7ce2 100644
--- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/CustomerDetailSubModuleView.java
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/CustomerDetailSubModuleView.java
@@ -4,7 +4,6 @@ import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.riena.example.client.controllers.CustomerDetailSubModuleController;
import org.eclipse.riena.internal.example.client.utils.UIControlsFactory;
-import org.eclipse.riena.navigation.ISubModuleNode;
import org.eclipse.riena.navigation.ui.swt.views.SubModuleNodeView;
import org.eclipse.riena.ui.swt.lnf.ILnfKeyConstants;
import org.eclipse.riena.ui.swt.lnf.LnfManager;
@@ -150,9 +149,9 @@ public class CustomerDetailSubModuleView extends SubModuleNodeView<CustomerDetai
/**
* @see org.eclipse.riena.navigation.ui.swt.views.SubModuleNodeView#createController(org.eclipse.riena.navigation.ISubModuleNode)
*/
- @Override
- protected CustomerDetailSubModuleController createController(ISubModuleNode subModuleNode) {
- return new CustomerDetailSubModuleController(subModuleNode);
- }
-
+ // @Override
+ // protected CustomerDetailSubModuleController
+ // createController(ISubModuleNode subModuleNode) {
+ // return new CustomerDetailSubModuleController(subModuleNode);
+ // }
}
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/SharedViewDemoSubModuleView.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/SharedViewDemoSubModuleView.java
index 6be8e2b..8fbb877 100644
--- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/SharedViewDemoSubModuleView.java
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/SharedViewDemoSubModuleView.java
@@ -3,7 +3,6 @@ package org.eclipse.riena.example.client.views;
import org.eclipse.riena.example.client.controllers.SharedViewDemoSubModuleController;
import org.eclipse.riena.internal.example.client.utils.UIControlsFactory;
import org.eclipse.riena.internal.ui.ridgets.swt.LabelRidget;
-import org.eclipse.riena.navigation.ISubModuleNode;
import org.eclipse.riena.navigation.ui.swt.views.SubModuleNodeView;
import org.eclipse.riena.ui.ridgets.ILabelRidget;
import org.eclipse.riena.ui.swt.lnf.ILnfKeyConstants;
@@ -75,9 +74,4 @@ public class SharedViewDemoSubModuleView extends SubModuleNodeView<SharedViewDem
// getController().afterBind();
}
- @Override
- protected SharedViewDemoSubModuleController createController(ISubModuleNode subModuleNode) {
- return new SharedViewDemoSubModuleController(subModuleNode);
- }
-
} \ No newline at end of file
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/UiProcessDemoSubModuleView.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/UIProcessDemoSubModuleView.java
index b8a2e02..36dbf76 100644
--- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/UiProcessDemoSubModuleView.java
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/UIProcessDemoSubModuleView.java
@@ -13,7 +13,6 @@ package org.eclipse.riena.example.client.views;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.riena.example.client.controllers.UIProcessDemoSubModuleController;
import org.eclipse.riena.internal.example.client.utils.UIControlsFactory;
-import org.eclipse.riena.navigation.ISubModuleNode;
import org.eclipse.riena.navigation.ui.swt.views.SubModuleNodeView;
import org.eclipse.riena.ui.swt.lnf.ILnfKeyConstants;
import org.eclipse.riena.ui.swt.lnf.LnfManager;
@@ -23,9 +22,9 @@ import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
-public class UiProcessDemoSubModuleView extends SubModuleNodeView<UIProcessDemoSubModuleController> {
+public class UIProcessDemoSubModuleView extends SubModuleNodeView<UIProcessDemoSubModuleController> {
- public final static String ID = UiProcessDemoSubModuleView.class.getName();
+ public final static String ID = UIProcessDemoSubModuleView.class.getName();
@Override
protected void basicCreatePartControl(Composite parent) {
@@ -53,9 +52,4 @@ public class UiProcessDemoSubModuleView extends SubModuleNodeView<UIProcessDemoS
return group;
}
- @Override
- protected UIProcessDemoSubModuleController createController(ISubModuleNode subModuleNode) {
- return new UIProcessDemoSubModuleController(getCurrentNode());
- }
-
}
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/ValidationSubModuleView.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/ValidationSubModuleView.java
index 0f140f2..3319414 100644
--- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/ValidationSubModuleView.java
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/views/ValidationSubModuleView.java
@@ -14,7 +14,6 @@ import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.riena.example.client.controllers.ValidationSubModuleController;
import org.eclipse.riena.internal.example.client.utils.UIControlsFactory;
-import org.eclipse.riena.navigation.ISubModuleNode;
import org.eclipse.riena.navigation.ui.swt.views.SubModuleNodeView;
import org.eclipse.riena.ui.swt.lnf.ILnfKeyConstants;
import org.eclipse.riena.ui.swt.lnf.LnfManager;
@@ -42,11 +41,6 @@ public class ValidationSubModuleView extends SubModuleNodeView<ValidationSubModu
fillFactory.applyTo(group1);
}
- @Override
- protected ValidationSubModuleController createController(ISubModuleNode subModuleNode) {
- return new ValidationSubModuleController(subModuleNode);
- }
-
// helping methods
// ////////////////