Author: ericwa
Date: Sun Mar 16 02:11:16 2014
New Revision: 10577
URL: http://svn.gna.org/viewcvs/etoile?rev=10577&view=rev
Log:
ProjectDemo: convert to using COPersistentRoot 'name' property
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/ApplicationDelegate.m
trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/EWDocumentWindowController.m
trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/EWGraphLabelCell.m
trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/ProjectNavWindowController.m
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/ApplicationDelegate.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/ApplicationDelegate.m?rev=10577&r1=10576&r2=10577&view=diff
==============================================================================
---
trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/ApplicationDelegate.m
(original)
+++
trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/ApplicationDelegate.m
Sun Mar 16 02:11:16 2014
@@ -128,7 +128,7 @@
{
for (COPersistentRoot *persistentRoot in context.persistentRoots)
{
- if ([persistentRoot.metadata[@"documentName"] isEqualToString:
aName])
+ if ([persistentRoot.name isEqualToString: aName])
return YES;
}
return NO;
@@ -155,8 +155,7 @@
COPersistentRoot *persistentRoot = [context
insertNewPersistentRootWithEntityName: @"Anonymous.Document"];
assert(persistentRoot != nil);
- // FIXME: Merge with old metadata dictionary
- persistentRoot.metadata = @{ @"documentName" : [self
untitledDocumentName] };
+ persistentRoot.name = [self untitledDocumentName];
persistentRoot.currentBranch.label = @"Initial Branch";
@@ -199,11 +198,8 @@
COPersistentRoot *persistentRoot = [[wc editingBranch]
makePersistentRootCopy];
assert(persistentRoot != nil);
- NSString *oldDocName =
wc.persistentRoot.metadata[@"documentName"];
- NSMutableDictionary *md = [NSMutableDictionary
dictionaryWithDictionary: persistentRoot.metadata];
- md[@"documentName"] = [NSString stringWithFormat: @"Copy of
%@", oldDocName];
- persistentRoot.metadata = md;
-
+ NSString *oldDocName = wc.persistentRoot.name;
+ persistentRoot.name = [NSString stringWithFormat: @"Copy of
%@", oldDocName];
persistentRoot.currentBranch.label = @"Initial Branch";
Document *doc = persistentRoot.rootObject;
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/EWDocumentWindowController.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/EWDocumentWindowController.m?rev=10577&r1=10576&r2=10577&view=diff
==============================================================================
---
trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/EWDocumentWindowController.m
(original)
+++
trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/EWDocumentWindowController.m
Sun Mar 16 02:11:16 2014
@@ -246,9 +246,9 @@
- (void) resetTitle
{
NSString *title = @"";
- if (self.persistentRoot.metadata[@"documentName"] != nil)
- {
- title = self.persistentRoot.metadata[@"documentName"];
+ if (self.persistentRoot.name != nil)
+ {
+ title = self.persistentRoot.name;
}
[[self window] setTitle: title];
}
@@ -411,20 +411,18 @@
informativeTextWithFormat: @""];
NSTextField *input = [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0,
200, 24)];
- [input setStringValue: self.persistentRoot.metadata[@"documentName"]];
+ [input setStringValue: self.persistentRoot.name];
[alert setAccessoryView:input];
NSInteger button = [alert runModal];
if (button == NSAlertDefaultReturn) {
[input validateEditing];
- NSString *oldDocName =
self.persistentRoot.metadata[@"documentName"];
- NSMutableDictionary *md = [NSMutableDictionary
dictionaryWithDictionary: self.persistentRoot.metadata];
- md[@"documentName"] = [input stringValue];
- self.persistentRoot.metadata = md;
+ NSString *oldDocName = self.persistentRoot.name;
+ self.persistentRoot.name = [input stringValue];
[self commitWithIdentifier: @"rename-document"
- descriptionArguments: @[oldDocName,
self.persistentRoot.metadata[@"documentName"]]];
+ descriptionArguments: @[oldDocName,
self.persistentRoot.name]];
}
}
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/EWGraphLabelCell.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/EWGraphLabelCell.m?rev=10577&r1=10576&r2=10577&view=diff
==============================================================================
--- trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/EWGraphLabelCell.m
(original)
+++ trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/EWGraphLabelCell.m
Sun Mar 16 02:11:16 2014
@@ -25,7 +25,7 @@
- (NSString *) prettyPrintBranch: (COBranch *)aBranch
{
- NSString *prootLabel = aBranch.persistentRoot.metadata[@"documentName"];
+ NSString *prootLabel = aBranch.persistentRoot.name;
NSString *branchLabel = aBranch.label;
NSString *type = (aBranch.isCurrentBranch) ? @"current" : @"head";
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/ProjectNavWindowController.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/ProjectNavWindowController.m?rev=10577&r1=10576&r2=10577&view=diff
==============================================================================
---
trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/ProjectNavWindowController.m
(original)
+++
trunk/Etoile/Frameworks/CoreObject/Samples/ProjectDemo/ProjectNavWindowController.m
Sun Mar 16 02:11:16 2014
@@ -98,7 +98,7 @@
if ([item isKindOfClass: [Document class]])
{
- return [[[item persistentRoot] metadata] valueForKey:
@"documentName"];
+ return [[item persistentRoot] name];
}
return @"?";
}
_______________________________________________
Etoile-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/etoile-cvs
