警告部分を修正。

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 387a8cf..a718c12 100644 (file)
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -93,7 +93,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/DetailActivity.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/DetailActivity.java
index 864165f..1a11aab 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/DetailActivity.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/DetailActivity.java
@@ -11,6 +11,7 @@ import android.view.MenuItem;
 import android.widget.Toast;
 
 import net.osdn.gokigen.joggingtimer.R;
+import net.osdn.gokigen.joggingtimer.storage.ITimeEntryDatabase;
 import net.osdn.gokigen.joggingtimer.utilities.CreateModelDataDialog;
 import net.osdn.gokigen.joggingtimer.utilities.DataEditDialog;
 
@@ -248,7 +249,7 @@ public class DetailActivity extends WearableActivity implements RecordDetailSetu
                 break;
             case R.id.menu_create_model:
                 CreateModelDataDialog dialog2 = new CreateModelDataDialog(this);
-                dialog2.show(true, getString(R.string.information_time_picker), setupper.getCreateModelDataCallback(), 0);
+                dialog2.show(true, getString(R.string.information_time_picker), setupper.getCreateModelDataCallback(ITimeEntryDatabase.DONT_USE_ID, ITimeEntryDatabase.DONT_USE_ID), 0);
                 break;
 
             case R.id.menu_set_reference:

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/RecordDetailSetup.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/RecordDetailSetup.java
index 26844a7..136f579 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/RecordDetailSetup.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/RecordDetailSetup.java
@@ -11,7 +11,6 @@ import net.osdn.gokigen.joggingtimer.storage.TimeEntryDatabaseFactory;
 import net.osdn.gokigen.joggingtimer.storage.contract.TimeEntryData;
 import net.osdn.gokigen.joggingtimer.utilities.CreateModelData;
 import net.osdn.gokigen.joggingtimer.utilities.CreateModelDataDialog;
-import net.osdn.gokigen.joggingtimer.utilities.TimeStringConvert;
 
 import static android.provider.BaseColumns._ID;
 
@@ -213,11 +212,14 @@ public class RecordDetailSetup  implements ITimeEntryDatabaseCallback, IDetailEd
     /**
      *
      */
-    CreateModelDataDialog.Callback getCreateModelDataCallback()
+    CreateModelDataDialog.Callback getCreateModelDataCallback(long indexId, long dataId)
     {
-        return (new CreateModelData(database));
+        return (new CreateModelData(database, indexId, dataId));
     }
 
+    /**
+     *    IDetailEditor.editDetailData()
+     */
     @Override
     public void editDetailData(final long indexId, final long dataId, final int count, final long defaultMillis)
     {
@@ -227,7 +229,7 @@ public class RecordDetailSetup  implements ITimeEntryDatabaseCallback, IDetailEd
             public void run()
             {
                 CreateModelDataDialog dialog2 = new CreateModelDataDialog(activity);
-                dialog2.show(false, activity.getString(R.string.information_modify_time), getCreateModelDataCallback(), defaultMillis);
+                dialog2.show(false, activity.getString(R.string.information_modify_time), getCreateModelDataCallback(indexId, dataId), defaultMillis);
             }
         });
     }

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/storage/ITimeEntryDatabase.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/storage/ITimeEntryDatabase.java
index 664378d..37ab1c6 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/storage/ITimeEntryDatabase.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/storage/ITimeEntryDatabase.java
@@ -8,8 +8,9 @@ import android.database.Cursor;
  */
 public interface ITimeEntryDatabase
 {
-    static final long DEFAULT_RECORD_TYPE = 0;
-    static final long EDITABLE_RECORD_TYPE = 1;
+    long DONT_USE_ID = -1;
+    long DEFAULT_RECORD_TYPE = 0;
+    long EDITABLE_RECORD_TYPE = 1;
 
     void prepare();
     void close();

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/storage/ITimeEntryDatabaseCallback.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/storage/ITimeEntryDatabaseCallback.java
index 6c1f9c9..2ef8adb 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/storage/ITimeEntryDatabaseCallback.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/storage/ITimeEntryDatabaseCallback.java
@@ -12,7 +12,7 @@ public interface ITimeEntryDatabaseCallback
         APPENDED,
         FINISHED,
         //UPDATED,
-    };
+    }
 
     void prepareFinished(boolean isReady);
     void dataEntryFinished(OperationType operationType, boolean result, long id, String title);

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/storage/TimeEntryDatabase.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/storage/TimeEntryDatabase.java
index 2259a6c..ec44368 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/storage/TimeEntryDatabase.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/storage/TimeEntryDatabase.java
@@ -9,7 +9,6 @@ import android.util.Log;
 
 import net.osdn.gokigen.joggingtimer.storage.contract.TimeEntryData;
 import net.osdn.gokigen.joggingtimer.storage.contract.TimeEntryIndex;
-import net.osdn.gokigen.joggingtimer.utilities.TimeStringConvert;
 
 import static android.provider.BaseColumns._ID;
 

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/CreateModelData.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/CreateModelData.java
index d573641..0817fbf 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/CreateModelData.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/CreateModelData.java
@@ -8,11 +8,14 @@ public class CreateModelData implements CreateModelDataDialog.Callback
 {
     private final String TAG = toString();
     private final ITimeEntryDatabase database;
+    private final long indexId;
+    private final long detailId;
 
-    public CreateModelData(ITimeEntryDatabase database)
+    public CreateModelData(ITimeEntryDatabase database, long indexId, long detailId)
     {
         this.database = database;
-
+        this.indexId = indexId;
+        this.detailId = detailId;
     }
 
     @Override
@@ -33,7 +36,7 @@ public class CreateModelData implements CreateModelDataDialog.Callback
                         }
                         else
                         {
-                            Log.v(TAG, "MODIFIED TO : " + hour + ":" + minute + ":" + second);
+                            Log.v(TAG, "MODIFIED TO : " + hour + ":" + minute + ":" + second + " indexId: " + indexId + "  dataId: " + detailId);
                         }
                     }
                     catch (Exception e)