summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Kriese2011-05-11 03:18:31 (EDT)
committerSteffen Kriese2011-05-11 03:18:31 (EDT)
commit9afbf30f053d126b825b8a272ac4f0ddfd570e0e (patch)
tree7190fb0f79fecfed573951d8ff975f98b4c68d11
parente5c0f7d025cd7251cd08071e789cf9e806a2b483 (diff)
downloadorg.eclipse.riena-9afbf30f053d126b825b8a272ac4f0ddfd570e0e.zip
org.eclipse.riena-9afbf30f053d126b825b8a272ac4f0ddfd570e0e.tar.gz
org.eclipse.riena-9afbf30f053d126b825b8a272ac4f0ddfd570e0e.tar.bz2
updated demo client launcher
-rw-r--r--org.eclipse.riena.demo.client/Riena Demo Client (eclipse look).launch8
-rw-r--r--org.eclipse.riena.demo.client/Riena Demo Client.launch4
-rw-r--r--org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/CustomerSearchView.java7
-rw-r--r--org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/EmailView.java1
-rw-r--r--org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/EmailView2.java1
5 files changed, 10 insertions, 11 deletions
diff --git a/org.eclipse.riena.demo.client/Riena Demo Client (eclipse look).launch b/org.eclipse.riena.demo.client/Riena Demo Client (eclipse look).launch
index 7809a6f..528aea4 100644
--- a/org.eclipse.riena.demo.client/Riena Demo Client (eclipse look).launch
+++ b/org.eclipse.riena.demo.client/Riena Demo Client (eclipse look).launch
@@ -12,17 +12,17 @@
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Riena Demo Client (eclipse look)"/>
<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="true"/>
+<booleanAttribute key="includeOptional" value="false"/>
<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -clean -consolelog"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.registry.nulltoken=true &#13;&#10;-Driena.defaultlogging=true &#13;&#10;-Driena.application.height=700 &#13;&#10;-Driena.application.width=950 &#13;&#10;-Driena.lnf=org.eclipse.riena.demo.client:org.eclipse.riena.demo.client.lnf.EclipseLnf &#13;&#10;-Driena.lnf.update.view=true"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.registry.nulltoken=true &#13;&#10;-Driena.defaultlogging=true &#13;&#10;-Driena.application.height=700 &#13;&#10;-Driena.application.width=950 &#13;&#10;-Driena.application.minimum.height=700&#13;&#10;-Driena.application.minimum.width=950&#13;&#10;-Driena.lnf=org.eclipse.riena.demo.client:org.eclipse.riena.demo.client.lnf.EclipseLnf &#13;&#10;-Driena.lnf.update.view=true"/>
<stringAttribute key="pde.version" value="3.3"/>
<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="org.eclipse.osgi.services@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.jobs@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.commands@default:default,org.eclipse.help@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.apache.log4j@default:default,org.eclipse.riena.navigation@default:default,org.junit@default:default,org.eclipse.riena.communication.core@default:default,org.eclipse.riena.beans.common@default:default,org.eclipse.riena.communication.factory.hessian@default:default,org.eclipse.riena.ui.ridgets@default:default,org.eclipse.riena.navigation.ui@default:default,javax.servlet@default:default,org.easymock@default:default,org.eclipse.riena.ui.swt.rcp@default:false,org.eclipse.riena.ui.ridgets.swt@default:default,org.eclipse.riena.ui.workarea@default:default,com.caucho.hessian@default:default,org.eclipse.core.net@default:default,org.eclipse.riena.demo.client@default:default,org.eclipse.riena.ui.core@default:default,org.eclipse.riena.client@default:default,org.eclipse.riena.ui.filter@default:default,org.eclipse.riena.ui.common@default:default,org.eclipse.riena.demo.common@default:default,org.eclipse.riena.ui.swt@default:default,org.eclipse.riena.core@default:default,org.apache.commons.beanutils@default:default,org.apache.oro@default:default,org.eclipse.riena.navigation.ui.swt@default:default,org.eclipse.riena.communication.console@default:default,org.pushingpixels.trident@default:default,org.eclipse.core.variables@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.expressions@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.ui.workbench@default:default,org.eclipse.core.databinding.observable@default:default,com.ibm.icu@default:default,org.eclipse.jface@default:default,org.eclipse.core.commands@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.app@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.common@2:true,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui@default:default,org.eclipse.core.databinding@default:default,org.eclipse.help@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.core.jobs@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.contenttype@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.apache.log4j@default:default,org.eclipse.riena.navigation@default:default,org.eclipse.riena.communication.core@default:default,org.eclipse.riena.ui.ridgets@default:default,javax.servlet@default:default,org.eclipse.riena.ui.ridgets.swt@default:default,org.eclipse.riena.ui.workarea@default:default,com.caucho.hessian@default:default,org.eclipse.riena.demo.client@default:default,org.eclipse.riena.ui.core@default:default,org.eclipse.riena.client@default:default,org.eclipse.riena.ui.filter@default:default,org.eclipse.riena.ui.common@default:default,org.eclipse.riena.ui.swt@default:default,org.apache.oro@default:default,org.pushingpixels.trident@default:default,org.eclipse.riena.communication.console@default:default,org.eclipse.equinox.log@default:default,org.apache.commons.logging@default:default,org.junit@default:default,org.eclipse.riena.beans.common@default:default,org.eclipse.riena.communication.factory.hessian@default:default,org.eclipse.riena.navigation.ui@default:default,org.easymock@default:default,org.eclipse.riena.ui.swt.rcp@default:false,org.eclipse.riena.demo.client.rcp@default:default,org.eclipse.core.net@default:default,org.eclipse.riena.ui.ridgets.swt.optional@default:default,org.eclipse.riena.demo.common@default:default,org.apache.commons.beanutils@default:default,org.eclipse.riena.core@default:default,org.eclipse.equinox.security@default:default,org.eclipse.riena.navigation.ui.swt@default:default,org.eclipse.core.variables@default:default,org.eclipse.riena.communication.client.ui@default:default,org.eclipse.nebula.widgets.compositetable@default:default"/>
<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.demo.client/Riena Demo Client.launch b/org.eclipse.riena.demo.client/Riena Demo Client.launch
index b4b9fec..4133319 100644
--- a/org.eclipse.riena.demo.client/Riena Demo Client.launch
+++ b/org.eclipse.riena.demo.client/Riena Demo Client.launch
@@ -17,11 +17,11 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -clean -consolelog"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.registry.nulltoken=true -Driena.defaultlogging=true -Driena.application.height=700 -Driena.application.width=950"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.registry.nulltoken=true &#13;&#10;-Driena.defaultlogging=true &#13;&#10;-Driena.application.height=700 &#13;&#10;-Driena.application.width=950&#13;&#10;-Driena.application.minimum.height=700&#13;&#10;-Driena.application.minimum.width=950&#13;&#10;-Driena.lnf.update.view=true"/>
<stringAttribute key="pde.version" value="3.3"/>
<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="org.eclipse.swt@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.log@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.core.expressions@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.jface@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.databinding.beans@default:default,org.apache.commons.logging@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.security@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.ui@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.registry@default:default,com.ibm.icu@default:default,org.eclipse.core.jobs@default:default,org.eclipse.osgi.services@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.security.win32.x86@default:false"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.expressions@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.ui.workbench@default:default,org.eclipse.core.databinding.observable@default:default,com.ibm.icu@default:default,org.eclipse.jface@default:default,org.eclipse.core.commands@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.app@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.common@2:true,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.equinox.log@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui@default:default,org.eclipse.core.databinding@default:default,org.apache.commons.logging@default:default,org.eclipse.help@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.core.jobs@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.core.databinding.beans@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.contenttype@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.apache.log4j@default:default,org.eclipse.riena.navigation@default:default,org.eclipse.riena.communication.core@default:default,org.eclipse.riena.ui.ridgets@default:default,javax.servlet@default:default,org.eclipse.riena.ui.ridgets.swt@default:default,org.eclipse.riena.ui.workarea@default:default,com.caucho.hessian@default:default,org.eclipse.riena.demo.client@default:default,org.eclipse.riena.ui.core@default:default,org.eclipse.riena.client@default:default,org.eclipse.riena.ui.filter@default:default,org.eclipse.riena.ui.common@default:default,org.eclipse.riena.ui.swt@default:default,org.apache.oro@default:default,org.pushingpixels.trident@default:default,org.eclipse.riena.communication.console@default:default,org.junit@default:default,org.eclipse.riena.beans.common@default:default,org.eclipse.riena.communication.factory.hessian@default:default,org.eclipse.riena.navigation.ui@default:default,org.easymock@default:default,org.eclipse.riena.ui.swt.rcp@default:false,org.eclipse.riena.demo.client.rcp@default:default,org.eclipse.core.net@default:default,org.eclipse.riena.demo.common@default:default,org.apache.commons.beanutils@default:default,org.eclipse.riena.core@default:default,org.eclipse.riena.navigation.ui.swt@default:default,org.eclipse.core.variables@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
diff --git a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/CustomerSearchView.java b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/CustomerSearchView.java
index 6bab6c8..ee66535 100644
--- a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/CustomerSearchView.java
+++ b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/CustomerSearchView.java
@@ -16,13 +16,14 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.Text;
import org.eclipse.riena.internal.demo.client.DemoClientUIControlsFactory;
import org.eclipse.riena.navigation.ui.swt.views.SubModuleView;
+import org.eclipse.riena.ui.swt.lnf.LnfKeyConstants;
+import org.eclipse.riena.ui.swt.lnf.LnfManager;
import org.eclipse.riena.ui.swt.utils.UIControlsFactory;
/**
@@ -51,7 +52,7 @@ public class CustomerSearchView extends SubModuleView {
final Label treffer = UIControlsFactory.createLabel(container, "no", SWT.RIGHT, "hits"); //$NON-NLS-1$ //$NON-NLS-2$
treffer.setFont(SWTResourceManager.getFont("Arial", 11, SWT.BOLD)); //$NON-NLS-1$
- treffer.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
+ treffer.setBackground(LnfManager.getLnf().getColor(LnfKeyConstants.SUB_MODULE_BACKGROUND));
treffer.setBounds(665, 110, 33, 19);
final Button openCustomerButton = UIControlsFactory.createButton(container, "&Open", "open"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -62,7 +63,7 @@ public class CustomerSearchView extends SubModuleView {
final Label hitsLabel = UIControlsFactory.createLabel(container, "Hits", SWT.NONE); //$NON-NLS-1$
hitsLabel.setFont(SWTResourceManager.getFont("Arial", 11, SWT.BOLD)); //$NON-NLS-1$
- hitsLabel.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
+ hitsLabel.setBackground(LnfManager.getLnf().getColor(LnfKeyConstants.SUB_MODULE_BACKGROUND));
hitsLabel.setForeground(SWTResourceManager.getColor(0, 0, 1));
hitsLabel.setBounds(703, 110, 30, 19);
diff --git a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/EmailView.java b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/EmailView.java
index 167e915..ea5d5b4 100644
--- a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/EmailView.java
+++ b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/EmailView.java
@@ -65,7 +65,6 @@ public class EmailView extends SubModuleView {
final Label subjectLabel = UIControlsFactory.createLabel(container, "", SWT.NONE, "emailSubject"); //$NON-NLS-1$ //$NON-NLS-2$
subjectLabel.setLocation(103, 254);
subjectLabel.setSize(619, 17);
- subjectLabel.setFont(SWTResourceManager.getFont("Arial", 11, SWT.BOLD)); //$NON-NLS-1$
subjectLabel.setForeground(SWTResourceManager.getColor(1, 1, 1));
l = UIControlsFactory.createLabel(container, "From", SWT.WRAP); //$NON-NLS-1$
diff --git a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/EmailView2.java b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/EmailView2.java
index 21329be..f1fb595 100644
--- a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/EmailView2.java
+++ b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/EmailView2.java
@@ -65,7 +65,6 @@ public class EmailView2 extends SubModuleView {
l.setSize(40, 18);
final Label fromLabel = UIControlsFactory.createLabel(container, "", "emailFrom"); //$NON-NLS-1$ //$NON-NLS-2$
- fromLabel.setFont(boldFont11);
fromLabel.setLocation(103, 277);
fromLabel.setSize(302, 17);