summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Schenkel2008-07-03 11:38:14 -0400
committerThorsten Schenkel2008-07-03 11:38:14 -0400
commit5cd9545cbfaf007af3d2253d8be67014b1452b36 (patch)
tree5dafa1a06be8f676661ead2da4ffe48872c0e8e9
parenta4758b024c1b18bc81a18f8614f19a98fc34aaff (diff)
downloadorg.eclipse.riena-5cd9545cbfaf007af3d2253d8be67014b1452b36.zip
org.eclipse.riena-5cd9545cbfaf007af3d2253d8be67014b1452b36.tar.gz
org.eclipse.riena-5cd9545cbfaf007af3d2253d8be67014b1452b36.tar.xz
renderer classes move to an own package
one new test
-rw-r--r--org.eclipse.riena.example.client/SWT ExampleApplication (with alternative LnF).launch2
-rw-r--r--org.eclipse.riena.example.client/SWT ExampleApplication.launch26
-rw-r--r--org.eclipse.riena.navigation.ui.swt/META-INF/MANIFEST.MF1
-rw-r--r--org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/component/ModuleGroupToolTip.java2
-rw-r--r--org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/component/ModuleGroupWidget.java2
-rw-r--r--org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/component/SubApplicationSwitcherWidget.java2
-rw-r--r--org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/EmbeddedBorderRenderer.java (renamed from org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/EmbeddedBorderRenderer.java)3
-rw-r--r--org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/EmbeddedTitlebarRenderer.java (renamed from org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/EmbeddedTitlebarRenderer.java)3
-rw-r--r--org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/HoverBorderRenderer.java (renamed from org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/HoverBorderRenderer.java)3
-rw-r--r--org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/ModuleGroupRenderer.java (renamed from org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/ModuleGroupRenderer.java)2
-rw-r--r--org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/ShellBorderRenderer.java (renamed from org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/ShellBorderRenderer.java)3
-rw-r--r--org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/ShellLogoRenderer.java (renamed from org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/ShellLogoRenderer.java)2
-rw-r--r--org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/ShellRenderer.java (renamed from org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/ShellRenderer.java)2
-rw-r--r--org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/SubApplicationSwitcherRenderer.java (renamed from org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/SubApplicationSwitcherRenderer.java)3
-rw-r--r--org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/SubApplicationTabRenderer.java (renamed from org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/SubApplicationTabRenderer.java)3
-rw-r--r--org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/SubModuleViewRenderer.java (renamed from org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/SubModuleViewRenderer.java)2
-rw-r--r--org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/RienaDefaultLnf.java16
-rw-r--r--org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/presentation/stack/TitlelessStackPresentation.java6
-rw-r--r--org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/views/ApplicationViewAdvisor.java7
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/AllTests.java2
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/ShellBorderRendererTest.java65
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/EmbeddedBorderRendererTest.java1
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/EmbeddedTitlebarRendererTest.java1
23 files changed, 122 insertions, 37 deletions
diff --git a/org.eclipse.riena.example.client/SWT ExampleApplication (with alternative LnF).launch b/org.eclipse.riena.example.client/SWT ExampleApplication (with alternative LnF).launch
index e7f0964..ab385c9 100644
--- a/org.eclipse.riena.example.client/SWT ExampleApplication (with alternative LnF).launch
+++ b/org.eclipse.riena.example.client/SWT ExampleApplication (with alternative LnF).launch
@@ -23,7 +23,7 @@
<stringAttribute key="product" value="org.eclipse.riena.sample.app.client.mail.product"/>
<stringAttribute key="selectedPlugin" value="org.eclipse.ui.workbench"/>
<stringAttribute key="selected_target_plugins" value="com.ibm.icu,javax.servlet,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.databinding,org.eclipse.core.databinding.beans,org.eclipse.core.expressions,org.eclipse.core.jobs,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility.auth,org.eclipse.equinox.app,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.ui,org.eclipse.ui.workbench"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.riena.ui.core,org.eclipse.equinox.log,org.eclipse.riena.navigation,org.apache.log4j,org.eclipse.riena.core,org.eclipse.riena.navigation.ui.swt,org.eclipse.equinox.cm,org.eclipse.riena.navigation.ui,org.eclipse.riena.ui.ridgets,org.eclipse.riena.example.client,org.eclipse.riena.ui.swt,org.eclipse.riena.ui.ridgets.swt,org.eclipse.core.variables"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.riena.navigation.ui.swt.win32,org.eclipse.riena.ui.core,org.eclipse.equinox.log,org.eclipse.riena.navigation,org.apache.log4j,org.eclipse.riena.core,org.eclipse.riena.navigation.ui.swt,org.eclipse.equinox.cm,org.eclipse.riena.navigation.ui,org.eclipse.riena.ui.ridgets,org.eclipse.riena.example.client,org.eclipse.riena.ui.swt,org.eclipse.riena.ui.ridgets.swt,org.eclipse.core.variables"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="true"/>
diff --git a/org.eclipse.riena.example.client/SWT ExampleApplication.launch b/org.eclipse.riena.example.client/SWT ExampleApplication.launch
index 09b5fe7..d3c48d6 100644
--- a/org.eclipse.riena.example.client/SWT ExampleApplication.launch
+++ b/org.eclipse.riena.example.client/SWT ExampleApplication.launch
@@ -32,12 +32,12 @@
<mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
<mapEntry key="org.eclipse.ui/trace/sources" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
<mapEntry key="org.eclipse.core.jobs/jobs/timing" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
@@ -45,12 +45,12 @@
<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
<mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
@@ -66,11 +66,11 @@
<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
-<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
+<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
+<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
@@ -103,8 +103,8 @@
<mapEntry key="org.eclipse.ui/debug/showAllJobs" value="false"/>
<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
<mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
<mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
@@ -115,21 +115,21 @@
<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/>
<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
<mapEntry key="org.eclipse.equinox.registry/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
<mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug" value="false"/>
<mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug" value="false"/>
<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
diff --git a/org.eclipse.riena.navigation.ui.swt/META-INF/MANIFEST.MF b/org.eclipse.riena.navigation.ui.swt/META-INF/MANIFEST.MF
index 49ad329..83e63cc 100644
--- a/org.eclipse.riena.navigation.ui.swt/META-INF/MANIFEST.MF
+++ b/org.eclipse.riena.navigation.ui.swt/META-INF/MANIFEST.MF
@@ -21,6 +21,7 @@ Export-Package: org.eclipse.riena.navigation.ui.swt.application,
org.eclipse.riena.navigation.ui.swt.binding;x-friends:="org.eclipse.riena.tests",
org.eclipse.riena.navigation.ui.swt.component;x-friends:="org.eclipse.riena.tests",
org.eclipse.riena.navigation.ui.swt.lnf,
+ org.eclipse.riena.navigation.ui.swt.lnf.renderer,
org.eclipse.riena.navigation.ui.swt.lnf.rienadefault,
org.eclipse.riena.navigation.ui.swt.presentation,
org.eclipse.riena.navigation.ui.swt.views
diff --git a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/component/ModuleGroupToolTip.java b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/component/ModuleGroupToolTip.java
index 22c242f..3c949ef 100644
--- a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/component/ModuleGroupToolTip.java
+++ b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/component/ModuleGroupToolTip.java
@@ -13,7 +13,7 @@ package org.eclipse.riena.navigation.ui.swt.component;
import org.eclipse.jface.window.DefaultToolTip;
import org.eclipse.riena.navigation.ui.swt.lnf.ILnfKeyConstants;
import org.eclipse.riena.navigation.ui.swt.lnf.LnfManager;
-import org.eclipse.riena.navigation.ui.swt.lnf.rienadefault.ModuleGroupRenderer;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.ModuleGroupRenderer;
import org.eclipse.riena.navigation.ui.swt.lnf.rienadefault.RienaDefaultLnf;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.graphics.Color;
diff --git a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/component/ModuleGroupWidget.java b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/component/ModuleGroupWidget.java
index 5ad93fe..c9d948b 100644
--- a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/component/ModuleGroupWidget.java
+++ b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/component/ModuleGroupWidget.java
@@ -7,7 +7,7 @@ import org.eclipse.riena.navigation.IModuleGroupNode;
import org.eclipse.riena.navigation.IModuleNode;
import org.eclipse.riena.navigation.ui.swt.lnf.ILnfKeyConstants;
import org.eclipse.riena.navigation.ui.swt.lnf.LnfManager;
-import org.eclipse.riena.navigation.ui.swt.lnf.rienadefault.ModuleGroupRenderer;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.ModuleGroupRenderer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseListener;
diff --git a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/component/SubApplicationSwitcherWidget.java b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/component/SubApplicationSwitcherWidget.java
index 4dfb7ec..3affed2 100644
--- a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/component/SubApplicationSwitcherWidget.java
+++ b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/component/SubApplicationSwitcherWidget.java
@@ -17,7 +17,7 @@ import org.eclipse.riena.navigation.IApplicationModel;
import org.eclipse.riena.navigation.ISubApplication;
import org.eclipse.riena.navigation.ui.swt.lnf.ILnfKeyConstants;
import org.eclipse.riena.navigation.ui.swt.lnf.LnfManager;
-import org.eclipse.riena.navigation.ui.swt.lnf.rienadefault.SubApplicationSwitcherRenderer;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.SubApplicationSwitcherRenderer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
diff --git a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/EmbeddedBorderRenderer.java b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/EmbeddedBorderRenderer.java
index e6717d4..b56f61e 100644
--- a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/EmbeddedBorderRenderer.java
+++ b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/EmbeddedBorderRenderer.java
@@ -8,11 +8,12 @@
* Contributors:
* compeople AG - initial API and implementation
*******************************************************************************/
-package org.eclipse.riena.navigation.ui.swt.lnf.rienadefault;
+package org.eclipse.riena.navigation.ui.swt.lnf.renderer;
import org.eclipse.riena.navigation.ui.swt.lnf.AbstractLnfRenderer;
import org.eclipse.riena.navigation.ui.swt.lnf.ILnfKeyConstants;
import org.eclipse.riena.navigation.ui.swt.lnf.LnfManager;
+import org.eclipse.riena.navigation.ui.swt.lnf.rienadefault.RienaDefaultLnf;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.GC;
diff --git a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/EmbeddedTitlebarRenderer.java b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/EmbeddedTitlebarRenderer.java
index b1f4576..d741ca0 100644
--- a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/EmbeddedTitlebarRenderer.java
+++ b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/EmbeddedTitlebarRenderer.java
@@ -8,12 +8,13 @@
* Contributors:
* compeople AG - initial API and implementation
*******************************************************************************/
-package org.eclipse.riena.navigation.ui.swt.lnf.rienadefault;
+package org.eclipse.riena.navigation.ui.swt.lnf.renderer;
import org.eclipse.riena.core.util.StringUtils;
import org.eclipse.riena.navigation.ui.swt.lnf.AbstractLnfRenderer;
import org.eclipse.riena.navigation.ui.swt.lnf.ILnfKeyConstants;
import org.eclipse.riena.navigation.ui.swt.lnf.LnfManager;
+import org.eclipse.riena.navigation.ui.swt.lnf.rienadefault.RienaDefaultLnf;
import org.eclipse.riena.navigation.ui.swt.utils.ImageUtil;
import org.eclipse.riena.ui.swt.utils.SwtUtilities;
import org.eclipse.swt.SWT;
diff --git a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/HoverBorderRenderer.java b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/HoverBorderRenderer.java
index 511ed9d..74ad5db 100644
--- a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/HoverBorderRenderer.java
+++ b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/HoverBorderRenderer.java
@@ -8,11 +8,12 @@
* Contributors:
* compeople AG - initial API and implementation
*******************************************************************************/
-package org.eclipse.riena.navigation.ui.swt.lnf.rienadefault;
+package org.eclipse.riena.navigation.ui.swt.lnf.renderer;
import org.eclipse.riena.navigation.ui.swt.lnf.AbstractLnfRenderer;
import org.eclipse.riena.navigation.ui.swt.lnf.ILnfKeyConstants;
import org.eclipse.riena.navigation.ui.swt.lnf.LnfManager;
+import org.eclipse.riena.navigation.ui.swt.lnf.rienadefault.RienaDefaultLnf;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.GC;
diff --git a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/ModuleGroupRenderer.java b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/ModuleGroupRenderer.java
index d76acc0..caafe4f 100644
--- a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/ModuleGroupRenderer.java
+++ b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/ModuleGroupRenderer.java
@@ -8,7 +8,7 @@
* Contributors:
* compeople AG - initial API and implementation
*******************************************************************************/
-package org.eclipse.riena.navigation.ui.swt.lnf.rienadefault;
+package org.eclipse.riena.navigation.ui.swt.lnf.renderer;
import java.util.ArrayList;
import java.util.List;
diff --git a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/ShellBorderRenderer.java b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/ShellBorderRenderer.java
index a419f59..1c9351d 100644
--- a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/ShellBorderRenderer.java
+++ b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/ShellBorderRenderer.java
@@ -8,11 +8,12 @@
* Contributors:
* compeople AG - initial API and implementation
*******************************************************************************/
-package org.eclipse.riena.navigation.ui.swt.lnf.rienadefault;
+package org.eclipse.riena.navigation.ui.swt.lnf.renderer;
import org.eclipse.riena.navigation.ui.swt.lnf.AbstractLnfRenderer;
import org.eclipse.riena.navigation.ui.swt.lnf.ILnfKeyConstants;
import org.eclipse.riena.navigation.ui.swt.lnf.LnfManager;
+import org.eclipse.riena.navigation.ui.swt.lnf.rienadefault.RienaDefaultLnf;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.GC;
diff --git a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/ShellLogoRenderer.java b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/ShellLogoRenderer.java
index 11e64cd..370fe27 100644
--- a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/ShellLogoRenderer.java
+++ b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/ShellLogoRenderer.java
@@ -8,7 +8,7 @@
* Contributors:
* compeople AG - initial API and implementation
*******************************************************************************/
-package org.eclipse.riena.navigation.ui.swt.lnf.rienadefault;
+package org.eclipse.riena.navigation.ui.swt.lnf.renderer;
import org.eclipse.riena.navigation.ui.swt.lnf.AbstractLnfRenderer;
import org.eclipse.riena.navigation.ui.swt.lnf.ILnfKeyConstants;
diff --git a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/ShellRenderer.java b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/ShellRenderer.java
index 718c416..112aa8b 100644
--- a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/ShellRenderer.java
+++ b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/ShellRenderer.java
@@ -8,7 +8,7 @@
* Contributors:
* compeople AG - initial API and implementation
*******************************************************************************/
-package org.eclipse.riena.navigation.ui.swt.lnf.rienadefault;
+package org.eclipse.riena.navigation.ui.swt.lnf.renderer;
import org.eclipse.riena.core.util.StringUtils;
import org.eclipse.riena.navigation.ui.swt.lnf.AbstractLnfRenderer;
diff --git a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/SubApplicationSwitcherRenderer.java b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/SubApplicationSwitcherRenderer.java
index c9fa52e..ea3ea5d 100644
--- a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/SubApplicationSwitcherRenderer.java
+++ b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/SubApplicationSwitcherRenderer.java
@@ -8,7 +8,7 @@
* Contributors:
* compeople AG - initial API and implementation
*******************************************************************************/
-package org.eclipse.riena.navigation.ui.swt.lnf.rienadefault;
+package org.eclipse.riena.navigation.ui.swt.lnf.renderer;
import java.util.ArrayList;
import java.util.List;
@@ -17,6 +17,7 @@ import org.eclipse.riena.navigation.ui.swt.component.SubApplicationItem;
import org.eclipse.riena.navigation.ui.swt.lnf.AbstractLnfRenderer;
import org.eclipse.riena.navigation.ui.swt.lnf.ILnfKeyConstants;
import org.eclipse.riena.navigation.ui.swt.lnf.LnfManager;
+import org.eclipse.riena.navigation.ui.swt.lnf.rienadefault.RienaDefaultLnf;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.GC;
diff --git a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/SubApplicationTabRenderer.java b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/SubApplicationTabRenderer.java
index f18860a..d9744da 100644
--- a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/SubApplicationTabRenderer.java
+++ b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/SubApplicationTabRenderer.java
@@ -8,11 +8,12 @@
* Contributors:
* compeople AG - initial API and implementation
*******************************************************************************/
-package org.eclipse.riena.navigation.ui.swt.lnf.rienadefault;
+package org.eclipse.riena.navigation.ui.swt.lnf.renderer;
import org.eclipse.riena.navigation.ui.swt.lnf.AbstractLnfRenderer;
import org.eclipse.riena.navigation.ui.swt.lnf.ILnfKeyConstants;
import org.eclipse.riena.navigation.ui.swt.lnf.LnfManager;
+import org.eclipse.riena.navigation.ui.swt.lnf.rienadefault.RienaDefaultLnf;
import org.eclipse.riena.navigation.ui.swt.utils.ImageUtil;
import org.eclipse.riena.ui.swt.utils.SwtUtilities;
import org.eclipse.swt.graphics.Color;
diff --git a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/SubModuleViewRenderer.java b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/SubModuleViewRenderer.java
index d8f57d9..1281e0a 100644
--- a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/SubModuleViewRenderer.java
+++ b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/SubModuleViewRenderer.java
@@ -8,7 +8,7 @@
* Contributors:
* compeople AG - initial API and implementation
*******************************************************************************/
-package org.eclipse.riena.navigation.ui.swt.lnf.rienadefault;
+package org.eclipse.riena.navigation.ui.swt.lnf.renderer;
import org.eclipse.riena.navigation.INavigationNode;
import org.eclipse.riena.navigation.ISubModuleNode;
diff --git a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/RienaDefaultLnf.java b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/RienaDefaultLnf.java
index 4fe3177..7f53e0b 100644
--- a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/RienaDefaultLnf.java
+++ b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/RienaDefaultLnf.java
@@ -19,6 +19,16 @@ import org.eclipse.riena.navigation.ui.swt.lnf.ILnfRenderer;
import org.eclipse.riena.navigation.ui.swt.lnf.ILnfResource;
import org.eclipse.riena.navigation.ui.swt.lnf.ILnfTheme;
import org.eclipse.riena.navigation.ui.swt.lnf.LnfManager;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.EmbeddedBorderRenderer;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.EmbeddedTitlebarRenderer;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.HoverBorderRenderer;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.ModuleGroupRenderer;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.ShellBorderRenderer;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.ShellLogoRenderer;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.ShellRenderer;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.SubApplicationSwitcherRenderer;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.SubApplicationTabRenderer;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.SubModuleViewRenderer;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
@@ -36,15 +46,15 @@ public class RienaDefaultLnf {
private ILnfTheme theme;
private boolean initialized;
- private Map<String, ILnfResource> getResourceTable() {
+ protected Map<String, ILnfResource> getResourceTable() {
return resourceTable;
}
- private Map<String, ILnfRenderer> getRendererTable() {
+ protected Map<String, ILnfRenderer> getRendererTable() {
return rendererTable;
}
- private Map<String, Object> getSettingTable() {
+ protected Map<String, Object> getSettingTable() {
return settingTable;
}
diff --git a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/presentation/stack/TitlelessStackPresentation.java b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/presentation/stack/TitlelessStackPresentation.java
index 59037bc..9f0cc83 100644
--- a/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/presentation/stack/TitlelessStackPresentation.java
+++ b/org.eclipse.riena.navigation.ui.swt/src/org/eclipse/riena/navigation/ui/swt/presentation/stack/TitlelessStackPresentation.java
@@ -16,9 +16,9 @@ import java.util.Map;
import org.eclipse.riena.navigation.model.SubModuleNode;
import org.eclipse.riena.navigation.ui.swt.lnf.ILnfKeyConstants;
import org.eclipse.riena.navigation.ui.swt.lnf.LnfManager;
-import org.eclipse.riena.navigation.ui.swt.lnf.rienadefault.ModuleGroupRenderer;
-import org.eclipse.riena.navigation.ui.swt.lnf.rienadefault.SubApplicationTabRenderer;
-import org.eclipse.riena.navigation.ui.swt.lnf.rienadefault.SubModuleViewRenderer;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.ModuleGroupRenderer;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.SubApplicationTabRenderer;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.SubModuleViewRenderer;
import org.eclipse.riena.navigation.ui.swt.presentation.SwtPresentationManagerAccessor;
import org.eclipse.riena.navigation.ui.swt.presentation.SwtViewId;
import org.eclipse.swt.SWT;
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 31cdd45..c635522 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
@@ -22,9 +22,9 @@ import org.eclipse.riena.navigation.ui.swt.binding.DefaultSwtControlRidgetMapper
import org.eclipse.riena.navigation.ui.swt.lnf.ILnfKeyConstants;
import org.eclipse.riena.navigation.ui.swt.lnf.ILnfRenderer;
import org.eclipse.riena.navigation.ui.swt.lnf.LnfManager;
-import org.eclipse.riena.navigation.ui.swt.lnf.rienadefault.ShellBorderRenderer;
-import org.eclipse.riena.navigation.ui.swt.lnf.rienadefault.ShellLogoRenderer;
-import org.eclipse.riena.navigation.ui.swt.lnf.rienadefault.ShellRenderer;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.ShellBorderRenderer;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.ShellLogoRenderer;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.ShellRenderer;
import org.eclipse.riena.navigation.ui.swt.presentation.SwtPresentationManagerAccessor;
import org.eclipse.riena.navigation.ui.swt.presentation.stack.TitlelessStackPresentation;
import org.eclipse.riena.navigation.ui.swt.utils.ImageUtil;
@@ -380,7 +380,6 @@ public class ApplicationViewAdvisor extends WorkbenchWindowAdvisor {
if ((cursor != null) && (shell.getCursor() != cursor)) {
shell.setCursor(cursor);
}
-
}
private class SubApplicationListener extends SubApplicationAdapter {
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/AllTests.java b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/AllTests.java
index b2df4db..63295ac 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/AllTests.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/AllTests.java
@@ -18,6 +18,7 @@ import org.eclipse.riena.navigation.ui.swt.binding.DefaultSwtControlRidgetMapper
import org.eclipse.riena.navigation.ui.swt.component.ModuleItemTest;
import org.eclipse.riena.navigation.ui.swt.lnf.AbstractLnfResourceTest;
import org.eclipse.riena.navigation.ui.swt.lnf.LnfManagerTest;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.ShellBorderRendererTest;
import org.eclipse.riena.navigation.ui.swt.lnf.rienadefault.EmbeddedBorderRendererTest;
import org.eclipse.riena.navigation.ui.swt.lnf.rienadefault.EmbeddedTitlebarRendererTest;
import org.eclipse.riena.navigation.ui.swt.lnf.rienadefault.RienaDefaultLnfTest;
@@ -40,6 +41,7 @@ public class AllTests extends TestCase {
suite.addTestSuite(RienaDefaultLnfTest.class);
suite.addTestSuite(SwtViewIdTest.class);
suite.addTestSuite(ModuleItemTest.class);
+ suite.addTestSuite(ShellBorderRendererTest.class);
return suite;
}
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/ShellBorderRendererTest.java b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/ShellBorderRendererTest.java
new file mode 100644
index 0000000..daa212a
--- /dev/null
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/lnf/renderer/ShellBorderRendererTest.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * 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.navigation.ui.swt.lnf.renderer;
+
+import junit.framework.TestCase;
+
+import org.eclipse.riena.navigation.ui.swt.lnf.ILnfKeyConstants;
+import org.eclipse.riena.navigation.ui.swt.lnf.LnfManager;
+import org.eclipse.riena.navigation.ui.swt.lnf.rienadefault.RienaDefaultLnf;
+
+/**
+ * Tests of the class <code>ShellBorderRenderer</code>.
+ */
+public class ShellBorderRendererTest extends TestCase {
+
+ /**
+ * Test of the method <code>getCompelteBorderWidth</code>.
+ */
+ public void testGetCompelteBorderWidth() {
+
+ MyLnf lnf = new MyLnf();
+ LnfManager.setLnf(lnf);
+ lnf.initialize();
+ ShellBorderRenderer renderer = new ShellBorderRenderer();
+
+ lnf.setPadding(20);
+ int expected = 20 + renderer.getBorderWidth();
+ assertEquals(expected, renderer.getCompelteBorderWidth());
+
+ lnf.removePadding();
+ expected = renderer.getBorderWidth();
+ assertEquals(expected, renderer.getCompelteBorderWidth());
+
+ lnf.setPadding(1.2);
+ expected = renderer.getBorderWidth();
+ assertEquals(expected, renderer.getCompelteBorderWidth());
+
+ renderer.dispose();
+
+ }
+
+ /**
+ * Look and Feel where it is possible to change the setting for padding.
+ */
+ private class MyLnf extends RienaDefaultLnf {
+
+ public void removePadding() {
+ getSettingTable().remove(ILnfKeyConstants.TITLELESS_SHELL_PADDING);
+ }
+
+ public void setPadding(Object padding) {
+ getSettingTable().put(ILnfKeyConstants.TITLELESS_SHELL_PADDING, padding);
+ }
+
+ }
+
+}
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/EmbeddedBorderRendererTest.java b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/EmbeddedBorderRendererTest.java
index 6aa1688..5cd3e17 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/EmbeddedBorderRendererTest.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/EmbeddedBorderRendererTest.java
@@ -12,6 +12,7 @@ package org.eclipse.riena.navigation.ui.swt.lnf.rienadefault;
import junit.framework.TestCase;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.EmbeddedBorderRenderer;
import org.eclipse.swt.graphics.Rectangle;
/**
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/EmbeddedTitlebarRendererTest.java b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/EmbeddedTitlebarRendererTest.java
index 7d50695..0cf06a4 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/EmbeddedTitlebarRendererTest.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/ui/swt/lnf/rienadefault/EmbeddedTitlebarRendererTest.java
@@ -14,6 +14,7 @@ import junit.framework.TestCase;
import org.eclipse.riena.navigation.ui.swt.lnf.ILnfKeyConstants;
import org.eclipse.riena.navigation.ui.swt.lnf.LnfManager;
+import org.eclipse.riena.navigation.ui.swt.lnf.renderer.EmbeddedTitlebarRenderer;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Point;