[Wonder-cvs] CVS: Wonder/Utilities/RuleModeler Rule.m,1.6,1.7

[<dav...@us...>]

Update of /cvsroot/wonder/Wonder/Utilities/RuleModeler
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv813

Modified Files:
	Rule.m 
Log Message:
Localized strings
Fixed bug where if rule had no rhs in file, it was not possible to add one later - now creates an empty one


Index: Rule.m
===================================================================
RCS file: /cvsroot/wonder/Wonder/Utilities/RuleModeler/Rule.m,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Rule.m	21 Aug 2006 22:38:11 -0000	1.6
--- Rule.m	29 Oct 2006 18:31:50 -0000	1.7
***************
*** 67,72 ****
      for(i = 0; i < count; i++){
          Rule    *rule = [decodedRules objectAtIndex:i];
          
!         [[rule rhs] setAssignmentClass:[loadedRuleClassNames objectAtIndex:i]];
      }
      
--- 67,76 ----
      for(i = 0; i < count; i++){
          Rule    *rule = [decodedRules objectAtIndex:i];
+         id      aClassName = [loadedRuleClassNames objectAtIndex:i];
          
!         // aClassName might be NSNull, in case there was no assignment for that rule
!         if(aClassName == [NSNull null])
!             aClassName = nil;
!         [[rule rhs] setAssignmentClass:aClassName];
      }
      
***************
*** 86,94 ****
  - (id)initWithKeyValueUnarchiver:(EOKeyValueUnarchiver *)unarchiver {
      if (self = [super init]) {
  	_enabled = YES;
  	
  	_author = [unarchiver decodeIntForKey:@"author"];
  	_lhs = [[unarchiver decodeObjectForKey:@"lhs"] retain];
!     [self setRhs:[unarchiver decodeObjectForKey:@"rhs"]];
  	
  	if ([_lhs isKindOfClass:[EOAndQualifier class]]) {
--- 90,104 ----
  - (id)initWithKeyValueUnarchiver:(EOKeyValueUnarchiver *)unarchiver {
      if (self = [super init]) {
+     Assignment   *anAssignment;
+         
  	_enabled = YES;
  	
  	_author = [unarchiver decodeIntForKey:@"author"];
  	_lhs = [[unarchiver decodeObjectForKey:@"lhs"] retain];
!     anAssignment = [unarchiver decodeObjectForKey:@"rhs"];
!     // If there was no saved assignment, we create an empty one (automatic fix of model)
!     if(!anAssignment)
!         anAssignment = [[[Assignment alloc] init] autorelease];
!     [self setRhs:anAssignment];
  	
  	if ([_lhs isKindOfClass:[EOAndQualifier class]]) {
***************
*** 218,222 ****
          }
      } NS_HANDLER {
!         NSDictionary *dict = [NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"This is not a valid qualifier:\n\n%@", localException] forKey:NSLocalizedDescriptionKey];
          *outError = [NSError errorWithDomain:@"EOQualifier" code:0 userInfo:dict];
          return NO;
--- 228,232 ----
          }
      } NS_HANDLER {
!         NSDictionary *dict = [NSDictionary dictionaryWithObject:[NSString stringWithFormat:NSLocalizedString(@"This is not a valid qualifier:\n\n%@", @"Validation error description"), localException] forKey:NSLocalizedDescriptionKey];
          *outError = [NSError errorWithDomain:@"EOQualifier" code:0 userInfo:dict];
          return NO;
***************
*** 231,235 ****
              if (qual) {
                  [[[self undoManager] prepareWithInvocationTarget:self] setLhsDescription:[_lhs description]];
!                 [[self undoManager] setActionName:@"Set Left-Hand Side"];
                  
                  [self setLhs:qual];
--- 241,245 ----
              if (qual) {
                  [[[self undoManager] prepareWithInvocationTarget:self] setLhsDescription:[_lhs description]];
!                 [[self undoManager] setActionName:NSLocalizedString(@"Set Left-Hand Side", @"Undo-redo action name")];
                  
                  [self setLhs:qual];
***************
*** 237,241 ****
          } else {
              [[[self undoManager] prepareWithInvocationTarget:self] setLhsDescription:[_lhs description]];
!             [[self undoManager] setActionName:@"Set Left-Hand Side"];
              
              [self setLhs:nil];
--- 247,251 ----
          } else {
              [[[self undoManager] prepareWithInvocationTarget:self] setLhsDescription:[_lhs description]];
!             [[self undoManager] setActionName:NSLocalizedString(@"Set Left-Hand Side", @"Undo-redo action name")];
              
              [self setLhs:nil];
***************
*** 253,257 ****
  	if(_author != value){
  		[[[self undoManager] prepareWithInvocationTarget:self] setAuthor:_author];
! 		[self _setActionName:@"Set Priority to %@" old:[NSNumber numberWithInt:_author] new:[NSNumber numberWithInt:value]];
  		
  		_author = value;
--- 263,267 ----
  	if(_author != value){
  		[[[self undoManager] prepareWithInvocationTarget:self] setAuthor:_author];
! 		[self _setActionName:NSLocalizedString(@"Set Priority to %@", @"Undo-redo action name") old:[NSNumber numberWithInt:_author] new:[NSNumber numberWithInt:value]];
  		
  		_author = value;
***************
*** 274,278 ****
  	if(_enabled != flag){
  		[[[self undoManager] prepareWithInvocationTarget:self] setEnabled:_enabled];
! 		[[self undoManager] setActionName:@"Enabled"];
  		
  		_enabled = flag;
--- 284,288 ----
  	if(_enabled != flag){
  		[[[self undoManager] prepareWithInvocationTarget:self] setEnabled:_enabled];
! 		[[self undoManager] setActionName:NSLocalizedString(@"Enabled", @"Undo-redo action name")];
  		
  		_enabled = flag;