summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Kriese2011-05-11 02:59:25 (EDT)
committerSteffen Kriese2011-05-11 02:59:25 (EDT)
commite5c0f7d025cd7251cd08071e789cf9e806a2b483 (patch)
treec3a56b81c64cc68058558cb294eb3277795c91ab
parent57a4dea87f1bcf3c804ff665e9858ae2a255902b (diff)
downloadorg.eclipse.riena-e5c0f7d025cd7251cd08071e789cf9e806a2b483.zip
org.eclipse.riena-e5c0f7d025cd7251cd08071e789cf9e806a2b483.tar.gz
org.eclipse.riena-e5c0f7d025cd7251cd08071e789cf9e806a2b483.tar.bz2
cleaned up the ui of the riena demo client
-rw-r--r--org.eclipse.riena.demo.client/RAP Riena Demo Client (eclipse look).launch4
-rw-r--r--org.eclipse.riena.demo.client/Riena Demo Client (eclipse look).launch6
-rw-r--r--org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/AbstractEmailController.java1
-rw-r--r--org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/CustomerContractController.java2
-rw-r--r--org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/CustomerSearchController.java7
-rw-r--r--org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/lnf/EclipseTheme.java14
-rw-r--r--org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/model/EmailsResult.java (renamed from org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/EmailsResult.java)2
-rw-r--r--org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/model/SearchBean.java (renamed from org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/SearchBean.java)2
-rw-r--r--org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/model/SearchResult.java (renamed from org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/SearchResult.java)2
-rw-r--r--org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/CustomerContractView.java9
-rw-r--r--org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/CustomerOverviewView.java15
-rw-r--r--org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/CustomerSearchView.java27
-rw-r--r--org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/EmailView.java12
-rw-r--r--org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/EmailView2.java18
-rw-r--r--org.eclipse.riena.demo.client/src/org/eclipse/riena/internal/demo/client/DemoClientUIControlsFactory.java7
15 files changed, 61 insertions, 67 deletions
diff --git a/org.eclipse.riena.demo.client/RAP Riena Demo Client (eclipse look).launch b/org.eclipse.riena.demo.client/RAP Riena Demo Client (eclipse look).launch
index 984af02..448b71b 100644
--- a/org.eclipse.riena.demo.client/RAP Riena Demo Client (eclipse look).launch
+++ b/org.eclipse.riena.demo.client/RAP Riena Demo Client (eclipse look).launch
@@ -28,9 +28,9 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="selectedPlugin" value="org.eclipse.rap.ui.workbench"/>
<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="target_bundles" value="org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.rap.rwt.q07@default:false,org.eclipse.core.databinding@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.equinox.servletbridge@default:default,org.eclipse.help@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.contenttype@default:default,com.ibm.icu.base@default:default,org.eclipse.osgi.services@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.databinding.property@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.preferences@default:default,org.mortbay.jetty.server@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.core.jobs@default:default,org.eclipse.core.expressions@default:default,org.eclipse.rap.jface@default:default,org.eclipse.rap.ui@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.rap.ui.workbench@default:default,org.eclipse.rap.jface.databinding@default:default,org.eclipse.rap.rwt@default:default,org.eclipse.equinox.http.servletbridge@default:default,org.eclipse.equinox.http.registry@default:default"/>
+<stringAttribute key="target_bundles" value="org.eclipse.equinox.servletbridge@default:default,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.rap.jface@default:default,org.eclipse.equinox.http.registry@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.rap.rwt@default:default,com.ibm.icu.base@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.http.servletbridge@default:default,org.eclipse.rap.ui@default:default,org.eclipse.equinox.http.jetty@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.rap.ui.workbench@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.common@2:true,org.eclipse.rap.rwt.q07@default:false,org.eclipse.equinox.app@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.commands@default:default,org.eclipse.rap.jface.databinding@default:default,org.eclipse.help@default:default"/>
<booleanAttribute key="tracing" value="true"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="org.eclipse.riena.navigation@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.eclipse.riena.ui.swt.rap@default:default,org.eclipse.riena.ui.ridgets.swt@default:default,org.eclipse.riena.demo.common@default:default,org.eclipse.riena.ui.workarea@default:default,com.caucho.hessian@default:default,org.eclipse.riena.ui.core@default:default,org.eclipse.riena.rap.mocks@default:false,org.eclipse.riena.client@default:default,org.eclipse.riena.ui.filter@default:default,org.eclipse.riena.ui.common@default:default,org.eclipse.riena.demo.client.webtheme@default:false,org.eclipse.riena.demo.client@default:default,org.eclipse.riena.ui.swt@default:default,org.apache.commons.beanutils@default:default,org.eclipse.riena.core@default:default,org.apache.oro@default:default,org.eclipse.riena.navigation.ui.swt@default:default,org.eclipse.riena.communication.console@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.log@default:default,org.apache.commons.logging@default:default"/>
+<stringAttribute key="workspace_bundles" value="org.eclipse.riena.navigation@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.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.demo.client.webtheme@default:false,org.eclipse.riena.ui.common@default:default,org.eclipse.riena.ui.swt.rap@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.eclipse.core.variables@default:default,org.eclipse.riena.rap.mocks@default:false,org.eclipse.equinox.log@default:default,org.apache.commons.logging@default:default"/>
</launchConfiguration>
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 ce98762..7809a6f 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
@@ -6,7 +6,7 @@
<booleanAttribute key="automaticAdd" value="false"/>
<booleanAttribute key="automaticValidate" value="true"/>
<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="org.eclipse.ui.workbench"/>
+<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
@@ -21,8 +21,8 @@
<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_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.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"/>
+<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"/>
<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/src/org/eclipse/riena/demo/client/controllers/AbstractEmailController.java b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/AbstractEmailController.java
index 7674f21..7c1edfc 100644
--- a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/AbstractEmailController.java
+++ b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/AbstractEmailController.java
@@ -18,6 +18,7 @@ import java.util.Date;
import org.eclipse.riena.beans.common.TypedComparator;
import org.eclipse.riena.core.wire.InjectService;
+import org.eclipse.riena.demo.client.model.EmailsResult;
import org.eclipse.riena.demo.common.Customer;
import org.eclipse.riena.demo.common.Email;
import org.eclipse.riena.demo.common.ICustomerService;
diff --git a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/CustomerContractController.java b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/CustomerContractController.java
index 12595f8..da1ea03 100644
--- a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/CustomerContractController.java
+++ b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/CustomerContractController.java
@@ -41,7 +41,7 @@ public class CustomerContractController extends SubModuleController {
final IMasterDetailsRidget master = getRidget(IMasterDetailsRidget.class, "contracts"); //$NON-NLS-1$
master.setDelegate(new ContractDelegate());
final String[] properties = new String[] { "contractNo", "contractValue", "status" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- final String[] headers = new String[] { "contract#", "value", "status" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ final String[] headers = new String[] { "ContractNo", "Value", "Status" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
master.bindToModel(new WritableList(customer.getContracts(), Contract.class), Contract.class, properties,
headers);
}
diff --git a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/CustomerSearchController.java b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/CustomerSearchController.java
index 9f957e6..4e91004 100644
--- a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/CustomerSearchController.java
+++ b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/CustomerSearchController.java
@@ -13,6 +13,8 @@ package org.eclipse.riena.demo.client.controllers;
import java.util.Date;
import org.eclipse.riena.core.wire.InjectService;
+import org.eclipse.riena.demo.client.model.SearchBean;
+import org.eclipse.riena.demo.client.model.SearchResult;
import org.eclipse.riena.demo.common.Customer;
import org.eclipse.riena.demo.common.ICustomerService;
import org.eclipse.riena.navigation.NavigationArgument;
@@ -47,16 +49,15 @@ public class CustomerSearchController extends SubModuleController {
@Override
public void configureRidgets() {
- final ITextRidget suchName = getRidget("searchLastName"); //$NON-NLS-1$
+ final ITextRidget suchName = getRidget(ITextRidget.class, "searchLastName"); //$NON-NLS-1$
suchName.bindToModel(customerSearchBean, "lastName"); //$NON-NLS-1$
suchName.setMandatory(true);
((ILabelRidget) getRidget("hits")).bindToModel(result, "hits"); //$NON-NLS-1$ //$NON-NLS-2$
final ITableRidget kunden = getRidget("result"); //$NON-NLS-1$
- final String[] columnNames = { "lastname", "firstname", "birthdate", "street", "city" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ final String[] columnNames = { "Lastname", "Firstname", "Birthdate", "Street", "City" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
final String[] propertyNames = { "lastName", "firstName", "birthDate", "address.street", "address.city" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-
kunden.bindToModel(result, "customers", Customer.class, propertyNames, columnNames); //$NON-NLS-1$
kunden.setColumnFormatter(2, new DateColumnFormatter("dd.MM.yyyy") { //$NON-NLS-1$
diff --git a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/lnf/EclipseTheme.java b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/lnf/EclipseTheme.java
index f65ca68..ad9d348 100644
--- a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/lnf/EclipseTheme.java
+++ b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/lnf/EclipseTheme.java
@@ -20,7 +20,7 @@ import org.eclipse.riena.ui.swt.lnf.LnfKeyConstants;
import org.eclipse.riena.ui.swt.lnf.rienadefault.RienaDefaultTheme;
/**
- * Theme of the Look and Feel (Lnf) of the example application.
+ * Theme of the Look and Feel (Lnf) of the demo client.
*/
public class EclipseTheme extends RienaDefaultTheme {
@@ -42,10 +42,10 @@ public class EclipseTheme extends RienaDefaultTheme {
lnf.putLnfResource(LnfKeyConstants.SUB_MODULE_ITEM_TOOLTIP_FOREGROUND, new ColorLnfResource(64, 0, 64));
lnf.putLnfResource(LnfKeyConstants.EMBEDDED_TITLEBAR_ACTIVE_BACKGROUND_START_COLOR, new ColorLnfResource(215,
- 214, 231)); // d7d6e7 hell
+ 214, 231));
lnf.putLnfResource(LnfKeyConstants.EMBEDDED_TITLEBAR_ACTIVE_BACKGROUND_END_COLOR, new ColorLnfResource(150,
- 146, 192)); // 9692c0 dunkel
+ 146, 192));
lnf.putLnfResource(LnfKeyConstants.EMBEDDED_TITLEBAR_ACTIVE_BORDER_COLOR, new ColorLnfResource(121, 117, 168));
@@ -55,8 +55,6 @@ public class EclipseTheme extends RienaDefaultTheme {
219, 219));
lnf.putLnfResource(LnfKeyConstants.EMBEDDED_TITLEBAR_PASSIVE_BORDER_COLOR, new ColorLnfResource(183, 183, 183));
- // lnf.putLnfResource("Text.background", new ColorLnfResource(230, 230, 230)); //$NON-NLS-1$
-
lnf.putLnfResource(LnfKeyConstants.SUB_APPLICATION_SWITCHER_TOP_SELECTION_COLOR, new ColorLnfResource(172, 167,
226));
lnf.putLnfResource(LnfKeyConstants.SUB_APPLICATION_SWITCHER_ACTIVE_FOREGROUND, new ColorLnfResource(0, 0, 0));
@@ -71,7 +69,11 @@ public class EclipseTheme extends RienaDefaultTheme {
lnf.putLnfResource(LnfKeyConstants.SUB_APPLICATION_SWITCHER_PASSIVE_BACKGROUND_END_COLOR,
lnf.getLnfResource(LnfKeyConstants.EMBEDDED_TITLEBAR_PASSIVE_BORDER_COLOR));
- //lnf.putLnfResource("Label.foreground", new ColorLnfResource(112, 54, 190)); //$NON-NLS-1$
+ lnf.putLnfResource("Table.background", new ColorLnfResource(255, 255, 255)); //$NON-NLS-1$
+ lnf.putLnfResource("Label.foreground", new ColorLnfResource(0, 0, 0)); //$NON-NLS-1$
+
+ lnf.putLnfResource(LnfKeyConstants.TITLEBAR_SEPARATOR_FIRST_LINE_FOREGROUND, getPrimaryBackground());
+ lnf.putLnfResource(LnfKeyConstants.TITLEBAR_SEPARATOR_SECOND_LINE_FOREGROUND, getPrimaryBackground());
}
private void customizeImages(final ILnfCustomizer lnf) {
diff --git a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/EmailsResult.java b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/model/EmailsResult.java
index 003f3e4..bbb08dd 100644
--- a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/EmailsResult.java
+++ b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/model/EmailsResult.java
@@ -8,7 +8,7 @@
* Contributors:
* compeople AG - initial API and implementation
*******************************************************************************/
-package org.eclipse.riena.demo.client.controllers;
+package org.eclipse.riena.demo.client.model;
import java.util.List;
diff --git a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/SearchBean.java b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/model/SearchBean.java
index f20cba1..90d5beb 100644
--- a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/SearchBean.java
+++ b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/model/SearchBean.java
@@ -8,7 +8,7 @@
* Contributors:
* compeople AG - initial API and implementation
*******************************************************************************/
-package org.eclipse.riena.demo.client.controllers;
+package org.eclipse.riena.demo.client.model;
public class SearchBean {
diff --git a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/SearchResult.java b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/model/SearchResult.java
index 5bc4b21..3812dcc 100644
--- a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/controllers/SearchResult.java
+++ b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/model/SearchResult.java
@@ -8,7 +8,7 @@
* Contributors:
* compeople AG - initial API and implementation
*******************************************************************************/
-package org.eclipse.riena.demo.client.controllers;
+package org.eclipse.riena.demo.client.model;
import java.util.List;
diff --git a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/CustomerContractView.java b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/CustomerContractView.java
index 1c1e5ae..9ea4b11 100644
--- a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/CustomerContractView.java
+++ b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/CustomerContractView.java
@@ -16,7 +16,6 @@ import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
@@ -52,7 +51,7 @@ public class CustomerContractView extends SubModuleView {
final Text lastname = UIControlsFactory.createText(container, SWT.BORDER, "lastname"); //$NON-NLS-1$
lastname.setBounds(235, 62, 182, 32);
- final Group group = new Group(container, SWT.NONE);
+ final Composite group = new Composite(container, SWT.NONE);
group.setBackground(LnfManager.getLnf().getColor(LnfKeyConstants.SUB_MODULE_BACKGROUND));
group.setLayout(new FillLayout());
group.setBounds(130, 120, 537, 310);
@@ -93,10 +92,10 @@ public class CustomerContractView extends SubModuleView {
final Label contractsLabel = DemoClientUIControlsFactory.createSectionLabel(container, "Contracts"); //$NON-NLS-1$
contractsLabel.setBounds(25, 136, 81, 28);
- final Composite composite = UIControlsFactory.createComposite(container, SWT.NONE);
+ final Composite composite = DemoClientUIControlsFactory.createSeparator(container);
composite.setBounds(30, 105, 706, 2);
- final Composite composite2 = UIControlsFactory.createComposite(container, SWT.NONE);
- composite2.setBounds(0, 450, 767, 2);
+ final Composite composite2 = DemoClientUIControlsFactory.createSeparator(container);
+ composite2.setBounds(30, 450, 706, 2);
}
}
diff --git a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/CustomerOverviewView.java b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/CustomerOverviewView.java
index ee28ab6..82d9719 100644
--- a/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/CustomerOverviewView.java
+++ b/org.eclipse.riena.demo.client/src/org/eclipse/riena/demo/client/views/CustomerOverviewView.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.riena.demo.client.views;
-import com.swtdesigner.SWTResourceManager;
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Button;
@@ -94,7 +92,7 @@ public class CustomerOverviewView extends SubModuleView {
openEmailsButton.setBounds(625, 465, 109, 38);
final Group grpUifilter = UIControlsFactory.createGroup(container, "UIFilter"); //$NON-NLS-1$
- grpUifilter.setBounds(576, 340, 190, 89);
+ grpUifilter.setBounds(545, 340, 190, 89);
final Button buttonA = UIControlsFactory.createButtonToggle(grpUifilter, "Restricted Content", "assistent"); //$NON-NLS-1$ //$NON-NLS-2$
buttonA.setBounds(28, 20, 143, 26);
@@ -102,16 +100,13 @@ public class CustomerOverviewView extends SubModuleView {
final Button buttonB = UIControlsFactory.createButtonToggle(grpUifilter, "Add Validation", "mandatory"); //$NON-NLS-1$ //$NON-NLS-2$
buttonB.setBounds(28, 52, 143, 26);
- final Composite composite = new Composite(container, SWT.NONE);
- composite.setBackground(SWTResourceManager.getColor(121, 117, 168));
+ final Composite composite = DemoClientUIControlsFactory.createSeparator(container);
composite.setBounds(30, 110, 706, 2);
- final Composite composite2 = new Composite(container, SWT.NONE);
- composite2.setBackground(SWTResourceManager.getColor(121, 117, 168));
+ final Composite composite2 = DemoClientUIControlsFactory.createSeparator(container);
composite2.setBounds(30, 214, 706, 2);
- final Composite composite3 = new Composite(container, SWT.NONE);
- composite3.setBackground(SWTResourceManager.getColor(121, 117, 168));
- composite3.setBounds(0, 450, 766, 2);
+ final Composite composite3 = DemoClientUIControlsFactory.createSeparator(container);
+ composite3.setBounds(30, 450, 706, 2);
}
}
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 fdcc951..6bab6c8 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
@@ -19,9 +19,9 @@ 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.TableColumn;
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.utils.UIControlsFactory;
@@ -36,31 +36,14 @@ public class CustomerSearchView extends SubModuleView {
final Composite container = new Composite(parent, SWT.NONE);
final Table ergebnis = UIControlsFactory.createTable(container, SWT.BORDER | SWT.FULL_SELECTION, "result"); //$NON-NLS-1$
- ergebnis.setBackground(SWTResourceManager.getColor(255, 255, 254));
ergebnis.setLinesVisible(true);
ergebnis.setHeaderVisible(true);
ergebnis.setBounds(30, 137, 703, 264);
- final TableColumn colLastname = new TableColumn(ergebnis, SWT.NONE);
- colLastname.setWidth(136);
-
- final TableColumn colFirstname = new TableColumn(ergebnis, SWT.NONE);
- colFirstname.setWidth(95);
-
- final TableColumn colBirthdate = new TableColumn(ergebnis, SWT.NONE);
- colBirthdate.setWidth(122);
-
- final TableColumn colStreet = new TableColumn(ergebnis, SWT.NONE);
- colStreet.setWidth(150);
-
- final TableColumn colCity = new TableColumn(ergebnis, SWT.NONE);
- colCity.setWidth(127);
-
final Text suchName = UIControlsFactory.createText(container, SWT.BORDER, "searchLastName"); //$NON-NLS-1$
suchName.setBounds(120, 25, 201, 32);
final Label nameLabel = UIControlsFactory.createLabel(container, "Lastname", SWT.NONE); //$NON-NLS-1$
- nameLabel.setForeground(SWTResourceManager.getColor(1, 0, 0));
nameLabel.setBounds(30, 31, 82, 26);
final Button sucheStarten = UIControlsFactory.createButton(container, "&Search", "search"); //$NON-NLS-1$//$NON-NLS-2$
@@ -83,8 +66,10 @@ public class CustomerSearchView extends SubModuleView {
hitsLabel.setForeground(SWTResourceManager.getColor(0, 0, 1));
hitsLabel.setBounds(703, 110, 30, 19);
- final Composite composite = new Composite(container, SWT.BORDER);
- composite.setBackground(SWTResourceManager.getColor(255, 255, 255));
- composite.setBounds(-12, 86, 1027, 349);
+ final Composite composite1 = DemoClientUIControlsFactory.createSeparator(container);
+ composite1.setBounds(30, 90, 706, 2);
+
+ final Composite composite2 = DemoClientUIControlsFactory.createSeparator(container);
+ composite2.setBounds(30, 450, 706, 2);
}
}
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 e6ea8d2..167e915 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
@@ -22,6 +22,7 @@ import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
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.utils.UIControlsFactory;
@@ -113,14 +114,11 @@ public class EmailView extends SubModuleView {
//create button
final Button openCustomerButton = UIControlsFactory.createButton(container, "Open Customer", "openCustomer"); //$NON-NLS-1$ //$NON-NLS-2$
openCustomerButton.setBounds(580, 474, 133, 38);
- openCustomerButton.setFont(SWTResourceManager.getFont("Arial", 10, SWT.BOLD)); //$NON-NLS-1$
- final Composite composite = UIControlsFactory.createComposite(container, SWT.NONE);
- composite.setBackground(SWTResourceManager.getColor(121, 117, 168));
- composite.setBounds(25, 235, 1054, 2);
+ final Composite composite = DemoClientUIControlsFactory.createSeparator(container);
+ composite.setBounds(25, 235, 706, 2);
- final Composite composite2 = UIControlsFactory.createComposite(container, SWT.NONE);
- composite2.setBackground(SWTResourceManager.getColor(121, 117, 168));
- composite2.setBounds(25, 457, 1054, 2);
+ final Composite composite2 = DemoClientUIControlsFactory.createSeparator(container);
+ composite2.setBounds(25, 457, 706, 2);
}
}
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 c36bba3..21329be 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
@@ -13,6 +13,7 @@ package org.eclipse.riena.demo.client.views;
import com.swtdesigner.SWTResourceManager;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
@@ -21,6 +22,7 @@ import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
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.utils.UIControlsFactory;
@@ -32,6 +34,7 @@ public class EmailView2 extends SubModuleView {
protected void basicCreatePartControl(final Composite parent) {
parent.setLayout(new FillLayout(SWT.VERTICAL));
+ final Font boldFont11 = SWTResourceManager.getFont("Arial", 11, SWT.BOLD); //$NON-NLS-1$
final Composite container = new Composite(parent, SWT.NONE);
final Table table = UIControlsFactory.createTable(container, SWT.SINGLE | SWT.BORDER | SWT.FULL_SELECTION,
@@ -48,6 +51,7 @@ public class EmailView2 extends SubModuleView {
tableColumn2.setWidth(143);
Label l = UIControlsFactory.createLabel(container, "Subject", SWT.WRAP); //$NON-NLS-1$
+ l.setFont(boldFont11);
l.setLocation(25, 254);
l.setSize(58, 18);
@@ -56,14 +60,17 @@ public class EmailView2 extends SubModuleView {
subjectLabel.setSize(619, 17);
l = UIControlsFactory.createLabel(container, "From", SWT.WRAP); //$NON-NLS-1$
+ l.setFont(boldFont11);
l.setLocation(25, 278);
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);
l = UIControlsFactory.createLabel(container, "To", SWT.WRAP); //$NON-NLS-1$
+ l.setFont(boldFont11);
l.setLocation(411, 277);
l.setSize(23, 18);
@@ -72,6 +79,7 @@ public class EmailView2 extends SubModuleView {
toLabel.setSize(282, 17);
l = UIControlsFactory.createLabel(container, "Date", SWT.WRAP); //$NON-NLS-1$
+ l.setFont(boldFont11);
l.setLocation(25, 302);
l.setSize(37, 18);
@@ -87,12 +95,10 @@ public class EmailView2 extends SubModuleView {
final Button openCustomerButton = UIControlsFactory.createButton(container, "Open Customer", "openCustomer"); //$NON-NLS-1$ //$NON-NLS-2$
openCustomerButton.setBounds(580, 474, 133, 38);
- final Composite composite = UIControlsFactory.createComposite(container, SWT.NONE);
- composite.setBackground(SWTResourceManager.getColor(121, 117, 168));
- composite.setBounds(25, 235, 1054, 2);
+ final Composite composite = DemoClientUIControlsFactory.createSeparator(container);
+ composite.setBounds(25, 235, 706, 2);
- final Composite composite2 = UIControlsFactory.createComposite(container, SWT.NONE);
- composite2.setBackground(SWTResourceManager.getColor(121, 117, 168));
- composite2.setBounds(25, 457, 1054, 2);
+ final Composite composite2 = DemoClientUIControlsFactory.createSeparator(container);
+ composite2.setBounds(25, 457, 706, 2);
}
}
diff --git a/org.eclipse.riena.demo.client/src/org/eclipse/riena/internal/demo/client/DemoClientUIControlsFactory.java b/org.eclipse.riena.demo.client/src/org/eclipse/riena/internal/demo/client/DemoClientUIControlsFactory.java
index c38adf2..8b511c2 100644
--- a/org.eclipse.riena.demo.client/src/org/eclipse/riena/internal/demo/client/DemoClientUIControlsFactory.java
+++ b/org.eclipse.riena.demo.client/src/org/eclipse/riena/internal/demo/client/DemoClientUIControlsFactory.java
@@ -13,6 +13,7 @@ package org.eclipse.riena.internal.demo.client;
import com.swtdesigner.SWTResourceManager;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.riena.ui.swt.utils.UIControlsFactory;
@@ -28,4 +29,10 @@ public class DemoClientUIControlsFactory extends UIControlsFactory {
return createLabel;
}
+ public static Composite createSeparator(final Composite parent) {
+ final Composite composite1 = UIControlsFactory.createComposite(parent, SWT.NONE);
+ composite1.setBackground(SWTResourceManager.getColor(121, 117, 168));
+ return composite1;
+ }
+
}