X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FmodelCDMPackage.h;h=471dbb35f6836e5d0f9e06a276d47375b8aeb813;hb=2fb5dd9262993efaf56bfc731f4297fdb96bf63e;hp=dcbce566168971d853e6ec4cec97c3c917766be4;hpb=667f8ae6982afb3a65dc1e1fad8c3aabdf0caf80;p=crea.git

diff --git a/lib/creaDevManagerLib/modelCDMPackage.h b/lib/creaDevManagerLib/modelCDMPackage.h
index dcbce56..471dbb3 100644
--- a/lib/creaDevManagerLib/modelCDMPackage.h
+++ b/lib/creaDevManagerLib/modelCDMPackage.h
@@ -37,15 +37,16 @@
 
 #include<iostream>
 #include<vector>
+#include<map>
 
-#include"modelCDMIProjectTreeNode.h"
-#include"modelCDMBlackBox.h"
+#include"modelCDMFolder.h"
+#include"modelCDMPackageSrc.h"
 
-class modelCDMPackage : public modelCDMIProjectTreeNode
+class modelCDMPackage : public modelCDMFolder
 {
 public:
   modelCDMPackage();
-  modelCDMPackage(const std::string& path, const int& level = 1);
+  modelCDMPackage(modelCDMIProjectTreeNode* parent, const std::string& path, const std::string& name, const int& level = 1);
   ~modelCDMPackage();
 
   const std::string& GetNamePackage() const;
@@ -53,6 +54,7 @@ public:
   const std::string& GetAuthorsEmail() const;
   const std::string& GetVersion() const;
   const std::string& GetDescription() const;
+  modelCDMPackageSrc* GetSrc() const;
 
   bool SetAuthors(const std::string& authors, std::string*& result);
   bool SetAuthorsEmail(const std::string& email, std::string*& result);
@@ -60,23 +62,27 @@ public:
   bool SetDescription(const std::string& description, std::string*& result);
 
 
-  bool CreateBlackBox(
+  modelCDMBlackBox* CreateBlackBox(
+      std::string*& result,
       const std::string& name,
+      const std::string& type = "std",
+      const std::string& format = "C++",
+      const std::string& categories = "empty",
       const std::string& authors = "unknown",
       const std::string& authorsEmail = "",
-      const std::string& categories = "empty",
       const std::string& description = "no description"
   );
-  bool OpenCMakeListsFile(std::string*& result);
   virtual const bool Refresh(std::string*& result);
 
+  void CheckStructure(std::map<std::string, bool>& properties);
+
 private:
   std::string namePackage;
   std::string authors;
   std::string authorsEmail;
   std::string version;
   std::string description;
-  std::vector<modelCDMBlackBox*> blackBoxes;
+  modelCDMPackageSrc* src;
 
 };