commit 403c83bde6d05e6325e99eb89924f0a09e5df3bb
author Daisuke Miyakawa <dmiyakawa@google.com> Fri Mar 11 14:59:52 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 11 14:59:52 2011 -0800
tree fb0a0b162fdbf1ebf4997333b08c801d140e1d8e
parent 8ed6de732dfb8bf8257152e5c5faf7e0ee760464
parent 02117b3d19787ff65486b9f9db8abd338ae4c9f9

Merge "Use same TAG in vCard"

java/com/android/vcard/VCardComposer.java

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 @@
         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 @@
      * @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;

tests/src/com/android/vcard/tests/testutils/VCardVerifier.java

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 @@
                 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);