Revert "Add drag and drop for the table view."

This reverts commit 7a8a10f2673ce531fcb38cfec89a04991bbe09c0.

diff --git a/English.lproj/Breakpoints.xib b/English.lproj/Breakpoints.xib
index c1093b5f6743344a2bedd4e7bab9f026dbe18ef0..1574853568c025a6723bbf9d2e1bcb1e5346d1d7 100644 (file)
--- a/English.lproj/Breakpoints.xib
+++ b/English.lproj/Breakpoints.xib
@@ -12,7 +12,7 @@
                </object>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="10"/>
+                       <integer value="1"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -480,14 +480,6 @@
                                        </object>
                                        <int key="connectionID">50</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">dataSource</string>
-                                               <reference key="source" ref="648662165"/>
-                                               <reference key="destination" ref="1001"/>
-                                       </object>
-                                       <int key="connectionID">51</int>
-                               </object>
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <object class="NSArray" key="orderedObjects">
@@ -749,7 +741,7 @@
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">51</int>
+                       <int key="maxID">50</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">

diff --git a/Source/BreakpointController.m b/Source/BreakpointController.m
index 1f08eba7e7b4d210dd141a7a5339b719cd539496..ef3e5a990553cbfeff257b16e21794de7c73b81e 100644 (file)
--- a/Source/BreakpointController.m
+++ b/Source/BreakpointController.m
@@ -43,8 +43,6 @@
  */
 - (void)awakeFromNib
 {
-  NSArray* dragTypes = [NSArray arrayWithObject:NSFilenamesPboardType];
-  [tableView_ registerForDraggedTypes:dragTypes];
 }
 
 /**
@@ -88,8 +86,7 @@
   
   Breakpoint* bp = [selection objectAtIndex:0];
   [sourceView_ setFile:[bp file]];
-  if ([bp line] > 0)
-    [sourceView_ scrollToLine:[bp line]];
+  [sourceView_ scrollToLine:[bp line]];
   [[sourceView_ numberView] setMarkers:[NSSet setWithArray:[manager breakpointsForFile:[bp file]]]];
 }
 
@@ -102,8 +99,6 @@
     writeRowsWithIndexes:(NSIndexSet*)rowIndexes
     toPasteboard:(NSPasteboard*)pboard
 {
-  NSLog(@"begin");
-  return [[pboard types] containsObject:NSFilenamesPboardType];
 }
 
 /**
@@ -114,14 +109,6 @@
                  proposedRow:(NSInteger)row
        proposedDropOperation:(NSTableViewDropOperation)operation
 {
-  NSLog(@"validate");
-  NSPasteboard* pboard = [info draggingPasteboard];
-  if ([[pboard types] containsObject:NSFilenamesPboardType]) {
-    NSArray* files = [pboard propertyListForType:NSFilenamesPboardType];
-    if ([files count])
-      return NSDragOperationGeneric;
-  }
-  return NSDragOperationNone;
 }
 
 /**
@@ -132,21 +119,6 @@
               row:(NSInteger)row
     dropOperation:(NSTableViewDropOperation)operation
 {
-  NSLog(@"accept");
-  BOOL valid = [self tableView:aTableView
-                  validateDrop:info
-                   proposedRow:row
-         proposedDropOperation:operation] == NSDragOperationGeneric;
-  if (valid) {
-    NSPasteboard* pboard = [info draggingPasteboard];
-    NSArray* files = [pboard propertyListForType:NSFilenamesPboardType];
-    for (NSString* file in files) {
-      Breakpoint* bp = [[[Breakpoint alloc] initWithLine:0 inFile:file] autorelease];
-      [manager addBreakpoint:bp];
-    }
-    return YES;
-  }
-  return NO;
 }
 
 #pragma mark BSSourceView Delegate

diff --git a/Source/BreakpointManager.m b/Source/BreakpointManager.m
index 6d4bcb8edb780e28bd65954687fe2ba4f0c4da42..0407a472163c8006bcd1512699d35bae43f98a31 100644 (file)
--- a/Source/BreakpointManager.m
+++ b/Source/BreakpointManager.m
@@ -67,14 +67,13 @@
  */
 - (void)addBreakpoint:(Breakpoint*)bp;
 {
-  if (![breakpoints containsObject:bp]) {
+  if (![breakpoints containsObject:bp])
+  {
     [breakpoints addObject:bp];
-    if (bp.line > 0) {
-      [connection addBreakpoint:bp];
-
-      [savedBreakpoints addObject:[bp dictionary]];
-      [[NSUserDefaults standardUserDefaults] setValue:savedBreakpoints forKey:@"Breakpoints"];
-    }
+    [connection addBreakpoint:bp];
+    
+    [savedBreakpoints addObject:[bp dictionary]];
+    [[NSUserDefaults standardUserDefaults] setValue:savedBreakpoints forKey:@"Breakpoints"];
     
     [self updateDisplaysForFile:[bp file]];
   }
@@ -90,12 +89,11 @@
     if ([b line] == line && [[b file] isEqualToString:file])
     {
       [breakpoints removeObject:b];
-      if (b.line > 0)
-        [connection removeBreakpoint:b];
-
+      [connection removeBreakpoint:b];
+      
       [savedBreakpoints removeObject:[b dictionary]];
       [[NSUserDefaults standardUserDefaults] setValue:savedBreakpoints forKey:@"Breakpoints"];
-
+      
       [self updateDisplaysForFile:file];
       return b;
     }
@@ -111,7 +109,7 @@
   NSMutableArray* matches = [NSMutableArray array];
   for (Breakpoint* b in breakpoints)
   {
-    if ([[b file] isEqualToString:file] && [b line] > 0)
+    if ([[b file] isEqualToString:file])
     {
       [matches addObject:b];
     }