diff options
author | Kent Sutherland <git@ksuther.com> | 2017-02-12 17:42:02 -0600 |
---|---|---|
committer | Kent Sutherland <git@ksuther.com> | 2017-02-12 17:42:02 -0600 |
commit | 4e668943bf8278b1b61af3b00e85e076ecbd8a4f (patch) | |
tree | 2aebba50df63118ec036546fc6e636daf49af43f /src/java | |
parent | c06484a5f0005a6e8ec859a906c2cf3f4a0fd9a7 (diff) | |
download | libical-git-4e668943bf8278b1b61af3b00e85e076ecbd8a4f.tar.gz |
Removed references to is_utc from Java and libical-glib.
Diffstat (limited to 'src/java')
-rw-r--r-- | src/java/ICalTimeType.java | 10 | ||||
-rw-r--r-- | src/java/jniICalPeriodType_cxx.cpp | 4 | ||||
-rw-r--r-- | src/java/jniICalRecurrenceType_cxx.cpp | 2 | ||||
-rw-r--r-- | src/java/jniICalTimeType_cxx.cpp | 14 | ||||
-rw-r--r-- | src/java/jniICalTimeType_cxx.h | 2 | ||||
-rw-r--r-- | src/java/jniICalTriggerType_cxx.cpp | 2 | ||||
-rw-r--r-- | src/java/testjni.java | 8 |
7 files changed, 4 insertions, 38 deletions
diff --git a/src/java/ICalTimeType.java b/src/java/ICalTimeType.java index cf4ee407..15cf8715 100644 --- a/src/java/ICalTimeType.java +++ b/src/java/ICalTimeType.java @@ -79,15 +79,6 @@ public class ICalTimeType return second; } - public void setIs_utc(boolean lcl_arg0) - { - is_utc = lcl_arg0 ? 1 : 0; - } - public boolean getIs_utc() - { - return is_utc == 0 ? false : true; - } - public void setIs_date(boolean lcl_arg0) { is_date = lcl_arg0 ? 1 : 0; @@ -138,7 +129,6 @@ public class ICalTimeType private int hour; private int minute; private int second; - private int is_utc; private int is_date; private String zone = new String(); // Converted from char* } diff --git a/src/java/jniICalPeriodType_cxx.cpp b/src/java/jniICalPeriodType_cxx.cpp index 398bc4b2..0642ac0f 100644 --- a/src/java/jniICalPeriodType_cxx.cpp +++ b/src/java/jniICalPeriodType_cxx.cpp @@ -32,7 +32,6 @@ void jni_SetStart_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, J 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_utc_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);
}
@@ -47,7 +46,6 @@ void jni_GetStart_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, 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_utc_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);
}
@@ -62,7 +60,6 @@ void jni_SetEnd_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNI 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_utc_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);
}
@@ -77,7 +74,6 @@ void jni_GetEnd_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JN 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_utc_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);
}
diff --git a/src/java/jniICalRecurrenceType_cxx.cpp b/src/java/jniICalRecurrenceType_cxx.cpp index 48698b90..5a58c864 100644 --- a/src/java/jniICalRecurrenceType_cxx.cpp +++ b/src/java/jniICalRecurrenceType_cxx.cpp @@ -54,7 +54,6 @@ void jni_SetUntil_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurr 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_utc_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); } @@ -69,7 +68,6 @@ void jni_GetUntil_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecur 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_utc_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); } diff --git a/src/java/jniICalTimeType_cxx.cpp b/src/java/jniICalTimeType_cxx.cpp index 341ded7e..a511edd6 100644 --- a/src/java/jniICalTimeType_cxx.cpp +++ b/src/java/jniICalTimeType_cxx.cpp @@ -17,7 +17,6 @@ static jfieldID ICalTimeType_Day_FID; static jfieldID ICalTimeType_Hour_FID; static jfieldID ICalTimeType_Minute_FID; static jfieldID ICalTimeType_Second_FID; -static jfieldID ICalTimeType_Is_utc_FID; static jfieldID ICalTimeType_Is_date_FID; static jfieldID ICalTimeType_Zone_FID; @@ -30,7 +29,6 @@ void initICalTimeTypeFieldIDs(JNIEnv* env, jclass clazz) 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_utc_FID = env->GetFieldID(clazz, "is_utc", "I"); ICalTimeType_Is_date_FID = env->GetFieldID(clazz, "is_date", "I"); ICalTimeType_Zone_FID = env->GetFieldID(clazz, "zone", "Ljava/lang/String;"); } @@ -95,16 +93,6 @@ void jni_GetSecond_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEn __ICalTimeType_->second = env->GetIntField(thisICalTimeType, ICalTimeType_Second_FID); } -void jni_SetIs_utc_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType) -{ - env->SetIntField(thisICalTimeType, ICalTimeType_Is_utc_FID, (jint) __ICalTimeType_->is_utc); -} - -void jni_GetIs_utc_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType) -{ - __ICalTimeType_->is_utc = env->GetIntField(thisICalTimeType, ICalTimeType_Is_utc_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); @@ -134,7 +122,6 @@ void jni_SetAll_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv* en jni_SetHour_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType); jni_SetMinute_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType); jni_SetSecond_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType); - jni_SetIs_utc_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType); jni_SetIs_date_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType); jni_SetZone_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType); } @@ -148,7 +135,6 @@ void jni_GetAll_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv* jni_GetHour_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType); jni_GetMinute_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType); jni_GetSecond_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType); - jni_GetIs_utc_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType); jni_GetIs_date_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType); jni_GetZone_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType); } diff --git a/src/java/jniICalTimeType_cxx.h b/src/java/jniICalTimeType_cxx.h index 5d6f84ce..4455808e 100644 --- a/src/java/jniICalTimeType_cxx.h +++ b/src/java/jniICalTimeType_cxx.h @@ -32,8 +32,6 @@ void jni_SetMinute_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv void jni_GetMinute_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType); void jni_SetSecond_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType); void jni_GetSecond_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType); -void jni_SetIs_utc_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType); -void jni_GetIs_utc_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType); void jni_SetIs_date_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType); void jni_GetIs_date_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType); void jni_SetZone_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType); diff --git a/src/java/jniICalTriggerType_cxx.cpp b/src/java/jniICalTriggerType_cxx.cpp index b4140c8f..033b277d 100644 --- a/src/java/jniICalTriggerType_cxx.cpp +++ b/src/java/jniICalTriggerType_cxx.cpp @@ -31,7 +31,6 @@ void jni_SetTime_in_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_, 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_utc_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); } @@ -46,7 +45,6 @@ void jni_GetTime_from_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_ 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_utc_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); } diff --git a/src/java/testjni.java b/src/java/testjni.java index a7eb5886..d90c327b 100644 --- a/src/java/testjni.java +++ b/src/java/testjni.java @@ -37,7 +37,7 @@ public class testjni starttime.setHour(18); starttime.setMinute(0); starttime.setSecond(0); - starttime.setIs_utc(true); + starttime.setZone("UTC"); System.out.println("done creating starttime"); ICalTimeType endtime = new ICalTimeType(); @@ -47,7 +47,7 @@ public class testjni endtime.setHour(8); endtime.setMinute(0); endtime.setSecond(0); - endtime.setIs_utc(true); + endtime.setZone("UTC"); System.out.println("done creating endtime"); @@ -258,7 +258,7 @@ public class testjni time_tma.setHour(2); time_tma.setMinute(2); time_tma.setSecond(2); - time_tma.setIs_utc(true); + time_tma.setZone("UTC"); ic.set_recurrenceid(time_tma); @@ -299,7 +299,7 @@ public class testjni duetime.setHour(18); duetime.setMinute(0); duetime.setSecond(0); - duetime.setIs_utc(true); + duetime.setZone("UTC"); System.out.println("done creating duetime"); statusProp.set_status(ICalProperty.ICalPropertyStatus.ICAL_STATUS_COMPLETED); |