From f2cd8f76489827d8e6a23cae36da715ada710c2f Mon Sep 17 00:00:00 2001
From: masakih <masakih@users.sourceforge.jp>
Date: Sun, 25 Dec 2016 00:16:02 +0900
Subject: [PATCH] =?utf8?q?HMBookmarkListViewController=E3=82=92Swift?=
 =?utf8?q?=E3=81=AB=E5=A4=89=E6=8F=9B=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KCD.xcodeproj/project.pbxproj                   |  10 +-
 KCD/Base.lproj/HMBookmarkListViewController.xib |  15 +-
 KCD/HMBookmarkListViewController.h              |  26 ----
 KCD/HMBookmarkListViewController.m              | 184 ------------------------
 KCD/HMBookmarkListViewController.swift          | 140 ++++++++++++++++++
 KCD/KCD-Bridging-Header.h                       |   3 -
 6 files changed, 152 insertions(+), 226 deletions(-)
 delete mode 100644 KCD/HMBookmarkListViewController.h
 delete mode 100644 KCD/HMBookmarkListViewController.m
 create mode 100644 KCD/HMBookmarkListViewController.swift

diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj
index f9a6456b..b094830e 100644
--- a/KCD.xcodeproj/project.pbxproj
+++ b/KCD.xcodeproj/project.pbxproj
@@ -114,7 +114,6 @@
 		F495462B1B14CBA600E0D8D0 /* HMBookmarkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F495462A1B14CBA600E0D8D0 /* HMBookmarkManager.m */; };
 		F495462E1B1894DD00E0D8D0 /* Bookmark.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = F495462C1B1894DD00E0D8D0 /* Bookmark.xcdatamodeld */; };
 		F49546311B18991300E0D8D0 /* HMBookmarkDataStore.m in Sources */ = {isa = PBXBuildFile; fileRef = F49546301B18991300E0D8D0 /* HMBookmarkDataStore.m */; };
-		F49546351B19924D00E0D8D0 /* HMBookmarkListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F49546331B19924D00E0D8D0 /* HMBookmarkListViewController.m */; };
 		F49688671B3EA16800D3CEDE /* RemoveDatabaseFileAndRestart.app in Resources */ = {isa = PBXBuildFile; fileRef = F49688661B3EA16800D3CEDE /* RemoveDatabaseFileAndRestart.app */; };
 		F49828FC1902A226000D6BBE /* HMStrokeTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F49828FB1902A226000D6BBE /* HMStrokeTextFieldCell.m */; };
 		F499E8901B5D4E7F00189029 /* HMPortNotifyCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F499E88F1B5D4E7F00189029 /* HMPortNotifyCommand.m */; };
@@ -241,6 +240,7 @@
 		F4D05BCA1E0CADA100688D66 /* HMExternalBrowserWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D05BC91E0CADA100688D66 /* HMExternalBrowserWindowController.swift */; };
 		F4D05BCC1E0D274100688D66 /* HMBookmarkEditorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D05BCB1E0D274100688D66 /* HMBookmarkEditorViewController.swift */; };
 		F4D05BCE1E0D50D300688D66 /* HMBrowserContentAdjuster.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D05BCD1E0D50D300688D66 /* HMBrowserContentAdjuster.swift */; };
+		F4D05BD01E0D667600688D66 /* HMBookmarkListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D05BCF1E0D667600688D66 /* HMBookmarkListViewController.swift */; };
 		F4D2CBC218AD0E1A000EBC59 /* HMMasterSTypeCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4D2CBC118AD0E1A000EBC59 /* HMMasterSTypeCommand.m */; };
 		F4D2CBC518AE2AE2000EBC59 /* HMCompositCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4D2CBC418AE2AE2000EBC59 /* HMCompositCommand.m */; };
 		F4D2CBC818B0555A000EBC59 /* HMKCManagedObject.m in Sources */ = {isa = PBXBuildFile; fileRef = F4D2CBC718B0555A000EBC59 /* HMKCManagedObject.m */; };
@@ -527,8 +527,6 @@
 		F495462D1B1894DD00E0D8D0 /* Bookmark.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Bookmark.xcdatamodel; sourceTree = "<group>"; };
 		F495462F1B18991300E0D8D0 /* HMBookmarkDataStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMBookmarkDataStore.h; sourceTree = "<group>"; };
 		F49546301B18991300E0D8D0 /* HMBookmarkDataStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMBookmarkDataStore.m; sourceTree = "<group>"; };
-		F49546321B19924D00E0D8D0 /* HMBookmarkListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMBookmarkListViewController.h; sourceTree = "<group>"; };
-		F49546331B19924D00E0D8D0 /* HMBookmarkListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMBookmarkListViewController.m; sourceTree = "<group>"; };
 		F49688661B3EA16800D3CEDE /* RemoveDatabaseFileAndRestart.app */ = {isa = PBXFileReference; lastKnownFileType = wrapper.application; path = RemoveDatabaseFileAndRestart.app; sourceTree = "<group>"; };
 		F497F6231D5B7CCA00A8F609 /* zh-Hant-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/MainMenu.strings"; sourceTree = "<group>"; };
 		F497F63A1D5B7CE300A8F609 /* zh-Hant-TW */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/Makefile"; sourceTree = "<group>"; };
@@ -710,6 +708,7 @@
 		F4D05BC91E0CADA100688D66 /* HMExternalBrowserWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMExternalBrowserWindowController.swift; sourceTree = "<group>"; };
 		F4D05BCB1E0D274100688D66 /* HMBookmarkEditorViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMBookmarkEditorViewController.swift; sourceTree = "<group>"; };
 		F4D05BCD1E0D50D300688D66 /* HMBrowserContentAdjuster.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMBrowserContentAdjuster.swift; sourceTree = "<group>"; };
+		F4D05BCF1E0D667600688D66 /* HMBookmarkListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMBookmarkListViewController.swift; sourceTree = "<group>"; };
 		F4D2CBC018AD0E1A000EBC59 /* HMMasterSTypeCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMasterSTypeCommand.h; sourceTree = "<group>"; };
 		F4D2CBC118AD0E1A000EBC59 /* HMMasterSTypeCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMasterSTypeCommand.m; sourceTree = "<group>"; };
 		F4D2CBC318AE2AE2000EBC59 /* HMCompositCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMCompositCommand.h; sourceTree = "<group>"; };
@@ -1085,8 +1084,7 @@
 		F4666C5B1B242065001840DB /* Bookmark */ = {
 			isa = PBXGroup;
 			children = (
-				F49546321B19924D00E0D8D0 /* HMBookmarkListViewController.h */,
-				F49546331B19924D00E0D8D0 /* HMBookmarkListViewController.m */,
+				F4D05BCF1E0D667600688D66 /* HMBookmarkListViewController.swift */,
 				F4C668591C5450EB00601AFB /* HMBookmarkListViewController.xib */,
 				F4666C581B2067CF001840DB /* HMSourceListColoredView.h */,
 				F4666C591B2067CF001840DB /* HMSourceListColoredView.m */,
@@ -1946,7 +1944,6 @@
 				F4D05BCC1E0D274100688D66 /* HMBookmarkEditorViewController.swift in Sources */,
 				F494DC6D18CC054800AE97E4 /* HMNyukyoDockStatus.m in Sources */,
 				F4666C641B25CA3E001840DB /* HMKCQuest+Extensions.m in Sources */,
-				F49546351B19924D00E0D8D0 /* HMBookmarkListViewController.m in Sources */,
 				F4F9F8A91C796C2E00D0EE76 /* HMChangeHenseiNotification.m in Sources */,
 				F43BA4A1197BE22200CFF788 /* HMDestroyShipCommand.m in Sources */,
 				F47B78B218A7B42B0011386E /* HMJSONViewWindowController.m in Sources */,
@@ -1976,6 +1973,7 @@
 				F4ECA36F1C6102FC0098AB6A /* HMMillisecondTransformer.m in Sources */,
 				F43769E71AE7D22700DE6204 /* HMKCQuest.m in Sources */,
 				F4D05BCE1E0D50D300688D66 /* HMBrowserContentAdjuster.swift in Sources */,
+				F4D05BD01E0D667600688D66 /* HMBookmarkListViewController.swift in Sources */,
 				F43769E41AE7D01D00DE6204 /* HMUpdateQuestListCommand.m in Sources */,
 				F4C1190818A746EB005D5B25 /* HMJSONTracker.m in Sources */,
 				F4B3DC4718EEEB920011B4FC /* HMStart2Command.m in Sources */,
diff --git a/KCD/Base.lproj/HMBookmarkListViewController.xib b/KCD/Base.lproj/HMBookmarkListViewController.xib
index ee142bd8..7f79b670 100644
--- a/KCD/Base.lproj/HMBookmarkListViewController.xib
+++ b/KCD/Base.lproj/HMBookmarkListViewController.xib
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="HMBookmarkListViewController">
@@ -27,7 +28,7 @@
                         <rect key="frame" x="1" y="1" width="305" height="590"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView focusRingType="none" appearanceType="vibrantLight" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="18" id="UuT-SX-V20" customClass="HMBookmarkListTableView">
+                            <tableView focusRingType="none" appearanceType="vibrantLight" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="18" id="UuT-SX-V20">
                                 <rect key="frame" x="0.0" y="0.0" width="305" height="590"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <size key="intercellSpacing" width="3" height="4"/>
@@ -54,13 +55,14 @@
                                 <connections>
                                     <outlet property="dataSource" destination="-2" id="ZY2-PF-PrX"/>
                                     <outlet property="delegate" destination="-2" id="eQt-bz-lsL"/>
+                                    <outlet property="menu" destination="Q3n-jS-n1E" id="SMM-Pk-g9K"/>
                                 </connections>
                             </tableView>
                         </subviews>
-                        <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        <nil key="backgroundColor"/>
                     </clipView>
                     <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="DtO-aT-4Xo">
-                        <rect key="frame" x="1" y="115.55228078365326" width="233" height="16"/>
+                        <rect key="frame" x="1" y="115.5" width="233" height="16"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
                     <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="caP-Y9-8W4">
@@ -86,7 +88,6 @@
                     </subviews>
                 </customView>
             </subviews>
-            <animations/>
             <point key="canvasLocation" x="232.5" y="356"/>
         </customView>
         <arrayController mode="entity" entityName="Bookmark" automaticallyPreparesContent="YES" avoidsEmptySelection="NO" id="k0q-xy-XXR">
diff --git a/KCD/HMBookmarkListViewController.h b/KCD/HMBookmarkListViewController.h
deleted file mode 100644
index e09ea007..00000000
--- a/KCD/HMBookmarkListViewController.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-//  HMBookmarkListViewController.h
-//  KCD
-//
-//  Created by Hori,Masaki on 2015/05/30.
-//  Copyright (c) 2015å¹´ Hori,Masaki. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-#import "HMBookMarkItem.h"
-
-@protocol HMBookmarkListViewControllerDelegate;
-
-
-@interface HMBookmarkListViewController : NSViewController
-
-@property (nonatomic, weak) id<HMBookmarkListViewControllerDelegate> delegate;
-
-@end
-
-@protocol HMBookmarkListViewControllerDelegate <NSObject>
-
-- (void)didSelectBookmark:(HMBookmarkItem *)bookmark;
-
-@end
diff --git a/KCD/HMBookmarkListViewController.m b/KCD/HMBookmarkListViewController.m
deleted file mode 100644
index fb6573bd..00000000
--- a/KCD/HMBookmarkListViewController.m
+++ /dev/null
@@ -1,184 +0,0 @@
-//
-//  HMBookmarkListViewController.m
-//  KCD
-//
-//  Created by Hori,Masaki on 2015/05/30.
-//  Copyright (c) 2015å¹´ Hori,Masaki. All rights reserved.
-//
-
-#import "HMBookmarkListViewController.h"
-
-#import "KCD-Swift.h"
-
-#import "HMBookmarkManager.h"
-
-
-const NSInteger kEditMenuItemTag = 1000;
-const NSInteger kDeleteMenuItemTag = 5000;
-
-@interface HMBookmarkListViewController () <NSTableViewDataSource>
-
-@property (readonly) NSManagedObjectContext *managedObjectContext;
-
-@property (nonatomic, weak) IBOutlet NSTableView *tableView;
-@property (nonatomic, strong) IBOutlet NSArrayController *bookmarkController;
-@property (nonatomic, strong) IBOutlet NSMenu *contextMenu;
-
-@property (nonatomic, weak) IBOutlet NSPopover *popover;
-@property (nonatomic, strong) HMBookmarkEditorViewController *editorController;
-
-@property NSRange objectRange;
-@property (nonatomic, copy) NSArray *currentlyDraggedObjects;
-
-- (IBAction)editBookmark:(id)sender;
-- (IBAction)deleteBookmark:(id)sender;
-
-@end
-
-@implementation HMBookmarkListViewController
-
-- (instancetype)init
-{
-	self = [super initWithNibName:NSStringFromClass([self class])
-						   bundle:nil];
-	return self;
-}
-- (void)awakeFromNib
-{
-	NSSortDescriptor *sortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"order" ascending:YES];
-	[self.bookmarkController setSortDescriptors:@[sortDescriptor]];
-	
-	self.editorController = [HMBookmarkEditorViewController new];
-	self.popover.contentViewController = self.editorController;
-	
-	[self.tableView registerForDraggedTypes:@[@"com.masakih.KCD.HMBookmarkItem"]];
-	[self.tableView setDraggingSourceOperationMask:NSDragOperationMove forLocal:YES];
-}
-
-- (NSManagedObjectContext *)managedObjectContext
-{
-	return [HMBookmarkManager sharedManager].manageObjectContext;
-}
-
-- (IBAction)editBookmark:(id)sender
-{
-	if(![sender respondsToSelector:@selector(representedObject)]) return;
-	NSNumber *rowValue = [sender representedObject];
-	NSInteger row = rowValue.integerValue;
-	if(row == -1) return;
-	if(row < [self.bookmarkController.arrangedObjects count]) {
-		self.editorController.representedObject = [self.bookmarkController.arrangedObjects objectAtIndex:row];
-	}
-	
-	NSRect itemRect = [self.tableView rectOfRow:row];
-	
-	[self.popover showRelativeToRect:itemRect
-							  ofView:self.tableView
-					   preferredEdge:NSMinYEdge];
-}
-- (IBAction)deleteBookmark:(id)sender
-{
-	if(![sender respondsToSelector:@selector(representedObject)]) return;
-	NSNumber *rowValue = [sender representedObject];
-	NSInteger row = rowValue.integerValue;
-	if(row == -1) return;
-	if(row > [self.bookmarkController.arrangedObjects count]) return;
-	
-	[self.bookmarkController removeObjectAtArrangedObjectIndex:row];
-}
-
-- (void)reorderingBoolmarks
-{
-	NSInteger order = 100;
-	for(HMBookmarkItem *item in self.bookmarkController.arrangedObjects) {
-		item.order = @(order);
-		order += 100;
-	}
-}
-
-- (void)tableViewSelectionDidChange:(NSNotification *)notification
-{
-	NSTableView *tableView = [notification object];
-	NSInteger selection = [tableView selectedRow];
-	NSArray *array = self.bookmarkController.arrangedObjects;
-	if(array.count > selection) {
-		id obj = array[selection];
-		HMBookmarkItem *item = [obj valueForKey:@"self"];
-		[self.delegate didSelectBookmark:item];
-	}
-	
-	[tableView deselectAll:nil];
-}
-
-- (NSMenu *)tableView:(NSTableView *)tableView menuForEvent:(NSEvent *)event
-{
-	NSPoint mouse = [tableView convertPoint:[event locationInWindow] fromView:nil];
-	NSInteger row = [tableView rowAtPoint:mouse];
-	
-	if(row == -1) return nil;
-	
-	NSMenuItem *editMenuItem = [self.contextMenu itemWithTag:kEditMenuItemTag];
-	editMenuItem.representedObject = @(row);
-	NSMenuItem *deleteMenuItem = [self.contextMenu itemWithTag:kDeleteMenuItemTag];
-	deleteMenuItem.representedObject = @(row);
-	
-	return self.contextMenu;
-}
-
-- (id<NSPasteboardWriting>)tableView:(NSTableView *)tableView pasteboardWriterForRow:(NSInteger)row
-{
-	return [self.bookmarkController.arrangedObjects objectAtIndex:row];
-}
-
-- (void)tableView:(NSTableView *)tableView draggingSession:(NSDraggingSession *)session willBeginAtPoint:(NSPoint)screenPoint forRowIndexes:(NSIndexSet *)rowIndexes
-{
-	NSUInteger len = ([rowIndexes lastIndex]+1) - [rowIndexes firstIndex];
-	self.objectRange = NSMakeRange([rowIndexes firstIndex], len);
-	self.currentlyDraggedObjects = [self.bookmarkController.arrangedObjects objectsAtIndexes:rowIndexes];
-}
-
-- (void)tableView:(NSTableView *)tableView draggingSession:(NSDraggingSession *)session endedAtPoint:(NSPoint)screenPoint operation:(NSDragOperation)operation
-{
-	self.objectRange = NSMakeRange(0, 0);
-	self.currentlyDraggedObjects = nil;
-}
-
-- (NSDragOperation)tableView:(NSTableView *)tableView validateDrop:(id<NSDraggingInfo>)info proposedRow:(NSInteger)row proposedDropOperation:(NSTableViewDropOperation)dropOperation
-{
-	if(dropOperation == NSTableViewDropAbove && (_objectRange.location > row || _objectRange.location + _objectRange.length < row)) {
-		if([info draggingSource] == tableView) {
-			return NSDragOperationMove;
-		}
-	}
-	return NSDragOperationNone;
-}
-
-- (BOOL)tableView:(NSTableView *)tableView acceptDrop:(id<NSDraggingInfo>)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)dropOperation
-{
-	[self.tableView beginUpdates];
-	
-	HMBookmarkDataStore *store = [[HMBookmarkManager sharedManager] editorStore];
-	HMBookmarkItem *target = nil;
-	if(row != 0) {
-		target = [self.bookmarkController.arrangedObjects objectAtIndex:row - 1];
-	}
-	NSInteger targetOrder = target.order.integerValue;
-	NSArray *items = [info draggingPasteboard].pasteboardItems;
-	NSInteger i = 1;
-	for(NSPasteboardItem *item in items) {
-		id p = [item dataForType:@"com.masakih.KCD.HMBookmarkItem"];
-		NSURL *uri = [NSKeyedUnarchiver unarchiveObjectWithData:p];
-		NSManagedObjectID *oID = [self.managedObjectContext.persistentStoreCoordinator managedObjectIDForURIRepresentation:uri];
-		HMBookmarkItem *bookmark = (HMBookmarkItem *)[store.managedObjectContext objectWithID:oID];
-		bookmark.order = @(targetOrder + i);
-		i++;
-	}
-	[self.bookmarkController rearrangeObjects];
-	[self reorderingBoolmarks];
-	[self.bookmarkController rearrangeObjects];
-	
-	[self.tableView endUpdates];
-	return YES;
-}
-
-@end
diff --git a/KCD/HMBookmarkListViewController.swift b/KCD/HMBookmarkListViewController.swift
new file mode 100644
index 00000000..0a8b4f5a
--- /dev/null
+++ b/KCD/HMBookmarkListViewController.swift
@@ -0,0 +1,140 @@
+//
+//  HMBookmarkListViewController.swift
+//  KCD
+//
+//  Created by Hori,Masaki on 2016/12/23.
+//  Copyright © 2016年 Hori,Masaki. All rights reserved.
+//
+
+import Cocoa
+
+protocol HMBookmarkListViewControllerDelegate {
+    func didSelectBookmark(_ bookmark: HMBookmarkItem)
+}
+
+fileprivate struct DragingType {
+    static let bookmarkItem = "com.masakih.KCD.HMBookmarkItem"
+}
+
+class HMBookmarkListViewController: NSViewController {
+    
+    override var nibName: String! {
+        return "HMBookmarkListViewController"
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        editorController = HMBookmarkEditorViewController()
+        popover.contentViewController = editorController
+        
+        tableView.register(forDraggedTypes: [DragingType.bookmarkItem])
+        tableView.setDraggingSourceOperationMask(.move, forLocal: true)
+    }
+    
+    var delegate: HMBookmarkListViewControllerDelegate?
+    
+    @IBOutlet var tableView: NSTableView!
+    @IBOutlet var bookmarkController: NSArrayController!
+    @IBOutlet var contextMenu: NSMenu!
+    @IBOutlet var popover: NSPopover!
+    
+    let managedObjectContext: NSManagedObjectContext = HMBookmarkManager.shared().manageObjectContext
+    
+    var editorController: HMBookmarkEditorViewController?
+    
+    // tableView support
+    var objectRange: NSRange = NSRange()
+    
+    @IBAction func editBookmark(_ sender: AnyObject?) {
+        let clickedRow = tableView.clickedRow
+        guard clickedRow != -1 else { return }
+        guard let bookmarks = (bookmarkController.arrangedObjects as? NSArray) else { return }
+        guard clickedRow < bookmarks.count else { return }
+        
+        editorController?.representedObject = bookmarks[clickedRow]
+        popover.show(relativeTo: tableView.rect(ofRow: clickedRow), of: tableView, preferredEdge: .minY)
+    }
+    @IBAction func deleteBookmark(_ sender: AnyObject?) {
+        let clickedRow = tableView.clickedRow
+        guard clickedRow != -1 else { return }
+        guard let bookmarks = (bookmarkController.arrangedObjects as? NSArray) else { return }
+        guard clickedRow < bookmarks.count else { return }
+        
+        bookmarkController.remove(atArrangedObjectIndex: clickedRow)
+    }
+}
+
+extension HMBookmarkListViewController: NSTableViewDelegate, NSTableViewDataSource {
+    
+    func reorderingBoolmarks() {
+        guard let objects = bookmarkController.arrangedObjects as? [HMBookmarkItem] else { return }
+        var order = 100
+        objects.forEach {
+            $0.order = order as NSNumber!
+            order = order + 100
+        }
+    }
+    
+    func tableViewSelectionDidChange(_ notification: Notification) {
+        guard let tableView = notification.object as? NSTableView else { return }
+        guard let bookmarks = (bookmarkController.arrangedObjects) as? [HMBookmarkItem] else { return }
+        let selection = tableView.selectedRow
+        tableView.deselectAll(nil)
+        guard selection != -1 else { return }
+        guard bookmarks.count > selection else { return }
+        delegate?.didSelectBookmark(bookmarks[selection])
+    }
+    func tableView(_ tableView: NSTableView, pasteboardWriterForRow row: Int) -> NSPasteboardWriting? {
+        guard let objects = (bookmarkController.arrangedObjects as? [NSPasteboardWriting]) else { return nil }
+        return objects[row]
+    }
+    func tableView(_ tableView: NSTableView, draggingSession session: NSDraggingSession, willBeginAt screenPoint: NSPoint, forRowIndexes rowIndexes: IndexSet) {
+        guard let first = rowIndexes.first else { return }
+        guard let last = rowIndexes.last else { return }
+        objectRange = NSMakeRange(first, last + 1 - first)
+    }
+    func tableView(_ tableView: NSTableView, draggingSession session: NSDraggingSession, endedAt screenPoint: NSPoint, operation: NSDragOperation) {
+        objectRange = NSMakeRange(0, 0)
+    }
+    func tableView(_ tableView: NSTableView, validateDrop info: NSDraggingInfo, proposedRow row: Int, proposedDropOperation dropOperation: NSTableViewDropOperation) -> NSDragOperation {
+        if dropOperation == .above {
+            if objectRange.location > row || objectRange.location + objectRange.length < row {
+                if let tableView = info.draggingSource() as? NSTableView {
+                    if tableView == self.tableView {
+                        return .move
+                    }
+                }
+            }
+        }
+        return []
+    }
+    func tableView(_ tableView: NSTableView, acceptDrop info: NSDraggingInfo, row: Int, dropOperation: NSTableViewDropOperation) -> Bool {
+        tableView.beginUpdates()
+        defer {
+            tableView.endUpdates()
+        }
+        
+        let targetOrder: Int = {
+            guard row != 0 else { return 0 }
+            guard let objects = bookmarkController.arrangedObjects as? NSArray else { return 0 }
+            guard objects.count >= row else { return 0 }
+            guard let target = objects[row - 1] as? HMBookmarkItem else { return 0 }
+            return target.order as Int
+        }()
+        guard let items = info.draggingPasteboard().pasteboardItems else { return false }
+        let store = HMBookmarkManager.shared().editorStore()!
+        items.enumerated().forEach {
+            guard let data = $0.element.data(forType: DragingType.bookmarkItem) else { return }
+            guard let uri = NSKeyedUnarchiver.unarchiveObject(with: data) as? URL else { return }
+            guard let oID = managedObjectContext.persistentStoreCoordinator?.managedObjectID(forURIRepresentation: uri) else { return }
+            guard let bookmark = store.object(with: oID) as? HMBookmarkItem else { return }
+            bookmark.order = NSNumber(value: targetOrder + $0.offset + 1)
+        }
+        bookmarkController.rearrangeObjects()
+        reorderingBoolmarks()
+        bookmarkController.rearrangeObjects()
+        
+        return true
+    }
+}
diff --git a/KCD/KCD-Bridging-Header.h b/KCD/KCD-Bridging-Header.h
index 8d5ca07d..8db66c4a 100644
--- a/KCD/KCD-Bridging-Header.h
+++ b/KCD/KCD-Bridging-Header.h
@@ -6,9 +6,6 @@
 #import "HMUserDefaults.h"
 
 
-#import "HMBookmarkListViewController.h"
-
-
 #import "HMServerDataStore.h"
 #import "HMLocalDataStore.h"
 #import "HMBookmarkManager.h"
-- 
2.11.0