summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Kriese2010-08-18 08:11:53 (EDT)
committerSteffen Kriese2010-08-18 08:11:53 (EDT)
commit832587a66d3cda5dc075afdc7c3ff3b3d90b210c (patch)
tree934b460da3ea96e9677452add4dfc5fe46c9cb5d
parent9704611aac4e5d751da7b74c72fd8f816eabcc81 (diff)
downloadorg.eclipse.riena-832587a66d3cda5dc075afdc7c3ff3b3d90b210c.zip
org.eclipse.riena-832587a66d3cda5dc075afdc7c3ff3b3d90b210c.tar.gz
org.eclipse.riena-832587a66d3cda5dc075afdc7c3ff3b3d90b210c.tar.bz2
applied patch for Bug #323008
-rw-r--r--org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/views/ModuleNavigationListener.java3
-rw-r--r--org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/views/ModuleView.java3
2 files changed, 5 insertions, 1 deletions
diff --git a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/views/ModuleNavigationListener.java b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/views/ModuleNavigationListener.java
index 408ea36..f51509b 100644
--- a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/views/ModuleNavigationListener.java
+++ b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/views/ModuleNavigationListener.java
@@ -251,7 +251,8 @@ class ModuleNavigationListener extends SelectionAdapter implements KeyListener,
private void startSwitch(final TreeItem item) {
cancelSwitch();
- if (item != null) {
+ if (item != null && item.getData(ModuleView.SUPPRESS_TIMER) == null) {
+ item.setData(ModuleView.SUPPRESS_TIMER, null);
nodeSwitcher = new NodeSwitcher(item.getDisplay(), (INavigationNode<?>) item.getData());
nodeSwitcher.start();
}
diff --git a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/views/ModuleView.java b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/views/ModuleView.java
index dd90ff7..40d2479 100644
--- a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/views/ModuleView.java
+++ b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/views/ModuleView.java
@@ -70,6 +70,7 @@ import org.eclipse.riena.ui.swt.utils.SwtUtilities;
public class ModuleView implements INavigationNodeView<ModuleNode> {
private static final String WINDOW_RIDGET = "windowRidget"; //$NON-NLS-1$
+ public static final String SUPPRESS_TIMER = "suppressTimer"; //$NON-NLS-1$
private static final LnFUpdater LNF_UPDATER = new LnFUpdater();
private final AbstractViewBindingDelegate binding;
private final Composite parent;
@@ -774,6 +775,7 @@ public class ModuleView implements INavigationNodeView<ModuleNode> {
* view must be resized.
*/
private class SubModuleListener extends SubModuleNodeListener {
+
@Override
public void beforeActivated(final ISubModuleNode source) {
/*
@@ -789,6 +791,7 @@ public class ModuleView implements INavigationNodeView<ModuleNode> {
final Tree tree = getTree();
if (tree.getSelectionCount() == 0 && tree.getItemCount() > 0) {
final TreeItem firstItem = tree.getItem(0);
+ firstItem.setData(SUPPRESS_TIMER, true);
tree.select(firstItem);
}
}