[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39940] trunk/blender/source/blender/ collada: svn maintenance

[Nathan Letwory]

Revision: 39940
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39940
Author:   jesterking
Date:     2011-09-05 20:43:45 +0000 (Mon, 05 Sep 2011)
Log Message:
-----------
svn maintenance

Modified Paths:
--------------
    trunk/blender/source/blender/collada/ErrorHandler.cpp
    trunk/blender/source/blender/collada/ErrorHandler.h

Property Changed:
----------------
    trunk/blender/source/blender/collada/ErrorHandler.cpp
    trunk/blender/source/blender/collada/ErrorHandler.h

Modified: trunk/blender/source/blender/collada/ErrorHandler.cpp
===================================================================
--- trunk/blender/source/blender/collada/ErrorHandler.cpp	2011-09-05 20:41:58 UTC (rev 39939)
+++ trunk/blender/source/blender/collada/ErrorHandler.cpp	2011-09-05 20:43:45 UTC (rev 39940)
@@ -1,90 +1,90 @@
-/*
- * $Id$
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor(s): Nathan Letwory.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/collada/ErrorHandler.cpp
- *  \ingroup collada
- */
-#include "ErrorHandler.h"
-#include <iostream>
-
-#include "COLLADASaxFWLIError.h"
-#include "COLLADASaxFWLSaxParserError.h"
-#include "COLLADASaxFWLSaxFWLError.h"
-
-#include "GeneratedSaxParserParserError.h"
-
-#include <string.h>
-
-//--------------------------------------------------------------------
-ErrorHandler::ErrorHandler() : mError(false)
-{
-}
-
-//--------------------------------------------------------------------
-ErrorHandler::~ErrorHandler()
-{
-}
-
-//--------------------------------------------------------------------
-bool ErrorHandler::handleError( const COLLADASaxFWL::IError* error )
-{
-	if ( error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXPARSER )
-	{
-		COLLADASaxFWL::SaxParserError* saxParserError = (COLLADASaxFWL::SaxParserError*) error;
-		const GeneratedSaxParser::ParserError& parserError = saxParserError->getError();
-
-		// Workaround to avoid wrong error
-		if ( parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_VALIDATION_MIN_OCCURS_UNMATCHED)
-		{
-			if ( strcmp(parserError.getElement(), "effect") == 0 )
-			{
-				return false;
-			}
-		}
-		if ( parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_VALIDATION_SEQUENCE_PREVIOUS_SIBLING_NOT_PRESENT)
-		{
-			if ( (strcmp(parserError.getElement(), "extra") == 0) 
-				&& (strcmp(parserError.getAdditionalText().c_str(), "sibling: fx_profile_abstract") == 0)) 
-			{
-				return false;
-			}
-		}
-
-		if ( parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_COULD_NOT_OPEN_FILE)
-		{
-			std::cout << "Couldn't open file" << std::endl;
-			mError = true;
-		}
-
-		std::cout << "Schema validation error: " << parserError.getErrorMessage() << std::endl;
-		mError = true;
-	}
-	else if ( error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXFWL )
-	{
-		COLLADASaxFWL::SaxFWLError* saxFWLError = (COLLADASaxFWL::SaxFWLError*) error;
-		std::cout << "Sax FWL Error: " << saxFWLError->getErrorMessage() << std::endl;
-		mError = true;
-	}
-	return false;
-}
+/*
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Nathan Letwory.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/collada/ErrorHandler.cpp
+ *  \ingroup collada
+ */
+#include "ErrorHandler.h"
+#include <iostream>
+
+#include "COLLADASaxFWLIError.h"
+#include "COLLADASaxFWLSaxParserError.h"
+#include "COLLADASaxFWLSaxFWLError.h"
+
+#include "GeneratedSaxParserParserError.h"
+
+#include <string.h>
+
+//--------------------------------------------------------------------
+ErrorHandler::ErrorHandler() : mError(false)
+{
+}
+
+//--------------------------------------------------------------------
+ErrorHandler::~ErrorHandler()
+{
+}
+
+//--------------------------------------------------------------------
+bool ErrorHandler::handleError( const COLLADASaxFWL::IError* error )
+{
+	if ( error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXPARSER )
+	{
+		COLLADASaxFWL::SaxParserError* saxParserError = (COLLADASaxFWL::SaxParserError*) error;
+		const GeneratedSaxParser::ParserError& parserError = saxParserError->getError();
+
+		// Workaround to avoid wrong error
+		if ( parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_VALIDATION_MIN_OCCURS_UNMATCHED)
+		{
+			if ( strcmp(parserError.getElement(), "effect") == 0 )
+			{
+				return false;
+			}
+		}
+		if ( parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_VALIDATION_SEQUENCE_PREVIOUS_SIBLING_NOT_PRESENT)
+		{
+			if ( (strcmp(parserError.getElement(), "extra") == 0) 
+				&& (strcmp(parserError.getAdditionalText().c_str(), "sibling: fx_profile_abstract") == 0)) 
+			{
+				return false;
+			}
+		}
+
+		if ( parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_COULD_NOT_OPEN_FILE)
+		{
+			std::cout << "Couldn't open file" << std::endl;
+			mError = true;
+		}
+
+		std::cout << "Schema validation error: " << parserError.getErrorMessage() << std::endl;
+		mError = true;
+	}
+	else if ( error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXFWL )
+	{
+		COLLADASaxFWL::SaxFWLError* saxFWLError = (COLLADASaxFWL::SaxFWLError*) error;
+		std::cout << "Sax FWL Error: " << saxFWLError->getErrorMessage() << std::endl;
+		mError = true;
+	}
+	return false;
+}


Property changes on: trunk/blender/source/blender/collada/ErrorHandler.cpp
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: trunk/blender/source/blender/collada/ErrorHandler.h
===================================================================
--- trunk/blender/source/blender/collada/ErrorHandler.h	2011-09-05 20:41:58 UTC (rev 39939)
+++ trunk/blender/source/blender/collada/ErrorHandler.h	2011-09-05 20:43:45 UTC (rev 39940)
@@ -1,58 +1,58 @@
-/*
- * $Id$
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor(s): Nathan Letwory.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/collada/ErrorHandler.h
- *  \ingroup collada
- */
-
-#include <string>
-#include <map>
-#include <vector>
-#include <algorithm> // sort()
-
-#include "COLLADASaxFWLIErrorHandler.h"
-
-/** \brief Handler class for parser errors
- */
-class ErrorHandler : public COLLADASaxFWL::IErrorHandler
-{
-public:
-	/** Constructor. */
-	ErrorHandler();
-
-	/** Destructor. */
-	virtual ~ErrorHandler();
-	/** handle any error thrown by the parser. */
-	bool virtual handleError(const COLLADASaxFWL::IError* error);
-	/** True if there was an error during parsing. */
-	bool hasError() { return mError; }
-private:
-	/** Disable default copy ctor. */
-	ErrorHandler( const ErrorHandler& pre );
-	/** Disable default assignment operator. */
-	const ErrorHandler& operator= ( const ErrorHandler& pre );
-	/** Hold error status. */
-	bool mError;
-};
-
+/*
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Nathan Letwory.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/collada/ErrorHandler.h
+ *  \ingroup collada
+ */
+
+#include <string>
+#include <map>
+#include <vector>
+#include <algorithm> // sort()
+
+#include "COLLADASaxFWLIErrorHandler.h"
+
+/** \brief Handler class for parser errors
+ */
+class ErrorHandler : public COLLADASaxFWL::IErrorHandler
+{
+public:
+	/** Constructor. */
+	ErrorHandler();
+
+	/** Destructor. */
+	virtual ~ErrorHandler();
+	/** handle any error thrown by the parser. */
+	bool virtual handleError(const COLLADASaxFWL::IError* error);
+	/** True if there was an error during parsing. */
+	bool hasError() { return mError; }
+private:
+	/** Disable default copy ctor. */
+	ErrorHandler( const ErrorHandler& pre );
+	/** Disable default assignment operator. */
+	const ErrorHandler& operator= ( const ErrorHandler& pre );
+	/** Hold error status. */
+	bool mError;
+};
+


Property changes on: trunk/blender/source/blender/collada/ErrorHandler.h
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native