renamed methods in EmbeddedTitleBar to set/isWindowActive() to avoid name conflict with super method Control.isActive()

5 files changed, 17 insertions, 17 deletions

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 6623caf..1f6313e 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
@@ -683,7 +683,7 @@ public class ModuleView implements INavigationNodeView<SWTModuleController, Modu
 		}
 
 		getParent().layout();
-		title.setActive(active);
+		title.setWindowActive(active);
 
 	}
 
diff --git a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/views/SubModuleView.java b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/views/SubModuleView.java
index e206ea1..86377cd 100644
--- a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/views/SubModuleView.java
+++ b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/views/SubModuleView.java
@@ -191,7 +191,7 @@ public abstract class SubModuleView<C extends SubModuleController> extends ViewP
 		if (!isRCP()) {
 			title = new EmbeddedTitleBar(parent, SWT.NONE);
 			addUIControl(title, SubModuleController.WINDOW_RIDGET);
-			title.setActive(true);
+			title.setWindowActive(true);
 			FormData formData = new FormData();
 			// don't show the top border of the title => -1
 			formData.top = new FormAttachment(0, -1);
@@ -357,7 +357,7 @@ public abstract class SubModuleView<C extends SubModuleController> extends ViewP
 			binding.bind(currentController);
 			currentController.afterBind();
 			if (title != null) {
-				title.setActive(currentController.isActivated());
+				title.setWindowActive(currentController.isActivated());
 			}
 		}
 	}
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/ui/swt/EmbeddedTitleBarTest.java b/org.eclipse.riena.tests/src/org/eclipse/riena/ui/swt/EmbeddedTitleBarTest.java
index eed7e12..096b3d4 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/ui/swt/EmbeddedTitleBarTest.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/ui/swt/EmbeddedTitleBarTest.java
@@ -89,13 +89,13 @@ public class EmbeddedTitleBarTest extends TestCase {
 	 */
 	public void testSetActive() {
 
-		titleBar.setActive(true);
+		titleBar.setWindowActive(true);
 		titleBar.resetRedrawCalled();
 
-		titleBar.setActive(true);
+		titleBar.setWindowActive(true);
 		assertFalse(titleBar.isRedrawCalled());
 
-		titleBar.setActive(false);
+		titleBar.setWindowActive(false);
 		assertTrue(titleBar.isRedrawCalled());
 
 	}
diff --git a/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/EmbeddedTitleBarRidget.java b/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/EmbeddedTitleBarRidget.java
index 209adc2..59e5bbf 100644
--- a/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/EmbeddedTitleBarRidget.java
+++ b/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/EmbeddedTitleBarRidget.java
@@ -232,7 +232,7 @@ public class EmbeddedTitleBarRidget extends AbstractSWTRidget implements IWindow
 	private void updateActive() {
 		EmbeddedTitleBar control = getUIControl();
 		if (control != null) {
-			control.setActive(active);
+			control.setWindowActive(active);
 		}
 	}
 
diff --git a/org.eclipse.riena.ui.swt/src/org/eclipse/riena/ui/swt/EmbeddedTitleBar.java b/org.eclipse.riena.ui.swt/src/org/eclipse/riena/ui/swt/EmbeddedTitleBar.java
index 0798970..c291d87 100644
--- a/org.eclipse.riena.ui.swt/src/org/eclipse/riena/ui/swt/EmbeddedTitleBar.java
+++ b/org.eclipse.riena.ui.swt/src/org/eclipse/riena/ui/swt/EmbeddedTitleBar.java
@@ -33,7 +33,7 @@ import org.eclipse.swt.widgets.Composite;
  */
 public class EmbeddedTitleBar extends Canvas {
 
-	private boolean active;
+	private boolean windowActive;
 	private boolean pressed;
 	private boolean hover;
 	private boolean closeButtonPressed;
@@ -86,7 +86,7 @@ public class EmbeddedTitleBar extends Canvas {
 		GC gc = e.gc;
 
 		// title bar
-		getLnfTitlebarRenderer().setActive(isActive());
+		getLnfTitlebarRenderer().setActive(isWindowActive());
 		getLnfTitlebarRenderer().setCloseable(isCloseable());
 		getLnfTitlebarRenderer().setPressed(isPressed());
 		getLnfTitlebarRenderer().setHover(isHover());
@@ -147,19 +147,19 @@ public class EmbeddedTitleBar extends Canvas {
 	}
 
 	/**
-	 * @return the active
+	 * @return the windowActive
 	 */
-	public boolean isActive() {
-		return active;
+	public boolean isWindowActive() {
+		return windowActive;
 	}
 
 	/**
-	 * @param active
-	 *            the active to set
+	 * @param windowActive
+	 *            the windowActive to set
 	 */
-	public void setActive(boolean active) {
-		if (hasChanged(this.active, active)) {
-			this.active = active;
+	public void setWindowActive(boolean active) {
+		if (hasChanged(this.windowActive, active)) {
+			this.windowActive = active;
 			redraw();
 		}
 	}