--- a/uiacceltk/hitchcock/ServerCore/Src/alfhierarchymodel.cpp Wed May 26 16:47:36 2010 +0300
+++ b/uiacceltk/hitchcock/ServerCore/Src/alfhierarchymodel.cpp Tue Jun 08 13:16:48 2010 +0300
@@ -803,14 +803,7 @@
}
#endif
- AMT_INC_COUNTER_IF(node && (nodeType==MWsWindowTreeNode::EWinTreeNodeClient), iWindowNodeCount );
- AMT_INC_COUNTER_IF(node && (nodeType==MWsWindowTreeNode::EWinTreeNodeGroup), iWindowGroupNodeCount );
- AMT_INC_COUNTER_IF(node, iTotalNodeCount );
-
- AMT_MAP_INC_VALUE_IF( node && nodeType == MWsWindowTreeNode::EWinTreeNodeClient,
- iIntMap, node->iId, EAlfModuleTestTypeHierarchyModelCreateWindow );
- AMT_MAP_INC_VALUE_IF( node && nodeType == MWsWindowTreeNode::EWinTreeNodeGroup,
- iIntMap, node->iId, EAlfModuleTestTypeHierarchyModelCreateWindowGroup );
+ AMT_MAP_NODE_CREATED();
}
// ---------------------------------------------------------------------------
@@ -841,14 +834,7 @@
USER_INVARIANT();
}
- AMT_DEC_COUNTER_IF(node && (nodeType==MWsWindowTreeNode::EWinTreeNodeClient), iWindowNodeCount );
- AMT_DEC_COUNTER_IF(node && (nodeType==MWsWindowTreeNode::EWinTreeNodeGroup), iWindowGroupNodeCount );
- AMT_DEC_COUNTER_IF(node, iTotalNodeCount );
-
- AMT_MAP_INC_VALUE_IF( node && nodeType == MWsWindowTreeNode::EWinTreeNodeClient,
- iIntMap, nodeId, EAlfModuleTestTypeHierarchyModelReleaseWindow );
- AMT_MAP_INC_VALUE_IF( node && nodeType == MWsWindowTreeNode::EWinTreeNodeGroup,
- iIntMap, nodeId, EAlfModuleTestTypeHierarchyModelReleaseWindowGroup );
+ AMT_MAP_NODE_RELEASED();
}
// ---------------------------------------------------------------------------
@@ -868,12 +854,8 @@
{
USER_INVARIANT();
}
-
- AMT_INC_COUNTER_IF( node && (nodeType==MWsWindowTreeNode::EWinTreeNodeClient), iWindowNodeActivatedCount );
-
- AMT_MAP_SET_VALUE_IF( node && nodeType == MWsWindowTreeNode::EWinTreeNodeClient,
- iBoolMap, nodeId, ETrue,
- EAlfModuleTestTypeHierarchyModelActiveWindow );
+
+ AMT_MAP_NODE_ACTIVATED();
}
// ---------------------------------------------------------------------------
@@ -904,14 +886,7 @@
}
#endif
- AMT_INC_COUNTER_IF(node, iNodeExtentChangedCount );
- AMT_SET_VALUE_IF(node, iLatestNodeExtentRect, rect );
- AMT_MAP_SET_VALUE_IF( node && node->iWindow,
- iSizeMap, node->iWindow->WsInfo().iClientSideId.iWindowIdentifer,
- rect.Size(), EAlfModuleTestTypeHierarchyModelChangeWindowSize );
- AMT_MAP_SET_VALUE_IF( node && node->iWindow,
- iPositionMap, node->iWindow->WsInfo().iClientSideId.iWindowIdentifer,
- rect.iTl, EAlfModuleTestTypeHierarchyModelChangeWindowPosition );
+ AMT_MAP_NODE_EXTENT_CHANGED();
}
// ---------------------------------------------------------------------------
@@ -972,12 +947,7 @@
USER_INVARIANT();
}
- AMT_INC_COUNTER_IF(node, iTotalNodeFlagChangedCount );
- AMT_MAP_SET_VALUE_IF( node && node->iWindow && MWsWindowTreeObserver::EVisible == flag,
- iBoolMap,
- node->iWindow->WsInfo().iClientSideId.iWindowIdentifer,
- newValue,
- EAlfModuleTestTypeHierarchyModelChangeWindowVisibility );
+ AMT_MAP_NODE_FLAG_CHANGED();
}
// ---------------------------------------------------------------------------