Commit: 387da867d557898247a73cb36f27e381dfd5cf04 - KakuriNoMiya (git)

BathyScapheの中身をぐちゃぐちゃに

Commit MetaInfo

• Révision: 387da867d557898247a73cb36f27e381dfd5cf04 (tree)
• l'heure: 2012-07-02 23:19:56
• Auteur: masakih <masakih@user...>
• Commiter: masakih

Message de Log

[Mod] ソースコード整理

Change Summary

• modified: application/source/KakuriNoMiya/KMBSLogViewController.m

Modification

--- a/application/source/KakuriNoMiya/KMBSLogViewController.m
+++ b/application/source/KakuriNoMiya/KMBSLogViewController.m
@@ -13,7 +13,6 @@
 
 #import "CMRThreadView.h"
 
-#import <SGAppKit/BSLayoutManager.h>
 #import "CMRMainMenuManager.h"
 #import "AppDefaults.h"
 #import "CMRMessageAttributesTemplate.h"
@@ -21,10 +20,7 @@
 #import "CMRThreadAttributes.h"
 #import "CMRThreadSignature.h"
 
-#import <SGAppKit/BSTitleRulerAppearance.h>
-#import <SGAppKit/BSTitleRulerView.h>
-#import <SGAppKit/NSTextView-SGExtensions.h>
-#import <SGAppKit/NSWorkspace-SGExtensions.h>
+#import <SGAppKit/SGAppKit.h>
 
 #import "CMRThreadMessageBufferReader.h"
 #import "CMRThreadComposingTask.h"
@@ -43,17 +39,11 @@ NSString *const CMRThreadViewerRunSpamFilterNotification = @"CMRThreadViewerRunS
 NSString *const BSThreadViewerWillStartFindingNotification = @"BSThreadViewerWillStartFindingNotification";
 NSString *const BSThreadViewerDidEndFindingNotification = @"BSThreadViewerDidEndFindingNotification";
 
-
-#define APP_TVIEW_LOCALIZABLE_FILE			@"ThreadViewer"
-
-
-
 @interface KMBSLogViewController()
 @property (assign, readwrite) NSLayoutManager *layoutManager;
 @property (assign, readwrite) NSTextContainer *textContainer;
 @property (nonatomic, retain, readwrite) NSCountedSet *countedSet;
 
-
 @property (readonly) KMReplyMessenger *messenger;
 @property (nonatomic, retain) NSTextStorage *privateTextStorage;
 @property (nonatomic, retain) KMHistoryStack *histories;
@@ -64,7 +54,6 @@ NSString *const BSThreadViewerDidEndFindingNotification = @"BSThreadViewerDidEnd
 @property (readonly) NSWindow *window;
 
 - (void)composeDocumentMessage:(id)sender;
-
 @end
 
 @interface KMBSLogViewController(BuildViews)
@@ -128,6 +117,7 @@ static void KMClearRangesFromIndex(KMBSLogViewController *obj, NSUInteger index)
 
 + (NSString *)localizableStringsTableName
 {
+#define APP_TVIEW_LOCALIZABLE_FILE			@"ThreadViewer"
 	return APP_TVIEW_LOCALIZABLE_FILE;
 }
 
@@ -381,6 +371,7 @@ static void KMClearRangesFromIndex(KMBSLogViewController *obj, NSUInteger index)
     }
 	
 finish:
+	// lock in -composeDocumentMessage: method.
 	[updatingLock unlock];
 }
 - (void)threadComposingDidFinish:(NSMutableAttributedString *)aTextBuffer
@@ -413,14 +404,10 @@ finish:
 }
 @end
 
-
 #import "CMRThreadMessage.h"
 #import "CMRThreadMessageBuffer.h"
 #import "CMRAttributedMessageComposer.h"
-
 @implementation KMBSLogViewController(CMRThreadLayout_Dummy)
-#pragma mark CMRThreadLayout ?
-
 - (CMRThreadLayout *)threadLayout
 {
 	return (CMRThreadLayout *)self;
@@ -1269,9 +1256,6 @@ typedef NSUInteger NSEventSwipeTrackingOptions;
 }
 - (void)scrollWheel:(NSEvent *)event
 {
-    // NSScrollView is instructed to only forward horizontal scroll gesture events (see code above). However, depending
-    // on where your controller is in the responder chain, it may receive other scrollWheel events that we don't want
-    // to track as a fluid swipe because the event wasn't routed though an NSScrollView first.
     if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_6) {
         return;
     }
@@ -1285,19 +1269,12 @@ typedef NSUInteger NSEventSwipeTrackingOptions;
     if (fabsf(foo) <= fabsf(bar)) { // Not horizontal
         return;
     }
-    // If the user has disabled tracking scrolls as fluid swipes in system preferences, we should respect that.
-    // NSScrollView will do this check for us, however, depending on where your controller is in the responder chain,
-    // it may scrollWheel events that are not filtered by an NSScrollView.
     if (![NSEvent isSwipeTrackingFromScrollEventsEnabled]) {
         return;
     }
     
     BOOL goForward = (foo < 0);
-    // Released by the tracking handler once the gesture is complete.
-    HistoryOverlayController* historyOverlay =
-    [[HistoryOverlayController alloc]
-     initForMode:goForward ? kHistoryOverlayModeForward :
-     kHistoryOverlayModeBack];
+    HistoryOverlayController* historyOverlay = [[HistoryOverlayController alloc] initForMode:goForward ? kHistoryOverlayModeForward : kHistoryOverlayModeBack];
 	
     [event trackSwipeEventWithOptions:NSEventSwipeTrackingClampGestureAmount
              dampenAmountThresholdMin:([self.histories canForward] ? -1 : 0)
@@ -1330,7 +1307,6 @@ typedef NSUInteger NSEventSwipeTrackingOptions;
 }
 @end
 
-
 #import "KMThreadDeleteCenter.h"
 @interface KMBSLogViewController(KMThreadDeleteCenterDelegate) <KMThreadDeleteCenterDelegate>
 @end
@@ -1341,7 +1317,6 @@ typedef NSUInteger NSEventSwipeTrackingOptions;
 }
 @end
 
-
 #import "BSLabelMenuItemView.h"
 @interface KMBSLogViewController(BSLabelMenuItemViewValidation) <BSLabelMenuItemViewValidation>
 - (BOOL)validateLabelMenuItem:(BSLabelMenuItemView *)item;
@@ -1374,10 +1349,8 @@ typedef NSUInteger NSEventSwipeTrackingOptions;
 }
 @end
 
-
 @implementation KMBSLogViewController(Actions)
 #import "CMRFavoritesManager+KMAddition.h"
-#import <SGAppKit/SGAppKit.h>
 
 #define kReplyItemKey				@"Reply..."
 #define kReplyToItemKey				@"Reply 2..."
@@ -1387,7 +1360,6 @@ typedef NSUInteger NSEventSwipeTrackingOptions;
 
 /*** アクション・メニュー ***/
 #define kActionMenuItemTag				(100)	/* 「アクション」 */
-
 #define kActionSpamHeader				(111)	/* 「迷惑レス」ヘッダ */
 #define kActionAAHeader					(222)	/* 「AA」ヘッダ */
 #define kActionBookmarkHeader			(333)	/* 「ブックマーク」ヘッダ */
@@ -1703,8 +1675,6 @@ static NSInteger messageMaskForTag(NSInteger tag)
 
 #import "BSDateFormatter.h"
 #import "BSIndexPanelController.h"
-
-
 @implementation KMBSLogViewController (MoveAction)
 /* 最初／最後のレス */
 - (IBAction)scrollFirstMessage:(id)sender
@@ -1834,7 +1804,6 @@ static NSInteger messageMaskForTag(NSInteger tag)
 }
 @end
 
-
 @implementation KMBSLogViewController (MoveActionValidation)
 - (BOOL)canScrollToMessage
 {