[Bibdesk-commit] bibdesk BDSKTypeNameFormatter.h,NONE,1.1.2.1 BDSKTypeNameFormatter.m,NONE,1.1.2.1 BDSKTypeInfoEditor.m,1.19.2.2,1.19.2.3

[Christiaan H. <ho...@us...>]

Update of /cvsroot/bibdesk/bibdesk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11970

Modified Files:
      Tag: BR_1x
	BDSKTypeInfoEditor.m 
Added Files:
      Tag: BR_1x
	BDSKTypeNameFormatter.h BDSKTypeNameFormatter.m 
Log Message:
Add new formatter for type names to the project.

--- NEW FILE: BDSKTypeNameFormatter.h ---
//
//  BDSKTypeNameFormatter.h
//  BibDesk
//
//  Created by Michael McCracken on Sat Sep 27 2003.
/*
 This software is Copyright (c) 2003,2004,2005
 Michael O. McCracken. All rights reserved.

 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:

 - Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.

 - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in
    the documentation and/or other materials provided with the
    distribution.

 - Neither the name of Michael O. McCracken nor the names of any
    contributors may be used to endorse or promote products derived
    from this software without specific prior written permission.

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#import <Foundation/Foundation.h>
#import "BibPrefController.h"
#import "BibTypeManager.h"


@interface BDSKTypeNameFormatter : NSFormatter {

}

@end

Index: BDSKTypeInfoEditor.m
===================================================================
RCS file: /cvsroot/bibdesk/bibdesk/BDSKTypeInfoEditor.m,v
retrieving revision 1.19.2.2
retrieving revision 1.19.2.3
diff -C2 -d -r1.19.2.2 -r1.19.2.3
*** BDSKTypeInfoEditor.m	22 May 2005 21:41:28 -0000	1.19.2.2
--- BDSKTypeInfoEditor.m	29 May 2005 13:16:38 -0000	1.19.2.3
***************
*** 39,42 ****
--- 39,43 ----
  #import "BDSKTypeInfoEditor.h"
  #import "BDSKFieldNameFormatter.h"
+ #import "BDSKTypeNameFormatter.h"
  #import "BibAppController.h"
  #import "BibTypeManager.h"
***************
*** 89,94 ****
  	
      BDSKFieldNameFormatter *fieldNameFormatter = [[[BDSKFieldNameFormatter alloc] init] autorelease];
      NSTableColumn *tc = [typeTableView tableColumnWithIdentifier:@"type"];
!     [[tc dataCell] setFormatter:fieldNameFormatter];
  	tc = [requiredTableView tableColumnWithIdentifier:@"required"];
      [[tc dataCell] setFormatter:fieldNameFormatter];
--- 90,96 ----
  	
      BDSKFieldNameFormatter *fieldNameFormatter = [[[BDSKFieldNameFormatter alloc] init] autorelease];
+     BDSKFieldTypeFormatter *typeNameFormatter = [[[BDSKTypeNameFormatter alloc] init] autorelease];
      NSTableColumn *tc = [typeTableView tableColumnWithIdentifier:@"type"];
!     [[tc dataCell] setFormatter:typeNameFormatter];
  	tc = [requiredTableView tableColumnWithIdentifier:@"required"];
      [[tc dataCell] setFormatter:fieldNameFormatter];

--- NEW FILE: BDSKTypeNameFormatter.m ---
//
//  BDSKTypeNameFormatter.m
//  BibDesk
//
//  Created by Michael McCracken on Sat Sep 27 2003.
/*
 This software is Copyright (c) 2003,2004,2005
 Michael O. McCracken. All rights reserved.

 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:

 - Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.

 - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in
    the documentation and/or other materials provided with the
    distribution.

 - Neither the name of Michael O. McCracken nor the names of any
    contributors may be used to endorse or promote products derived
    from this software without specific prior written permission.

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

//
//  File Description: BDSKFieldNameFormatter
//
//  This is a formatter that makes sure you can't enter invalid field names.
//



#import "BDSKTypeNameFormatter.h"


@implementation BDSKTypeNameFormatter

- (NSString *)stringForObjectValue:(id)obj{
    return obj;
}

- (NSAttributedString *)attributedStringForObjectValue:(id)obj withDefaultAttributes:(NSDictionary *)attrs{
    return [[[NSAttributedString alloc] initWithString:[self stringForObjectValue:obj] attributes:attrs] autorelease];
}

- (BOOL)getObjectValue:(id *)obj forString:(NSString *)string errorDescription:(NSString **)error{
    *obj = string; // ? retain?
    return YES;
}

// This is currently the same deal as what we check for in cite-keys, but in a different class
// because that may change.

- (BOOL)isPartialStringValid:(NSString *)partialString
            newEditingString:(NSString **)newString
            errorDescription:(NSString **)error{
    NSRange r = [partialString rangeOfCharacterFromSet:[[BibTypeManager sharedManager] invalidFieldNameCharacterSetForFileType:BDSKBibtexString]];
    if ( r.location != NSNotFound)
        return NO;
    r = [partialString rangeOfCharacterFromSet:[NSCharacterSet uppercaseLetterCharacterSet]];
    if ( r.location != NSNotFound) {
        // this is a BibDesk requirement, since we expect type names to be lowercase
        *newString = [partialString lowercaseString];
        return NO;
    }
    else return YES;
}


@end