summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Kriese2011-05-10 10:37:42 (EDT)
committerSteffen Kriese2011-05-10 10:37:42 (EDT)
commitc2be826c405c7c1fc922c8ce7c1fec65f5a8ef57 (patch)
tree1c0557e7ecf0247f61c53c69b4bb1335702650fe
parentd0d08d6b1717ac508732cdc337c853679f6ed375 (diff)
downloadorg.eclipse.riena.rap-c2be826c405c7c1fc922c8ce7c1fec65f5a8ef57.zip
org.eclipse.riena.rap-c2be826c405c7c1fc922c8ce7c1fec65f5a8ef57.tar.gz
org.eclipse.riena.rap-c2be826c405c7c1fc922c8ce7c1fec65f5a8ef57.tar.bz2
fixed ModuleNavigationListenerRAP and Activator due to API changes
-rw-r--r--org.eclipse.riena.ui.swt.rap/src/org/eclipse/riena/internalui/swt/rap/Activator.java10
-rw-r--r--org.eclipse.riena.ui.swt.rap/src/org/eclipse/riena/ui/swt/facades/internal/ModuleNavigationListenerRAP.java8
2 files changed, 9 insertions, 9 deletions
diff --git a/org.eclipse.riena.ui.swt.rap/src/org/eclipse/riena/internalui/swt/rap/Activator.java b/org.eclipse.riena.ui.swt.rap/src/org/eclipse/riena/internalui/swt/rap/Activator.java
index 24cea71..fac449e 100644
--- a/org.eclipse.riena.ui.swt.rap/src/org/eclipse/riena/internalui/swt/rap/Activator.java
+++ b/org.eclipse.riena.ui.swt.rap/src/org/eclipse/riena/internalui/swt/rap/Activator.java
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.rap.ui.internal.progress.JobManagerAdapter;
import org.eclipse.rwt.internal.lifecycle.FakeContextUtil;
-import org.eclipse.rwt.internal.lifecycle.RWTLifeCycle;
+import org.eclipse.rwt.internal.lifecycle.LifeCycleUtil;
import org.eclipse.rwt.internal.service.ContextProvider;
import org.eclipse.rwt.internal.service.ServiceContext;
import org.eclipse.rwt.lifecycle.UICallBack;
@@ -100,7 +100,7 @@ public class Activator extends AbstractRienaUIPlugin {
event.getJob().setProperty(new QualifiedName(RAP, SERVICE_CONTEXT), null);
event.getJob().setProperty(new QualifiedName(RAP, THREAD), null);
- RWTLifeCycle.getSessionDisplay();
+ LifeCycleUtil.getSessionDisplay();
}
@Override
@@ -109,7 +109,7 @@ public class Activator extends AbstractRienaUIPlugin {
if (display != null && !display.isDisposed()) {
final ServiceContext context = ContextProvider.getContext();
if (context != null) {
- final Display sessionDisplay = RWTLifeCycle.getSessionDisplay();
+ final Display sessionDisplay = LifeCycleUtil.getSessionDisplay();
final IDisplayAdapter adapter = (IDisplayAdapter) sessionDisplay.getAdapter(IDisplayAdapter.class);
final ISessionStore session = adapter.getSession();
final ServiceContext fakeContext = FakeContextUtil.createFakeContext(session);
@@ -128,7 +128,7 @@ public class Activator extends AbstractRienaUIPlugin {
@Override
public void done(final IJobChangeEvent event) {
- final Display display = RWTLifeCycle.getSessionDisplay();
+ final Display display = LifeCycleUtil.getSessionDisplay();
if (display != null && !display.isDisposed()) {
try {
display.asyncExec(new Runnable() {
@@ -148,7 +148,7 @@ public class Activator extends AbstractRienaUIPlugin {
private static Display findDisplay(final Job job) {
Display result = null;
if (ContextProvider.hasContext()) {
- result = RWTLifeCycle.getSessionDisplay();
+ result = LifeCycleUtil.getSessionDisplay();
} else {
if (job instanceof UIJob) {
final UIJob uiJob = (UIJob) job;
diff --git a/org.eclipse.riena.ui.swt.rap/src/org/eclipse/riena/ui/swt/facades/internal/ModuleNavigationListenerRAP.java b/org.eclipse.riena.ui.swt.rap/src/org/eclipse/riena/ui/swt/facades/internal/ModuleNavigationListenerRAP.java
index d560380..7ea1bf6 100644
--- a/org.eclipse.riena.ui.swt.rap/src/org/eclipse/riena/ui/swt/facades/internal/ModuleNavigationListenerRAP.java
+++ b/org.eclipse.riena.ui.swt.rap/src/org/eclipse/riena/ui/swt/facades/internal/ModuleNavigationListenerRAP.java
@@ -11,7 +11,6 @@
package org.eclipse.riena.ui.swt.facades.internal;
import org.eclipse.rwt.lifecycle.UICallBack;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
@@ -29,14 +28,15 @@ public class ModuleNavigationListenerRAP extends ModuleNavigationListener {
@Override
protected NodeSwitcher createNodeSwitcher(final TreeItem item) {
- return new NodeSwitcherRAP(item.getDisplay(), (INavigationNode<?>) item.getData());
+ return new NodeSwitcherRAP(item);
}
private final static class NodeSwitcherRAP extends ModuleNavigationListener.NodeSwitcher {
private final String id;
- NodeSwitcherRAP(final Display display, final INavigationNode<?> node) {
- super(display, node);
+ NodeSwitcherRAP(final TreeItem item) {
+ super(item);
+ final INavigationNode<?> node = (INavigationNode<?>) item.getData();
final String instanceId = node.getNodeId().getInstanceId();
if (instanceId != null) {
id = instanceId;