From a8b5f20167955b39222828f4e4d5e9bcb67ab270 Mon Sep 17 00:00:00 2001 From: pllearns Date: Wed, 8 Apr 2020 12:10:19 -0700 Subject: [PATCH] last refactor of structure --- README.md | 2 +- sdk-core-swift.podspec | 2 +- .../objectmodel/XyoIterableStructure.swift | 12 ++++++------ sdk-core-swift/objectmodel/XyoObjectStructure.swift | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index bacdf47..593c0e4 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ platform :ios, '11.0' use_frameworks! target '' do - pod 'sdk-core-swift', '3.1.5' + pod 'sdk-core-swift', '3.1.6' end ``` diff --git a/sdk-core-swift.podspec b/sdk-core-swift.podspec index ff169ad..4bbe79e 100644 --- a/sdk-core-swift.podspec +++ b/sdk-core-swift.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'sdk-core-swift' - s.version = '3.1.5' + s.version = '3.1.6' s.summary = 'Core Library for XYO Network in Swift.' s.swift_version = '5.0' diff --git a/sdk-core-swift/objectmodel/XyoIterableStructure.swift b/sdk-core-swift/objectmodel/XyoIterableStructure.swift index 2b0e8cf..c691161 100644 --- a/sdk-core-swift/objectmodel/XyoIterableStructure.swift +++ b/sdk-core-swift/objectmodel/XyoIterableStructure.swift @@ -41,7 +41,7 @@ open class XyoIterableStructure: XyoObjectStructure { i += 1 } - throw XyoObjectError.OUT_OF_INDEX + throw XyoObjectError.OUTOFINDEX } public func get (id : UInt8) throws -> [XyoObjectStructure] { @@ -73,7 +73,7 @@ open class XyoIterableStructure: XyoObjectStructure { let sizeOfObject = readSizeOfObject(sizeIdentifier : schemaOfItem.getSizeIdentifier(), offset: offset + 2) if (sizeOfObject == 0) { - throw XyoObjectError.SIZE_ZERO + throw XyoObjectError.SIZEZERO } let start = offset + value.allowedOffset @@ -94,7 +94,7 @@ open class XyoIterableStructure: XyoObjectStructure { let sizeOfObject = readSizeOfObject(sizeIdentifier : schemaOfItem.getSizeIdentifier(), offset: offset) if (sizeOfObject == 0) { - throw XyoObjectError.SIZE_ZERO + throw XyoObjectError.SIZEZERO } let start = offset + value.allowedOffset @@ -119,7 +119,7 @@ open class XyoIterableStructure: XyoObjectStructure { let totalSize = readSizeOfObject(sizeIdentifier: setHeader.getSizeIdentifier(), offset: 2) if (!setHeader.getIsIterable()) { - throw XyoObjectError.NOT_ITERABLE + throw XyoObjectError.NOTITERABLE } if (setHeader.getIsTypedIterable() && totalSize != setHeader.getSizeIdentifier().rawValue) { @@ -143,7 +143,7 @@ open class XyoIterableStructure: XyoObjectStructure { return } - throw XyoObjectError.WRONG_TYPE + throw XyoObjectError.WRONGTYPE } buffer.put(buffer: element.getBuffer()) @@ -209,7 +209,7 @@ open class XyoIterableStructure: XyoObjectStructure { } if (values.isEmpty) { - throw XyoObjectError.NO_ELEMENTS + throw XyoObjectError.NOELEMENTS } let buffer = XyoBuffer() diff --git a/sdk-core-swift/objectmodel/XyoObjectStructure.swift b/sdk-core-swift/objectmodel/XyoObjectStructure.swift index 1316975..f92a9da 100644 --- a/sdk-core-swift/objectmodel/XyoObjectStructure.swift +++ b/sdk-core-swift/objectmodel/XyoObjectStructure.swift @@ -46,7 +46,7 @@ open class XyoObjectStructure { internal func checkIndex (index : Int) throws { if (index > value.getSize()) { - throw XyoObjectError.OUT_OF_INDEX + throw XyoObjectError.OUTOFINDEX } }