[archstudio-commits] svn commit: r7128 - in /calico/trunk/Calico: ./ .settings/ edu/ edu/umd/ edu/umd/cs/ edu/umd/cs/piccolo/ edu/umd/cs/piccolo/activities/ edu/umd/cs/piccolo/event/ edu/umd/cs/piccolo/nodes/ edu/umd/cs/piccolo/util/ edu/umd/cs/piccolox/ edu/umd/cs/piccolox/activities/ edu/umd/cs/piccolox/event/ edu/umd/cs/piccolox/handles/ edu/umd/cs/piccolox/nodes/ edu/umd/cs/piccolox/pswing/ edu/umd/cs/piccolox/pswing/tests/ edu/umd/cs/piccolox/swing/ edu/umd/cs/piccolox/util/ ics/uci/edu/Calico/Structures/ ics/uci/edu/Calico/UI/ ics/uci/edu/Calico/UI/components/ ics/uci/edu/Calico/UI/components/palettes/ ics/uci/edu/Calico/models/ ics/uci/edu/Calico/models/actions/ ics/uci/edu/Calico/networking/

archstudio-commits-owner at uci.edu archstudio-commits-owner at uci.edu
Wed May 21 12:02:34 PDT 2008


Author: mdempsey
Date: Wed May 21 12:02:33 2008
New Revision: 7128

Log:
Merging MitchNick2 branch with the main trunk (6987:7127)

Added:
    calico/trunk/Calico/edu/
      - copied from r7127, calico/branches/mitchnick2/edu/
    calico/trunk/Calico/edu/umd/
      - copied from r7127, calico/branches/mitchnick2/edu/umd/
    calico/trunk/Calico/edu/umd/cs/
      - copied from r7127, calico/branches/mitchnick2/edu/umd/cs/
    calico/trunk/Calico/edu/umd/cs/piccolo/
      - copied from r7127, calico/branches/mitchnick2/edu/umd/cs/piccolo/
    calico/trunk/Calico/edu/umd/cs/piccolo/PCamera.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/PCamera.java
    calico/trunk/Calico/edu/umd/cs/piccolo/PCanvas.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/PCanvas.java
    calico/trunk/Calico/edu/umd/cs/piccolo/PComponent.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/PComponent.java
    calico/trunk/Calico/edu/umd/cs/piccolo/PInputManager.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/PInputManager.java
    calico/trunk/Calico/edu/umd/cs/piccolo/PLayer.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/PLayer.java
    calico/trunk/Calico/edu/umd/cs/piccolo/PNode.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/PNode.java
    calico/trunk/Calico/edu/umd/cs/piccolo/PRoot.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/PRoot.java
    calico/trunk/Calico/edu/umd/cs/piccolo/activities/
      - copied from r7127, calico/branches/mitchnick2/edu/umd/cs/piccolo/ac=
tivities/
    calico/trunk/Calico/edu/umd/cs/piccolo/activities/PActivity.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/activities/PActivity.java
    calico/trunk/Calico/edu/umd/cs/piccolo/activities/PActivityScheduler.ja=
va
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/activities/PActivityScheduler.java
    calico/trunk/Calico/edu/umd/cs/piccolo/activities/PColorActivity.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/activities/PColorActivity.java
    calico/trunk/Calico/edu/umd/cs/piccolo/activities/PInterpolatingActivit=
y.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/activities/PInterpolatingActivity.java
    calico/trunk/Calico/edu/umd/cs/piccolo/activities/PTransformActivity.ja=
va
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/activities/PTransformActivity.java
    calico/trunk/Calico/edu/umd/cs/piccolo/event/
      - copied from r7127, calico/branches/mitchnick2/edu/umd/cs/piccolo/ev=
ent/
    calico/trunk/Calico/edu/umd/cs/piccolo/event/PBasicInputEventHandler.ja=
va
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/event/PBasicInputEventHandler.java
    calico/trunk/Calico/edu/umd/cs/piccolo/event/PDragEventHandler.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/event/PDragEventHandler.java
    calico/trunk/Calico/edu/umd/cs/piccolo/event/PDragSequenceEventHandler.=
java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/event/PDragSequenceEventHandler.java
    calico/trunk/Calico/edu/umd/cs/piccolo/event/PInputEvent.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/event/PInputEvent.java
    calico/trunk/Calico/edu/umd/cs/piccolo/event/PInputEventFilter.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/event/PInputEventFilter.java
    calico/trunk/Calico/edu/umd/cs/piccolo/event/PInputEventListener.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/event/PInputEventListener.java
    calico/trunk/Calico/edu/umd/cs/piccolo/event/PPanEventHandler.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/event/PPanEventHandler.java
    calico/trunk/Calico/edu/umd/cs/piccolo/event/PZoomEventHandler.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/event/PZoomEventHandler.java
    calico/trunk/Calico/edu/umd/cs/piccolo/nodes/
      - copied from r7127, calico/branches/mitchnick2/edu/umd/cs/piccolo/no=
des/
    calico/trunk/Calico/edu/umd/cs/piccolo/nodes/PImage.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/nodes/PImage.java
    calico/trunk/Calico/edu/umd/cs/piccolo/nodes/PPath.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/nodes/PPath.java
    calico/trunk/Calico/edu/umd/cs/piccolo/nodes/PText.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/nodes/PText.java
    calico/trunk/Calico/edu/umd/cs/piccolo/util/
      - copied from r7127, calico/branches/mitchnick2/edu/umd/cs/piccolo/ut=
il/
    calico/trunk/Calico/edu/umd/cs/piccolo/util/PAffineTransform.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/util/PAffineTransform.java
    calico/trunk/Calico/edu/umd/cs/piccolo/util/PBounds.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/util/PBounds.java
    calico/trunk/Calico/edu/umd/cs/piccolo/util/PDebug.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/util/PDebug.java
    calico/trunk/Calico/edu/umd/cs/piccolo/util/PDimension.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/util/PDimension.java
    calico/trunk/Calico/edu/umd/cs/piccolo/util/PNodeFilter.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/util/PNodeFilter.java
    calico/trunk/Calico/edu/umd/cs/piccolo/util/PObjectOutputStream.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/util/PObjectOutputStream.java
    calico/trunk/Calico/edu/umd/cs/piccolo/util/PPaintContext.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/util/PPaintContext.java
    calico/trunk/Calico/edu/umd/cs/piccolo/util/PPickPath.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/util/PPickPath.java
    calico/trunk/Calico/edu/umd/cs/piccolo/util/PStack.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/util/PStack.java
    calico/trunk/Calico/edu/umd/cs/piccolo/util/PUtil.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolo/util/PUtil.java
    calico/trunk/Calico/edu/umd/cs/piccolox/
      - copied from r7127, calico/branches/mitchnick2/edu/umd/cs/piccolox/
    calico/trunk/Calico/edu/umd/cs/piccolox/PApplet.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/PApplet.java
    calico/trunk/Calico/edu/umd/cs/piccolox/PFrame.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/PFrame.java
    calico/trunk/Calico/edu/umd/cs/piccolox/activities/
      - copied from r7127, calico/branches/mitchnick2/edu/umd/cs/piccolox/a=
ctivities/
    calico/trunk/Calico/edu/umd/cs/piccolox/activities/PPathActivity.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/activities/PPathActivity.java
    calico/trunk/Calico/edu/umd/cs/piccolox/activities/PPositionPathActivit=
y.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/activities/PPositionPathActivity.java
    calico/trunk/Calico/edu/umd/cs/piccolox/event/
      - copied from r7127, calico/branches/mitchnick2/edu/umd/cs/piccolox/e=
vent/
    calico/trunk/Calico/edu/umd/cs/piccolox/event/PNavigationEventHandler.j=
ava
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/event/PNavigationEventHandler.java
    calico/trunk/Calico/edu/umd/cs/piccolox/event/PNotification.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/event/PNotification.java
    calico/trunk/Calico/edu/umd/cs/piccolox/event/PNotificationCenter.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/event/PNotificationCenter.java
    calico/trunk/Calico/edu/umd/cs/piccolox/event/PSelectionEventHandler.ja=
va
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/event/PSelectionEventHandler.java
    calico/trunk/Calico/edu/umd/cs/piccolox/event/PStyledTextEventHandler.j=
ava
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/event/PStyledTextEventHandler.java
    calico/trunk/Calico/edu/umd/cs/piccolox/event/PZoomToEventHandler.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/event/PZoomToEventHandler.java
    calico/trunk/Calico/edu/umd/cs/piccolox/handles/
      - copied from r7127, calico/branches/mitchnick2/edu/umd/cs/piccolox/h=
andles/
    calico/trunk/Calico/edu/umd/cs/piccolox/handles/PBoundsHandle.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/handles/PBoundsHandle.java
    calico/trunk/Calico/edu/umd/cs/piccolox/handles/PHandle.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/handles/PHandle.java
    calico/trunk/Calico/edu/umd/cs/piccolox/handles/PStickyHandleManager.ja=
va
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/handles/PStickyHandleManager.java
    calico/trunk/Calico/edu/umd/cs/piccolox/nodes/
      - copied from r7127, calico/branches/mitchnick2/edu/umd/cs/piccolox/n=
odes/
    calico/trunk/Calico/edu/umd/cs/piccolox/nodes/P3DRect.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/nodes/P3DRect.java
    calico/trunk/Calico/edu/umd/cs/piccolox/nodes/PCacheCamera.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/nodes/PCacheCamera.java
    calico/trunk/Calico/edu/umd/cs/piccolox/nodes/PClip.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/nodes/PClip.java
    calico/trunk/Calico/edu/umd/cs/piccolox/nodes/PComposite.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/nodes/PComposite.java
    calico/trunk/Calico/edu/umd/cs/piccolox/nodes/PLens.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/nodes/PLens.java
    calico/trunk/Calico/edu/umd/cs/piccolox/nodes/PLine.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/nodes/PLine.java
    calico/trunk/Calico/edu/umd/cs/piccolox/nodes/PNodeCache.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/nodes/PNodeCache.java
    calico/trunk/Calico/edu/umd/cs/piccolox/nodes/PStyledText.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/nodes/PStyledText.java
    calico/trunk/Calico/edu/umd/cs/piccolox/pswing/
      - copied from r7127, calico/branches/mitchnick2/edu/umd/cs/piccolox/p=
swing/
    calico/trunk/Calico/edu/umd/cs/piccolox/pswing/PComboBox.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/pswing/PComboBox.java
    calico/trunk/Calico/edu/umd/cs/piccolox/pswing/PSwing.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/pswing/PSwing.java
    calico/trunk/Calico/edu/umd/cs/piccolox/pswing/PSwingCanvas.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/pswing/PSwingCanvas.java
    calico/trunk/Calico/edu/umd/cs/piccolox/pswing/PSwingEventHandler.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/pswing/PSwingEventHandler.java
    calico/trunk/Calico/edu/umd/cs/piccolox/pswing/PSwingMouseEvent.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/pswing/PSwingMouseEvent.java
    calico/trunk/Calico/edu/umd/cs/piccolox/pswing/PSwingMouseMotionEvent.j=
ava
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/pswing/PSwingMouseMotionEvent.java
    calico/trunk/Calico/edu/umd/cs/piccolox/pswing/PSwingRepaintManager.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/pswing/PSwingRepaintManager.java
    calico/trunk/Calico/edu/umd/cs/piccolox/pswing/readme.txt
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/pswing/readme.txt
    calico/trunk/Calico/edu/umd/cs/piccolox/pswing/tests/
      - copied from r7127, calico/branches/mitchnick2/edu/umd/cs/piccolox/p=
swing/tests/
    calico/trunk/Calico/edu/umd/cs/piccolox/pswing/tests/TestPSwing.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/pswing/tests/TestPSwing.java
    calico/trunk/Calico/edu/umd/cs/piccolox/pswing/tests/TestPSwingFull.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/pswing/tests/TestPSwingFull.java
    calico/trunk/Calico/edu/umd/cs/piccolox/swing/
      - copied from r7127, calico/branches/mitchnick2/edu/umd/cs/piccolox/s=
wing/
    calico/trunk/Calico/edu/umd/cs/piccolox/swing/PCacheCanvas.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/swing/PCacheCanvas.java
    calico/trunk/Calico/edu/umd/cs/piccolox/swing/PDefaultScrollDirector.ja=
va
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/swing/PDefaultScrollDirector.java
    calico/trunk/Calico/edu/umd/cs/piccolox/swing/PScrollDirector.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/swing/PScrollDirector.java
    calico/trunk/Calico/edu/umd/cs/piccolox/swing/PScrollPane.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/swing/PScrollPane.java
    calico/trunk/Calico/edu/umd/cs/piccolox/swing/PScrollPaneLayout.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/swing/PScrollPaneLayout.java
    calico/trunk/Calico/edu/umd/cs/piccolox/swing/PViewport.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/swing/PViewport.java
    calico/trunk/Calico/edu/umd/cs/piccolox/util/
      - copied from r7127, calico/branches/mitchnick2/edu/umd/cs/piccolox/u=
til/
    calico/trunk/Calico/edu/umd/cs/piccolox/util/LineShape.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/util/LineShape.java
    calico/trunk/Calico/edu/umd/cs/piccolox/util/MutablePoints.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/util/MutablePoints.java
    calico/trunk/Calico/edu/umd/cs/piccolox/util/PBoundsLocator.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/util/PBoundsLocator.java
    calico/trunk/Calico/edu/umd/cs/piccolox/util/PFixedWidthStroke.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/util/PFixedWidthStroke.java
    calico/trunk/Calico/edu/umd/cs/piccolox/util/PLocator.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/util/PLocator.java
    calico/trunk/Calico/edu/umd/cs/piccolox/util/PNodeLocator.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/util/PNodeLocator.java
    calico/trunk/Calico/edu/umd/cs/piccolox/util/POcclusionDetection.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/util/POcclusionDetection.java
    calico/trunk/Calico/edu/umd/cs/piccolox/util/Points.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/util/Points.java
    calico/trunk/Calico/edu/umd/cs/piccolox/util/XYArray.java
      - copied unchanged from r7127, calico/branches/mitchnick2/edu/umd/cs/=
piccolox/util/XYArray.java
    calico/trunk/Calico/ics/uci/edu/Calico/UI/components/palettes/
      - copied from r7127, calico/branches/mitchnick2/ics/uci/edu/Calico/UI=
/components/palettes/
    calico/trunk/Calico/ics/uci/edu/Calico/UI/components/palettes/ByteFaker=
.java
      - copied unchanged from r7127, calico/branches/mitchnick2/ics/uci/edu=
/Calico/UI/components/palettes/ByteFaker.java
    calico/trunk/Calico/ics/uci/edu/Calico/UI/components/palettes/CellConte=
nts.java
      - copied unchanged from r7127, calico/branches/mitchnick2/ics/uci/edu=
/Calico/UI/components/palettes/CellContents.java
    calico/trunk/Calico/ics/uci/edu/Calico/UI/components/palettes/PaletteCo=
mmand.java
      - copied unchanged from r7127, calico/branches/mitchnick2/ics/uci/edu=
/Calico/UI/components/palettes/PaletteCommand.java
    calico/trunk/Calico/ics/uci/edu/Calico/UI/components/palettes/Palettes.=
java
      - copied unchanged from r7127, calico/branches/mitchnick2/ics/uci/edu=
/Calico/UI/components/palettes/Palettes.java
    calico/trunk/Calico/ics/uci/edu/Calico/models/SetScrapTransparency.java
      - copied unchanged from r7127, calico/branches/mitchnick2/ics/uci/edu=
/Calico/models/SetScrapTransparency.java
    calico/trunk/Calico/ics/uci/edu/Calico/models/actions/PaletteItemDelete=
d.java
      - copied unchanged from r7127, calico/branches/mitchnick2/ics/uci/edu=
/Calico/models/actions/PaletteItemDeleted.java
    calico/trunk/Calico/ics/uci/edu/Calico/models/actions/PaletteItemMoved.=
java
      - copied unchanged from r7127, calico/branches/mitchnick2/ics/uci/edu=
/Calico/models/actions/PaletteItemMoved.java
    calico/trunk/Calico/ics/uci/edu/Calico/models/actions/PaletteItemSet.ja=
va
      - copied unchanged from r7127, calico/branches/mitchnick2/ics/uci/edu=
/Calico/models/actions/PaletteItemSet.java
    calico/trunk/Calico/ics/uci/edu/Calico/models/actions/PaletteItemUsed.j=
ava
      - copied unchanged from r7127, calico/branches/mitchnick2/ics/uci/edu=
/Calico/models/actions/PaletteItemUsed.java
    calico/trunk/Calico/ics/uci/edu/Calico/models/actions/PaletteLoaded.java
      - copied unchanged from r7127, calico/branches/mitchnick2/ics/uci/edu=
/Calico/models/actions/PaletteLoaded.java
    calico/trunk/Calico/ics/uci/edu/Calico/models/actions/PaletteSaved.java
      - copied unchanged from r7127, calico/branches/mitchnick2/ics/uci/edu=
/Calico/models/actions/PaletteSaved.java
    calico/trunk/Calico/ics/uci/edu/Calico/models/actions/PaletteUnloaded.j=
ava
      - copied unchanged from r7127, calico/branches/mitchnick2/ics/uci/edu=
/Calico/models/actions/PaletteUnloaded.java
    calico/trunk/Calico/ics/uci/edu/Calico/networking/CalicoCommand.java
      - copied unchanged from r7127, calico/branches/mitchnick2/ics/uci/edu=
/Calico/networking/CalicoCommand.java
    calico/trunk/Calico/ics/uci/edu/Calico/networking/CalicoPacket.java
      - copied unchanged from r7127, calico/branches/mitchnick2/ics/uci/edu=
/Calico/networking/CalicoPacket.java
    calico/trunk/Calico/ics/uci/edu/Calico/networking/Networking2.java
      - copied unchanged from r7127, calico/branches/mitchnick2/ics/uci/edu=
/Calico/networking/Networking2.java
Removed:
    calico/trunk/Calico/ics/uci/edu/Calico/UI/components/Palettes.java
Modified:
    calico/trunk/Calico/.classpath
    calico/trunk/Calico/.fatjar
    calico/trunk/Calico/.settings/org.eclipse.jdt.core.prefs
    calico/trunk/Calico/build.sh
    calico/trunk/Calico/ics/uci/edu/Calico/Structures/BGElementController.j=
ava
    calico/trunk/Calico/ics/uci/edu/Calico/Structures/ScrapController.java
    calico/trunk/Calico/ics/uci/edu/Calico/UI/BGElementPainter.java
    calico/trunk/Calico/ics/uci/edu/Calico/UI/Calico.java
    calico/trunk/Calico/ics/uci/edu/Calico/UI/CalicoCanvas.java
    calico/trunk/Calico/ics/uci/edu/Calico/UI/CalicoOptions.java
    calico/trunk/Calico/ics/uci/edu/Calico/UI/MouseInputHandler.java
    calico/trunk/Calico/ics/uci/edu/Calico/UI/ScrapPainter.java
    calico/trunk/Calico/ics/uci/edu/Calico/UI/components/CalicoGrid.java
    calico/trunk/Calico/ics/uci/edu/Calico/UI/components/Menu.java
    calico/trunk/Calico/ics/uci/edu/Calico/UI/components/ZoomSlider.java
    calico/trunk/Calico/ics/uci/edu/Calico/models/CalicoLogger.java
    calico/trunk/Calico/ics/uci/edu/Calico/models/ObjectHandlerModel.java
    calico/trunk/Calico/ics/uci/edu/Calico/networking/NetworkPacket.java
    calico/trunk/Calico/run.sh

Modified: calico/trunk/Calico/.classpath
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- calico/trunk/Calico/.classpath (original)
+++ calico/trunk/Calico/.classpath Wed May 21 12:02:33 2008
@@ -5,8 +5,6 @@
 	<classpathentry kind=3D"lib" path=3D"lib/ant.jar"/>
 	<classpathentry kind=3D"lib" path=3D"lib/junit.jar"/>
 	<classpathentry kind=3D"lib" path=3D"examples.jar"/>
-	<classpathentry kind=3D"lib" path=3D"piccolo.jar"/>
-	<classpathentry kind=3D"lib" path=3D"piccolox.jar"/>
 	<classpathentry kind=3D"lib" path=3D"tests.jar"/>
 	<classpathentry kind=3D"output" path=3D""/>
 </classpath>

Modified: calico/trunk/Calico/.fatjar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- calico/trunk/Calico/.fatjar (original)
+++ calico/trunk/Calico/.fatjar Wed May 21 12:02:33 2008
@@ -1,5 +1,5 @@
 #Fat Jar Configuration File
-#Mon Apr 21 13:07:58 PDT 2008
+#Thu May 08 06:22:59 PDT 2008
 onejar.license.required=3Dtrue
 manifest.classpath=3D
 manifest.removesigners=3Dtrue
@@ -10,5 +10,5 @@
 manifest.file=3D<createnew>
 jarname.isextern=3Dfalse
 onejar.expand=3D
-excludes=3D<po|Calico>~.settings/~.svn/;<po|Calico>~.svn/;<po|Calico>~Logs=
/;<po|Calico>~Calico.jar;<po|Calico>~Calico.zip;<po|Calico>~config.cfg;<po|=
Calico>~redo.png;<po|Calico>~undo.png
+excludes=3D<po|CalicoMitchNick>~Calico;<po|CalicoMitchNick>~Calico.jar;<po=
|CalicoMitchNick>~Calico.zip
 includes=3D

Modified: calico/trunk/Calico/.settings/org.eclipse.jdt.core.prefs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- calico/trunk/Calico/.settings/org.eclipse.jdt.core.prefs (original)
+++ calico/trunk/Calico/.settings/org.eclipse.jdt.core.prefs Wed May 21 12:=
02:33 2008
@@ -1,12 +1,66 @@
-#Sun Dec 09 20:12:17 PST 2007
-eclipse.preferences.version=3D1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=3Denabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=3D1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=3Dpreserve
-org.eclipse.jdt.core.compiler.compliance=3D1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=3Dgenerate
-org.eclipse.jdt.core.compiler.debug.localVariable=3Dgenerate
-org.eclipse.jdt.core.compiler.debug.sourceFile=3Dgenerate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=3Derror
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=3Derror
-org.eclipse.jdt.core.compiler.source=3D1.5
+#Tue Apr 29 14:46:32 PDT 2008
+eclipse.preferences.version=3D1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=3Denabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=3D1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=3Dpreserve
+org.eclipse.jdt.core.compiler.compliance=3D1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=3Dgenerate
+org.eclipse.jdt.core.compiler.debug.localVariable=3Dgenerate
+org.eclipse.jdt.core.compiler.debug.sourceFile=3Dgenerate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=3Dwarning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=3Derror
+org.eclipse.jdt.core.compiler.problem.autoboxing=3Dignore
+org.eclipse.jdt.core.compiler.problem.deprecation=3Dwarning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=3Ddisabl=
ed
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedM=
ethod=3Ddisabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=3Dwarning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=3Dignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=3Derror
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=3Dignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=3Denabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=3Dignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=3Dwarning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=3D=
warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=3Derror
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=3Dwarning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMet=
hod=3Dwarning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=3Dignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=3Dignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=3Dignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=3Dwarning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=3Dignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=3Dignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=3Dwarning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=3Dwarning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=3Dwarning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=3Dignore
+org.eclipse.jdt.core.compiler.problem.nullReference=3Dignore
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=3Dwar=
ning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=3Dignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=
=3Dignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=3Dignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=3Dwarning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=3Dignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=3Ddisabl=
ed
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=3Dwarning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=3Denabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=3Dignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=3Dwarning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=3Dwarning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=3Dignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=3Dwarning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=3Dignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=3Dignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=3Dignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=3Digno=
re
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOve=
rriding=3Ddisabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=3Dignore
+org.eclipse.jdt.core.compiler.problem.unusedLabel=3Dwarning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=3Dwarning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=3Dignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentRefe=
rence=3Denabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstr=
act=3Ddisabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcret=
e=3Ddisabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=3Dwarning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=3Dwarning
+org.eclipse.jdt.core.compiler.source=3D1.5

Modified: calico/trunk/Calico/build.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- calico/trunk/Calico/build.sh (original)
+++ calico/trunk/Calico/build.sh Wed May 21 12:02:33 2008
@@ -3,10 +3,10 @@
 echo -n > files.txt
 #find ucigame/ -type f -iname '*.java' >> files.txt
 =

-find org/json/me -type f -iname '*.java' >> files.txt
-find edu/umd/cs/piccolo/ -type f -iname '*.java' >> files.txt
-find ics/uci/edu/Calico/ -type f -iname '*.java' >> files.txt
+find org/ -type f -iname '*.java' >> files.txt
+find edu/ -type f -iname '*.java' >> files.txt
+find ics/ -type f -iname '*.java' >> files.txt
 =

 #-Xlint:unchecked
-javac  -cp .:bin/piccolo.jar:bin/piccolox.jar -d bin @files.txt
+javac -d bin @files.txt
 rm files.txt

Modified: calico/trunk/Calico/ics/uci/edu/Calico/Structures/BGElementContro=
ller.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- calico/trunk/Calico/ics/uci/edu/Calico/Structures/BGElementController.j=
ava (original)
+++ calico/trunk/Calico/ics/uci/edu/Calico/Structures/BGElementController.j=
ava Wed May 21 12:02:33 2008
@@ -30,7 +30,7 @@
 		return new BGElementModel(p, c, bge.id);
 	}
 	=

-	public static boolean contianedBy(BGElementModel bge, Polygon p) {
+	public static boolean containedBy(BGElementModel bge, Polygon p) {
 		boolean ret =3D true;
 		for (int i =3D 0; i < bge.poly.npoints; i++)
 			if (!p.contains(bge.poly.xpoints[i], bge.poly.ypoints[i]))

Modified: calico/trunk/Calico/ics/uci/edu/Calico/Structures/ScrapController=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- calico/trunk/Calico/ics/uci/edu/Calico/Structures/ScrapController.java =
(original)
+++ calico/trunk/Calico/ics/uci/edu/Calico/Structures/ScrapController.java =
Wed May 21 12:02:33 2008
@@ -21,8 +21,8 @@
 		return scrap.encasingPoly.intersects(bounds);
 	}
 	=

-	public static boolean intersects(ScrapModel scrap, Polygon p) {
-		return DragHistory.intersect(scrap.encasingPoly, p);
+	public static boolean intersects(Polygon scrap, Polygon p) {
+		return DragHistory.intersect(scrap, p);
 	}
 	=

 	public static boolean containsPoint(ScrapModel scrap, Point2D p) {

Modified: calico/trunk/Calico/ics/uci/edu/Calico/UI/BGElementPainter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- calico/trunk/Calico/ics/uci/edu/Calico/UI/BGElementPainter.java (origin=
al)
+++ calico/trunk/Calico/ics/uci/edu/Calico/UI/BGElementPainter.java Wed May=
 21 12:02:33 2008
@@ -19,6 +19,8 @@
 	Color color;
 	int id;
 	Stroke stroke;
+
+	private static final long serialVersionUID =3D 1L;
 	=

 	public BGElementPainter() {
 		color =3D Color.black;
@@ -60,6 +62,15 @@
 		return line;
 	}*/
 	=

+	public Polygon getPoly() {
+		Polygon ret =3D new Polygon();
+		for (int i =3D 0; i < this.getPointCount(); i++) {
+			ret.addPoint(new Double(getLineReference().getX(i)).intValue(), =

+					new Double(getLineReference().getY(i)).intValue());
+		}
+		return ret;
+	}
+	=

 	public void setColor(Color c) {
 		color =3D c;
 	}

Modified: calico/trunk/Calico/ics/uci/edu/Calico/UI/Calico.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- calico/trunk/Calico/ics/uci/edu/Calico/UI/Calico.java (original)
+++ calico/trunk/Calico/ics/uci/edu/Calico/UI/Calico.java Wed May 21 12:02:=
33 2008
@@ -1,12 +1,7 @@
 package ics.uci.edu.Calico.UI;
 =

-import ics.uci.edu.Calico.UI.components.Panning;
-import ics.uci.edu.Calico.UI.components.PenColorChooser;
-import ics.uci.edu.Calico.UI.components.Undo;
-import ics.uci.edu.Calico.UI.components.CalicoGrid;
-import ics.uci.edu.Calico.UI.components.Palettes;
-import ics.uci.edu.Calico.UI.components.Zoom;
-import ics.uci.edu.Calico.UI.components.ZoomSlider;
+import ics.uci.edu.Calico.UI.components.*;
+import ics.uci.edu.Calico.UI.components.palettes.*;
 import ics.uci.edu.Calico.models.CalicoLogger;
 import ics.uci.edu.Calico.UI.CalicoOptions;
 import ics.uci.edu.Calico.networking.Networking;
@@ -57,7 +52,7 @@
 		=

 		=

 		=

-        setTitle("Calico V0.9.0.0.1 Alpha Client");
+        setTitle("Calico V2.01");
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         =

         //Setup Canvas
@@ -99,7 +94,7 @@
 		// will be displayed on the screen.
 		canvas.removeInputEventListener(canvas.getPanEventHandler());
 		canvas.removeInputEventListener(canvas.getZoomEventHandler());
-		canvas.addInputEventListener(new MouseInputHandler(canvas));
+		//canvas.addInputEventListener(new MouseInputHandler(canvas));
 		=

 		getContentPane().add(canvas);
         pack();

Modified: calico/trunk/Calico/ics/uci/edu/Calico/UI/CalicoCanvas.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- calico/trunk/Calico/ics/uci/edu/Calico/UI/CalicoCanvas.java (original)
+++ calico/trunk/Calico/ics/uci/edu/Calico/UI/CalicoCanvas.java Wed May 21 =
12:02:33 2008
@@ -20,6 +20,7 @@
 import ics.uci.edu.Calico.models.ObjectHandlerModel;
 import ics.uci.edu.Calico.models.RelationshipModel;
 import ics.uci.edu.Calico.models.ScrapModel;
+import ics.uci.edu.Calico.models.SetScrapTransparency;
 import ics.uci.edu.Calico.models.actions.*;
 import ics.uci.edu.Calico.UI.CalicoCanvas;
 import ics.uci.edu.Calico.UI.components.CalicoGrid;
@@ -243,6 +244,9 @@
 		else if (action instanceof PenColorChanged) {
 			penColorChanged((PenColorChanged)action);
 		}
+		else if (action instanceof SetScrapTransparency) {
+			setScrapTransparency((SetScrapTransparency)action);
+		}
 		else {
 			//System.err.println("PrimaryFrame:applyAction() improper action passed=
: " + action);
 		}
@@ -256,6 +260,11 @@
 		return ret;
 	}
 	=

+	private void setScrapTransparency(SetScrapTransparency action) {
+		ScrapPainter painter =3D getScrap(action.scrapId);
+		painter.setTransparency(action.transparency);		=

+	}
+
 	private void penColorChanged(PenColorChanged action) {
 		setPenColor(action.color);	=

 	}
@@ -319,12 +328,31 @@
 		=

 		ScrapPainter painter =3D getScrap(action.scrapId);
 		ScrapModel model =3D painter.getModel();
+		Polygon bge;
+		boolean dropped;
 		=

 		BGElementPainter bgePainter;
 		for (int i =3D 0; i < model.encasedFigures.size(); i++) {
+			dropped =3D false;
 			bgePainter =3D new BGElementPainter(
 					new BGElementModel(model.encasedFigures.get(i), model.encasedFigureCo=
lors.get(i), objectIdTicker++));
-			getLayer().addChild(0, bgePainter);
+			//check if there's another scrap to drop it on to
+			for (int j =3D getLayer().getChildrenCount() - 1; j >=3D 0; j--) {
+				=

+				bge =3D bgePainter.getPoly();
+				if (getLayer().getChild(j) instanceof ScrapPainter &&
+						((ScrapPainter)getLayer().getChild(j)).contains(bge) && =

+						((ScrapPainter)getLayer().getChild(j)).getModel().id !=3D action.scr=
apId) {
+					//drop it on to that scrap
+					((ScrapPainter)getLayer().getChild(j)).getModel().encasedFigures.add(=
bge);
+					((ScrapPainter)getLayer().getChild(j)).getModel().encasedFigureColors=
.add(bgePainter.getColor());
+					//((ScrapPainter)getLayer().getChild(j)).repaint();
+					dropped =3D true;
+				}
+			}
+			if (!dropped)
+				getLayer().addChild(0, bgePainter);
+			//getLayer().addChild(0, bgePainter);
 		}
 		=

 		deleteScraps(new DeleteScraps(new int[]{action.scrapId}));		=

@@ -481,7 +509,7 @@
 		for (int i =3D getLayer().getChildrenCount() - 1; i >=3D 0; i--) {
 			if (getLayer().getChild(i) instanceof BGElementPainter) {
 				bgeModel =3D ((BGElementPainter)getLayer().getChild(i)).getModel();
-				if (BGElementController.contianedBy(bgeModel, action.p)) {
+				if (BGElementController.containedBy(bgeModel, action.p)) {
 					getLayer().removeChild(i);
 					ScrapController.addDrawingFigure(
 							temp, =

@@ -785,6 +813,14 @@
 		return latestAction;
 	}
 	=

+	public void clearInvalidNodes() {
+		for (int i =3D getLayer().getChildrenCount() - 1; i > -1; i--) {
+			if (getLayer().getChild(i) instanceof BGElementPainter &&
+					((BGElementPainter)getLayer().getChild(i)).getId() < 0)
+				getLayer().removeChild(i);
+		}
+	}
+	=

 }
 =

 =


Modified: calico/trunk/Calico/ics/uci/edu/Calico/UI/CalicoOptions.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- calico/trunk/Calico/ics/uci/edu/Calico/UI/CalicoOptions.java (original)
+++ calico/trunk/Calico/ics/uci/edu/Calico/UI/CalicoOptions.java Wed May 21=
 12:02:33 2008
@@ -29,13 +29,15 @@
 =

 public class CalicoOptions
 {
+	public static boolean debug =3D true;
+	=

 	// Palettes
 	public static int pal_rows =3D 5;
 	public static int pal_cols =3D 2;
 	public static String pal_server =3D "127.0.0.1";
 	public static int pal_port =3D 8787;
 	public static int pal_timeout =3D 1000;
-	public static String pal_savetype =3D "SERVER"; // SERVER, FILE, BOTH?
+	public static String pal_savetype =3D "FILE"; // SERVER, FILE, BOTH?
 	=

 	// Grid
 	public static int grid_rows =3D 14;
@@ -64,6 +66,14 @@
 	// Networking
 	public static int network_port =3D 6112;
 	=

+	public static void debug(String str)
+	{
+		if(debug)
+		{
+			System.out.println("DEBUG: " + str);
+		}
+	}
+	=

 	// =

 =

 	public static void setDefaults()
@@ -73,6 +83,12 @@
 		calico_pencolors.add(Color.RED);
 		calico_pencolors.add(Color.BLUE);
 		=

+		modules_active.add("PALETTES");
+		modules_active.add("PENCOLOR");
+		modules_active.add("ZOOM");
+		modules_active.add("PAN");
+		=

+		=

 		/*calico_bgcolors.add(Color.WHITE);
 		calico_bgcolors.add(Color.WHITE);
 		calico_bgcolors.add(Color.WHITE);

Modified: calico/trunk/Calico/ics/uci/edu/Calico/UI/MouseInputHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- calico/trunk/Calico/ics/uci/edu/Calico/UI/MouseInputHandler.java (origi=
nal)
+++ calico/trunk/Calico/ics/uci/edu/Calico/UI/MouseInputHandler.java Wed Ma=
y 21 12:02:33 2008
@@ -1,36 +1,18 @@
 package ics.uci.edu.Calico.UI;
 =

-import ics.uci.edu.Calico.Structures.BGElementController;
-import ics.uci.edu.Calico.Structures.RelationshipController;
-import ics.uci.edu.Calico.Structures.ScrapController;
+import ics.uci.edu.Calico.Structures.*;
 import ics.uci.edu.Calico.UI.ScrapPainter.ScrapWidgetItem;
-import ics.uci.edu.Calico.UI.components.Bucket;
-import ics.uci.edu.Calico.UI.components.CalicoGrid;
-import ics.uci.edu.Calico.UI.components.Palettes;
-import ics.uci.edu.Calico.UI.components.GridNavPointer;
-import ics.uci.edu.Calico.UI.components.GridNavThumb;
-import ics.uci.edu.Calico.UI.components.Panning;
-import ics.uci.edu.Calico.UI.components.Undo;
-import ics.uci.edu.Calico.UI.components.Zoom;
-import ics.uci.edu.Calico.UI.components.ZoomSlider;
+import ics.uci.edu.Calico.UI.components.*;
+import ics.uci.edu.Calico.UI.components.palettes.*;
 import ics.uci.edu.Calico.UI.CalicoCanvas;
-import ics.uci.edu.Calico.UI.components.Palettes.CellContents;
 import ics.uci.edu.Calico.models.ScrapModel;
+import ics.uci.edu.Calico.models.SetScrapTransparency;
 import ics.uci.edu.Calico.models.actions.*;
 =

-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Point;
-import java.awt.Polygon;
-import java.awt.geom.Line2D;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Vector;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.awt.*;
+import java.awt.geom.*;
+import java.util.*;
+import java.util.concurrent.*;
 =

 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
@@ -53,7 +35,7 @@
 //note, this class is a bit unwieldy.
 public class MouseInputHandler extends PBasicInputEventHandler {
 =

-	=

+
 	public static int NULL =3D -1;
 	public static int DRAW =3D 1;
 	public static int SCRAP_DRAG =3D 2;
@@ -66,68 +48,69 @@
 	public static int ERASE =3D 9;
 	public static int UNDO =3D 10;
 	public static int GENERIC_WIDGET =3D 11;
-	=

+
 =

 	private boolean mousePressed =3D false;
-	=

-	=

-	=

+
+	public HashMap<Integer,Point2D> dragCoords;
+
 	protected DragHistory hist;
 	//pathLines are temporary
 	protected Vector<BGElementPainter> pathLines;
 	protected Vector<MouseEv> mouseEventQueue;
-	=

+
 	//This is mainly to see if it was just a click.
 	private boolean cameraElem =3D false;
 	//private int mSemaphore =3D 0;
-	=

+
 	private CalicoCanvas canvas;
-	=

+
 	private PNode cache;
-	=

+
 	private Point2D mDown;
 	private Point2D mDownCanvas;
 	private double zoomScale =3D 1;
-	=

+
 	//keep this cached so we can close a scrap widget on next click
 	private ScrapPainter openedWidget;
-	=

+
 	private ExecutorService threadManager;
-	=

+
 	private int MODE =3D NULL;
-	=

+
 	public MouseInputHandler(CalicoCanvas c) {
 		super();
 		canvas =3D c;
 		pathLines =3D new Vector<BGElementPainter>();
 		mouseEventQueue =3D new Vector<MouseEv>();
-		threadManager =3D Executors.newFixedThreadPool( 1 ); =

+		threadManager =3D Executors.newFixedThreadPool( 1 );
+		dragCoords =3D new HashMap<Integer,Point2D>();
 	}
-	=

+
 	//The mode is set on mouse down.
 	public void mousePressed(PInputEvent e) {
-		=

+
 		if (mousePressed)
 			return;
 		mousePressed =3D true;
-		=

+
 		/*
 		mSemaphore++;
-		=

+
 		if (mSemaphore > 1)
 			return;
 			*/
 		mouseEventQueue.add(new MouseEv(e));
-		=

+
 		mDown =3D e.getPosition();
 		mDownCanvas =3D e.getCanvasPosition();
-		=

-		=

-		=

+
+
+
 		PLayer layer =3D ((PCanvas)(e.getComponent())).getLayer();
-		=

+
 		if (openedWidget !=3D null) {
-			=

+
 			ScrapWidgetItem item =3D openedWidget.getWidgetItem(e.getPosition());
 			if (item !=3D null) {
 				if (item.getText().compareTo(ScrapWidgetItem.DROP) =3D=3D 0)
@@ -136,14 +119,19 @@
 					canvas.applyAction(new DuplicateScrap(openedWidget.getModel().id));
 				} else if (item.getText().compareTo(ScrapWidgetItem.RECTANGLE) =3D=3D =
0) {
 					canvas.applyAction(new TransformScrapToRect(openedWidget.getModel().i=
d));
+				} else if (item.getText().compareTo(ScrapWidgetItem.TRANSPARENT) =3D=
=3D 0) {
+					if (openedWidget.isTransparent())
+						canvas.applyAction(new SetScrapTransparency(openedWidget.getModel().=
id, false));
+					else
+						canvas.applyAction(new SetScrapTransparency(openedWidget.getModel().=
id, true));
 				}
 				MODE =3D SCRAP_WIDGET;
 			}
-			=

+
 			openedWidget.closeWidgetMenu();
 			openedWidget =3D null;
 		}
-		=

+
 		if (isCameraLayerElem(e.getCanvasPosition())) {
 			cameraElem =3D true;
 			return;
@@ -178,21 +166,26 @@
 			MODE =3D SCRAP;
 			cache =3D getScrapAt(e.getPosition());
 			ScrapPainter painter =3D (ScrapPainter)cache;
-			=

-			=

-			if (e.isRightMouseButton()) {				=

-				=

+
+
+			if (e.isRightMouseButton()) {
+
 				lastEvent().occludingScraps =3D canvas.getOccluding(painter);
 				lastEvent().occludingScraps.add(0, painter);
 				for (ScrapPainter sp : lastEvent().occludingScraps) {
 					sp.setTranslucent(true);
 				}
 				int[] scrapsToRaise =3D new int[lastEvent().occludingScraps.size()];
-				for (int i =3D 0; i < lastEvent().occludingScraps.size(); i++)
+				for (int i =3D 0; i < lastEvent().occludingScraps.size(); i++) {
 					scrapsToRaise[i] =3D lastEvent().occludingScraps.get(i).getModel().id;
+					dragCoords.put(Integer.valueOf(lastEvent().occludingScraps.get(i).get=
Model().id), =

+							ScrapController.getMidPoint(lastEvent().occludingScraps.get(i).getM=
odel()));
+				}
 				canvas.applyAction(new ScrapsRaised(scrapsToRaise));
 				canvas.moveToFront(painter, null);
 				MODE =3D SCRAP_DRAG;
+				=

+				=

 			}
 			else if (painter.widgetContains(e.getPosition())) {
 				MODE =3D SCRAP_WIDGET;
@@ -206,7 +199,7 @@
 		//MODE: DRAG
 		//else if (MODE =3D=3D SCRAP && e.isRightMouseButton()) {
 		//	MODE =3D SCRAP_DRAG;
-		//} =

+		//}
 		else if (e.isRightMouseButton()) {
 			MODE =3D SCRAP_OUTLINE;
 		}
@@ -214,9 +207,8 @@
 		else {
 			MODE =3D DRAW;
 		}
-		=

-		if (e.isLeftMouseButton() && =

-				(MODE =3D=3D DRAW || MODE =3D=3D SCRAP)) {
+
+		if (e.isLeftMouseButton() && (MODE =3D=3D DRAW || MODE =3D=3D SCRAP)) {
 			BGElementPainter path =3D new BGElementPainter();
 			path.setStroke(new BasicStroke(1.0f));
 			path.setColor(canvas.getPenColor());
@@ -231,9 +223,9 @@
 			pathLines.add(path);
 			layer.addChild(path);
 		}
-		=

+
 		hist =3D new DragHistory();
-				=

+
 		updatePoly(e.getPosition());
 	}
 =

@@ -251,31 +243,31 @@
 	public void mouseDragged(PInputEvent e) {
 		if (cameraElem)
 			return;
-		=

+
 		/*
 		if (openedWidget !=3D null) {
 			openedWidget.closeWidgetMenu();
 			openedWidget =3D null;
 		}*/
-				=

+
 		updatePoly(e.getPosition());
 		mouseEventQueue.lastElement().dragged =3D true;
-		=

+
 		//Code to handle zoom
 		if (MODE =3D=3D ZOOM) {
-			=

-			=

+
+
 			Zoom zoom =3D (Zoom)cache;
 			Rectangle2D b =3D zoom.getBounds();
 			Point2D bCenter =3D new Point2D.Double(b.getCenterX(), b.getCenterY());
-			=

+
 			Point2D p =3D e.getPositionRelativeTo(zoom);
 			PDimension d =3D e.getDeltaRelativeTo(zoom);
 			double deltaX =3D d.width;
 			double deltaY =3D d.height;
 =

 			if (
-				/*upper left quadrant*/	=

+				/*upper left quadrant*/
 				p.getX() < bCenter.getX() && p.getY() < bCenter.getY() &&
 					deltaX > 0 && deltaY < 0 ||
 				/*upper right quadrant*/
@@ -290,11 +282,11 @@
 				zoom.setPoint(e.getCanvasPosition());
 				zoomScale *=3D 1.05;
 				zoom.setZoomScale(zoomScale);
-				e.getCamera().scaleViewAboutPoint(1.05, ((PCanvas)(e.getComponent())).=
getWidth()/2, =

+				e.getCamera().scaleViewAboutPoint(1.05, ((PCanvas)(e.getComponent())).=
getWidth()/2,
 						((PCanvas)(e.getComponent())).getHeight()/2);
 				zoom.repaint();
 			} else if (
-				/*upper left quadrant*/	=

+				/*upper left quadrant*/
 				p.getX() < b.getCenterX() && p.getY() < b.getCenterY() &&
 					deltaX < 0 && deltaY > 0 ||
 				/*upper right quadrant*/
@@ -309,18 +301,18 @@
 				zoom.setPoint(e.getCanvasPosition());
 				zoomScale *=3D .95;
 				zoom.setZoomScale(zoomScale);
-				e.getCamera().scaleViewAboutPoint(.95, ((PCanvas)(e.getComponent())).g=
etWidth()/2, =

+				e.getCamera().scaleViewAboutPoint(.95, ((PCanvas)(e.getComponent())).g=
etWidth()/2,
 						((PCanvas)(e.getComponent())).getHeight()/2);
 				zoom.repaint();
 			}
-			=

-				=

+
+
 		}
 		//Code for erase
 		else if (MODE =3D=3D ERASE) {
 			Rectangle2D eraserBounds =3D new Rectangle2D.Double(e.getPosition().get=
X() - 10, e.getPosition().getY() - 10, 20, 20);
 			for (Object node : canvas.getLayer().getAllNodes()) {
-				if (node instanceof BGElementPainter && =

+				if (node instanceof BGElementPainter &&
 						BGElementController.intersects(((BGElementPainter)node).getModel(), =
eraserBounds)) {
 					canvas.applyAction(new BGEErase(((BGElementPainter)node).getId(), era=
serBounds));
 					//BGElementController.trim((BGElementPainter)node, eraserBounds);
@@ -332,15 +324,22 @@
 			ScrapPainter painter =3D (ScrapPainter)cache;
 			if (!e.isRightMouseButton())
 				return;
-			=

-			=

+
+			/*
+			if( !dragCoords.containsKey(Integer.valueOf(painter.getModel().id)) )
+			{
+				dragCoords.put(Integer.valueOf(painter.getModel().id), e.getPosition()=
);
+			}*/
+
+
 			int deltaX =3D new Double(e.getDelta().getWidth()).intValue();
 			int deltaY =3D new Double(e.getDelta().getHeight()).intValue();
-			=

+
 			painter.translate(deltaX, deltaY);
 			for (ScrapPainter sp : lastEvent().occludingScraps) {
 				if (sp.getDrawingPriority() > painter.getDrawingPriority()) {
 					sp.translate(deltaX, deltaY);
+					sp.setBounds();
 				}
 			}
 			=

@@ -348,12 +347,12 @@
 		}
 	}
 =

-	=

+
 	public void mouseReleased(PInputEvent e) {
 		if (!mousePressed)
 			return;
 		mousePressed =3D false;
-		=

+
 		/*
 		mSemaphore--;
 		if (mSemaphore !=3D 0)
@@ -365,22 +364,18 @@
 		MODE =3D -1;
 		MouseUpTask task =3D new MouseUpTask();
 		threadManager.execute(task);
+
 		=

-		//pop the draw stroke from the thread queue
-		if (pathLines.size() > 0) {
-			canvas.getLayer().removeChild(pathLines.get(0));
-			pathLines.remove(0);
-		}
 		//canvas.repaint();
-		=

+
 		//SwingUtilities.invokeLater(task);
 =

-		=

-		=

+
+
 	}
-	=

+
 	private class MouseUpTask implements Runnable {
-		=

+
 		public void run() {
 			PInputEvent e =3D mouseEventQueue.firstElement().ev;
 			PInputEvent upEv =3D mouseEventQueue.firstElement().upEv;
@@ -392,14 +387,14 @@
 			mouseEventQueue.remove(0);
 =

 			//System.out.println("MODE =3D "+MODE);
-			=

+
 			boolean wasDragToFigbar =3D false;
-			=

+
 			if (cameraElem) {
 				cameraElem =3D false;
 				return;
 			}
-			=

+
 			if (MODE =3D=3D ERASE) {
 				canvas.applyAction(new EraseBGElement());
 			}
@@ -412,14 +407,33 @@
 				{
 					if( getFigBarAt(upEv) !=3D null )
 					{
+					=

+						=

 						wasDragToFigbar =3D true;
 						Palettes bar =3D (Palettes)getFigBarAt(upEv);
+						=

+						/*if(bar.isInHiddenMode)
+						{
+							bar.showHide();
+						}*/
+						=

 						ArrayList<ScrapPainter> scraps =3D new ArrayList<ScrapPainter>();
 						for (int i =3D 0; i < occludingScraps.size(); i++)
 						{
 							if (occludingScraps.get(i) instanceof ScrapPainter )
 							{
 								scraps.add( (ScrapPainter)occludingScraps.get(i));
+
+								Integer key =3D Integer.valueOf(((ScrapPainter)occludingScraps.get=
(i)).getModel().id);
+
+								=

+								if(dragCoords.containsKey( key ) )
+								{
+									((ScrapPainter)occludingScraps.get(i)).translateTo(dragCoords.get=
(key));
+									((ScrapPainter)occludingScraps.get(i)).setTranslucent(false);
+									((ScrapPainter)occludingScraps.get(i)).setBounds();
+									dragCoords.remove( key );
+								}
 							}
 						}
 						if( scraps.size() > 0 )
@@ -428,19 +442,27 @@
 						}
 						else
 						{
+							//Nick: Mitch, when is this line ever called?
 							bar.showHide();
 						}
 					}
-				=

+
 				}
 				else
 				{
-				=

+
 					Palettes bar =3D (Palettes)cache;
 					if (distance(mDownCanvas, e.getCanvasPosition()) < 5)
 					{
 						cache =3D bar;
-						=

+						if(bar.isInHiddenMode)
+						{
+							bar.showHide(); //opens here
+						}
+						else if (!bar.isInHiddenMode && bar.getIndex(e.getCanvasPosition()) =
=3D=3D Palettes.PULL_HANDLE)
+						{
+							bar.showHide();
+						}
 						if(e.isRightMouseButton())
 						{
 							int index =3D bar.getIndex(e.getCanvasPosition());
@@ -452,9 +474,9 @@
 						}
 						else
 						{
-					=

+
 							ArrayList<ScrapPainter> scraps =3D new ArrayList<ScrapPainter>();
-					=

+
 							for (int i =3D 0; i < canvas.getLayer().getChildrenCount(); i++)
 							{
 								if (canvas.getLayer().getChild(i) instanceof ScrapPainter )
@@ -462,18 +484,23 @@
 									scraps.add( (ScrapPainter)canvas.getLayer().getChild(i));
 								}
 							}
-					=

+
 							if( scraps.size() > 0 )
 							{
 								bar.registerScrap(scraps, e.getCanvasPosition());
 							}
+							/*
 							else
 							{
-								bar.showHide();
-							}
+								bar.showHide(); //closes it on startup
+							}*/
 						}
-						=

-					} else {
+
+					} =

+					else if (bar.getIndex(mDownCanvas) > -1 && bar.getIndex(e.getCanvasPo=
sition()) > -1) {
+						bar.movePaletteItem(bar.getIndex(mDownCanvas), bar.getIndex(e.getCan=
vasPosition()));
+					}
+					else {
 						if (bar.getScrapAt(mDownCanvas, e.getPosition()) !=3D null) {
 							CellContents contents =3D bar.getScrapAt(mDownCanvas, e.getPosition=
());
 							canvas.applyAction(new AddPremadeScrap(contents.getScraps(), conten=
ts.getRelationships()));
@@ -494,7 +521,7 @@
 			if (MODE =3D=3D ZOOM) {
 				if (distance(mDown, e.getPosition()) < 5) {
 					//reset camera (zoom and pan)
-					e.getCamera().scaleViewAboutPoint(1/zoomScale, ((PCanvas)(e.getCompon=
ent())).getWidth()/2, =

+					e.getCamera().scaleViewAboutPoint(1/zoomScale, ((PCanvas)(e.getCompon=
ent())).getWidth()/2,
 							((PCanvas)(e.getComponent())).getHeight()/2);
 					zoomScale =3D 1;
 					Zoom zoom =3D (Zoom)cache;
@@ -502,39 +529,49 @@
 					zoom.setPoint(new Point(0,0));
 				}
 			}
-			=

+
 			if (MODE =3D=3D DRAW || (MODE =3D=3D SCRAP && e.isLeftMouseButton())) {
 =

 				PNode parent =3D (PNode)canvas.getLayer();
-				if (attemptModifyRel(e, hist)) {
-					=

-				} else if (attemptBGElement(e, hist)) {
-					=

+				if (attemptModifyRel(e, hist)) =

+				{
+					System.out.println("MouseInput:MouseUp:Draw:1");
+				}
+				else if (attemptBGElement(e, hist))
+				{
+					System.out.println("MouseInput:MouseUp:Draw:2");
+				} =

+				else if (attemptInternalDraw(e, hist))
+				{
+					System.out.println("MouseInput:MouseUp:Draw:3");
+				}
+				else if (attemptDeleteScrap(hist, parent))
+				{
+					System.out.println("MouseInput:MouseUp:Draw:4");
+				}
+				else if (attemptRelationship(parent, hist))
+				{
+					System.out.println("MouseInput:MouseUp:Draw:5");
+				}
+				else if (attemptExtend(e, hist))
+				{
+					System.out.println("MouseInput:MouseUp:Draw:6");
 				}
-				else if (attemptInternalDraw(e, hist)) {
-					=

-				} else if (attemptDeleteScrap(hist, parent)) {
-					=

-				} else if (attemptRelationship(parent, hist)) {
-					=

-				} else if (attemptExtend(e, hist)) {
-					=

-				}  =

 				else  {
-					=

+
 				}
-				=

-					=

+
+
 			}
-			=

+
 			if (!wasDragToFigbar && MODE =3D=3D SCRAP_DRAG) {
-				=

+
 				ScrapModel model;
 				Point2D midPoint;
 				int[] scraps =3D new int[occludingScraps.size()],
 					x =3D new int[occludingScraps.size()],
 					y =3D new int[occludingScraps.size()];
-				=

+
 				for (int i =3D 0; i < occludingScraps.size(); i++) {
 					model =3D occludingScraps.get(i).getModel();
 					midPoint =3D ScrapController.getMidPoint(model);
@@ -542,10 +579,10 @@
 					x[i] =3D new Double(midPoint.getX()).intValue();
 					y[i] =3D new Double(midPoint.getY()).intValue();
 				}
-				=

+
 				canvas.applyAction(new TranslateScrap(x, y, scraps));
 			}
-			=

+
 			if (MODE =3D=3D SCRAP_OUTLINE) {
 				if (hist.isEnclosed())
 					canvas.applyAction(new AddScrap(hist.getPolygon()));
@@ -553,7 +590,12 @@
 					canvas.applyAction(new AddScrap(hist.getPolyline()));
 			}
 =

-			=

+
+			//pop the draw stroke from the thread queue
+			if (pathLines.size() > 0) {
+				canvas.getLayer().removeChild(pathLines.get(0));
+				pathLines.remove(0);
+			}
 			return;
 		}
 =

@@ -562,34 +604,34 @@
 	private boolean attemptBGElement(PInputEvent e, DragHistory hist) {
 		//if (hist.path.size() < 3)
 		//	return false;
-		for (Point2D p : hist.path) =

+		for (Point2D p : hist.path)
 			if (this.getScrapAt(p) !=3D null)
 				return false;
-		=

-		=

+
+
 		canvas.applyAction(new CreateBackgroundElement(hist.getPolyline(), Color=
.black));
 		return true;
 	}
-	=

+
 	private boolean attemptModifyRel(PInputEvent e, DragHistory hist) {
 		Line2D line;
 		Point2D intersect1 =3D null, intersect2 =3D null;
 		RelationshipPainter painter =3D null;
 		int inc =3D 2;
 		int painterId =3D -1;
-		=

+
 		//this variable decides if we're thickening (true) or thinning (false) t=
he relationship
 		boolean thicken =3D true;
-		=

+
 		for (int i =3D 1; i < hist.path.size(); i++) {
-			line =3D new Line2D.Double(hist.path.get(i-1).getX(), hist.path.get(i-1=
).getY(), =

+			line =3D new Line2D.Double(hist.path.get(i-1).getX(), hist.path.get(i-1=
).getY(),
 					hist.path.get(i).getX(), hist.path.get(i).getY());
 			painter =3D getIntersectingRel(line);
-			=

+
 			if (painter !=3D null) {
 				if (painterId =3D=3D -1)
 					painterId =3D painter.getModel().id;
-				=

+
 				if (intersect1 =3D=3D null)
 					intersect1 =3D RelationshipController.getIntersectingPoint(painter.ge=
tModel(), line);
 				else if (intersect2 =3D=3D null) {
@@ -599,25 +641,25 @@
 							!RelationshipController.isAbove(painter.getModel(), hist.path.get(0=
)) && intersect1.getX() > intersect2.getX())
 						thicken =3D true;
 					//[^ , <] -OR- [v , >]
-					else =

+					else
 						thicken =3D false;
 				}
 				else
 					inc++;
 			}
-			=

+
 			painter =3D null;
 		}
-		=

+
 		if (painterId =3D=3D -1)
 			return false;
-		=

+
 		if (inc < 3)
 			canvas.applyAction(new DeleteRelationship(painterId));
-		=

+
 		if (thicken)
 			canvas.applyAction(new ThickenRelationship(inc, painterId));
-		else =

+		else
 			canvas.applyAction(new ThinRelationship(inc, painterId));
 		return true;
 	}
@@ -642,21 +684,21 @@
 		if (painter =3D=3D null)
 			return false;
 		ScrapModel scrap =3D getScrapAt(e.getPosition()).getModel();
-		=

-		=

-		=

+
+
+
 		if (ScrapController.containsPoint(scrap, hist.path.get(0)) &&
 				ScrapController.containsPoint(scrap, hist.path.get(hist.path.size()-1)=
)) {
 			for (Point2D p : hist.path) {
 				if (!ScrapController.containsPoint(scrap, p)) {
-					=

+
 					return canvas.applyAction(new ExtendScrap(scrap.id, point2DtoPoly(his=
t.path)));
 				}
 			}
 		}
 		return false;
 	}
-	=

+
 	private Polygon point2DtoPoly(ArrayList<Point2D> pa) {
 		int xArr[] =3D new int[hist.path.size()];
 		int yArr[] =3D new int[hist.path.size()];
@@ -666,11 +708,11 @@
 		}
 		return new Polygon(xArr, yArr, hist.path.size());
 	}
-	=

+
 	private boolean attemptDeleteScrap(DragHistory hist, PNode parent) {
 		//remove all intersecting concepts
-		=

-		=

+
+
 		Polygon stroke =3D hist.getPolyline();
 		ArrayList<Integer> toBeDeleted =3D new ArrayList<Integer>();
 		if (getScrapAt(hist.path.get(0)) =3D=3D null &&
@@ -678,10 +720,10 @@
 				//find intersections
 				for (int i =3D 0; i < canvas.getLayer().getChildrenCount(); i++) {
 					if (canvas.getLayer().getChild(i) instanceof ScrapPainter &&
-							ScrapController.intersects(((ScrapPainter)canvas.getLayer().getChil=
d(i)).getModel(), stroke))
+							ScrapController.intersects(((ScrapPainter)canvas.getLayer().getChil=
d(i)).getTotalPoly(), stroke))
 						toBeDeleted.add(new Integer(((ScrapPainter)canvas.getLayer().getChil=
d(i)).getModel().id));
 				}
-		=

+
 		if (toBeDeleted.size() =3D=3D 0)
 			return false;
 		//If they user deletes a selected concept, we're going to delete all the=
 concepts
@@ -696,28 +738,28 @@
 			for (ScrapPainter sp: selected)
 				if (!toBeDeleted.contains(sp))
 					toBeDeleted.add(new Integer(sp.getModel().id));
-		=

+
 		if (toBeDeleted.size() > 0) {
 			int[] toDelete =3D new int[toBeDeleted.size()];
 			for (int i =3D 0; i < toDelete.length; i++)
 				toDelete[i] =3D toBeDeleted.get(i).intValue();
 			return canvas.applyAction(new DeleteScraps(toDelete));
 		}
-		=

+
 		else
 			return false;
 	}
-	=

+
 	private boolean attemptInternalDraw(PInputEvent e, DragHistory hist) {
 		ScrapPainter scrap =3D getScrapAt(e.getPosition());
 		if (scrap =3D=3D null)
-			return false;		=

-		=

+			return false;
+
 		for (Point2D p : hist.path) {
 			if (!ScrapController.containsPoint(scrap.getModel(), p))
 				return false;
 		}
-		=

+
 		return canvas.applyAction(new AddInternalScrap(scrap.getModel().id, poin=
t2DtoPoly(hist.path), Color.BLACK));
 	}
 =

@@ -726,13 +768,13 @@
 		Collection col =3D canvas.getLayer().getAllNodes();
 		for (Object o : col) {
 			if (o instanceof ScrapPainter &&
-					((ScrapPainter)o).intersects(p)) =

+					((ScrapPainter)o).intersects(p))
 				ret.add(new Integer(((ScrapPainter)o).getModel().id));
 		}
-		=

+
 		return ret;
 	}
-	=

+
 	/*
 	public boolean acceptsEvent(PInputEvent event, int type) {
 		if (super.acceptsEvent(event, type) =3D=3D false)
@@ -744,9 +786,9 @@
 		}
 		return true;
 	}*/
-	=

 =

-	=

+
+//noChildLeftBehind(Har joke)
 	private boolean noChildAt(PInputEvent e) {
 		for (int i =3D 0; i < canvas.getLayer().getChildrenCount(); i++) {
 			for (Object node : canvas.getLayer().getAllNodes()) {
@@ -759,7 +801,7 @@
 		}
 		return true;
 	}
-	=

+
 	public void updatePoly(Point2D p) {
 		if (pathLines.size() > 0) {
 			BGElementPainter path =3D pathLines.get(pathLines.size()-1);
@@ -768,10 +810,17 @@
 		hist.add(p);
 	}
 	=

+	public void resetStrokes() {
+		for (BGElementPainter bge : pathLines) {
+			canvas.getLayer().removeChild(bge);
+		}
+		pathLines.clear();
+	}
+
 	protected void pan(PInputEvent e) {
 		PCamera c =3D e.getCamera();
 		Point2D l =3D e.getPosition();
-		=

+
 		if (c.getViewBounds().contains(l)) {
 			PDimension d =3D e.getDelta();
 			c.translateView(d.getWidth(), d.getHeight());
@@ -781,13 +830,13 @@
 	private ScrapPainter getScrapAt(Point2D p) {
 		PLayer layer =3D canvas.getLayer();
 		for (int i =3D layer.getChildrenCount()-1; i >=3D 0; i--) {
-			if (layer.getChild(i) instanceof ScrapPainter && =

+			if (layer.getChild(i) instanceof ScrapPainter &&
 					((ScrapPainter)layer.getChild(i)).contains(p))
 				return (ScrapPainter)layer.getChild(i);
 		}
 		return null;
 	}
-	=

+
 	private boolean isCameraLayerElem(Point2D p) {
 		for (Object node : canvas.getCamera().getAllNodes())
 			if ((node instanceof GridNavPointer ||
@@ -796,7 +845,7 @@
 					return true;
 		return false;
 	}
-	=

+
 	private Zoom getZoom(PInputEvent e) {
 		for (Object node : canvas.getCamera().getAllNodes()) {
 			if (node instanceof Zoom && ((Zoom)node).contains(e.getCanvasPosition()=
))
@@ -804,7 +853,7 @@
 		}
 		return null;
 	}
-	=

+
 	private Palettes getFigBarAt(PInputEvent e) {
 		for (Object node : canvas.getCamera().getAllNodes()) {
 			if (node instanceof Palettes && ((Palettes)node).contains(e.getCanvasPo=
sition()))
@@ -812,7 +861,7 @@
 		}
 		return null;
 	}
-	=

+
 	/*
 	private Undo getUndoAt(PInputEvent e) {
 		for (Object node : canvas.getCamera().getAllNodes()) {
@@ -821,11 +870,11 @@
 		}
 		return null;
 	}*/
-	=

+
 	private double distance(Point2D p1, Point2D p2) {
 		return Math.sqrt(Math.pow(p2.getX()-p1.getX(), 2) + Math.pow(p2.getY()-p=
1.getY(), 2));
 	}
-	=

+
 	/**
 	 * Returns the first RelationshipPainter who intersects with line.
 	 * @param line
@@ -833,16 +882,16 @@
 	 */
 	private RelationshipPainter getIntersectingRel(Line2D line) {
 		for (Object node : canvas.getLayer().getAllNodes()) {
-			if (node instanceof RelationshipPainter && =

+			if (node instanceof RelationshipPainter &&
 					RelationshipController.intersects(((RelationshipPainter)node).getMode=
l(), line))
 				return (RelationshipPainter)node;
 		}
-		=

+
 		return null;
 	}
-	=

 =

-	=

+
+
 	private Palettes getPalettes() {
 		for (Object node : canvas.getCamera().getAllNodes()) {
 			if (node instanceof Palettes)
@@ -850,11 +899,11 @@
 		}
 		return null;
 	}
-	=

+
 	private MouseEv lastEvent() {
 		return mouseEventQueue.get(mouseEventQueue.size() - 1);
 	}
-	=

+
 	private class MouseEv {
 		public PInputEvent ev;
 		public PInputEvent upEv;
@@ -863,12 +912,12 @@
 		public DragHistory history;
 		public int MODE;
 		private ArrayList<ScrapPainter> occludingScraps;
-		=

+
 		public MouseEv(PInputEvent e) {
 			ev =3D e;
 			mDownPos =3D ev.getPosition();
 			occludingScraps =3D new ArrayList<ScrapPainter>();
 		}
 	}
-	=

+
 }

Modified: calico/trunk/Calico/ics/uci/edu/Calico/UI/ScrapPainter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- calico/trunk/Calico/ics/uci/edu/Calico/UI/ScrapPainter.java (original)
+++ calico/trunk/Calico/ics/uci/edu/Calico/UI/ScrapPainter.java Wed May 21 =
12:02:33 2008
@@ -7,6 +7,7 @@
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.geom.Arc2D;
+import java.awt.geom.Area;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
@@ -27,6 +28,8 @@
 	private boolean selected =3D false;
 	private boolean widgetOpen =3D false;
 	private boolean translucent =3D false;
+	private boolean transparent =3D false;
+	private ScrapWidget widg;
 	=

 	public ScrapPainter(ScrapModel s) {
 		super();
@@ -111,7 +114,7 @@
 	}
 	=

 	public boolean intersects(Polygon p) {
-		return (ScrapController.intersects(scrap, p) || containedIn(p));
+		return (ScrapController.intersects(scrap.encasingPoly, p) || containedIn=
(p));
 	}
 	=

 	public boolean containedIn(Polygon p) {
@@ -143,7 +146,7 @@
 		=

 		=

 		=

-		if (translucent) {
+		if (translucent || transparent) {
 			g2.setColor(new Color(scrap.getBackgroundColor().getRed(), scrap.getBac=
kgroundColor().getGreen(),
 					scrap.getBackgroundColor().getBlue(), 96));
 		}
@@ -212,10 +215,27 @@
 		return selected;
 	}
 	=

+	public boolean isTransparent() {
+		return transparent;
+	}
+	=

+	/**
+	 * This applies to dragging only
+	 * @param trans
+	 */
 	public void setTranslucent(boolean trans) {
 		translucent =3D trans;
 	}
 	=

+	/**
+	 * Applies universely
+	 * =

+	 * @param trans
+	 */
+	public void setTransparency(boolean trans) {
+		transparent =3D trans;
+	}
+	=

 	private void setShadow() {
 		shadow =3D new Polygon();
 		for (int i =3D 0; i < scrap.encasingPoly.npoints; i++) {
@@ -245,7 +265,8 @@
 		int midPointIndex =3D highestIndex;
 		Point2D.Double midPoint =3D new Point2D.Double(scrap.encasingPoly.xpoint=
s[midPointIndex],
 											scrap.encasingPoly.ypoints[midPointIndex]);
-		addChild(new ScrapWidget(midPoint));
+		widg =3D new ScrapWidget(midPoint);
+		addChild(widg);
 	}
 	=

 	private ScrapWidget getScrapWidget() {
@@ -286,14 +307,14 @@
 		up.centerBoundsOnPoint(centerX, centerY - offset);
 		ScrapWidgetItem down =3D new ScrapWidgetItem(ScrapWidgetItem.DROP);
 		down.centerBoundsOnPoint(centerX, centerY + offset);
-		//ScrapWidgetItem left =3D new ScrapWidgetItem(ScrapWidgetItem.LEFT);
-		//left.centerBoundsOnPoint(centerX - offset, centerY);
+		ScrapWidgetItem transparent =3D new ScrapWidgetItem(ScrapWidgetItem.TRAN=
SPARENT);
+		transparent.centerBoundsOnPoint(centerX - offset, centerY);
 		ScrapWidgetItem right =3D new ScrapWidgetItem(ScrapWidgetItem.RECTANGLE);
 		right.centerBoundsOnPoint(centerX + offset, centerY);
 		=

 		addChild(up);
 		addChild(down);
-		//addChild(left);
+		addChild(transparent);
 		addChild(right);	=

 		=

 		widgetOpen =3D true;
@@ -340,7 +361,7 @@
 		=

 		public static final String DROP =3D " Drop ";
 		public static final String DUPLICATE =3D " Duplicate ";
-		//public static final String LEFT =3D " Left ";
+		public static final String TRANSPARENT =3D " Transparent ";
 		public static final String RIGHT =3D " Right ";
 		public static final String ELLIPSE =3D " Ellipse ";
 		public static final String RECTANGLE =3D " Rectangle "; =

@@ -367,4 +388,22 @@
 			super.paint(c);
 		}
 	}
+	=

+	public Polygon getTotalPoly() {
+		=

+		Area scrap =3D new Area(getModel().encasingPoly);
+		Area widget =3D new Area(widg.circle);
+		scrap.add(widget);
+		return ScrapController.getPolyFromArea(scrap);
+	}
+
+	public boolean contains(Polygon poly) {
+		boolean contained =3D true;
+		for (int i =3D 0; i < poly.npoints; i++) {
+			if (!scrap.encasingPoly.contains(new Point2D.Double(poly.xpoints[i], po=
ly.ypoints[i])))
+				contained =3D false;
+		}
+		return contained;
+	}
+	=

 }

Modified: calico/trunk/Calico/ics/uci/edu/Calico/UI/components/CalicoGrid.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- calico/trunk/Calico/ics/uci/edu/Calico/UI/components/CalicoGrid.java (o=
riginal)
+++ calico/trunk/Calico/ics/uci/edu/Calico/UI/components/CalicoGrid.java We=
d May 21 12:02:33 2008
@@ -2,6 +2,7 @@
 =

 import ics.uci.edu.Calico.UI.Calico;
 import ics.uci.edu.Calico.UI.CalicoCanvas;
+import ics.uci.edu.Calico.UI.MouseInputHandler;
 import ics.uci.edu.Calico.models.ObjectHandlerModel;
 import ics.uci.edu.Calico.models.actions.BGColorChanged;
 import ics.uci.edu.Calico.models.actions.CalicoAction;
@@ -88,6 +89,7 @@
 	JPopupMenu popup;
 	int mousedOverCell =3D -1;
 	boolean menuFocus =3D false;
+	MouseInputHandler inputHandler;
 	=

 	Menu menu =3D new Menu();
 	=

@@ -930,6 +932,11 @@
 	 */
 	public void loadGrid() {
 		//setupMenu();
+		//canvas.removeInputEventListener(inputHandler);
+		if (inputHandler !=3D null)
+			inputHandler.resetStrokes();
+		canvas.clearInvalidNodes();		=

+		//inputHandler =3D null;
 		canvas.fireListeners(new GridView(currentCell));
 		canvas.getCamera().addChild(this);
 		updateBounds(canvas.getWidth(), canvas.getHeight());
@@ -972,6 +979,9 @@
 					((ZoomSlider)node).setPercent(100);
 		=

 		currentCell =3D pos;
+		=

+		=

+		//canvas.addInputEventListener(inputHandler);
 		frame.setJMenuBar(null);
 		frame.pack();
 		canvas.repaint();
@@ -1123,6 +1133,8 @@
 		canvas.addComponent(new GridNavThumb(GridNavThumb.WEST));
 		setupMenu();
 		canvas.addCalicoActionListener(this);
+		inputHandler =3D new MouseInputHandler(canvas);
+		canvas.addInputEventListener(inputHandler);
 		=

 	}
 =


Modified: calico/trunk/Calico/ics/uci/edu/Calico/UI/components/Menu.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- calico/trunk/Calico/ics/uci/edu/Calico/UI/components/Menu.java (origina=
l)
+++ calico/trunk/Calico/ics/uci/edu/Calico/UI/components/Menu.java Wed May =
21 12:02:33 2008
@@ -21,6 +21,8 @@
 import java.io.ObjectOutput;
 import java.io.ObjectOutputStream;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
 =

 import javax.imageio.ImageIO;
 import javax.swing.JFileChooser;
@@ -327,7 +329,7 @@
 		for (int i =3D 0; i < gridToBeSaved.getChildrenCount(); i++) {
 			if (gridToBeSaved.getChild(i) instanceof CGCell &&
 					((CGCell)gridToBeSaved.getChild(i)).model !=3D null &&
-					((CGCell)gridToBeSaved.getChild(i)).model.objectIdTicker >=3D 0) {
+					((CGCell)gridToBeSaved.getChild(i)).model.objectIdTicker > 0) {
 				cells.add(new SerializedCell((CGCell)gridToBeSaved.getChild(i)));
 			}
 		}
@@ -336,6 +338,11 @@
 	        // Serialize to a file
 			String filename =3D File.separator+"vbg";
 		    JFileChooser fc =3D new JFileChooser(new File(filename));
+		    Calendar cal =3D new GregorianCalendar();
+		    String defaultName =3D cal.get(Calendar.HOUR_OF_DAY) + "" + cal.get(=
Calendar.MINUTE) + "_" + =

+		    	cal.get(Calendar.MONTH) + "-" + cal.get(Calendar.DAY_OF_MONTH) + "-=
" + =

+		    	cal.get(Calendar.YEAR) + ".vbg";
+		    fc.setSelectedFile(new File(defaultName));
 		    fc.setCurrentDirectory(null);
 		    fc.addChoosableFileFilter(new MyFilter());
 		    =


Modified: calico/trunk/Calico/ics/uci/edu/Calico/UI/components/ZoomSlider.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- calico/trunk/Calico/ics/uci/edu/Calico/UI/components/ZoomSlider.java (o=
riginal)
+++ calico/trunk/Calico/ics/uci/edu/Calico/UI/components/ZoomSlider.java We=
d May 21 12:02:33 2008
@@ -19,6 +19,8 @@
 	Polygon slider;
 	int percentOnSlider, actualPercent;
 	=

+	int lastPercent =3D 0;
+	=

 	int[] zoomValues =3D {12, 25, 50, 100, 200, 400, 800};
 	=

 	public ZoomSlider() {
@@ -78,6 +80,11 @@
 		if (p < 0 || p > 200)
 			return;
 		=

+		if(p=3D=3DlastPercent)
+			return;
+		=

+		lastPercent =3D p;
+		=

 		slider.reset();
 		slider.addPoint(0, 0);
 		slider.addPoint(0, 20);

Modified: calico/trunk/Calico/ics/uci/edu/Calico/models/CalicoLogger.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- calico/trunk/Calico/ics/uci/edu/Calico/models/CalicoLogger.java (origin=
al)
+++ calico/trunk/Calico/ics/uci/edu/Calico/models/CalicoLogger.java Wed May=
 21 12:02:33 2008
@@ -87,7 +87,7 @@
 	}
 	=

 	private void updatePathName(){
-		pathName =3D folderName+File.pathSeparator+fileName;
+		pathName =3D folderName+File.separatorChar+fileName;
 	}
 	=

 	private String get12HourTime(int hour, int minute){

Modified: calico/trunk/Calico/ics/uci/edu/Calico/models/ObjectHandlerModel.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- calico/trunk/Calico/ics/uci/edu/Calico/models/ObjectHandlerModel.java (=
original)
+++ calico/trunk/Calico/ics/uci/edu/Calico/models/ObjectHandlerModel.java W=
ed May 21 12:02:33 2008
@@ -32,7 +32,7 @@
 		relationships =3D new ArrayList<RelationshipModel>();
 		bgElements =3D new ArrayList<BGElementModel>();
 		bgColor =3D defaultBackground;
-		objectIdTicker =3D -1;
+		objectIdTicker =3D 0;
 	}
 	=

 	//Alex:Copy constructor. May not need this later, trying for now

Modified: calico/trunk/Calico/ics/uci/edu/Calico/networking/NetworkPacket.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- calico/trunk/Calico/ics/uci/edu/Calico/networking/NetworkPacket.java (o=
riginal)
+++ calico/trunk/Calico/ics/uci/edu/Calico/networking/NetworkPacket.java We=
d May 21 12:02:33 2008
@@ -29,6 +29,7 @@
 	=

 	public NetworkPacket(CalicoAction cAction){
 		this.cAction =3D cAction;
+		this.nickname =3D System.getProperty("user.name");
 		packetID =3D CALICO_ACTION;
 	}
 	=


Modified: calico/trunk/Calico/run.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- calico/trunk/Calico/run.sh (original)
+++ calico/trunk/Calico/run.sh Wed May 21 12:02:33 2008
@@ -1,4 +1,4 @@
 #!/bin/bash
 =

 cd bin/
-java -cp .:lib/ant.jar:piccolox.jar:piccolo.jar:lib/junit.jar ics.uci.edu.=
Calico.UI.Calico
+java ics.uci.edu.Calico.UI.Calico




More information about the archstudio-commits mailing list