Commit: 847e0dd99b3af0f1edc50bd9d1d97fecd05982c0 - ExtractKanMusu (git)

艦娘をちゅーちゅーします

Commit MetaInfo

• Revision: 847e0dd99b3af0f1edc50bd9d1d97fecd05982c0 (tree)
• Time: 2017-08-08 22:09:50
• Author: masakih <masakih@user...>
• Commiter: masakih

Log Message

ソースコードを整理

Change Summary

• modified: ExtractKanMusu/ProgressPanelController.swift

Incremental Difference

--- a/ExtractKanMusu/ProgressPanelController.swift
+++ b/ExtractKanMusu/ProgressPanelController.swift
@@ -10,6 +10,17 @@ import Cocoa
 
 class ProgressPanelController: NSWindowController, MessageObserver {
     
+    override var windowNibName: String? {
+        
+        return "ProgressPanelController"
+    }
+    
+    override func windowDidLoad() {
+        
+        super.windowDidLoad()
+        
+    }
+    
     private dynamic var rawCount: Int = 0 {
         
         didSet {
@@ -31,7 +42,7 @@ class ProgressPanelController: NSWindowController, MessageObserver {
         }
     }
     
-    private dynamic var finished: Int = 0 {
+    private dynamic var completed: Int = 0 {
         
         didSet {
             
@@ -41,24 +52,7 @@ class ProgressPanelController: NSWindowController, MessageObserver {
         }
     }
     
-    private dynamic var progresString: String {
-        
-        get {
-            
-            if count == 0 {
-                return ""
-            }
-            
-            let parcent = Int( Double(finished) / Double(rawCount) * 100 )
-            
-            return "\(finished)/\(rawCount) (\(parcent)%)"
-            
-        }
-    }
-    
     private dynamic var rawMessage: String = ""
-    
-    
     var message: String = "" {
         
         didSet {
@@ -71,30 +65,33 @@ class ProgressPanelController: NSWindowController, MessageObserver {
         }
     }
     
-    dynamic var font: NSFont {
+    private dynamic var progresString: String {
         
-        let size = NSFont.systemFontSize()
-        return NSFont.monospacedDigitSystemFont(ofSize: size, weight: NSFontWeightRegular)
+        get {
+            
+            if count == 0 {
+                return ""
+            }
+            
+            let parcent = Int( Double(completed) / Double(rawCount) * 100 )
+            
+            return "\(completed)/\(rawCount) (\(parcent)%)"
+            
+        }
     }
     
-    
-    override var windowNibName: String? {
+    private dynamic var font: NSFont {
         
-        return "ProgressPanelController"
+        let size = NSFont.systemFontSize()
+        return NSFont.monospacedDigitSystemFont(ofSize: size, weight: NSFontWeightRegular)
     }
     
     func increse() {
         
         DispatchQueue.main.async {
             
-            self.finished += 1
+            self.completed += 1
         }
     }
     
-    override func windowDidLoad() {
-        
-        super.windowDidLoad()
-        
-    }
-    
 }