[CIShell-SVN] SF.net SVN: cishell:[1087] trunk/core/org.cishell.utilities/src/org/cishell /utilities

[<pat...@us...>]

Revision: 1087
          http://cishell.svn.sourceforge.net/cishell/?rev=1087&view=rev
Author:   pataphil
Date:     2010-07-13 18:06:07 +0000 (Tue, 13 Jul 2010)

Log Message:
-----------
* Fixing build again.  Hopefully.

Modified Paths:
--------------
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/MapUtilities.java
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/ExpandableComponentWidget.java
    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/MapUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/MapUtilities.java	2010-07-13 15:13:45 UTC (rev 1086)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/MapUtilities.java	2010-07-13 18:06:07 UTC (rev 1087)
@@ -23,6 +23,7 @@
 		return workingKeys;
 	}
 
+	/* Maps items to themselves in a Map. */
 	public static<T> Map<T, T> mirror(Collection<T> items) {
 		Map<T, T> mirroredItems = new HashMap<T, T>();
 

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/ExpandableComponentWidget.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/ExpandableComponentWidget.java	2010-07-13 15:13:45 UTC (rev 1086)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/ExpandableComponentWidget.java	2010-07-13 18:06:07 UTC (rev 1087)
@@ -78,8 +78,6 @@
 			this, this.scrolledAreaGrid, style, arguments, componentCount, this.uniqueComponentCount);
 		this.uniqueComponentCount++;
 
-//		Control componentControlHack = (Control) component;
-//		componentControlHack.setLayoutData(createComponentLayoutData());
 		fixSize();
 
 		this.components.add(component);
@@ -88,7 +86,6 @@
 	}
 
 	public void removeComponent(int index) {
-//		this.components.get(index).dispose();
 		this.scrolledAreaGrid.removeRow(index);
 		this.components.remove(index);
 		fixSize();

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-13 15:13:45 UTC (rev 1086)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/GUIModel.java	2010-07-13 18:06:07 UTC (rev 1087)
@@ -7,12 +7,10 @@
 import java.util.Map;
 
 import org.cishell.utilities.swt.model.datasynchronizer.CheckBoxDataSynchronizer;
-import org.cishell.utilities.swt.model.datasynchronizer.DateDataSynchronizer;
 import org.cishell.utilities.swt.model.datasynchronizer.DropDownDataSynchronizer;
 import org.cishell.utilities.swt.model.datasynchronizer.ModelDataSynchronizer;
 import org.cishell.utilities.swt.model.datasynchronizer.SingleListSelectionDataSynchronizer;
 import org.cishell.utilities.swt.model.datasynchronizer.TextDataSynchronizer;
-import org.cishell.utilities.swt.model.datasynchronizer.TimeDataSynchronizer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
@@ -78,43 +76,44 @@
 	// TODO: addMultiSelectionDropDown
 
 	// TODO: Test this out.
-	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, 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);
+	// TODO: Make it so the build works with this stuff.
+//	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, 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;
+//	}
 
-		return field;
-	}
-
 	// TODO: Test this out.
-	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, 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);
+//	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, 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;
+//	}
 
-		return field;
-	}
-
 	// TODO: addCalendar
 
 	// TODO: Test this out.

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-13 15:13:45 UTC (rev 1086)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/datasynchronizer/DateDataSynchronizer.java	2010-07-13 18:06:07 UTC (rev 1087)
@@ -1,42 +1,42 @@
-package org.cishell.utilities.swt.model.datasynchronizer;
-
-import org.eclipse.swt.SWT;
-
-public class DateDataSynchronizer implements ModelDataSynchronizer<org.joda.time.DateTime> {
-	private org.eclipse.swt.widgets.DateTime dateSelector;
-
-	public DateDataSynchronizer(
-			org.eclipse.swt.widgets.DateTime dateSelector, org.joda.time.DateTime date) {
-		this.dateSelector = dateSelector;
-		synchronizeToGUI(date);
-	}
-
-	public int swtUpdateListenerCode() {
-		return SWT.Selection;
-	}
-
-	public org.joda.time.DateTime value() {
-		return new org.joda.time.DateTime(
-			this.dateSelector.getYear(),
-			this.dateSelector.getMonth(),
-			this.dateSelector.getDay(),
-			0,
-			0,
-			0,
-			0);
-	}
-
-	public org.joda.time.DateTime synchronizeFromGUI() {
-		return value();
-	}
-
-	public org.joda.time.DateTime synchronizeToGUI(org.joda.time.DateTime date) {
-		this.dateSelector.setDate(date.getYear(), date.getMonthOfYear(), date.getDayOfMonth());
-
-		return value();
-	}
-
-	public org.joda.time.DateTime reset(org.joda.time.DateTime defaultValue) {
-		return synchronizeToGUI(defaultValue);
-	}
-}
\ No newline at end of file
+//package org.cishell.utilities.swt.model.datasynchronizer;
+//
+//import org.eclipse.swt.SWT;
+//
+//public class DateDataSynchronizer implements ModelDataSynchronizer<org.joda.time.DateTime> {
+//	private org.eclipse.swt.widgets.DateTime dateSelector;
+//
+//	public DateDataSynchronizer(
+//			org.eclipse.swt.widgets.DateTime dateSelector, org.joda.time.DateTime date) {
+//		this.dateSelector = dateSelector;
+//		synchronizeToGUI(date);
+//	}
+//
+//	public int swtUpdateListenerCode() {
+//		return SWT.Selection;
+//	}
+//
+//	public org.joda.time.DateTime value() {
+//		return new org.joda.time.DateTime(
+//			this.dateSelector.getYear(),
+//			this.dateSelector.getMonth(),
+//			this.dateSelector.getDay(),
+//			0,
+//			0,
+//			0,
+//			0);
+//	}
+//
+//	public org.joda.time.DateTime synchronizeFromGUI() {
+//		return value();
+//	}
+//
+//	public org.joda.time.DateTime synchronizeToGUI(org.joda.time.DateTime date) {
+//		this.dateSelector.setDate(date.getYear(), date.getMonthOfYear(), date.getDayOfMonth());
+//
+//		return value();
+//	}
+//
+//	public org.joda.time.DateTime reset(org.joda.time.DateTime defaultValue) {
+//		return synchronizeToGUI(defaultValue);
+//	}
+//}
\ No newline at end of file

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-13 15:13:45 UTC (rev 1086)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/datasynchronizer/TimeDataSynchronizer.java	2010-07-13 18:06:07 UTC (rev 1087)
@@ -1,43 +1,43 @@
-package org.cishell.utilities.swt.model.datasynchronizer;
-
-import org.eclipse.swt.SWT;
-
-public class TimeDataSynchronizer implements ModelDataSynchronizer<org.joda.time.DateTime> {
-	private org.eclipse.swt.widgets.DateTime timeSelector;
-
-	public TimeDataSynchronizer(
-			org.eclipse.swt.widgets.DateTime timeSelector, org.joda.time.DateTime time) {
-		this.timeSelector = timeSelector;
-		synchronizeToGUI(time);
-	}
-
-	public int swtUpdateListenerCode() {
-		return SWT.Selection;
-	}
-
-	public org.joda.time.DateTime value() {
-		return new org.joda.time.DateTime(
-			0,
-			0,
-			0,
-			this.timeSelector.getHours(),
-			this.timeSelector.getMinutes(),
-			this.timeSelector.getSeconds(),
-			0);
-	}
-
-	public org.joda.time.DateTime synchronizeFromGUI() {
-		return value();
-	}
-
-	public org.joda.time.DateTime synchronizeToGUI(org.joda.time.DateTime time) {
-		this.timeSelector.setTime(
-			time.getHourOfDay(), time.getMinuteOfHour(), time.getSecondOfMinute());
-
-		return value();
-	}
-
-	public org.joda.time.DateTime reset(org.joda.time.DateTime defaultValue) {
-		return synchronizeToGUI(defaultValue);
-	}
-}
\ No newline at end of file
+//package org.cishell.utilities.swt.model.datasynchronizer;
+//
+//import org.eclipse.swt.SWT;
+//
+//public class TimeDataSynchronizer implements ModelDataSynchronizer<org.joda.time.DateTime> {
+//	private org.eclipse.swt.widgets.DateTime timeSelector;
+//
+//	public TimeDataSynchronizer(
+//			org.eclipse.swt.widgets.DateTime timeSelector, org.joda.time.DateTime time) {
+//		this.timeSelector = timeSelector;
+//		synchronizeToGUI(time);
+//	}
+//
+//	public int swtUpdateListenerCode() {
+//		return SWT.Selection;
+//	}
+//
+//	public org.joda.time.DateTime value() {
+//		return new org.joda.time.DateTime(
+//			0,
+//			0,
+//			0,
+//			this.timeSelector.getHours(),
+//			this.timeSelector.getMinutes(),
+//			this.timeSelector.getSeconds(),
+//			0);
+//	}
+//
+//	public org.joda.time.DateTime synchronizeFromGUI() {
+//		return value();
+//	}
+//
+//	public org.joda.time.DateTime synchronizeToGUI(org.joda.time.DateTime time) {
+//		this.timeSelector.setTime(
+//			time.getHourOfDay(), time.getMinuteOfHour(), time.getSecondOfMinute());
+//
+//		return value();
+//	}
+//
+//	public org.joda.time.DateTime reset(org.joda.time.DateTime defaultValue) {
+//		return synchronizeToGUI(defaultValue);
+//	}
+//}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.