|
From: <pat...@us...> - 2010-07-13 15:13:52
|
Revision: 1086
http://cishell.svn.sourceforge.net/cishell/?rev=1086&view=rev
Author: pataphil
Date: 2010-07-13 15:13:45 +0000 (Tue, 13 Jul 2010)
Log Message:
-----------
* Fixing build. Hopefully.
Modified Paths:
--------------
trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/GUIModel.java
trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/datasynchronizer/DateDataSynchronizer.java
trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/datasynchronizer/TimeDataSynchronizer.java
Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/GUIModel.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/GUIModel.java 2010-07-12 21:25:00 UTC (rev 1085)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/GUIModel.java 2010-07-13 15:13:45 UTC (rev 1086)
@@ -17,7 +17,6 @@
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DateTime;
import org.eclipse.swt.widgets.List;
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.Widget;
@@ -79,26 +78,38 @@
// TODO: addMultiSelectionDropDown
// TODO: Test this out.
- public GUIModelField<org.joda.time.DateTime, DateTime, DateDataSynchronizer> addDate(
- String name, org.joda.time.DateTime date, Composite parent, int style) {
- DateTime dateSelector = new DateTime(parent, style | SWT.DATE);
+ public GUIModelField<
+ org.joda.time.DateTime, org.eclipse.swt.widgets.DateTime, DateDataSynchronizer>
+ addDate(String name, org.joda.time.DateTime date, Composite parent, int style) {
+ org.eclipse.swt.widgets.DateTime dateSelector =
+ new org.eclipse.swt.widgets.DateTime(parent, style | SWT.DATE);
DateDataSynchronizer dataSynchronizer = new DateDataSynchronizer(dateSelector, date);
- GUIModelField<org.joda.time.DateTime, DateTime, DateDataSynchronizer> field =
- new GUIModelField<org.joda.time.DateTime, DateTime, DateDataSynchronizer>(
- name, date, dateSelector, dataSynchronizer);
+ GUIModelField<
+ org.joda.time.DateTime, org.eclipse.swt.widgets.DateTime, DateDataSynchronizer> field =
+ new GUIModelField<
+ org.joda.time.DateTime,
+ org.eclipse.swt.widgets.DateTime,
+ DateDataSynchronizer>(
+ name, date, dateSelector, dataSynchronizer);
addField(field);
return field;
}
// TODO: Test this out.
- public GUIModelField<org.joda.time.DateTime, DateTime, TimeDataSynchronizer> addTime(
- String name, org.joda.time.DateTime time, Composite parent, int style) {
- DateTime timeSelector = new DateTime(parent, style | SWT.TIME);
+ public GUIModelField<
+ org.joda.time.DateTime, org.eclipse.swt.widgets.DateTime, TimeDataSynchronizer>
+ addTime(String name, org.joda.time.DateTime time, Composite parent, int style) {
+ org.eclipse.swt.widgets.DateTime timeSelector =
+ new org.eclipse.swt.widgets.DateTime(parent, style | SWT.TIME);
TimeDataSynchronizer dataSynchronizer = new TimeDataSynchronizer(timeSelector, time);
- GUIModelField<org.joda.time.DateTime, DateTime, TimeDataSynchronizer> field =
- new GUIModelField<org.joda.time.DateTime, DateTime, TimeDataSynchronizer>(
- name, time, timeSelector, dataSynchronizer);
+ GUIModelField<
+ org.joda.time.DateTime, org.eclipse.swt.widgets.DateTime, TimeDataSynchronizer> field =
+ new GUIModelField<
+ org.joda.time.DateTime,
+ org.eclipse.swt.widgets.DateTime,
+ TimeDataSynchronizer>(
+ name, time, timeSelector, dataSynchronizer);
addField(field);
return field;
Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/datasynchronizer/DateDataSynchronizer.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/datasynchronizer/DateDataSynchronizer.java 2010-07-12 21:25:00 UTC (rev 1085)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/datasynchronizer/DateDataSynchronizer.java 2010-07-13 15:13:45 UTC (rev 1086)
@@ -1,12 +1,12 @@
package org.cishell.utilities.swt.model.datasynchronizer;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.DateTime;
public class DateDataSynchronizer implements ModelDataSynchronizer<org.joda.time.DateTime> {
- private DateTime dateSelector;
+ private org.eclipse.swt.widgets.DateTime dateSelector;
- public DateDataSynchronizer(DateTime dateSelector, org.joda.time.DateTime date) {
+ public DateDataSynchronizer(
+ org.eclipse.swt.widgets.DateTime dateSelector, org.joda.time.DateTime date) {
this.dateSelector = dateSelector;
synchronizeToGUI(date);
}
Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/datasynchronizer/TimeDataSynchronizer.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/datasynchronizer/TimeDataSynchronizer.java 2010-07-12 21:25:00 UTC (rev 1085)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/datasynchronizer/TimeDataSynchronizer.java 2010-07-13 15:13:45 UTC (rev 1086)
@@ -1,12 +1,12 @@
package org.cishell.utilities.swt.model.datasynchronizer;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.DateTime;
public class TimeDataSynchronizer implements ModelDataSynchronizer<org.joda.time.DateTime> {
- private DateTime timeSelector;
+ private org.eclipse.swt.widgets.DateTime timeSelector;
- public TimeDataSynchronizer(DateTime timeSelector, org.joda.time.DateTime time) {
+ public TimeDataSynchronizer(
+ org.eclipse.swt.widgets.DateTime timeSelector, org.joda.time.DateTime time) {
this.timeSelector = timeSelector;
synchronizeToGUI(time);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|