Attachment #1458 for bug #1516

View | Details | Raw Unified | Return to bug 1516
Collapse All | Expand All

(-)a/src/config-store/model/attribute-default-iterator.cc (+5 lines)

Lines 112-117	Link Here

112

113

114

void

114

void

115

AttributeDefaultIterator::DoVisitAttributeReadOnly (std::string name, std::string defaultValue)

116

117

118

119

void

115

AttributeDefaultIterator::VisitAttribute (TypeId tid, std::string name, std::string defaultValue, uint32_t index)

120

AttributeDefaultIterator::VisitAttribute (TypeId tid, std::string name, std::string defaultValue, uint32_t index)

116

121

117

  DoVisitAttribute (name, defaultValue);

122

  DoVisitAttribute (name, defaultValue);

(-)a/src/config-store/model/attribute-default-iterator.h (+4 lines)

Lines 53-58	Link Here

   * \brief This method is just an interface and needs to be implemented

   * \brief This method is just an interface and needs to be implemented

*/

*/

  virtual void DoVisitAttribute (std::string name, std::string defaultValue);

  virtual void DoVisitAttribute (std::string name, std::string defaultValue);

/**

   * \brief This method is just an interface and needs to be implemented

*/

  virtual void DoVisitAttributeReadOnly (std::string name, std::string defaultValue);

};

};

} // namespace ns3

} // namespace ns3

(-)a/src/config-store/model/attribute-iterator.cc (+12 lines)

Lines 134-139	Link Here

134

135

136

void

136

void

137

AttributeIterator::VisitAttributeReadOnly (Ptr<Object> object, std::string name)

138

139

  m_currentPath.push_back (name);

140

  DoVisitAttributeReadOnly (object, name);

141

  m_currentPath.pop_back ();

142

143

144

void

137

AttributeIterator::StartVisitObject (Ptr<Object> object)

145

AttributeIterator::StartVisitObject (Ptr<Object> object)

138

146

139

  m_currentPath.push_back ("$" + object->GetInstanceTypeId ().GetName ());

147

  m_currentPath.push_back ("$" + object->GetInstanceTypeId ().GetName ());

Lines 250-255	Link Here

250

258

251

              VisitAttribute (object, info.name);

259

              VisitAttribute (object, info.name);

252

260

261

          else if ((info.flags & TypeId::ATTR_GET) && info.accessor->HasGetter ())

262

263

              VisitAttributeReadOnly (object, info.name);

264

253

          else

265

          else

254

266

255

              NS_LOG_DEBUG ("could not store " << info.name);

267

              NS_LOG_DEBUG ("could not store " << info.name);

(-)a/src/config-store/model/attribute-iterator.h (+2 lines)

Lines 42-47	Link Here

  std::string GetCurrentPath (void) const;

  std::string GetCurrentPath (void) const;

private:

private:

  virtual void DoVisitAttribute (Ptr<Object> object, std::string name) = 0;

  virtual void DoVisitAttribute (Ptr<Object> object, std::string name) = 0;

  virtual void DoVisitAttributeReadOnly (Ptr<Object> object, std::string name) = 0;

  virtual void DoStartVisitObject (Ptr<Object> object);

  virtual void DoStartVisitObject (Ptr<Object> object);

  virtual void DoEndVisitObject (void);

  virtual void DoEndVisitObject (void);

  virtual void DoStartVisitPointerAttribute (Ptr<Object> object, std::string name, Ptr<Object> value);

  virtual void DoStartVisitPointerAttribute (Ptr<Object> object, std::string name, Ptr<Object> value);

Lines 56-61	Link Here

  std::string GetCurrentPath (std::string attr) const;

  std::string GetCurrentPath (std::string attr) const;

  void VisitAttribute (Ptr<Object> object, std::string name);

  void VisitAttribute (Ptr<Object> object, std::string name);

  void VisitAttributeReadOnly (Ptr<Object> object, std::string name);

  void StartVisitObject (Ptr<Object> object);

  void StartVisitObject (Ptr<Object> object);

  void EndVisitObject (void);

  void EndVisitObject (void);

  void StartVisitPointerAttribute (Ptr<Object> object, std::string name, Ptr<Object> value);

  void StartVisitPointerAttribute (Ptr<Object> object, std::string name, Ptr<Object> value);

(-)a/src/config-store/model/display-functions.cc (+9 lines)

Lines 40-45	Link Here

      g_object_set (renderer, "text", str.Get ().c_str (), (char*) 0);

      g_object_set (renderer, "text", str.Get ().c_str (), (char*) 0);

      g_object_set (renderer, "editable", TRUE, (char*) 0);

      g_object_set (renderer, "editable", TRUE, (char*) 0);

  else if (node->type == ModelNode::NODE_ATTRIBUTE_READ_ONLY)

      StringValue str;

      node->object->GetAttribute (node->name, str);

      g_object_set (renderer, "text", str.Get ().c_str (), (char*) 0);

      g_object_set (renderer, "editable", FALSE, (char*) 0);

  else

  else

      g_object_set (renderer, "text", "", (char*) 0);

      g_object_set (renderer, "text", "", (char*) 0);

Lines 76-81	Link Here

      break;

      break;

    case ModelNode::NODE_ATTRIBUTE:

    case ModelNode::NODE_ATTRIBUTE:

    case ModelNode::NODE_ATTRIBUTE_READ_ONLY:

      g_object_set (renderer, "text", node->name.c_str (), (char*) 0);

      g_object_set (renderer, "text", node->name.c_str (), (char*) 0);

      break;

      break;

Lines 173-178	Link Here

173

181

174

      break;

182

      break;

175

    case ModelNode::NODE_ATTRIBUTE:

183

    case ModelNode::NODE_ATTRIBUTE:

184

    case ModelNode::NODE_ATTRIBUTE_READ_ONLY:

176

185

177

        uint32_t attrIndex = 0;

186

        uint32_t attrIndex = 0;

178

        TypeId tid;

187

        TypeId tid;




  Add (node);
  Remove ();
}

void 
ModelCreator::DoVisitAttributeReadOnly (Ptr<Object> object, std::string name)
{
  ModelNode *node = new ModelNode ();
  node->type = ModelNode::NODE_ATTRIBUTE_READ_ONLY;
  node->object = object;
  node->name = name;
  Add (node);
  Remove ();
}

void 
ModelCreator::DoStartVisitObject (Ptr<Object> object)
{

(-)a/src/config-store/model/model-node-creator.h (+3 lines)

Lines 35-40	Link Here

    // store object + attribute name

    // store object + attribute name

    NODE_ATTRIBUTE,

    NODE_ATTRIBUTE,

    // store object + attribute name

    // store object + attribute name

    NODE_ATTRIBUTE_READ_ONLY,

    // store object + attribute name

    NODE_POINTER,

    NODE_POINTER,

    // store object + attribute name

    // store object + attribute name

    NODE_VECTOR,

    NODE_VECTOR,

Lines 59-64	Link Here

  void Build (GtkTreeStore *treestore);

  void Build (GtkTreeStore *treestore);

private:

private:

  virtual void DoVisitAttribute (Ptr<Object> object, std::string name);

  virtual void DoVisitAttribute (Ptr<Object> object, std::string name);

  virtual void DoVisitAttributeReadOnly (Ptr<Object> object, std::string name);

  virtual void DoStartVisitObject (Ptr<Object> object);

  virtual void DoStartVisitObject (Ptr<Object> object);

  virtual void DoEndVisitObject (void);

  virtual void DoEndVisitObject (void);

  virtual void DoStartVisitPointerAttribute (Ptr<Object> object, std::string name, Ptr<Object> value);

  virtual void DoStartVisitPointerAttribute (Ptr<Object> object, std::string name, Ptr<Object> value);

(-)a/src/config-store/model/raw-text-config.cc (+3 lines)

Lines 76-81	Link Here

      object->GetAttribute (name, str);

      object->GetAttribute (name, str);

      *m_os << "value " << GetCurrentPath () << " \"" << str.Get () << "\"" << std::endl;

      *m_os << "value " << GetCurrentPath () << " \"" << str.Get () << "\"" << std::endl;

    virtual void DoVisitAttributeReadOnly (Ptr<Object> object, std::string name) {

    std::ostream *m_os;

    std::ostream *m_os;

};

};

(-)a/src/config-store/model/xml-config.cc (+3 lines)

Lines 159-164	Link Here

159

          NS_FATAL_ERROR ("Error at xmlTextWriterEndElement");

159

          NS_FATAL_ERROR ("Error at xmlTextWriterEndElement");

160

161

162

    virtual void DoVisitAttributeReadOnly (Ptr<Object> object, std::string name) {

163

164

162

    xmlTextWriterPtr m_writer;

165

    xmlTextWriterPtr m_writer;

163

};

166

};

164

167

Return to bug 1516