From 21f014fa0b9b0a427ce99842f1f1dd4e02c386d0 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Thu, 14 Oct 2010 12:40:28 +0000 Subject: [PATCH] Minor javadoc/comment fixes around upload functionality, removed extra semicolon svn changeset:15553/svn branch:6.5 --- src/com/vaadin/terminal/ReceiverOwner.java | 12 ++++++------ .../gwt/server/AbstractCommunicationManager.java | 12 ++++++------ .../terminal/gwt/server/CommunicationManager.java | 4 ++-- src/com/vaadin/ui/Html5File.java | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/com/vaadin/terminal/ReceiverOwner.java b/src/com/vaadin/terminal/ReceiverOwner.java index d8263f9202..6f19192081 100644 --- a/src/com/vaadin/terminal/ReceiverOwner.java +++ b/src/com/vaadin/terminal/ReceiverOwner.java @@ -14,7 +14,7 @@ import com.vaadin.terminal.ReceiverOwner.ReceivingController; public interface ReceiverOwner extends VariableOwner { /* - * The monitor/control is passed to separate ReceivingContorller because: + * The monitor/control is passed to separate ReceivingController because: * * - possibly some component in the future may need support for streaming to * multiple Receivers at the same time. @@ -115,10 +115,10 @@ public interface ReceiverOwner extends VariableOwner { * during the upload. *

* {@link #onProgress(long, long)} is called in a synchronized block - * during the content is being received. This is potentially bit slow, - * so we are calling this method only if requested. The value is - * requested after the {@link #uploadStarted(ReceivingStartedEvent)} - * event, but not after each buffer reading. + * when the content is being received. This is potentially bit slow, so + * we are calling that method only if requested. The value is requested + * after the {@link #uploadStarted(ReceivingStartedEvent)} event, but + * not after reading each buffer. * * @return true if this ReceiverOwner wants to by notified during the * upload of the progress of streaming. @@ -150,7 +150,7 @@ public interface ReceiverOwner extends VariableOwner { * Note, the usage of this method is not synchronized over the * Application instance by the terminal like other methods. The * implementation should only return a boolean field and especially not - * to modify UI or implement a synchronization by itself. + * modify UI or implement a synchronization by itself. * * @return true if the streaming should be interrupted as soon as * possible. diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java index cbaa4b2676..e621e27cbe 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java @@ -418,12 +418,12 @@ public abstract class AbstractCommunicationManager implements final char[] charArray = boundary.toCharArray(); /* - * Reads bytes from the underlaying stream. Compares the read bytes to + * Reads bytes from the underlying stream. Compares the read bytes to * the boundary string and returns -1 if met. * - * The maching happens so that if the read byte equals to the first char - * of boundary string, the stream goes to "buffering mode". In buffering - * mode bytes are read until the character does not match the + * The matching happens so that if the read byte equals to the first + * char of boundary string, the stream goes to "buffering mode". In + * buffering mode bytes are read until the character does not match the * corresponding from boundary string or the full boundary string is * found. */ @@ -459,7 +459,7 @@ public abstract class AbstractCommunicationManager implements } fromActualStream = inputStream.read(); if (fromActualStream != charArray[matchedCount]) { - // Did not found full boundary, cache the last + // Did not find full boundary, cache the last // byte bufferedByte = fromActualStream; return getBuffered(); @@ -643,7 +643,7 @@ public abstract class AbstractCommunicationManager implements controller.uploadFailed(event); } // Note, we are not throwing interrupted exception forward as it is - // not a terminal level erro like all other exception. + // not a terminal level error like all other exception. } catch (final Exception e) { synchronized (application) { ReceivingFailedEvent event = new ReceivingFailedEventImpl( diff --git a/src/com/vaadin/terminal/gwt/server/CommunicationManager.java b/src/com/vaadin/terminal/gwt/server/CommunicationManager.java index b257559231..df937688cb 100644 --- a/src/com/vaadin/terminal/gwt/server/CommunicationManager.java +++ b/src/com/vaadin/terminal/gwt/server/CommunicationManager.java @@ -220,7 +220,7 @@ public class CommunicationManager extends AbstractCommunicationManager { InvalidUIDLSecurityKeyException { /* - * URI pattern: APP/UPPLOAD/[PID]/[NAME]/[SECKEY] See #createReceiverUrl + * URI pattern: APP/UPLOAD/[PID]/[NAME]/[SECKEY] See #createReceiverUrl */ String pathInfo = request.getPathInfo(); @@ -360,7 +360,7 @@ public class CommunicationManager extends AbstractCommunicationManager { * We will use the same APP/* URI space as ApplicationResources but * prefix url with UPLOAD * - * eg. APP/UPPLOAD/[PID]/[NAME]/[SECKEY] + * eg. APP/UPLOAD/[PID]/[NAME]/[SECKEY] * * SECKEY is created on each paint to make URL's unpredictable (to * prevent CSRF attacks). diff --git a/src/com/vaadin/ui/Html5File.java b/src/com/vaadin/ui/Html5File.java index c5d9468511..6c3a91f3b0 100644 --- a/src/com/vaadin/ui/Html5File.java +++ b/src/com/vaadin/ui/Html5File.java @@ -47,7 +47,7 @@ public class Html5File implements Serializable { */ private ProxyReceiver proxyReceiver = new ProxyReceiver(); private boolean interrupted = false; - private Html5FileUploadListener listener;; + private Html5FileUploadListener listener; public String getFileName() { return name; @@ -63,13 +63,13 @@ public class Html5File implements Serializable { /** * Sets the {@link Receiver} that into which the file contents will be - * written. Usage of Reveiver is similar to {@link Upload} component. + * written. Usage of Receiver is similar to {@link Upload} component. *

* If the {@link Receiver} is not set in the {@link DropHandler} the file * contents will not be sent to server. *

* Note! receiving file contents is experimental feature depending - * on HTML 5 API's. It is supported only by modern web brosers like Firefox + * on HTML 5 API's. It is supported only by modern web browsers like Firefox * 3.6 and above and recent webkit based browsers (Safari 5, Chrome 6) at * this time. * -- 2.39.5