Renamed YUMSource to YUMSourceImpl (to have compatible naming)

Insert the created resolvables from YUM source to ResStore

diff --git a/zypp/source/Builtin.h b/zypp/source/Builtin.h
index c954c7a..0fa1c6c 100644 (file)
--- a/zypp/source/Builtin.h
+++ b/zypp/source/Builtin.h
@@ -17,7 +17,7 @@
 
 #include "zypp/source/SourceImpl.h"
 #include "zypp/source/susetags/SuseTagsImpl.h"
-#include "zypp/source/yum/YUMSource.h"
+#include "zypp/source/yum/YUMSourceImpl.h"
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp

diff --git a/zypp/source/yum/Makefile.am b/zypp/source/yum/Makefile.am
index 47cbfef..a19a0c4 100644 (file)
--- a/zypp/source/yum/Makefile.am
+++ b/zypp/source/yum/Makefile.am
@@ -8,7 +8,7 @@ SUBDIRS =
 sourceyumincludedir = $(pkgincludedir)/source/yum
 
 sourceyuminclude_HEADERS =             \
-       YUMSource.h                     \
+       YUMSourceImpl.h                 \
        YUMScriptImpl.h                 \
        YUMMessageImpl.h                \
        YUMPackageImpl.h                \
@@ -23,7 +23,7 @@ noinst_LTLIBRARIES =  lib@PACKAGE@_source_yum.la
 ## ##################################################
 
 lib@PACKAGE@_source_yum_la_SOURCES =   \
-       YUMSource.cc                    \
+       YUMSourceImpl.cc                \
        YUMScriptImpl.cc                \
        YUMMessageImpl.cc               \
        YUMPackageImpl.cc               \

diff --git a/zypp/source/yum/YUMPatchImpl.cc b/zypp/source/yum/YUMPatchImpl.cc
index 65ffd34..20d5b11 100644 (file)
--- a/zypp/source/yum/YUMPatchImpl.cc
+++ b/zypp/source/yum/YUMPatchImpl.cc
@@ -11,7 +11,7 @@
 */
 
 #include "zypp/source/yum/YUMPatchImpl.h"
-#include "zypp/source/yum/YUMSource.h"
+#include "zypp/source/yum/YUMSourceImpl.h"
 #include <zypp/CapFactory.h>
 #include "zypp/parser/yum/YUMParserData.h"
 #include <zypp/parser/yum/YUMParser.h>
@@ -44,7 +44,7 @@ namespace zypp
       */
       YUMPatchImpl::YUMPatchImpl(
        const zypp::parser::yum::YUMPatchData & parsed,
-       YUMSource * src
+       YUMSourceImpl * src
       )
       {
        _patch_id = parsed.patchId;

diff --git a/zypp/source/yum/YUMPatchImpl.h b/zypp/source/yum/YUMPatchImpl.h
index 1f4409a..39fe349 100644 (file)
--- a/zypp/source/yum/YUMPatchImpl.h
+++ b/zypp/source/yum/YUMPatchImpl.h
@@ -14,7 +14,7 @@
 
 #include "zypp/detail/PatchImpl.h"
 #include "zypp/parser/yum/YUMParserData.h"
-#include "zypp/source/yum/YUMSource.h"
+#include "zypp/source/yum/YUMSourceImpl.h"
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp
@@ -37,7 +37,7 @@ namespace zypp
         /** Default ctor */
         YUMPatchImpl(
          const zypp::parser::yum::YUMPatchData & parsed,
-         YUMSource * src
+         YUMSourceImpl * src
        );
        /** Patch ID */
        std::string id() const;

diff --git a/zypp/source/yum/YUMProductImpl.cc b/zypp/source/yum/YUMProductImpl.cc
index a7f6508..7860898 100644 (file)
--- a/zypp/source/yum/YUMProductImpl.cc
+++ b/zypp/source/yum/YUMProductImpl.cc
@@ -11,7 +11,7 @@
 */
 
 #include "zypp/source/yum/YUMProductImpl.h"
-#include "zypp/source/yum/YUMSource.h"
+#include "zypp/source/yum/YUMSourceImpl.h"
 #include <zypp/CapFactory.h>
 #include "zypp/parser/yum/YUMParserData.h"
 #include <zypp/parser/yum/YUMParser.h>
@@ -44,7 +44,7 @@ namespace zypp
       */
       YUMProductImpl::YUMProductImpl(
        const zypp::parser::yum::YUMProductData & parsed,
-       YUMSource * src
+       YUMSourceImpl * src
       )
       :        _category(parsed.type),
        _vendor(parsed.vendor)//,

diff --git a/zypp/source/yum/YUMProductImpl.h b/zypp/source/yum/YUMProductImpl.h
index f8d36ae..ee6a9ab 100644 (file)
--- a/zypp/source/yum/YUMProductImpl.h
+++ b/zypp/source/yum/YUMProductImpl.h
@@ -14,7 +14,7 @@
 
 #include "zypp/detail/ProductImpl.h"
 #include "zypp/parser/yum/YUMParserData.h"
-#include "zypp/source/yum/YUMSource.h"
+#include "zypp/source/yum/YUMSourceImpl.h"
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp
@@ -37,7 +37,7 @@ namespace zypp
         /** Default ctor */
         YUMProductImpl(
          const zypp::parser::yum::YUMProductData & parsed,
-         YUMSource * src
+         YUMSourceImpl * src
        );
        std::string category() const;
        Label vendor() const;

diff --git a/zypp/source/yum/YUMSource.cc b/zypp/source/yum/YUMSourceImpl.cc
similarity index 94%
rename from zypp/source/yum/YUMSource.cc
rename to zypp/source/yum/YUMSourceImpl.cc
index 6427fac..9e38775 100644 (file)
--- a/zypp/source/yum/YUMSource.cc
+++ b/zypp/source/yum/YUMSourceImpl.cc
@@ -6,11 +6,11 @@
 |                         /_____||_| |_| |_|                           |
 |                                                                      |
 \---------------------------------------------------------------------*/
-/** \file zypp/source/yum/YUMSource.cc
+/** \file zypp/source/yum/YUMSourceImpl.cc
  *
 */
 
-#include "zypp/source/yum/YUMSource.h"
+#include "zypp/source/yum/YUMSourceImpl.h"
 #include "zypp/source/yum/YUMPackageImpl.h"
 #include "zypp/source/yum/YUMScriptImpl.h"
 #include "zypp/source/yum/YUMMessageImpl.h"
@@ -41,16 +41,16 @@ namespace zypp
     {
       ///////////////////////////////////////////////////////////////////
       //
-      //        CLASS NAME : YUMSource
+      //        CLASS NAME : YUMSourceImpl
       //
       ///////////////////////////////////////////////////////////////////
 
       /** Default ctor
       */
-      YUMSource::YUMSource()
+      YUMSourceImpl::YUMSourceImpl()
       {}
 
-      void YUMSource::parseSourceMetadata(std::string path)
+      void YUMSourceImpl::parseSourceMetadata(std::string path)
       {
        std::list<YUMRepomdData_Ptr> repo_primary;
        std::list<YUMRepomdData_Ptr> repo_files;
@@ -179,7 +179,7 @@ namespace zypp
                ? *found_other->second
                : other_empty
            );
-           ERR << "Insert package " << *p << " into the pool" << endl;
+           _store.insert (p);
          }
          if (prim.errorStatus())
            throw *prim.errorStatus();
@@ -205,7 +205,7 @@ namespace zypp
               ++group)
          {
            Selection::Ptr p = createGroup(**group);
-           ERR << "Insert group " << *p << " into the pool" << endl;
+           _store.insert (p);
          }
          if (group.errorStatus())
            throw *group.errorStatus();
@@ -231,7 +231,7 @@ namespace zypp
               ++pattern)
          {
            Pattern::Ptr p = createPattern(**pattern);
-           ERR << "Insert pattern " << *p << " into the pool" << endl;
+           _store.insert (p);
          }
          if (pattern.errorStatus())
            throw *pattern.errorStatus();
@@ -257,7 +257,7 @@ namespace zypp
               ++product)
          {
            Product::Ptr p = createProduct(**product);
-           ERR << "Insert product " << *p << " into the pool" << endl;
+           _store.insert (p);
          }
          if (product.errorStatus())
            throw *product.errorStatus();
@@ -304,13 +304,13 @@ namespace zypp
                ++ptch)
            {
              Patch::Ptr p = createPatch(**ptch);
-             ERR << "Insert patch " << *p << " into the pool" << endl;
+             _store.insert (p);
              Patch::AtomList atoms = p->atoms();
              for (Patch::AtomList::iterator at = atoms.begin();
                at != atoms.end();
                at++)
              {
-               ERR << "Inserting atom " << **at << " into the pool" << endl;
+               _store.insert (*at);
              }
            }
            if (ptch.errorStatus())
@@ -323,7 +323,7 @@ namespace zypp
        }
       }
 
-       Package::Ptr YUMSource::createPackage(
+       Package::Ptr YUMSourceImpl::createPackage(
          const zypp::parser::yum::YUMPrimaryData & parsed,
          const zypp::parser::yum::YUMFileListData & filelist,
          const zypp::parser::yum::YUMOtherData & other
@@ -353,7 +353,7 @@ namespace zypp
          }
        }
 
-       Package::Ptr YUMSource::createPackage(
+       Package::Ptr YUMSourceImpl::createPackage(
          const zypp::parser::yum::YUMPatchPackage & parsed
        )
        {
@@ -380,7 +380,7 @@ namespace zypp
          }
        }
 
-       Selection::Ptr YUMSource::createGroup(
+       Selection::Ptr YUMSourceImpl::createGroup(
          const zypp::parser::yum::YUMGroupData & parsed
        )
        {
@@ -404,7 +404,7 @@ namespace zypp
          }
        }
 
-       Pattern::Ptr YUMSource::createPattern(
+       Pattern::Ptr YUMSourceImpl::createPattern(
          const zypp::parser::yum::YUMPatternData & parsed
        )
        {
@@ -428,7 +428,7 @@ namespace zypp
          }
        }
 
-       Message::Ptr YUMSource::createMessage(
+       Message::Ptr YUMSourceImpl::createMessage(
          const zypp::parser::yum::YUMPatchMessage & parsed
        )
        {
@@ -455,7 +455,7 @@ namespace zypp
          }
        }
 
-       Script::Ptr YUMSource::createScript(
+       Script::Ptr YUMSourceImpl::createScript(
          const zypp::parser::yum::YUMPatchScript & parsed
        )
        {
@@ -482,7 +482,7 @@ namespace zypp
          }
        }
 
-       Product::Ptr YUMSource::createProduct(
+       Product::Ptr YUMSourceImpl::createProduct(
          const zypp::parser::yum::YUMProductData & parsed
        )
        {
@@ -509,7 +509,7 @@ namespace zypp
          }
        }
 
-       Patch::Ptr YUMSource::createPatch(
+       Patch::Ptr YUMSourceImpl::createPatch(
          const zypp::parser::yum::YUMPatchData & parsed
        )
        {
@@ -536,7 +536,7 @@ namespace zypp
          }
        }
 
-       Dependencies YUMSource::createDependencies(
+       Dependencies YUMSourceImpl::createDependencies(
          const zypp::parser::yum::YUMObjectData & parsed,
          const Resolvable::Kind my_kind
        )
@@ -583,7 +583,7 @@ namespace zypp
          return _deps;
        }
 
-       Dependencies YUMSource::createGroupDependencies(
+       Dependencies YUMSourceImpl::createGroupDependencies(
          const zypp::parser::yum::YUMGroupData & parsed
        )
        {
@@ -628,7 +628,7 @@ namespace zypp
          return _deps;
        }
 
-       Dependencies YUMSource::createPatternDependencies(
+       Dependencies YUMSourceImpl::createPatternDependencies(
          const zypp::parser::yum::YUMPatternData & parsed
        )
        {
@@ -673,7 +673,7 @@ namespace zypp
          return _deps;
        }
 
-       Capability YUMSource::createCapability(const YUMDependency & dep,
+       Capability YUMSourceImpl::createCapability(const YUMDependency & dep,
                                               const Resolvable::Kind & my_kind)
        {
          CapFactory _f;

diff --git a/zypp/source/yum/YUMSource.h b/zypp/source/yum/YUMSourceImpl.h
similarity index 90%
rename from zypp/source/yum/YUMSource.h
rename to zypp/source/yum/YUMSourceImpl.h
index 211268a..e024dfc 100644 (file)
--- a/zypp/source/yum/YUMSource.h
+++ b/zypp/source/yum/YUMSourceImpl.h
@@ -6,11 +6,11 @@
 |                         /_____||_| |_| |_|                           |
 |                                                                      |
 \---------------------------------------------------------------------*/
-/** \file zypp/source/yum/YUMSource.h
+/** \file zypp/source/yum/YUMSourceImpl.h
  *
 */
-#ifndef ZYPP_SOURCE_YUM_YUMSOURCE_H
-#define ZYPP_SOURCE_YUM_YUMSOURCE_H
+#ifndef ZYPP_SOURCE_YUM_YUMSOURCEIMPL_H
+#define ZYPP_SOURCE_YUM_YUMSOURCEIMPL_H
 
 #include "zypp/source/SourceImpl.h"
 #include "zypp/parser/yum/YUMParserData.h"
@@ -35,15 +35,15 @@ namespace zypp
 
       ///////////////////////////////////////////////////////////////////
       //
-      //        CLASS NAME : YUMSource
+      //        CLASS NAME : YUMSourceImpl
       //
       /** Class representing a YUM installation source
       */
-      class YUMSource : public SourceImpl
+      class YUMSourceImpl : public SourceImpl
       {
       public:
         /** Default ctor */
-        YUMSource();
+        YUMSourceImpl();
 
        void parseSourceMetadata(std::string path);
 
@@ -134,8 +134,8 @@ namespace zypp
        };
 
       };
-      inline bool operator<( const YUMSource::PackageID & lhs, const YUMSource::PackageID & rhs )
-      { return YUMSource::PackageID::compare( lhs, rhs ) == -1; }
+      inline bool operator<( const YUMSourceImpl::PackageID & lhs, const YUMSourceImpl::PackageID & rhs )
+      { return YUMSourceImpl::PackageID::compare( lhs, rhs ) == -1; }
 
       ///////////////////////////////////////////////////////////////////
     } // namespace yum
@@ -145,4 +145,4 @@ namespace zypp
   /////////////////////////////////////////////////////////////////
 } // namespace zypp
 ///////////////////////////////////////////////////////////////////
-#endif // ZYPP_SOURCE_YUM_YUMSOURCE_H
+#endif // ZYPP_SOURCE_YUM_YUMSOURCEIMPL_H