Adjust test cases according to updated Arc behavior

[modules/shaper.git] / src / BuildPlugin / BuildPlugin_Validators.h

diff --git a/src/BuildPlugin/BuildPlugin_Validators.h b/src/BuildPlugin/BuildPlugin_Validators.h
index 8792c42ce9b4af7bcac37a0f63dee1360affaca6..347ef5f22f4db23d368ae2fa3fca5ef1fa028ced 100644 (file)
--- a/src/BuildPlugin/BuildPlugin_Validators.h
+++ b/src/BuildPlugin/BuildPlugin_Validators.h
@@ -12,7 +12,8 @@
 
 /// \class BuildPlugin_ValidatorBaseForBuild
 /// \ingroup Validators
-/// \brief A validator for selection base shapes for build features. Allows to select shapes on sketch and
+/// \brief A validator for selection base shapes for build features.
+/// Allows to select shapes on sketch and
 /// whole objects with allowed type.
 class BuildPlugin_ValidatorBaseForBuild: public ModelAPI_AttributeValidator
 {
@@ -23,7 +24,7 @@ public:
   //! \param[out] theError error message.
    virtual bool isValid(const AttributePtr& theAttribute,
                         const std::list<std::string>& theArguments,
-                        std::string& theError) const;
+                        Events_InfoMessage& theError) const;
 };
 
 /// \class BuildPlugin_ValidatorBaseForWire
@@ -39,7 +40,7 @@ public:
   //! \param theError error message.
   virtual bool isValid(const std::shared_ptr<ModelAPI_Feature>& theFeature,
                        const std::list<std::string>& theArguments,
-                       std::string& theError) const;
+                       Events_InfoMessage& theError) const;
 
   /// \return true if the attribute in feature is not obligatory for the feature execution
   virtual bool isNotObligatory(std::string theFeature, std::string theAttribute);
@@ -48,8 +49,26 @@ public:
 /// \class BuildPlugin_ValidatorBaseForFace
 /// \ingroup Validators
 /// \brief A validator for selection base shapes for face. Allows to select sketch edges, edges and
-/// wires objects that lie in the same plane.
-class BuildPlugin_ValidatorBaseForFace: public ModelAPI_AttributeValidator
+/// wires objects that lie in the same plane and don't have intersections.
+class BuildPlugin_ValidatorBaseForFace: public ModelAPI_FeatureValidator
+{
+public:
+  //! Returns true if attributes is ok.
+  //! \param theFeature the checked feature.
+  //! \param theArguments arguments of the feature.
+  //! \param theError error message.
+  virtual bool isValid(const std::shared_ptr<ModelAPI_Feature>& theFeature,
+                       const std::list<std::string>& theArguments,
+                       Events_InfoMessage& theError) const;
+
+  /// \return true if the attribute in feature is not obligatory for the feature execution
+  virtual bool isNotObligatory(std::string theFeature, std::string theAttribute);
+};
+
+/// \class BuildPlugin_ValidatorSubShapesSelection
+/// \ingroup Validators
+/// \brief A validator for selection sub-shapes for SubShape feature.
+class BuildPlugin_ValidatorSubShapesSelection: public ModelAPI_AttributeValidator
 {
 public:
   //! Returns true if attribute is ok.
@@ -58,7 +77,7 @@ public:
   //! \param[out] theError error message.
    virtual bool isValid(const AttributePtr& theAttribute,
                         const std::list<std::string>& theArguments,
-                        std::string& theError) const;
+                        Events_InfoMessage& theError) const;
 };
 
 #endif