Merge branch 'master' into remove-is_utc

21 files changed, 2203 insertions, 1987 deletions

diff --git a/src/java/jlibical_consts_cxx.h b/src/java/jlibical_consts_cxx.h
index 2cdf1f8b..1fdc4346 100644
--- a/src/java/jlibical_consts_cxx.h
+++ b/src/java/jlibical_consts_cxx.h
@@ -1,17 +1,27 @@
-
 /*======================================================================
  FILE: jlibical_consts_cxx/h
  CREATOR: Srinivasa Boppana/George Norman
+
  (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
 
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
+======================================================================*/
 #ifndef JLIBICAL_CONSTS_CXX_H
 #define JLIBICAL_CONSTS_CXX_H
 
 /*
  * Error code constants.
  */
-#define JLIBICAL_OK                         0	/* good return code */
+#define JLIBICAL_OK                         0   /* good return code */
 
 /* system/API errors */
 #define JLIBICAL_ERR_NETWORK                100 /* general network error */
@@ -24,12 +34,12 @@
 /* Java classes */
 #define JLIBICAL_CLASS_ICALVALUE                "net/cp/jlibical/ICalValue"
 #define JLIBICAL_CLASS_VCOMPONENT               "net/cp/jlibical/VComponent"
-#define JLIBICAL_CLASS_VALARM			"net/cp/jlibical/VAlarm"
-#define JLIBICAL_CLASS_VCALENDAR		"net/cp/jlibical/VCalendar"
+#define JLIBICAL_CLASS_VALARM                   "net/cp/jlibical/VAlarm"
+#define JLIBICAL_CLASS_VCALENDAR                "net/cp/jlibical/VCalendar"
 #define JLIBICAL_CLASS_VAGENDA                  "net/cp/jlibical/VAgenda"
-#define JLIBICAL_CLASS_VEVENT			"net/cp/jlibical/VEvent"
-#define JLIBICAL_CLASS_VQUERY			"net/cp/jlibical/VQuery"
-#define JLIBICAL_CLASS_VTODO			"net/cp/jlibical/VToDo"
+#define JLIBICAL_CLASS_VEVENT                   "net/cp/jlibical/VEvent"
+#define JLIBICAL_CLASS_VQUERY                   "net/cp/jlibical/VQuery"
+#define JLIBICAL_CLASS_VTODO                    "net/cp/jlibical/VToDo"
 #define JLIBICAL_CLASS_ICALPARAMETER            "net/cp/jlibical/ICalParameter"
 #define JLIBICAL_CLASS_ICALPROPERTY             "net/cp/jlibical/ICalProperty"
 
@@ -37,6 +47,6 @@
 #define JLIBICAL_CLASS_ICALTIMETYPE             "net/cp/jlibical/ICalTimeType"
 #define JLIBICAL_CLASS_ICALTRIGGERTYPE          "net/cp/jlibical/ICalTriggerType"
 #define JLIBICAL_CLASS_ICALRECURRENCETYPE       "net/cp/jlibical/ICalRecurrenceType"
-#define JLIBICAL_CLASS_ICALPERIODTYPE      		"net/cp/jlibical/ICalPeriodType"
+#define JLIBICAL_CLASS_ICALPERIODTYPE                   "net/cp/jlibical/ICalPeriodType"
 
 #endif /* JLIBICAL_CONSTS_CXX_H */
diff --git a/src/java/jlibical_utils_cxx.cpp b/src/java/jlibical_utils_cxx.cpp
index d04eefd8..38f23726 100644
--- a/src/java/jlibical_utils_cxx.cpp
+++ b/src/java/jlibical_utils_cxx.cpp
@@ -1,8 +1,19 @@
-/*
 /*======================================================================
  FILE: jlibical_utils_cxx.cpp
  CREATOR: Srinivasa Boppana/George Norman
+
  (C) COPYRIGHT 2002, Critical Path
+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
 ======================================================================*/
 
 #ifndef JLIBICAL_UTILS_CXX_H
@@ -54,26 +65,26 @@
 //-------------------------------------------------------
 void* getCObjectPtr(JNIEnv *env, jobject surrogate)
 {
-	void* result = 0;
+        void* result = 0;
     jclass jcls = env->GetObjectClass(surrogate);
     jfieldID fid = env->GetFieldID(jcls,"m_Obj","J");
 
     if (fid == NULL)
     {
-		// this should never happen.
+                // this should never happen.
         throwException( env, JLIBICAL_ERR_CLIENT_INTERNAL );
         return(NULL);
     }
 
-	result = (void*)env->GetLongField(surrogate,fid);
+        result = (void*)env->GetLongField(surrogate,fid);
     if (result == NULL)
-	{
-		// the proxy object (java) has no subject (c++ object)
+        {
+                // the proxy object (java) has no subject (c++ object)
         throwException( env, JLIBICAL_ERR_CLIENT_INTERNAL );
         return(NULL);
-	}
+        }
 
-	return(result);
+        return(result);
 }
 
 //-------------------------------------------------------
@@ -91,7 +102,7 @@ void setCObjectPtr(JNIEnv *env, jobject surrogate, void* subject)
         return;
     }
 
-	env->SetLongField(surrogate,fid,(long)subject);
+        env->SetLongField(surrogate,fid,(long)subject);
 }
 
 //-------------------------------------------------------
@@ -100,14 +111,14 @@ void setCObjectPtr(JNIEnv *env, jobject surrogate, void* subject)
 //-------------------------------------------------------
 VComponent* getSubjectAsVComponent(JNIEnv *env, jobject surrogateComponent, int exceptionType)
 {
-	VComponent* result = (VComponent*)(getCObjectPtr(env,surrogateComponent));
+        VComponent* result = (VComponent*)(getCObjectPtr(env,surrogateComponent));
 
-	if (result == NULL)
-	{
+        if (result == NULL)
+        {
         throwException(env, exceptionType );
-	}
+        }
 
-	return(result);
+        return(result);
 }
 
 //-------------------------------------------------------
@@ -116,14 +127,14 @@ VComponent* getSubjectAsVComponent(JNIEnv *env, jobject surrogateComponent, int
 //-------------------------------------------------------
 ICalProperty* getSubjectAsICalProperty(JNIEnv *env, jobject surrogateProperty, int exceptionType)
 {
-	ICalProperty* result = (ICalProperty*)(getCObjectPtr(env,surrogateProperty));
+        ICalProperty* result = (ICalProperty*)(getCObjectPtr(env,surrogateProperty));
 
-	if (result == NULL)
-	{
+        if (result == NULL)
+        {
         throwException(env, exceptionType );
-	}
+        }
 
-	return(result);
+        return(result);
 }
 
 //-------------------------------------------------------
@@ -132,14 +143,14 @@ ICalProperty* getSubjectAsICalProperty(JNIEnv *env, jobject surrogateProperty, i
 //-------------------------------------------------------
 ICalValue* getSubjectAsICalValue(JNIEnv *env, jobject surrogateValue, int exceptionType)
 {
-	ICalValue* result = (ICalValue*)(getCObjectPtr(env,surrogateValue));
+        ICalValue* result = (ICalValue*)(getCObjectPtr(env,surrogateValue));
 
-	if (result == NULL)
-	{
+        if (result == NULL)
+        {
         throwException( env, exceptionType );
-	}
+        }
 
-	return(result);
+        return(result);
 }
 
 //-------------------------------------------------------
@@ -148,134 +159,134 @@ ICalValue* getSubjectAsICalValue(JNIEnv *env, jobject surrogateValue, int except
 //-------------------------------------------------------
 ICalParameter* getSubjectAsICalParameter(JNIEnv *env, jobject surrogateParameter, int exceptionType)
 {
-	ICalParameter* result = (ICalParameter*)(getCObjectPtr(env,surrogateParameter));
+        ICalParameter* result = (ICalParameter*)(getCObjectPtr(env,surrogateParameter));
 
-	if (result == NULL)
-	{
+        if (result == NULL)
+        {
         throwException( env, exceptionType );
-	}
+        }
 
-	return(result);
+        return(result);
 }
 
 //-------------------------------------------------------
 // Copy the data from the src (a java ICalTimeType object)
 // to the dest (a c struct icaltimetype*).
 // Returns true if success.  False if exception is thrown:
-//	- the src java object is not an ICalTimeType type
-//	- the dest c struct is null.
+//      - the src java object is not an ICalTimeType type
+//      - the dest c struct is null.
 //-------------------------------------------------------
 bool copyObjToicaltimetype(JNIEnv *env, jobject src, icaltimetype* dest)
 {
-	bool result = false;
-
-	if (dest != NULL && env->IsInstanceOf(src,env->FindClass(JLIBICAL_CLASS_ICALTIMETYPE)))
-	{
-		jni_GetAll_from_ICalTimeType(dest, env, src);
-		result = true;
-	}
-	else
-	{
+        bool result = false;
+
+        if (dest != NULL && env->IsInstanceOf(src,env->FindClass(JLIBICAL_CLASS_ICALTIMETYPE)))
+        {
+                jni_GetAll_from_ICalTimeType(dest, env, src);
+                result = true;
+        }
+        else
+        {
         throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
-	}
+        }
 
-	return(result);
+        return(result);
 }
 
 //-------------------------------------------------------
 // Copy the data from the src (a java ICalTriggerType object)
 // to the dest (a c struct icaltriggertype*).
 // Returns true if success.  False if exception is thrown:
-//	- the src java object is not an ICalTriggerType type
-//	- the dest c struct is null.
+//      - the src java object is not an ICalTriggerType type
+//      - the dest c struct is null.
 //-------------------------------------------------------
 bool copyObjToicaltriggertype(JNIEnv *env, jobject src, icaltriggertype* dest)
 {
-	bool result = false;
-
-	if (dest != NULL && env->IsInstanceOf(src,env->FindClass(JLIBICAL_CLASS_ICALTRIGGERTYPE)))
-	{
-		jni_GetAll_from_ICalTriggerType(dest, env, src);
-		result = true;
-	}
-	else
-	{
+        bool result = false;
+
+        if (dest != NULL && env->IsInstanceOf(src,env->FindClass(JLIBICAL_CLASS_ICALTRIGGERTYPE)))
+        {
+                jni_GetAll_from_ICalTriggerType(dest, env, src);
+                result = true;
+        }
+        else
+        {
         throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
-	}
+        }
 
-	return(result);
+        return(result);
 }
 
 //-------------------------------------------------------
 // Copy the data from the src (a java ICalDurationType object)
 // to the dest (a c struct icaldurationtype*).
 // Returns true if success.  False if exception is thrown:
-//	- the src java object is not an ICalDurationType type
-//	- the dest c struct is null.
+//      - the src java object is not an ICalDurationType type
+//      - the dest c struct is null.
 //-------------------------------------------------------
 bool copyObjToicaldurationtype(JNIEnv *env, jobject src, icaldurationtype* dest)
 {
-	bool result = false;
-
-	if (dest != NULL && env->IsInstanceOf(src,env->FindClass(JLIBICAL_CLASS_ICALDURATIONTYPE)))
-	{
-		jni_GetAll_from_ICalDurationType(dest, env, src);
-		result = true;
-	}
-	else
-	{
+        bool result = false;
+
+        if (dest != NULL && env->IsInstanceOf(src,env->FindClass(JLIBICAL_CLASS_ICALDURATIONTYPE)))
+        {
+                jni_GetAll_from_ICalDurationType(dest, env, src);
+                result = true;
+        }
+        else
+        {
         throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
-	}
+        }
 
-	return(result);
+        return(result);
 }
 
 //-------------------------------------------------------
 // Copy the data from the src (a java ICalRecurrenceType object)
 // to the dest (a c struct icalrecurrencetype*).
 // Returns true if success.  False if exception is thrown:
-//	- the src java object is not an ICalRecurrenceType type
-//	- the dest c struct is null.
+//      - the src java object is not an ICalRecurrenceType type
+//      - the dest c struct is null.
 //-------------------------------------------------------
 bool copyObjToicalrecurrencetype(JNIEnv *env, jobject src, icalrecurrencetype* dest)
 {
-	bool result = false;
-
-	if (dest != NULL && env->IsInstanceOf(src,env->FindClass(JLIBICAL_CLASS_ICALRECURRENCETYPE)))
-	{
-		jni_GetAll_from_ICalRecurrenceType(dest, env, src);
-		result = true;
-	}
-	else
-	{
+        bool result = false;
+
+        if (dest != NULL && env->IsInstanceOf(src,env->FindClass(JLIBICAL_CLASS_ICALRECURRENCETYPE)))
+        {
+                jni_GetAll_from_ICalRecurrenceType(dest, env, src);
+                result = true;
+        }
+        else
+        {
         throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
-	}
+        }
 
-	return(result);
+        return(result);
 }
 
 //-------------------------------------------------------
 // Copy the data from the src (a java ICalPeriodType object)
 // to the dest (a c struct icalperiodtype*).
 // Returns true if success.  False if exception is thrown:
-//	- the src java object is not an ICalPeriodType type
-//	- the dest c struct is null.
+//      - the src java object is not an ICalPeriodType type
+//      - the dest c struct is null.
 //-------------------------------------------------------
 bool copyObjToicalperiodtype(JNIEnv *env, jobject src, icalperiodtype* dest)
 {
-	bool result = false;
-
-	if (dest != NULL && env->IsInstanceOf(src,env->FindClass(JLIBICAL_CLASS_ICALPERIODTYPE)))
-	{
-		jni_GetAll_from_ICalPeriodType(dest, env, src);
-		result = true;
-	}
-	else
-	{
+        bool result = false;
+
+        if (dest != NULL && env->IsInstanceOf(src,env->FindClass(JLIBICAL_CLASS_ICALPERIODTYPE)))
+        {
+                jni_GetAll_from_ICalPeriodType(dest, env, src);
+                result = true;
+        }
+        else
+        {
         throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
-	}
+        }
 
-	return(result);
+        return(result);
 }
 
 //-------------------------------------------------------
@@ -285,21 +296,21 @@ bool copyObjToicalperiodtype(JNIEnv *env, jobject src, icalperiodtype* dest)
 //-------------------------------------------------------
 jobject createNewVComponentSurrogate(JNIEnv *env, VComponent* subject)
 {
-	char* classname = JLIBICAL_CLASS_VCOMPONENT;
-	if (dynamic_cast<VAlarm*>(subject))
-		classname = JLIBICAL_CLASS_VALARM;
-	else if (dynamic_cast<VCalendar*>(subject))
-		classname = JLIBICAL_CLASS_VCALENDAR;
-	else if (dynamic_cast<VEvent*>(subject))
-		classname = JLIBICAL_CLASS_VEVENT;
-	else if (dynamic_cast<VQuery*>(subject))
-		classname = JLIBICAL_CLASS_VQUERY;
-	else if (dynamic_cast<VToDo*>(subject))
-		classname = JLIBICAL_CLASS_VTODO;
+        char* classname = JLIBICAL_CLASS_VCOMPONENT;
+        if (dynamic_cast<VAlarm*>(subject))
+                classname = JLIBICAL_CLASS_VALARM;
+        else if (dynamic_cast<VCalendar*>(subject))
+                classname = JLIBICAL_CLASS_VCALENDAR;
+        else if (dynamic_cast<VEvent*>(subject))
+                classname = JLIBICAL_CLASS_VEVENT;
+        else if (dynamic_cast<VQuery*>(subject))
+                classname = JLIBICAL_CLASS_VQUERY;
+        else if (dynamic_cast<VToDo*>(subject))
+                classname = JLIBICAL_CLASS_VTODO;
         else if (dynamic_cast<VAgenda*>(subject))
                 classname = JLIBICAL_CLASS_VAGENDA;
 
-	return(doCreateNewSurrogate(env,env->FindClass(classname),(jlong)subject));
+        return(doCreateNewSurrogate(env,env->FindClass(classname),(jlong)subject));
 }
 
 //-------------------------------------------------------
@@ -309,7 +320,7 @@ jobject createNewVComponentSurrogate(JNIEnv *env, VComponent* subject)
 //-------------------------------------------------------
 jobject createNewICalPropertySurrogate(JNIEnv *env, ICalProperty* subject)
 {
-	return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALPROPERTY),(jlong)subject));
+        return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALPROPERTY),(jlong)subject));
 }
 
 //-------------------------------------------------------
@@ -319,7 +330,7 @@ jobject createNewICalPropertySurrogate(JNIEnv *env, ICalProperty* subject)
 //-------------------------------------------------------
 jobject createNewICalValueSurrogate(JNIEnv *env, ICalValue* subject)
 {
-	return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALVALUE),(jlong)subject));
+        return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALVALUE),(jlong)subject));
 }
 
 //-------------------------------------------------------
@@ -329,7 +340,7 @@ jobject createNewICalValueSurrogate(JNIEnv *env, ICalValue* subject)
 //-------------------------------------------------------
 jobject createNewICalParameterSurrogate(JNIEnv *env, ICalParameter* subject)
 {
-	return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALPARAMETER),(jlong)subject));
+        return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALPARAMETER),(jlong)subject));
 }
 
 //-------------------------------------------------------
@@ -340,7 +351,7 @@ jobject createNewICalParameterSurrogate(JNIEnv *env, ICalParameter* subject)
 //-------------------------------------------------------
 jobject createNewICalTimeType(JNIEnv *env, icaltimetype* source)
 {
-	return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALTIMETYPE),(jlong)source));
+        return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALTIMETYPE),(jlong)source));
 }
 
 //-------------------------------------------------------
@@ -351,7 +362,7 @@ jobject createNewICalTimeType(JNIEnv *env, icaltimetype* source)
 //-------------------------------------------------------
 jobject createNewICalTriggerType(JNIEnv *env, icaltriggertype* source)
 {
-	return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALTRIGGERTYPE),(jlong)source));
+        return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALTRIGGERTYPE),(jlong)source));
 }
 
 //-------------------------------------------------------
@@ -362,7 +373,7 @@ jobject createNewICalTriggerType(JNIEnv *env, icaltriggertype* source)
 //-------------------------------------------------------
 jobject createNewICalDurationType(JNIEnv *env, icaldurationtype* source)
 {
-	return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALDURATIONTYPE),(jlong)source));
+        return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALDURATIONTYPE),(jlong)source));
 }
 
 //-------------------------------------------------------
@@ -373,7 +384,7 @@ jobject createNewICalDurationType(JNIEnv *env, icaldurationtype* source)
 //-------------------------------------------------------
 jobject createNewICalRecurrenceType(JNIEnv *env, icalrecurrencetype* source)
 {
-	return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALRECURRENCETYPE),(jlong)source));
+        return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALRECURRENCETYPE),(jlong)source));
 }
 
 //-------------------------------------------------------
@@ -384,7 +395,7 @@ jobject createNewICalRecurrenceType(JNIEnv *env, icalrecurrencetype* source)
 //-------------------------------------------------------
 jobject createNewICalPeriodType(JNIEnv *env, icalperiodtype* source)
 {
-	return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALPERIODTYPE),(jlong)source));
+        return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALPERIODTYPE),(jlong)source));
 }
 
 //-------------------------------------------------------
@@ -392,66 +403,66 @@ jobject createNewICalPeriodType(JNIEnv *env, icalperiodtype* source)
 //-------------------------------------------------------
 jobject doCreateNewSurrogate(JNIEnv *env, jclass surrogateClass, jlong subject)
 {
-	jobject result = NULL;
+        jobject result = NULL;
 
-	if (subject != NULL)
-	{
-		jmethodID jconstructorID = env->GetMethodID(surrogateClass, "<init>", "(J)V");
+        if (subject != NULL)
+        {
+                jmethodID jconstructorID = env->GetMethodID(surrogateClass, "<init>", "(J)V");
 
-		result = env->NewObject(surrogateClass, jconstructorID, subject);
-	}
+                result = env->NewObject(surrogateClass, jconstructorID, subject);
+        }
 
-	return(result);
+        return(result);
 }
 
 
 //-------------------------------------------------------
 // For the given cpErr, create a new Exception and send it to env.
 // Note: Throw does not throw anything.  It only sets the state.
-//		The JVM will check this and throw an exception later.
+//              The JVM will check this and throw an exception later.
 //-------------------------------------------------------
 void throwException(JNIEnv *env, int cpErr)
 {
-	jclass jexceptionClass;
-	jthrowable jexceptionObj;
-	jmethodID jconstructorID;
-	const char* exClassName;
+        jclass jexceptionClass;
+        jthrowable jexceptionObj;
+        jmethodID jconstructorID;
+        const char* exClassName;
 
-	if (env->ExceptionOccurred())
-	{
-		return;
-	}
+        if (env->ExceptionOccurred())
+        {
+                return;
+        }
 
     switch ( cpErr )
     {
     case JLIBICAL_ERR_NETWORK:
             exClassName = "net.cp.jlibical/JLCNetworkException";
-	    break;
+            break;
 
     case JLIBICAL_ERR_SERVER_INTERNAL:
             exClassName = "net.cp.jlibical/JLCServerInternalException";
-	    break;
+            break;
 
     case JLIBICAL_ERR_CLIENT_INTERNAL:
             exClassName = "net.cp.jlibical/JLCClientInternalException";
-	    break;
+            break;
 
     case JLIBICAL_ERR_ILLEGAL_ARGUMENT:
             exClassName = "net.cp.jlibical/JLCIllegalArgumentException";
-	    break;
+            break;
 
     case JLIBICAL_ERR_API_NOT_INITED:
             exClassName = "net.cp.jlibical/JLCNotInitedException";
-	    break;
+            break;
 
     case JLIBICAL_ERR_HOST_INVALID:
             exClassName = "net.cp.jlibical/JLCHostInvalidException";
-	    break;
+            break;
 
     default:
             exClassName = "net.cp.jlibical/JLCClientInternalException";
-	    printf("*** JLIBICAL JNI throwException: unknown error code: %d\n", cpErr );
-	    break;
+            printf("*** JLIBICAL JNI throwException: unknown error code: %d\n", cpErr );
+            break;
     }
 
     env->ThrowNew(env->FindClass(exClassName),"");
diff --git a/src/java/jlibical_utils_cxx.h b/src/java/jlibical_utils_cxx.h
index a6cdbc56..f8ea5316 100644
--- a/src/java/jlibical_utils_cxx.h
+++ b/src/java/jlibical_utils_cxx.h
@@ -1,8 +1,19 @@
-
 /*======================================================================
  FILE: jlibical_utils_cxx.h
  CREATOR: Srinivasa Boppana/George Norman
+
  (C) COPYRIGHT 2002, Critical Path
+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
 ======================================================================*/
 
 #ifndef TEST_CXX_H
diff --git a/src/java/jniICalDurationType_cxx.cpp b/src/java/jniICalDurationType_cxx.cpp
index e1e0204c..3037db8a 100644
--- a/src/java/jniICalDurationType_cxx.cpp
+++ b/src/java/jniICalDurationType_cxx.cpp
@@ -1,8 +1,18 @@
-/* -*- Mode: C -*- */
 /*======================================================================
  FILE: jniICalDurationType_cxx.cpp
  CREATOR: structConverter
  (C) COPYRIGHT 2002, Critical Path
+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
 ======================================================================*/
 
 #include <jni.h>
@@ -19,94 +29,94 @@ static jfieldID ICalDurationType_Seconds_FID;
 
 void initICalDurationTypeFieldIDs(JNIEnv* env, jclass clazz)
 {
-	ICalDurationType_Is_neg_FID = env->GetFieldID(clazz, "is_neg", "I");
-	ICalDurationType_Days_FID = env->GetFieldID(clazz, "days", "J");
-	ICalDurationType_Weeks_FID = env->GetFieldID(clazz, "weeks", "J");
-	ICalDurationType_Hours_FID = env->GetFieldID(clazz, "hours", "J");
-	ICalDurationType_Minutes_FID = env->GetFieldID(clazz, "minutes", "J");
-	ICalDurationType_Seconds_FID = env->GetFieldID(clazz, "seconds", "J");
+    ICalDurationType_Is_neg_FID = env->GetFieldID(clazz, "is_neg", "I");
+    ICalDurationType_Days_FID = env->GetFieldID(clazz, "days", "J");
+    ICalDurationType_Weeks_FID = env->GetFieldID(clazz, "weeks", "J");
+    ICalDurationType_Hours_FID = env->GetFieldID(clazz, "hours", "J");
+    ICalDurationType_Minutes_FID = env->GetFieldID(clazz, "minutes", "J");
+    ICalDurationType_Seconds_FID = env->GetFieldID(clazz, "seconds", "J");
 }
 
 void  jni_SetIs_neg_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
 {
-	env->SetIntField(thisICalDurationType, ICalDurationType_Is_neg_FID, (jint) __ICalDurationType_->is_neg);
+    env->SetIntField(thisICalDurationType, ICalDurationType_Is_neg_FID, (jint) __ICalDurationType_->is_neg);
 }
 
 void jni_GetIs_neg_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
 {
-	__ICalDurationType_->is_neg = env->GetIntField(thisICalDurationType, ICalDurationType_Is_neg_FID);
+    __ICalDurationType_->is_neg = env->GetIntField(thisICalDurationType, ICalDurationType_Is_neg_FID);
 }
 
 void  jni_SetDays_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
 {
-	env->SetLongField(thisICalDurationType, ICalDurationType_Days_FID, (jlong) __ICalDurationType_->days);
+    env->SetLongField(thisICalDurationType, ICalDurationType_Days_FID, (jlong) __ICalDurationType_->days);
 }
 
 void jni_GetDays_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
 {
-	__ICalDurationType_->days = env->GetLongField(thisICalDurationType, ICalDurationType_Days_FID);
+    __ICalDurationType_->days = env->GetLongField(thisICalDurationType, ICalDurationType_Days_FID);
 }
 
 void  jni_SetWeeks_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
 {
-	env->SetLongField(thisICalDurationType, ICalDurationType_Weeks_FID, (jlong) __ICalDurationType_->weeks);
+    env->SetLongField(thisICalDurationType, ICalDurationType_Weeks_FID, (jlong) __ICalDurationType_->weeks);
 }
 
 void jni_GetWeeks_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
 {
-	__ICalDurationType_->weeks = env->GetLongField(thisICalDurationType, ICalDurationType_Weeks_FID);
+    __ICalDurationType_->weeks = env->GetLongField(thisICalDurationType, ICalDurationType_Weeks_FID);
 }
 
 void  jni_SetHours_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
 {
-	env->SetLongField(thisICalDurationType, ICalDurationType_Hours_FID, (jlong) __ICalDurationType_->hours);
+    env->SetLongField(thisICalDurationType, ICalDurationType_Hours_FID, (jlong) __ICalDurationType_->hours);
 }
 
 void jni_GetHours_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
 {
-	__ICalDurationType_->hours = env->GetLongField(thisICalDurationType, ICalDurationType_Hours_FID);
+    __ICalDurationType_->hours = env->GetLongField(thisICalDurationType, ICalDurationType_Hours_FID);
 }
 
 void  jni_SetMinutes_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
 {
-	env->SetLongField(thisICalDurationType, ICalDurationType_Minutes_FID, (jlong) __ICalDurationType_->minutes);
+    env->SetLongField(thisICalDurationType, ICalDurationType_Minutes_FID, (jlong) __ICalDurationType_->minutes);
 }
 
 void jni_GetMinutes_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
 {
-	__ICalDurationType_->minutes = env->GetLongField(thisICalDurationType, ICalDurationType_Minutes_FID);
+    __ICalDurationType_->minutes = env->GetLongField(thisICalDurationType, ICalDurationType_Minutes_FID);
 }
 
 void  jni_SetSeconds_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
 {
-	env->SetLongField(thisICalDurationType, ICalDurationType_Seconds_FID, (jlong) __ICalDurationType_->seconds);
+    env->SetLongField(thisICalDurationType, ICalDurationType_Seconds_FID, (jlong) __ICalDurationType_->seconds);
 }
 
 void jni_GetSeconds_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
 {
-	__ICalDurationType_->seconds = env->GetLongField(thisICalDurationType, ICalDurationType_Seconds_FID);
+    __ICalDurationType_->seconds = env->GetLongField(thisICalDurationType, ICalDurationType_Seconds_FID);
 }
 
 // copy all fields from the c struct (ICalDurationType) to the java object (thisICalDurationType).
 void jni_SetAll_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv* env, jobject thisICalDurationType)
 {
-	jni_SetIs_neg_in_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-	jni_SetDays_in_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-	jni_SetWeeks_in_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-	jni_SetHours_in_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-	jni_SetMinutes_in_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-	jni_SetSeconds_in_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
+    jni_SetIs_neg_in_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
+    jni_SetDays_in_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
+    jni_SetWeeks_in_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
+    jni_SetHours_in_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
+    jni_SetMinutes_in_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
+    jni_SetSeconds_in_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
 }
 
 // copy all fields from the java object (thisICalDurationType) to the c struct (__ICalDurationType_).
 void jni_GetAll_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv* env, jobject thisICalDurationType)
 {
-	jni_GetIs_neg_from_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-	jni_GetDays_from_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-	jni_GetWeeks_from_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-	jni_GetHours_from_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-	jni_GetMinutes_from_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-	jni_GetSeconds_from_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
+    jni_GetIs_neg_from_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
+    jni_GetDays_from_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
+    jni_GetWeeks_from_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
+    jni_GetHours_from_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
+    jni_GetMinutes_from_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
+    jni_GetSeconds_from_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
 }
 /*
  * Class:     net_cp_jlibical_ICalDurationType
@@ -116,8 +126,8 @@ void jni_GetAll_from_ICalDurationType(struct ICalDurationType* __ICalDurationTyp
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalDurationType_init__J
   (JNIEnv *env, jobject thisICalDurationType, jlong data)
 {
-	// copy all fields from the c struct (data) to the java object (thisICalDurationType). 
-	jni_SetAll_in_ICalDurationType((ICalDurationType*)data,env,thisICalDurationType);
+    // copy all fields from the c struct (data) to the java object (thisICalDurationType).
+    jni_SetAll_in_ICalDurationType((ICalDurationType*)data,env,thisICalDurationType);
 }
 
 /*
@@ -126,5 +136,5 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalDurationType_init__J
  * Signature: ()V
  */
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalDurationType_initFIDs(JNIEnv *env, jclass clazz) {
-	initICalDurationTypeFieldIDs(env, clazz);
+    initICalDurationTypeFieldIDs(env, clazz);
 }
diff --git a/src/java/jniICalDurationType_cxx.h b/src/java/jniICalDurationType_cxx.h
index 6ef1de1a..bc37e865 100644
--- a/src/java/jniICalDurationType_cxx.h
+++ b/src/java/jniICalDurationType_cxx.h
@@ -1,10 +1,20 @@
-
 /*======================================================================
  FILE: jniICalDurationType_cxx.h
  CREATOR: structConverter
+
  (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
 
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
+======================================================================*/
 #ifndef _jni_ICalDurationType_H
 #define _jni_ICalDurationType_H
 #include <jni.h>
diff --git a/src/java/jniICalPeriodType_cxx.cpp b/src/java/jniICalPeriodType_cxx.cpp
index 0642ac0f..3f4ea10a 100644
--- a/src/java/jniICalPeriodType_cxx.cpp
+++ b/src/java/jniICalPeriodType_cxx.cpp
@@ -1,140 +1,152 @@
-/* -*- Mode: C -*- */

-/*======================================================================

- FILE: jniICalPeriodType_cxx.cpp

- CREATOR: structConverter

-======================================================================*/

-

-#include <jni.h>

-

-#include "jniICalPeriodType_cxx.h"

-#include "jniICalTimeType_cxx.h"

-#include "jniICalDurationType_cxx.h"

-

-static jfieldID ICalPeriodType_Start_FID;

-static jfieldID ICalPeriodType_End_FID;

-static jfieldID ICalPeriodType_Duration_FID;

-

-

-void initICalPeriodTypeFieldIDs(JNIEnv* env, jclass clazz)

-{

-	ICalPeriodType_Start_FID = env->GetFieldID(clazz, "start", "Lnet/cp/jlibical/ICalTimeType;");

-	ICalPeriodType_End_FID = env->GetFieldID(clazz, "end", "Lnet/cp/jlibical/ICalTimeType;");

-	ICalPeriodType_Duration_FID = env->GetFieldID(clazz, "duration", "Lnet/cp/jlibical/ICalDurationType;");

-}

-

-void  jni_SetStart_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType)

-{

-	jobject	lcl_jobj0;

-	lcl_jobj0 = env->GetObjectField(thisICalPeriodType, ICalPeriodType_Start_FID);

-	jni_SetYear_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);

-	jni_SetMonth_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);

-	jni_SetDay_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);

-	jni_SetHour_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);

-	jni_SetMinute_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);

-	jni_SetSecond_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);

-	jni_SetIs_date_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);

-	jni_SetZone_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);

-}

-

-void jni_GetStart_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType)

-{

-	jobject	lcl_jobj0;

-	lcl_jobj0 = env->GetObjectField(thisICalPeriodType, ICalPeriodType_Start_FID);

-	jni_GetYear_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);

-	jni_GetMonth_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);

-	jni_GetDay_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);

-	jni_GetHour_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);

-	jni_GetMinute_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);

-	jni_GetSecond_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);

-	jni_GetIs_date_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);

-	jni_GetZone_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);

-}

-

-void  jni_SetEnd_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType)

-{

-	jobject	lcl_jobj0;

-	lcl_jobj0 = env->GetObjectField(thisICalPeriodType, ICalPeriodType_End_FID);

-	jni_SetYear_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);

-	jni_SetMonth_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);

-	jni_SetDay_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);

-	jni_SetHour_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);

-	jni_SetMinute_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);

-	jni_SetSecond_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);

-	jni_SetIs_date_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);

-	jni_SetZone_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);

-}

-

-void jni_GetEnd_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType)

-{

-	jobject	lcl_jobj0;

-	lcl_jobj0 = env->GetObjectField(thisICalPeriodType, ICalPeriodType_End_FID);

-	jni_GetYear_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);

-	jni_GetMonth_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);

-	jni_GetDay_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);

-	jni_GetHour_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);

-	jni_GetMinute_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);

-	jni_GetSecond_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);

-	jni_GetIs_date_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);

-	jni_GetZone_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);

-}

-

-void  jni_SetDuration_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType)

-{

-	jobject	lcl_jobj0;

-	lcl_jobj0 = env->GetObjectField(thisICalPeriodType, ICalPeriodType_Duration_FID);

-	jni_SetIs_neg_in_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);

-	jni_SetDays_in_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);

-	jni_SetWeeks_in_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);

-	jni_SetHours_in_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);

-	jni_SetMinutes_in_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);

-	jni_SetSeconds_in_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);

-}

-

-void jni_GetDuration_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType)

-{

-	jobject	lcl_jobj0;

-	lcl_jobj0 = env->GetObjectField(thisICalPeriodType, ICalPeriodType_Duration_FID);

-	jni_GetIs_neg_from_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);

-	jni_GetDays_from_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);

-	jni_GetWeeks_from_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);

-	jni_GetHours_from_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);

-	jni_GetMinutes_from_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);

-	jni_GetSeconds_from_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);

-}

-

-// copy all fields from the c struct (__ICalPeriodType_) to the java object (thisICalPeriodType).

-void jni_SetAll_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv* env, jobject thisICalPeriodType)

-{

-	jni_SetStart_in_ICalPeriodType(__ICalPeriodType_, env, thisICalPeriodType);

-	jni_SetEnd_in_ICalPeriodType(__ICalPeriodType_, env, thisICalPeriodType);

-	jni_SetDuration_in_ICalPeriodType(__ICalPeriodType_, env, thisICalPeriodType);

-}

-

-// copy all fields from the java object (thisICalPeriodType) to the c struct (__ICalPeriodType_).

-void jni_GetAll_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv* env, jobject thisICalPeriodType)

-{

-	jni_GetStart_from_ICalPeriodType(__ICalPeriodType_, env, thisICalPeriodType);

-	jni_GetEnd_from_ICalPeriodType(__ICalPeriodType_, env, thisICalPeriodType);

-	jni_GetDuration_from_ICalPeriodType(__ICalPeriodType_, env, thisICalPeriodType);

-}

-

-/*

- * Class:     net_cp_jlibical_ICalPeriodType

- * Method:    init

- * Signature: (J)V

- */

-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalPeriodType_init__J

-  (JNIEnv* env, jobject thisICalPeriodType, jlong data)

-{

-	// copy all fields from the c struct (data) to the java object (thisICalTimeType).

-	jni_SetAll_in_ICalPeriodType((ICalPeriodType*)data,env,thisICalPeriodType);

-}

-

-/*

- * Class:     net_cp_jlibical_ICalPeriodType

- * Method:    initFIDs

- * Signature: ()V

- */

-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalPeriodType_initFIDs(JNIEnv *env, jclass clazz) {

-	initICalPeriodTypeFieldIDs(env, clazz);

-}

+/*======================================================================
+ FILE: jniICalPeriodType_cxx.cpp
+ CREATOR: structConverter
+
+ (C) COPYRIGHT 2001, Eric Busboom <eric@softwarestudio.org>
+ (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>
+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
+======================================================================*/
+#include <jni.h>
+
+#include "jniICalPeriodType_cxx.h"
+#include "jniICalTimeType_cxx.h"
+#include "jniICalDurationType_cxx.h"
+
+static jfieldID ICalPeriodType_Start_FID;
+static jfieldID ICalPeriodType_End_FID;
+static jfieldID ICalPeriodType_Duration_FID;
+
+
+void initICalPeriodTypeFieldIDs(JNIEnv* env, jclass clazz)
+{
+    ICalPeriodType_Start_FID = env->GetFieldID(clazz, "start", "Lnet/cp/jlibical/ICalTimeType;");
+    ICalPeriodType_End_FID = env->GetFieldID(clazz, "end", "Lnet/cp/jlibical/ICalTimeType;");
+    ICalPeriodType_Duration_FID = env->GetFieldID(clazz, "duration", "Lnet/cp/jlibical/ICalDurationType;");
+}
+
+void  jni_SetStart_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType)
+{
+    jobject lcl_jobj0;
+    lcl_jobj0 = env->GetObjectField(thisICalPeriodType, ICalPeriodType_Start_FID);
+    jni_SetYear_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
+    jni_SetMonth_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
+    jni_SetDay_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
+    jni_SetHour_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
+    jni_SetMinute_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
+    jni_SetSecond_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
+    jni_SetIs_date_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
+    jni_SetZone_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
+}
+
+void jni_GetStart_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType)
+{
+    jobject lcl_jobj0;
+    lcl_jobj0 = env->GetObjectField(thisICalPeriodType, ICalPeriodType_Start_FID);
+    jni_GetYear_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
+    jni_GetMonth_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
+    jni_GetDay_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
+    jni_GetHour_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
+    jni_GetMinute_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
+    jni_GetSecond_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
+    jni_GetIs_date_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
+    jni_GetZone_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
+}
+
+void  jni_SetEnd_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType)
+{
+    jobject lcl_jobj0;
+    lcl_jobj0 = env->GetObjectField(thisICalPeriodType, ICalPeriodType_End_FID);
+    jni_SetYear_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
+    jni_SetMonth_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
+    jni_SetDay_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
+    jni_SetHour_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
+    jni_SetMinute_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
+    jni_SetSecond_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
+    jni_SetIs_date_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
+    jni_SetZone_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
+}
+
+void jni_GetEnd_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType)
+{
+    jobject lcl_jobj0;
+    lcl_jobj0 = env->GetObjectField(thisICalPeriodType, ICalPeriodType_End_FID);
+    jni_GetYear_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
+    jni_GetMonth_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
+    jni_GetDay_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
+    jni_GetHour_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
+    jni_GetMinute_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
+    jni_GetSecond_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
+    jni_GetIs_date_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
+    jni_GetZone_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
+}
+
+void  jni_SetDuration_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType)
+{
+    jobject lcl_jobj0;
+    lcl_jobj0 = env->GetObjectField(thisICalPeriodType, ICalPeriodType_Duration_FID);
+    jni_SetIs_neg_in_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
+    jni_SetDays_in_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
+    jni_SetWeeks_in_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
+    jni_SetHours_in_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
+    jni_SetMinutes_in_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
+    jni_SetSeconds_in_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
+}
+
+void jni_GetDuration_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType)
+{
+    jobject lcl_jobj0;
+    lcl_jobj0 = env->GetObjectField(thisICalPeriodType, ICalPeriodType_Duration_FID);
+    jni_GetIs_neg_from_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
+    jni_GetDays_from_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
+    jni_GetWeeks_from_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
+    jni_GetHours_from_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
+    jni_GetMinutes_from_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
+    jni_GetSeconds_from_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
+}
+
+// copy all fields from the c struct (__ICalPeriodType_) to the java object (thisICalPeriodType).
+void jni_SetAll_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv* env, jobject thisICalPeriodType)
+{
+    jni_SetStart_in_ICalPeriodType(__ICalPeriodType_, env, thisICalPeriodType);
+    jni_SetEnd_in_ICalPeriodType(__ICalPeriodType_, env, thisICalPeriodType);
+    jni_SetDuration_in_ICalPeriodType(__ICalPeriodType_, env, thisICalPeriodType);
+}
+
+// copy all fields from the java object (thisICalPeriodType) to the c struct (__ICalPeriodType_).
+void jni_GetAll_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv* env, jobject thisICalPeriodType)
+{
+    jni_GetStart_from_ICalPeriodType(__ICalPeriodType_, env, thisICalPeriodType);
+    jni_GetEnd_from_ICalPeriodType(__ICalPeriodType_, env, thisICalPeriodType);
+    jni_GetDuration_from_ICalPeriodType(__ICalPeriodType_, env, thisICalPeriodType);
+}
+
+/*
+ * Class:     net_cp_jlibical_ICalPeriodType
+ * Method:    init
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalPeriodType_init__J
+  (JNIEnv* env, jobject thisICalPeriodType, jlong data)
+{
+    // copy all fields from the c struct (data) to the java object (thisICalTimeType).
+    jni_SetAll_in_ICalPeriodType((ICalPeriodType*)data,env,thisICalPeriodType);
+}
+
+/*
+ * Class:     net_cp_jlibical_ICalPeriodType
+ * Method:    initFIDs
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalPeriodType_initFIDs(JNIEnv *env, jclass clazz) {
+    initICalPeriodTypeFieldIDs(env, clazz);
+}
diff --git a/src/java/jniICalPeriodType_cxx.h b/src/java/jniICalPeriodType_cxx.h
index f3635c84..ac98d3d9 100644
--- a/src/java/jniICalPeriodType_cxx.h
+++ b/src/java/jniICalPeriodType_cxx.h
@@ -1,42 +1,52 @@
-

-/*======================================================================

- FILE: jniICalPeriodType_cxx.h

- CREATOR: structConverter

- (C) COPYRIGHT 2002, Critical Path

-======================================================================*/

-

-#ifndef _jni_ICalPeriodType_H

-#define _jni_ICalPeriodType_H

-#include <jni.h>

-

-// I forgot how to do this using a typedef in c++!!!!

-#define ICalPeriodType icalperiodtype

-

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#include "ical.h"

-

-static void initICalPeriodTypeFieldIDs(JNIEnv* env, jclass clazz);

-

-void  jni_SetStart_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType);

-void jni_GetStart_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType);

-void  jni_SetEnd_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType);

-void jni_GetEnd_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType);

-void  jni_SetDuration_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType);

-void jni_GetDuration_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType);

-

-void jni_SetAll_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv* env, jobject thisICalPeriodType);

-void jni_GetAll_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv* env, jobject thisICalPeriodType);

-

-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalPeriodType_init__J(JNIEnv* env, jobject thisICalPeriodType, jlong data);

-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalPeriodType_initFIDs(JNIEnv *env, jclass clazz);

-

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

+/*======================================================================
+ FILE: jniICalPeriodType_cxx.h
+ CREATOR: structConverter
+
+ (C) COPYRIGHT 2002, Critical Path
+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
+======================================================================*/
+#ifndef _jni_ICalPeriodType_H
+#define _jni_ICalPeriodType_H
+#include <jni.h>
+
+// I forgot how to do this using a typedef in c++!!!!
+#define ICalPeriodType icalperiodtype
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "ical.h"
+
+static void initICalPeriodTypeFieldIDs(JNIEnv* env, jclass clazz);
+
+void  jni_SetStart_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType);
+void jni_GetStart_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType);
+void  jni_SetEnd_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType);
+void jni_GetEnd_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType);
+void  jni_SetDuration_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType);
+void jni_GetDuration_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType);
+
+void jni_SetAll_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv* env, jobject thisICalPeriodType);
+void jni_GetAll_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv* env, jobject thisICalPeriodType);
+
+JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalPeriodType_init__J(JNIEnv* env, jobject thisICalPeriodType, jlong data);
+JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalPeriodType_initFIDs(JNIEnv *env, jclass clazz);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/java/jniICalRecurrenceType_cxx.cpp b/src/java/jniICalRecurrenceType_cxx.cpp
index 5a58c864..9b463301 100644
--- a/src/java/jniICalRecurrenceType_cxx.cpp
+++ b/src/java/jniICalRecurrenceType_cxx.cpp
@@ -1,7 +1,17 @@
-/* -*- Mode: C -*- */
 /*======================================================================
  FILE: jniICalRecurrenceType_cxx.cpp
  CREATOR: structConverter
+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
 ======================================================================*/
 
 #include <jni.h>
@@ -28,318 +38,318 @@ static jfieldID ICalRecurrenceType_By_set_pos_FID;
 
 void initICalRecurrenceTypeFieldIDs(JNIEnv* env, jclass clazz)
 {
-	ICalRecurrenceType_Until_FID = env->GetFieldID(clazz, "until", "Lnet/cp/jlibical/ICalTimeType;");
-	ICalRecurrenceType_Freq_FID = env->GetFieldID(clazz, "freq", "I");
-	ICalRecurrenceType_Week_start_FID = env->GetFieldID(clazz, "week_start", "I");
-	ICalRecurrenceType_Count_FID = env->GetFieldID(clazz, "count", "I");
-	ICalRecurrenceType_Interval_FID = env->GetFieldID(clazz, "interval", "S");
-	ICalRecurrenceType_By_second_FID = env->GetFieldID(clazz, "by_second", "[S");
-	ICalRecurrenceType_By_minute_FID = env->GetFieldID(clazz, "by_minute", "[S");
-	ICalRecurrenceType_By_hour_FID = env->GetFieldID(clazz, "by_hour", "[S");
-	ICalRecurrenceType_By_day_FID = env->GetFieldID(clazz, "by_day", "[S");
-	ICalRecurrenceType_By_month_day_FID = env->GetFieldID(clazz, "by_month_day", "[S");
-	ICalRecurrenceType_By_year_day_FID = env->GetFieldID(clazz, "by_year_day", "[S");
-	ICalRecurrenceType_By_week_no_FID = env->GetFieldID(clazz, "by_week_no", "[S");
-	ICalRecurrenceType_By_month_FID = env->GetFieldID(clazz, "by_month", "[S");
-	ICalRecurrenceType_By_set_pos_FID = env->GetFieldID(clazz, "by_set_pos", "[S");
+    ICalRecurrenceType_Until_FID = env->GetFieldID(clazz, "until", "Lnet/cp/jlibical/ICalTimeType;");
+    ICalRecurrenceType_Freq_FID = env->GetFieldID(clazz, "freq", "I");
+    ICalRecurrenceType_Week_start_FID = env->GetFieldID(clazz, "week_start", "I");
+    ICalRecurrenceType_Count_FID = env->GetFieldID(clazz, "count", "I");
+    ICalRecurrenceType_Interval_FID = env->GetFieldID(clazz, "interval", "S");
+    ICalRecurrenceType_By_second_FID = env->GetFieldID(clazz, "by_second", "[S");
+    ICalRecurrenceType_By_minute_FID = env->GetFieldID(clazz, "by_minute", "[S");
+    ICalRecurrenceType_By_hour_FID = env->GetFieldID(clazz, "by_hour", "[S");
+    ICalRecurrenceType_By_day_FID = env->GetFieldID(clazz, "by_day", "[S");
+    ICalRecurrenceType_By_month_day_FID = env->GetFieldID(clazz, "by_month_day", "[S");
+    ICalRecurrenceType_By_year_day_FID = env->GetFieldID(clazz, "by_year_day", "[S");
+    ICalRecurrenceType_By_week_no_FID = env->GetFieldID(clazz, "by_week_no", "[S");
+    ICalRecurrenceType_By_month_FID = env->GetFieldID(clazz, "by_month", "[S");
+    ICalRecurrenceType_By_set_pos_FID = env->GetFieldID(clazz, "by_set_pos", "[S");
 }
 
 void  jni_SetUntil_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	jobject	lcl_jobj0;
-	lcl_jobj0 = env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_Until_FID);
-	jni_SetYear_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_SetMonth_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_SetDay_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_SetHour_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_SetMinute_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_SetSecond_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_SetIs_date_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_SetZone_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
+    jobject lcl_jobj0;
+    lcl_jobj0 = env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_Until_FID);
+    jni_SetYear_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
+    jni_SetMonth_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
+    jni_SetDay_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
+    jni_SetHour_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
+    jni_SetMinute_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
+    jni_SetSecond_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
+    jni_SetIs_date_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
+    jni_SetZone_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
 }
 
 void jni_GetUntil_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	jobject	lcl_jobj0;
-	lcl_jobj0 = env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_Until_FID);
-	jni_GetYear_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_GetMonth_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_GetDay_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_GetHour_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_GetMinute_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_GetSecond_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_GetIs_date_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_GetZone_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
+    jobject lcl_jobj0;
+    lcl_jobj0 = env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_Until_FID);
+    jni_GetYear_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
+    jni_GetMonth_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
+    jni_GetDay_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
+    jni_GetHour_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
+    jni_GetMinute_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
+    jni_GetSecond_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
+    jni_GetIs_date_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
+    jni_GetZone_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
 }
 
 void  jni_SetFreq_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	env->SetIntField(thisICalRecurrenceType, ICalRecurrenceType_Freq_FID, (jint) __ICalRecurrenceType_->freq);
+    env->SetIntField(thisICalRecurrenceType, ICalRecurrenceType_Freq_FID, (jint) __ICalRecurrenceType_->freq);
 }
 
 void jni_GetFreq_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	__ICalRecurrenceType_->freq = (icalrecurrencetype_frequency) env->GetIntField(thisICalRecurrenceType, ICalRecurrenceType_Freq_FID);
+    __ICalRecurrenceType_->freq = (icalrecurrencetype_frequency) env->GetIntField(thisICalRecurrenceType, ICalRecurrenceType_Freq_FID);
 }
 
 void  jni_SetWeek_start_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	env->SetIntField(thisICalRecurrenceType, ICalRecurrenceType_Week_start_FID, (jint) __ICalRecurrenceType_->week_start);
+    env->SetIntField(thisICalRecurrenceType, ICalRecurrenceType_Week_start_FID, (jint) __ICalRecurrenceType_->week_start);
 }
 
 void jni_GetWeek_start_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	__ICalRecurrenceType_->week_start = (icalrecurrencetype_weekday) env->GetIntField(thisICalRecurrenceType, ICalRecurrenceType_Week_start_FID);
+    __ICalRecurrenceType_->week_start = (icalrecurrencetype_weekday) env->GetIntField(thisICalRecurrenceType, ICalRecurrenceType_Week_start_FID);
 }
 
 void  jni_SetCount_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	env->SetIntField(thisICalRecurrenceType, ICalRecurrenceType_Count_FID, (jint) __ICalRecurrenceType_->count);
+    env->SetIntField(thisICalRecurrenceType, ICalRecurrenceType_Count_FID, (jint) __ICalRecurrenceType_->count);
 }
 
 void jni_GetCount_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	__ICalRecurrenceType_->count = env->GetIntField(thisICalRecurrenceType, ICalRecurrenceType_Count_FID);
+    __ICalRecurrenceType_->count = env->GetIntField(thisICalRecurrenceType, ICalRecurrenceType_Count_FID);
 }
 
 void  jni_SetInterval_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	env->SetShortField(thisICalRecurrenceType, ICalRecurrenceType_Interval_FID, (jshort) __ICalRecurrenceType_->interval);
+    env->SetShortField(thisICalRecurrenceType, ICalRecurrenceType_Interval_FID, (jshort) __ICalRecurrenceType_->interval);
 }
 
 void jni_GetInterval_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	__ICalRecurrenceType_->interval = env->GetShortField(thisICalRecurrenceType, ICalRecurrenceType_Interval_FID);
+    __ICalRecurrenceType_->interval = env->GetShortField(thisICalRecurrenceType, ICalRecurrenceType_Interval_FID);
 }
 
 void  jni_SetBy_second_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	jclass	elem_clazz;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_second_FID);
-	env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,61, (jshort*)&(__ICalRecurrenceType_->by_second[0]));
+    jclass  elem_clazz;
+    int ix0;
+    jobject lcl_jobj0;
+    jarray lcl_jobjA0;
+    lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_second_FID);
+    env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,61, (jshort*)&(__ICalRecurrenceType_->by_second[0]));
 }
 
 void jni_GetBy_second_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	jclass	elem_clazz;
-	jboolean isCopy;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_second_FID);
-	env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,61, (jshort*)&(__ICalRecurrenceType_->by_second[0]));
+    jclass  elem_clazz;
+    jboolean isCopy;
+    int ix0;
+    jobject lcl_jobj0;
+    jarray lcl_jobjA0;
+    lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_second_FID);
+    env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,61, (jshort*)&(__ICalRecurrenceType_->by_second[0]));
 }
 
 void  jni_SetBy_minute_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	jclass	elem_clazz;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_minute_FID);
-	env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,61, (jshort*)&(__ICalRecurrenceType_->by_minute[0]));
+    jclass  elem_clazz;
+    int ix0;
+    jobject lcl_jobj0;
+    jarray lcl_jobjA0;
+    lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_minute_FID);
+    env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,61, (jshort*)&(__ICalRecurrenceType_->by_minute[0]));
 }
 
 void jni_GetBy_minute_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	jclass	elem_clazz;
-	jboolean isCopy;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_minute_FID);
-	env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,61, (jshort*)&(__ICalRecurrenceType_->by_minute[0]));
+    jclass  elem_clazz;
+    jboolean isCopy;
+    int ix0;
+    jobject lcl_jobj0;
+    jarray lcl_jobjA0;
+    lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_minute_FID);
+    env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,61, (jshort*)&(__ICalRecurrenceType_->by_minute[0]));
 }
 
 void  jni_SetBy_hour_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	jclass	elem_clazz;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_hour_FID);
-	env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,25, (jshort*)&(__ICalRecurrenceType_->by_hour[0]));
+    jclass  elem_clazz;
+    int ix0;
+    jobject lcl_jobj0;
+    jarray lcl_jobjA0;
+    lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_hour_FID);
+    env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,25, (jshort*)&(__ICalRecurrenceType_->by_hour[0]));
 }
 
 void jni_GetBy_hour_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	jclass	elem_clazz;
-	jboolean isCopy;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_hour_FID);
-	env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,25, (jshort*)&(__ICalRecurrenceType_->by_hour[0]));
+    jclass  elem_clazz;
+    jboolean isCopy;
+    int ix0;
+    jobject lcl_jobj0;
+    jarray lcl_jobjA0;
+    lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_hour_FID);
+    env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,25, (jshort*)&(__ICalRecurrenceType_->by_hour[0]));
 }
 
 void  jni_SetBy_day_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	jclass	elem_clazz;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_day_FID);
-	env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,364, (jshort*)&(__ICalRecurrenceType_->by_day[0]));
+    jclass  elem_clazz;
+    int ix0;
+    jobject lcl_jobj0;
+    jarray lcl_jobjA0;
+    lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_day_FID);
+    env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,364, (jshort*)&(__ICalRecurrenceType_->by_day[0]));
 }
 
 void jni_GetBy_day_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	jclass	elem_clazz;
-	jboolean isCopy;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_day_FID);
-	env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,364, (jshort*)&(__ICalRecurrenceType_->by_day[0]));
+    jclass  elem_clazz;
+    jboolean isCopy;
+    int ix0;
+    jobject lcl_jobj0;
+    jarray lcl_jobjA0;
+    lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_day_FID);
+    env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,364, (jshort*)&(__ICalRecurrenceType_->by_day[0]));
 }
 
 void  jni_SetBy_month_day_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	jclass	elem_clazz;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_month_day_FID);
-	env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,32, (jshort*)&(__ICalRecurrenceType_->by_month_day[0]));
+    jclass  elem_clazz;
+    int ix0;
+    jobject lcl_jobj0;
+    jarray lcl_jobjA0;
+    lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_month_day_FID);
+    env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,32, (jshort*)&(__ICalRecurrenceType_->by_month_day[0]));
 }
 
 void jni_GetBy_month_day_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	jclass	elem_clazz;
-	jboolean isCopy;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_month_day_FID);
-	env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,32, (jshort*)&(__ICalRecurrenceType_->by_month_day[0]));
+    jclass  elem_clazz;
+    jboolean isCopy;
+    int ix0;
+    jobject lcl_jobj0;
+    jarray lcl_jobjA0;
+    lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_month_day_FID);
+    env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,32, (jshort*)&(__ICalRecurrenceType_->by_month_day[0]));
 }
 
 void  jni_SetBy_year_day_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	jclass	elem_clazz;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_year_day_FID);
-	env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,367, (jshort*)&(__ICalRecurrenceType_->by_year_day[0]));
+    jclass  elem_clazz;
+    int ix0;
+    jobject lcl_jobj0;
+    jarray lcl_jobjA0;
+    lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_year_day_FID);
+    env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,367, (jshort*)&(__ICalRecurrenceType_->by_year_day[0]));
 }
 
 void jni_GetBy_year_day_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	jclass	elem_clazz;
-	jboolean isCopy;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_year_day_FID);
-	env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,367, (jshort*)&(__ICalRecurrenceType_->by_year_day[0]));
+    jclass  elem_clazz;
+    jboolean isCopy;
+    int ix0;
+    jobject lcl_jobj0;
+    jarray lcl_jobjA0;
+    lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_year_day_FID);
+    env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,367, (jshort*)&(__ICalRecurrenceType_->by_year_day[0]));
 }
 
 void  jni_SetBy_week_no_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	jclass	elem_clazz;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_week_no_FID);
-	env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,54, (jshort*)&(__ICalRecurrenceType_->by_week_no[0]));
+    jclass  elem_clazz;
+    int ix0;
+    jobject lcl_jobj0;
+    jarray lcl_jobjA0;
+    lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_week_no_FID);
+    env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,54, (jshort*)&(__ICalRecurrenceType_->by_week_no[0]));
 }
 
 void jni_GetBy_week_no_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	jclass	elem_clazz;
-	jboolean isCopy;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_week_no_FID);
-	env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,54, (jshort*)&(__ICalRecurrenceType_->by_week_no[0]));
+    jclass  elem_clazz;
+    jboolean isCopy;
+    int ix0;
+    jobject lcl_jobj0;
+    jarray lcl_jobjA0;
+    lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_week_no_FID);
+    env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,54, (jshort*)&(__ICalRecurrenceType_->by_week_no[0]));
 }
 
 void  jni_SetBy_month_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	jclass	elem_clazz;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_month_FID);
-	env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,13, (jshort*)&(__ICalRecurrenceType_->by_month[0]));
+    jclass  elem_clazz;
+    int ix0;
+    jobject lcl_jobj0;
+    jarray lcl_jobjA0;
+    lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_month_FID);
+    env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,13, (jshort*)&(__ICalRecurrenceType_->by_month[0]));
 }
 
 void jni_GetBy_month_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	jclass	elem_clazz;
-	jboolean isCopy;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_month_FID);
-	env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,13, (jshort*)&(__ICalRecurrenceType_->by_month[0]));
+    jclass  elem_clazz;
+    jboolean isCopy;
+    int ix0;
+    jobject lcl_jobj0;
+    jarray lcl_jobjA0;
+    lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_month_FID);
+    env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,13, (jshort*)&(__ICalRecurrenceType_->by_month[0]));
 }
 
 void  jni_SetBy_set_pos_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	jclass	elem_clazz;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_set_pos_FID);
-	env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,367, (jshort*)&(__ICalRecurrenceType_->by_set_pos[0]));
+    jclass  elem_clazz;
+    int ix0;
+    jobject lcl_jobj0;
+    jarray lcl_jobjA0;
+    lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_set_pos_FID);
+    env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,367, (jshort*)&(__ICalRecurrenceType_->by_set_pos[0]));
 }
 
 void jni_GetBy_set_pos_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
 {
-	jclass	elem_clazz;
-	jboolean isCopy;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_set_pos_FID);
-	env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,367, (jshort*)&(__ICalRecurrenceType_->by_set_pos[0]));
+    jclass  elem_clazz;
+    jboolean isCopy;
+    int ix0;
+    jobject lcl_jobj0;
+    jarray lcl_jobjA0;
+    lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_set_pos_FID);
+    env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,367, (jshort*)&(__ICalRecurrenceType_->by_set_pos[0]));
 }
 void jni_SetAll_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv* env, jobject thisICalRecurrenceType)
 {
-	jni_SetUntil_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetFreq_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetWeek_start_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetCount_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetInterval_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetBy_second_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetBy_minute_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetBy_hour_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetBy_day_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetBy_month_day_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetBy_year_day_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetBy_week_no_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetBy_month_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetBy_set_pos_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_SetUntil_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_SetFreq_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_SetWeek_start_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_SetCount_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_SetInterval_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_SetBy_second_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_SetBy_minute_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_SetBy_hour_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_SetBy_day_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_SetBy_month_day_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_SetBy_year_day_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_SetBy_week_no_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_SetBy_month_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_SetBy_set_pos_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
 }
 void jni_GetAll_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv* env, jobject thisICalRecurrenceType)
 {
-	jni_GetUntil_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetFreq_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetWeek_start_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetCount_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetInterval_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetBy_second_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetBy_minute_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetBy_hour_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetBy_day_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetBy_month_day_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetBy_year_day_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetBy_week_no_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetBy_month_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetBy_set_pos_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	
+    jni_GetUntil_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_GetFreq_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_GetWeek_start_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_GetCount_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_GetInterval_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_GetBy_second_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_GetBy_minute_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_GetBy_hour_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_GetBy_day_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_GetBy_month_day_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_GetBy_year_day_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_GetBy_week_no_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_GetBy_month_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+    jni_GetBy_set_pos_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
+
 }
 
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalRecurrenceType_init__J(JNIEnv* env, jobject thisICalRecurrenceType, jlong data) {
-	jni_SetAll_in_ICalRecurrenceType((ICalRecurrenceType*)data,env,thisICalRecurrenceType);
+    jni_SetAll_in_ICalRecurrenceType((ICalRecurrenceType*)data,env,thisICalRecurrenceType);
 }
 
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalRecurrenceType_initFIDs(JNIEnv *env, jclass clazz) {
-	initICalRecurrenceTypeFieldIDs(env, clazz);
+    initICalRecurrenceTypeFieldIDs(env, clazz);
 }
diff --git a/src/java/jniICalRecurrenceType_cxx.h b/src/java/jniICalRecurrenceType_cxx.h
index 2f0bf4ba..37fc8de1 100644
--- a/src/java/jniICalRecurrenceType_cxx.h
+++ b/src/java/jniICalRecurrenceType_cxx.h
@@ -1,9 +1,20 @@
-
 /*======================================================================
  FILE: jniICalRecurrenceType_cxx.h
  CREATOR: structConverter
-======================================================================*/
 
+ (C) COPYRIGHT 2002, Critical Path
+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
+======================================================================*/
 #ifndef _jni_ICalRecurrenceType_H_
 #define _jni_ICalRecurrenceType_H_
 #include <jni.h>
diff --git a/src/java/jniICalTimeType_cxx.cpp b/src/java/jniICalTimeType_cxx.cpp
index a511edd6..8ee2d694 100644
--- a/src/java/jniICalTimeType_cxx.cpp
+++ b/src/java/jniICalTimeType_cxx.cpp
@@ -1,8 +1,18 @@
-/* -*- Mode: C -*- */
 /*======================================================================
  FILE: jniICalTimeType_cxx.cpp
  CREATOR: structConverter
  (C) COPYRIGHT 2002, Critical Path
+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
 ======================================================================*/
 
 #include <jni.h>
@@ -23,120 +33,120 @@ static jfieldID ICalTimeType_Zone_FID;
 
 void initICalTimeTypeFieldIDs(JNIEnv* env, jclass clazz)
 {
-	ICalTimeType_Year_FID = env->GetFieldID(clazz, "year", "I");
-	ICalTimeType_Month_FID = env->GetFieldID(clazz, "month", "I");
-	ICalTimeType_Day_FID = env->GetFieldID(clazz, "day", "I");
-	ICalTimeType_Hour_FID = env->GetFieldID(clazz, "hour", "I");
-	ICalTimeType_Minute_FID = env->GetFieldID(clazz, "minute", "I");
-	ICalTimeType_Second_FID = env->GetFieldID(clazz, "second", "I");
-	ICalTimeType_Is_date_FID = env->GetFieldID(clazz, "is_date", "I");
-	ICalTimeType_Zone_FID = env->GetFieldID(clazz, "zone", "Ljava/lang/String;");
+    ICalTimeType_Year_FID = env->GetFieldID(clazz, "year", "I");
+    ICalTimeType_Month_FID = env->GetFieldID(clazz, "month", "I");
+    ICalTimeType_Day_FID = env->GetFieldID(clazz, "day", "I");
+    ICalTimeType_Hour_FID = env->GetFieldID(clazz, "hour", "I");
+    ICalTimeType_Minute_FID = env->GetFieldID(clazz, "minute", "I");
+    ICalTimeType_Second_FID = env->GetFieldID(clazz, "second", "I");
+    ICalTimeType_Is_date_FID = env->GetFieldID(clazz, "is_date", "I");
+    ICalTimeType_Zone_FID = env->GetFieldID(clazz, "zone", "Ljava/lang/String;");
 }
 
 void  jni_SetYear_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
 {
-	env->SetIntField(thisICalTimeType, ICalTimeType_Year_FID, (jint) __ICalTimeType_->year);
+    env->SetIntField(thisICalTimeType, ICalTimeType_Year_FID, (jint) __ICalTimeType_->year);
 }
 
 void jni_GetYear_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
 {
-	__ICalTimeType_->year = env->GetIntField(thisICalTimeType, ICalTimeType_Year_FID);
+    __ICalTimeType_->year = env->GetIntField(thisICalTimeType, ICalTimeType_Year_FID);
 }
 
 void  jni_SetMonth_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
 {
-	env->SetIntField(thisICalTimeType, ICalTimeType_Month_FID, (jint) __ICalTimeType_->month);
+    env->SetIntField(thisICalTimeType, ICalTimeType_Month_FID, (jint) __ICalTimeType_->month);
 }
 
 void jni_GetMonth_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
 {
-	__ICalTimeType_->month = env->GetIntField(thisICalTimeType, ICalTimeType_Month_FID);
+    __ICalTimeType_->month = env->GetIntField(thisICalTimeType, ICalTimeType_Month_FID);
 }
 
 void  jni_SetDay_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
 {
-	env->SetIntField(thisICalTimeType, ICalTimeType_Day_FID, (jint) __ICalTimeType_->day);
+    env->SetIntField(thisICalTimeType, ICalTimeType_Day_FID, (jint) __ICalTimeType_->day);
 }
 
 void jni_GetDay_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
 {
-	__ICalTimeType_->day = env->GetIntField(thisICalTimeType, ICalTimeType_Day_FID);
+    __ICalTimeType_->day = env->GetIntField(thisICalTimeType, ICalTimeType_Day_FID);
 }
 
 void  jni_SetHour_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
 {
-	env->SetIntField(thisICalTimeType, ICalTimeType_Hour_FID, (jint) __ICalTimeType_->hour);
+    env->SetIntField(thisICalTimeType, ICalTimeType_Hour_FID, (jint) __ICalTimeType_->hour);
 }
 
 void jni_GetHour_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
 {
-	__ICalTimeType_->hour = env->GetIntField(thisICalTimeType, ICalTimeType_Hour_FID);
+    __ICalTimeType_->hour = env->GetIntField(thisICalTimeType, ICalTimeType_Hour_FID);
 }
 
 void  jni_SetMinute_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
 {
-	env->SetIntField(thisICalTimeType, ICalTimeType_Minute_FID, (jint) __ICalTimeType_->minute);
+    env->SetIntField(thisICalTimeType, ICalTimeType_Minute_FID, (jint) __ICalTimeType_->minute);
 }
 
 void jni_GetMinute_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
 {
-	__ICalTimeType_->minute = env->GetIntField(thisICalTimeType, ICalTimeType_Minute_FID);
+    __ICalTimeType_->minute = env->GetIntField(thisICalTimeType, ICalTimeType_Minute_FID);
 }
 
 void  jni_SetSecond_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
 {
-	env->SetIntField(thisICalTimeType, ICalTimeType_Second_FID, (jint) __ICalTimeType_->second);
+    env->SetIntField(thisICalTimeType, ICalTimeType_Second_FID, (jint) __ICalTimeType_->second);
 }
 
 void jni_GetSecond_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
 {
-	__ICalTimeType_->second = env->GetIntField(thisICalTimeType, ICalTimeType_Second_FID);
+    __ICalTimeType_->second = env->GetIntField(thisICalTimeType, ICalTimeType_Second_FID);
 }
 
 void  jni_SetIs_date_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
 {
-	env->SetIntField(thisICalTimeType, ICalTimeType_Is_date_FID, (jint) __ICalTimeType_->is_date);
+    env->SetIntField(thisICalTimeType, ICalTimeType_Is_date_FID, (jint) __ICalTimeType_->is_date);
 }
 
 void jni_GetIs_date_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
 {
-	__ICalTimeType_->is_date = env->GetIntField(thisICalTimeType, ICalTimeType_Is_date_FID);
+    __ICalTimeType_->is_date = env->GetIntField(thisICalTimeType, ICalTimeType_Is_date_FID);
 }
 
 void  jni_SetZone_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
 {
-	env->SetObjectField(thisICalTimeType, ICalTimeType_Zone_FID, env->NewStringUTF(icaltime_get_tzid(*__ICalTimeType_)));
+    env->SetObjectField(thisICalTimeType, ICalTimeType_Zone_FID, env->NewStringUTF(icaltime_get_tzid(*__ICalTimeType_)));
 }
 
 void jni_GetZone_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
 {
-	__ICalTimeType_->zone = icaltimezone_get_builtin_timezone_from_tzid((char*) env->GetStringUTFChars((jstring) env->GetObjectField(thisICalTimeType, ICalTimeType_Zone_FID), NULL));
+    __ICalTimeType_->zone = icaltimezone_get_builtin_timezone_from_tzid((char*) env->GetStringUTFChars((jstring) env->GetObjectField(thisICalTimeType, ICalTimeType_Zone_FID), NULL));
 }
 
 // copy all fields from the c struct (__ICalTimeType_) to the java object (thisICalTimeType).
 void jni_SetAll_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv* env, jobject thisICalTimeType)
 {
-	jni_SetYear_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_SetMonth_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_SetDay_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_SetHour_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_SetMinute_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_SetSecond_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_SetIs_date_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_SetZone_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
+    jni_SetYear_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
+    jni_SetMonth_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
+    jni_SetDay_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
+    jni_SetHour_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
+    jni_SetMinute_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
+    jni_SetSecond_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
+    jni_SetIs_date_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
+    jni_SetZone_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
 }
 
 // copy all fields from the java object (thisICalTimeType) to the c struct (__ICalTimeType_).
 void jni_GetAll_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv* env, jobject thisICalTimeType)
 {
-	jni_GetYear_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_GetMonth_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_GetDay_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_GetHour_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_GetMinute_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_GetSecond_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_GetIs_date_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_GetZone_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
+    jni_GetYear_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
+    jni_GetMonth_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
+    jni_GetDay_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
+    jni_GetHour_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
+    jni_GetMinute_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
+    jni_GetSecond_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
+    jni_GetIs_date_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
+    jni_GetZone_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
 }
 
 /*
@@ -147,8 +157,8 @@ void jni_GetAll_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv*
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalTimeType_init__J
   (JNIEnv* env, jobject thisICalTimeType, jlong data)
 {
-	// copy all fields from the c struct (data) to the java object (thisICalTimeType). 
-	jni_SetAll_in_ICalTimeType((ICalTimeType*)data,env,thisICalTimeType);
+    // copy all fields from the c struct (data) to the java object (thisICalTimeType).
+    jni_SetAll_in_ICalTimeType((ICalTimeType*)data,env,thisICalTimeType);
 }
 
 /*
@@ -156,7 +166,7 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalTimeType_init__J
  * Method:    initFIDs
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalTimeType_initFIDs(JNIEnv *env, jclass clazz) 
+JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalTimeType_initFIDs(JNIEnv *env, jclass clazz)
 {
-	initICalTimeTypeFieldIDs(env, clazz);
+    initICalTimeTypeFieldIDs(env, clazz);
 }
diff --git a/src/java/jniICalTimeType_cxx.h b/src/java/jniICalTimeType_cxx.h
index 4455808e..06428398 100644
--- a/src/java/jniICalTimeType_cxx.h
+++ b/src/java/jniICalTimeType_cxx.h
@@ -1,10 +1,20 @@
-
 /*======================================================================
  FILE: jniICalTimeType_cxx.h
  CREATOR: structConverter
+
  (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
 
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
+======================================================================*/
 #ifndef _jni_ICalTimeType_H
 #define _jni_ICalTimeType_H
 #include <jni.h>
diff --git a/src/java/jniICalTriggerType_cxx.cpp b/src/java/jniICalTriggerType_cxx.cpp
index 033b277d..7b9d860c 100644
--- a/src/java/jniICalTriggerType_cxx.cpp
+++ b/src/java/jniICalTriggerType_cxx.cpp
@@ -1,10 +1,20 @@
-/* -*- Mode: C -*- */
 /*======================================================================
  FILE: jniICalTriggerType_cxx.cpp
  CREATOR: structConverter
+
  (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
 
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
+======================================================================*/
 #include <jni.h>
 
 #include "jniICalTriggerType_cxx.h"
@@ -17,74 +27,74 @@ static jfieldID ICalTriggerType_Duration_FID;
 
 void initICalTriggerTypeFieldIDs(JNIEnv* env, jclass clazz)
 {
-	ICalTriggerType_Time_FID = env->GetFieldID(clazz, "time", "Lnet/cp/jlibical/ICalTimeType;");
-	ICalTriggerType_Duration_FID = env->GetFieldID(clazz, "duration", "Lnet/cp/jlibical/ICalDurationType;");
+    ICalTriggerType_Time_FID = env->GetFieldID(clazz, "time", "Lnet/cp/jlibical/ICalTimeType;");
+    ICalTriggerType_Duration_FID = env->GetFieldID(clazz, "duration", "Lnet/cp/jlibical/ICalDurationType;");
 }
 
 void  jni_SetTime_in_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_, JNIEnv *env, jobject thisICalTriggerType)
 {
-	jobject	lcl_jobj0;
-	lcl_jobj0 = env->GetObjectField(thisICalTriggerType, ICalTriggerType_Time_FID);
-	jni_SetYear_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_SetMonth_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_SetDay_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_SetHour_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_SetMinute_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_SetSecond_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_SetIs_date_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_SetZone_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
+    jobject lcl_jobj0;
+    lcl_jobj0 = env->GetObjectField(thisICalTriggerType, ICalTriggerType_Time_FID);
+    jni_SetYear_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
+    jni_SetMonth_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
+    jni_SetDay_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
+    jni_SetHour_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
+    jni_SetMinute_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
+    jni_SetSecond_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
+    jni_SetIs_date_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
+    jni_SetZone_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
 }
 
 void jni_GetTime_from_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_, JNIEnv *env, jobject thisICalTriggerType)
 {
-	jobject	lcl_jobj0;
-	lcl_jobj0 = env->GetObjectField(thisICalTriggerType, ICalTriggerType_Time_FID);
-	jni_GetYear_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_GetMonth_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_GetDay_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_GetHour_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_GetMinute_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_GetSecond_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_GetIs_date_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_GetZone_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
+    jobject lcl_jobj0;
+    lcl_jobj0 = env->GetObjectField(thisICalTriggerType, ICalTriggerType_Time_FID);
+    jni_GetYear_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
+    jni_GetMonth_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
+    jni_GetDay_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
+    jni_GetHour_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
+    jni_GetMinute_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
+    jni_GetSecond_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
+    jni_GetIs_date_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
+    jni_GetZone_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
 }
 
 void  jni_SetDuration_in_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_, JNIEnv *env, jobject thisICalTriggerType)
 {
-	jobject	lcl_jobj0;
-	lcl_jobj0 = env->GetObjectField(thisICalTriggerType, ICalTriggerType_Duration_FID);
-	jni_SetIs_neg_in_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-	jni_SetDays_in_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-	jni_SetWeeks_in_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-	jni_SetHours_in_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-	jni_SetMinutes_in_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-	jni_SetSeconds_in_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
+    jobject lcl_jobj0;
+    lcl_jobj0 = env->GetObjectField(thisICalTriggerType, ICalTriggerType_Duration_FID);
+    jni_SetIs_neg_in_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
+    jni_SetDays_in_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
+    jni_SetWeeks_in_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
+    jni_SetHours_in_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
+    jni_SetMinutes_in_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
+    jni_SetSeconds_in_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
 }
 
 void jni_GetDuration_from_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_, JNIEnv *env, jobject thisICalTriggerType)
 {
-	jobject	lcl_jobj0;
-	lcl_jobj0 = env->GetObjectField(thisICalTriggerType, ICalTriggerType_Duration_FID);
-	jni_GetIs_neg_from_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-	jni_GetDays_from_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-	jni_GetWeeks_from_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-	jni_GetHours_from_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-	jni_GetMinutes_from_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-	jni_GetSeconds_from_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
+    jobject lcl_jobj0;
+    lcl_jobj0 = env->GetObjectField(thisICalTriggerType, ICalTriggerType_Duration_FID);
+    jni_GetIs_neg_from_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
+    jni_GetDays_from_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
+    jni_GetWeeks_from_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
+    jni_GetHours_from_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
+    jni_GetMinutes_from_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
+    jni_GetSeconds_from_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
 }
 
 // copy all fields from the c struct (__ICalTriggerType_) to the java object (thisICalTriggerType).
 void jni_SetAll_in_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_, JNIEnv* env, jobject thisICalTriggerType)
 {
-	jni_SetTime_in_ICalTriggerType(__ICalTriggerType_, env, thisICalTriggerType);
-	jni_SetDuration_in_ICalTriggerType(__ICalTriggerType_, env, thisICalTriggerType);
+    jni_SetTime_in_ICalTriggerType(__ICalTriggerType_, env, thisICalTriggerType);
+    jni_SetDuration_in_ICalTriggerType(__ICalTriggerType_, env, thisICalTriggerType);
 }
 
 // copy all fields from the java object (thisICalTriggerType) to the c struct (__ICalTriggerType_).
 void jni_GetAll_from_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_, JNIEnv* env, jobject thisICalTriggerType)
 {
-	jni_GetTime_from_ICalTriggerType(__ICalTriggerType_, env, thisICalTriggerType);
-	jni_GetDuration_from_ICalTriggerType(__ICalTriggerType_, env, thisICalTriggerType);
+    jni_GetTime_from_ICalTriggerType(__ICalTriggerType_, env, thisICalTriggerType);
+    jni_GetDuration_from_ICalTriggerType(__ICalTriggerType_, env, thisICalTriggerType);
 }
 
 /*
@@ -95,8 +105,8 @@ void jni_GetAll_from_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_,
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalTriggerType_init__J
   (JNIEnv* env, jobject thisICalTriggerType, jlong data)
 {
-	// copy all fields from the c struct (data) to the java object (thisICalTimeType). 
-	jni_SetAll_in_ICalTriggerType((ICalTriggerType*)data,env,thisICalTriggerType);
+    // copy all fields from the c struct (data) to the java object (thisICalTimeType).
+    jni_SetAll_in_ICalTriggerType((ICalTriggerType*)data,env,thisICalTriggerType);
 }
 
 /*
@@ -105,5 +115,5 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalTriggerType_init__J
  * Signature: ()V
  */
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalTriggerType_initFIDs(JNIEnv *env, jclass clazz) {
-	initICalTriggerTypeFieldIDs(env, clazz);
+    initICalTriggerTypeFieldIDs(env, clazz);
 }
diff --git a/src/java/jniICalTriggerType_cxx.h b/src/java/jniICalTriggerType_cxx.h
index 62d6ec3e..19b85e02 100644
--- a/src/java/jniICalTriggerType_cxx.h
+++ b/src/java/jniICalTriggerType_cxx.h
@@ -1,8 +1,19 @@
-
 /*======================================================================
  FILE: jniICalTriggerType_cxx.h
  CREATOR: structConverter
+
  (C) COPYRIGHT 2002, Critical Path
+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
 ======================================================================*/
 
 #ifndef _jni_ICalTriggerType_H
diff --git a/src/java/net_cp_jlibical_ICalParameter_cxx.cpp b/src/java/net_cp_jlibical_ICalParameter_cxx.cpp
index 21574739..71714989 100644
--- a/src/java/net_cp_jlibical_ICalParameter_cxx.cpp
+++ b/src/java/net_cp_jlibical_ICalParameter_cxx.cpp
@@ -1,8 +1,18 @@
-/* -*- Mode: C -*- */
 /*======================================================================
  FILE: net_cp_jlibical_ICalParameter_cxx.cpp
  CREATOR: gnorman 1/10/02
  (C) COPYRIGHT 2002, Critical Path
+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
 ======================================================================*/
 
 #ifndef NET_CP_JLIBICAL_ICALPARAMETER_CXX_H
@@ -29,22 +39,22 @@
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalParameter_as_1ical_1string
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->as_ical_string();
+    if (cObj != NULL)
+    {
+        char* icalStr = cObj->as_ical_string();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+        if (icalStr == NULL)
+        {
+            icalStr = "";
+        }
 
-		result = env->NewStringUTF(icalStr);
-	}
+        result = env->NewStringUTF(icalStr);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -55,15 +65,15 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalParameter_as_1ical_1string
 JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalParameter_isa
   (JNIEnv *env, jobject jobj)
 {
-	jint result = 0;
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jint result = 0;
+    ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		result = cObj->isa();
-	}
+    if (cObj != NULL)
+    {
+        result = cObj->isa();
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -74,25 +84,25 @@ JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalParameter_isa
 JNIEXPORT jboolean JNICALL Java_net_cp_jlibical_ICalParameter_isa_1parameter
   (JNIEnv *env, jobject jobj, jobject arg)
 {
-	jboolean result = 0;
+    jboolean result = 0;
 
-	// get the c++ object from the jobj
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		// get the c++ object from the arg
-		void* argObjPtr = 0;
+    // get the c++ object from the jobj
+    ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    if (cObj != NULL)
+    {
+        // get the c++ object from the arg
+        void* argObjPtr = 0;
 
-		if (arg != NULL)
-		{
-			argObjPtr = getCObjectPtr(env,arg);
-		}
+        if (arg != NULL)
+        {
+            argObjPtr = getCObjectPtr(env,arg);
+        }
 
-		// get the result from the c++ object (candidateValue can be 0, it's cObj's responsibility to handle this if an error).
-		result = cObj->isa_parameter(argObjPtr) != 0;
-	}
+        // get the result from the c++ object (candidateValue can be 0, it's cObj's responsibility to handle this if an error).
+        result = cObj->isa_parameter(argObjPtr) != 0;
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -103,22 +113,22 @@ JNIEXPORT jboolean JNICALL Java_net_cp_jlibical_ICalParameter_isa_1parameter
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalParameter_get_1language
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_language();
+    if (cObj != NULL)
+    {
+        char* icalStr = cObj->get_language();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+        if (icalStr == NULL)
+        {
+            icalStr = "";
+        }
 
-		result = env->NewStringUTF(icalStr);
-	}
+        result = env->NewStringUTF(icalStr);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -129,15 +139,15 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalParameter_get_1language
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_set_1language
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
+    if (cObj != NULL)
+    {
+        const char* szTemp = env->GetStringUTFChars(str,NULL);
 
-		cObj->set_language((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
+        cObj->set_language((char*)szTemp);
+        env->ReleaseStringUTFChars(str,szTemp);
+    }
 }
 
 /*
@@ -148,15 +158,15 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_set_1language
 JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalParameter_get_1encoding
   (JNIEnv *env, jobject jobj)
 {
-	jint result = 0;
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jint result = 0;
+    ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		result = cObj->get_encoding();
-	}
+    if (cObj != NULL)
+    {
+        result = cObj->get_encoding();
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -167,12 +177,12 @@ JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalParameter_get_1encoding
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_set_1encoding
   (JNIEnv *env, jobject jobj, jint value)
 {
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		cObj->set_encoding((icalparameter_encoding)value);
-	}
+    if (cObj != NULL)
+    {
+        cObj->set_encoding((icalparameter_encoding)value);
+    }
 }
 
 /*
@@ -183,15 +193,15 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_set_1encoding
 JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalParameter_get_1role
   (JNIEnv *env, jobject jobj)
 {
-	jint result = 0;
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jint result = 0;
+    ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		result = cObj->get_role();
-	}
+    if (cObj != NULL)
+    {
+        result = cObj->get_role();
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -202,12 +212,12 @@ JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalParameter_get_1role
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_set_1role
   (JNIEnv *env, jobject jobj, jint value)
 {
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		cObj->set_role((icalparameter_role)value);
-	}
+    if (cObj != NULL)
+    {
+        cObj->set_role((icalparameter_role)value);
+    }
 }
 
 /*
@@ -218,15 +228,15 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_set_1role
 JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalParameter_get_1partstat
   (JNIEnv *env, jobject jobj)
 {
-	jint result = 0;
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jint result = 0;
+    ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		result = cObj->get_partstat();
-	}
+    if (cObj != NULL)
+    {
+        result = cObj->get_partstat();
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -237,12 +247,12 @@ JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalParameter_get_1partstat
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_set_1partstat
   (JNIEnv *env, jobject jobj, jint value)
 {
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		cObj->set_partstat((icalparameter_partstat)value);
-	}
+    if (cObj != NULL)
+    {
+        cObj->set_partstat((icalparameter_partstat)value);
+    }
 }
 
 /*
@@ -253,7 +263,7 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_set_1partstat
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_init__
   (JNIEnv *env, jobject jobj)
 {
-	setCObjectPtr(env,jobj,new ICalParameter());
+    setCObjectPtr(env,jobj,new ICalParameter());
 }
 
 /*
@@ -264,17 +274,17 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_init__
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_init__Ljava_lang_String_2
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	if (str != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		setCObjectPtr(env,jobj,new ICalParameter((char*)szTemp));
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-	else
-	{
-		throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
-	}
+    if (str != NULL)
+    {
+        const char* szTemp = env->GetStringUTFChars(str,NULL);
+
+        setCObjectPtr(env,jobj,new ICalParameter((char*)szTemp));
+        env->ReleaseStringUTFChars(str,szTemp);
+    }
+    else
+    {
+        throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
+    }
 }
 
 /*
@@ -285,17 +295,17 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_init__Ljava_lang_Strin
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_init__ILjava_lang_String_2
   (JNIEnv *env, jobject jobj, jint kind, jstring str)
 {
-	if (str != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		setCObjectPtr(env,jobj,new ICalParameter((icalparameter_kind)kind,(char*)szTemp));
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-	else
-	{
-		throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
-	}
+    if (str != NULL)
+    {
+        const char* szTemp = env->GetStringUTFChars(str,NULL);
+
+        setCObjectPtr(env,jobj,new ICalParameter((icalparameter_kind)kind,(char*)szTemp));
+        env->ReleaseStringUTFChars(str,szTemp);
+    }
+    else
+    {
+        throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
+    }
 }
 
 /*
@@ -306,5 +316,5 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_init__ILjava_lang_Stri
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_init__I
   (JNIEnv *env, jobject jobj, jint kind)
 {
-	setCObjectPtr(env,jobj,new ICalParameter((icalparameter_kind)kind));
+    setCObjectPtr(env,jobj,new ICalParameter((icalparameter_kind)kind));
 }
diff --git a/src/java/net_cp_jlibical_ICalParameter_cxx.h b/src/java/net_cp_jlibical_ICalParameter_cxx.h
index f2fef299..47dd4354 100644
--- a/src/java/net_cp_jlibical_ICalParameter_cxx.h
+++ b/src/java/net_cp_jlibical_ICalParameter_cxx.h
@@ -1,10 +1,20 @@
-
 /*======================================================================
  FILE: net_cp_jlibical_ICalParameter_cxx.h
  CREATOR: javah 1/11/02
+
  (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
 
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
+======================================================================*/
 #ifndef _Included_net_cp_jlibical_ICalParameter
 #define _Included_net_cp_jlibical_ICalParameter
 
diff --git a/src/java/net_cp_jlibical_ICalProperty_cxx.cpp b/src/java/net_cp_jlibical_ICalProperty_cxx.cpp
index adbd7846..e1440684 100644
--- a/src/java/net_cp_jlibical_ICalProperty_cxx.cpp
+++ b/src/java/net_cp_jlibical_ICalProperty_cxx.cpp
@@ -1,8 +1,18 @@
-/* -*- Mode: C -*- */
 /*======================================================================
  FILE: net_cp_jlibical_ICalProperty_cxx.cpp
  CREATOR: gnorman 1/10/02
  (C) COPYRIGHT 2002, Critical Path
+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
 ======================================================================*/
 
 #ifndef NET_CP_JLIBICAL_ICALPROPERTY_CXX_H
@@ -29,22 +39,22 @@
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_as_1ical_1string
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->as_ical_string();
+    if (cObj != NULL)
+    {
+        char* icalStr = cObj->as_ical_string();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+        if (icalStr == NULL)
+        {
+            icalStr = "";
+        }
 
-		result = env->NewStringUTF(icalStr);
-	}
+        result = env->NewStringUTF(icalStr);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -55,15 +65,15 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_as_1ical_1string
 JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_isa
   (JNIEnv *env, jobject jobj)
 {
-	jint result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jint result = 0;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		result = cObj->isa();
-	}
+    if (cObj != NULL)
+    {
+        result = cObj->isa();
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -74,23 +84,23 @@ JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_isa
 JNIEXPORT jboolean JNICALL Java_net_cp_jlibical_ICalProperty_isa_1property
   (JNIEnv *env, jobject jobj, jobject arg)
 {
-	jboolean result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jboolean result = 0;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		void* argObjPtr = 0;
+    if (cObj != NULL)
+    {
+        void* argObjPtr = 0;
 
-		if (arg != NULL)
-		{
-			argObjPtr = getCObjectPtr(env,arg);
-		}
+        if (arg != NULL)
+        {
+            argObjPtr = getCObjectPtr(env,arg);
+        }
 
-		// get the result from the c++ object (argObjPtr can be 0, it's cObj's responsibility to handle this if an error).
-		result = cObj->isa_property(argObjPtr) != 0;
-	}
+        // get the result from the c++ object (argObjPtr can be 0, it's cObj's responsibility to handle this if an error).
+        result = cObj->isa_property(argObjPtr) != 0;
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -101,17 +111,17 @@ JNIEXPORT jboolean JNICALL Java_net_cp_jlibical_ICalProperty_isa_1property
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_add_1parameter
   (JNIEnv *env, jobject jobj, jobject arg)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		ICalParameter* icalparameter = getSubjectAsICalParameter(env,arg,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
+    if (cObj != NULL)
+    {
+        ICalParameter* icalparameter = getSubjectAsICalParameter(env,arg,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
 
-		if (icalparameter != NULL)
-		{
-			cObj->add_parameter(*icalparameter);
-		}
-	}
+        if (icalparameter != NULL)
+        {
+            cObj->add_parameter(*icalparameter);
+        }
+    }
 }
 
 /*
@@ -122,17 +132,17 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_add_1parameter
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1parameter
   (JNIEnv *env, jobject jobj, jobject arg)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		ICalParameter* icalparameter = getSubjectAsICalParameter(env,arg,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
+    if (cObj != NULL)
+    {
+        ICalParameter* icalparameter = getSubjectAsICalParameter(env,arg,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
 
-		if (icalparameter != NULL)
-		{
-			cObj->set_parameter(*icalparameter);
-		}
-	}
+        if (icalparameter != NULL)
+        {
+            cObj->set_parameter(*icalparameter);
+        }
+    }
 }
 
 /*
@@ -143,18 +153,18 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1parameter
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1parameter_1from_1string
   (JNIEnv *env, jobject jobj, jstring name, jstring value)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szName = env->GetStringUTFChars(name,NULL);
-		const char* szValue = env->GetStringUTFChars(value,NULL);
+    if (cObj != NULL)
+    {
+        const char* szName = env->GetStringUTFChars(name,NULL);
+        const char* szValue = env->GetStringUTFChars(value,NULL);
 
-		if (szName != NULL && szValue != NULL)
-		{
-			cObj->set_parameter_from_string((string)szName, (string)szValue);
-		}
-	}
+        if (szName != NULL && szValue != NULL)
+        {
+            cObj->set_parameter_from_string((string)szName, (string)szValue);
+        }
+    }
 }
 
 /*
@@ -165,27 +175,27 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1parameter_1from_1s
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1parameter_1as_1string
   (JNIEnv *env, jobject jobj, jstring name)
 {
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szName = env->GetStringUTFChars(name,NULL);
+    if (cObj != NULL)
+    {
+        const char* szName = env->GetStringUTFChars(name,NULL);
 
-		if (szName != NULL)
-		{
-			char* szValue = cObj->get_parameter_as_string((string)szName);
+        if (szName != NULL)
+        {
+            char* szValue = cObj->get_parameter_as_string((string)szName);
 
-			if (szValue == NULL)
-			{
-				szValue = "";
-			}
+            if (szValue == NULL)
+            {
+                szValue = "";
+            }
 
-			result = env->NewStringUTF(szValue);
-		}
-	}
+            result = env->NewStringUTF(szValue);
+        }
+    }
 
-	return (result);
+    return (result);
 }
 
 /*
@@ -196,12 +206,12 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1parameter_1as_1
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_remove_1parameter_by_kind
   (JNIEnv *env, jobject jobj, jint kind)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		cObj->remove_parameter_by_kind((icalparameter_kind)kind);
-	}
+    if (cObj != NULL)
+    {
+        cObj->remove_parameter_by_kind((icalparameter_kind)kind);
+    }
 }
 
 /*
@@ -212,15 +222,15 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_remove_1parameter_by_ki
 JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_count_1parameters
   (JNIEnv *env, jobject jobj)
 {
-	jint result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jint result = 0;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		result = cObj->count_parameters();
-	}
+    if (cObj != NULL)
+    {
+        result = cObj->count_parameters();
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -231,19 +241,19 @@ JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_count_1parameters
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1first_1parameter
   (JNIEnv *env, jobject jobj, jint kind)
 {
-	jobject result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jobject result = 0;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the first parameter from CObj
-		ICalParameter* aParameter = cObj->get_first_parameter((icalparameter_kind)kind);
+    if (cObj != NULL)
+    {
+        // get the first parameter from CObj
+        ICalParameter* aParameter = cObj->get_first_parameter((icalparameter_kind)kind);
 
-		// create a new surrogate, using aParameter as the subject (returns NULL if subject is NULL).
-		result = createNewICalParameterSurrogate(env,aParameter);
-	}
+        // create a new surrogate, using aParameter as the subject (returns NULL if subject is NULL).
+        result = createNewICalParameterSurrogate(env,aParameter);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -254,19 +264,19 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1first_1paramete
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1next_1parameter
   (JNIEnv *env, jobject jobj, jint kind)
 {
-	jobject result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jobject result = 0;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the first parameter from CObj
-		ICalParameter* aParameter = cObj->get_next_parameter((icalparameter_kind)kind);
+    if (cObj != NULL)
+    {
+        // get the first parameter from CObj
+        ICalParameter* aParameter = cObj->get_next_parameter((icalparameter_kind)kind);
 
-		// create a new surrogate, using aParameter as the subject (returns NULL if subject is NULL).
-		result = createNewICalParameterSurrogate(env,aParameter);
-	}
+        // create a new surrogate, using aParameter as the subject (returns NULL if subject is NULL).
+        result = createNewICalParameterSurrogate(env,aParameter);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -277,13 +287,13 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1next_1parameter
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1value
   (JNIEnv *env, jobject jobj, jobject arg)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		ICalValue* aValue = getSubjectAsICalValue(env,arg,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
-		cObj->set_value(*aValue);
-	}
+    if (cObj != NULL)
+    {
+        ICalValue* aValue = getSubjectAsICalValue(env,arg,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
+        cObj->set_value(*aValue);
+    }
 }
 
 /*
@@ -294,18 +304,18 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1value
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1value_1from_1string
   (JNIEnv *env, jobject jobj, jstring name, jstring value)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szName = env->GetStringUTFChars(name,NULL);
-		const char* szValue = env->GetStringUTFChars(value,NULL);
+    if (cObj != NULL)
+    {
+        const char* szName = env->GetStringUTFChars(name,NULL);
+        const char* szValue = env->GetStringUTFChars(value,NULL);
 
-		if (szName != NULL && szValue != NULL)
-		{
-			cObj->set_value_from_string((string)szName, (string)szValue);
-		}
-	}
+        if (szName != NULL && szValue != NULL)
+        {
+            cObj->set_value_from_string((string)szName, (string)szValue);
+        }
+    }
 }
 
 /*
@@ -316,19 +326,19 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1value_1from_1strin
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1value
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jobject result = 0;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the first value from CObj
-		ICalValue* aValue = cObj->get_value();
+    if (cObj != NULL)
+    {
+        // get the first value from CObj
+        ICalValue* aValue = cObj->get_value();
 
-		// create a new surrogate, using aValue as the subject (returns NULL if subject is NULL).
-		result = createNewICalValueSurrogate(env,aValue);
-	}
+        // create a new surrogate, using aValue as the subject (returns NULL if subject is NULL).
+        result = createNewICalValueSurrogate(env,aValue);
+    }
 
-	return (result);
+    return (result);
 }
 
 /*
@@ -339,22 +349,22 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1value
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1value_1as_1string
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_value_as_string();
+    if (cObj != NULL)
+    {
+        char* icalStr = cObj->get_value_as_string();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+        if (icalStr == NULL)
+        {
+            icalStr = "";
+        }
 
-		result = env->NewStringUTF(icalStr);
-	}
+        result = env->NewStringUTF(icalStr);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -365,22 +375,22 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1value_1as_1stri
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1name
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_name();
+    if (cObj != NULL)
+    {
+        char* icalStr = cObj->get_name();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+        if (icalStr == NULL)
+        {
+            icalStr = "";
+        }
 
-		result = env->NewStringUTF(icalStr);
-	}
+        result = env->NewStringUTF(icalStr);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -391,12 +401,12 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1name
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1action
   (JNIEnv *env, jobject jobj, jint value)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		cObj->set_action((icalproperty_action)value);
-	}
+    if (cObj != NULL)
+    {
+        cObj->set_action((icalproperty_action)value);
+    }
 }
 
 /*
@@ -407,15 +417,15 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1action
 JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_get_1action
   (JNIEnv *env, jobject jobj)
 {
-	jint result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jint result = 0;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		result = cObj->get_action();
-	}
+    if (cObj != NULL)
+    {
+        result = cObj->get_action();
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -426,15 +436,15 @@ JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_get_1action
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1attendee
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
+    if (cObj != NULL)
+    {
+        const char* szTemp = env->GetStringUTFChars(str,NULL);
 
-		cObj->set_attendee((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
+        cObj->set_attendee((char*)szTemp);
+        env->ReleaseStringUTFChars(str,szTemp);
+    }
 }
 
 /*
@@ -445,22 +455,22 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1attendee
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1attendee
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_attendee();
+    if (cObj != NULL)
+    {
+        char* icalStr = cObj->get_attendee();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+        if (icalStr == NULL)
+        {
+            icalStr = "";
+        }
 
-		result = env->NewStringUTF(icalStr);
-	}
+        result = env->NewStringUTF(icalStr);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -471,15 +481,15 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1attendee
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1comment
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
+    if (cObj != NULL)
+    {
+        const char* szTemp = env->GetStringUTFChars(str,NULL);
 
-		cObj->set_comment((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
+        cObj->set_comment((char*)szTemp);
+        env->ReleaseStringUTFChars(str,szTemp);
+    }
 }
 
 /*
@@ -490,21 +500,21 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1comment
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1comment
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* commentStr = cObj->get_comment();
+    if (cObj != NULL)
+    {
+        char* commentStr = cObj->get_comment();
 
-		if (commentStr == NULL)
-		{
-			commentStr = "";
-		}
+        if (commentStr == NULL)
+        {
+            commentStr = "";
+        }
 
-		result = env->NewStringUTF(commentStr);
-	}
-	return(result);
+        result = env->NewStringUTF(commentStr);
+    }
+    return(result);
 }
 
 /*
@@ -515,15 +525,15 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1comment
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1description
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
+    if (cObj != NULL)
+    {
+        const char* szTemp = env->GetStringUTFChars(str,NULL);
 
-		cObj->set_description((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
+        cObj->set_description((char*)szTemp);
+        env->ReleaseStringUTFChars(str,szTemp);
+    }
 }
 
 /*
@@ -534,22 +544,22 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1description
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1description
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_description();
+    if (cObj != NULL)
+    {
+        char* icalStr = cObj->get_description();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+        if (icalStr == NULL)
+        {
+            icalStr = "";
+        }
 
-		result = env->NewStringUTF(icalStr);
-	}
+        result = env->NewStringUTF(icalStr);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -560,17 +570,17 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1description
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1dtend
   (JNIEnv *env, jobject jobj, jobject arg)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		icaltimetype aTime;
+    if (cObj != NULL)
+    {
+        icaltimetype aTime;
 
-		if (copyObjToicaltimetype(env,arg,&aTime))
-		{
-			cObj->set_dtend(aTime);
-		}
-	}
+        if (copyObjToicaltimetype(env,arg,&aTime))
+        {
+            cObj->set_dtend(aTime);
+        }
+    }
 }
 
 /*
@@ -581,19 +591,19 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1dtend
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1dtend
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jobject result = 0;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the dtend time from CObj
-		icaltimetype aTime = cObj->get_dtend();
+    if (cObj != NULL)
+    {
+        // get the dtend time from CObj
+        icaltimetype aTime = cObj->get_dtend();
 
-		// create a new surrogate, using aTime as the subject.
-		result = createNewICalTimeType(env,&aTime);
-	}
+        // create a new surrogate, using aTime as the subject.
+        result = createNewICalTimeType(env,&aTime);
+    }
 
-	return (result);
+    return (result);
 }
 
 /*
@@ -604,17 +614,17 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1dtend
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1dtstamp
   (JNIEnv *env, jobject jobj, jobject dtstamp)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		icaltimetype aDTStamp;
+    if (cObj != NULL)
+    {
+        icaltimetype aDTStamp;
 
-		if (copyObjToicaltimetype(env,dtstamp,&aDTStamp))
-		{
-			cObj->set_dtstamp(aDTStamp);
-		}
-	}
+        if (copyObjToicaltimetype(env,dtstamp,&aDTStamp))
+        {
+            cObj->set_dtstamp(aDTStamp);
+        }
+    }
 }
 
 /*
@@ -625,19 +635,19 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1dtstamp
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1dtstamp
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jobject result = 0;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the dtstamp time from CObj
-		icaltimetype aDTStamp = cObj->get_dtstamp();
+    if (cObj != NULL)
+    {
+        // get the dtstamp time from CObj
+        icaltimetype aDTStamp = cObj->get_dtstamp();
 
-		// create a new surrogate, using aDTStamp as the subject.
-		result = createNewICalTimeType(env,&aDTStamp);
-	}
+        // create a new surrogate, using aDTStamp as the subject.
+        result = createNewICalTimeType(env,&aDTStamp);
+    }
 
-	return (result);
+    return (result);
 }
 
 /*
@@ -648,17 +658,17 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1dtstamp
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1dtstart
   (JNIEnv *env, jobject jobj, jobject arg)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		icaltimetype aTime;
+    if (cObj != NULL)
+    {
+        icaltimetype aTime;
 
-		if (copyObjToicaltimetype(env,arg,&aTime))
-		{
-			cObj->set_dtstart(aTime);
-		}
-	}
+        if (copyObjToicaltimetype(env,arg,&aTime))
+        {
+            cObj->set_dtstart(aTime);
+        }
+    }
 }
 
 /*
@@ -669,19 +679,19 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1dtstart
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1dtstart
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jobject result = 0;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the dtend time from CObj
-		icaltimetype aTime = cObj->get_dtstart();
+    if (cObj != NULL)
+    {
+        // get the dtend time from CObj
+        icaltimetype aTime = cObj->get_dtstart();
 
-		// create a new surrogate, using aTime as the subject.
-		result = createNewICalTimeType(env,&aTime);
-	}
+        // create a new surrogate, using aTime as the subject.
+        result = createNewICalTimeType(env,&aTime);
+    }
 
-	return (result);
+    return (result);
 }
 
 /*
@@ -692,17 +702,17 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1dtstart
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1due
   (JNIEnv *env, jobject jobj, jobject arg)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		icaltimetype aTime;
+    if (cObj != NULL)
+    {
+        icaltimetype aTime;
 
-		if (copyObjToicaltimetype(env,arg,&aTime))
-		{
-			cObj->set_due(aTime);
-		}
-	}
+        if (copyObjToicaltimetype(env,arg,&aTime))
+        {
+            cObj->set_due(aTime);
+        }
+    }
 }
 
 /*
@@ -713,19 +723,19 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1due
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1due
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jobject result = 0;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the dtend time from CObj
-		icaltimetype aTime = cObj->get_due();
+    if (cObj != NULL)
+    {
+        // get the dtend time from CObj
+        icaltimetype aTime = cObj->get_due();
 
-		// create a new surrogate, using aTime as the subject.
-		result = createNewICalTimeType(env,&aTime);
-	}
+        // create a new surrogate, using aTime as the subject.
+        result = createNewICalTimeType(env,&aTime);
+    }
 
-	return (result);
+    return (result);
 }
 
 /*
@@ -736,17 +746,17 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1due
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1duration
   (JNIEnv *env, jobject jobj, jobject arg)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		icaldurationtype aDuration;
+    if (cObj != NULL)
+    {
+        icaldurationtype aDuration;
 
-		if (copyObjToicaldurationtype(env,arg,&aDuration))
-		{
-			cObj->set_duration(aDuration);
-		}
-	}
+        if (copyObjToicaldurationtype(env,arg,&aDuration))
+        {
+            cObj->set_duration(aDuration);
+        }
+    }
 }
 
 /*
@@ -757,19 +767,19 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1duration
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1duration
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jobject result = 0;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the dtend time from CObj
-		icaldurationtype aDuration = cObj->get_duration();
+    if (cObj != NULL)
+    {
+        // get the dtend time from CObj
+        icaldurationtype aDuration = cObj->get_duration();
 
-		// create a new surrogate, using aTime as the subject.
-		result = createNewICalDurationType(env,&aDuration);
-	}
+        // create a new surrogate, using aTime as the subject.
+        result = createNewICalDurationType(env,&aDuration);
+    }
 
-	return (result);
+    return (result);
 }
 
 /*
@@ -780,15 +790,15 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1duration
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1location
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
+    if (cObj != NULL)
+    {
+        const char* szTemp = env->GetStringUTFChars(str,NULL);
 
-		cObj->set_location((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
+        cObj->set_location((char*)szTemp);
+        env->ReleaseStringUTFChars(str,szTemp);
+    }
 }
 
 /*
@@ -799,22 +809,22 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1location
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1location
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_location();
+    if (cObj != NULL)
+    {
+        char* icalStr = cObj->get_location();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+        if (icalStr == NULL)
+        {
+            icalStr = "";
+        }
 
-		result = env->NewStringUTF(icalStr);
-	}
+        result = env->NewStringUTF(icalStr);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -825,12 +835,12 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1location
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1method
   (JNIEnv *env, jobject jobj, jint value)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		cObj->set_method((icalproperty_method)value);
-	}
+    if (cObj != NULL)
+    {
+        cObj->set_method((icalproperty_method)value);
+    }
 }
 
 /*
@@ -841,15 +851,15 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1method
 JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_get_1method
   (JNIEnv *env, jobject jobj)
 {
-	jint result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jint result = 0;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		result = cObj->get_method();
-	}
+    if (cObj != NULL)
+    {
+        result = cObj->get_method();
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -860,15 +870,15 @@ JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_get_1method
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1organizer
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
+    if (cObj != NULL)
+    {
+        const char* szTemp = env->GetStringUTFChars(str,NULL);
 
-		cObj->set_organizer((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
+        cObj->set_organizer((char*)szTemp);
+        env->ReleaseStringUTFChars(str,szTemp);
+    }
 }
 
 /*
@@ -879,21 +889,21 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1organizer
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1organizer
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* organizerStr = cObj->get_organizer();
+    if (cObj != NULL)
+    {
+        char* organizerStr = cObj->get_organizer();
 
-		if (organizerStr == NULL)
-		{
-			organizerStr = "";
-		}
+        if (organizerStr == NULL)
+        {
+            organizerStr = "";
+        }
 
-		result = env->NewStringUTF(organizerStr);
-	}
-	return(result);
+        result = env->NewStringUTF(organizerStr);
+    }
+    return(result);
 }
 
 /*
@@ -904,15 +914,15 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1organizer
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1owner
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
+    if (cObj != NULL)
+    {
+        const char* szTemp = env->GetStringUTFChars(str,NULL);
 
-		cObj->set_owner((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
+        cObj->set_owner((char*)szTemp);
+        env->ReleaseStringUTFChars(str,szTemp);
+    }
 }
 
 /*
@@ -923,22 +933,22 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1owner
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1owner
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_owner();
+    if (cObj != NULL)
+    {
+        char* icalStr = cObj->get_owner();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+        if (icalStr == NULL)
+        {
+            icalStr = "";
+        }
 
-		result = env->NewStringUTF(icalStr);
-	}
+        result = env->NewStringUTF(icalStr);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -949,15 +959,15 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1owner
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1prodid
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
+    if (cObj != NULL)
+    {
+        const char* szTemp = env->GetStringUTFChars(str,NULL);
 
-		cObj->set_prodid((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
+        cObj->set_prodid((char*)szTemp);
+        env->ReleaseStringUTFChars(str,szTemp);
+    }
 }
 
 /*
@@ -968,22 +978,22 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1prodid
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1prodid
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_prodid();
+    if (cObj != NULL)
+    {
+        char* icalStr = cObj->get_prodid();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+        if (icalStr == NULL)
+        {
+            icalStr = "";
+        }
 
-		result = env->NewStringUTF(icalStr);
-	}
+        result = env->NewStringUTF(icalStr);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -994,15 +1004,15 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1prodid
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1query
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
+    if (cObj != NULL)
+    {
+        const char* szTemp = env->GetStringUTFChars(str,NULL);
 
-		cObj->set_query((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
+        cObj->set_query((char*)szTemp);
+        env->ReleaseStringUTFChars(str,szTemp);
+    }
 }
 
 /*
@@ -1013,22 +1023,22 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1query
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1query
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_query();
+    if (cObj != NULL)
+    {
+        char* icalStr = cObj->get_query();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+        if (icalStr == NULL)
+        {
+            icalStr = "";
+        }
 
-		result = env->NewStringUTF(icalStr);
-	}
+        result = env->NewStringUTF(icalStr);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -1039,15 +1049,15 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1query
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1queryname
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
+    if (cObj != NULL)
+    {
+        const char* szTemp = env->GetStringUTFChars(str,NULL);
 
-		cObj->set_queryname((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
+        cObj->set_queryname((char*)szTemp);
+        env->ReleaseStringUTFChars(str,szTemp);
+    }
 }
 
 /*
@@ -1058,22 +1068,22 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1queryname
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1queryname
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_queryname();
+    if (cObj != NULL)
+    {
+        char* icalStr = cObj->get_queryname();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+        if (icalStr == NULL)
+        {
+            icalStr = "";
+        }
 
-		result = env->NewStringUTF(icalStr);
-	}
+        result = env->NewStringUTF(icalStr);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -1084,12 +1094,12 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1queryname
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1repeat
   (JNIEnv *env, jobject jobj, jint value)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		cObj->set_repeat(value);
-	}
+    if (cObj != NULL)
+    {
+        cObj->set_repeat(value);
+    }
 }
 
 /*
@@ -1100,15 +1110,15 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1repeat
 JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_get_1repeat
   (JNIEnv *env, jobject jobj)
 {
-	jint result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jint result = 0;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		result = cObj->get_repeat();
-	}
+    if (cObj != NULL)
+    {
+        result = cObj->get_repeat();
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -1119,15 +1129,15 @@ JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_get_1repeat
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1summary
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
+    if (cObj != NULL)
+    {
+        const char* szTemp = env->GetStringUTFChars(str,NULL);
 
-		cObj->set_summary((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
+        cObj->set_summary((char*)szTemp);
+        env->ReleaseStringUTFChars(str,szTemp);
+    }
 }
 
 /*
@@ -1138,22 +1148,22 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1summary
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1summary
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_summary();
+    if (cObj != NULL)
+    {
+        char* icalStr = cObj->get_summary();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+        if (icalStr == NULL)
+        {
+            icalStr = "";
+        }
 
-		result = env->NewStringUTF(icalStr);
-	}
+        result = env->NewStringUTF(icalStr);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -1164,15 +1174,15 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1summary
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1target
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
+    if (cObj != NULL)
+    {
+        const char* szTemp = env->GetStringUTFChars(str,NULL);
 
-		cObj->set_target((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
+        cObj->set_target((char*)szTemp);
+        env->ReleaseStringUTFChars(str,szTemp);
+    }
 }
 
 /*
@@ -1183,22 +1193,22 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1target
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1target
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_target();
+    if (cObj != NULL)
+    {
+        char* icalStr = cObj->get_target();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+        if (icalStr == NULL)
+        {
+            icalStr = "";
+        }
 
-		result = env->NewStringUTF(icalStr);
-	}
+        result = env->NewStringUTF(icalStr);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -1209,17 +1219,17 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1target
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1trigger
   (JNIEnv *env, jobject jobj, jobject arg)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		icaltriggertype aTrigger;
+    if (cObj != NULL)
+    {
+        icaltriggertype aTrigger;
 
-		if (copyObjToicaltriggertype(env,arg,&aTrigger))
-		{
-			cObj->set_trigger(aTrigger);
-		}
-	}
+        if (copyObjToicaltriggertype(env,arg,&aTrigger))
+        {
+            cObj->set_trigger(aTrigger);
+        }
+    }
 }
 
 /*
@@ -1230,19 +1240,19 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1trigger
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1trigger
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jobject result = 0;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the dtend time from CObj
-		icaltriggertype aTrigger = cObj->get_trigger();
+    if (cObj != NULL)
+    {
+        // get the dtend time from CObj
+        icaltriggertype aTrigger = cObj->get_trigger();
 
-		// create a new surrogate, using aTime as the subject.
-		result = createNewICalTriggerType(env,&aTrigger);
-	}
+        // create a new surrogate, using aTime as the subject.
+        result = createNewICalTriggerType(env,&aTrigger);
+    }
 
-	return (result);
+    return (result);
 }
 
 /*
@@ -1253,15 +1263,15 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1trigger
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1tzid
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
+    if (cObj != NULL)
+    {
+        const char* szTemp = env->GetStringUTFChars(str,NULL);
 
-		cObj->set_tzid((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
+        cObj->set_tzid((char*)szTemp);
+        env->ReleaseStringUTFChars(str,szTemp);
+    }
 }
 
 /*
@@ -1272,22 +1282,22 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1tzid
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1tzid
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_tzid();
+    if (cObj != NULL)
+    {
+        char* icalStr = cObj->get_tzid();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+        if (icalStr == NULL)
+        {
+            icalStr = "";
+        }
 
-		result = env->NewStringUTF(icalStr);
-	}
+        result = env->NewStringUTF(icalStr);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -1298,15 +1308,15 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1tzid
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1uid
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
+    if (cObj != NULL)
+    {
+        const char* szTemp = env->GetStringUTFChars(str,NULL);
 
-		cObj->set_uid((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
+        cObj->set_uid((char*)szTemp);
+        env->ReleaseStringUTFChars(str,szTemp);
+    }
 }
 
 /*
@@ -1317,22 +1327,22 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1uid
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1uid
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_uid();
+    if (cObj != NULL)
+    {
+        char* icalStr = cObj->get_uid();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+        if (icalStr == NULL)
+        {
+            icalStr = "";
+        }
 
-		result = env->NewStringUTF(icalStr);
-	}
+        result = env->NewStringUTF(icalStr);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -1343,7 +1353,7 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1uid
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_init__
   (JNIEnv *env, jobject jobj)
 {
-	setCObjectPtr(env,jobj,new ICalProperty());
+    setCObjectPtr(env,jobj,new ICalProperty());
 }
 
 /*
@@ -1354,17 +1364,17 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_init__
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_init__Ljava_lang_String_2
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	if (str != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
+    if (str != NULL)
+    {
+        const char* szTemp = env->GetStringUTFChars(str,NULL);
 
-		setCObjectPtr(env,jobj,new ICalProperty((char*)szTemp));
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-	else
-	{
-		throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
-	}
+        setCObjectPtr(env,jobj,new ICalProperty((char*)szTemp));
+        env->ReleaseStringUTFChars(str,szTemp);
+    }
+    else
+    {
+        throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
+    }
 }
 
 /*
@@ -1375,7 +1385,7 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_init__Ljava_lang_String
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_init__I
   (JNIEnv *env, jobject jobj, jint kind)
 {
-	setCObjectPtr(env,jobj,new ICalProperty((icalproperty_kind)kind));
+    setCObjectPtr(env,jobj,new ICalProperty((icalproperty_kind)kind));
 }
 
 
@@ -1388,12 +1398,12 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_init__I
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1status
   (JNIEnv *env, jobject jobj, jint value)
 {
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		cObj->set_status((icalproperty_status)value);
-	}
+    if (cObj != NULL)
+    {
+        cObj->set_status((icalproperty_status)value);
+    }
 }
 
 /*
@@ -1404,15 +1414,15 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1status
 JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_get_1status
   (JNIEnv *env, jobject jobj)
 {
-	jint result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jint result = 0;
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		result = cObj->get_status();
-	}
+    if (cObj != NULL)
+    {
+        result = cObj->get_status();
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -1469,18 +1479,18 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1relcalid
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1exdate
   (JNIEnv *env, jobject jobj, jobject exdate)
 {
-	// get the ICalProperty c++ object from jobj
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    // get the ICalProperty c++ object from jobj
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		icaltimetype aExDate;
+    if (cObj != NULL)
+    {
+        icaltimetype aExDate;
 
-		if (copyObjToicaltimetype(env,exdate,&aExDate))
-		{
-			cObj->set_exdate(aExDate);
-		}
-	}
+        if (copyObjToicaltimetype(env,exdate,&aExDate))
+        {
+            cObj->set_exdate(aExDate);
+        }
+    }
 }
 
 /*
@@ -1491,20 +1501,20 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1exdate
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1exdate
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	// get the ICalProperty c++ object from jobj
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jobject result = 0;
+    // get the ICalProperty c++ object from jobj
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the exdate from CObj
-		icaltimetype aExDate = cObj->get_exdate();
+    if (cObj != NULL)
+    {
+        // get the exdate from CObj
+        icaltimetype aExDate = cObj->get_exdate();
 
-		// create a new surrogate, using aRecurrenceId as the subject.
-		result = createNewICalTimeType(env,&aExDate);
-	}
+        // create a new surrogate, using aRecurrenceId as the subject.
+        result = createNewICalTimeType(env,&aExDate);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -1515,16 +1525,16 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1exdate
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1exrule
   (JNIEnv *env, jobject jobj, jobject exrule)
 {
-	// get the ICalProperty c++ object from jobj
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		icalrecurrencetype aExRule;
-		if (copyObjToicalrecurrencetype(env,exrule,&aExRule))
-		{
-			cObj->set_exrule(aExRule);
-		}
-	}
+    // get the ICalProperty c++ object from jobj
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    if (cObj != NULL)
+    {
+        icalrecurrencetype aExRule;
+        if (copyObjToicalrecurrencetype(env,exrule,&aExRule))
+        {
+            cObj->set_exrule(aExRule);
+        }
+    }
 }
 
 /*
@@ -1535,20 +1545,20 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1exrule
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1exrule
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	// get the ICalProperty c++ object from jobj
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jobject result = 0;
+    // get the ICalProperty c++ object from jobj
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the exrule from CObj
-		icalrecurrencetype aExRule = cObj->get_exrule();
+    if (cObj != NULL)
+    {
+        // get the exrule from CObj
+        icalrecurrencetype aExRule = cObj->get_exrule();
 
-		// create a new surrogate, using aExRule as the subject.
-		result = createNewICalRecurrenceType(env,&aExRule);
-	}
+        // create a new surrogate, using aExRule as the subject.
+        result = createNewICalRecurrenceType(env,&aExRule);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -1559,18 +1569,18 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1exrule
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1freebusy
   (JNIEnv *env, jobject jobj, jobject period)
 {
-	// get the ICalProperty c++ object from jobj
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    // get the ICalProperty c++ object from jobj
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		icalperiodtype aPeriod;
+    if (cObj != NULL)
+    {
+        icalperiodtype aPeriod;
 
-		if (copyObjToicalperiodtype(env,period,&aPeriod))
-		{
-			cObj->set_freebusy(aPeriod);
-		}
-	}
+        if (copyObjToicalperiodtype(env,period,&aPeriod))
+        {
+            cObj->set_freebusy(aPeriod);
+        }
+    }
 }
 
 /*
@@ -1581,20 +1591,20 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1freebusy
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1freebusy
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	// get the ICalProperty c++ object from jobj
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jobject result = 0;
+    // get the ICalProperty c++ object from jobj
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the period from CObj
-		icalperiodtype aPeriod = cObj->get_freebusy();
+    if (cObj != NULL)
+    {
+        // get the period from CObj
+        icalperiodtype aPeriod = cObj->get_freebusy();
 
-		// create a new surrogate, using aPeriod as the subject.
-		result = createNewICalPeriodType(env,&aPeriod);
-	}
+        // create a new surrogate, using aPeriod as the subject.
+        result = createNewICalPeriodType(env,&aPeriod);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -1605,18 +1615,18 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1freebusy
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1recurrenceid
   (JNIEnv *env, jobject jobj, jobject recurrenceid)
 {
-	// get the ICalProperty c++ object from jobj
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    // get the ICalProperty c++ object from jobj
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		icaltimetype aRecurrenceId;
+    if (cObj != NULL)
+    {
+        icaltimetype aRecurrenceId;
 
-		if (copyObjToicaltimetype(env,recurrenceid,&aRecurrenceId))
-		{
-			cObj->set_recurrenceid(aRecurrenceId);
-		}
-	}
+        if (copyObjToicaltimetype(env,recurrenceid,&aRecurrenceId))
+        {
+            cObj->set_recurrenceid(aRecurrenceId);
+        }
+    }
 }
 
 /*
@@ -1627,20 +1637,20 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1recurrenceid
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1recurrenceid
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	// get the ICalProperty c++ object from jobj
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jobject result = 0;
+    // get the ICalProperty c++ object from jobj
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the exdate from CObj
-		icaltimetype aRecurrenceId = cObj->get_recurrenceid();
+    if (cObj != NULL)
+    {
+        // get the exdate from CObj
+        icaltimetype aRecurrenceId = cObj->get_recurrenceid();
 
-		// create a new surrogate, using aRecurrenceId as the subject.
-		result = createNewICalTimeType(env,&aRecurrenceId);
-	}
+        // create a new surrogate, using aRecurrenceId as the subject.
+        result = createNewICalTimeType(env,&aRecurrenceId);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -1651,18 +1661,18 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1recurrenceid
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1rrule
   (JNIEnv *env, jobject jobj, jobject rrule)
 {
-	// get the ICalProperty c++ object from jobj
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    // get the ICalProperty c++ object from jobj
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		icalrecurrencetype aRRule;
+    if (cObj != NULL)
+    {
+        icalrecurrencetype aRRule;
 
-		if (copyObjToicalrecurrencetype(env,rrule,&aRRule))
-		{
-			cObj->set_rrule(aRRule);
-		}
-	}
+        if (copyObjToicalrecurrencetype(env,rrule,&aRRule))
+        {
+            cObj->set_rrule(aRRule);
+        }
+    }
 }
 
 /*
@@ -1673,18 +1683,18 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1rrule
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1rrule
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	// get the ICalProperty c++ object from jobj
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jobject result = 0;
+    // get the ICalProperty c++ object from jobj
+    ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the rrule from CObj
-		icalrecurrencetype aRRule = cObj->get_rrule();
+    if (cObj != NULL)
+    {
+        // get the rrule from CObj
+        icalrecurrencetype aRRule = cObj->get_rrule();
 
-		// create a new surrogate, using aExRule as the subject.
-		result = createNewICalRecurrenceType(env,&aRRule);
-	}
+        // create a new surrogate, using aExRule as the subject.
+        result = createNewICalRecurrenceType(env,&aRRule);
+    }
 
-	return(result);
+    return(result);
 }
diff --git a/src/java/net_cp_jlibical_ICalProperty_cxx.h b/src/java/net_cp_jlibical_ICalProperty_cxx.h
index 3e98c0d3..cab2aa02 100644
--- a/src/java/net_cp_jlibical_ICalProperty_cxx.h
+++ b/src/java/net_cp_jlibical_ICalProperty_cxx.h
@@ -1,10 +1,20 @@
-
 /*======================================================================
  FILE: net_cp_jlibical_ICalProperty_cxx.h
  CREATOR: javah 1/11/02
+
  (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
 
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
+======================================================================*/
 #ifndef _Included_net_cp_jlibical_ICalProperty
 #define _Included_net_cp_jlibical_ICalProperty
 
diff --git a/src/java/net_cp_jlibical_ICalValue_cxx.cpp b/src/java/net_cp_jlibical_ICalValue_cxx.cpp
index de2adac8..bd932371 100644
--- a/src/java/net_cp_jlibical_ICalValue_cxx.cpp
+++ b/src/java/net_cp_jlibical_ICalValue_cxx.cpp
@@ -1,8 +1,18 @@
-/* -*- Mode: C -*- */
 /*======================================================================
  FILE: net_cp_jlibical_ICalValue_cxx.cpp
  CREATOR: gnorman 1/10/02
  (C) COPYRIGHT 2002, Critical Path
+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
 ======================================================================*/
 
 #ifndef NET_CP_JLIBICAL_ICALVALUE_CXX_H
@@ -29,22 +39,22 @@
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalValue_as_1ical_1string
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->as_ical_string();
+    if (cObj != NULL)
+    {
+        char* icalStr = cObj->as_ical_string();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+        if (icalStr == NULL)
+        {
+            icalStr = "";
+        }
 
-		result = env->NewStringUTF(icalStr);
-	}
+        result = env->NewStringUTF(icalStr);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -55,15 +65,15 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalValue_as_1ical_1string
 JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalValue_isa
   (JNIEnv *env, jobject jobj)
 {
-	jint result = 0;
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jint result = 0;
+    ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		result = cObj->isa();
-	}
+    if (cObj != NULL)
+    {
+        result = cObj->isa();
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -74,25 +84,25 @@ JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalValue_isa
 JNIEXPORT jboolean JNICALL Java_net_cp_jlibical_ICalValue_isa_1value
   (JNIEnv *env, jobject jobj, jobject arg)
 {
-	jboolean result = 0;
+    jboolean result = 0;
 
-	// get the c++ object from the jobj
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		// get the c++ object from arg
-		void* argObjPtr = 0;
+    // get the c++ object from the jobj
+    ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    if (cObj != NULL)
+    {
+        // get the c++ object from arg
+        void* argObjPtr = 0;
 
-		if (arg != NULL)
-		{
-			argObjPtr = getCObjectPtr(env,jobj);
-		}
+        if (arg != NULL)
+        {
+            argObjPtr = getCObjectPtr(env,jobj);
+        }
 
-		// get the result from the c++ object
-		result = cObj->isa_value(argObjPtr) != 0;
-	}
+        // get the result from the c++ object
+        result = cObj->isa_value(argObjPtr) != 0;
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -103,17 +113,17 @@ JNIEXPORT jboolean JNICALL Java_net_cp_jlibical_ICalValue_isa_1value
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1trigger
   (JNIEnv *env, jobject jobj, jobject arg)
 {
-	// get the c++ object from the jobj
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		icaltriggertype aTrigger; 
-
-		if (copyObjToicaltriggertype(env,arg,&aTrigger))
-		{
-			cObj->set_trigger(aTrigger);
-		}
-	}
+    // get the c++ object from the jobj
+    ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    if (cObj != NULL)
+    {
+        icaltriggertype aTrigger;
+
+        if (copyObjToicaltriggertype(env,arg,&aTrigger))
+        {
+            cObj->set_trigger(aTrigger);
+        }
+    }
 }
 
 /*
@@ -124,21 +134,21 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1trigger
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalValue_get_1trigger
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
+    jobject result = 0;
 
-	// get the c++ object from the jobj
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    // get the c++ object from the jobj
+    ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the trigger from CObj
-		icaltriggertype aTrigger = cObj->get_trigger();
+    if (cObj != NULL)
+    {
+        // get the trigger from CObj
+        icaltriggertype aTrigger = cObj->get_trigger();
 
-		// create a new surrogate, using aTrigger as the subject.
-		result = createNewICalTriggerType(env,&aTrigger);
-	}
+        // create a new surrogate, using aTrigger as the subject.
+        result = createNewICalTriggerType(env,&aTrigger);
+    }
 
-	return (result);
+    return (result);
 }
 
 /*
@@ -149,15 +159,15 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalValue_get_1trigger
 JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalValue_get_1method
   (JNIEnv *env, jobject jobj)
 {
-	jint result = 0;
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jint result = 0;
+    ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		result = cObj->get_method();
-	}
+    if (cObj != NULL)
+    {
+        result = cObj->get_method();
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -168,12 +178,12 @@ JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalValue_get_1method
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1method
   (JNIEnv *env, jobject jobj, jint value)
 {
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		cObj->set_method((icalproperty_method)value);
-	}
+    if (cObj != NULL)
+    {
+        cObj->set_method((icalproperty_method)value);
+    }
 }
 
 /*
@@ -184,22 +194,22 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1method
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalValue_get_1text
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_text();
+    if (cObj != NULL)
+    {
+        char* icalStr = cObj->get_text();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+        if (icalStr == NULL)
+        {
+            icalStr = "";
+        }
 
-		result = env->NewStringUTF(icalStr);
-	}
+        result = env->NewStringUTF(icalStr);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -210,15 +220,15 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalValue_get_1text
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1text
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
+    if (cObj != NULL)
+    {
+        const char* szTemp = env->GetStringUTFChars(str,NULL);
 
-		cObj->set_text((char*)szTemp);                                                                                                                                                                                                                    
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
+        cObj->set_text((char*)szTemp);
+        env->ReleaseStringUTFChars(str,szTemp);
+    }
 }
 
 /*
@@ -229,21 +239,21 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1text
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalValue_get_1duration
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
+    jobject result = 0;
 
-	// get the c++ object from the jobj
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    // get the c++ object from the jobj
+    ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the duration from CObj
-		icaldurationtype aDuration = cObj->get_duration();
+    if (cObj != NULL)
+    {
+        // get the duration from CObj
+        icaldurationtype aDuration = cObj->get_duration();
 
-		// create a new surrogate, using aDuration as the subject.
-		result = createNewICalDurationType(env,&aDuration);
-	}
+        // create a new surrogate, using aDuration as the subject.
+        result = createNewICalDurationType(env,&aDuration);
+    }
 
-	return (result);
+    return (result);
 }
 
 /*
@@ -254,18 +264,18 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalValue_get_1duration
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1duration
   (JNIEnv *env, jobject jobj, jobject arg)
 {
-	// get the c++ object from the jobj
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		icaldurationtype aDuration;
-
-		if (copyObjToicaldurationtype(env,arg,&aDuration))
-		{
-			cObj->set_duration(aDuration);
-		}
-	}
+    // get the c++ object from the jobj
+    ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+
+    if (cObj != NULL)
+    {
+        icaldurationtype aDuration;
+
+        if (copyObjToicaldurationtype(env,arg,&aDuration))
+        {
+            cObj->set_duration(aDuration);
+        }
+    }
 }
 
 /*
@@ -276,22 +286,22 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1duration
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalValue_get_1query
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jstring result = NULL;
+    ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_query();
+    if (cObj != NULL)
+    {
+        char* icalStr = cObj->get_query();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+        if (icalStr == NULL)
+        {
+            icalStr = "";
+        }
 
-		result = env->NewStringUTF(icalStr);
-	}
+        result = env->NewStringUTF(icalStr);
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -302,15 +312,15 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalValue_get_1query
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1query
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
+    if (cObj != NULL)
+    {
+        const char* szTemp = env->GetStringUTFChars(str,NULL);
 
-		cObj->set_query((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
+        cObj->set_query((char*)szTemp);
+        env->ReleaseStringUTFChars(str,szTemp);
+    }
 }
 
 /*
@@ -321,18 +331,18 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1query
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalValue_get_1datetime
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = NULL;
+    jobject result = NULL;
 
-	// get the c++ object from the jobj
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    // get the c++ object from the jobj
+    ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		icaltimetype aTime = cObj->get_datetime();
-		result = createNewICalTimeType(env,&aTime);
-	}
+    if (cObj != NULL)
+    {
+        icaltimetype aTime = cObj->get_datetime();
+        result = createNewICalTimeType(env,&aTime);
+    }
 
-	return (result);
+    return (result);
 }
 
 /*
@@ -343,18 +353,18 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalValue_get_1datetime
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1datetime
   (JNIEnv *env, jobject jobj, jobject arg)
 {
-	// get the c++ object from the jobj
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		icaltimetype aTime;
-
-		if (copyObjToicaltimetype(env,arg,&aTime))
-		{
-			cObj->set_datetime(aTime);
-		}
-	}
+    // get the c++ object from the jobj
+    ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+
+    if (cObj != NULL)
+    {
+        icaltimetype aTime;
+
+        if (copyObjToicaltimetype(env,arg,&aTime))
+        {
+            cObj->set_datetime(aTime);
+        }
+    }
 }
 
 /*
@@ -365,15 +375,15 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1datetime
 JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalValue_get_1action
   (JNIEnv *env, jobject jobj)
 {
-	jint result = 0;
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    jint result = 0;
+    ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		result = cObj->get_action();
-	}
+    if (cObj != NULL)
+    {
+        result = cObj->get_action();
+    }
 
-	return(result);
+    return(result);
 }
 
 /*
@@ -384,12 +394,12 @@ JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalValue_get_1action
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1action
   (JNIEnv *env, jobject jobj, jint value)
 {
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+    ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		cObj->set_action((icalproperty_action)value);
-	}
+    if (cObj != NULL)
+    {
+        cObj->set_action((icalproperty_action)value);
+    }
 }
 
 /*
@@ -400,7 +410,7 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1action
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_init__
   (JNIEnv *env, jobject jobj)
 {
-	setCObjectPtr(env,jobj,new ICalValue());
+    setCObjectPtr(env,jobj,new ICalValue());
 }
 
 /*
@@ -411,17 +421,17 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_init__
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_init__ILjava_lang_String_2
   (JNIEnv *env, jobject jobj, jint kind, jstring str)
 {
-	if (str != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		setCObjectPtr(env,jobj,new ICalValue((icalvalue_kind)kind,(char*)szTemp));
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-	else
-	{
-		throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
-	}
+    if (str != NULL)
+    {
+        const char* szTemp = env->GetStringUTFChars(str,NULL);
+
+        setCObjectPtr(env,jobj,new ICalValue((icalvalue_kind)kind,(char*)szTemp));
+        env->ReleaseStringUTFChars(str,szTemp);
+    }
+    else
+    {
+        throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
+    }
 }
 
 /*
@@ -432,5 +442,5 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_init__ILjava_lang_String_2
 JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_init__I
   (JNIEnv *env, jobject jobj, jint kind)
 {
-	setCObjectPtr(env,jobj,new ICalValue((icalvalue_kind)kind));
+    setCObjectPtr(env,jobj,new ICalValue((icalvalue_kind)kind));
 }
diff --git a/src/java/net_cp_jlibical_ICalValue_cxx.h b/src/java/net_cp_jlibical_ICalValue_cxx.h
index 989cf59a..99de8fa8 100644
--- a/src/java/net_cp_jlibical_ICalValue_cxx.h
+++ b/src/java/net_cp_jlibical_ICalValue_cxx.h
@@ -1,10 +1,20 @@
-
 /*======================================================================
  FILE: net_cp_jlibical_ICalValue_cxx.h
  CREATOR: javah 1/11/02
+
  (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
 
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
+======================================================================*/
 #ifndef _Included_net_cp_jlibical_ICalValue
 #define _Included_net_cp_jlibical_ICalValue
 
diff --git a/src/java/net_cp_jlibical_VComponent_cxx.cpp b/src/java/net_cp_jlibical_VComponent_cxx.cpp
index cd27d34e..d9e1fb5e 100644
--- a/src/java/net_cp_jlibical_VComponent_cxx.cpp
+++ b/src/java/net_cp_jlibical_VComponent_cxx.cpp
@@ -1,8 +1,18 @@
-/*
 /*======================================================================
  FILE: net_cp_jlibical_VComponent_cxx.cpp
  CREATOR: gnorman 1/10/02
  (C) COPYRIGHT 2002, Critical Path
+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
 ======================================================================*/
 
 #ifndef NET_CP_JLIBICAL_VCOMPONENT_CXX_H
@@ -33,23 +43,23 @@
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_VComponent_as_1ical_1string
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jstring result = NULL;
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->as_ical_string();
+        if (cObj != NULL)
+        {
+                char* icalStr = cObj->as_ical_string();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+                if (icalStr == NULL)
+                {
+                        icalStr = "";
+                }
 
-		result = env->NewStringUTF(icalStr);
-	}
+                result = env->NewStringUTF(icalStr);
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -60,16 +70,16 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_VComponent_as_1ical_1string
 JNIEXPORT jint JNICALL Java_net_cp_jlibical_VComponent_isa
   (JNIEnv *env, jobject jobj)
 {
-	jint result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jint result = 0;
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		result = cObj->isa();
-	}
+        if (cObj != NULL)
+        {
+                result = cObj->isa();
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -80,25 +90,25 @@ JNIEXPORT jint JNICALL Java_net_cp_jlibical_VComponent_isa
 JNIEXPORT jboolean JNICALL Java_net_cp_jlibical_VComponent_isa_1component
   (JNIEnv *env, jobject jobj, jobject candidateObj)
 {
-	jboolean result = 0;
+        jboolean result = 0;
 
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		void* candidateValue = 0;
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        if (cObj != NULL)
+        {
+                void* candidateValue = 0;
 
-		if (candidateObj != NULL)
-		{
-			// get the c++ object from candidateObj (as long)
-			candidateValue = getCObjectPtr(env,candidateObj);
-		}
+                if (candidateObj != NULL)
+                {
+                        // get the c++ object from candidateObj (as long)
+                        candidateValue = getCObjectPtr(env,candidateObj);
+                }
 
-		// get the result from the c++ object (candidateValue can be 0, it's cObj's responsibility to handle this if an error).
-		result = cObj->isa_component(candidateValue) != 0;
-	}
+                // get the result from the c++ object (candidateValue can be 0, it's cObj's responsibility to handle this if an error).
+                result = cObj->isa_component(candidateValue) != 0;
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -109,18 +119,18 @@ JNIEXPORT jboolean JNICALL Java_net_cp_jlibical_VComponent_isa_1component
 JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_add_1property
   (JNIEnv *env, jobject jobj, jobject jprop)
 {
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		// get the ICalProperty c++ object from jprop
-		ICalProperty* icalProperty = getSubjectAsICalProperty(env,jprop,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        if (cObj != NULL)
+        {
+                // get the ICalProperty c++ object from jprop
+                ICalProperty* icalProperty = getSubjectAsICalProperty(env,jprop,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
 
-		if (icalProperty != NULL)
-		{
-			cObj->add_property(icalProperty);
-		}
-	}
+                if (icalProperty != NULL)
+                {
+                        cObj->add_property(icalProperty);
+                }
+        }
 }
 
 /*
@@ -131,18 +141,18 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_add_1property
 JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_remove_1property
   (JNIEnv *env, jobject jobj, jobject jprop)
 {
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		// get the ICalProperty c++ object from jprop
-		ICalProperty* icalProperty = getSubjectAsICalProperty(env,jprop,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        if (cObj != NULL)
+        {
+                // get the ICalProperty c++ object from jprop
+                ICalProperty* icalProperty = getSubjectAsICalProperty(env,jprop,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
 
-		if (icalProperty != NULL)
-		{
-			cObj->remove_property(icalProperty);
-		}
-	}
+                if (icalProperty != NULL)
+                {
+                        cObj->remove_property(icalProperty);
+                }
+        }
 }
 
 /*
@@ -153,16 +163,16 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_remove_1property
 JNIEXPORT jint JNICALL Java_net_cp_jlibical_VComponent_count_1properties
   (JNIEnv *env, jobject jobj, jint kind)
 {
-	jint result = 0;
+        jint result = 0;
 
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		result = cObj->count_properties((icalproperty_kind)kind);
-	}
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        if (cObj != NULL)
+        {
+                result = cObj->count_properties((icalproperty_kind)kind);
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -173,20 +183,20 @@ JNIEXPORT jint JNICALL Java_net_cp_jlibical_VComponent_count_1properties
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1current_1property
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jobject result = 0;
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the current property from CObj
-		ICalProperty* aProperty = cObj->get_current_property();
+        if (cObj != NULL)
+        {
+                // get the current property from CObj
+                ICalProperty* aProperty = cObj->get_current_property();
 
-		// create a new surrogate, using aProperty as the subject (returns NULL if subject is NULL).
-		result = createNewICalPropertySurrogate(env,aProperty);
-	}
+                // create a new surrogate, using aProperty as the subject (returns NULL if subject is NULL).
+                result = createNewICalPropertySurrogate(env,aProperty);
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -197,20 +207,20 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1current_1property
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1first_1property
   (JNIEnv *env, jobject jobj, jint kind)
 {
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jobject result = 0;
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the first property from CObj
-		ICalProperty* aProperty = cObj->get_first_property((icalproperty_kind)kind);
+        if (cObj != NULL)
+        {
+                // get the first property from CObj
+                ICalProperty* aProperty = cObj->get_first_property((icalproperty_kind)kind);
 
-		// create a new surrogate, using aProperty as the subject (returns NULL if subject is NULL).
-		result = createNewICalPropertySurrogate(env,aProperty);
-	}
+                // create a new surrogate, using aProperty as the subject (returns NULL if subject is NULL).
+                result = createNewICalPropertySurrogate(env,aProperty);
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -221,19 +231,19 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1first_1property
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1next_1property
   (JNIEnv *env, jobject jobj, jint kind)
 {
-	jobject result = 0;
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jobject result = 0;
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the next property from CObj
-		ICalProperty* aProperty = cObj->get_next_property((icalproperty_kind)kind);
+        if (cObj != NULL)
+        {
+                // get the next property from CObj
+                ICalProperty* aProperty = cObj->get_next_property((icalproperty_kind)kind);
 
-		// create a new surrogate, using aProperty as the subject (returns NULL if subject is NULL).
-		result = createNewICalPropertySurrogate(env,aProperty);
-	}
+                // create a new surrogate, using aProperty as the subject (returns NULL if subject is NULL).
+                result = createNewICalPropertySurrogate(env,aProperty);
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -244,19 +254,19 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1next_1property
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1inner
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jobject result = 0;
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the next property from CObj
-		VComponent* inner = cObj->get_inner();
+        if (cObj != NULL)
+        {
+                // get the next property from CObj
+                VComponent* inner = cObj->get_inner();
 
-		// create a new surrogate, using inner as the subject (returns NULL if subject is NULL).
-		result = createNewVComponentSurrogate(env,inner);
-	}
+                // create a new surrogate, using inner as the subject (returns NULL if subject is NULL).
+                result = createNewVComponentSurrogate(env,inner);
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -267,18 +277,18 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1inner
 JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_add_1component
   (JNIEnv *env, jobject jobj, jobject jcomp)
 {
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		// get the VComponent c++ object from jcomp
-		VComponent* aComponent = getSubjectAsVComponent(env,jcomp,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        if (cObj != NULL)
+        {
+                // get the VComponent c++ object from jcomp
+                VComponent* aComponent = getSubjectAsVComponent(env,jcomp,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
 
-		if (aComponent != NULL)
-		{
-			cObj->add_component(aComponent);
-		}
-	}
+                if (aComponent != NULL)
+                {
+                        cObj->add_component(aComponent);
+                }
+        }
 }
 
 /*
@@ -289,18 +299,18 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_add_1component
 JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_remove_1component
   (JNIEnv *env, jobject jobj, jobject jcomp)
 {
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		// get the VComponent c++ object from jcomp
-		VComponent* aComponent = getSubjectAsVComponent(env,jcomp,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        if (cObj != NULL)
+        {
+                // get the VComponent c++ object from jcomp
+                VComponent* aComponent = getSubjectAsVComponent(env,jcomp,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
 
-		if (aComponent != NULL)
-		{
-			cObj->remove_component(aComponent);
-		}
-	}
+                if (aComponent != NULL)
+                {
+                        cObj->remove_component(aComponent);
+                }
+        }
 }
 
 /*
@@ -311,16 +321,16 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_remove_1component
 JNIEXPORT jint JNICALL Java_net_cp_jlibical_VComponent_count_1components
   (JNIEnv *env, jobject jobj, jint kind)
 {
-	jint result = 0;
+        jint result = 0;
 
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		result = cObj->count_components((icalcomponent_kind)kind);
-	}
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        if (cObj != NULL)
+        {
+                result = cObj->count_components((icalcomponent_kind)kind);
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -331,19 +341,19 @@ JNIEXPORT jint JNICALL Java_net_cp_jlibical_VComponent_count_1components
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1current_1component
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jobject result = 0;
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the next property from CObj
-		VComponent* aComponent = cObj->get_current_component();
+        if (cObj != NULL)
+        {
+                // get the next property from CObj
+                VComponent* aComponent = cObj->get_current_component();
 
-		// create a new surrogate, using aComponent as the subject (returns NULL if subject is NULL).
-		result = createNewVComponentSurrogate(env,aComponent);
-	}
+                // create a new surrogate, using aComponent as the subject (returns NULL if subject is NULL).
+                result = createNewVComponentSurrogate(env,aComponent);
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -354,20 +364,20 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1current_1componen
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1first_1component
   (JNIEnv *env, jobject jobj, jint kind)
 {
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jobject result = 0;
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the first component from CObj
-		VComponent* aComponent = cObj->get_first_component((icalcomponent_kind)kind);
+        if (cObj != NULL)
+        {
+                // get the first component from CObj
+                VComponent* aComponent = cObj->get_first_component((icalcomponent_kind)kind);
 
-		// create a new surrogate, using aComponent as the subject (returns NULL if subject is NULL).
-		result = createNewVComponentSurrogate(env,aComponent);
-	}
+                // create a new surrogate, using aComponent as the subject (returns NULL if subject is NULL).
+                result = createNewVComponentSurrogate(env,aComponent);
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -378,20 +388,20 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1first_1component
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1next_1component
   (JNIEnv *env, jobject jobj, jint kind)
 {
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jobject result = 0;
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the first component from CObj
-		VComponent* aComponent = cObj->get_next_component((icalcomponent_kind)kind);
+        if (cObj != NULL)
+        {
+                // get the first component from CObj
+                VComponent* aComponent = cObj->get_next_component((icalcomponent_kind)kind);
 
-		// create a new surrogate, using aComponent as the subject (returns NULL if subject is NULL).
-		result = createNewVComponentSurrogate(env,aComponent);
-	}
+                // create a new surrogate, using aComponent as the subject (returns NULL if subject is NULL).
+                result = createNewVComponentSurrogate(env,aComponent);
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -402,20 +412,20 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1next_1component
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1dtstart
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jobject result = 0;
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the dtstart time from CObj
-		icaltimetype aTime = cObj->get_dtstart();
+        if (cObj != NULL)
+        {
+                // get the dtstart time from CObj
+                icaltimetype aTime = cObj->get_dtstart();
 
                 // create a new surrogate, using aTime as the subject.
-		result = createNewICalTimeType(env,&aTime);
-	}
+                result = createNewICalTimeType(env,&aTime);
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -426,19 +436,19 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1dtstart
 JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1dtstart
   (JNIEnv *env, jobject jobj, jobject dtstart)
 {
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jobject result = 0;
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		icaltimetype aStartTime;
+        if (cObj != NULL)
+        {
+                icaltimetype aStartTime;
 
-		if (copyObjToicaltimetype(env,dtstart,&aStartTime))
-		{
-			cObj->set_dtstart(aStartTime);
-		}
-	}
+                if (copyObjToicaltimetype(env,dtstart,&aStartTime))
+                {
+                        cObj->set_dtstart(aStartTime);
+                }
+        }
 }
 
 /*
@@ -449,21 +459,21 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1dtstart
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1dtend
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jobject result = 0;
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the dtend time from CObj
-		icaltimetype aTime = cObj->get_dtend();
+        if (cObj != NULL)
+        {
+                // get the dtend time from CObj
+                icaltimetype aTime = cObj->get_dtend();
 
-		// create a new surrogate, using aTime as the subject.
-		result = createNewICalTimeType(env,&aTime);
+                // create a new surrogate, using aTime as the subject.
+                result = createNewICalTimeType(env,&aTime);
 
-	}
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -474,19 +484,19 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1dtend
 JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1dtend
   (JNIEnv *env, jobject jobj, jobject dtend)
 {
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jobject result = 0;
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		icaltimetype anEndTime;
+        if (cObj != NULL)
+        {
+                icaltimetype anEndTime;
 
-		if (copyObjToicaltimetype(env,dtend,&anEndTime))
-		{
-			cObj->set_dtend(anEndTime);
-		}
-	}
+                if (copyObjToicaltimetype(env,dtend,&anEndTime))
+                {
+                        cObj->set_dtend(anEndTime);
+                }
+        }
 }
 
 /*
@@ -497,20 +507,20 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1dtend
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1duration
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jobject result = 0;
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the duration time from CObj
-		icaldurationtype aDuration = cObj->get_duration();
+        if (cObj != NULL)
+        {
+                // get the duration time from CObj
+                icaldurationtype aDuration = cObj->get_duration();
 
-		// create a new surrogate, using aDuration as the subject.
-		result = createNewICalDurationType(env,&aDuration);
-	}
+                // create a new surrogate, using aDuration as the subject.
+                result = createNewICalDurationType(env,&aDuration);
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -521,19 +531,19 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1duration
 JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1duration
   (JNIEnv *env, jobject jobj, jobject duration)
 {
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jobject result = 0;
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		icaldurationtype aDuration;
+        if (cObj != NULL)
+        {
+                icaldurationtype aDuration;
 
-		if (copyObjToicaldurationtype(env,duration,&aDuration))
-		{
-			cObj->set_duration(aDuration);
-		}
-	}
+                if (copyObjToicaldurationtype(env,duration,&aDuration))
+                {
+                        cObj->set_duration(aDuration);
+                }
+        }
 }
 
 /*
@@ -544,15 +554,15 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1duration
 JNIEXPORT jint JNICALL Java_net_cp_jlibical_VComponent_get_1method
   (JNIEnv *env, jobject jobj)
 {
-	jint result = 0;
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jint result = 0;
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		result = cObj->get_method();
-	}
+        if (cObj != NULL)
+        {
+                result = cObj->get_method();
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -563,12 +573,12 @@ JNIEXPORT jint JNICALL Java_net_cp_jlibical_VComponent_get_1method
 JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1method
   (JNIEnv *env, jobject jobj, jint value)
 {
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		cObj->set_method((icalproperty_method)value);
-	}
+        if (cObj != NULL)
+        {
+                cObj->set_method((icalproperty_method)value);
+        }
 }
 
 /*
@@ -579,22 +589,22 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1method
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_VComponent_get_1summary
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jstring result = NULL;
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_summary();
+        if (cObj != NULL)
+        {
+                char* icalStr = cObj->get_summary();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+                if (icalStr == NULL)
+                {
+                        icalStr = "";
+                }
 
-		result = env->NewStringUTF(icalStr);
-	}
+                result = env->NewStringUTF(icalStr);
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -605,15 +615,15 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_VComponent_get_1summary
 JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1summary
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
+        if (cObj != NULL)
+        {
+                const char* szTemp = env->GetStringUTFChars(str,NULL);
 
-		cObj->set_summary((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
+                cObj->set_summary((char*)szTemp);
+                env->ReleaseStringUTFChars(str,szTemp);
+        }
 }
 
 /*
@@ -624,20 +634,20 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1summary
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1dtstamp
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jobject result = 0;
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the recurrenceid from CObj
-		icaltimetype aDTStamp = cObj->get_dtstamp();
+        if (cObj != NULL)
+        {
+                // get the recurrenceid from CObj
+                icaltimetype aDTStamp = cObj->get_dtstamp();
 
         // create a new surrogate, using aRecurrenceId as the subject.
-		result = createNewICalTimeType(env,&aDTStamp);
-	}
+                result = createNewICalTimeType(env,&aDTStamp);
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -648,18 +658,18 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1dtstamp
 JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1dtstamp
   (JNIEnv *env, jobject jobj, jobject dtstamp)
 {
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		icaltimetype aDTStamp;
+        if (cObj != NULL)
+        {
+                icaltimetype aDTStamp;
 
-		if (copyObjToicaltimetype(env,dtstamp,&aDTStamp))
-		{
-			cObj->set_dtstamp(aDTStamp);
-		}
-	}
+                if (copyObjToicaltimetype(env,dtstamp,&aDTStamp))
+                {
+                        cObj->set_dtstamp(aDTStamp);
+                }
+        }
 }
 
 /*
@@ -759,22 +769,22 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1description
 JNIEXPORT jstring JNICALL Java_net_cp_jlibical_VComponent_get_1uid
   (JNIEnv *env, jobject jobj)
 {
-	jstring result = NULL;
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jstring result = NULL;
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_uid();
+        if (cObj != NULL)
+        {
+                char* icalStr = cObj->get_uid();
 
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
+                if (icalStr == NULL)
+                {
+                        icalStr = "";
+                }
 
-		result = env->NewStringUTF(icalStr);
-	}
+                result = env->NewStringUTF(icalStr);
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -785,15 +795,15 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_VComponent_get_1uid
 JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1uid
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
+        if (cObj != NULL)
+        {
+                const char* szTemp = env->GetStringUTFChars(str,NULL);
 
-		cObj->set_uid((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
+                cObj->set_uid((char*)szTemp);
+                env->ReleaseStringUTFChars(str,szTemp);
+        }
 }
 
 /*
@@ -804,20 +814,20 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1uid
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1first_1real_1component
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jobject result = 0;
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the first component from CObj
-		VComponent* aComponent = cObj->get_first_real_component();
+        if (cObj != NULL)
+        {
+                // get the first component from CObj
+                VComponent* aComponent = cObj->get_first_real_component();
 
-		// create a new surrogate, using aComponent as the subject (returns NULL if subject is NULL).
-		result = createNewVComponentSurrogate(env,aComponent);
-	}
+                // create a new surrogate, using aComponent as the subject (returns NULL if subject is NULL).
+                result = createNewVComponentSurrogate(env,aComponent);
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -828,7 +838,7 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1first_1real_1comp
 JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_init__
   (JNIEnv *env, jobject jobj)
 {
-	setCObjectPtr(env,jobj,new VComponent());
+        setCObjectPtr(env,jobj,new VComponent());
 }
 
 /*
@@ -839,17 +849,17 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_init__
 JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_init__Ljava_lang_String_2
   (JNIEnv *env, jobject jobj, jstring str)
 {
-	if (str != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
+        if (str != NULL)
+        {
+                const char* szTemp = env->GetStringUTFChars(str,NULL);
 
-		setCObjectPtr(env,jobj,new VComponent((char*)szTemp));
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-	else
-	{
-		throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
-	}
+                setCObjectPtr(env,jobj,new VComponent((char*)szTemp));
+                env->ReleaseStringUTFChars(str,szTemp);
+        }
+        else
+        {
+                throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
+        }
 }
 
 /*
@@ -860,7 +870,7 @@ JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_init__Ljava_lang_String_2
 JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_init__I
   (JNIEnv *env, jobject jobj, jint kind)
 {
-	setCObjectPtr(env,jobj,new VComponent((icalcomponent_kind)kind));
+        setCObjectPtr(env,jobj,new VComponent((icalcomponent_kind)kind));
 }
 
 /*
@@ -916,20 +926,20 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_VComponent_get_1relcalid
 JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1recurrenceid
   (JNIEnv *env, jobject jobj)
 {
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jobject result = 0;
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		// get the recurrenceid from CObj
-		icaltimetype aRecurrenceId = cObj->get_recurrenceid();
+        if (cObj != NULL)
+        {
+                // get the recurrenceid from CObj
+                icaltimetype aRecurrenceId = cObj->get_recurrenceid();
 
         // create a new surrogate, using aRecurrenceId as the subject.
-		result = createNewICalTimeType(env,&aRecurrenceId);
-	}
+                result = createNewICalTimeType(env,&aRecurrenceId);
+        }
 
-	return(result);
+        return(result);
 }
 
 /*
@@ -940,17 +950,17 @@ JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1recurrenceid
 JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1recurrenceid
   (JNIEnv *env, jobject jobj, jobject recurrenceid)
 {
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
+        jobject result = 0;
+        // get the VComponent c++ object from jobj
+        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
-	if (cObj != NULL)
-	{
-		icaltimetype aRecurrenceId;
+        if (cObj != NULL)
+        {
+                icaltimetype aRecurrenceId;
 
-		if (copyObjToicaltimetype(env,recurrenceid,&aRecurrenceId))
-		{
-			cObj->set_recurrenceid(aRecurrenceId);
-		}
-	}
+                if (copyObjToicaltimetype(env,recurrenceid,&aRecurrenceId))
+                {
+                        cObj->set_recurrenceid(aRecurrenceId);
+                }
+        }
 }
diff --git a/src/java/net_cp_jlibical_VComponent_cxx.h b/src/java/net_cp_jlibical_VComponent_cxx.h
index ad2dfb60..e42feac6 100644
--- a/src/java/net_cp_jlibical_VComponent_cxx.h
+++ b/src/java/net_cp_jlibical_VComponent_cxx.h
@@ -1,10 +1,20 @@
-
 /*======================================================================
  FILE: net_cp_jlibical_VComponent_cxx.h
  CREATOR: javah 1/11/02
+
  (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
 
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of either:
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
+
+ Or:
+
+    The Mozilla Public License Version 2.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
+======================================================================*/
 #ifndef _Included_net_cp_jlibical_VComponent
 #define _Included_net_cp_jlibical_VComponent