Issue #1343 Fixes

[modules/shaper.git] / src / GeomValidators / GeomValidators_ShapeType.cpp

diff --git a/src/GeomValidators/GeomValidators_ShapeType.cpp b/src/GeomValidators/GeomValidators_ShapeType.cpp
index e6a96f355bb490644c195c0154242df37bcd2b9c..141839ed1213ac7bd43e073405fc51bed4466a06 100644 (file)
--- a/src/GeomValidators/GeomValidators_ShapeType.cpp
+++ b/src/GeomValidators/GeomValidators_ShapeType.cpp
@@ -32,14 +32,14 @@ GeomValidators_ShapeType::TypeOfShape GeomValidators_ShapeType::shapeType(const
     MyShapeTypes["circle"] = Circle;
     MyShapeTypes["wire"]   = Wire;
     MyShapeTypes["face"]   = Face;
-    MyShapeTypes["solid"]  = Solid;
     MyShapeTypes["plane"]  = Plane;
     MyShapeTypes["shell"]  = Shell;
+    MyShapeTypes["solid"]  = Solid;
   }
   std::string aType = std::string(theType.c_str());
   if (MyShapeTypes.find(aType) != MyShapeTypes.end())
     return MyShapeTypes[aType];
-  
+
   Events_Error::send("Shape type defined in XML is not implemented!");
   return AnyShape;
 }
@@ -217,12 +217,13 @@ bool GeomValidators_ShapeType::isValidShape(const GeomShapePtr theShape,
     case Face:
       aValid = theShape->isFace();
       break;
+    case Shell:
+      aValid = theShape->shapeType() == GeomAPI_Shape::SHELL;
+      break;
     case Solid:
       aValid = theShape->isSolid() || theShape->isCompSolid() ||
                theShape->isCompoundOfSolids();
       break;
-    case Shell:
-      aValid = theShape->shapeType() == GeomAPI_Shape::SHELL;
     case Compound:
       aValid = theShape->isCompound();
       break;