提交

12 changed files with 15 additions and 140 deletions
--- a/src/Notes-master/src/net/micode/notes/data/Contact.java
+++ b/src/Notes-master/src/net/micode/notes/data/Contact.java
@ -16,6 +16,7 @@

 package net.micode.notes.data;

+
 import android.content.Context;
 import android.database.Cursor;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
--- a/src/Notes-master/src/net/micode/notes/data/Notes.java
+++ b/src/Notes-master/src/net/micode/notes/data/Notes.java
@ -7,15 +7,9 @@
 *
 *        http://www.apache.org/licenses/LICENSE-2.0
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
 */

 package net.micode.notes.data;
-
 import android.net.Uri;
 public class Notes {
    public static final String AUTHORITY = "micode_notes";
@ -23,7 +17,6 @@ public class Notes {
    public static final int TYPE_NOTE     = 0;
    public static final int TYPE_FOLDER   = 1;
    public static final int TYPE_SYSTEM   = 2;
-
    /**
     * Following IDs are system folders' identifiers
     * {@link Notes#ID_ROOT_FOLDER } is default folder
@ -68,7 +61,7 @@ public class Notes {
         */
        public static final String ID = "_id";

-        /**
+        /*
         * The parent's id for note or folder
         * <P> Type: INTEGER (long) </P>
         */
@ -80,7 +73,7 @@ public class Notes {
         */
        public static final String CREATED_DATE = "created_date";

-        /**
+        /*
         * Latest modified date
         * <P> Type: INTEGER (long) </P>
         */
--- a/src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java
+++ b/src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java
@ -1,18 +1,3 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */

 package net.micode.notes.data;

--- a/src/Notes-master/src/net/micode/notes/data/NotesProvider.java
+++ b/src/Notes-master/src/net/micode/notes/data/NotesProvider.java
@ -15,8 +15,6 @@
 */

 package net.micode.notes.data;
-
-
 import android.app.SearchManager;
 import android.content.ContentProvider;
 import android.content.ContentUris;
--- a/src/Notes-master/src/net/micode/notes/gtask/data/MetaData.java
+++ b/src/Notes-master/src/net/micode/notes/gtask/data/MetaData.java
@ -13,38 +13,29 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 package net.micode.notes.gtask.data;
-
 import android.database.Cursor;
 import android.util.Log;
-
 import net.micode.notes.tool.GTaskStringUtils;
-
 import org.json.JSONException;
 import org.json.JSONObject;

-
 public class MetaData extends Task {
    /*
-
-	 * 功能描述：得到类的简写名称存入字符串TAG中
-
-	 * 实现过程：调用getSimpleName ()函数
+     功能描述：得到类的简写名称存入字符串TAG中
+     实现过程：调用getSimpleName ()函数
     */
-
    private final static String TAG = MetaData.class.getSimpleName();

    private String mRelatedGid = null;

     /*
-     * 功能描述：设置数据，即生成元数据库
-     * 实现过程：调用JSONObject库函数put ()，Task类中的setNotes ()和setName ()函数
-     * 参数注解：
+    功能描述：设置数据，即生成元数据库
+     实现过程：调用JSONObject库函数put ()，Task类中的setNotes ()和setName ()函数
+     参数注解：
     */
    public void setMeta(String gid, JSONObject metaInfo) 
-    {
-    	//对函数块进行注释
+    {//对函数块进行注释
        try {
            metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid);
            /*
@ -94,10 +85,7 @@ public class MetaData extends Task {
            }
        }
    }
-    /*
-     * 功能描述：使用本地json数据对象设置元数据内容，一般不会用到，若用到，则抛出异常
-     
-     */
+    /*功能描述：使用本地json数据对象设置元数据内容，一般不会用到，若用到，则抛出异常*/

    @Override
      public void setContentByLocalJSON(JSONObject js) {
@ -111,9 +99,6 @@ public class MetaData extends Task {
    /*
     * 功能描述：从元数据内容中获取本地json对象，一般不会用到，若用到，则抛出异常
     */
-
-
-    @Override
    public JSONObject getLocalJSONFromContent() {
        throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called");
        /*
--- a/src/Notes-master/src/net/micode/notes/gtask/data/Node.java
+++ b/src/Notes-master/src/net/micode/notes/gtask/data/Node.java
@ -1,29 +1,11 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */

 package net.micode.notes.gtask.data;
-
 import android.database.Cursor;
-
 import org.json.JSONObject;
 /**
 * 应该是同步操作的基础数据类型，定义了相关指示同步操作的常量
 * 关键字：abstract
 */
-
    public abstract class Node {
 	//定义了各种用于表征同步状态的常量
    public static final int SYNC_ACTION_NONE = 0;// 本地和云端都无可更新内容（即本地和云端内容一致）
--- a/src/Notes-master/src/net/micode/notes/gtask/data/SqlData.java
+++ b/src/Notes-master/src/net/micode/notes/gtask/data/SqlData.java
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-
-
    /*
 * Description：用于支持小米便签最底层的数据库相关操作，和sqlnote的关系上是子集关系，即data是note的子集（节点）。
 * SqlData其实就是也就是所谓数据中的数据
--- a/src/Notes-master/src/net/micode/notes/gtask/data/SqlNote.java
+++ b/src/Notes-master/src/net/micode/notes/gtask/data/SqlNote.java
@ -1,21 +1,3 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-

 package net.micode.notes.gtask.data;

@ -33,14 +15,10 @@ import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.gtask.exception.ActionFailureException;
 import net.micode.notes.tool.GTaskStringUtils;
 import net.micode.notes.tool.ResourceParser;
-
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-
 import java.util.ArrayList;
-
-
 public class SqlNote {
    private static final String TAG = SqlNote.class.getSimpleName();

--- a/src/Notes-master/src/net/micode/notes/gtask/data/Task.java
+++ b/src/Notes-master/src/net/micode/notes/gtask/data/Task.java
@ -1,18 +1,3 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */

 package net.micode.notes.gtask.data;

@ -26,12 +11,9 @@ import net.micode.notes.data.Notes.DataConstants;
 import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.gtask.exception.ActionFailureException;
 import net.micode.notes.tool.GTaskStringUtils;
-
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-
-
 public class Task extends Node {
    private static final String TAG = Task.class.getSimpleName();

@ -53,7 +35,6 @@ public class Task extends Node {
        mParent = null;//当前Task所在的TaskList
        mMetaInfo = null;
    }
-    
    public JSONObject getCreateAction(int actionId) {
        JSONObject js = new JSONObject();

--- a/src/Notes-master/src/net/micode/notes/gtask/data/TaskList.java
+++ b/src/Notes-master/src/net/micode/notes/gtask/data/TaskList.java
@ -77,7 +77,7 @@ public class TaskList extends Node {

        return js;
    }
-     /* (non-Javadoc)
+     /* 
     * @see net.micode.notes.gtask.data.Node#getUpdateAction(int)
     * 生成并返回一个包含了一定数据的JSONObject实体
     */
@ -107,10 +107,8 @@ public class TaskList extends Node {
            e.printStackTrace();
            throw new ActionFailureException("fail to generate tasklist-update jsonobject");
        }
-
        return js;
    }
-
    public void setContentByRemoteJSON(JSONObject js) {
        if (js != null) {
            try {
@ -136,7 +134,6 @@ public class TaskList extends Node {
            }
        }
    }
-
    public void setContentByLocalJSON(JSONObject js) {
        if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) {
            Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
@ -164,7 +161,6 @@ public class TaskList extends Node {
            e.printStackTrace();
        }
    }
-
    public JSONObject getLocalJSONFromContent() {
        try {
            JSONObject js = new JSONObject();
@ -233,7 +229,7 @@ public class TaskList extends Node {
    }
 
    /**
-     * @param task
+     
     * @return 返回值为是否成功添加任务。
     * 功能：在当前任务表末尾添加新的任务。
     */
--- a/src/Notes-master/src/net/micode/notes/gtask/exception/ActionFailureException.java
+++ b/src/Notes-master/src/net/micode/notes/gtask/exception/ActionFailureException.java
@ -14,14 +14,11 @@
 * limitations under the License.
 */

-
-
 /*
 * Description：支持小米便签运行过程中的运行异常处理。
 */
 
 package net.micode.notes.gtask.exception;
- 
 public class ActionFailureException extends RuntimeException {
    private static final long serialVersionUID = 4425249765923293627L;
    /*
@ -43,7 +40,6 @@ public class ActionFailureException extends RuntimeException {
    public ActionFailureException(String paramString) {
        super(paramString);
    }
-
    public ActionFailureException(String paramString, Throwable paramThrowable) {
        super(paramString, paramThrowable);
    }
--- a/src/Notes-master/src/net/micode/notes/gtask/exception/NetworkFailureException.java
+++ b/src/Notes-master/src/net/micode/notes/gtask/exception/NetworkFailureException.java
@ -1,20 +1,3 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-

 /*
 * Description：支持小米便签运行过程中的网络异常处理。
@ -45,7 +28,6 @@ public class NetworkFailureException extends Exception {
    public NetworkFailureException(String paramString) {
        super(paramString);
    }
-
    public NetworkFailureException(String paramString, Throwable paramThrowable) {
        super(paramString, paramThrowable);
    }