Author: ericwa
Date: Sun Mar 16 00:29:36 2014
New Revision: 10576
URL: http://svn.gna.org/viewcvs/etoile?rev=10576&view=rev
Log:
Typewriter: use new COPersistentRoot 'name' property
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWHistoryWindowController.m
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWUndoWindowController.m
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWNoteListDataSource.m
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.m
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWHistoryWindowController.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWHistoryWindowController.m?rev=10576&r1=10575&r2=10576&view=diff
==============================================================================
---
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWHistoryWindowController.m
(original)
+++
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWHistoryWindowController.m
Sun Mar 16 00:29:36 2014
@@ -48,7 +48,7 @@
- (NSString *)windowTitleForDocumentDisplayName:(NSString *)displayName
{
- return [NSString stringWithFormat: @"%@ History",
inspectedPersistentRoot.metadata[@"label"]];
+ return [NSString stringWithFormat: @"%@ History",
inspectedPersistentRoot.name];
}
- (void) update
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWUndoWindowController.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWUndoWindowController.m?rev=10576&r1=10575&r2=10576&view=diff
==============================================================================
---
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWUndoWindowController.m
(original)
+++
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWUndoWindowController.m
Sun Mar 16 00:29:36 2014
@@ -223,7 +223,7 @@
if (node.persistentRootUUID != nil)
{
COPersistentRoot *proot = [_track.editingContext
persistentRootForUUID: node.persistentRootUUID];
- return proot.metadata[@"label"];
+ return proot.name;
}
return @"";
}
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWNoteListDataSource.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWNoteListDataSource.m?rev=10576&r1=10575&r2=10576&view=diff
==============================================================================
---
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWNoteListDataSource.m
(original)
+++
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWNoteListDataSource.m
Sun Mar 16 00:29:36 2014
@@ -37,7 +37,7 @@
if ([[tableColumn identifier] isEqual: @"name"])
{
- return persistentRoot.metadata[@"label"];
+ return persistentRoot.name;
}
else if ([[tableColumn identifier] isEqual: @"date"])
{
@@ -52,15 +52,11 @@
if ([[tableColumn identifier] isEqual: @"name"])
{
- NSMutableDictionary *md = [NSMutableDictionary
dictionaryWithDictionary: persistentRoot.metadata];
-
- NSString *oldName = md[@"label"] != nil ? md[@"label"] : @"";
- NSString *newName = [object stringValue] != nil ? [object
stringValue] : @"";
-
- md[@"label"] = newName;
-
+ NSString *oldName = persistentRoot.name != nil ?
persistentRoot.name : @"";
+ __block NSString *newName = [object stringValue] != nil ?
[object stringValue] : @"";
+
[self.owner commitChangesInBlock: ^{
- persistentRoot.metadata = md;
+ persistentRoot.name = newName;
} withIdentifier: @"rename-note" descriptionArguments:
@[oldName, newName]];
}
}
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.m?rev=10576&r1=10575&r2=10576&view=diff
==============================================================================
---
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.m
(original)
+++
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.m
Sun Mar 16 00:29:36 2014
@@ -297,7 +297,7 @@
{
for (COPersistentRoot *persistentRoot in
self.editingContext.persistentRoots)
{
- if ([persistentRoot.metadata[@"label"] isEqualToString: aName])
+ if ([persistentRoot.name isEqualToString: aName])
return YES;
}
return NO;
@@ -323,9 +323,7 @@
[self commitChangesInBlock: ^{
newNote = [self.editingContext
insertNewPersistentRootWithEntityName: @"TypewriterDocument"];
- NSMutableDictionary *md = [NSMutableDictionary
dictionaryWithDictionary: newNote.metadata];
- [md addEntriesFromDictionary: @{ @"label" : [self
untitledDocumentName] }];
- newNote.metadata = md;
+ newNote.name = [self untitledDocumentName];
COTag *currentTag = [self clickedOrSelectedTag];
if (currentTag != nil)
@@ -352,11 +350,9 @@
[self commitChangesInBlock: ^{
copyOfSelection = [selectedPersistentRoot.currentBranch
makePersistentRootCopy];
- sourceLabel = selectedPersistentRoot.metadata[@"label"];
-
- NSMutableDictionary *md = [NSMutableDictionary
dictionaryWithDictionary: copyOfSelection.metadata];
- [md addEntriesFromDictionary: @{ @"label" : [NSString
stringWithFormat: @"Copy of %@", sourceLabel] }];
- copyOfSelection.metadata = md;
+ sourceLabel = selectedPersistentRoot.name;
+
+ copyOfSelection.name = [NSString stringWithFormat:
@"Copy of %@", sourceLabel];
// Also give it the selected tag
COTag *selectedTag = [self clickedOrSelectedTag];
@@ -398,7 +394,7 @@
ETAssert([tag containsObject: noteRootObject]);
[tag removeObject: noteRootObject];
- }withIdentifier: @"untag-note" descriptionArguments: @[[tag
name], note.metadata[@"label"]]];
+ }withIdentifier: @"untag-note" descriptionArguments: @[[tag
name], note.name]];
}
}
@@ -638,9 +634,9 @@
for (COPersistentRoot *selectedPersistentRoot in [self
selectedNotePersistentRoots])
{
selectedPersistentRoot.deleted = YES;
- if (selectedPersistentRoot.metadata[@"label"]
!= nil)
+ if (selectedPersistentRoot.name != nil)
{
- [label appendFormat: @" %@",
selectedPersistentRoot.metadata[@"label"]];
+ [label appendFormat: @" %@",
selectedPersistentRoot.name];
}
}
} withIdentifier: @"delete-note" descriptionArguments:
@[label]];
@@ -709,9 +705,9 @@
}
// Set window title
- if (selectedNote.metadata[@"label"] != nil)
- {
- [[self window] setTitle: selectedNote.metadata[@"label"]];
+ if (selectedNote.name != nil)
+ {
+ [[self window] setTitle: selectedNote.name];
}
else
{
_______________________________________________
Etoile-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/etoile-cvs
