Skip to content

Commit 3c30743

Browse files
committed
clean code and removing savedTabView
1 parent b31fd05 commit 3c30743

File tree

1 file changed

+0
-49
lines changed

1 file changed

+0
-49
lines changed

SubnetCalcAppDelegate.swift

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,
8282

8383

8484
//Private global vars
85-
private var savedTabView: [NSTabViewItem]? //ex tab_tabView
8685
private var ipsc: IPSubnetCalc?
8786
private var subnetsVLSM = [(Int, String, String)]()
8887
private var globalMaskVLSM: UInt32!
@@ -173,15 +172,6 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,
173172
else if (c == "D")
174173
{
175174
classType.selectItem(at: 3)
176-
/*
177-
savedTabView = tabView.tabViewItems
178-
if (savedTabView != nil)
179-
{
180-
tabView.removeTabViewItem(savedTabView![1])
181-
tabView.removeTabViewItem(savedTabView![2])
182-
tabView.removeTabViewItem(savedTabView![3])
183-
}
184-
*/
185175
}
186176
else if (c == "E")
187177
{
@@ -380,13 +370,6 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,
380370
ipsc = IPSubnetCalc(ipAddress: ipaddr, maskbits: Int(ipmask!)!)
381371
}
382372
if (ipsc != nil) {
383-
if (tabView.numberOfTabViewItems != 6 && savedTabView != nil) {
384-
tabView.addTabViewItem(savedTabView![1])
385-
tabView.addTabViewItem(savedTabView![2])
386-
tabView.addTabViewItem(savedTabView![3])
387-
tabView.addTabViewItem(savedTabView![4])
388-
tabView.addTabViewItem(savedTabView![5])
389-
}
390373
self.doAddressMap()
391374
self.doSubnet()
392375
self.doSubnetHost()
@@ -484,13 +467,6 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,
484467
//print("IP Address: \(ipaddr) mask: \(ipmask)")
485468
ipsc = IPSubnetCalc(ipv6: ipaddr, maskbits: Int(ipmask!)!)
486469
if (ipsc != nil) {
487-
if (tabView.numberOfTabViewItems != 6 && savedTabView != nil) {
488-
tabView.addTabViewItem(savedTabView![1])
489-
tabView.addTabViewItem(savedTabView![2])
490-
tabView.addTabViewItem(savedTabView![3])
491-
tabView.addTabViewItem(savedTabView![4])
492-
tabView.addTabViewItem(savedTabView![5])
493-
}
494470
self.doAddressMap()
495471
self.doSubnet()
496472
self.doSubnetHost()
@@ -510,13 +486,6 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,
510486
//IPv4 UI actions
511487
@IBAction func changeAddrClassType(_ sender: AnyObject)
512488
{
513-
if (tabView.numberOfTabViewItems != 6 && savedTabView != nil) {
514-
tabView.addTabViewItem(savedTabView![1])
515-
tabView.addTabViewItem(savedTabView![2])
516-
tabView.addTabViewItem(savedTabView![3])
517-
tabView.addTabViewItem(savedTabView![4])
518-
tabView.addTabViewItem(savedTabView![5])
519-
}
520489
if (sender.indexOfSelectedItem() == 0)
521490
{
522491
classBitMap.stringValue = "nnnnnnnn.hhhhhhhh.hhhhhhhh.hhhhhhhh"
@@ -537,30 +506,12 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,
537506
}
538507
else if (sender.indexOfSelectedItem() == 3)
539508
{
540-
/*
541-
savedTabView = tabView.tabViewItems
542-
if (savedTabView != nil)
543-
{
544-
tabView.removeTabViewItem(savedTabView![1])
545-
tabView.removeTabViewItem(savedTabView![2])
546-
tabView.removeTabViewItem(savedTabView![3])
547-
}
548-
*/
549509
classBitMap.stringValue = "hhhhhhhh.hhhhhhhh.hhhhhhhh.hhhhhhhh"
550510
classBinaryMap.stringValue = "11100000.00000000.00000000.00000000"
551511
classHexaMap.stringValue = "E0.00.00.00"
552512
}
553513
else if (sender.indexOfSelectedItem() == 4)
554514
{
555-
/*
556-
savedTabView = tabView.tabViewItems
557-
if (savedTabView != nil)
558-
{
559-
tabView.removeTabViewItem(savedTabView![1])
560-
tabView.removeTabViewItem(savedTabView![2])
561-
tabView.removeTabViewItem(savedTabView![3])
562-
}
563-
*/
564515
classBitMap.stringValue = "hhhhhhhh.hhhhhhhh.hhhhhhhh.hhhhhhhh"
565516
classBinaryMap.stringValue = "11110000.00000000.00000000.00000000"
566517
classHexaMap.stringValue = "F0.00.00.00"

0 commit comments

Comments
 (0)