Author: dongxu
Date: Thu Sep 12 03:36:35 2013
New Revision: 1522223
URL: http://svn.apache.org/r1522223
Log:
commit frequently based on (http://t.cn/zjxJ71X), there should be more robust
and user-friendly features to develop.
Modified:
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java
Modified:
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java?rev=1522223&r1=1522222&r2=1522223&view=diff
==============================================================================
---
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java
(original)
+++
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java
Thu Sep 12 03:36:35 2013
@@ -21,6 +21,7 @@ package org.apache.hupa.client.mock;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import gwtupload.client.IFileInput;
import gwtupload.client.IUploadStatus;
import gwtupload.client.IUploadStatus.Status;
@@ -39,18 +40,26 @@ import com.google.gwt.core.client.JavaSc
import com.google.gwt.event.shared.HandlerRegistration;
import com.google.gwt.user.client.ui.Widget;
+=======
+>>>>>>> commit frequently based on (http://t.cn/zjxJ71X), there should be more
robust and user-friendly features to develop.
import gwtupload.client.IFileInput;
import gwtupload.client.IUploadStatus;
-import gwtupload.client.IUploader;
import gwtupload.client.IUploadStatus.Status;
-import gwtupload.client.IUploader.UploadedInfo;
+import gwtupload.client.IUploader;
import java.util.Iterator;
<<<<<<< HEAD
+<<<<<<< HEAD
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+import com.google.gwt.core.client.JavaScriptObject;
+import com.google.gwt.event.shared.HandlerRegistration;
+import com.google.gwt.user.client.ui.Widget;
+
+>>>>>>> commit frequently based on (http://t.cn/zjxJ71X), there should be more
robust and user-friendly features to develop.
public class MockUploader implements IUploader {
public HandlerRegistration
addOnCancelUploadHandler(OnCancelUploaderHandler handler) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
