Merge branch 'master' into zsl

Conflicts:
	imageLoader/src/com/nostra13/universalimageloader/cache/disc/DiskCache.java

.gitignore

 imageLoader/bin/
 imageLoader/gen/com/nostra13/universalimageloader/BuildConfig.java
+imageLoader/gen/

imageLoader/src/com/nostra13/universalimageloader/cache/disc/DiskCache.java

@@ -14,8 +14,10 @@
  * limitations under the License.
  *******************************************************************************/
 package com.nostra13.universalimageloader.cache.disc;
-/** zsl分支修改，添加注释1 2015年2月9日 15:17:36*/
-//zsl分支修改，添加注释2 2015年2月9日 15:18:28
+/** zsl分支修改，添加注释1 2015年2月9日 15:17:36*/
+/** 主线代码修改了呢？2015年2月9日 15:21:09*/
+//zsl分支修改，添加注释2 2015年2月9日 15:18:28
+//主线代码再来修改一次 2015年2月9日 15:21:26
 import android.graphics.Bitmap;
 import com.nostra13.universalimageloader.utils.IoUtils;
 

imageLoader/src/com/nostra13/universalimageloader/cache/disc/DiskCache.java.orig

+/*******************************************************************************
+ * Copyright 2014 Sergey Tarasevich
+ *
+ * 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 com.nostra13.universalimageloader.cache.disc;
+<<<<<<< .merge_file_a08184
+/** zsl分支修改，添加注释1 2015年2月9日 15:17:36*/
+//zsl分支修改，添加注释2 2015年2月9日 15:18:28
+=======
+/** 主线代码修改了呢？2015年2月9日 15:21:09*/
+//主线代码再来修改一次 2015年2月9日 15:21:26
+>>>>>>> .merge_file_a08000
+import android.graphics.Bitmap;
+import com.nostra13.universalimageloader.utils.IoUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Interface for disk cache
+ *
+ * @author Sergey Tarasevich (nostra13[at]gmail[dot]com)
+ * @since 1.9.2
+ */
+public interface DiskCache {
+	/**
+	 * Returns root directory of disk cache
+	 *
+	 * @return Root directory of disk cache
+	 */
+	File getDirectory();
+
+	/**
+	 * Returns file of cached image
+	 *
+	 * @param imageUri Original image URI
+	 * @return File of cached image or <b>null</b> if image wasn't cached
+	 */
+	File get(String imageUri);
+
+	/**
+	 * Saves image stream in disk cache.
+	 * Incoming image stream shouldn't be closed in this method.
+	 *
+	 * @param imageUri    Original image URI
+	 * @param imageStream Input stream of image (shouldn't be closed in this method)
+	 * @param listener    Listener for saving progress, can be ignored if you don't use
+	 *                    {@linkplain com.nostra13.universalimageloader.core.listener.ImageLoadingProgressListener
+	 *                    progress listener} in ImageLoader calls
+	 * @return <b>true</b> - if image was saved successfully; <b>false</b> - if image wasn't saved in disk cache.
+	 * @throws java.io.IOException
+	 */
+	boolean save(String imageUri, InputStream imageStream, IoUtils.CopyListener listener) throws IOException;
+
+	/**
+	 * Saves image bitmap in disk cache.
+	 *
+	 * @param imageUri Original image URI
+	 * @param bitmap   Image bitmap
+	 * @return <b>true</b> - if bitmap was saved successfully; <b>false</b> - if bitmap wasn't saved in disk cache.
+	 * @throws IOException
+	 */
+	boolean save(String imageUri, Bitmap bitmap) throws IOException;
+
+	/**
+	 * Removes image file associated with incoming URI
+	 *
+	 * @param imageUri Image URI
+	 * @return <b>true</b> - if image file is deleted successfully; <b>false</b> - if image file doesn't exist for
+	 * incoming URI or image file can't be deleted.
+	 */
+	boolean remove(String imageUri);
+
+	/** Closes disk cache, releases resources. */
+	void close();
+
+	/** Clears disk cache. */
+	void clear();
+}