Revision: 12142
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12142&view=rev
Author: hofman
Date: 2007-12-31 04:49:29 -0800 (Mon, 31 Dec 2007)
Log Message:
-----------
Change enum to simplify some code.
Modified Paths:
--------------
trunk/bibdesk/BDSKCondition.h
trunk/bibdesk/BDSKConditionController.m
Modified: trunk/bibdesk/BDSKCondition.h
===================================================================
--- trunk/bibdesk/BDSKCondition.h 2007-12-31 12:28:06 UTC (rev 12141)
+++ trunk/bibdesk/BDSKCondition.h 2007-12-31 12:49:29 UTC (rev 12142)
@@ -80,11 +80,11 @@
enum {
BDSKDateField,
+ BDSKLinkedField,
+ BDSKStringField,
BDSKBooleanField,
BDSKTriStateField,
- BDSKRatingField,
- BDSKLinkedField,
- BDSKStringField
+ BDSKRatingField
};
@interface BDSKCondition : NSObject <NSCopying, NSCoding> {
Modified: trunk/bibdesk/BDSKConditionController.m
===================================================================
--- trunk/bibdesk/BDSKConditionController.m 2007-12-31 12:28:06 UTC (rev
12141)
+++ trunk/bibdesk/BDSKConditionController.m 2007-12-31 12:49:29 UTC (rev
12142)
@@ -297,14 +297,10 @@
NSString *newValue = [change objectForKey:NSKeyValueChangeNewKey];
int oldFieldType = [oldValue fieldType];
int newFieldType = [newValue fieldType];
- int oldComparisonType = oldFieldType == BDSKDateField ? 0 :
oldFieldType == BDSKLinkedField ? 1 : 2;
- int newComparisonType = newFieldType == BDSKDateField ? 0 :
newFieldType == BDSKLinkedField ? 1 : 2;
- if(oldComparisonType != newComparisonType){
+ if(MIN(oldFieldType, BDSKStringField) != MIN(newFieldType,
BDSKStringField))
[self layoutComparisonControls];
- }
- if(oldFieldType != newFieldType){
+ if(oldFieldType != newFieldType)
[self layoutValueControls];
- }
[[undoManager prepareWithInvocationTarget:condition]
setKey:oldValue];
} else if ([keyPath isEqualToString:@"dateComparison"]) {
[self layoutValueControls];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
