1998-10-30  Marcus G. Daniels  <mgd@chama.santafe.edu>

	* MousetrapObserverSwarm.m ([MousetrapObserverSwarm
	-_setupMousetraps_]): Remove window argument, pick up both
	displayWindow and scheduleItem from instance variables.  Use
	displayWindow instead of window (the former argument).
	([MousetrapObserverSwarm -_displayWindowDeath_:]): Call
	_setupMousetraps_ without argument.
	([MousetrapObserverSwarm -buildObjects]): Likewise.  Setup canvas
	to call _scheduleItemCanvasDeath_ upon closing of scheduleItem
	canvas.
	([MousetrapObserverSwarm -_scheduleItemCanvasDeath_:]): New method.
	([MousetrapObserverSwarm -_update_]): Don't call scheduleItem update 
	unless scheduleItem is non-nil.

	* Mousetrap.m ([Mousetrap -trigger]): Don't call scheduleItem
	trigger unless scheduleItem is non-nil.
	([Mousetrap -trigger]): Don't set trigger info unless scheduleItem
	is non-nil.

1998-09-25  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* MousetrapObserverSwarm.m ([MousetrapObserverSwarm -buildObjects]): 
	Run canvas/scheduleItem setup before _setupMousetraps_.

	* Mousetrap.m ([Mousetrap -trigger]): Run scheduleItem's trigger:
	at the time of drawing the point if SCHEDULE_INSPECTION is defined.

1998-09-24  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* MousetrapModelSwarm.m ([MousetrapModelSwarm -buildActions]): 
	Pass YES instead of 1 to setAutoDrop:.

1998-09-23  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* Mousetrap.m ([Mousetrap -trigger]): Set triggered to YES instead
	of 1.

	* Mousetrap.h (Mousetrap): Make triggered a boolean.

	* MousetrapObserverSwarm.m ([MousetrapObserverSwarm -buildObjects]): 
	If SCHEDULE_INSPECTION is defined, create canvas and scheduleItem.
	([MousetrapObserverSwarm -_update_]): If SCHEDULE_INSPECTION is
	defined, update scheduleItem.

	* MousetrapObserverSwarm.h (MousetrapObserverSwarm): If
	SCHEDULE_INSPECTION is defined, include canvas and scheduleItem
	ivars.

	* MousetrapModelSwarm.[hm]: New method -getSchedule.

	* MousetrapObserverSwarm.m ([MousetrapObserverSwarm
	-_setupMousetraps_:], [MousetrapObserverSwarm -buildObjects],
	[MousetrapObserverSwarm -_displayWindowDeath_:]): Rename to
	_setupMousetraps_.

1998-08-20  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* MousetrapBatchSwarm.m ([MousetrapBatchSwarm -buildObjects]): 
	Use ObjectLoader's fromAppDataFileNamed: instead of fromFileNamed:.

	* Makefile (APPLIBS): Remove.
	(SWARMHOME): Default to 1998-08-20.
	(DATAFILES): Set to {model,batch}.setup.

1998-08-17  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* Makefile: Include Makefile.appl from $(SWARMHOME)/etc/swarm.

1998-04-23  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* MousetrapObserverSwarm.m: Include space.h.

	* MousetrapObserverSwarm.h: Include space.h.
	(MousetrapObserverSwarm): Make triggerGraph an object conforming
	to the EZGraph protcol, and mousetrapDisplay an object
	conforming to the Object2dDisplay protocol.

	* MousetrapModelSwarm.h: Include objectbase/Swarm.h.  Don't
	include objectbase.h.  Don't include activity.h and collections.h.
	(MousetrapModelSwarm): Make grid an object that conforms to the
	Grid2d protocol.

	* Mousetrap.h: Include objectbase/SwarmObject.h instead of
	objectbase.h.  Reformatting throughout.

1998-02-27  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* main.m: Include simtoolsgui.h instead of simtools.h.

	* MousetrapObserverSwarm.m: Don't include collections.h or
	objectbase.h.  Include simtoolsgui.h.

	* MousetrapObserverSwarm.h: Don't include objectbase.h, space.h,
	activity.h, collections.h, or simtools.h.  Include
	simtoolsgui/GUISwarm.h.

	* MousetrapModelSwarm.m: Include simtoolsgui.h.

1998-02-04  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* MousetrapModelSwarm.h: Include from objectbase/ instead of
	swarmobject/.  Include objectbase.h instead of swarmobject.h.

	* Mousetrap.h, MousetrapBatchSwarm.h, MousetrapObserverSwarm.[hm]:
	Include objectbase.h instead of swarmobject.h.

1998-01-27  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* main.m (main): Constify argv.

	* MousetrapObserverSwarm.m ([MousetrapObserverSwarm
	-buildObjects]): Use Colormap not XColormap for colormap.  Revert
	GUI_ButtonRight change.

1998-01-24  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* MousetrapObserverSwarm.m:  Include gui.h.
	([MousetrapObserverSwarm -buildObjects]): Send waitForControlEvent
	to actionCache. Use GUI_ButtonRight instead of ButtonRight.

	* MousetrapObserverSwarm.h (MousetrapObserverSwarm): Make
	colormap conform to Colormap protocol instead of being statically
	typed to XColormap.  Make displayWindow conform to the ZoomRaster
	protocol instead of being statically typed.

	* MousetrapObserverSwarm.h: Include gui.h instead of tkobjc.h.

	* Mousetrap.m: Don't include tkobjc.h.
	Reformatting throughout.

1998-01-15  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* MousetrapObserverSwarm.m ([MousetrapObserverSwarm
	-buildObjects]): Use SET_WINDOW_GEOMETRY_RECORD_NAME for
	triggerGraph and displayWindow.

	* main.m (main): Likewise, but for theTopLevelSwarm.

1998-01-14  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* MousetrapObserverSwarm.m ([MousetrapObserverSwarm -_update_]):
	Checks to see that there is still a displayWindow before
	attempting the draw it.
	([MousetrapObserverSwarm -_updateMousetraps_:]): New method that
	draws all the mousetraps unless there isn't a display window (the
	argument), and sets a trap's display widget.
	([MousetrapObserverSwarm -_displayWindowDeath_:]): New method
	called on destruction of display windows.  Has the effect of
	clearing all the display widgets.
	([MousetrapObserverSwarm -buildObjects]): Call
	enableDestroyNotification using our _displayWindowDeath_ as a
	handler.  Call _updateMousetraps_ (code that was inline).
	([MousetrapObserverSwarm -buildActions]): Use action that
	calls our _update_ instead of displayWindow's drawSelf.

1998-01-13  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* MousetrapModelSwarm.m ([MousetrapModelSwarm -activateIn:]): Use
	CREATE_ARCHIVED_PROBE_DISPLAY to create probe display for
	modelActCont.

	* MousetrapObserverSwarm.m ([MousetrapObserverSwarm -buildObjects]): 
	Likewise, but for mousetrapModelSwarm and MousetrapObserverSwarm.
	* MousetrapObserverSwarm.m ([MousetrapObserverSwarm -activateIn:]): 
	Likewise, but for observerActCont.

	* Makefile (SWARMHOME): Don't define if already defined.  Default is
	swarm-1.0.5.

	* MousetrapModelSwarm.m: Use setWindowGeometryRecordName version
	of createProbeDisplayFor for the model activity controller.

	* MousetrapObserverSwarm.m ([MousetrapObserverSwarm -buildObjects]): 
	Likewise for mousetrapModelSwarm, mousetrapObserverSwarm,
	and the observer activity controller.
	Call setWindowGeometryRecordName for triggerGraph, and mousetrapWorld.

	* MousetrapModelSwarm.[hm]: Reformatting throughout.
	* MousetrapObserverSwarm.[hm]: Likewise.
	* MousetrapBatchSwarm.[hm]: Likewise.

1997-12-20  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* MousetrapObserverSwarm.m: Send doTkEvents to actionCache, not
	controlPanel.

1997-12-10  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* MousetrapModelSwarm.m: Switch from ProbeMap * to id <ProbeMap>
	declaration for probeMap.
	
	* MousetrapObserverSwarm.m: Likewise.

