X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomValidators%2FGeomValidators_MinObjectsSelected.cpp;h=ca3ebc7a2aef4c871355f0c678c700ca4844d958;hb=be64ac512378281d54e4a73e8edb68ae43d0c5a7;hp=58e39b3a0d07bafee932835d57cbddefcb8ccae0;hpb=1d864d8beda4d31de109734a9f7f006cb361e91c;p=modules%2Fshaper.git

diff --git a/src/GeomValidators/GeomValidators_MinObjectsSelected.cpp b/src/GeomValidators/GeomValidators_MinObjectsSelected.cpp
index 58e39b3a0..ca3ebc7a2 100644
--- a/src/GeomValidators/GeomValidators_MinObjectsSelected.cpp
+++ b/src/GeomValidators/GeomValidators_MinObjectsSelected.cpp
@@ -1,45 +1,60 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomValidators_MinObjectsSelected.cpp
-// Created:     30 June 2015
-// Author:      Dmitry Bobylev
+// Copyright (C) 2014-2019  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
+//
 
 #include <GeomValidators_MinObjectsSelected.h>
 
+#include <Events_InfoMessage.h>
+
 #include <ModelAPI_AttributeInteger.h>
 #include <ModelAPI_AttributeSelectionList.h>
 
 //=================================================================================================
 bool GeomValidators_MinObjectsSelected::isValid(const std::shared_ptr<ModelAPI_Feature>& theFeature,
                                                 const std::list<std::string>& theArguments,
-                                                std::string& theError) const
+                                                Events_InfoMessage& theError) const
 {
   if(theArguments.size() != 2) {
-    theError = "Error: Wrong number of arguments (expected 2): selection list id and min number of objects";
+// LCOV_EXCL_START
+    theError =
+      "Error: Wrong number of arguments (expected 2): selection list id and min number of objects";
     return false;
+// LCOV_EXCL_STOP
   }
 
   std::string aSelectionListId = theArguments.front();
   AttributeSelectionListPtr anAttrSelList = theFeature->selectionList(aSelectionListId);
   if(!anAttrSelList.get()) {
-    theError = "Error: Could not get attribute \"" + aSelectionListId + "\".";
+// LCOV_EXCL_START
+    theError = "Error: Could not get attribute \"%1\".";
+    theError.arg(aSelectionListId);
     return false;
+// LCOV_EXCL_STOP
   }
   int anObjectsNb = anAttrSelList->size();
 
   int aMinObjectsNb = atoi(theArguments.back().c_str());
 
   if(anObjectsNb < aMinObjectsNb) {
-    theError = "Error: Attribute \"" + aSelectionListId + "\" should contain at least "
-      + theArguments.back() + " items.";
+    theError = "Error: Attribute \"%1\" should contain at least %2 items.";
+    theError.arg(aSelectionListId).arg(aMinObjectsNb);
     return false;
   }
 
   return true;
 }
-
-//=================================================================================================
-bool GeomValidators_MinObjectsSelected::isNotObligatory(std::string theFeature, std::string theAttribute)
-{
-  return false;
-}