summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Drossel2008-08-11 05:17:02 (EDT)
committerCarsten Drossel2008-08-11 05:17:02 (EDT)
commitb2c9980ebc5d7f00b2de614f3e82e57b0f8da37e (patch)
treeef63b3453c6ecc095080f57786ade4241aad3ea4
parent11d05bda3fbc5f7ddae44503a33ee281f096d4ee (diff)
downloadorg.eclipse.riena-b2c9980ebc5d7f00b2de614f3e82e57b0f8da37e.zip
org.eclipse.riena-b2c9980ebc5d7f00b2de614f3e82e57b0f8da37e.tar.gz
org.eclipse.riena-b2c9980ebc5d7f00b2de614f3e82e57b0f8da37e.tar.bz2
applying patch for bugzilla entry 243714 - add navigation history to example menu and toolbar
-rw-r--r--org.eclipse.riena.example.client/icons/backward.gifbin0 -> 323 bytes
-rw-r--r--org.eclipse.riena.example.client/icons/forward.gifbin0 -> 328 bytes
-rw-r--r--org.eclipse.riena.example.client/plugin.xml113
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/handler/HistoryBackwardHandler.java47
-rw-r--r--org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/handler/HistoryForwardHandler.java47
5 files changed, 164 insertions, 43 deletions
diff --git a/org.eclipse.riena.example.client/icons/backward.gif b/org.eclipse.riena.example.client/icons/backward.gif
new file mode 100644
index 0000000..328e97e
--- /dev/null
+++ b/org.eclipse.riena.example.client/icons/backward.gif
Binary files differ
diff --git a/org.eclipse.riena.example.client/icons/forward.gif b/org.eclipse.riena.example.client/icons/forward.gif
new file mode 100644
index 0000000..c39cf62
--- /dev/null
+++ b/org.eclipse.riena.example.client/icons/forward.gif
Binary files differ
diff --git a/org.eclipse.riena.example.client/plugin.xml b/org.eclipse.riena.example.client/plugin.xml
index 07abe82..2d37e81 100644
--- a/org.eclipse.riena.example.client/plugin.xml
+++ b/org.eclipse.riena.example.client/plugin.xml
@@ -24,113 +24,93 @@
name="subapplication.2">
</perspective>
</extension>
- <extension
- point="org.eclipse.ui.views">
- <view
- allowMultiple="true"
+ <extension point="org.eclipse.ui.views">
+ <view allowMultiple="true"
class="org.eclipse.riena.example.client.views.CustomerDetailSubModuleView"
id="org.eclipse.riena.example.client.views.CustomerDetailSubModuleView"
name="org.eclipse.riena.example.client.views.CustomerDetailSubModuleView">
</view>
-
- <view
- allowMultiple="true"
+ <view allowMultiple="true"
class="org.eclipse.riena.example.client.views.SharedViewDemoSubModuleView"
id="org.eclipse.riena.example.client.views.SharedViewDemoSubModuleView"
name="org.eclipse.riena.example.client.views.SharedViewDemoSubModuleView">
</view>
- <view
- allowMultiple="true"
+ <view allowMultiple="true"
class="org.eclipse.riena.example.client.views.RidgetsSubModuleView"
id="org.eclipse.riena.example.client.views.RidgetsSubModuleView"
name="org.eclipse.riena.example.client.views.RidgetsSubModuleView">
</view>
- <view
- allowMultiple="true"
+ <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">
</view>
- <view
- allowMultiple="true"
+ <view allowMultiple="true"
class="org.eclipse.riena.example.client.views.ChoiceSubModuleView"
id="org.eclipse.riena.example.client.views.ChoiceSubModuleView"
name="org.eclipse.riena.example.client.views.ChoiceSubModuleView">
</view>
- <view
- allowMultiple="true"
+ <view allowMultiple="true"
class="org.eclipse.riena.example.client.views.ComboSubModuleView"
id="org.eclipse.riena.example.client.views.ComboSubModuleView"
name="org.eclipse.riena.example.client.views.ComboSubModuleView">
</view>
- <view
- allowMultiple="true"
+ <view allowMultiple="true"
class="org.eclipse.riena.example.client.views.ListSubModuleView"
id="org.eclipse.riena.example.client.views.ListSubModuleView"
name="org.eclipse.riena.example.client.views.ListSubModuleView">
</view>
- <view
- allowMultiple="true"
+ <view allowMultiple="true"
class="org.eclipse.riena.example.client.views.TextSubModuleView"
id="org.eclipse.riena.example.client.views.TextSubModuleView"
name="org.eclipse.riena.example.client.views.TextSubModuleView">
</view>
- <view
- allowMultiple="true"
+ <view allowMultiple="true"
class="org.eclipse.riena.example.client.views.MarkerSubModuleView"
id="org.eclipse.riena.example.client.views.MarkerSubModuleView"
name="org.eclipse.riena.example.client.views.MarkerSubModuleView">
</view>
- <view
- allowMultiple="true"
+ <view allowMultiple="true"
class="org.eclipse.riena.example.client.views.FocusableSubModuleView"
id="org.eclipse.riena.example.client.views.FocusableSubModuleView"
name="org.eclipse.riena.example.client.views.FocusableSubModuleView">
</view>
- <view
- allowMultiple="true"
+ <view allowMultiple="true"
class="org.eclipse.riena.example.client.views.ValidationSubModuleView"
id="org.eclipse.riena.example.client.views.ValidationSubModuleView"
name="org.eclipse.riena.example.client.views.ValidationSubModuleView">
</view>
- <view
- allowMultiple="true"
+ <view allowMultiple="true"
class="org.eclipse.riena.example.client.views.SystemPropertiesSubModuleView"
id="org.eclipse.riena.example.client.views.SystemPropertiesSubModuleView"
name="org.eclipse.riena.example.client.views.SystemPropertiesSubModuleView">
</view>
- <view
- allowMultiple="true"
+ <view allowMultiple="true"
class="org.eclipse.riena.example.client.views.TreeSubModuleView"
id="org.eclipse.riena.example.client.views.TreeSubModuleView"
name="org.eclipse.riena.example.client.views.TreeSubModuleView">
</view>
- <view
- allowMultiple="true"
+ <view allowMultiple="true"
class="org.eclipse.riena.example.client.views.TreeTableSubModuleView"
id="org.eclipse.riena.example.client.views.TreeTableSubModuleView"
name="org.eclipse.riena.example.client.views.TreeTableSubModuleView">
</view>
- <view
- allowMultiple="true"
+ <view allowMultiple="true"
class="org.eclipse.riena.example.client.views.TableSubModuleView"
id="org.eclipse.riena.example.client.views.TableSubModuleView"
name="org.eclipse.riena.example.client.views.TableSubModuleView">
</view>
- <view
- allowMultiple="true"
+ <view allowMultiple="true"
class="org.eclipse.riena.example.client.views.NavigationSubModuleView"
id="org.eclipse.riena.example.client.views.NavigationSubModuleView"
name="org.eclipse.riena.example.client.views.NavigationSubModuleView">
</view>
- <view
- allowMultiple="true"
+ <view allowMultiple="true"
class="org.eclipse.riena.example.client.views.StatuslineSubModuleView"
id="org.eclipse.riena.example.client.views.StatuslineSubModuleView"
name="org.eclipse.riena.example.client.views.StatuslineSubModuleView">
</view>
- <view
- allowMultiple="true"
+ <view allowMultiple="true"
class="org.eclipse.riena.example.client.views.NavigateSubModuleView"
id="org.eclipse.riena.example.client.views.NavigateSubModuleView"
name="org.eclipse.riena.example.client.views.NavigateSubModuleView">
@@ -140,9 +120,7 @@
point="org.eclipse.ui.perspectiveExtensions">
<perspectiveExtension
targetID="subapplication.1">
- <actionSet
- id="org.eclipse.riena.example.client.actionSet">
- </actionSet>
+ <actionSet id="org.eclipse.riena.example.client.actionSet"></actionSet>
</perspectiveExtension>
</extension>
<extension
@@ -167,7 +145,15 @@
id="org.eclipse.riena.example.client.certainPerspectiveCommand"
name="Certain Perspective">
</command>
- </extension>
+ <command
+ id="org.eclipse.riena.example.client.histBackCommand"
+ name="History Backward">
+ </command>
+ <command
+ id="org.eclipse.riena.example.client.histForCommand"
+ name="History Forward">
+ </command>
+ </extension>
<extension
point="org.eclipse.ui.menus">
<menuContribution
@@ -237,6 +223,25 @@
style="push">
</command>
</menu>
+ <menu
+ id="navigationMenu"
+ label="Navigation menu"
+ mnemonic="N">
+ <command
+ commandId="org.eclipse.riena.example.client.histBackCommand"
+ icon="icons/backward.gif"
+ id="org.eclipse.riena.example.client.histBackMenuItem"
+ mnemonic="B"
+ style="push">
+ </command>
+ <command
+ commandId="org.eclipse.riena.example.client.histForCommand"
+ icon="icons/forward.gif"
+ id="org.eclipse.riena.example.client.histForMenuItem"
+ mnemonic="F"
+ style="push">
+ </command>
+ </menu>
</menuContribution>
<menuContribution
locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
@@ -264,6 +269,20 @@
mnemonic="P"
style="push">
</command>
+ <command
+ commandId="org.eclipse.riena.example.client.histBackCommand"
+ icon="icons/backward.gif"
+ label="History Back"
+ mnemonic="B"
+ style="push">
+ </command>
+ <command
+ commandId="org.eclipse.riena.example.client.histForCommand"
+ icon="icons/forward.gif"
+ label="History Forward"
+ mnemonic="F"
+ style="push">
+ </command>
</toolbar>
</menuContribution>
</extension>
@@ -305,6 +324,14 @@
class="org.eclipse.riena.example.client.handler.ZoomOutHandler"
commandId="org.eclipse.riena.example.client.zoomOutCommand">
</handler>
+ <handler
+ class="org.eclipse.riena.example.client.handler.HistoryBackwardHandler"
+ commandId="org.eclipse.riena.example.client.histBackCommand">
+ </handler>
+ <handler
+ class="org.eclipse.riena.example.client.handler.HistoryForwardHandler"
+ commandId="org.eclipse.riena.example.client.histForCommand">
+ </handler>
</extension>
<extension
point="org.eclipse.riena.ui.swt.lnfrenderer">
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/handler/HistoryBackwardHandler.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/handler/HistoryBackwardHandler.java
new file mode 100644
index 0000000..aa47422
--- /dev/null
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/handler/HistoryBackwardHandler.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * 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.example.client.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.riena.navigation.ApplicationModelManager;
+
+/**
+ *
+ */
+public class HistoryBackwardHandler extends DummyHandler {
+
+ /**
+ * @see org.eclipse.riena.example.client.handler.DummyHandler#getTitle()
+ */
+ @Override
+ protected String getTitle() {
+ return "History Forward"; //$NON-NLS-1$
+ }
+
+ /**
+ * @see org.eclipse.riena.example.client.handler.DummyHandler#getMessage()
+ */
+ @Override
+ protected String getMessage() {
+ return "History Forward\n"; //$NON-NLS-1$
+ }
+
+ /**
+ * @see org.eclipse.riena.example.client.handler.DummyHandler#execute(org.eclipse
+ * .core.commands.ExecutionEvent)
+ */
+ @Override
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ ApplicationModelManager.getApplicationModel().historyBack();
+ return null;
+ }
+}
diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/handler/HistoryForwardHandler.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/handler/HistoryForwardHandler.java
new file mode 100644
index 0000000..2c26ada
--- /dev/null
+++ b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/handler/HistoryForwardHandler.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * 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.example.client.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.riena.navigation.ApplicationModelManager;
+
+/**
+ *
+ */
+public class HistoryForwardHandler extends DummyHandler {
+
+ /**
+ * @see org.eclipse.riena.example.client.handler.DummyHandler#getTitle()
+ */
+ @Override
+ protected String getTitle() {
+ return "History Backward"; //$NON-NLS-1$
+ }
+
+ /**
+ * @see org.eclipse.riena.example.client.handler.DummyHandler#getMessage()
+ */
+ @Override
+ protected String getMessage() {
+ return "History Backward\n"; //$NON-NLS-1$
+ }
+
+ /**
+ * @see org.eclipse.riena.example.client.handler.DummyHandler#execute(org.eclipse
+ * .core.commands.ExecutionEvent)
+ */
+ @Override
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ ApplicationModelManager.getApplicationModel().historyForward();
+ return null;
+ }
+}