summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Kriese2011-06-17 07:27:20 (EDT)
committerSteffen Kriese2011-06-17 07:27:20 (EDT)
commit6f919a1464864b30f5cc0ce22fc412294da227e6 (patch)
treeb36447ec3e423e265a8c3aa305ec06c6c0159b52
parentab321a525ca1c892c9f122ef62c9be6bd3486cfe (diff)
downloadorg.eclipse.riena-6f919a1464864b30f5cc0ce22fc412294da227e6.zip
org.eclipse.riena-6f919a1464864b30f5cc0ce22fc412294da227e6.tar.gz
org.eclipse.riena-6f919a1464864b30f5cc0ce22fc412294da227e6.tar.bz2
added missing NodeId in NavigationNode + Code Cleaning
-rw-r--r--org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/Application.java10
-rw-r--r--org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/MessagePopupHandler.java3
-rw-r--r--org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/NodeFactory.java2
-rw-r--r--org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/OpenViewHandler.java9
4 files changed, 11 insertions, 13 deletions
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 68b770c..08ef996 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
@@ -33,7 +33,7 @@ public class Application extends SwtApplication {
final ApplicationNode app = new ApplicationNode("Riena Mail"); //$NON-NLS-1$
- final ISubApplicationNode subApp = new SubApplicationNode("Your Mail"); //$NON-NLS-1$
+ final ISubApplicationNode subApp = new SubApplicationNode(new NavigationNodeId("yourmail"), "Your Mail"); //$NON-NLS-1$ //$NON-NLS-2$
app.addChild(subApp);
WorkareaManager.getInstance().registerDefinition(subApp, "rcp.mail.perspective"); //$NON-NLS-1$
@@ -43,13 +43,13 @@ public class Application extends SwtApplication {
final IModuleNode moduleAccount1 = NodeFactory.createModule(
new NavigationNodeId("account1"), "me@this.com", groupMailboxes); //$NON-NLS-1$ //$NON-NLS-2$
moduleAccount1.setClosable(false);
- NodeFactory.createSubMobule(new NavigationNodeId("inbox"), "Inbox", moduleAccount1, View.ID); //$NON-NLS-1$ //$NON-NLS-2$
- NodeFactory.createSubMobule(new NavigationNodeId("drafts"), "Drafts", moduleAccount1, View.ID); //$NON-NLS-1$ //$NON-NLS-2$
- NodeFactory.createSubMobule(new NavigationNodeId("sent"), "Sent", moduleAccount1, View.ID); //$NON-NLS-1$ //$NON-NLS-2$
+ NodeFactory.createSubModule(new NavigationNodeId("inbox"), "Inbox", moduleAccount1, View.ID); //$NON-NLS-1$ //$NON-NLS-2$
+ NodeFactory.createSubModule(new NavigationNodeId("drafts"), "Drafts", moduleAccount1, View.ID); //$NON-NLS-1$ //$NON-NLS-2$
+ NodeFactory.createSubModule(new NavigationNodeId("sent"), "Sent", moduleAccount1, View.ID); //$NON-NLS-1$ //$NON-NLS-2$
final IModuleNode moduleAccount2 = NodeFactory.createModule(
new NavigationNodeId("account2"), "other@aol.com", groupMailboxes); //$NON-NLS-1$ //$NON-NLS-2$
- NodeFactory.createSubMobule(new NavigationNodeId("inbox2"), "Inbox", moduleAccount2, View.ID); //$NON-NLS-1$ //$NON-NLS-2$
+ NodeFactory.createSubModule(new NavigationNodeId("inbox2"), "Inbox", moduleAccount2, View.ID); //$NON-NLS-1$ //$NON-NLS-2$
return app;
}
diff --git a/org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/MessagePopupHandler.java b/org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/MessagePopupHandler.java
index ceada66..769cb0f 100644
--- a/org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/MessagePopupHandler.java
+++ b/org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/MessagePopupHandler.java
@@ -12,12 +12,11 @@ package org.eclipse.riena.sample.app.client.mail;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.IHandler;
import org.eclipse.swt.widgets.Display;
import org.eclipse.riena.ui.swt.RienaMessageDialog;
-public class MessagePopupHandler extends AbstractHandler implements IHandler {
+public class MessagePopupHandler extends AbstractHandler {
public Object execute(final ExecutionEvent event) {
RienaMessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Open", "Open Message Dialog!"); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/NodeFactory.java b/org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/NodeFactory.java
index c6efdcc..bc3eee4 100644
--- a/org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/NodeFactory.java
+++ b/org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/NodeFactory.java
@@ -34,7 +34,7 @@ public final class NodeFactory {
return result;
}
- public static ISubModuleNode createSubMobule(final NavigationNodeId nodeId, final String caption,
+ public static ISubModuleNode createSubModule(final NavigationNodeId nodeId, final String caption,
final IModuleNode parent, final String viewId) {
final ISubModuleNode result = new SubModuleNode(nodeId, caption);
// path found via org.eclipse.riena.ui.swt.imagePaths in plugin.xml
diff --git a/org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/OpenViewHandler.java b/org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/OpenViewHandler.java
index 3ec0abe..22295e9 100644
--- a/org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/OpenViewHandler.java
+++ b/org.eclipse.riena.sample.app.client.mail/src/org/eclipse/riena/sample/app/client/mail/OpenViewHandler.java
@@ -12,7 +12,6 @@ package org.eclipse.riena.sample.app.client.mail;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.IHandler;
import org.eclipse.riena.navigation.ApplicationNodeManager;
import org.eclipse.riena.navigation.IApplicationNode;
@@ -23,7 +22,7 @@ import org.eclipse.riena.navigation.NavigationNodeId;
/**
* Creates a new module group with an associated message view.
*/
-public class OpenViewHandler extends AbstractHandler implements IHandler {
+public class OpenViewHandler extends AbstractHandler {
private int count = 0;
@@ -35,11 +34,11 @@ public class OpenViewHandler extends AbstractHandler implements IHandler {
final IModuleNode moduleAccount1 = NodeFactory.createModule(
new NavigationNodeId("account", Integer.toString(count)), //$NON-NLS-1$
title, group);
- NodeFactory.createSubMobule(
+ NodeFactory.createSubModule(
new NavigationNodeId("Inbox", Integer.toString(count)), "Inbox", moduleAccount1, View.ID); //$NON-NLS-1$ //$NON-NLS-2$
- NodeFactory.createSubMobule(
+ NodeFactory.createSubModule(
new NavigationNodeId("Drafts", Integer.toString(count)), "Drafts", moduleAccount1, View.ID); //$NON-NLS-1$ //$NON-NLS-2$
- NodeFactory.createSubMobule(
+ NodeFactory.createSubModule(
new NavigationNodeId("Sent", Integer.toString(count)), "Sent", moduleAccount1, View.ID); //$NON-NLS-1$ //$NON-NLS-2$
return null;
}