summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2010-01-12 15:56:25 +0000
committerArtur Signell <artur.signell@itmill.com>2010-01-12 15:56:25 +0000
commit0ec3379ac00df225766aedb53072839eefd260f8 (patch)
treef6fa4779ed8235e8b6708aa3c62f94379690dd28 /src
parent6490e96cfa722fdc1360bbea16582390d4694ba4 (diff)
downloadvaadin-framework-0ec3379ac00df225766aedb53072839eefd260f8.tar.gz
vaadin-framework-0ec3379ac00df225766aedb53072839eefd260f8.zip
Merged [10696]
svn changeset:10700/svn branch:6.3
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/data/util/ObjectProperty.java4
-rw-r--r--src/com/vaadin/data/validator/AbstractStringValidator.java3
-rw-r--r--src/com/vaadin/data/validator/AbstractValidator.java4
-rw-r--r--src/com/vaadin/data/validator/EmailValidator.java4
-rw-r--r--src/com/vaadin/event/FieldEvents.java2
-rw-r--r--src/com/vaadin/event/MethodEventSource.java18
-rw-r--r--src/com/vaadin/launcher/util/BrowserLauncher.java44
-rw-r--r--src/com/vaadin/terminal/Resource.java2
-rw-r--r--src/com/vaadin/terminal/Sizeable.java2
-rw-r--r--src/com/vaadin/terminal/Terminal.java4
-rw-r--r--src/com/vaadin/terminal/gwt/client/Paintable.java2
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/MenuBar.java10
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java8
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java2
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VPopupView.java6
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VUriFragmentUtility.java2
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java10
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java2
-rw-r--r--src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java28
-rw-r--r--src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java12
-rw-r--r--src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java2
-rw-r--r--src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java4
-rw-r--r--src/com/vaadin/terminal/gwt/server/Constants.java4
-rw-r--r--src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java6
-rw-r--r--src/com/vaadin/terminal/gwt/server/HttpUploadStream.java3
-rw-r--r--src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java40
-rw-r--r--src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java6
-rw-r--r--src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java8
-rw-r--r--src/com/vaadin/terminal/gwt/server/WebBrowser.java10
-rw-r--r--src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java4
-rw-r--r--src/com/vaadin/ui/BaseFieldFactory.java7
31 files changed, 131 insertions, 132 deletions
diff --git a/src/com/vaadin/data/util/ObjectProperty.java b/src/com/vaadin/data/util/ObjectProperty.java
index 6d58b2d92d..8993b74a1e 100644
--- a/src/com/vaadin/data/util/ObjectProperty.java
+++ b/src/com/vaadin/data/util/ObjectProperty.java
@@ -11,8 +11,8 @@ import com.vaadin.data.Property;
/**
* A simple data object containing one typed value. This class is a
- * straightforward implementation of the the
- * {@link com.vaadin.data.Property} interface.
+ * straightforward implementation of the the {@link com.vaadin.data.Property}
+ * interface.
*
* @author IT Mill Ltd.
* @version
diff --git a/src/com/vaadin/data/validator/AbstractStringValidator.java b/src/com/vaadin/data/validator/AbstractStringValidator.java
index 7d08c69f29..a81d48b6f5 100644
--- a/src/com/vaadin/data/validator/AbstractStringValidator.java
+++ b/src/com/vaadin/data/validator/AbstractStringValidator.java
@@ -2,8 +2,7 @@ package com.vaadin.data.validator;
/**
* Validator base class for validating strings. See
- * {@link com.vaadin.data.validator.AbstractValidator} for more
- * information.
+ * {@link com.vaadin.data.validator.AbstractValidator} for more information.
*
* <p>
* If the validation fails, the exception thrown contains the error message with
diff --git a/src/com/vaadin/data/validator/AbstractValidator.java b/src/com/vaadin/data/validator/AbstractValidator.java
index 5cfc8a57e8..94222049a9 100644
--- a/src/com/vaadin/data/validator/AbstractValidator.java
+++ b/src/com/vaadin/data/validator/AbstractValidator.java
@@ -3,8 +3,8 @@ package com.vaadin.data.validator;
import com.vaadin.data.Validator;
/**
- * Default Validator base class. See
- * {@link com.vaadin.data.validator.Validator} for more information.
+ * Default Validator base class. See {@link com.vaadin.data.validator.Validator}
+ * for more information.
* <p>
* If the validation fails, the exception thrown contains the error message with
* its argument 0 replaced with the toString() of the object being validated.
diff --git a/src/com/vaadin/data/validator/EmailValidator.java b/src/com/vaadin/data/validator/EmailValidator.java
index edb7c8ce80..24bfb166d6 100644
--- a/src/com/vaadin/data/validator/EmailValidator.java
+++ b/src/com/vaadin/data/validator/EmailValidator.java
@@ -5,8 +5,8 @@ package com.vaadin.data.validator;
* complete according to RFC 822 but handles the vast majority of valid e-mail
* addresses correctly.
*
- * See {@link com.vaadin.data.validator.AbstractStringValidator} for
- * more information.
+ * See {@link com.vaadin.data.validator.AbstractStringValidator} for more
+ * information.
*
* @author IT Mill Ltd.
* @version
diff --git a/src/com/vaadin/event/FieldEvents.java b/src/com/vaadin/event/FieldEvents.java
index b298590a8c..0280aebb76 100644
--- a/src/com/vaadin/event/FieldEvents.java
+++ b/src/com/vaadin/event/FieldEvents.java
@@ -23,6 +23,7 @@ public interface FieldEvents {
* class really will send the events, or if it just defines the methods to
* be able to implement an interface.
* </p>
+ *
* @since 6.2
* @see FocusListener
* @see FocusEvent
@@ -60,6 +61,7 @@ public interface FieldEvents {
* class really will send the events, or if it just defines the methods to
* be able to implement an interface.
* </p>
+ *
* @since 6.2
* @see BlurListener
* @see BlurEvent
diff --git a/src/com/vaadin/event/MethodEventSource.java b/src/com/vaadin/event/MethodEventSource.java
index 3fd8ef68be..680aaad4b8 100644
--- a/src/com/vaadin/event/MethodEventSource.java
+++ b/src/com/vaadin/event/MethodEventSource.java
@@ -14,8 +14,7 @@ import java.lang.reflect.Method;
*
* <p>
* For more information on the inheritable event mechanism see the
- * {@link com.vaadin.event com.vaadin.event package
- * documentation}.
+ * {@link com.vaadin.event com.vaadin.event package documentation}.
* </p>
*
* @author IT Mill Ltd.
@@ -35,8 +34,7 @@ public interface MethodEventSource extends Serializable {
*
* <p>
* For more information on the inheritable event mechanism see the
- * {@link com.vaadin.event com.vaadin.event package
- * documentation}.
+ * {@link com.vaadin.event com.vaadin.event package documentation}.
* </p>
*
* @param eventType
@@ -69,8 +67,7 @@ public interface MethodEventSource extends Serializable {
*
* <p>
* For more information on the inheritable event mechanism see the
- * {@link com.vaadin.event com.vaadin.event package
- * documentation}.
+ * {@link com.vaadin.event com.vaadin.event package documentation}.
* </p>
*
* @param eventType
@@ -95,8 +92,7 @@ public interface MethodEventSource extends Serializable {
*
* <p>
* For more information on the inheritable event mechanism see the
- * {@link com.vaadin.event com.vaadin.event package
- * documentation}.
+ * {@link com.vaadin.event com.vaadin.event package documentation}.
* </p>
*
* @param eventType
@@ -114,8 +110,7 @@ public interface MethodEventSource extends Serializable {
*
* <p>
* For more information on the inheritable event mechanism see the
- * {@link com.vaadin.event com.vaadin.event package
- * documentation}.
+ * {@link com.vaadin.event com.vaadin.event package documentation}.
* </p>
*
* @param eventType
@@ -145,8 +140,7 @@ public interface MethodEventSource extends Serializable {
*
* <p>
* For more information on the inheritable event mechanism see the
- * {@link com.vaadin.event com.vaadin.event package
- * documentation}.
+ * {@link com.vaadin.event com.vaadin.event package documentation}.
* </p>
*
* @param eventType
diff --git a/src/com/vaadin/launcher/util/BrowserLauncher.java b/src/com/vaadin/launcher/util/BrowserLauncher.java
index 9775bdc48e..f30a717cf6 100644
--- a/src/com/vaadin/launcher/util/BrowserLauncher.java
+++ b/src/com/vaadin/launcher/util/BrowserLauncher.java
@@ -35,33 +35,35 @@ public class BrowserLauncher {
// See if the default browser is Konqueror by resolving the symlink.
boolean isDefaultKonqueror = false;
try {
- // Find out the location of the x-www-browser link from path.
- Process process = runtime.exec("which x-www-browser");
- BufferedInputStream ins = new BufferedInputStream(process.getInputStream());
- BufferedReader bufreader = new BufferedReader(new InputStreamReader(ins));
- String defaultLinkPath = bufreader.readLine();
- ins.close();
-
- // The path is null if the link did not exist.
- if (defaultLinkPath != null) {
- // See if the default browser is Konqueror.
- File file = new File(defaultLinkPath);
- String canonical = file.getCanonicalPath();
- if (canonical.indexOf("konqueror") != -1)
- isDefaultKonqueror = true;
- }
+ // Find out the location of the x-www-browser link from path.
+ Process process = runtime.exec("which x-www-browser");
+ BufferedInputStream ins = new BufferedInputStream(process
+ .getInputStream());
+ BufferedReader bufreader = new BufferedReader(
+ new InputStreamReader(ins));
+ String defaultLinkPath = bufreader.readLine();
+ ins.close();
+
+ // The path is null if the link did not exist.
+ if (defaultLinkPath != null) {
+ // See if the default browser is Konqueror.
+ File file = new File(defaultLinkPath);
+ String canonical = file.getCanonicalPath();
+ if (canonical.indexOf("konqueror") != -1)
+ isDefaultKonqueror = true;
+ }
} catch (IOException e1) {
- // The symlink was probably not found, so this is ok.
+ // The symlink was probably not found, so this is ok.
}
// Try x-www-browser, which is symlink to the default browser,
// except if we found that it is Konqueror.
if (!started && !isDefaultKonqueror) {
- try {
- runtime.exec("x-www-browser " + url);
- started = true;
- } catch (final IOException e) {
- }
+ try {
+ runtime.exec("x-www-browser " + url);
+ started = true;
+ } catch (final IOException e) {
+ }
}
// Try firefox
diff --git a/src/com/vaadin/terminal/Resource.java b/src/com/vaadin/terminal/Resource.java
index 07753aad16..2aee741f01 100644
--- a/src/com/vaadin/terminal/Resource.java
+++ b/src/com/vaadin/terminal/Resource.java
@@ -15,7 +15,7 @@ import java.io.Serializable;
* @VERSION@
* @since 3.0
*/
-public interface Resource extends Serializable{
+public interface Resource extends Serializable {
/**
* Gets the MIME type of the resource.
diff --git a/src/com/vaadin/terminal/Sizeable.java b/src/com/vaadin/terminal/Sizeable.java
index 6c18f746f2..0504451e19 100644
--- a/src/com/vaadin/terminal/Sizeable.java
+++ b/src/com/vaadin/terminal/Sizeable.java
@@ -15,7 +15,7 @@ import java.io.Serializable;
* @VERSION@
* @since 3.0
*/
-public interface Sizeable extends Serializable{
+public interface Sizeable extends Serializable {
/**
* Unit code representing pixels.
diff --git a/src/com/vaadin/terminal/Terminal.java b/src/com/vaadin/terminal/Terminal.java
index 4494bdc144..2ce013f6be 100644
--- a/src/com/vaadin/terminal/Terminal.java
+++ b/src/com/vaadin/terminal/Terminal.java
@@ -40,7 +40,7 @@ public interface Terminal extends Serializable {
/**
* Terminal error event.
*/
- public interface ErrorEvent extends Serializable{
+ public interface ErrorEvent extends Serializable {
/**
* Gets the contained throwable.
@@ -52,7 +52,7 @@ public interface Terminal extends Serializable {
/**
* Terminal error listener interface.
*/
- public interface ErrorListener extends Serializable{
+ public interface ErrorListener extends Serializable {
/**
* Invoked when terminal error occurs.
diff --git a/src/com/vaadin/terminal/gwt/client/Paintable.java b/src/com/vaadin/terminal/gwt/client/Paintable.java
index 54713bd5b7..0cf5571829 100644
--- a/src/com/vaadin/terminal/gwt/client/Paintable.java
+++ b/src/com/vaadin/terminal/gwt/client/Paintable.java
@@ -8,7 +8,7 @@ package com.vaadin.terminal.gwt.client;
* An interface used by client-side widgets or paintable parts to receive
* updates from the corresponding server-side components in the form of
* {@link UIDL}.
- *
+ *
* Updates can be sent back to the server using the
* {@link ApplicationConnection#updateVariable()} methods.
*/
diff --git a/src/com/vaadin/terminal/gwt/client/ui/MenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/MenuBar.java
index f950014ad7..5d10044d64 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/MenuBar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/MenuBar.java
@@ -42,9 +42,13 @@ import com.google.gwt.user.client.ui.Widget;
* <img class='gallery' src='MenuBar.png'/>
* </p>
*
- * <h3>CSS Style Rules</h3> <ul class='css'> <li>.gwt-MenuBar { the menu bar
- * itself }</li> <li>.gwt-MenuBar .gwt-MenuItem { menu items }</li> <li>
- * .gwt-MenuBar .gwt-MenuItem-selected { selected menu items }</li> </ul>
+ * <h3>CSS Style Rules</h3>
+ * <ul class='css'>
+ * <li>.gwt-MenuBar { the menu bar itself }</li>
+ * <li>.gwt-MenuBar .gwt-MenuItem { menu items }</li>
+ * <li>
+ * .gwt-MenuBar .gwt-MenuItem-selected { selected menu items }</li>
+ * </ul>
*
* <p>
* <h3>Example</h3>
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
index ac23ad9c68..74c1a683e2 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
@@ -263,7 +263,7 @@ public class VCalendarPanel extends FlexTable implements MouseListener {
}
/**
- *
+ *
* @param forceRedraw
* Build all from scratch, in case of e.g. locale changes
*/
@@ -447,8 +447,8 @@ public class VCalendarPanel extends FlexTable implements MouseListener {
Object sender = event.getSource();
Cell cell = cal.days.getCellForEvent(event);
if (sender != cal.days || cell == null || cell.getRowIndex() < 1
- || cell.getRowIndex() > 6
- || !cal.datefield.isEnabled() || cal.datefield.isReadonly()) {
+ || cell.getRowIndex() > 6 || !cal.datefield.isEnabled()
+ || cal.datefield.isReadonly()) {
return;
}
@@ -540,7 +540,7 @@ public class VCalendarPanel extends FlexTable implements MouseListener {
/**
* Sets focus to Calendar panel.
- *
+ *
* @param focus
*/
public void setFocus(boolean focus) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
index 0f269722de..8d83e8b2b5 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
@@ -93,7 +93,7 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field,
boolean overflowRight = false;
if (l + +w + extraSpace > browserWindowWidth) {
overflowRight = true;
- // Part of the popup is outside the browser window
+ // Part of the popup is outside the browser window
// (to the right)
l = browserWindowWidth - w - extraSpace;
}
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java
index 866ca99a0f..807c144b33 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java
@@ -153,12 +153,12 @@ public class VPopupView extends HTML implements Container, Iterable<Widget> {
/**
* Determines the correct position for a popup and displays the popup at
* that position.
- *
+ *
* By default, the popup is shown centered relative to its host component,
* ensuring it is visible on the screen if possible.
- *
+ *
* Can be overridden to customize the popup position.
- *
+ *
* @param popup
*/
protected void showPopup(final CustomPopup popup) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VUriFragmentUtility.java b/src/com/vaadin/terminal/gwt/client/ui/VUriFragmentUtility.java
index f0d571e741..bf57d23585 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VUriFragmentUtility.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VUriFragmentUtility.java
@@ -14,7 +14,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
/**
* Client side implementation for UriFragmentUtility. Uses GWT's History object
* as an implementation.
- *
+ *
*/
public class VUriFragmentUtility extends Widget implements Paintable,
ValueChangeHandler<String> {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java b/src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java
index ccda36ff8e..a29c915c52 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java
@@ -40,7 +40,7 @@ public class ChildComponentContainer extends Panel {
private int captionHeight = 0;
/**
- *
+ *
* Padding added to the container when it is larger than the component.
*/
private Size containerExpansion = new Size(0, 0);
@@ -189,14 +189,14 @@ public class ChildComponentContainer extends Panel {
/*
* Must remove width specification from container before rendering to
* allow components to grow in horizontal direction.
- *
+ *
* For fixed width layouts we specify the width directly so that height
* is automatically calculated correctly (e.g. for Labels).
*/
/*
* This should no longer be needed (after #2563) as all components are
* such that they can be rendered inside a 0x0 DIV.
- *
+ *
* The exception seems to be complex components (Tree and Table) on
* Opera (#3444).
*/
@@ -611,7 +611,7 @@ public class ChildComponentContainer extends Panel {
/**
* Return true if the size of the widget has been specified in the selected
* orientation.
- *
+ *
* @return
*/
public boolean widgetHasSizeSpecified(int orientation) {
@@ -654,7 +654,7 @@ public class ChildComponentContainer extends Panel {
/**
* Sets the normalized expand ratio of this slot. The fraction that this
* slot will use of "excess space".
- *
+ *
* @param expandRatio
*/
public void setNormalizedExpandRatio(double expandRatio) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java
index a6754a04b0..5b224dc689 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java
@@ -319,7 +319,7 @@ public class VRichTextToolbar extends Composite {
/**
* Creates a new toolbar that drives the given rich text area.
- *
+ *
* @param richText
* the rich text area to be controlled
*/
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
index eda9670ff7..428a9b38b9 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
@@ -51,7 +51,7 @@ import com.vaadin.ui.Window;
/**
* TODO Document me!
- *
+ *
* @author peholmst
*/
public abstract class AbstractApplicationPortlet extends GenericPortlet
@@ -136,7 +136,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
/**
* Gets an application property value.
- *
+ *
* @param parameterName
* the Name or the parameter.
* @return String value or null if not found
@@ -157,7 +157,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
/**
* Gets an system property value.
- *
+ *
* @param parameterName
* the Name or the parameter.
* @return String value or null if not found
@@ -186,7 +186,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
/**
* Gets an application or system property value.
- *
+ *
* @param parameterName
* the Name or the parameter.
* @param defaultValue
@@ -217,7 +217,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
* Return the URL from where static files, e.g. the widgetset and the theme,
* are served. In a standard configuration the VAADIN folder inside the
* returned folder is what is used for widgetsets and themes.
- *
+ *
* @param request
* @return The location of static resources (inside which there should be a
* VAADIN directory). Does not end with a slash (/).
@@ -292,7 +292,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
/**
* Returns true if the servlet is running in production mode. Production
* mode disables all debug facilities.
- *
+ *
* @return true if in production mode, false if in debug mode
*/
public boolean isProductionMode() {
@@ -655,15 +655,15 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
* application with window names identical to the portlet mode names.
* Alternatively, a PortletListener can change the application main window
* contents.
- *
+ *
* To implement custom portlet modes, subclass the portlet class and
* implement a method annotated with {@link RenderMode} for the custom mode,
* calling {@link #handleRequest(PortletRequest, PortletResponse)} directly
* from it.
- *
+ *
* Note that the portlet class in the portlet configuration needs to be
* changed when overriding methods of this class.
- *
+ *
* @param request
* @param response
* @throws PortletException
@@ -677,7 +677,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
/**
* Handle a request for the "edit" portlet mode.
- *
+ *
* @see #doView(RenderRequest, RenderResponse)
*/
@Override
@@ -688,7 +688,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
/**
* Handle a request for the "help" portlet mode.
- *
+ *
* @see #doView(RenderRequest, RenderResponse)
*/
@Override
@@ -1012,7 +1012,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
/**
* Returns the theme for given request/window
- *
+ *
* @param request
* @param window
* @return
@@ -1063,7 +1063,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
/**
* Get system messages from the current application class
- *
+ *
* @return
*/
protected SystemMessages getSystemMessages() {
@@ -1136,7 +1136,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
* Send notification to client's application. Used to notify client of
* critical errors and session expiration due to long inactivity. Server has
* no knowledge of what application client refers to.
- *
+ *
* @param request
* the Portlet request instance.
* @param response
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java b/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java
index 39d660c05b..d74eb99ec7 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java
@@ -43,7 +43,7 @@ public abstract class AbstractWebApplicationContext implements
/**
* Sends a notification that a transaction is starting.
- *
+ *
* @param application
* The application associated with the transaction.
* @param request
@@ -59,7 +59,7 @@ public abstract class AbstractWebApplicationContext implements
/**
* Sends a notification that a transaction has ended.
- *
+ *
* @param application
* The application associated with the transaction.
* @param request
@@ -130,11 +130,11 @@ public abstract class AbstractWebApplicationContext implements
/**
* Get the web browser associated with this application context.
- *
+ *
* Because application context is related to the http session and server
* maintains one session per browser-instance, each context has exactly one
* web browser associated with it.
- *
+ *
* @return
*/
public WebBrowser getBrowser() {
@@ -150,8 +150,8 @@ public abstract class AbstractWebApplicationContext implements
applicationToAjaxAppMgrMap.remove(application);
}
- public String generateApplicationResourceURL(
- ApplicationResource resource, String mapKey) {
+ public String generateApplicationResourceURL(ApplicationResource resource,
+ String mapKey) {
final String filename = resource.getFilename();
if (filename == null) {
diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java
index c865121a3c..1340bee3c7 100644
--- a/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java
+++ b/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java
@@ -182,7 +182,7 @@ public class ApplicationPortlet implements Portlet, Serializable {
* servlet to extend the session lifetime after each Vaadin
* request. This hack can be removed when supporting portlet
* 2.0 and resourceRequests.
- *
+ *
* TODO make this configurable, this is not necessary with
* some custom session configurations.
*/
diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
index 07b0f84338..62aebf949a 100644
--- a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
@@ -89,7 +89,7 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet {
/**
* Parses application runner URIs.
- *
+ *
* If request URL is e.g.
* http://localhost:8080/vaadin/run/com.vaadin.demo.Calc then
* <ul>
@@ -97,7 +97,7 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet {
* <li>Runner servlet=run</li>
* <li>Vaadin application=com.vaadin.demo.Calc</li>
* </ul>
- *
+ *
* @param request
* @return string array containing widgetset URI, application URI and
* context, runner, application classname
diff --git a/src/com/vaadin/terminal/gwt/server/Constants.java b/src/com/vaadin/terminal/gwt/server/Constants.java
index a2825de87a..06ad23cf21 100644
--- a/src/com/vaadin/terminal/gwt/server/Constants.java
+++ b/src/com/vaadin/terminal/gwt/server/Constants.java
@@ -2,9 +2,9 @@ package com.vaadin.terminal.gwt.server;
/**
* TODO Document me!
- *
+ *
* @author peholmst
- *
+ *
*/
public interface Constants {
diff --git a/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java b/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java
index 4d57e1f395..5fa0703f47 100644
--- a/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java
+++ b/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java
@@ -24,7 +24,7 @@ import com.vaadin.terminal.Terminal;
* <p>
* Alternatives for implementing similar features are are Servlet {@link Filter}
* s and {@link TransactionListener}s in Vaadin.
- *
+ *
* @since 6.2
* @see PortletRequestListener
*/
@@ -33,7 +33,7 @@ public interface HttpServletRequestListener extends Serializable {
/**
* This method is called before {@link Terminal} applies the request to
* Application.
- *
+ *
* @param request
* @param response
*/
@@ -42,7 +42,7 @@ public interface HttpServletRequestListener extends Serializable {
/**
* This method is called at the end of each request.
- *
+ *
* @param request
* @param response
*/
diff --git a/src/com/vaadin/terminal/gwt/server/HttpUploadStream.java b/src/com/vaadin/terminal/gwt/server/HttpUploadStream.java
index c9e3c77cad..40b5d41004 100644
--- a/src/com/vaadin/terminal/gwt/server/HttpUploadStream.java
+++ b/src/com/vaadin/terminal/gwt/server/HttpUploadStream.java
@@ -15,8 +15,7 @@ import java.io.InputStream;
* @since 5.0
*/
@SuppressWarnings("serial")
-public class HttpUploadStream implements
- com.vaadin.terminal.UploadStream {
+public class HttpUploadStream implements com.vaadin.terminal.UploadStream {
/**
* Holds value of property variableName.
diff --git a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
index 8effcb6c65..ab1b1da81f 100644
--- a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
+++ b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
@@ -34,10 +34,10 @@ import com.vaadin.ui.Window;
/**
* TODO Write documentation, fix JavaDoc tags.
- *
+ *
* This is automatically registered as a {@link HttpSessionBindingListener} when
* {@link PortletSession#setAttribute()} is called with the context as value.
- *
+ *
* @author peholmst
*/
@SuppressWarnings("serial")
@@ -144,7 +144,8 @@ public class PortletApplicationContext2 extends AbstractWebApplicationContext {
Set<PortletListener> listeners = portletListeners.get(app);
if (listeners != null) {
for (PortletListener l : listeners) {
- l.handleRenderRequest(request, new RestrictedRenderResponse(response));
+ l.handleRenderRequest(request, new RestrictedRenderResponse(
+ response));
}
}
}
@@ -154,8 +155,8 @@ public class PortletApplicationContext2 extends AbstractWebApplicationContext {
String key = request.getParameter(ActionRequest.ACTION_NAME);
if (eventActionDestinationMap.containsKey(key)) {
// this action request is only to send queued portlet events
- response.setEvent(eventActionDestinationMap.get(key), eventActionValueMap
- .get(key));
+ response.setEvent(eventActionDestinationMap.get(key),
+ eventActionValueMap.get(key));
// cleanup
eventActionDestinationMap.remove(key);
eventActionValueMap.remove(key);
@@ -214,9 +215,9 @@ public class PortletApplicationContext2 extends AbstractWebApplicationContext {
/**
* This is for use by {@link AbstractApplicationPortlet} only.
- *
+ *
* TODO cleaner implementation, now "semi-static"!
- *
+ *
* @param mimeResponse
*/
void setResponse(PortletResponse response) {
@@ -224,8 +225,7 @@ public class PortletApplicationContext2 extends AbstractWebApplicationContext {
}
@Override
- public String generateApplicationResourceURL(
- ApplicationResource resource,
+ public String generateApplicationResourceURL(ApplicationResource resource,
String mapKey) {
if (response instanceof MimeResponse) {
ResourceURL resourceURL = ((MimeResponse) response)
@@ -245,7 +245,7 @@ public class PortletApplicationContext2 extends AbstractWebApplicationContext {
/**
* Creates a new action URL.
- *
+ *
* @param action
* @return action URL or null if called outside a MimeRequest (outside a
* UIDL request or similar)
@@ -263,16 +263,16 @@ public class PortletApplicationContext2 extends AbstractWebApplicationContext {
/**
* Sends a portlet event to the indicated destination.
- *
+ *
* Internally, an action may be created and opened, as an event cannot be
* sent directly from all types of requests.
- *
+ *
* The event destinations and values need to be kept in the context until
* sent. Any memory leaks if the action fails are limited to the session.
- *
+ *
* Event names for events sent and received by a portlet need to be declared
* in portlet.xml .
- *
+ *
* @param window
* a window in which a temporary action URL can be opened if
* necessary
@@ -310,16 +310,16 @@ public class PortletApplicationContext2 extends AbstractWebApplicationContext {
/**
* Sets a shared portlet parameter.
- *
+ *
* Internally, an action may be created and opened, as shared parameters
* cannot be set directly from all types of requests.
- *
+ *
* The parameters and values need to be kept in the context until sent. Any
* memory leaks if the action fails are limited to the session.
- *
+ *
* Shared parameters set or read by a portlet need to be declared in
* portlet.xml .
- *
+ *
* @param window
* a window in which a temporary action URL can be opened if
* necessary
@@ -356,9 +356,9 @@ public class PortletApplicationContext2 extends AbstractWebApplicationContext {
/**
* Sets the portlet mode. This may trigger a new render request.
- *
+ *
* Portlet modes used by a portlet need to be declared in portlet.xml .
- *
+ *
* @param window
* a window in which the render URL can be opened if necessary
* @param portletMode
diff --git a/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java
index 092bc4c55e..3a5cd90f7c 100644
--- a/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java
@@ -24,9 +24,9 @@ import com.vaadin.ui.Window;
/**
* TODO document me!
- *
+ *
* @author peholmst
- *
+ *
*/
@SuppressWarnings("serial")
public class PortletCommunicationManager extends AbstractCommunicationManager {
@@ -168,7 +168,7 @@ public class PortletCommunicationManager extends AbstractCommunicationManager {
/**
* Find the application window to use based on the portlet mode. For
* internal use only, not in the {@link Callback} interface.
- *
+ *
* @param request
* @param application
* @return
diff --git a/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java b/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java
index 95458d59d9..201797968e 100644
--- a/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java
+++ b/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java
@@ -19,12 +19,11 @@ import org.w3c.dom.Element;
/**
* Read-only wrapper for a {@link RenderResponse}.
- *
+ *
* Only for use by {@link PortletApplicationContext} and
* {@link PortletApplicationContext2}.
*/
-class RestrictedRenderResponse implements RenderResponse,
- Serializable {
+class RestrictedRenderResponse implements RenderResponse, Serializable {
private RenderResponse response;
@@ -115,8 +114,7 @@ class RestrictedRenderResponse implements RenderResponse,
response.setTitle(title);
}
- public void setNextPossiblePortletModes(
- Collection<PortletMode> portletModes) {
+ public void setNextPossiblePortletModes(Collection<PortletMode> portletModes) {
// NOP
// TODO throw?
}
diff --git a/src/com/vaadin/terminal/gwt/server/WebBrowser.java b/src/com/vaadin/terminal/gwt/server/WebBrowser.java
index a3fcfafb1f..1fb4cbba74 100644
--- a/src/com/vaadin/terminal/gwt/server/WebBrowser.java
+++ b/src/com/vaadin/terminal/gwt/server/WebBrowser.java
@@ -20,7 +20,7 @@ public class WebBrowser implements Terminal {
/**
* There is no default-theme for this terminal type.
- *
+ *
* @return Allways returns null.
*/
public String getDefaultTheme() {
@@ -29,7 +29,7 @@ public class WebBrowser implements Terminal {
/**
* Get the height of the users display in pixels.
- *
+ *
*/
public int getScreenHeight() {
return screenHeight;
@@ -37,7 +37,7 @@ public class WebBrowser implements Terminal {
/**
* Get the width of the users display in pixels.
- *
+ *
*/
public int getScreenWidth() {
return screenWidth;
@@ -45,7 +45,7 @@ public class WebBrowser implements Terminal {
/**
* Get the browser user-agent string.
- *
+ *
* @return
*/
public String getBrowserApplication() {
@@ -78,7 +78,7 @@ public class WebBrowser implements Terminal {
/**
* Get the IP-address of the web browser. If the application is running
* inside a portlet, this method will return null.
- *
+ *
* @return IP-address in 1.12.123.123 -format
*/
public String getAddress() {
diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java b/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java
index c2c47f76a2..5b760b3b18 100644
--- a/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java
+++ b/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java
@@ -20,11 +20,11 @@ import java.util.regex.Pattern;
/**
* Helper class to update widgetsets GWT module configuration file. Can be used
* command line or via IDE tools.
- *
+ *
* <p>
* If module definition file contains text "WS Compiler: manually edited", tool
* will skip editing file.
- *
+ *
*/
public class WidgetSetBuilder {
diff --git a/src/com/vaadin/ui/BaseFieldFactory.java b/src/com/vaadin/ui/BaseFieldFactory.java
index 0be76ab2b3..50478f4310 100644
--- a/src/com/vaadin/ui/BaseFieldFactory.java
+++ b/src/com/vaadin/ui/BaseFieldFactory.java
@@ -11,9 +11,10 @@ import com.vaadin.data.Property;
/**
* Default implementation of the the following Field types are used by default:
* <p>
- * <b>Boolean</b>: Button(switchMode:true).<br/> <b>Date</b>:
- * DateField(resolution: day).<br/> <b>Item</b>: Form. <br/> <b>default field
- * type</b>: TextField.
+ * <b>Boolean</b>: Button(switchMode:true).<br/>
+ * <b>Date</b>: DateField(resolution: day).<br/>
+ * <b>Item</b>: Form. <br/>
+ * <b>default field type</b>: TextField.
* <p>
*
* @author IT Mill Ltd.