Fix error in test case for issue #1779

[modules/shaper.git] / src / ModelAPI / ModelAPI_Data.h

diff --git a/src/ModelAPI/ModelAPI_Data.h b/src/ModelAPI/ModelAPI_Data.h
index da516142181fd28bc8e583803ab4142db049b923..2fc8fbfc8fec35a6997faf2119930bcc8b9885fc 100644 (file)
--- a/src/ModelAPI/ModelAPI_Data.h
+++ b/src/ModelAPI/ModelAPI_Data.h
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        ModelAPI_Data.hxx
-// Created:     21 Mar 2014
-// Author:      Mikhail PONIKAROV
+// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
 
 #ifndef ModelAPI_Data_H_
 #define ModelAPI_Data_H_
@@ -60,9 +74,10 @@ class MODELAPI_EXPORT ModelAPI_Data
 
   /// Returns the name of the feature visible by the user in the object browser
   virtual std::string name() = 0;
-
   /// Defines the name of the feature visible by the user in the object browser
   virtual void setName(const std::string& theName) = 0;
+  /// Return \c true if the object has been renamed by the user
+  virtual bool hasUserDefinedName() const = 0;
 
   /// Returns the attribute that references to another document
   virtual std::shared_ptr<ModelAPI_AttributeDocRef> document(const std::string& theID) = 0;
@@ -129,8 +144,8 @@ class MODELAPI_EXPORT ModelAPI_Data
   /// Blocks sending "attribute updated" if theBlock is true
   /// \param theID identifier of the attribute that can be referenced by this ID later
   /// \param theAttrType type of the created attribute (received from the type method)
-  /// \returns the just created attribute
-  virtual void blockSendAttributeUpdated(
+  /// \returns the previous state of block
+  virtual bool blockSendAttributeUpdated(
     const bool theBlock, const bool theSendMessage = true) = 0;
 
   /// Erases all the data from the data model
@@ -185,6 +200,10 @@ class MODELAPI_EXPORT ModelAPI_Data
   /// Sets true if the object is deleted, but some data is still keept in memory
   virtual void setIsDeleted(const bool theFlag) = 0;
 
+  /// Returns \c true if theAttribute1 is going earlier than theAttribute2 in the data
+  virtual bool isPrecedingAttribute(const std::string& theAttribute1,
+                                    const std::string& theAttribute2) const = 0;
+
  protected:
   /// Objects are created for features automatically
   ModelAPI_Data();