0024624: Lost word in license statement in source files

[occt.git] / src / AIS / AIS_Selection.cxx

diff --git a/src/AIS/AIS_Selection.cxx b/src/AIS/AIS_Selection.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 9e76206..2aa0b10
--- a/src/AIS/AIS_Selection.cxx
+++ b/src/AIS/AIS_Selection.cxx
@@ -1,20 +1,16 @@
 // Copyright (c) 1998-1999 Matra Datavision
-// Copyright (c) 1999-2012 OPEN CASCADE SAS
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
 //
-// The content of this file is subject to the Open CASCADE Technology Public
-// License Version 6.5 (the "License"). You may not use the content of this file
-// except in compliance with the License. Please obtain a copy of the License
-// at http://www.opencascade.org and read it completely before using this file.
+// This file is part of Open CASCADE Technology software library.
 //
-// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
-// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
 //
-// The Original Code and all software distributed under the License is
-// distributed on an "AS IS" basis, without warranty of any kind, and the
-// Initial Developer hereby disclaims all such warranties, including without
-// limitation, any warranties of merchantability, fitness for a particular
-// purpose or non-infringement. Please see the License for the specific terms
-// and conditions governing the rights and limitations under the License.
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
 
 #include <AIS_Selection.ixx>
 #include <TCollection_AsciiString.hxx>
@@ -50,9 +46,10 @@
 #define MaxSizeOfResult 100000
 #endif
 
+//current selection (handle)
+static Handle(AIS_Selection) theCurrentSelection;
 static void AIS_Sel_CurrentSelection (Handle(AIS_Selection)& InputSel)     
 {
-  static Handle(AIS_Selection) theCurrentSelection;
   if(!InputSel.IsNull())
     theCurrentSelection = InputSel;
   else
@@ -71,7 +68,6 @@ static TColStd_SequenceOfTransient&  AIS_Sel_GetSelections()
 //=======================================================================
 AIS_Selection::AIS_Selection(const Standard_CString aName) :
 myName(TCollection_AsciiString(aName)),
-mycuri(0), 
 #if !defined USE_MAP && !defined OCC189
 myresult(new TColStd_HArray1OfTransient(1,MaxSizeOfResult)),
 #endif
@@ -248,11 +244,12 @@ AIS_SelectStatus AIS_Selection::Select(const Handle(Standard_Transient)& anObjec
   if ( S->myResultMap.IsBound( anObject ) ){
     AIS_NListTransient::Iterator aListIter = S->myResultMap.Find( anObject );
 //skt-----------------------------------------------------------------
-    if( S->myIterator == aListIter )
-       if( S->myIterator.More() )
-           S->myIterator.Next();
-       else
-           S->myIterator = AIS_NListTransient::Iterator();
+    if( S->myIterator == aListIter ) {
+      if( S->myIterator.More() )
+          S->myIterator.Next();
+      else
+          S->myIterator = AIS_NListTransient::Iterator();
+    }
 //--------------------------------------------------------------------
 #ifdef BUC60953
     // In the mode of advanced mesh selection only one owner is created
@@ -283,9 +280,7 @@ AIS_SelectStatus AIS_Selection::Select(const Handle(Standard_Transient)& anObjec
   S->myresult.Append( anObject, aListIter );
   S->myResultMap.Bind( anObject, aListIter );
   return AIS_SS_Added;
-#endif //USE_MAP
-  return AIS_SS_Removed;
-  
+#endif //USE_MAP  
 }
 
 //=======================================================================
@@ -420,6 +415,11 @@ void AIS_Selection::Remove(const Standard_CString aName)
 #endif
     AIS_Sel_GetSelections().Remove(I);
   }
-  
+}
+
+// clean the static current selection handle
+void AIS_Selection::ClearCurrentSelection()
+{
+    theCurrentSelection.Nullify();
 }