# | Line 1 | Line 1 | |
---|---|---|
1 | < | /* |
1 | > | /* |
2 | * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved. | |
3 | * | |
4 | * The University of Notre Dame grants you ("Licensee") a | |
# | Line 45 | Line 45 | namespace oopse { | |
45 | ||
46 | namespace oopse { | |
47 | ||
48 | < | PropertyMap::~PropertyMap(){ |
49 | < | clearProperties(); |
50 | < | } |
48 | > | PropertyMap::~PropertyMap(){ |
49 | > | clearProperties(); |
50 | > | } |
51 | ||
52 | ||
53 | < | void PropertyMap::addProperty(GenericData* genData){ |
53 | > | void PropertyMap::addProperty(GenericData* genData){ |
54 | std::map<std::string, GenericData*>::iterator iter; | |
55 | ||
56 | iter = propMap_.find(genData->getID()); | |
57 | ||
58 | if (iter == propMap_.end()){ | |
59 | < | propMap_.insert(std::make_pair(genData->getID(), genData)); |
59 | > | propMap_.insert(std::make_pair(genData->getID(), genData)); |
60 | } else { | |
61 | < | delete iter->second; |
62 | < | iter->second = genData; |
61 | > | delete iter->second; |
62 | > | iter->second = genData; |
63 | } | |
64 | < | } |
64 | > | } |
65 | ||
66 | < | bool PropertyMap::removeProperty(const std::string& propName){ |
67 | < | std::map<std::string, GenericData*>::iterator iter; |
66 | > | bool PropertyMap::removeProperty(const std::string& propName){ |
67 | > | std::map<std::string, GenericData*>::iterator iter; |
68 | ||
69 | iter = propMap_.find(propName); | |
70 | ||
71 | if (iter != propMap_.end()){ | |
72 | < | delete iter->second; |
73 | < | propMap_.erase(iter); |
74 | < | return true; |
72 | > | delete iter->second; |
73 | > | propMap_.erase(iter); |
74 | > | return true; |
75 | } else { | |
76 | < | //logger.warn("Can not find property with name: " + propName); |
77 | < | return false; |
76 | > | //logger.warn("Can not find property with name: " + propName); |
77 | > | return false; |
78 | } | |
79 | < | } |
79 | > | } |
80 | ||
81 | < | void PropertyMap::clearProperties(){ |
81 | > | void PropertyMap::clearProperties(){ |
82 | std::map<std::string, GenericData*>::iterator iter; | |
83 | ||
84 | for (iter = propMap_.begin(); iter != propMap_.end(); ++iter) | |
85 | < | delete iter->second; |
85 | > | delete iter->second; |
86 | ||
87 | propMap_.clear(); | |
88 | < | } |
88 | > | } |
89 | ||
90 | < | std::vector<std::string> PropertyMap::getPropertyNames(){ |
90 | > | std::vector<std::string> PropertyMap::getPropertyNames(){ |
91 | std::vector<std::string> propNames; | |
92 | std::map<std::string, GenericData*>::iterator iter; | |
93 | ||
94 | for (iter = propMap_.begin(); iter != propMap_.end(); ++iter) | |
95 | < | propNames.push_back(iter->first); |
95 | > | propNames.push_back(iter->first); |
96 | ||
97 | return propNames; | |
98 | < | } |
98 | > | } |
99 | ||
100 | < | std::vector<GenericData*> PropertyMap::getProperties(){ |
100 | > | std::vector<GenericData*> PropertyMap::getProperties(){ |
101 | std::vector<GenericData*> properties; | |
102 | std::map<std::string, GenericData*>::iterator iter; | |
103 | ||
104 | for (iter = propMap_.begin(); iter != propMap_.end(); ++iter) | |
105 | < | properties.push_back(iter->second); |
105 | > | properties.push_back(iter->second); |
106 | ||
107 | return properties; | |
108 | < | } |
108 | > | } |
109 | ||
110 | < | GenericData* PropertyMap::getPropertyByName(const std::string& propName){ |
110 | > | GenericData* PropertyMap::getPropertyByName(const std::string& propName){ |
111 | std::map<std::string, GenericData*>::iterator iter; | |
112 | ||
113 | iter = propMap_.find(propName); | |
114 | ||
115 | if (iter != propMap_.end()) | |
116 | < | return iter->second; |
116 | > | return iter->second; |
117 | else | |
118 | < | return NULL; |
119 | < | } |
118 | > | return NULL; |
119 | > | } |
120 | ||
121 | }//end namepace oopse |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |