summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Drossel2008-08-13 11:32:50 (EDT)
committerCarsten Drossel2008-08-13 11:32:50 (EDT)
commit398f297da3aae43330c88ddf7707143ef30a9dc2 (patch)
tree899c485f2562d7ce037a6f1fbada20f6f4371821
parent4f88805f0e9e3c5659c44abaa334011239242946 (diff)
downloadorg.eclipse.riena-398f297da3aae43330c88ddf7707143ef30a9dc2.zip
org.eclipse.riena-398f297da3aae43330c88ddf7707143ef30a9dc2.tar.gz
org.eclipse.riena-398f297da3aae43330c88ddf7707143ef30a9dc2.tar.bz2
removed constructor setting label for module group (label is not displayed)
-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.java2
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/NavigateNodeBuilder.java2
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/NavigationSubApplicationNodeBuilder.java4
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/PlaygroundNodeBuilder.java2
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/SharedViewsNodeBuilder.java2
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/TableTextAndTreeNodeBuilder.java2
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/navigation/model/UIProcessNodeBuilder.java2
-rw-r--r--org.eclipse.riena.navigation/src/org/eclipse/riena/navigation/model/ModuleGroupNode.java13
-rw-r--r--org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/Application.java27
-rw-r--r--org.eclipse.riena.sample.app.client/src/org/eclipse/riena/sample/app/client/helloworld/applications/HelloWorldApplication.java8
11 files changed, 26 insertions, 40 deletions
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 f911ccb..d21a1da 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
@@ -175,7 +175,7 @@ public class NavigationSubModuleController extends SubModuleController {
*/
private IModuleGroupNode createModuleGroupNode() {
- IModuleGroupNode newModuleGroupNode = new ModuleGroupNode(null, "Added child Module Group to SubApplication"); //$NON-NLS-1$
+ IModuleGroupNode newModuleGroupNode = new ModuleGroupNode(null);
IModuleNode newModuleNode = createModuleNode();
newModuleGroupNode.addChild(newModuleNode);
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 eb17cf7..0633918 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
@@ -28,7 +28,7 @@ public class ComboAndListNodeBuilder implements INavigationNodeBuilder {
* org.eclipse.riena.navigation.NavigationArgument)
*/
public IModuleGroupNode buildNode(INavigationNodeId presentationId, NavigationArgument navigationArgument) {
- IModuleGroupNode node = new ModuleGroupNode(presentationId, "Combo&List"); //$NON-NLS-1$
+ IModuleGroupNode node = new ModuleGroupNode(presentationId);
IModuleNode module = new ModuleNode(null, "Combo&List"); //$NON-NLS-1$
node.addChild(module);
ISubModuleNode subModule = new SubModuleNode(new NavigationNodeId("org.eclipse.riena.example.combo"), "Combo"); //$NON-NLS-1$ //$NON-NLS-2$
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 11e0b14..5442518 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
@@ -32,7 +32,7 @@ public class NavigateNodeBuilder extends NavigationNodeBuilder {
* org.eclipse.riena.navigation.NavigationArgument)
*/
public INavigationNode<?> buildNode(INavigationNodeId nodeId, NavigationArgument navigationArgument) {
- IModuleGroupNode moduleGroup = new ModuleGroupNode(nodeId, "Navigate"); //$NON-NLS-1$
+ IModuleGroupNode moduleGroup = new ModuleGroupNode(nodeId);
moduleGroup.setPresentWithSingleModule(false);
IModuleNode module = new ModuleNode(null, "Navigate"); //$NON-NLS-1$
module.setIcon(createIconPath(IExampleIcons.ICON_GREEN_LED));
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 e5021bf..1d37c59 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
@@ -40,7 +40,7 @@ public class NavigationSubApplicationNodeBuilder extends NavigationNodeBuilder {
presentation.present(subApplication, "subapplication.1"); //$NON-NLS-1$
subApplication.setSelected(true);
- IModuleGroupNode moduleGroup = new ModuleGroupNode(null, "Group 1.1"); //$NON-NLS-1$
+ IModuleGroupNode moduleGroup = new ModuleGroupNode(null);
subApplication.addChild(moduleGroup);
IModuleNode module = new ModuleNode(null, "Module 1.1.1"); //$NON-NLS-1$
module.setIcon(createIconPath(IExampleIcons.ICON_APPLICATION));
@@ -67,7 +67,7 @@ public class NavigationSubApplicationNodeBuilder extends NavigationNodeBuilder {
subModule = new SubModuleNode(new NavigationNodeId("org.eclipse.riena.example.navigation"), "Navigation"); //$NON-NLS-1$ //$NON-NLS-2$
module.addChild(subModule);
- moduleGroup = new ModuleGroupNode(null, "Group 1.2"); //$NON-NLS-1$
+ moduleGroup = new ModuleGroupNode(null);
moduleGroup.setPresentWithSingleModule(false);
subApplication.addChild(moduleGroup);
module = new ModuleNode(null, "Module 1.2.1 (not closeable)"); //$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 100712a..eebf977 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
@@ -33,7 +33,7 @@ public class PlaygroundNodeBuilder implements INavigationNodeBuilder {
*/
public INavigationNode<?> buildNode(INavigationNodeId navigationNodeId, NavigationArgument navigationArgument) {
- IModuleGroupNode moduleGroup = new ModuleGroupNode(navigationNodeId, "Playground"); //$NON-NLS-1$
+ IModuleGroupNode moduleGroup = new ModuleGroupNode(navigationNodeId);
IModuleNode playgroundModule = new ModuleNode(null, "Playground"); //$NON-NLS-1$
moduleGroup.addChild(playgroundModule);
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 b7f1094..65b6bb7 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
@@ -29,7 +29,7 @@ public class SharedViewsNodeBuilder extends NavigationNodeBuilder {
* org.eclipse.riena.navigation.NavigationArgument)
*/
public INavigationNode<?> buildNode(INavigationNodeId navigationNodeId, NavigationArgument navigationArgument) {
- IModuleGroupNode moduleGroup = new ModuleGroupNode(navigationNodeId, "Shared View Demo"); //$NON-NLS-1$
+ IModuleGroupNode moduleGroup = new ModuleGroupNode(navigationNodeId);
IModuleNode sharedViewModule = new ModuleNode(null, "Shared View Demo"); //$NON-NLS-1$
sharedViewModule.setIcon(createIconPath(IExampleIcons.ICON_SAMPLE));
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 3635036..e138f60 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
@@ -28,7 +28,7 @@ public class TableTextAndTreeNodeBuilder implements INavigationNodeBuilder {
* org.eclipse.riena.navigation.NavigationArgument)
*/
public IModuleGroupNode buildNode(INavigationNodeId presentationId, NavigationArgument navigationArgument) {
- IModuleGroupNode node = new ModuleGroupNode(presentationId, "Table,Text&Tree"); //$NON-NLS-1$
+ IModuleGroupNode node = new ModuleGroupNode(presentationId);
IModuleNode module = new ModuleNode(null, "Table,Text&Tree"); //$NON-NLS-1$
node.addChild(module);
ISubModuleNode subModule = new SubModuleNode(new NavigationNodeId("org.eclipse.riena.example.table"), "Table"); //$NON-NLS-1$ //$NON-NLS-2$
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 d23b649..eddd000 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
@@ -32,7 +32,7 @@ public class UIProcessNodeBuilder implements INavigationNodeBuilder {
* org.eclipse.riena.navigation.NavigationArgument)
*/
public INavigationNode<?> buildNode(INavigationNodeId navigationNodeId, NavigationArgument navigationArgument) {
- IModuleGroupNode moduleGroup = new ModuleGroupNode(navigationNodeId, "UIProcess"); //$NON-NLS-1$
+ IModuleGroupNode moduleGroup = new ModuleGroupNode(navigationNodeId);
IModuleNode uiProcessModule = new ModuleNode(null, "UIProcess"); //$NON-NLS-1$
moduleGroup.addChild(uiProcessModule);
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 096b030..f7c0cd5 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
@@ -33,19 +33,6 @@ public class ModuleGroupNode extends NavigationNode<IModuleGroupNode, IModuleNod
super(nodeId);
}
- /**
- * Creates a ModuleGroupNode.
- *
- * @param nodeId
- * Identifies the node in the application model tree.
- * @param label
- * Label of the module group (not displayed). TODO remove this
- * constructor.
- */
- public ModuleGroupNode(INavigationNodeId nodeId, String label) {
- super(nodeId, label);
- }
-
public boolean isPresentWithSingleModule() {
return presentWithSingleModule;
}
diff --git a/org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/Application.java b/org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/Application.java
index 5d9a0e7..cb376ac 100644
--- a/org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/Application.java
+++ b/org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/Application.java
@@ -19,42 +19,39 @@ import org.osgi.framework.Bundle;
* This class controls all aspects of the application's execution
*/
public class Application extends SwtApplication {
-
+
@Override
protected IApplicationModel createModel() {
SwtPresentationManager presentation = SwtPresentationManagerAccessor.getManager();
-
+
ApplicationModel app = new ApplicationModel(null, "Riena Mail");
-
+
ISubApplicationNode subApp = new SubApplicationNode(null, "Your Mail");
app.addChild(subApp);
presentation.present(subApp, "rcp.mail.perspective");
-
- IModuleGroupNode groupMailboxes = new ModuleGroupNode(null, "Mailboxes");
+
+ IModuleGroupNode groupMailboxes = new ModuleGroupNode(null);
subApp.addChild(groupMailboxes);
-
+
IModuleNode moduleAccount1 = createModule("me@this.com", groupMailboxes);
presentation.registerView(View.ID, false);
createSubMobule("Inbox", moduleAccount1, View.ID);
createSubMobule("Drafts", moduleAccount1, View.ID);
createSubMobule("Sent", moduleAccount1, View.ID);
-
+
IModuleNode moduleAccount2 = createModule("other@aol.com", groupMailboxes);
createSubMobule("Inbox", moduleAccount2, View.ID);
-
- return app;
+
+ return app;
}
- private IModuleNode createModule(String caption,
- IModuleGroupNode parent) {
+ private IModuleNode createModule(String caption, IModuleGroupNode parent) {
IModuleNode module = new ModuleNode(null, caption);
parent.addChild(module);
return module;
}
-
- private ISubModuleNode createSubMobule(String caption,
- IModuleNode parent,
- String viewId) {
+
+ private ISubModuleNode createSubMobule(String caption, IModuleNode parent, String viewId) {
ISubModuleNode subModule = new SubModuleNode(null, caption);
parent.addChild(subModule);
SwtPresentationManagerAccessor.getManager().present(subModule, viewId);
diff --git a/org.eclipse.riena.sample.app.client/src/org/eclipse/riena/sample/app/client/helloworld/applications/HelloWorldApplication.java b/org.eclipse.riena.sample.app.client/src/org/eclipse/riena/sample/app/client/helloworld/applications/HelloWorldApplication.java
index 3cfc592..3aa9b88 100644
--- a/org.eclipse.riena.sample.app.client/src/org/eclipse/riena/sample/app/client/helloworld/applications/HelloWorldApplication.java
+++ b/org.eclipse.riena.sample.app.client/src/org/eclipse/riena/sample/app/client/helloworld/applications/HelloWorldApplication.java
@@ -54,7 +54,7 @@ public class HelloWorldApplication extends SwtApplication {
presentation.present(subApplication, "helloWorldSubApplication");
application.addChild(subApplication);
- IModuleGroupNode moduleGroup = new ModuleGroupNode(null, "ModuleGroup 1");
+ IModuleGroupNode moduleGroup = new ModuleGroupNode(null);
subApplication.addChild(moduleGroup);
// simple hello world
@@ -87,7 +87,7 @@ public class HelloWorldApplication extends SwtApplication {
ISubApplicationNode subApplication2 = new SubApplicationNode(null, "Simple Subapplication");
presentation.present(subApplication2, "org.eclipse.riena.sample.app.client.second");
application.addChild(subApplication2);
- moduleGroup = new ModuleGroupNode(null, "ModuleGroup 1");
+ moduleGroup = new ModuleGroupNode(null);
subApplication2.addChild(moduleGroup);
IModuleNode module = new ModuleNode(null, "Module 1");
moduleGroup.addChild(module);
@@ -103,7 +103,9 @@ public class HelloWorldApplication extends SwtApplication {
/*
* (non-Javadoc)
*
- * @see org.eclipse.riena.navigation.ui.swt.application.SwtApplication#getBundle()
+ * @see
+ * org.eclipse.riena.navigation.ui.swt.application.SwtApplication#getBundle
+ * ()
*/
@Override
protected Bundle getBundle() {