Revision: 15151
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=15151&view=rev
Author: hofman
Date: 2009-04-22 11:53:34 +0000 (Wed, 22 Apr 2009)
Log Message:
-----------
rename string node enum constants
Modified Paths:
--------------
trunk/bibdesk/BDSKComplexString.m
trunk/bibdesk/BDSKConverter.m
trunk/bibdesk/BDSKFormatParser.m
trunk/bibdesk/BDSKMacroResolver.m
trunk/bibdesk/BDSKStringNode.h
trunk/bibdesk/BDSKStringNode.m
trunk/bibdesk/BibItem.m
trunk/bibdesk/NSDate_BDSKExtensions.m
trunk/bibdesk/UnitTests/TestComplexString.m
Modified: trunk/bibdesk/BDSKComplexString.m
===================================================================
--- trunk/bibdesk/BDSKComplexString.m 2009-04-22 11:51:18 UTC (rev 15150)
+++ trunk/bibdesk/BDSKComplexString.m 2009-04-22 11:53:34 UTC (rev 15151)
@@ -106,7 +106,7 @@
while(iMax--){
node = *stringNodeIdx++;
nodeVal = (CFStringRef)(node->value);
- if(node->type == BSN_MACRODEF){
+ if(node->type == BDSKStringNodeMacro){
expandedValue = (CFStringRef)[macroResolver valueOfMacro:(NSString
*)nodeVal];
if(expandedValue == nil && macroResolver != [BDSKMacroResolver
defaultMacroResolver])
expandedValue = (CFStringRef)[[BDSKMacroResolver
defaultMacroResolver] valueOfMacro:(NSString *)nodeVal];
@@ -345,7 +345,7 @@
if (i != 0){
[retStr appendString:@" # "];
}
- if([valNode type] == BSN_STRING){
+ if([valNode type] == BDSKStringNodeString){
[retStr appendString:[[valNode value] stringAsBibTeXString]];
}else{
[retStr appendString:[valNode value]];
@@ -483,7 +483,7 @@
}
- (id)initWithNodes:(NSArray *)nodesArray macroResolver:(BDSKMacroResolver
*)aMacroResolver{
- if ([nodesArray count] == 1 && [(BDSKStringNode *)[nodesArray
objectAtIndex:0] type] == BSN_STRING) {
+ if ([nodesArray count] == 1 && [(BDSKStringNode *)[nodesArray
objectAtIndex:0] type] == BDSKStringNodeString) {
self = [self initWithString:[(BDSKStringNode *)[nodesArray
objectAtIndex:0] value]];
} else {
[[self init] release];
Modified: trunk/bibdesk/BDSKConverter.m
===================================================================
--- trunk/bibdesk/BDSKConverter.m 2009-04-22 11:51:18 UTC (rev 15150)
+++ trunk/bibdesk/BDSKConverter.m 2009-04-22 11:53:34 UTC (rev 15151)
@@ -143,7 +143,7 @@
NSString *string;
while(node = [nodeEnum nextObject]){
- if([node type] == BSN_STRING){
+ if([node type] == BDSKStringNodeString){
string = [self performSelector:copySelector withObject:[node
value]];
newNode = [[BDSKStringNode alloc] initWithQuotedString:string];
[string release];
Modified: trunk/bibdesk/BDSKFormatParser.m
===================================================================
--- trunk/bibdesk/BDSKFormatParser.m 2009-04-22 11:51:18 UTC (rev 15150)
+++ trunk/bibdesk/BDSKFormatParser.m 2009-04-22 11:53:34 UTC (rev 15151)
@@ -351,9 +351,9 @@
if ([NSString isEmptyString:monthString] == NO) {
if([monthString isComplex]) {
NSArray *nodes = [monthString nodes];
- if ([nodes count] > 1 && [(BDSKStringNode *)[nodes
objectAtIndex:1] type] == BSN_MACRODEF)
+ if ([nodes count] > 1 && [(BDSKStringNode *)[nodes
objectAtIndex:1] type] == BDSKStringNodeMacro)
monthString = [(BDSKStringNode *)[nodes
objectAtIndex:1] value];
- else if ([nodes count] > 2 && [(BDSKStringNode
*)[nodes objectAtIndex:2] type] == BSN_MACRODEF)
+ else if ([nodes count] > 2 && [(BDSKStringNode
*)[nodes objectAtIndex:2] type] == BDSKStringNodeMacro)
monthString = [(BDSKStringNode *)[nodes
objectAtIndex:2] value];
else
monthString = [(BDSKStringNode *)[nodes
objectAtIndex:0] value];
Modified: trunk/bibdesk/BDSKMacroResolver.m
===================================================================
--- trunk/bibdesk/BDSKMacroResolver.m 2009-04-22 11:51:18 UTC (rev 15150)
+++ trunk/bibdesk/BDSKMacroResolver.m 2009-04-22 11:53:34 UTC (rev 15151)
@@ -147,7 +147,7 @@
BDSKStringNode *node;
while(node = [nodeE nextObject]){
- if([node type] != BSN_MACRODEF)
+ if([node type] != BDSKStringNodeMacro)
continue;
NSString *key = [node value];
@@ -312,7 +312,7 @@
BDSKStringNode *node;
while(node = [nodeE nextObject]){
- if([node type] == BSN_MACRODEF)
+ if([node type] == BDSKStringNodeMacro)
[self addMacro:[node value] toArray:array];
}
}
Modified: trunk/bibdesk/BDSKStringNode.h
===================================================================
--- trunk/bibdesk/BDSKStringNode.h 2009-04-22 11:51:18 UTC (rev 15150)
+++ trunk/bibdesk/BDSKStringNode.h 2009-04-22 11:53:34 UTC (rev 15151)
@@ -40,9 +40,9 @@
enum {
- BSN_STRING = 0,
- BSN_NUMBER = 1,
- BSN_MACRODEF = 2
+ BDSKStringNodeString = 0,
+ BDSKStringNodeNumber = 1,
+ BDSKStringNodeMacro = 2
};
typedef NSUInteger BDSKStringNodeType;
@@ -146,7 +146,7 @@
/*!
@method type
- @abstract The type of the string node. This can be BSN_STRING,
BSN_NUMBER, or BSN_MACRODEF.
+ @abstract The type of the string node. This can be
BDSKStringNodeString, BDSKStringNodeNumber, or BDSKStringNodeMacro.
@discussion (description)
@result -
*/
Modified: trunk/bibdesk/BDSKStringNode.m
===================================================================
--- trunk/bibdesk/BDSKStringNode.m 2009-04-22 11:51:18 UTC (rev 15150)
+++ trunk/bibdesk/BDSKStringNode.m 2009-04-22 11:53:34 UTC (rev 15151)
@@ -42,34 +42,34 @@
@implementation BDSKStringNode
+ (BDSKStringNode *)nodeWithQuotedString:(NSString *)s{
- BDSKStringNode *node = [[BDSKStringNode alloc] initWithType:BSN_STRING
value:s];
+ BDSKStringNode *node = [[BDSKStringNode alloc]
initWithType:BDSKStringNodeString value:s];
return [node autorelease];
}
+ (BDSKStringNode *)nodeWithNumberString:(NSString *)s{
- BDSKStringNode *node = [[BDSKStringNode alloc] initWithType:BSN_NUMBER
value:s];
+ BDSKStringNode *node = [[BDSKStringNode alloc]
initWithType:BDSKStringNodeNumber value:s];
return [node autorelease];
}
+ (BDSKStringNode *)nodeWithMacroString:(NSString *)s{
- BDSKStringNode *node = [[BDSKStringNode alloc] initWithType:BSN_MACRODEF
value:s];
+ BDSKStringNode *node = [[BDSKStringNode alloc]
initWithType:BDSKStringNodeMacro value:s];
return [node autorelease];
}
- (BDSKStringNode *)initWithQuotedString:(NSString *)s{
- return [self initWithType:BSN_STRING value:s];
+ return [self initWithType:BDSKStringNodeString value:s];
}
- (BDSKStringNode *)initWithNumberString:(NSString *)s{
- return [self initWithType:BSN_NUMBER value:s];
+ return [self initWithType:BDSKStringNodeNumber value:s];
}
- (BDSKStringNode *)initWithMacroString:(NSString *)s{
- return [self initWithType:BSN_MACRODEF value:s];
+ return [self initWithType:BDSKStringNodeMacro value:s];
}
- (id)init{
- self = [self initWithType:BSN_STRING value:@""];
+ self = [self initWithType:BDSKStringNodeString value:@""];
return self;
}
Modified: trunk/bibdesk/BibItem.m
===================================================================
--- trunk/bibdesk/BibItem.m 2009-04-22 11:51:18 UTC (rev 15150)
+++ trunk/bibdesk/BibItem.m 2009-04-22 11:53:34 UTC (rev 15151)
@@ -2381,7 +2381,7 @@
NSEnumerator *nodeEnum = [[value nodes] objectEnumerator];
BDSKStringNode *node;
while (node = [nodeEnum nextObject]) {
- if ([node type] != BSN_MACRODEF) continue;
+ if ([node type] != BDSKStringNodeMacro) continue;
BDSKMacroResolver *resolver = [[value macroResolver]
valueOfMacro:[node value]] ? [value macroResolver] : [BDSKMacroResolver
defaultMacroResolver];
BDSKMacro *macro = [[BDSKMacro alloc] initWithName:[node value]
macroResolver:resolver];
[macros addObject:macro];
Modified: trunk/bibdesk/NSDate_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSDate_BDSKExtensions.m 2009-04-22 11:51:18 UTC (rev
15150)
+++ trunk/bibdesk/NSDate_BDSKExtensions.m 2009-04-22 11:53:34 UTC (rev
15151)
@@ -125,7 +125,7 @@
NSEnumerator *nodeEnum = [nodes objectEnumerator];
BDSKStringNode *node = nil;
while (node = [nodeEnum nextObject]) {
- if ([node type] == BSN_MACRODEF) {
+ if ([node type] == BDSKStringNodeMacro) {
monthString = [node value];
break;
}
Modified: trunk/bibdesk/UnitTests/TestComplexString.m
===================================================================
--- trunk/bibdesk/UnitTests/TestComplexString.m 2009-04-22 11:51:18 UTC (rev
15150)
+++ trunk/bibdesk/UnitTests/TestComplexString.m 2009-04-22 11:53:34 UTC (rev
15151)
@@ -46,7 +46,7 @@
- (void)testNumberFromBibTeXString{
BDSKStringNode *sn = [BDSKStringNode nodeWithNumberString:@"14"];
STAssertNotNil(sn,nil);
- STAssertEquals(BSN_NUMBER, [sn type],nil);
+ STAssertEquals(BDSKStringNodeNumber, [sn type],nil);
STAssertEqualObjects(@"14", [sn value],nil);
}
@@ -54,7 +54,7 @@
BDSKStringNode *sn = [BDSKStringNode nodeWithQuotedString:@"string"];
STAssertNotNil(sn,nil);
- STAssertEquals(BSN_STRING, [sn type],nil);
+ STAssertEquals(BDSKStringNodeString, [sn type],nil);
STAssertEqualObjects(@"string", [sn value],nil);
}
@@ -62,7 +62,7 @@
BDSKStringNode *sn = [BDSKStringNode nodeWithMacroString:@"macro"];
STAssertNotNil(sn,nil);
- STAssertEquals(BSN_MACRODEF, [sn type],nil);
+ STAssertEquals(BDSKStringNodeMacro, [sn type],nil);
STAssertEqualObjects(@"macro", [sn value],nil);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
