Skip to content

Commit 8d47be3

Browse files
committed
Reindent files
Fix missing file on Product UI Tests
1 parent bd9712e commit 8d47be3

File tree

3 files changed

+29
-28
lines changed

3 files changed

+29
-28
lines changed

IPSubnetcalc.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -381,9 +381,9 @@ class IPSubnetCalc: NSObject {
381381

382382
func classBits() -> Int {
383383
let classType = self.netClass()
384-
384+
385385
if (classType == "A") {
386-
return (Constants.classAbits)
386+
return (Constants.classAbits)
387387
}
388388
else if (classType == "B") {
389389
return (Constants.classBbits)
@@ -396,9 +396,9 @@ class IPSubnetCalc: NSObject {
396396

397397
func classMask() -> UInt32 {
398398
let classType = self.netClass()
399-
399+
400400
if (classType == "A") {
401-
return (Constants.maskClassA)
401+
return (Constants.maskClassA)
402402
}
403403
else if (classType == "B") {
404404
return (Constants.maskClassB)

SubnetCalc.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
8D1107310486CEB800E47090 /* SubnetCalc-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SubnetCalc-Info.plist"; sourceTree = "<group>"; };
3737
8D1107320486CEB800E47090 /* SubnetCalc.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SubnetCalc.app; sourceTree = BUILT_PRODUCTS_DIR; };
3838
945E62EF25658A9500CDC9C7 /* SubnetCalc.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = SubnetCalc.xctestplan; sourceTree = "<group>"; };
39-
945E62F525658DBF00CDC9C7 /* SubnetCalcUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SubnetCalcUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
39+
945E62F525658DBF00CDC9C7 /* SubnetCalcUITests-Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SubnetCalcUITests-Runner.app"; sourceTree = BUILT_PRODUCTS_DIR; };
4040
945E62F925658DBF00CDC9C7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4141
9482A32625765B30008D2C56 /* SubnetCalcUITest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubnetCalcUITest.swift; sourceTree = "<group>"; };
4242
949420B712D3C62A00E2F57D /* License.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = License.txt; sourceTree = "<group>"; };
@@ -101,7 +101,7 @@
101101
isa = PBXGroup;
102102
children = (
103103
8D1107320486CEB800E47090 /* SubnetCalc.app */,
104-
945E62F525658DBF00CDC9C7 /* SubnetCalcUITests.xctest */,
104+
945E62F525658DBF00CDC9C7 /* SubnetCalcUITests-Runner.app */,
105105
);
106106
name = Products;
107107
sourceTree = "<group>";
@@ -194,7 +194,7 @@
194194
);
195195
name = SubnetCalcUITests;
196196
productName = SubnetCalcUITests;
197-
productReference = 945E62F525658DBF00CDC9C7 /* SubnetCalcUITests.xctest */;
197+
productReference = 945E62F525658DBF00CDC9C7 /* SubnetCalcUITests-Runner.app */;
198198
productType = "com.apple.product-type.bundle.ui-testing";
199199
};
200200
/* End PBXNativeTarget section */

SubnetCalcAppDelegate.swift

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,13 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,
149149
{
150150
classType.selectItem(at: 3)
151151
/*
152-
savedTabView = tabView.tabViewItems
153-
if (savedTabView != nil)
154-
{
155-
tabView.removeTabViewItem(savedTabView![1])
156-
tabView.removeTabViewItem(savedTabView![2])
157-
tabView.removeTabViewItem(savedTabView![3])
158-
}
152+
savedTabView = tabView.tabViewItems
153+
if (savedTabView != nil)
154+
{
155+
tabView.removeTabViewItem(savedTabView![1])
156+
tabView.removeTabViewItem(savedTabView![2])
157+
tabView.removeTabViewItem(savedTabView![3])
158+
}
159159
*/
160160
}
161161
else if (c == "E")
@@ -453,13 +453,13 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,
453453
else if (sender.indexOfSelectedItem() == 3)
454454
{
455455
/*
456-
savedTabView = tabView.tabViewItems
457-
if (savedTabView != nil)
458-
{
459-
tabView.removeTabViewItem(savedTabView![1])
460-
tabView.removeTabViewItem(savedTabView![2])
461-
tabView.removeTabViewItem(savedTabView![3])
462-
}
456+
savedTabView = tabView.tabViewItems
457+
if (savedTabView != nil)
458+
{
459+
tabView.removeTabViewItem(savedTabView![1])
460+
tabView.removeTabViewItem(savedTabView![2])
461+
tabView.removeTabViewItem(savedTabView![3])
462+
}
463463
*/
464464
classBitMap.stringValue = "hhhhhhhh.hhhhhhhh.hhhhhhhh.hhhhhhhh"
465465
classBinaryMap.stringValue = "11100000.00000000.00000000.00000000"
@@ -468,13 +468,13 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,
468468
else if (sender.indexOfSelectedItem() == 4)
469469
{
470470
/*
471-
savedTabView = tabView.tabViewItems
472-
if (savedTabView != nil)
473-
{
474-
tabView.removeTabViewItem(savedTabView![1])
475-
tabView.removeTabViewItem(savedTabView![2])
476-
tabView.removeTabViewItem(savedTabView![3])
477-
}
471+
savedTabView = tabView.tabViewItems
472+
if (savedTabView != nil)
473+
{
474+
tabView.removeTabViewItem(savedTabView![1])
475+
tabView.removeTabViewItem(savedTabView![2])
476+
tabView.removeTabViewItem(savedTabView![3])
477+
}
478478
*/
479479
classBitMap.stringValue = "hhhhhhhh.hhhhhhhh.hhhhhhhh.hhhhhhhh"
480480
classBinaryMap.stringValue = "11110000.00000000.00000000.00000000"
@@ -717,6 +717,7 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,
717717
{
718718
if (ipsc != nil) {
719719
if (tabViewClassLess.state == NSControl.StateValue.on) {
720+
//print("numberOfRows: Maskbits : \(ipsc!.maskBits) Bits compute: \(ipsc!.maskBits - Constants.NETWORK_BITS_MIN_CLASSLESS) Power: \(NSDecimalNumber(decimal: pow(2, (ipsc!.maskBits - Constants.NETWORK_BITS_MIN_CLASSLESS))))")
720721
return Int(truncating: NSDecimalNumber(decimal: pow(2, (ipsc!.maskBits - Constants.NETWORK_BITS_MIN_CLASSLESS))))
721722
}
722723
else {

0 commit comments

Comments
 (0)