summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Drossel2008-09-02 12:09:21 (EDT)
committerCarsten Drossel2008-09-02 12:09:21 (EDT)
commit68a49e798e2fe49d6de72965aa62827d0b302271 (patch)
tree7a1d96a64a9b656abc07eaddfc43c8de1f4bbf67
parentaff57c6ea8410d14d7d4d9a7b2442d535ff632a1 (diff)
downloadorg.eclipse.riena-68a49e798e2fe49d6de72965aa62827d0b302271.zip
org.eclipse.riena-68a49e798e2fe49d6de72965aa62827d0b302271.tar.gz
org.eclipse.riena-68a49e798e2fe49d6de72965aa62827d0b302271.tar.bz2
renamed application window and fixed some binding stuff
-rw-r--r--org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/views/ApplicationViewAdvisor.java3
-rw-r--r--org.eclipse.riena.navigation.ui/src/org/eclipse/riena/navigation/ui/controllers/ApplicationController.java26
-rw-r--r--org.eclipse.riena.navigation.ui/src/org/eclipse/riena/navigation/ui/controllers/SubModuleController.java3
3 files changed, 18 insertions, 14 deletions
diff --git a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/views/ApplicationViewAdvisor.java b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/views/ApplicationViewAdvisor.java
index 7398457..4791014 100644
--- a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/views/ApplicationViewAdvisor.java
+++ b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/views/ApplicationViewAdvisor.java
@@ -73,7 +73,7 @@ public class ApplicationViewAdvisor extends WorkbenchWindowAdvisor {
private static final Point APPLICATION_SIZE = new Point(800, 600);
private static final int COOLBAR_HEIGHT = 22;
private static final int COOLBAR_TOP_MARGIN = 2;
- private static final String SHELL_RIDGET_PROPERTY = "windowRidget"; //$NON-NLS-1$
+ private static final String SHELL_RIDGET_PROPERTY = "applicationWindow"; //$NON-NLS-1$
enum BtnState {
NONE, HOVER, HOVER_SELECTED;
@@ -147,6 +147,7 @@ public class ApplicationViewAdvisor extends WorkbenchWindowAdvisor {
private void doInitialBinding() {
binding.injectAndBind(controller);
controller.afterBind();
+ controller.getNavigationNode().activate();
}
/**
diff --git a/org.eclipse.riena.navigation.ui/src/org/eclipse/riena/navigation/ui/controllers/ApplicationController.java b/org.eclipse.riena.navigation.ui/src/org/eclipse/riena/navigation/ui/controllers/ApplicationController.java
index 9253fbb..2e5779d 100644
--- a/org.eclipse.riena.navigation.ui/src/org/eclipse/riena/navigation/ui/controllers/ApplicationController.java
+++ b/org.eclipse.riena.navigation.ui/src/org/eclipse/riena/navigation/ui/controllers/ApplicationController.java
@@ -20,7 +20,7 @@ import org.eclipse.riena.ui.ridgets.listener.IWindowRidgetListener;
*/
public class ApplicationController extends NavigationNodeController<IApplicationNode> {
- private IWindowRidget windowRidget;
+ private IWindowRidget applicationWindow;
private IWindowRidgetListener windowRidgetListener;
private boolean menuBarVisible;
@@ -57,19 +57,19 @@ public class ApplicationController extends NavigationNodeController<IApplication
});
}
- public void setWindowRidget(IWindowRidget pWindowRidget) {
+ public void setApplicationWindow(IWindowRidget pWindowRidget) {
if (windowRidgetListener == null) {
windowRidgetListener = new FrameListener();
}
- windowRidget = pWindowRidget;
- if (windowRidget != null && windowRidgetListener != null) {
- windowRidget.addWindowRidgetListener(windowRidgetListener);
+ applicationWindow = pWindowRidget;
+ if (applicationWindow != null && windowRidgetListener != null) {
+ applicationWindow.addWindowRidgetListener(windowRidgetListener);
}
}
public void setVisible(boolean pVisible) {
- if (windowRidget != null) {
- windowRidget.setVisible(pVisible);
+ if (applicationWindow != null) {
+ applicationWindow.setVisible(pVisible);
}
}
@@ -82,17 +82,17 @@ public class ApplicationController extends NavigationNodeController<IApplication
}
/**
- * @return the windowRidget
+ * @return the applicationWindow
*/
- public IWindowRidget getWindowRidget() {
- return windowRidget;
+ public IWindowRidget getApplicationWindow() {
+ return applicationWindow;
}
/**
* @see org.eclipse.riena.ui.ridgets.IRidgetContainer#configureRidgets()
*/
public void configureRidgets() {
- getNavigationNode().activate();
+ // nothing to do
}
/**
@@ -106,11 +106,11 @@ public class ApplicationController extends NavigationNodeController<IApplication
}
private void updateLabel() {
- windowRidget.setTitle(getNavigationNode().getLabel());
+ applicationWindow.setTitle(getNavigationNode().getLabel());
}
private void updateIcon() {
- updateIcon(windowRidget);
+ updateIcon(applicationWindow);
}
public void setMenubarVisible(boolean visible) {
diff --git a/org.eclipse.riena.navigation.ui/src/org/eclipse/riena/navigation/ui/controllers/SubModuleController.java b/org.eclipse.riena.navigation.ui/src/org/eclipse/riena/navigation/ui/controllers/SubModuleController.java
index 79225d1..90dbdf6 100644
--- a/org.eclipse.riena.navigation.ui/src/org/eclipse/riena/navigation/ui/controllers/SubModuleController.java
+++ b/org.eclipse.riena.navigation.ui/src/org/eclipse/riena/navigation/ui/controllers/SubModuleController.java
@@ -148,6 +148,9 @@ public class SubModuleController extends NavigationNodeController<ISubModuleNode
* @see org.eclipse.riena.ui.ridgets.IRidgetContainer#configureRidgets()
*/
public void configureRidgets() {
+ if (getWindowRidget() == null) {
+ setWindowRidget((IWindowRidget) getRidget("windowRidget")); //$NON-NLS-1$
+ }
}
}