Anonymous avatar Anonymous committed 9af3377

Fixed some names

Comments (0)

Files changed (4)

gazebo/common/ModelDatabase.cc

 }
 
 /////////////////////////////////////////////////
-std::string ModelDatabase::GetDBManifest(const std::string &_uri)
+std::string ModelDatabase::GetDBConfig(const std::string &_uri)
 {
   std::string xmlString;
   std::string uri = _uri;
 }
 
 /////////////////////////////////////////////////
-std::string ModelDatabase::GetModelManifest(const std::string &_uri)
+std::string ModelDatabase::GetModelConfig(const std::string &_uri)
 {
   std::string xmlString;
   std::string uri = _uri;
 /////////////////////////////////////////////////
 std::string ModelDatabase::GetManifest(const std::string &_uri)
 {
-  return this->GetModelManifest(_uri);
+  return this->GetModelConfig(_uri);
 }
 
 /////////////////////////////////////////////////
 /////////////////////////////////////////////////
 bool ModelDatabase::UpdateModelCacheImpl()
 {
-  std::string xmlString = ModelDatabase::GetDBManifest(ModelDatabase::GetURI());
+  std::string xmlString = ModelDatabase::GetDBConfig(ModelDatabase::GetURI());
 
   if (!xmlString.empty())
   {
     if (!databaseElem)
     {
       gzerr << "No <database> tag in the model database "
-            << GZ_MODEL_MANIFEST_FILENAME << " found"
+            << GZ_MODEL_DB_MANIFEST_FILENAME << " found"
             << " here[" << ModelDatabase::GetURI() << "]\n";
       return false;
     }
     if (!modelsElem)
     {
       gzerr << "No <models> tag in the model database "
-        << GZ_MODEL_MANIFEST_FILENAME << " found"
+        << GZ_MODEL_DB_MANIFEST_FILENAME << " found"
         << " here[" << ModelDatabase::GetURI() << "]\n";
       return false;
     }
 std::string ModelDatabase::GetModelName(const std::string &_uri)
 {
   std::string result;
-  std::string xmlStr = ModelDatabase::GetModelManifest(_uri);
+  std::string xmlStr = ModelDatabase::GetModelConfig(_uri);
 
   if (!xmlStr.empty())
   {
   else
   {
     gzwarn << "The manifest.xml for a Gazebo model is deprecated. "
-      << "Please rename manifest.xml to gz_model_manifest.xml\n";
+      << "Please rename manifest.xml to " << GZ_MODEL_MANIFEST_FILENAME << "\n";
 
     manifestPath /= "manifest.xml";
   }
   else
   {
     gzwarn << "The manifest.xml for a Gazebo model is deprecated. "
-      << "Please rename manifest.xml to gz_model_manifest.xml\n";
+      << "Please rename manifest.xml to " << GZ_MODEL_MANIFEST_FILENAME << "\n";
 
     manifestPath /= "manifest.xml";
   }

gazebo/common/ModelDatabase.hh

       /// \return the model's name.
       public: std::string GetModelName(const std::string &_uri);
 
-      /// \brief Return the gz_model_manifest.xml file as a string.
-      /// \return the gz_model_manifest file from the model database.
-      public: std::string GetModelManifest(const std::string &_uri);
+      /// \brief Return the model.config file as a string.
+      /// \return The model config file from the model database.
+      public: std::string GetModelConfig(const std::string &_uri);
 
-      /// \brief Return the gz_model_db.xml file as a string.
-      /// \return the gz_model_db file from the model database.
-      public: std::string GetDBManifest(const std::string &_uri);
+      /// \brief Return the database.config file as a string.
+      /// \return The database config file from the model database.
+      public: std::string GetDBConfig(const std::string &_uri);
 
       /// \brief Deprecated.
-      /// \sa ModelDatabase::GetModelManifest
+      /// \sa ModelDatabase::GetModelConfig
+      /// \sa ModelDatabase::GetDBConfig
       public: std::string GetManifest(const std::string &_uri)
               GAZEBO_DEPRECATED;
 
 
       /// \brief Download all dependencies for a give model path
       ///
-      /// Look's in the model's manifest file (_path/gz_model_manifest.xml)
+      /// Look's in the model's manifest file (_path/model.config)
       /// for all models listed in the <depend> block, and downloads the
       /// models if necessary.
       /// \param[in] _path Path to a model.

gazebo/gui/InsertModelWidget.cc

       else
       {
         gzwarn << "The manifest.xml for a Gazebo model is deprecated. "
-          << "Please rename manifest.xml to gz_model_manifest.xml\n";
+          << "Please rename manifest.xml to "
+          << GZ_MODEL_MANIFEST_FILENAME << "\n";
 
         manifest /= "manifest.xml";
       }

gazebo/sdf/interface/parser.cc

           else
           {
             gzwarn << "The manifest.xml for a Gazebo model is deprecated. "
-                   << "Please rename manifest.xml to gz_model_manifest.xml\n";
+                   << "Please rename manifest.xml to "
+                   << GZ_MODEL_MANIFEST_FILENAME << ".\n";
 
             manifestPath /= "manifest.xml";
           }
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.