Projects >> fanfoudroid >>78f72ce7f09d1bb9e6ad5e91a1e026044e362d78

Chunk
Conflicting content 
package com.ch_linghu.fanfoudroid.db.dao;

import java.util.Date;
<<<<<<< HEAD:src/com/ch_linghu/fanfoudroid/data2/Status.java

public class Status implements java.io.Serializable {
    private static final long serialVersionUID = 8307449050213481609L;
    
    private Date created_at;
=======
import java.util.List;

import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;

import com.ch_linghu.fanfoudroid.fanfou.Photo;
import com.ch_linghu.fanfoudroid.fanfou.RetweetDetails;
import com.ch_linghu.fanfoudroid.fanfou.User;
import com.ch_linghu.fanfoudroid.fanfou.Weibo;
import com.ch_linghu.fanfoudroid.fanfou.WeiboResponse;
import com.ch_linghu.fanfoudroid.http.HttpException;
import com.ch_linghu.fanfoudroid.http.Response;

/**
 * 为避免影响旧数据格式, 临时测试用,
 * 
 * 今后结构:
 *  fanfoudroid.db 放数据库基本类
 *  fanfoudroid.data 各种数据逻辑类
 *  fanfoudroid.dao 数据DAO类
 *  fanfroudroi.weibo 无数据类, 只保留API部分
 */
public class Status extends WeiboResponse implements java.io.Serializable {
    private static final long serialVersionUID = 1608000492860584608L;

    // Required
>>>>>>> cbb20c83a4abae0550321f56101bb216b5c8f5bb:src/com/ch_linghu/fanfoudroid/db/dao/Status.java
    private String id;
    private String text;
    private String source;
Solution content 
package com.ch_linghu.fanfoudroid.db.dao;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;

import com.ch_linghu.fanfoudroid.fanfou.Photo;
import com.ch_linghu.fanfoudroid.fanfou.RetweetDetails;
import com.ch_linghu.fanfoudroid.fanfou.User;
import com.ch_linghu.fanfoudroid.fanfou.Weibo;
import com.ch_linghu.fanfoudroid.fanfou.WeiboResponse;
import com.ch_linghu.fanfoudroid.http.HttpException;
import com.ch_linghu.fanfoudroid.http.Response;

/**
 * 为避免影响旧数据格式, 临时测试用,
 * 
 * 今后结构:
 *  fanfoudroid.db 放数据库基本类
 *  fanfoudroid.data 各种数据逻辑类
 *  fanfoudroid.dao 数据DAO类
 *  fanfroudroi.weibo 无数据类, 只保留API部分
 */
public class Status extends WeiboResponse implements java.io.Serializable {
    private static final long serialVersionUID = 1608000492860584608L;

    // Required
    private String id;
    private String text;
    private String source;
File
Status.java
Developer's decision
Manual
Kind of conflict
Attribute
Class signature
Comment
Import
Chunk
Conflicting content 
import android.database.sqlite.SQLiteDatabase;
import android.util.Log;

<<<<<<< HEAD
import com.ch_linghu.fanfoudroid.data2.Photo;
import com.ch_linghu.fanfoudroid.data2.Status;
import com.ch_linghu.fanfoudroid.data2.User;
import com.ch_linghu.fanfoudroid.db.StatusTable;
import com.ch_linghu.fanfoudroid.db.TwitterDatabase;
import com.ch_linghu.fanfoudroid.helper.utils.DateTimeHelper;
import com.ch_linghu.fanfoudroid.helper.utils.TextHelper;
=======
import com.ch_linghu.fanfoudroid.db.StatusTable;
import com.ch_linghu.fanfoudroid.db.TwitterDatabase;
import com.ch_linghu.fanfoudroid.util.*;
>>>>>>> cbb20c83a4abae0550321f56101bb216b5c8f5bb

public class StatusDAO {
    private static final String TAG = "StatusDAO";
Solution content 
import android.database.sqlite.SQLiteDatabase;
import android.util.Log;

import com.ch_linghu.fanfoudroid.data2.Photo;
import com.ch_linghu.fanfoudroid.data2.Status;
import com.ch_linghu.fanfoudroid.data2.User;
import com.ch_linghu.fanfoudroid.db.StatusTable;
import com.ch_linghu.fanfoudroid.db.TwitterDatabase;
import com.ch_linghu.fanfoudroid.util.DateTimeHelper;
import com.ch_linghu.fanfoudroid.util.TextHelper;

public class StatusDAO {
    private static final String TAG = "StatusDAO";
File
StatusDAO.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
import org.json.JSONObject;
import org.w3c.dom.Document;

<<<<<<< HEAD
import android.util.Log;

import com.ch_linghu.fanfoudroid.data.json.JsonParser2;
import com.ch_linghu.fanfoudroid.data.json.JsonParserException;
import com.ch_linghu.fanfoudroid.data2.Status;
import com.ch_linghu.fanfoudroid.debug.DebugTimer;
=======
import com.ch_linghu.fanfoudroid.TwitterApplication;
import com.ch_linghu.fanfoudroid.util.DebugTimer;
>>>>>>> cbb20c83a4abae0550321f56101bb216b5c8f5bb

public class Response {
    private static boolean DEBUG = true;
Solution content 
import org.json.JSONObject;
import org.w3c.dom.Document;

import android.util.Log;

import com.ch_linghu.fanfoudroid.data.json.JsonParser2;
import com.ch_linghu.fanfoudroid.data.json.JsonParserException;
import com.ch_linghu.fanfoudroid.data2.Status;
import com.ch_linghu.fanfoudroid.debug.DebugTimer;

public class Response {
    private static boolean DEBUG = true;
File
Response.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    public InputStream asStream() throws ResponseException {
        HttpEntity entity = mResponse.getEntity();
<<<<<<< HEAD
        
        /* copy response content for debug
        if (DEBUG && entity != null) {
            try {
                entity = new BufferedHttpEntity(entity);
                debugEntity(entity); // copy 
            } catch (Exception e) {
                // TODO Auto-generated catch block
                e.printStackTrace();
            }
        }
        */
=======
        //FIXME: entity 可能为空
>>>>>>> cbb20c83a4abae0550321f56101bb216b5c8f5bb

        InputStream is = null;
        try {
Solution content 
    public InputStream asStream() throws ResponseException {
        HttpEntity entity = mResponse.getEntity();
        
        /* copy response content for debug
        if (DEBUG && entity != null) {
            try {
                entity = new BufferedHttpEntity(entity);
                debugEntity(entity); // copy 
            } catch (Exception e) {
                // TODO Auto-generated catch block
                e.printStackTrace();
            }
        }
        */

        InputStream is = null;
        try {
File
Response.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
    }

    public String asString() throws ResponseException {
<<<<<<< HEAD
=======
    	if (TwitterApplication.DEBUG){
    		DebugTimer.betweenStart("AS STRING");
    	}
>>>>>>> cbb20c83a4abae0550321f56101bb216b5c8f5bb

        String str = null;
        InputStream is = asStream();
Solution content 
    }

    public String asString() throws ResponseException {

        String str = null;
        InputStream is = asStream();
File
Response.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
                }
            }
        }
<<<<<<< HEAD
=======
        if(TwitterApplication.DEBUG){
        	DebugTimer.betweenEnd("AS STRING");
        }
>>>>>>> cbb20c83a4abae0550321f56101bb216b5c8f5bb
        return str;
    }
Solution content 
                }
            }
        }
        return str;
    }
File
Response.java
Developer's decision
Version 1
Kind of conflict
If statement