From ccf18bb9cb892d80e6134e27899519cb22882cc7 Mon Sep 17 00:00:00 2001 From: cacaodev Date: Mon, 9 Apr 2012 19:54:00 +0200 Subject: [PATCH] CPPredicateEditorRowNode formatting --- .../CPRuleEditor/_CPPredicateEditorRowNode.j | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/AppKit/CPRuleEditor/_CPPredicateEditorRowNode.j b/AppKit/CPRuleEditor/_CPPredicateEditorRowNode.j index eadd3993b..d102322b5 100644 --- a/AppKit/CPRuleEditor/_CPPredicateEditorRowNode.j +++ b/AppKit/CPRuleEditor/_CPPredicateEditorRowNode.j @@ -14,24 +14,21 @@ + (id)rowNodeFromTree:(id)aTree { - var mapTable = {}; - return [_CPPredicateEditorRowNode _rowNodeFromTree:aTree withTemplateTable:mapTable]; + return [_CPPredicateEditorRowNode _rowNodeFromTree:aTree withTemplateTable:{}]; } + (id)_rowNodeFromTree:(id)aTree withTemplateTable:(id)templateTable { - var node, - views, + var views, copiedContainer; + + var uuid = [[aTree template] UID], + cachedNode = templateTable[uuid], + node = [[_CPPredicateEditorRowNode alloc] init]; + + [node setTree:aTree]; - node = [[_CPPredicateEditorRowNode alloc] init]; - node.tree = aTree; - - var template = [aTree template], - uuid = [template UID], - cachedNode = templateTable[uuid]; - - if (cachedNode === nil) + if (cachedNode == nil) { views = [CPMutableArray array]; copiedContainer = [CPMutableArray array]; @@ -43,8 +40,8 @@ copiedContainer = [cachedNode copiedTemplateContainer]; } - node.templateViews = views; - node.copiedTemplateContainer = copiedContainer; + [node setTemplateViews:views]; + [node setCopiedTemplateContainer:copiedContainer]; var nodeChildren = [CPMutableArray array], treeChildren = [aTree children], @@ -65,7 +62,8 @@ - (BOOL)applyTemplate:(id)template withViews:(id)views forOriginalTemplate:(id)originalTemplate { - var t = [tree template]; + var t = [tree template], + count = [children count]; if (t !== template) { @@ -74,9 +72,7 @@ [copiedTemplateContainer addObject:template]; } - var count = [children count]; - - for (var i; i < count; i++) + for (var i = 0; i < count; i++) [children[i] applyTemplate:template withViews:views forOriginalTemplate:originalTemplate]; }