diff options
| -rw-r--r-- | java/com/android/vcard/VCardComposer.java | 17 | ||||
| -rw-r--r-- | tests/src/com/android/vcard/tests/testutils/VCardVerifier.java | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/java/com/android/vcard/VCardComposer.java b/java/com/android/vcard/VCardComposer.java index 32f80e0..cb67442 100644 --- a/java/com/android/vcard/VCardComposer.java +++ b/java/com/android/vcard/VCardComposer.java @@ -559,23 +559,24 @@ public class VCardComposer { return true; } - // TODO: replace this with createOneEntryNew(). Also remove OneEntryHandler. init/terminate - // capability can be prepared if caller really wants. - public boolean createOneEntry() { - return createOneEntry(null); + /** + * @deprecated use {@link #createOneEntry()} instead. + */ + public boolean createOneEntryLegacy() { + return createOneEntryLegacy(null); } /** * @return a vCard string. */ - public String createOneEntryNew() { - return createOneEntryNew(null); + public String createOneEntry() { + return createOneEntry(null); } /** * @hide */ - public String createOneEntryNew(Method getEntityIteratorMethod) { + public String createOneEntry(Method getEntityIteratorMethod) { final String vcard = createOneEntryInternal(mCursor.getString(mIdColumn), getEntityIteratorMethod); if (!mCursor.moveToNext()) { @@ -588,7 +589,7 @@ public class VCardComposer { * @param getEntityIteratorMethod For Dependency Injection. * @hide just for testing. */ - public boolean createOneEntry(Method getEntityIteratorMethod) { + public boolean createOneEntryLegacy(Method getEntityIteratorMethod) { if (!mInitDone) { mErrorReason = FAILURE_REASON_NOT_INITIALIZED; return false; diff --git a/tests/src/com/android/vcard/tests/testutils/VCardVerifier.java b/tests/src/com/android/vcard/tests/testutils/VCardVerifier.java index 5acd6a3..a145ebd 100644 --- a/tests/src/com/android/vcard/tests/testutils/VCardVerifier.java +++ b/tests/src/com/android/vcard/tests/testutils/VCardVerifier.java @@ -355,7 +355,7 @@ public class VCardVerifier { try { final Method mockGetEntityIteratorMethod = getMockGetEntityIteratorMethod(); AndroidTestCase.assertNotNull(mockGetEntityIteratorMethod); - final String vcard = composer.createOneEntryNew(mockGetEntityIteratorMethod); + final String vcard = composer.createOneEntry(mockGetEntityIteratorMethod); AndroidTestCase.assertNotNull(vcard); if (mLineVerifier != null) { mLineVerifier.verify(vcard); |