aboutsummaryrefslogtreecommitdiffstats
path: root/iBean
diff options
context:
space:
mode:
Diffstat (limited to 'iBean')
-rw-r--r--iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstatebin58143 -> 57787 bytes
-rw-r--r--iBean/iBean.xcodeproj/xcuserdata/eddiex.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist74
-rw-r--r--iBean/iBean/AddBeanViewController.m3
-rw-r--r--iBean/iBean/AppDelegate+Storage.m2
-rw-r--r--iBean/iBean/BeanCollectionBeanListViewController.m5
-rw-r--r--iBean/iBean/BeanCollectionExtractionViewController.m8
-rw-r--r--iBean/iBean/BeanCollectionInfoViewController.m8
-rw-r--r--iBean/iBean/BeanCollectionListViewController.m4
-rw-r--r--iBean/iBean/Configuration+Interface.m17
-rw-r--r--iBean/iBean/EditBeanViewController.m4
-rw-r--r--iBean/iBean/ExtractionViewController.m4
-rw-r--r--iBean/iBean/InstantExtractionViewController.m6
-rw-r--r--iBean/iBean/SettingsViewController.m4
-rw-r--r--iBean/iBean/ThresholdCell.m8
-rw-r--r--iBean/iBean/ThresholdListViewController.m1
-rw-r--r--iBean/iBean/ThresholdViewController.m4
16 files changed, 49 insertions, 103 deletions
diff --git a/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate b/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate
index 7e819f8..beaf722 100644
--- a/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate
Binary files differ
diff --git a/iBean/iBean.xcodeproj/xcuserdata/eddiex.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/iBean/iBean.xcodeproj/xcuserdata/eddiex.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
index ee63edf..f1cbc3f 100644
--- a/iBean/iBean.xcodeproj/xcuserdata/eddiex.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
+++ b/iBean/iBean.xcodeproj/xcuserdata/eddiex.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
@@ -8,11 +8,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "iBean/InstantExtractionViewController.m"
- timestampString = "381700930.572514"
+ timestampString = "385133878.06268"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "93"
- endingLineNumber = "93"
+ startingLineNumber = "91"
+ endingLineNumber = "91"
landmarkName = "-haltExtractionTimer"
landmarkType = "5">
</FileBreakpoint>
@@ -20,25 +20,12 @@
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
- filePath = "iBean/InstantExtractionViewController.m"
- timestampString = "381700930.572514"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "101"
- endingLineNumber = "101"
- landmarkName = "-timerInterrupted"
- landmarkType = "5">
- </FileBreakpoint>
- <FileBreakpoint
- shouldBeEnabled = "No"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
filePath = "iBean/ThresholdViewController.m"
- timestampString = "382793252.607427"
+ timestampString = "385133878.06268"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "87"
- endingLineNumber = "87"
+ startingLineNumber = "85"
+ endingLineNumber = "85"
landmarkName = "-commitThreshold:"
landmarkType = "5">
</FileBreakpoint>
@@ -47,11 +34,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "iBean/ThresholdListViewController.m"
- timestampString = "381702156.572563"
+ timestampString = "385133878.06268"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "146"
- endingLineNumber = "146"
+ startingLineNumber = "145"
+ endingLineNumber = "145"
landmarkName = "-tableView:commitEditingStyle:forRowAtIndexPath:"
landmarkType = "5">
</FileBreakpoint>
@@ -60,11 +47,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "iBean/AppDelegate+Storage.m"
- timestampString = "381432910.18618"
+ timestampString = "385133878.06268"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "145"
- endingLineNumber = "145"
+ startingLineNumber = "144"
+ endingLineNumber = "144"
landmarkName = "-incrementExtractionCount"
landmarkType = "5">
</FileBreakpoint>
@@ -73,11 +60,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "iBean/AppDelegate+Storage.m"
- timestampString = "381493109.294413"
+ timestampString = "385133878.06268"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "163"
- endingLineNumber = "163"
+ startingLineNumber = "162"
+ endingLineNumber = "162"
landmarkName = "-processThresholds"
landmarkType = "5">
</FileBreakpoint>
@@ -86,11 +73,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "iBean/AppDelegate+Storage.m"
- timestampString = "381432960.601612"
+ timestampString = "385133878.06268"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "136"
- endingLineNumber = "136"
+ startingLineNumber = "135"
+ endingLineNumber = "135"
landmarkName = "-setExtractionCount:"
landmarkType = "5">
</FileBreakpoint>
@@ -99,11 +86,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "iBean/AppDelegate+Storage.m"
- timestampString = "381503070.601476"
+ timestampString = "385133878.06268"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "170"
- endingLineNumber = "170"
+ startingLineNumber = "169"
+ endingLineNumber = "169"
landmarkName = "-processThresholds"
landmarkType = "5">
</FileBreakpoint>
@@ -125,11 +112,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "iBean/AppDelegate+Storage.m"
- timestampString = "382794135.600835"
+ timestampString = "385133878.06268"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "210"
- endingLineNumber = "210"
+ startingLineNumber = "208"
+ endingLineNumber = "208"
landmarkName = "-processThresholds"
landmarkType = "5">
</FileBreakpoint>
@@ -146,5 +133,18 @@
landmarkName = "+bottomShadowForTableView:"
landmarkType = "5">
</FileBreakpoint>
+ <FileBreakpoint
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "iBean/Configuration+Interface.m"
+ timestampString = "385134403.303216"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "11"
+ endingLineNumber = "11"
+ landmarkName = "@implementation Configuration(Interface)"
+ landmarkType = "3">
+ </FileBreakpoint>
</FileBreakpoints>
</Bucket>
diff --git a/iBean/iBean/AddBeanViewController.m b/iBean/iBean/AddBeanViewController.m
index 1d8a9da..abe4e72 100644
--- a/iBean/iBean/AddBeanViewController.m
+++ b/iBean/iBean/AddBeanViewController.m
@@ -49,8 +49,6 @@
*****************************************************/
- (void) initViewController
{
- NSLog(@"AddBeanViewController - initViewController");
-
//If there exists beans in collection, then pre set the
//grinder setting to the value of latest added bean.
if (self.beanCollection != nil)
@@ -66,7 +64,6 @@
- (void) initWithModeAndBeanCollection:(BOOL)editMode: (BeanCollection*) bc
{
- NSLog(@"AddBeanViewController - initWithModeAndBeanCollection");
self.editMode = editMode;
self.beanCollection = bc;
}
diff --git a/iBean/iBean/AppDelegate+Storage.m b/iBean/iBean/AppDelegate+Storage.m
index 6fb3ca8..a98cd41 100644
--- a/iBean/iBean/AppDelegate+Storage.m
+++ b/iBean/iBean/AppDelegate+Storage.m
@@ -71,7 +71,6 @@
{
//Set default configuration values:
config.instantExtractionTimer = [NSNumber numberWithDouble:25.0f];
-#warning TODO - Add call to iBean core data startup (to add example data)
}
else
{
@@ -199,7 +198,6 @@
//Case 2 - Threshold is hit & enabled
if ([configuration.extractionCount integerValue] >= [t.value integerValue] && [t.enabled boolValue] == YES)
{
- NSLog(@"Threshold %@ active (%@ >= %@)", t.name, configuration.extractionCount, t.value);
[self.activeThresholdsToProcess addObject:t];
}
}
diff --git a/iBean/iBean/BeanCollectionBeanListViewController.m b/iBean/iBean/BeanCollectionBeanListViewController.m
index f478770..570c38a 100644
--- a/iBean/iBean/BeanCollectionBeanListViewController.m
+++ b/iBean/iBean/BeanCollectionBeanListViewController.m
@@ -73,8 +73,6 @@
*****************************************************/
- (void) initViewController
{
- NSLog(@"BeanCollectionBeanListViewController - initViewController");
-
//Allocate edit's "Done" button
self.beanListEditDoneButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(toggleEditMode:)];
@@ -84,10 +82,8 @@
- (void) initWithModeAndBeanCollection:(BOOL)editMode: (BeanCollection*) bc
{
- NSLog(@"BeanCollectionBeanListViewController - initWithModeAndBeanCollection");
self.editMode = editMode;
self.beanCollection = bc;
-
}
/*****************************************************
@@ -177,7 +173,6 @@
{
if (self.beanCollection != nil && fromIndexPath.row != toIndexPath.row)
{
- NSLog(@"From: %d, To: %d", fromIndexPath.row, toIndexPath.row);
if (toIndexPath.row < (self.beanCollection.beans.count - 1))
{
NSMutableIndexSet *beanIndexes = [NSMutableIndexSet indexSetWithIndex:fromIndexPath.row];
diff --git a/iBean/iBean/BeanCollectionExtractionViewController.m b/iBean/iBean/BeanCollectionExtractionViewController.m
index 84d058e..fa0883c 100644
--- a/iBean/iBean/BeanCollectionExtractionViewController.m
+++ b/iBean/iBean/BeanCollectionExtractionViewController.m
@@ -69,7 +69,6 @@
#pragma mark - Utility methods
- (void) initViewController
{
- NSLog(@"BeanCollectionExtraction - initViewController");
if (self.beanCollection != nil)
{
self.navigationItem.title = self.beanCollection.name;
@@ -84,7 +83,6 @@
}
else
{
- NSLog(@"Note is empty!");
[self.beanCollectionNoteTextView setHidden:YES];
}
}
@@ -106,7 +104,6 @@
if (self.extractionProgress <= 0.0f)
{
- NSLog(@"Timer reached its limit!");
[self haltExtractionTimer];
UIAlertView *extractionCompleteAlert = [[UIAlertView alloc]
@@ -132,8 +129,6 @@
- (void) timerInterrupted
{
- NSLog(@"BeanCollectionExtractionViewController - timerInterrupted");
-
//Return UI to "Start extraction" state.
[self.extractionButton setTitle:@"Start" forState:UIControlStateNormal];
self.extractionProgressLabel.text = [NSString stringWithFormat:@"%1.1f", [self.beanCollection.extractionTime doubleValue]];
@@ -197,7 +192,6 @@
}
}
completion:^(BOOL finished){
- NSLog(@"Anim done!");
}
];
}
@@ -250,7 +244,7 @@
- (void) alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)buttonIndex
{
//This will process thresholds etc.
- NSLog(@"Extraction count = %@", [(AppDelegate*) [[UIApplication sharedApplication] delegate] incrementExtractionCount]);
+ [(AppDelegate*) [[UIApplication sharedApplication] delegate] incrementExtractionCount];
}
@end
diff --git a/iBean/iBean/BeanCollectionInfoViewController.m b/iBean/iBean/BeanCollectionInfoViewController.m
index d04d313..de2f950 100644
--- a/iBean/iBean/BeanCollectionInfoViewController.m
+++ b/iBean/iBean/BeanCollectionInfoViewController.m
@@ -108,8 +108,6 @@
#pragma mark - Utility methods
- (void) initViewController
{
- NSLog(@"BeanCollectionInfoViewController - initViewController");
-
if (self.editMode == YES)
{
if (self.beanCollection != nil)
@@ -120,13 +118,9 @@
}
else
{
+#warning TODO - This should never occur!?
NSLog(@"BeanCollectionInfoViewController - initViewController in edit state, but bean collection is null!");
}
- NSLog(@"BeanCollectionInfoViewController - in edit state");
- }
- else
- {
- NSLog(@"BeanCollectionInfoViewController - in add new state");
}
//Allocate text view&field done button, which will replace Next button when needed.
diff --git a/iBean/iBean/BeanCollectionListViewController.m b/iBean/iBean/BeanCollectionListViewController.m
index bd98f89..4f17ef9 100644
--- a/iBean/iBean/BeanCollectionListViewController.m
+++ b/iBean/iBean/BeanCollectionListViewController.m
@@ -31,9 +31,7 @@
- (void)viewDidLoad
{
[super viewDidLoad];
- NSLog(@"BeanCollectionListViewController view's loaded!");
-
// Uncomment the following line to preserve selection between presentations.
// self.clearsSelectionOnViewWillAppear = NO;
@@ -126,7 +124,6 @@
{
if ([(AppDelegate*) [[UIApplication sharedApplication] delegate] deleteObject:[self.beanCollections objectAtIndex:indexPath.row]] != nil)
{
- NSLog(@"deleteObject returned an error when deleting bean collection!");
UIAlertView *deleteErrorAlert = [[UIAlertView alloc]
initWithTitle:@"Delete error!"
message:[NSString stringWithFormat:@"Unable to delete bean collection:%@", [tableView cellForRowAtIndexPath:indexPath].textLabel.text]
@@ -168,7 +165,6 @@
*****************************************************/
- (void) initViewController
{
- NSLog(@"BeanCollectionListViewController - initViewController");
#warning TODO - Test on real hw to see if we need to have conditional reloading (i.e.: only when new data has been added!)
//Allocate edit's done button
self.beanCollectionsListEditDoneButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(toggleEditMode:)];
diff --git a/iBean/iBean/Configuration+Interface.m b/iBean/iBean/Configuration+Interface.m
index 230f529..53e9773 100644
--- a/iBean/iBean/Configuration+Interface.m
+++ b/iBean/iBean/Configuration+Interface.m
@@ -18,15 +18,6 @@
- (void) removeObjectFromThresholdsAtIndex:(NSUInteger)thresholdIndex
{
- /*
- NSIndexSet* indexes = [NSIndexSet indexSetWithIndex:idx];
- [self willChange:NSKeyValueChangeRemoval valuesAtIndexes:indexes forKey:@"beans"];
- NSMutableOrderedSet *tmpOrderedSet = [NSMutableOrderedSet orderedSetWithOrderedSet:[self mutableOrderedSetValueForKey:@"beans"]];
- [tmpOrderedSet removeObjectAtIndex:idx];
- [self setPrimitiveValue:tmpOrderedSet forKey:@"beans"];
- [self didChange:NSKeyValueChangeRemoval valuesAtIndexes:indexes forKey:@"beans"];
- */
-
NSMutableOrderedSet *tmpSet = [self mutableOrderedSetValueForKey:@"thresholds"];
if (thresholdIndex >= 0 && thresholdIndex < tmpSet.count)
[tmpSet removeObjectAtIndex:thresholdIndex];
@@ -36,14 +27,6 @@
- (void)replaceThresholdsAtIndexes:(NSIndexSet *)thresholdsIndexes withBeans:(NSArray *)thresholds
{
- /*
- [self willChange:NSKeyValueChangeReplacement valuesAtIndexes:indexes forKey:@"beans"];
- NSMutableOrderedSet *tmpOrderedSet = [NSMutableOrderedSet orderedSetWithOrderedSet:[self mutableOrderedSetValueForKey:@"beans"]];
- [tmpOrderedSet replaceObjectsAtIndexes:indexes withObjects:values];
- [self setPrimitiveValue:tmpOrderedSet forKey:@"beans"];
- [self didChange:NSKeyValueChangeReplacement valuesAtIndexes:indexes forKey:@"beans"];
- */
-
if (thresholds.count > 0)
{
NSMutableOrderedSet *tmpSet = [self mutableOrderedSetValueForKey:@"thresholds"];
diff --git a/iBean/iBean/EditBeanViewController.m b/iBean/iBean/EditBeanViewController.m
index e57b470..3e6321d 100644
--- a/iBean/iBean/EditBeanViewController.m
+++ b/iBean/iBean/EditBeanViewController.m
@@ -54,13 +54,12 @@
if (bc == nil)
{
NSLog(@"EditBeanViewController - initWithModeAndBeanCollectionAndBeanIndex: Received bogus bean collection (nil)!");
+#warning TODO - This should never occur!
}
}
- (void) initViewController
{
- NSLog(@"EditBeanViewController - initViewController");
-
//Fetch bean data from the collection and populate the ui.
Bean *b = [self.beanCollection.beans objectAtIndex:self.editBeanIndex];
if (b != nil)
@@ -89,7 +88,6 @@
- (void) commitBean:(id)sender
{
- NSLog(@"EditBeanViewController - commitBean");
if (self.beanCollection != nil)
{
Bean *b = [self.beanCollection.beans objectAtIndex:self.editBeanIndex];
diff --git a/iBean/iBean/ExtractionViewController.m b/iBean/iBean/ExtractionViewController.m
index cbabd22..4ffbf31 100644
--- a/iBean/iBean/ExtractionViewController.m
+++ b/iBean/iBean/ExtractionViewController.m
@@ -59,9 +59,6 @@
*****************************************************/
- (void) initViewController
{
- NSLog(@"ExtractionViewController - initViewController");
-
-
//No need to check self.editMode here, since bean collection
//receives a default value of 25.0 for extraction time.
if (self.beanCollection != nil)
@@ -73,7 +70,6 @@
- (void) initWithModeAndBeanCollection:(BOOL)editMode: (BeanCollection*) bc
{
- NSLog(@"ExtractionViewController - initWithModeAndBeanCollection");
self.editMode = editMode;
self.beanCollection = bc;
}
diff --git a/iBean/iBean/InstantExtractionViewController.m b/iBean/iBean/InstantExtractionViewController.m
index 0c06826..d489485 100644
--- a/iBean/iBean/InstantExtractionViewController.m
+++ b/iBean/iBean/InstantExtractionViewController.m
@@ -56,7 +56,6 @@
#pragma mark - Utility methods
- (void) initViewController
{
- NSLog(@"Loading & setting stepper!");
//Fetch extraction timer setting
NSNumber* extractionTimerSetting = [(AppDelegate*) [[UIApplication sharedApplication] delegate] getInstantExtractionTimer];
[self.extractionSettingStepper setValue: extractionTimerSetting != nil ? [extractionTimerSetting doubleValue] : 0.0f];
@@ -70,7 +69,6 @@
if (self.extractionProgress >= self.extractionSettingStepper.value)
{
- NSLog(@"Timer reached its limit!");
[self haltExtractionTimer];
UIAlertView *extractionCompleteAlert = [[UIAlertView alloc]
@@ -98,8 +96,6 @@
- (void) timerInterrupted
{
- NSLog(@"InstantExtractionViewController - timerInterrupted");
-
//Return UI to "Start extraction" state.
[self.extractionButton setTitle:@"Start extraction" forState:UIControlStateNormal];
[self.extractionSettingStepper setEnabled:YES];
@@ -140,6 +136,6 @@
#pragma mark - UIAlertView delegate
- (void) alertView:(UIAlertView *)alertView willDismissWithButtonIndex:(NSInteger)buttonIndex
{
- NSLog(@"Extraction count = %@", [(AppDelegate*) [[UIApplication sharedApplication] delegate] incrementExtractionCount]);
+ [(AppDelegate*) [[UIApplication sharedApplication] delegate] incrementExtractionCount];
}
@end
diff --git a/iBean/iBean/SettingsViewController.m b/iBean/iBean/SettingsViewController.m
index b3dfb46..6ace625 100644
--- a/iBean/iBean/SettingsViewController.m
+++ b/iBean/iBean/SettingsViewController.m
@@ -62,9 +62,7 @@
Utility methods
*****************************************************/
- (void) initViewController
-{
- NSLog(@"SettingsViewController - initViewController");
-
+{
//Let's go fetch Configuration!
self.configuration = [(AppDelegate*) [[UIApplication sharedApplication] delegate] getConfiguration];
diff --git a/iBean/iBean/ThresholdCell.m b/iBean/iBean/ThresholdCell.m
index bc89b4b..e4d586a 100644
--- a/iBean/iBean/ThresholdCell.m
+++ b/iBean/iBean/ThresholdCell.m
@@ -17,7 +17,6 @@
self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
if (self) {
// Initialization code
- NSLog(@"ThresholdCell - initWithStyle");
}
return self;
}
@@ -60,7 +59,12 @@
//Rollback
[(AppDelegate*) [[UIApplication sharedApplication] delegate] rollback];
- UIAlertView *switchChangedSaveAlert = [[UIAlertView alloc] initWithTitle:@"Save error!" message:@"iBean was unable to save threshold state!\nPlease try again." delegate:self cancelButtonTitle:@"OK" otherButtonTitles: nil];
+ UIAlertView *switchChangedSaveAlert = [[UIAlertView alloc]
+ initWithTitle:@"Save error!"
+ message:@"iBean was unable to save threshold state!\nPlease try again."
+ delegate:self
+ cancelButtonTitle:@"OK"
+ otherButtonTitles: nil];
[switchChangedSaveAlert show];
#warning TODO - Make sure that rollback resets the value back to previous one!!!!!
diff --git a/iBean/iBean/ThresholdListViewController.m b/iBean/iBean/ThresholdListViewController.m
index 62f69ab..5309ec5 100644
--- a/iBean/iBean/ThresholdListViewController.m
+++ b/iBean/iBean/ThresholdListViewController.m
@@ -65,7 +65,6 @@
*****************************************************/
- (void) initViewController
{
- NSLog(@"ThresholdListViewController - initViewController");
[self.thresholdListTableView reloadData];
self.thresholdListEditDoneButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(toggleEditMode:)];
}
diff --git a/iBean/iBean/ThresholdViewController.m b/iBean/iBean/ThresholdViewController.m
index 050e61a..8d9b738 100644
--- a/iBean/iBean/ThresholdViewController.m
+++ b/iBean/iBean/ThresholdViewController.m
@@ -53,9 +53,7 @@
Utility methods
*****************************************************/
- (void) initViewController
-{
- NSLog(@"ThresholdViewController - initViewController");
-
+{
if (self.thresholdObjectIndex >= 0 && self.thresholdObjectIndex <= self.configuration.thresholds.count)
{
//We are editing an existing threshold!