From eaf8cd354469f0978b9baca647cf7fe85eb943ef Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sun, 11 Oct 2015 13:38:17 -0400 Subject: [PATCH] Clean up DebuggerBackEnd and move all the ivars into the .m file. --- English.lproj/Debugger.xib | 3097 ++++++++++++++--------------------- English.lproj/MainMenu.xib | 1819 +++++++------------- Source/AppDelegate.m | 2 +- Source/DebuggerBackEnd.h | 38 +- Source/DebuggerBackEnd.m | 199 +-- Source/DebuggerController.m | 6 +- 6 files changed, 1919 insertions(+), 3242 deletions(-) diff --git a/English.lproj/Debugger.xib b/English.lproj/Debugger.xib index 9086ea1..d7d018e 100644 --- a/English.lproj/Debugger.xib +++ b/English.lproj/Debugger.xib @@ -1,29 +1,49 @@ - + 1050 - 10J869 - 804 - 1038.35 - 461.00 + + 8191 + 1404.11 + 806.00 com.apple.InterfaceBuilder.CocoaPlugin - 804 + 8191 - - YES - - - - YES + + NSArrayController + NSButton + NSButtonCell + NSCustomObject + NSCustomView + NSOutlineView + NSScrollView + NSScroller + NSSplitView + NSTableColumn + NSTableHeaderView + NSTableView + NSTextField + NSTextFieldCell + NSTextView + NSToolbar + NSToolbarFlexibleSpaceItem + NSToolbarItem + NSToolbarSeparatorItem + NSToolbarSpaceItem + NSTreeController + NSUserDefaultsController + NSView + NSWindowTemplate + + com.apple.InterfaceBuilder.CocoaPlugin - + PluginDependencyRecalculationVersion - - YES + DebuggerController @@ -51,376 +71,342 @@ YES 2 1 - - YES - - YES - 05157554-5CF3-45B4-9306-239A1F7E8130 - 0DD9463E-4676-43E6-B885-7A9CB1137956 - 16B58F9D-A05F-41F5-BD7C-37FD7619A84A - 4F493FF4-D55D-4881-B16D-54ED9DC66FF7 - 87BEA2D0-EF8E-4DF2-9827-B2AC06858DC6 - 91C3B0BD-0D34-4A26-A0EA-CC2A093F5916 - 9FD4795A-41D6-49D4-94CE-99E9DF733A09 - E0B2A793-522F-487A-AF2E-BE7FDFF26543 - NSToolbarCustomizeToolbarItem - NSToolbarFlexibleSpaceItem - NSToolbarSeparatorItem - NSToolbarSpaceItem + + + + 05157554-5CF3-45B4-9306-239A1F7E8130 + + Evaluate Script + Evaluate Script + + + + NSImage + Eval + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 - - YES - - - 05157554-5CF3-45B4-9306-239A1F7E8130 - - Evaluate Script - Evaluate Script - - - - NSImage - Eval - - - - {0, 0} - {0, 0} - YES - YES - -1 - YES - 0 + + + 0DD9463E-4676-43E6-B885-7A9CB1137956 - - - 0DD9463E-4676-43E6-B885-7A9CB1137956 - - Attached - - - - - 268 - {{0, 14}, {83, 18}} - - - YES - - -2080244224 - 0 - Attached - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 + Attached + + + + + 268 + {{0, 14}, {83, 18}} + YES + + -2080374784 + 0 + Attached + + YES + 13 + 1044 - - - 12779520 - - YES - - YES - - - - YES - - YES - size - state - value - widget - - - YES - regular - normal - - checkbox - - - {18, 18} - 0 - YES - NSCalibratedRGBColorSpace - - + + 1211912448 + 2 + + NSImage + NSSwitch - - 3 - MCAwAA + + NSSwitch + + + 200 + 25 - - - {63, 18} - {107, 18} - YES - YES - 0 - YES - 0 + NO - - - 16B58F9D-A05F-41F5-BD7C-37FD7619A84A - - Stop - Stop - - - - NSImage - Stop + + 12779520 + + + + + + regular + normal + + checkbox + + {18, 18} + 0 + YES + NSCalibratedRGBColorSpace + + + + + 3 + MCAwAA - - - {0, 0} - {0, 0} - YES - YES - -1 - YES - 0 - - - 4F493FF4-D55D-4881-B16D-54ED9DC66FF7 - - Step Out - Step Out - - - - NSImage - StepOut - - - - {0, 0} - {0, 0} - YES - YES - -1 - YES - 0 + + + {63, 18} + {107, 18} + YES + YES + 0 + YES + 0 + + + + 16B58F9D-A05F-41F5-BD7C-37FD7619A84A - - - 87BEA2D0-EF8E-4DF2-9827-B2AC06858DC6 - - Variable Inspector - Variable Inspector - - - - NSImage - HUDIcon - - - - {0, 0} - {0, 0} - YES - YES - -1 - YES - 0 + Stop + Stop + + + + NSImage + Stop - - - 91C3B0BD-0D34-4A26-A0EA-CC2A093F5916 - - Step In - Step In - - - - NSImage - StepIn - - - - {0, 0} - {0, 0} - YES - YES - -1 - YES - 0 + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + + 4F493FF4-D55D-4881-B16D-54ED9DC66FF7 - - - 9FD4795A-41D6-49D4-94CE-99E9DF733A09 - - Run - Run - - - - NSImage - Run - - - - {0, 0} - {0, 0} - YES - YES - -1 - YES - 0 + Step Out + Step Out + + + + NSImage + StepOut - - - E0B2A793-522F-487A-AF2E-BE7FDFF26543 - - Step Over - Step Over - - - - NSImage - StepOver - - - - {0, 0} - {0, 0} - YES - YES - -1 - YES - 0 + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + + 87BEA2D0-EF8E-4DF2-9827-B2AC06858DC6 + + Variable Inspector + Variable Inspector + + + + NSImage + HUDIcon + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + + 91C3B0BD-0D34-4A26-A0EA-CC2A093F5916 + + Step In + Step In + + + + NSImage + StepIn + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + + 9FD4795A-41D6-49D4-94CE-99E9DF733A09 + + Run + Run + + + + NSImage + Run - - NSToolbarCustomizeToolbarItem - Customize - Customize - Customize Toolbar - - + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + + E0B2A793-522F-487A-AF2E-BE7FDFF26543 + + Step Over + Step Over + + + + NSImage + StepOver + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + NSToolbarCustomizeToolbarItem + Customize + Customize + Customize Toolbar + + + NSImage + NSToolbarCustomize + + + runToolbarCustomizationPalette: + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + NSToolbarFlexibleSpaceItem + + Flexible Space + + + + + + {1, 5} + {20000, 32} + YES + YES + -1 + YES + 0 + + YES + YES + + + 1048576 + 2147483647 + NSImage - NSToolbarCustomizeToolbarItemImage + NSMenuCheckmark - - runToolbarCustomizationPalette: - {0, 0} - {0, 0} - YES - YES - -1 - YES - 0 - - - NSToolbarFlexibleSpaceItem - - Flexible Space - - - - - - {1, 5} - {20000, 32} - YES - YES - -1 - YES - 0 - - YES - YES - - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - + + NSImage + NSMenuMixedState - - NSToolbarSeparatorItem - - Separator - - - - - - {12, 5} - {12, 1000} - YES - YES - -1 - YES - 0 - - YES - YES - - - 1048576 - 2147483647 - - - + + + NSToolbarSeparatorItem + + Separator + + + + + + {12, 5} + {12, 1000} + YES + YES + -1 + YES + 0 + + YES + YES + + + 1048576 + 2147483647 + + - - NSToolbarSpaceItem - - Space - - - - - - {32, 5} - {32, 32} - YES - YES - -1 - YES - 0 - - YES - YES - - - 1048576 - 2147483647 - - - + + + NSToolbarSpaceItem + + Space + + + + + + {32, 5} + {32, 10000} + YES + YES + -1 + YES + 0 + + YES + YES + + + 1048576 + 2147483647 + + - - - YES + + @@ -433,9 +419,8 @@ - - - YES + + @@ -448,18 +433,15 @@ - - - YES - + + - {1.79769e+308, 1.79769e+308} + {213, 107} - + 256 - - YES + -2147483359 @@ -467,11 +449,11 @@ YES - 67239424 + 67108864 272629760 <error> - LucidaGrande + YES 11 3100 @@ -490,6 +472,8 @@ MSAwIDAAA + NO + 2 @@ -498,14 +482,10 @@ YES - 67239424 + 67108864 272629760 <status> - - LucidaGrande - 11 - 16 - + @@ -518,37 +498,37 @@ + NO + 2 274 - - YES + 274 - - YES + 274 - - YES + 2304 - - YES + 4352 {377, 205} YES + NO + YES 256 - {377, 17} + {377, 23} @@ -558,14 +538,13 @@ {{-26, 0}, {16, 17}} - - YES + 110 16 1000 - 75628096 + 75497536 2048 Variable @@ -581,7 +560,7 @@ - 337772096 + 337641536 2048 Text Cell @@ -603,7 +582,7 @@ 8 1000 - 75628096 + 75497536 2048 Value @@ -611,7 +590,7 @@ - 337772032 + 337641472 512 Text Cell @@ -628,7 +607,7 @@ 29.754390000000001 1000 - 75628096 + 75497536 2048 Type @@ -644,7 +623,7 @@ - 337772096 + 337641536 2048 Text Cell @@ -656,10 +635,10 @@ YES - + 3 2 - + 6 System @@ -678,20 +657,25 @@ 0 YES 0 + 1 - + {{1, 17}, {377, 205}} 4 + YES -2147483392 {{84, 17}, {15, 67}} + NO + _doScroller: + _doScroller: 0.81707320000000005 @@ -701,6 +685,9 @@ -2147483392 {{1, 207}, {377, 15}} + NO + _doScroller: + 1 _doScroller: @@ -710,50 +697,50 @@ 2304 - - YES + - + {{1, 0}, {377, 17}} - - 4 + YES - + {379, 223} - 562 + 133682 - QSAAAEEgAABBgAAAQYAAAA + 0.25 + 4 + 1 289 - - YES + 2304 - - YES + 4370 {382, 205} YES + NO + YES 256 - {382, 17} + {382, 23} @@ -763,15 +750,14 @@ {{-26, 0}, {16, 17}} - - YES + index 10 10 30 - 75628096 + 75497536 2048 # @@ -782,10 +768,10 @@ - 337772096 + 337641536 2048 Text Cell - + @@ -805,7 +791,7 @@ 8 1000 - 75628096 + 75497536 2048 File @@ -813,10 +799,10 @@ - 337772096 + 337641536 1536 Text Cell - + @@ -836,7 +822,7 @@ 26 1000 - 75628096 + 75497536 2048 Line @@ -844,10 +830,10 @@ - 337772096 + 337641536 2048 Text Cell - + @@ -867,7 +853,7 @@ 50.0625 1000 - 75628096 + 75497536 2048 Function @@ -875,10 +861,10 @@ - 337772096 + 337641536 2048 Text Cell - + @@ -892,10 +878,10 @@ compare: - + 3 2 - + 17 1388347392 @@ -906,20 +892,25 @@ 0 YES 0 + 1 - + {{1, 17}, {382, 205}} 4 + YES -2147483392 {{368, 17}, {15, 190}} + NO + _doScroller: + _doScroller: 0.92682929999999997 @@ -929,6 +920,9 @@ -2147483392 {{1, 207}, {382, 15}} + NO + _doScroller: + 1 _doScroller: @@ -937,31 +931,31 @@ 2304 - - YES + - + {{1, 0}, {382, 17}} - - 4 + YES - + {{388, 0}, {384, 223}} - 562 + 133682 - QSAAAEEgAABBmAAAQZgAAA + 0.25 + 4 + 1 - + {772, 223} YES @@ -973,29 +967,28 @@ BSSourceView - + {{-1, 19}, {772, 483}} - + {769, 501} - {{0, 0}, {1440, 878}} {213, 169} - {1.79769e+308, 1.79769e+308} + {10000000000000, 10000000000000} DebuggerWindow + YES - - YES + filename index lineNumber function contexts.Locals variables - + StackFrame YES YES @@ -1008,13 +1001,12 @@ YES - - YES + value name fullName displayType - + VariableNode YES @@ -1031,26 +1023,23 @@ Inspector NSPanel - {1.79769e+308, 1.79769e+308} + 256 - - YES + 274 - - YES + 2304 - - YES + 2322 - {402, 140} + {402, 402} @@ -1058,136 +1047,124 @@ Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum Et harumd und lookum like Greek to me, dereud facilis est er expedit distinct. Nam liber te conscient to factor tum poen legum odioque civiuda - - YES - - YES - NSColor - NSFont - NSParagraphStyle + + + 1 + MSAxIDEAA - - YES - - 1 - MSAxIDEAA - - - Monaco - 10 - 16 - - - 3 - - YES - - 0.0 - - - 56 - - - 112 - - - 168 - - - 224 - - - 280 - - - 336 - - - 392 - - - 448 - - - 504 - - - 560 - - - 616 - - - 672 - - - 728 - - - 784 - - - 840 - - - 896 - - - 952 - - - 1008 - - - 1064 - - - 1120 - - - 1176 - - - 1232 - - - 1288 - - - 1344 - - - 1400 - - - 1456 - - - 1512 - - - 1568 - - - 1624 - - - 1680 - - - 1736 - + + Monaco + 10 + 16 + + + 3 + + + 0.0 - + + 56 + + + 112 + + + 168 + + + 224 + + + 280 + + + 336 + + + 392 + + + 448 + + + 504 + + + 560 + + + 616 + + + 672 + + + 728 + + + 784 + + + 840 + + + 896 + + + 952 + + + 1008 + + + 1064 + + + 1120 + + + 1176 + + + 1232 + + + 1288 + + + 1344 + + + 1400 + + + 1456 + + + 1512 + + + 1568 + + + 1624 + + + 1680 + + + 1736 + + - + - - YES + - - 6 + + 38 @@ -1195,74 +1172,73 @@ 1 - 10849 + 50473569 0 - - YES - - YES - NSBackgroundColor - NSColor - - - YES - - 6 - System - selectedTextBackgroundColor - - - - 6 - System - selectedTextColor - - + + + 6 + System + selectedTextBackgroundColor + - - - - YES - - YES - NSColor - NSUnderline + + 6 + System + selectedTextColor + - - YES - - 1 - MCAwIDEAA - - + + + + + 1 + MCAwIDEAA - + + + + 1 - 6 - {804, 1e+07} - {223, 0} + 70 + {804, 10000000} - + {402, 402} - {4, -5} - 1 + {4, 5} + + 79691776 + + + + + + file:///Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework/Resources/DVTIbeamCursor.tiff + + + + + 2 + YES -2147483392 {{317, 1}, {15, 408}} + NO + _doScroller: + _doScroller: 0.23333329999999999 @@ -1273,35 +1249,41 @@ -2147483392 {{-100, -100}, {87, 18}} + NO + _doScroller: + 1 _doScroller: 0.86706950000000005 0.94565220000000005 - + {{-1, -1}, {402, 402}} - 560 + 133680 + 0.25 + 4 + 1 - + {400, 400} {{0, 0}, {1440, 878}} - {1.79769e+308, 1.79769e+308} + {10000000000000, 10000000000000} InspectorWindow + YES YES - + - - YES + window @@ -1310,46 +1292,6 @@ 26 - - - value: arrangedObjects.filename - - - - - - value: arrangedObjects.filename - value - arrangedObjects.filename - 2 - - - 44 - - - - delegate - - - - 53 - - - - delegate - - - - 84 - - - - delegate - - - - 92 - errormsg @@ -1407,72 +1349,152 @@ 503 - - contentArray: stackController.stack - - - - - - contentArray: stackController.stack - contentArray - stackController.stack - 2 - + + stackArrayController + + - 557 + 563 - - value: arrangedObjects.index - - - - - - value: arrangedObjects.index - value - arrangedObjects.index - - NSConditionallySetsEditable - - - 2 - + + variablesTreeController + + - 558 + 566 - - value: arrangedObjects.lineNumber - - + + variablesOutlineView + + + + 567 + + + + inspector + + + + 581 + + + + attachedToggled: + + + + 594 + + + + attachedCheckbox_ + + + + 595 + + + + stop: + + + + 598 + + + + showEvalWindow: + + + + 602 + + + + showInspectorWindow: + + + + 587 + + + + delegate + + + + 92 + + + + delegate + + + + 84 + + + + value: arrangedObjects.value + + - - - value: arrangedObjects.lineNumber + + + value: arrangedObjects.value value - arrangedObjects.lineNumber + arrangedObjects.value + + + StripLineBreaksValueTransformer + + 2 + + + 603 + + + + value: arrangedObjects.name + + + + + + value: arrangedObjects.name + value + arrangedObjects.name NSConditionallySetsEditable - + 2 - 559 + 588 + + + + delegate + + + + 53 - value: arrangedObjects.function - + value: arrangedObjects.index + - + - value: arrangedObjects.function + value: arrangedObjects.index value - arrangedObjects.function + arrangedObjects.index NSConditionallySetsEditable @@ -1480,15 +1502,23 @@ 2 - 560 + 558 - - stackArrayController - + + value: arrangedObjects.filename + + + + + value: arrangedObjects.filename + value + arrangedObjects.filename + 2 + - 563 + 44 @@ -1507,20 +1537,60 @@ 564 - - variablesTreeController - - + + contentArray: stackController.stack + + + + + + contentArray: stackController.stack + contentArray + stackController.stack + 2 + - 566 + 557 - - variablesOutlineView - - + + value: arrangedObjects.lineNumber + + + + + + value: arrangedObjects.lineNumber + value + arrangedObjects.lineNumber + + NSConditionallySetsEditable + + + 2 + - 567 + 559 + + + + value: arrangedObjects.function + + + + + + value: arrangedObjects.function + value + arrangedObjects.function + + NSConditionallySetsEditable + + + 2 + + + 560 @@ -1540,27 +1610,23 @@ - value: selection.value - + value: arrangedObjects.displayType + - + - value: selection.value + value: arrangedObjects.displayType value - selection.value + arrangedObjects.displayType + + NSConditionallySetsEditable + + 2 - 580 - - - - inspector - - - - 581 + 590 @@ -1578,34 +1644,6 @@ 583 - - - showInspectorWindow: - - - - 587 - - - - value: arrangedObjects.name - - - - - - value: arrangedObjects.name - value - arrangedObjects.name - - NSConditionallySetsEditable - - - 2 - - - 588 - title: selection.fullName @@ -1624,197 +1662,125 @@ - value: arrangedObjects.displayType - - + value: selection.value + + - + - value: arrangedObjects.displayType - value - arrangedObjects.displayType - - NSConditionallySetsEditable - - - 2 - - - 590 - - - - attachedToggled: - - - - 594 - - - - attachedCheckbox_ - - - - 595 - - - - value: values.DebuggerAttached - - - - - - value: values.DebuggerAttached + value: selection.value value - values.DebuggerAttached + selection.value 2 - 596 - - - - stop: - - - - 598 + 580 - value: connection.attached + value: connection.autoAttach - value: connection.attached + value: connection.autoAttach value - connection.attached + connection.autoAttach 2 599 - - - showEvalWindow: - - - - 602 - - value: arrangedObjects.value - - + value: values.DebuggerAttached + + - - - value: arrangedObjects.value + + + value: values.DebuggerAttached value - arrangedObjects.value - - YES - - YES - NSConditionallySetsEditable - NSValueTransformerName - - - YES - - StripLineBreaksValueTransformer - - + values.DebuggerAttached 2 - 603 + 596 - + - - YES + 0 - - YES - + -2 - + File's Owner -1 - + First Responder -3 - + Application 7 - - YES + - - + + Debugger 8 - - YES + - + 22 - - YES + - + 27 - - YES + - + 36 - + StackController 59 - + VariablesController @@ -1830,8 +1796,7 @@ 471 - - YES + @@ -1844,7 +1809,7 @@ - + @@ -1885,45 +1850,41 @@ 502 - - YES + - + 46 - - YES + - + 15 - - YES + - + 11 - - YES + - + @@ -1944,39 +1905,35 @@ 12 - - YES + - + 81 - - YES + - + 14 - - YES + - + 13 - - YES + - + @@ -2012,49 +1969,44 @@ 16 - - YES + - + 48 - - YES + - + 42 - - YES + - + 18 - - YES + - + 17 - - YES + - + @@ -2085,928 +2037,432 @@ 569 - - YES - - - - Inspector - - - 570 - - - YES - - - - - - 575 - - - YES - - - - - - - - 576 - - - - - 577 - - - - - 578 - - - - - 582 - - - - - 584 - - - - - 593 - - - YES - - - - - - 591 - - - YES - - - - - - 592 - - - - - 480 - - - - - 597 - - - - - 600 - - - - - - - YES - - YES - -3.IBPluginDependency - -3.ImportedFromIB2 - 11.IBPluginDependency - 11.ImportedFromIB2 - 12.IBPluginDependency - 12.ImportedFromIB2 - 13.IBPluginDependency - 13.ImportedFromIB2 - 14.IBPluginDependency - 14.ImportedFromIB2 - 15.IBPluginDependency - 15.ImportedFromIB2 - 16.IBPluginDependency - 16.ImportedFromIB2 - 17.IBPluginDependency - 17.ImportedFromIB2 - 18.IBPluginDependency - 18.ImportedFromIB2 - 22.IBPluginDependency - 22.ImportedFromIB2 - 27.IBPluginDependency - 27.ImportedFromIB2 - 36.IBPluginDependency - 36.ImportedFromIB2 - 42.IBPluginDependency - 42.ImportedFromIB2 - 453.IBPluginDependency - 455.IBPluginDependency - 456.IBPluginDependency - 456.IBShouldRemoveOnLegacySave - 457.IBPluginDependency - 457.IBShouldRemoveOnLegacySave - 458.IBPluginDependency - 458.IBShouldRemoveOnLegacySave - 459.IBPluginDependency - 459.IBShouldRemoveOnLegacySave - 46.CustomClassName - 46.IBPluginDependency - 46.ImportedFromIB2 - 460.IBPluginDependency - 460.IBShouldRemoveOnLegacySave - 461.IBPluginDependency - 461.IBShouldRemoveOnLegacySave - 462.IBPluginDependency - 462.IBShouldRemoveOnLegacySave - 465.IBPluginDependency - 465.IBShouldRemoveOnLegacySave - 466.IBPluginDependency - 466.IBShouldRemoveOnLegacySave - 467.IBPluginDependency - 467.IBShouldRemoveOnLegacySave - 468.IBPluginDependency - 468.IBShouldRemoveOnLegacySave - 469.IBPluginDependency - 469.IBShouldRemoveOnLegacySave - 471.IBEditorWindowLastContentRect - 471.IBPluginDependency - 471.editorWindowContentRectSynchronizationRect - 478.IBPluginDependency - 479.IBPluginDependency - 48.IBPluginDependency - 48.ImportedFromIB2 - 480.IBPluginDependency - 482.IBPluginDependency - 483.IBPluginDependency - 495.IBPluginDependency - 496.IBPluginDependency - 502.CustomClassName - 502.IBPluginDependency - 569.IBEditorWindowLastContentRect - 569.IBPluginDependency - 569.IBWindowTemplateEditedContentRect - 569.NSWindowTemplate.visibleAtLaunch - 570.IBPluginDependency - 575.IBPluginDependency - 576.IBPluginDependency - 577.IBPluginDependency - 578.IBPluginDependency - 582.IBPluginDependency - 584.IBPluginDependency - 59.IBPluginDependency - 59.ImportedFromIB2 - 591.IBPluginDependency - 592.IBPluginDependency - 597.IBPluginDependency - 600.IBPluginDependency - 7.IBEditorWindowLastContentRect - 7.IBPluginDependency - 7.IBViewEditorWindowController.showingBoundsRectangles - 7.IBViewEditorWindowController.showingLayoutRectangles - 7.IBWindowTemplateEditedContentRect - 7.ImportedFromIB2 - 7.NSWindowTemplate.visibleAtLaunch - 7.editorWindowContentRectSynchronizationRect - 7.windowTemplate.hasMaxSize - 7.windowTemplate.hasMinSize - 7.windowTemplate.maxSize - 7.windowTemplate.minSize - 8.IBPluginDependency - 8.ImportedFromIB2 - 81.IBPluginDependency - 81.ImportedFromIB2 - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - BSSplitView - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{442, 816}, {617, 0}} - com.apple.InterfaceBuilder.CocoaPlugin - {{418, 770}, {617, 0}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - BSSplitView - com.apple.InterfaceBuilder.CocoaPlugin - {{478, 327}, {400, 400}} - com.apple.InterfaceBuilder.CocoaPlugin - {{478, 327}, {400, 400}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{366, 315}, {769, 501}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{366, 315}, {769, 501}} - - - {{344, 269}, {769, 501}} - - - {3.40282e+38, 3.40282e+38} - {213, 107} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - YES - - - YES - - - - - YES - - - YES - - - - 603 - - - - YES - - BSSourceView - NSView - - delegate_ - id - - - delegate_ - - delegate_ - id - - - - IBProjectSource - Source/BSSourceView.h - - - - BSSplitView - NSSplitView - - IBProjectSource - Source/BSSplitView.h - - - - BSSplitView - NSSplitView - - IBUserSource - - - - - DebuggerController - NSWindowController - - YES - - YES - attachedToggled: - run: - showEvalWindow: - showInspectorWindow: - stepIn: - stepOut: - stepOver: - stop: - - - YES - id - id - id - id - id - id - id - id - - - - YES - - YES - attachedToggled: - run: - showEvalWindow: - showInspectorWindow: - stepIn: - stepOut: - stepOver: - stop: - - - YES - - attachedToggled: - id - - - run: - id - - - showEvalWindow: - id - - - showInspectorWindow: - id - - - stepIn: - id - - - stepOut: - id - - - stepOver: - id - - - stop: - id - - - - - YES - - YES - attachedCheckbox_ - errormsg - inspector - sourceViewer - stackArrayController - statusmsg - variablesOutlineView - variablesTreeController - - - YES - NSButton - NSTextField - NSWindow - BSSourceView - NSArrayController - NSTextField - NSOutlineView - NSTreeController - - - - YES - - YES - attachedCheckbox_ - errormsg - inspector - sourceViewer - stackArrayController - statusmsg - variablesOutlineView - variablesTreeController - - - YES - - attachedCheckbox_ - NSButton - - - errormsg - NSTextField - - - inspector - NSWindow - - - sourceViewer - BSSourceView - - - stackArrayController - NSArrayController - - - statusmsg - NSTextField - - - variablesOutlineView - NSOutlineView - - - variablesTreeController - NSTreeController - - - - - IBProjectSource - Source/DebuggerController.h - - - - DebuggerController - NSWindowController - - IBUserSource - - - - - FirstResponder - NSObject - - IBUserSource - - - - - NSObject - - IBUserSource - - - - - - YES - - NSActionCell - NSCell - - IBFrameworkSource - AppKit.framework/Headers/NSActionCell.h - - - - NSApplication - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSApplication.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSApplicationScripting.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSColorPanel.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSHelpManager.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSPageLayout.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSUserInterfaceItemSearching.h - - - - NSArrayController - NSObjectController - - IBFrameworkSource - AppKit.framework/Headers/NSArrayController.h - - - - NSButton - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSButton.h - - - - NSButtonCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSButtonCell.h - - - - NSCell - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSCell.h - - - - NSControl - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSControl.h - - - - NSController - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSController.h - - - - NSFormatter - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFormatter.h - - - - NSManagedObjectContext - NSObject - - IBFrameworkSource - CoreData.framework/Headers/NSManagedObjectContext.h - - - - NSMenu - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenu.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSAccessibility.h - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDictionaryController.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDragging.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontManager.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontPanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSKeyValueBinding.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSNibLoading.h + + + + + Inspector - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSOutlineView.h + + 570 + + + + + - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSPasteboard.h + + 575 + + + + + + + - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSSavePanel.h + + 576 + + - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableView.h + + 577 + + - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbarItem.h + + 578 + + - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSView.h + + 582 + + - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSArchiver.h + + 584 + + - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSClassDescription.h + + 593 + + + + + - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h + + 591 + + + + + - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h + + 592 + + - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h + + 480 + + - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h + + 597 + + - + + 600 + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + BSSplitView + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + BSSplitView + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{478, 327}, {400, 400}} + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{366, 315}, {769, 501}} + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + 603 + + + - NSObject + BSSourceView + NSView - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h + IBProjectSource + ../Source/BSSourceView.h - NSObject + BSSplitView + NSSplitView - IBFrameworkSource - Foundation.framework/Headers/NSObject.h + IBProjectSource + ../Source/BSSplitView.h - NSObject + DebuggerController + NSWindowController + + id + id + id + id + id + id + id + id + + + + attachedToggled: + id + + + run: + id + + + showEvalWindow: + id + + + showInspectorWindow: + id + + + stepIn: + id + + + stepOut: + id + + + stepOver: + id + + + stop: + id + + + + NSButton + NSTextField + NSWindow + BSSourceView + NSArrayController + NSTextField + NSOutlineView + NSTreeController + + + + attachedCheckbox_ + NSButton + + + errormsg + NSTextField + + + inspector + NSWindow + + + sourceViewer + BSSourceView + + + stackArrayController + NSArrayController + + + statusmsg + NSTextField + + + variablesOutlineView + NSOutlineView + + + variablesTreeController + NSTreeController + + - IBFrameworkSource - Foundation.framework/Headers/NSObjectScripting.h + IBProjectSource + ../Source/DebuggerController.h - NSObject + DebuggerController + + id + id + id + id + id + id + id + id + + + + attachedToggled: + id + + + run: + id + + + showEvalWindow: + id + + + showInspectorWindow: + id + + + stepIn: + id + + + stepOut: + id + + + stepOver: + id + + + stop: + id + + - IBFrameworkSource - Foundation.framework/Headers/NSPortCoder.h + IBProjectSource + ../Source/DebuggerController.m + + - NSObject + NSActionCell + NSCell IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h + AppKit.framework/Headers/NSActionCell.h - NSObject + NSApplication + NSResponder IBFrameworkSource - Foundation.framework/Headers/NSScriptClassDescription.h + AppKit.framework/Headers/NSApplication.h - NSObject + NSArrayController + NSObjectController IBFrameworkSource - Foundation.framework/Headers/NSScriptKeyValueCoding.h + AppKit.framework/Headers/NSArrayController.h - NSObject + NSButton + NSControl IBFrameworkSource - Foundation.framework/Headers/NSScriptObjectSpecifiers.h + AppKit.framework/Headers/NSButton.h - NSObject + NSButtonCell + NSActionCell IBFrameworkSource - Foundation.framework/Headers/NSScriptWhoseTests.h + AppKit.framework/Headers/NSButtonCell.h - NSObject + NSCell + NSObject IBFrameworkSource - Foundation.framework/Headers/NSThread.h + AppKit.framework/Headers/NSCell.h - NSObject + NSControl + NSView IBFrameworkSource - Foundation.framework/Headers/NSURL.h + AppKit.framework/Headers/NSControl.h - NSObject + NSController + NSObject IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h + AppKit.framework/Headers/NSController.h - NSObject + NSFormatter + NSObject IBFrameworkSource - Foundation.framework/Headers/NSURLDownload.h + Foundation.framework/Headers/NSFormatter.h - NSObject + NSManagedObjectContext + NSObject IBFrameworkSource - Sparkle.framework/Headers/SUAppcast.h + CoreData.framework/Headers/NSManagedObjectContext.h - NSObject + NSMenu + NSObject IBFrameworkSource - Sparkle.framework/Headers/SUUpdater.h + AppKit.framework/Headers/NSMenu.h @@ -3020,21 +2476,17 @@ NSOutlineView NSTableView - - - - NSPanel - NSWindow IBFrameworkSource - AppKit.framework/Headers/NSPanel.h + AppKit.framework/Headers/NSOutlineView.h - NSResponder + NSPanel + NSWindow IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h + AppKit.framework/Headers/NSPanel.h @@ -3088,7 +2540,10 @@ NSTableView NSControl - + + IBFrameworkSource + AppKit.framework/Headers/NSTableView.h + NSText @@ -3133,7 +2588,10 @@ NSToolbarItem NSObject - + + IBFrameworkSource + AppKit.framework/Headers/NSToolbarItem.h + NSTreeController @@ -3151,37 +2609,12 @@ AppKit.framework/Headers/NSUserDefaultsController.h - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSClipView.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItem.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSRulerView.h - - NSView NSResponder - - - - NSWindow IBFrameworkSource - AppKit.framework/Headers/NSDrawer.h + AppKit.framework/Headers/NSView.h @@ -3192,13 +2625,6 @@ AppKit.framework/Headers/NSWindow.h - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSWindowScripting.h - - NSWindowController NSResponder @@ -3218,7 +2644,7 @@ AppKit.framework/Headers/NSWindowController.h - + 0 IBCocoaFramework @@ -3226,47 +2652,24 @@ com.apple.InterfaceBuilder.CocoaPlugin.macosx - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - + YES - ../MacGDBp.xcodeproj 3 - - YES - - YES - Eval - HUDIcon - NSMenuCheckmark - NSMenuMixedState - NSSwitch - NSToolbarCustomizeToolbarItemImage - Run - StepIn - StepOut - StepOver - Stop - - - YES - {256, 256} - {32, 32} - {9, 8} - {7, 2} - {15, 15} - {32, 32} - {256, 256} - {256, 256} - {256, 256} - {256, 256} - {256, 256} - - + + {256, 256} + {32, 32} + {12, 12} + {10, 2} + {15, 15} + {32, 32} + {256, 256} + {256, 256} + {256, 256} + {256, 256} + {256, 256} + diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index 70b9493..68cf61b 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -1,29 +1,28 @@ - + 1050 - 10J869 - 804 - 1038.35 - 461.00 + + 8191 + 1404.11 + 806.00 com.apple.InterfaceBuilder.CocoaPlugin - 804 + 8191 - - YES - - - - YES + + NSCustomObject + NSMenu + NSMenuItem + + com.apple.InterfaceBuilder.CocoaPlugin - + PluginDependencyRecalculationVersion - - YES + NSApplication @@ -37,8 +36,7 @@ MainMenu - - YES + MacGDBp @@ -54,10 +52,10 @@ NSMenuMixedState submenuAction: + MacGDBp - - YES + About MacGDBp @@ -114,13 +112,12 @@ submenuAction: + Services - - YES - + _NSServicesMenu @@ -182,7 +179,7 @@ - + _NSAppleMenu @@ -194,10 +191,10 @@ submenuAction: + File - - YES + New @@ -224,10 +221,10 @@ submenuAction: + Open Recent - - YES + Clear Menu @@ -237,7 +234,7 @@ - + _NSRecentDocumentsMenu @@ -314,7 +311,7 @@ - + @@ -326,12 +323,12 @@ submenuAction: + Edit - - YES + Undo @@ -435,12 +432,12 @@ submenuAction: + Find - - YES + Find… @@ -490,7 +487,7 @@ - + @@ -502,10 +499,10 @@ submenuAction: + Spelling - - YES + Spelling… @@ -533,10 +530,10 @@ - + - + @@ -547,10 +544,10 @@ submenuAction: + Debugger - - YES + Step In @@ -614,7 +611,7 @@ - + @@ -626,12 +623,12 @@ submenuAction: + Window - - YES + Minimize @@ -715,7 +712,7 @@ - + _NSWindowsMenu @@ -728,10 +725,10 @@ submenuAction: + Help - - YES + MacGDBp Help @@ -741,10 +738,10 @@ - + - + _NSMainMenu @@ -762,26 +759,9 @@ SUUpdater - + - - YES - - - performMiniaturize: - - - - 37 - - - - arrangeInFront: - - - - 39 - + terminate: @@ -822,6 +802,30 @@ 153 + + + delegate + + + + 226 + + + + performMiniaturize: + + + + 37 + + + + arrangeInFront: + + + + 39 + cut: @@ -959,12 +963,12 @@ 205 - - delegate - - + + performClose: + + - 226 + 267 @@ -974,14 +978,6 @@ 266 - - - performClose: - - - - 267 - showBreakpointWindow: @@ -1007,12 +1003,28 @@ 285 - - checkForUpdates: - - + + breakpoint + + - 290 + 301 + + + + debugger + + + + 302 + + + + loggingController_ + + + + 307 @@ -1047,36 +1059,36 @@ 300 - - breakpoint - - + + showInspectorWindow: + + - 301 + 305 - - debugger - - + + stop: + + - 302 + 312 - showInspectorWindow: + showEvalWindow: - + - 305 + 317 - - loggingController_ - - + + checkForUpdates: + + - 307 + 290 @@ -1086,47 +1098,28 @@ 309 - - - stop: - - - - 312 - - value: connection.attached + value: connection.autoAttach - value: connection.attached + value: connection.autoAttach value - connection.attached + connection.autoAttach 2 314 - - - showEvalWindow: - - - - 317 - - + - - YES + 0 - - YES - + @@ -1145,32 +1138,29 @@ 29 - - YES + - + MainMenu 19 - - YES + - + 24 - - YES + @@ -1180,7 +1170,7 @@ - + @@ -1206,17 +1196,15 @@ 56 - - YES + - + 57 - - YES + @@ -1229,7 +1217,7 @@ - + @@ -1245,10 +1233,9 @@ 131 - - YES + - + @@ -1299,19 +1286,17 @@ 103 - - YES + - + 106 - - YES + - + @@ -1322,17 +1307,15 @@ 163 - - YES + - + 169 - - YES + @@ -1345,7 +1328,7 @@ - + @@ -1376,23 +1359,21 @@ 168 - - YES + - + 159 - - YES + - + @@ -1443,21 +1424,19 @@ 184 - - YES + - + 185 - - YES + - + @@ -1495,17 +1474,15 @@ 249 - - YES + - + 250 - - YES + @@ -1517,7 +1494,7 @@ - + @@ -1533,10 +1510,9 @@ 253 - - YES + - + @@ -1582,10 +1558,9 @@ 262 - - YES + - + @@ -1631,17 +1606,15 @@ 291 - - YES + - + 292 - - YES + @@ -1649,7 +1622,7 @@ - + @@ -1702,738 +1675,396 @@ - - - - YES - - YES - -3.IBPluginDependency - 103.IBPluginDependency - 103.ImportedFromIB2 - 106.IBEditorWindowLastContentRect - 106.IBPluginDependency - 106.ImportedFromIB2 - 111.IBPluginDependency - 111.ImportedFromIB2 - 129.IBPluginDependency - 129.ImportedFromIB2 - 130.IBPluginDependency - 130.ImportedFromIB2 - 131.IBPluginDependency - 131.ImportedFromIB2 - 134.IBPluginDependency - 134.ImportedFromIB2 - 136.IBPluginDependency - 136.ImportedFromIB2 - 143.IBPluginDependency - 143.ImportedFromIB2 - 144.IBPluginDependency - 144.ImportedFromIB2 - 145.IBPluginDependency - 145.ImportedFromIB2 - 149.IBPluginDependency - 149.ImportedFromIB2 - 150.IBPluginDependency - 150.ImportedFromIB2 - 154.IBPluginDependency - 154.ImportedFromIB2 - 155.IBPluginDependency - 155.ImportedFromIB2 - 156.IBPluginDependency - 156.ImportedFromIB2 - 157.IBPluginDependency - 157.ImportedFromIB2 - 158.IBPluginDependency - 158.ImportedFromIB2 - 159.IBPluginDependency - 159.ImportedFromIB2 - 160.IBPluginDependency - 160.ImportedFromIB2 - 161.IBPluginDependency - 161.ImportedFromIB2 - 162.IBPluginDependency - 162.ImportedFromIB2 - 163.IBPluginDependency - 163.ImportedFromIB2 - 164.IBPluginDependency - 164.ImportedFromIB2 - 167.IBPluginDependency - 167.ImportedFromIB2 - 168.IBPluginDependency - 168.ImportedFromIB2 - 169.IBEditorWindowLastContentRect - 169.IBPluginDependency - 169.ImportedFromIB2 - 171.IBPluginDependency - 171.ImportedFromIB2 - 172.IBPluginDependency - 172.ImportedFromIB2 - 173.IBPluginDependency - 173.ImportedFromIB2 - 174.IBPluginDependency - 174.ImportedFromIB2 - 184.IBPluginDependency - 184.ImportedFromIB2 - 185.IBPluginDependency - 185.ImportedFromIB2 - 187.IBPluginDependency - 187.ImportedFromIB2 - 189.IBPluginDependency - 189.ImportedFromIB2 - 19.IBPluginDependency - 19.ImportedFromIB2 - 191.IBPluginDependency - 191.ImportedFromIB2 - 196.IBPluginDependency - 196.ImportedFromIB2 - 197.IBPluginDependency - 197.ImportedFromIB2 - 204.IBPluginDependency - 204.ImportedFromIB2 - 225.ImportedFromIB2 - 23.IBPluginDependency - 23.ImportedFromIB2 - 24.IBEditorWindowLastContentRect - 24.IBPluginDependency - 24.ImportedFromIB2 - 249.IBPluginDependency - 250.IBEditorWindowLastContentRect - 250.IBPluginDependency - 251.IBPluginDependency - 252.IBPluginDependency - 253.IBPluginDependency - 254.IBPluginDependency - 255.IBPluginDependency - 256.IBPluginDependency - 257.IBPluginDependency - 258.IBPluginDependency - 259.IBPluginDependency - 260.IBPluginDependency - 261.IBPluginDependency - 262.IBPluginDependency - 263.IBPluginDependency - 264.IBPluginDependency - 265.IBPluginDependency - 268.IBPluginDependency - 289.IBPluginDependency - 29.IBEditorWindowLastContentRect - 29.IBPluginDependency - 29.ImportedFromIB2 - 291.IBPluginDependency - 292.IBEditorWindowLastContentRect - 292.IBPluginDependency - 293.IBPluginDependency - 294.IBPluginDependency - 295.IBPluginDependency - 296.IBPluginDependency - 303.IBPluginDependency - 308.IBPluginDependency - 310.IBPluginDependency - 313.IBPluginDependency - 316.IBPluginDependency - 5.IBPluginDependency - 5.ImportedFromIB2 - 56.IBPluginDependency - 56.ImportedFromIB2 - 57.IBEditorWindowLastContentRect - 57.IBPluginDependency - 57.ImportedFromIB2 - 58.IBPluginDependency - 58.ImportedFromIB2 - 92.IBPluginDependency - 92.ImportedFromIB2 - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - {{756, 778}, {174, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{598, 240}, {250, 223}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - {{727, 300}, {208, 163}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - {{556, 260}, {180, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{457, 463}, {402, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - {{642, 320}, {160, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{553, 390}, {235, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - YES - - - YES - + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + - - YES - - - YES - - + 317 - - YES + AppDelegate NSObject - - YES - - YES - openHelpPage: - showBreakpointWindow: - showDebuggerWindow: - showPreferences: - - - YES - id - id - id - id - - - - YES - - YES - openHelpPage: - showBreakpointWindow: - showDebuggerWindow: - showPreferences: - - - YES - - openHelpPage: - id - - - showBreakpointWindow: - id - - - showDebuggerWindow: - id - - - showPreferences: - id - - - - - YES - - YES - breakpoint - debugger - loggingController_ + + id + id + id + id + + + + openHelpPage: + id - - YES - BreakpointController - DebuggerController - LoggingController + + showBreakpointWindow: + id - - - YES - - YES - breakpoint - debugger - loggingController_ + + showDebuggerWindow: + id - - YES - - breakpoint - BreakpointController - - - debugger - DebuggerController - - - loggingController_ - LoggingController - + + showPreferences: + id - + + + BreakpointController + DebuggerController + LoggingController + + + + breakpoint + BreakpointController + + + debugger + DebuggerController + + + loggingController_ + LoggingController + + IBProjectSource - Source/AppDelegate.h + ../Source/AppDelegate.h AppDelegate - NSObject + + id + id + id + id + + + + openHelpPage: + id + + + showBreakpointWindow: + id + + + showDebuggerWindow: + id + + + showPreferences: + id + + - IBUserSource - + IBProjectSource + ../Source/AppDelegate.m BSSourceView NSView - - delegate_ - id - - - delegate_ - - delegate_ - id - - IBProjectSource - Source/BSSourceView.h + ../Source/BSSourceView.h BreakpointController NSWindowController - - YES - - YES - addBreakpoint: - removeBreakpoint: - - - YES - id - id - - - - YES - - YES - addBreakpoint: - removeBreakpoint: - - - YES - - addBreakpoint: - id - - - removeBreakpoint: - id - - - - - YES - - YES - arrayController - sourceView + + id + id + + + + addBreakpoint: + id - - YES - NSArrayController - BSSourceView + + removeBreakpoint: + id - - - YES - - YES - arrayController - sourceView + + + NSArrayController + BSSourceView + + + + arrayController + NSArrayController - - YES - - arrayController - NSArrayController - - - sourceView - BSSourceView - + + sourceView + BSSourceView - + IBProjectSource - Source/BreakpointController.h + ../Source/BreakpointController.h BreakpointController - NSWindowController + + id + id + + + + addBreakpoint: + id + + + removeBreakpoint: + id + + - IBUserSource - + IBProjectSource + ../Source/BreakpointController.m DebuggerController NSWindowController - - YES - - YES - attachedToggled: - run: - showEvalWindow: - showInspectorWindow: - stepIn: - stepOut: - stepOver: - stop: + + id + id + id + id + id + id + id + id + + + + attachedToggled: + id - - YES - id - id - id - id - id - id - id - id + + run: + id - - - YES - - YES - attachedToggled: - run: - showEvalWindow: - showInspectorWindow: - stepIn: - stepOut: - stepOver: - stop: + + showEvalWindow: + id - - YES - - attachedToggled: - id - - - run: - id - - - showEvalWindow: - id - - - showInspectorWindow: - id - - - stepIn: - id - - - stepOut: - id - - - stepOver: - id - - - stop: - id - + + showInspectorWindow: + id - - - YES - - YES - attachedCheckbox_ - errormsg - inspector - sourceViewer - stackArrayController - statusmsg - variablesOutlineView - variablesTreeController + + stepIn: + id - - YES - NSButton - NSTextField - NSWindow - BSSourceView - NSArrayController - NSTextField - NSOutlineView - NSTreeController + + stepOut: + id - - - YES - - YES - attachedCheckbox_ - errormsg - inspector - sourceViewer - stackArrayController - statusmsg - variablesOutlineView - variablesTreeController + + stepOver: + id - - YES - - attachedCheckbox_ - NSButton - - - errormsg - NSTextField - - - inspector - NSWindow - - - sourceViewer - BSSourceView - - - stackArrayController - NSArrayController - - - statusmsg - NSTextField - - - variablesOutlineView - NSOutlineView - - - variablesTreeController - NSTreeController - + + stop: + id - + + + NSButton + NSTextField + NSWindow + BSSourceView + NSArrayController + NSTextField + NSOutlineView + NSTreeController + + + + attachedCheckbox_ + NSButton + + + errormsg + NSTextField + + + inspector + NSWindow + + + sourceViewer + BSSourceView + + + stackArrayController + NSArrayController + + + statusmsg + NSTextField + + + variablesOutlineView + NSOutlineView + + + variablesTreeController + NSTreeController + + IBProjectSource - Source/DebuggerController.h + ../Source/DebuggerController.h DebuggerController - NSWindowController - - YES - - YES - reconnectButton - runButton - stackController2 - stepInButton - stepOutButton - stepOverButton + + id + id + id + id + id + id + id + id + + + + attachedToggled: + id - - YES - NSToolbarItem - NSToolbarItem - NSArrayController - NSToolbarItem - NSToolbarItem - NSToolbarItem + + run: + id - - - YES - - YES - reconnectButton - runButton - stackController2 - stepInButton - stepOutButton - stepOverButton + + showEvalWindow: + id - - YES - - reconnectButton - NSToolbarItem - - - runButton - NSToolbarItem - - - stackController2 - NSArrayController - - - stepInButton - NSToolbarItem - - - stepOutButton - NSToolbarItem - - - stepOverButton - NSToolbarItem - + + showInspectorWindow: + id - - - IBUserSource - - - - - FirstResponder - NSObject + + stepIn: + id + + + stepOut: + id + + + stepOver: + id + + + stop: + id + + - IBUserSource - + IBProjectSource + ../Source/DebuggerController.m @@ -2452,97 +2083,17 @@ IBProjectSource - Source/LoggingController.h - - - - - YES - - NSObject - - IBDocumentRelativeSource - ../Sparkle.framework/Versions/A/Headers/SUAppcast.h - - - - NSObject - - IBDocumentRelativeSource - ../Sparkle.framework/Versions/A/Headers/SUUpdater.h - - - - SUUpdater - NSObject - - checkForUpdates: - id - - - checkForUpdates: - - checkForUpdates: - id - - - - delegate - id + ../Source/LoggingController.h - - delegate - - delegate - id - - - - - - YES + + NSApplication NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSApplication.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSApplicationScripting.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSColorPanel.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSHelpManager.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSPageLayout.h - - - - NSApplication IBFrameworkSource - AppKit.framework/Headers/NSUserInterfaceItemSearching.h + AppKit.framework/Headers/NSApplication.h @@ -2569,10 +2120,37 @@ AppKit.framework/Headers/NSButton.h + + NSCollectionView + NSView + + id + id + + + + deselectAll: + id + + + selectAll: + id + + + + IBFrameworkSource + AppKit.framework/Headers/NSCollectionView.h + + + + NSCollectionViewItem + NSViewController + + NSControl NSView - + IBFrameworkSource AppKit.framework/Headers/NSControl.h @@ -2593,6 +2171,14 @@ Foundation.framework/Headers/NSFormatter.h + + NSImageView + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSImageView.h + + NSManagedObjectContext NSObject @@ -2612,7 +2198,7 @@ NSMenu NSObject - + IBFrameworkSource AppKit.framework/Headers/NSMenu.h @@ -2620,7 +2206,7 @@ NSMenuItem NSObject - + IBFrameworkSource AppKit.framework/Headers/NSMenuItem.h @@ -2633,264 +2219,6 @@ AppKit.framework/Headers/NSMovieView.h - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSAccessibility.h - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDictionaryController.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDragging.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontManager.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontPanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSKeyValueBinding.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSNibLoading.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSOutlineView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSPasteboard.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSSavePanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbarItem.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSView.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObjectScripting.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPortCoder.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptObjectSpecifiers.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptWhoseTests.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLDownload.h - - - - NSObject - - IBFrameworkSource - Sparkle.framework/Headers/SUAppcast.h - - - - NSObject - - IBFrameworkSource - Sparkle.framework/Headers/SUUpdater.h - - NSObjectController NSController @@ -2902,13 +2230,17 @@ NSOutlineView NSTableView - + + IBFrameworkSource + AppKit.framework/Headers/NSOutlineView.h + - NSResponder + NSPopover + NSResponder IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h + AppKit.framework/Headers/NSPopover.h @@ -2922,7 +2254,10 @@ NSTableView NSControl - + + IBFrameworkSource + AppKit.framework/Headers/NSTableView.h + NSText @@ -2941,46 +2276,46 @@ - NSToolbarItem - NSObject - - - - NSTreeController - NSObjectController + NSTextView + NSText IBFrameworkSource - AppKit.framework/Headers/NSTreeController.h + AppKit.framework/Headers/NSTextView.h - NSView + NSTreeController + NSObjectController IBFrameworkSource - AppKit.framework/Headers/NSClipView.h + AppKit.framework/Headers/NSTreeController.h NSView - - - - NSView + NSResponder IBFrameworkSource - AppKit.framework/Headers/NSRulerView.h + AppKit.framework/Headers/NSView.h - NSView + NSViewController NSResponder - - - - NSWindow + + view + NSView + + + view + + view + NSView + + IBFrameworkSource - AppKit.framework/Headers/NSDrawer.h + AppKit.framework/Headers/NSViewController.h @@ -2991,13 +2326,6 @@ AppKit.framework/Headers/NSWindow.h - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSWindowScripting.h - - NSWindowController NSResponder @@ -3042,9 +2370,12 @@ id - + + IBFrameworkSource + Sparkle.framework/Headers/SUUpdater.h + - + 0 IBCocoaFramework @@ -3052,29 +2383,15 @@ com.apple.InterfaceBuilder.CocoaPlugin.macosx - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - + YES - ../MacGDBp.xcodeproj 3 - - YES - - YES - NSMenuCheckmark - NSMenuMixedState - - - YES - {9, 8} - {7, 2} - - + + {12, 12} + {10, 2} + diff --git a/Source/AppDelegate.m b/Source/AppDelegate.m index 9046a00..fc8c185 100644 --- a/Source/AppDelegate.m +++ b/Source/AppDelegate.m @@ -71,7 +71,7 @@ - (void)applicationWillTerminate:(NSNotification*)notification { - [[NSUserDefaults standardUserDefaults] setBool:self.debugger.connection.attached + [[NSUserDefaults standardUserDefaults] setBool:self.debugger.connection.autoAttach forKey:@"DebuggerAttached"]; } diff --git a/Source/DebuggerBackEnd.h b/Source/DebuggerBackEnd.h index 588adec..ecd9a70 100644 --- a/Source/DebuggerBackEnd.h +++ b/Source/DebuggerBackEnd.h @@ -30,34 +30,16 @@ // primary unit that this class deals with is the StackFrame; clients should // maintain a stack structure and the BackEnd will inform the delegate when // a new frame is created or the stack should be destroyed. -@interface DebuggerBackEnd : NSObject -{ - // The connection to the debugger engine. - NSUInteger port_; - ProtocolClient* client_; - - // Human-readable status of the connection. - NSString* status; - BOOL active_; - - // Whether the debugger should detach immediately after being contacted by the - // backend. YES means all debugger connections will be dropped. - BOOL attached_; - - // The connection's delegate. - id delegate; - - // A dictionary that maps routingIDs to StackFrame objects. - NSMutableDictionary* stackFrames_; - // The stack depth for the current build of |stackFrames_|. - NSInteger stackDepth_; - // The earliest transaction ID for the current build of |stackFrames_|. - NSInteger stackFirstTransactionID_; -} - -@property (readonly, copy) NSString* status; -@property (nonatomic, assign) BOOL attached; -@property (assign) id delegate; +@interface DebuggerBackEnd : NSObject + +// Human-readable status of the connection. +@property(readonly, copy, nonatomic) NSString* status; + +// Whether the debugger should detach immediately after being contacted by the +// backend. YES means all debugger connections will be dropped. +@property(assign, nonatomic) BOOL autoAttach; + +@property(assign, nonatomic) id delegate; // initializer - (id)initWithPort:(NSUInteger)aPort; diff --git a/Source/DebuggerBackEnd.m b/Source/DebuggerBackEnd.m index 32a0e15..276ae65 100644 --- a/Source/DebuggerBackEnd.m +++ b/Source/DebuggerBackEnd.m @@ -20,87 +20,77 @@ #import "modp_b64.h" #import "NSXMLElementAdditions.h" -// GDBpConnection (Private) //////////////////////////////////////////////////// - @interface DebuggerBackEnd () -@property (readwrite, copy) NSString* status; - -- (void)updateStatus:(NSXMLDocument*)response; -- (void)debuggerStep:(NSXMLDocument*)response; -- (void)rebuildStack:(NSXMLDocument*)response; - +@property(readwrite, copy, nonatomic) NSString* status; @end -// GDBpConnection ////////////////////////////////////////////////////////////// +@implementation DebuggerBackEnd { + // The connection to the debugger engine. + NSUInteger _port; + ProtocolClient* _client; -@implementation DebuggerBackEnd + // Whether or not a debugging session is currently active. + BOOL _active; -@synthesize status; -@synthesize attached = attached_; -@synthesize delegate; + // The earliest transaction ID for the current build of |stackFrames_|. + NSInteger stackFirstTransactionID_; +} + +@synthesize status = _status; +@synthesize autoAttach = _autoAttach; +@synthesize delegate = _delegate; -/** - * Creates a new DebuggerBackEnd and initializes the socket from the given connection - * paramters. - */ - (id)initWithPort:(NSUInteger)aPort { if (self = [super init]) { [[BreakpointManager sharedManager] setConnection:self]; - port_ = aPort; - client_ = [[ProtocolClient alloc] initWithDelegate:self]; + _port = aPort; + _client = [[ProtocolClient alloc] initWithDelegate:self]; - attached_ = [[NSUserDefaults standardUserDefaults] boolForKey:@"DebuggerAttached"]; + _autoAttach = [[NSUserDefaults standardUserDefaults] boolForKey:@"DebuggerAttached"]; - if (self.attached) - [client_ connectOnPort:port_]; + if (self.autoAttach) + [_client connectOnPort:_port]; } return self; } -/** - * Deallocates the object - */ -- (void)dealloc -{ - [client_ release]; +- (void)dealloc { + [_client release]; [super dealloc]; } - // Getters ///////////////////////////////////////////////////////////////////// #pragma mark Getters /** * Gets the port number */ -- (NSUInteger)port -{ - return port_; +- (NSUInteger)port { + return _port; } /** * Returns whether or not we have an active connection */ -- (BOOL)isConnected -{ - return active_; +- (BOOL)isConnected { + return _active; } /** * Sets the attached state of the debugger. This will open and close the * connection as appropriate. */ -- (void)setAttached:(BOOL)attached { - if (attached == attached_) +- (void)setAutoAttach:(BOOL)flag { + if (flag == _autoAttach) return; - if (attached_) - [client_ disconnect]; + if (_autoAttach) + [_client disconnect]; else - [client_ connectOnPort:port_]; + [_client connectOnPort:_port]; - attached_ = attached; + _autoAttach = flag; } // Commands //////////////////////////////////////////////////////////////////// @@ -110,7 +100,7 @@ * Tells the debugger to continue running the script. Returns the current stack frame. */ - (void)run { - [client_ sendCommandWithFormat:@"run" handler:^(NSXMLDocument* message) { + [_client sendCommandWithFormat:@"run" handler:^(NSXMLDocument* message) { [self debuggerStep:message]; }]; } @@ -119,7 +109,7 @@ * Tells the debugger to step into the current command. */ - (void)stepIn { - [client_ sendCommandWithFormat:@"step_into" handler:^(NSXMLDocument* message) { + [_client sendCommandWithFormat:@"step_into" handler:^(NSXMLDocument* message) { [self debuggerStep:message]; }]; } @@ -128,7 +118,7 @@ * Tells the debugger to step out of the current context */ - (void)stepOut { - [client_ sendCommandWithFormat:@"step_out" handler:^(NSXMLDocument* message) { + [_client sendCommandWithFormat:@"step_out" handler:^(NSXMLDocument* message) { [self debuggerStep:message]; }]; } @@ -137,7 +127,7 @@ * Tells the debugger to step over the current function */ - (void)stepOver { - [client_ sendCommandWithFormat:@"step_over" handler:^(NSXMLDocument* message) { + [_client sendCommandWithFormat:@"step_over" handler:^(NSXMLDocument* message) { [self debuggerStep:message]; }]; } @@ -145,20 +135,18 @@ /** * Halts execution of the script. */ -- (void)stop -{ - [client_ disconnect]; - active_ = NO; +- (void)stop { + [_client disconnect]; + _active = NO; self.status = @"Stopped"; } /** * Ends the current debugging session. */ -- (void)detach -{ - [client_ sendCommandWithFormat:@"detach"]; - active_ = NO; +- (void)detach { + [_client sendCommandWithFormat:@"detach"]; + _active = NO; self.status = @"Stopped"; } @@ -168,8 +156,7 @@ */ - (void)getChildrenOfProperty:(VariableNode*)property atDepth:(NSInteger)depth - callback:(void (^)(NSArray*))callback -{ + callback:(void (^)(NSArray*))callback { ProtocolClientMessageHandler handler = ^(NSXMLDocument* message) { /* @@ -186,18 +173,17 @@ callback(children); }; - [client_ sendCommandWithFormat:@"property_get -d %d -n %@" handler:handler, depth, [property fullName]]; + [_client sendCommandWithFormat:@"property_get -d %d -n %@" handler:handler, depth, [property fullName]]; } -- (void)loadStackFrame:(StackFrame*)frame -{ +- (void)loadStackFrame:(StackFrame*)frame { if (frame.loaded) return; // Get the source code of the file. Escape % in URL chars. if ([frame.filename length]) { ProtocolClientMessageHandler handler = ^(NSXMLDocument* message) { - int receivedTransaction = [client_ transactionIDFromResponse:message]; + int receivedTransaction = [_client transactionIDFromResponse:message]; if (receivedTransaction < stackFirstTransactionID_) return; @@ -205,14 +191,14 @@ if ([self.delegate respondsToSelector:@selector(sourceUpdated:)]) [self.delegate sourceUpdated:frame]; }; - [client_ sendCommandWithFormat:@"source -f %@" handler:handler, frame.filename]; + [_client sendCommandWithFormat:@"source -f %@" handler:handler, frame.filename]; } // Get the names of all the contexts. ProtocolClientMessageHandler handler = ^(NSXMLDocument* message) { [self loadContexts:message forFrame:frame]; }; - [client_ sendCommandWithFormat:@"context_names -d %d" handler:handler, frame.index]; + [_client sendCommandWithFormat:@"context_names -d %d" handler:handler, frame.index]; // This frame will be fully loaded. frame.loaded = YES; @@ -224,35 +210,32 @@ /** * Send an add breakpoint command */ -- (void)addBreakpoint:(Breakpoint*)bp -{ - if (!active_) +- (void)addBreakpoint:(Breakpoint*)bp { + if (!_active) return; NSString* file = [ProtocolClient escapedFilePathURI:[bp transformedPath]]; ProtocolClientMessageHandler handler = ^(NSXMLDocument* message) { [bp setDebuggerId:[[[[message rootElement] attributeForName:@"id"] stringValue] intValue]]; }; - [client_ sendCommandWithFormat:@"breakpoint_set -t line -f %@ -n %i" handler:handler, file, [bp line]]; + [_client sendCommandWithFormat:@"breakpoint_set -t line -f %@ -n %i" handler:handler, file, [bp line]]; } /** * Removes a breakpoint */ -- (void)removeBreakpoint:(Breakpoint*)bp -{ - if (!active_) +- (void)removeBreakpoint:(Breakpoint*)bp { + if (!_active) return; - [client_ sendCommandWithFormat:@"breakpoint_remove -d %i", [bp debuggerId]]; + [_client sendCommandWithFormat:@"breakpoint_remove -d %i", [bp debuggerId]]; } /** * Sends a string to be evaluated by the engine. */ -- (void)evalScript:(NSString*)str -{ - if (!active_) +- (void)evalScript:(NSString*)str { + if (!_active) return; char* encodedString = malloc(modp_b64_encode_len([str length])); @@ -262,31 +245,29 @@ NSString* value = [parent base64DecodedValue]; [self.delegate scriptWasEvaluatedWithResult:value]; }; - [client_ sendCustomCommandWithFormat:@"eval -i {txn} -- %s" handler:handler, encodedString]; + [_client sendCustomCommandWithFormat:@"eval -i {txn} -- %s" handler:handler, encodedString]; free(encodedString); } // Protocol Client Delegate //////////////////////////////////////////////////// #pragma mark Protocol Client Delegate -- (void)debuggerEngineConnected:(ProtocolClient*)client -{ - active_ = YES; +- (void)debuggerEngineConnected:(ProtocolClient*)client { + _active = YES; } /** * Called when the connection is finally closed. This will reopen the listening * socket if the debugger remains attached. */ -- (void)debuggerEngineDisconnected:(ProtocolClient*)client -{ - active_ = NO; +- (void)debuggerEngineDisconnected:(ProtocolClient*)client { + _active = NO; - if ([delegate respondsToSelector:@selector(debuggerDisconnected)]) - [delegate debuggerDisconnected]; + if ([self.delegate respondsToSelector:@selector(debuggerDisconnected)]) + [self.delegate debuggerDisconnected]; - if (self.attached) - [client_ connectOnPort:port_]; + if (self.autoAttach) + [_client connectOnPort:_port]; } - (void)protocolClient:(ProtocolClient*)client receivedInitialMessage:(NSXMLDocument*)message { @@ -305,29 +286,27 @@ // Specific Response Handlers ////////////////////////////////////////////////// #pragma mark Response Handlers -- (void)errorEncountered:(NSString*)error -{ - [delegate errorEncountered:error]; +- (void)errorEncountered:(NSString*)error { + [self.delegate errorEncountered:error]; } /** * Initial packet received. We've started a brand-new connection to the engine. */ -- (void)handleInitialResponse:(NSXMLDocument*)response -{ - if (!self.attached) { - [client_ sendCommandWithFormat:@"detach"]; +- (void)handleInitialResponse:(NSXMLDocument*)response { + if (!self.autoAttach) { + [_client sendCommandWithFormat:@"detach"]; return; } - active_ = YES; + _active = YES; // Register any breakpoints that exist offline. for (Breakpoint* bp in [[BreakpointManager sharedManager] breakpoints]) [self addBreakpoint:bp]; // Load the debugger to make it look active. - [delegate debuggerConnected]; + [self.delegate debuggerConnected]; // TODO: update the status. } @@ -335,16 +314,15 @@ /** * Receiver for status updates. This just freshens up the UI. */ -- (void)updateStatus:(NSXMLDocument*)response -{ +- (void)updateStatus:(NSXMLDocument*)response { self.status = [[[[response rootElement] attributeForName:@"status"] stringValue] capitalizedString]; - active_ = YES; - if (!status || [status isEqualToString:@"Stopped"]) { - [delegate debuggerDisconnected]; - active_ = NO; - } else if ([status isEqualToString:@"Stopping"]) { - [client_ sendCommandWithFormat:@"stop"]; - active_ = NO; + _active = YES; + if (!_status || [_status isEqualToString:@"Stopped"]) { + [_delegate debuggerDisconnected]; + _active = NO; + } else if ([_status isEqualToString:@"Stopping"]) { + [_client sendCommandWithFormat:@"stop"]; + _active = NO; } } @@ -359,11 +337,11 @@ // If this is the run command, tell the delegate that a bunch of updates // are coming. Also remove all existing stack routes and request a new stack. - if ([delegate respondsToSelector:@selector(clobberStack)]) - [delegate clobberStack]; + if ([self.delegate respondsToSelector:@selector(clobberStack)]) + [self.delegate clobberStack]; - [client_ sendCommandWithFormat:@"stack_depth" handler:^(NSXMLDocument* message) { - stackFirstTransactionID_ = [client_ transactionIDFromResponse:message]; + [_client sendCommandWithFormat:@"stack_depth" handler:^(NSXMLDocument* message) { + stackFirstTransactionID_ = [_client transactionIDFromResponse:message]; [self rebuildStack:message]; }]; } @@ -375,15 +353,12 @@ - (void)rebuildStack:(NSXMLDocument*)response { NSInteger depth = [[[[response rootElement] attributeForName:@"depth"] stringValue] intValue]; - if (stackFirstTransactionID_ == [client_ transactionIDFromResponse:response]) - stackDepth_ = depth; - // We now need to alloc a bunch of stack frames and get the basic information // for them. for (NSInteger i = 0; i < depth; i++) { // Use the transaction ID to create a routing path. ProtocolClientMessageHandler handler = ^(NSXMLDocument* message) { - NSInteger receivedTransaction = [client_ transactionIDFromResponse:message]; + NSInteger receivedTransaction = [_client transactionIDFromResponse:message]; if (receivedTransaction < stackFirstTransactionID_) return; @@ -405,7 +380,7 @@ if ([self.delegate respondsToSelector:@selector(newStackFrame:)]) [self.delegate newStackFrame:frame]; }; - [client_ sendCommandWithFormat:@"stack_get -d %d" handler:handler, i]; + [_client sendCommandWithFormat:@"stack_get -d %d" handler:handler, i]; } } @@ -414,7 +389,7 @@ * contents of each one of these contexts. */ - (void)loadContexts:(NSXMLDocument*)response forFrame:(StackFrame*)frame { - int receivedTransaction = [client_ transactionIDFromResponse:response]; + int receivedTransaction = [_client transactionIDFromResponse:response]; if (receivedTransaction < stackFirstTransactionID_) return; @@ -441,7 +416,7 @@ frame.variables = variables; }; - [client_ sendCommandWithFormat:@"context_get -d %d -c %d" handler:handler, frame.index, cid]; + [_client sendCommandWithFormat:@"context_get -d %d -c %d" handler:handler, frame.index, cid]; } } diff --git a/Source/DebuggerController.m b/Source/DebuggerController.m index 541ad28..3155dca 100644 --- a/Source/DebuggerController.m +++ b/Source/DebuggerController.m @@ -76,7 +76,7 @@ [[self window] setTitle:[NSString stringWithFormat:@"MacGDBp @ %d", [connection port]]]; [sourceViewer setDelegate:self]; [stackArrayController setSortDescriptors:[NSArray arrayWithObject:[[[NSSortDescriptor alloc] initWithKey:@"index" ascending:YES] autorelease]]]; - self.connection.attached = [attachedCheckbox_ state] == NSOnState; + self.connection.autoAttach = [attachedCheckbox_ state] == NSOnState; } /** @@ -154,7 +154,7 @@ - (void)debuggerConnected { [errormsg setHidden:YES]; - if (!self.connection.attached) + if (!self.connection.autoAttach) return; if ([[NSUserDefaults standardUserDefaults] boolForKey:@"BreakOnFirstLine"]) [self stepIn:self]; @@ -180,7 +180,7 @@ - (IBAction)attachedToggled:(id)sender { - connection.attached = [sender state] == NSOnState; + connection.autoAttach = [sender state] == NSOnState; } /** -- 2.43.5