From eeffa805a212ebb25c4af18db1e927b23a3ad66a Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 18 Aug 2016 09:31:40 +0300 Subject: Remove trailing whitespace from code and javadoc Change-Id: I4c852b7f9928e190572876690d5bef1234494a5d --- .../main/java/com/vaadin/ui/themes/BaseTheme.java | 10 +- .../java/com/vaadin/ui/themes/ChameleonTheme.java | 20 +-- .../main/java/com/vaadin/ui/themes/Reindeer.java | 48 +++---- .../src/main/java/com/vaadin/ui/themes/Runo.java | 50 +++---- .../main/java/com/vaadin/ui/themes/ValoTheme.java | 160 ++++++++++----------- 5 files changed, 144 insertions(+), 144 deletions(-) (limited to 'server/src/main/java/com/vaadin/ui/themes') diff --git a/server/src/main/java/com/vaadin/ui/themes/BaseTheme.java b/server/src/main/java/com/vaadin/ui/themes/BaseTheme.java index 9421cf2341..5ec3f9dd88 100644 --- a/server/src/main/java/com/vaadin/ui/themes/BaseTheme.java +++ b/server/src/main/java/com/vaadin/ui/themes/BaseTheme.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2014 Vaadin Ltd. - * + * * 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 @@ -30,9 +30,9 @@ package com.vaadin.ui.themes; *

* All theme class files should follow the convention of specifying the theme * name as a string constant THEME_NAME. - * + * * @since 6.3.0 - * + * */ public class BaseTheme { diff --git a/server/src/main/java/com/vaadin/ui/themes/ChameleonTheme.java b/server/src/main/java/com/vaadin/ui/themes/ChameleonTheme.java index 6e230c426e..766a6b5486 100644 --- a/server/src/main/java/com/vaadin/ui/themes/ChameleonTheme.java +++ b/server/src/main/java/com/vaadin/ui/themes/ChameleonTheme.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2014 Vaadin Ltd. - * + * * 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 @@ -313,9 +313,9 @@ public class ChameleonTheme extends BaseTheme { * segment, and add "first" and "last" style names * for the first and last button in the segment. Then use the * {@link #BUTTON_DOWN} style to indicate button states. - * + * * E.g. - * + * *

      * HorizontalLayout ("segment")
      *   + Button ("first down")
@@ -324,7 +324,7 @@ public class ChameleonTheme extends BaseTheme {
      *    ...
      *   + Button ("last")
      * 
- * + * * You can also use most of the different button styles for the contained * buttons (e.g. {@link #BUTTON_BIG}, {@link #BUTTON_ICON_ONLY} etc.). */ @@ -335,9 +335,9 @@ public class ChameleonTheme extends BaseTheme { * {@link #COMPOUND_HORIZONTAL_LAYOUT_SEGMENT} style to make buttons with * the "down" style use the themes alternate color (e.g. blue instead of * gray). - * + * * E.g. - * + * *
      * HorizontalLayout ("segment segment-alternate")
      *   + Button ("first down")
@@ -352,9 +352,9 @@ public class ChameleonTheme extends BaseTheme {
     /**
      * Creates an iTunes-like menu from a CssLayout or a VerticalLayout. Place
      * plain Labels and NativeButtons inside the layout, and you're all set.
-     * 
+     *
      * E.g.
-     * 
+     *
      * 
      * CssLayout ("sidebar-menu")
      *   + Label
diff --git a/server/src/main/java/com/vaadin/ui/themes/Reindeer.java b/server/src/main/java/com/vaadin/ui/themes/Reindeer.java
index 1d7b2a10da..264edd49c5 100644
--- a/server/src/main/java/com/vaadin/ui/themes/Reindeer.java
+++ b/server/src/main/java/com/vaadin/ui/themes/Reindeer.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * 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
@@ -20,9 +20,9 @@ public class Reindeer extends BaseTheme {
     public static final String THEME_NAME = "reindeer";
 
     /***************************************************************************
-     * 
+     *
      * Label styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -41,9 +41,9 @@ public class Reindeer extends BaseTheme {
     public static final String LABEL_SMALL = "light";
 
     /***************************************************************************
-     * 
+     *
      * Button styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -59,9 +59,9 @@ public class Reindeer extends BaseTheme {
     public static final String BUTTON_SMALL = "small";
 
     /***************************************************************************
-     * 
+     *
      * TextField styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -70,9 +70,9 @@ public class Reindeer extends BaseTheme {
     public static final String TEXTFIELD_SMALL = "small";
 
     /***************************************************************************
-     * 
+     *
      * Panel styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -81,9 +81,9 @@ public class Reindeer extends BaseTheme {
     public static final String PANEL_LIGHT = "light";
 
     /***************************************************************************
-     * 
+     *
      * ProgressBar Styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -93,9 +93,9 @@ public class Reindeer extends BaseTheme {
     public static final String PROGRESSBAR_STATIC = "static";
 
     /***************************************************************************
-     * 
+     *
      * SplitPanel styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -104,9 +104,9 @@ public class Reindeer extends BaseTheme {
     public static final String SPLITPANEL_SMALL = "small";
 
     /***************************************************************************
-     * 
+     *
      * TabSheet styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -138,9 +138,9 @@ public class Reindeer extends BaseTheme {
     public static final String TABSHEET_SELECTED_CLOSABLE = "selected-closable";
 
     /***************************************************************************
-     * 
+     *
      * Table styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -154,9 +154,9 @@ public class Reindeer extends BaseTheme {
     public static final String TABLE_STRONG = "strong";
 
     /***************************************************************************
-     * 
+     *
      * Layout styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -192,14 +192,14 @@ public class Reindeer extends BaseTheme {
      * Applies to {@link VerticalLayout}, {@link HorizontalLayout},
      * {@link GridLayout}, {@link FormLayout} and {@link CssLayout}.
      * 

- * + * */ public static final String LAYOUT_BLACK = "black"; /*************************************************************************** - * + * * Window styles - * + * **************************************************************************/ /** diff --git a/server/src/main/java/com/vaadin/ui/themes/Runo.java b/server/src/main/java/com/vaadin/ui/themes/Runo.java index 6f8d5f37d9..e36a7c49af 100644 --- a/server/src/main/java/com/vaadin/ui/themes/Runo.java +++ b/server/src/main/java/com/vaadin/ui/themes/Runo.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2014 Vaadin Ltd. - * + * * 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 @@ -24,9 +24,9 @@ public class Runo extends BaseTheme { } /*************************************************************************** - * + * * Button styles - * + * **************************************************************************/ /** @@ -47,9 +47,9 @@ public class Runo extends BaseTheme { public static final String BUTTON_DEFAULT = "default"; /*************************************************************************** - * + * * Panel styles - * + * **************************************************************************/ /** @@ -58,9 +58,9 @@ public class Runo extends BaseTheme { public static final String PANEL_LIGHT = "light"; /*************************************************************************** - * + * * ProgressBar Styles - * + * **************************************************************************/ /** @@ -70,9 +70,9 @@ public class Runo extends BaseTheme { public static final String PROGRESSBAR_STATIC = "static"; /*************************************************************************** - * + * * TabSheet styles - * + * **************************************************************************/ /** @@ -81,9 +81,9 @@ public class Runo extends BaseTheme { public static final String TABSHEET_SMALL = "light"; /*************************************************************************** - * + * * SplitPanel styles - * + * **************************************************************************/ /** @@ -99,9 +99,9 @@ public class Runo extends BaseTheme { public static final String SPLITPANEL_SMALL = "small"; /*************************************************************************** - * + * * Label styles - * + * **************************************************************************/ /** @@ -123,9 +123,9 @@ public class Runo extends BaseTheme { public static final String LABEL_SMALL = "small"; /*************************************************************************** - * + * * Layout styles - * + * **************************************************************************/ /** @@ -153,9 +153,9 @@ public class Runo extends BaseTheme { public static final String CSSLAYOUT_SELECTABLE_SELECTED = "selectable-selected"; /*************************************************************************** - * + * * TextField styles - * + * **************************************************************************/ /** @@ -164,9 +164,9 @@ public class Runo extends BaseTheme { public static final String TEXTFIELD_SMALL = "small"; /*************************************************************************** - * + * * Table styles - * + * **************************************************************************/ /** @@ -181,9 +181,9 @@ public class Runo extends BaseTheme { public static final String TABLE_BORDERLESS = "borderless"; /*************************************************************************** - * + * * Accordion styles - * + * **************************************************************************/ /** @@ -194,9 +194,9 @@ public class Runo extends BaseTheme { public static final String ACCORDION_LIGHT = "light"; /*************************************************************************** - * + * * Window styles - * + * **************************************************************************/ /** diff --git a/server/src/main/java/com/vaadin/ui/themes/ValoTheme.java b/server/src/main/java/com/vaadin/ui/themes/ValoTheme.java index 3a9986c632..335c9daee8 100644 --- a/server/src/main/java/com/vaadin/ui/themes/ValoTheme.java +++ b/server/src/main/java/com/vaadin/ui/themes/ValoTheme.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2014 Vaadin Ltd. - * + * * 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 @@ -23,23 +23,23 @@ import com.vaadin.ui.Table.ColumnHeaderMode; *

* Additional style names which can be used with the Valo theme. *

- * + * *

* These styles are only available if the * $v-included-additional-styles Sass list variable contains the * name of the component for that additional style name (e.g. * button, textfield, table). *

- * + * *

* Most of these additional style names can be included individually into your * custom theme using the component specific Sass mixins, in which case you can * also define the style names yourself. See the Valo theme Sass API * documentation for additional information. *

- * + * * TODO link to Sass API documentation - * + * * @since 7.3 * @author Vaadin Ltd */ @@ -48,9 +48,9 @@ public class ValoTheme { public static final String THEME_NAME = "valo"; /*************************************************************************** - * + * * Notification styles - * + * **************************************************************************/ /** @@ -113,9 +113,9 @@ public class ValoTheme { public static final String NOTIFICATION_FAILURE = "failure"; /*************************************************************************** - * + * * Label styles - * + * **************************************************************************/ /** @@ -206,9 +206,9 @@ public class ValoTheme { /** * Spinner style. Add this style name to an empty Label to create a spinner. - * + * *

Example

- * + * *
      * Label spinner = new Label();
      * spinner.addStyleName(ValoTheme.LABEL_SPINNER);
@@ -217,9 +217,9 @@ public class ValoTheme {
     public static final String LABEL_SPINNER = "spinner";
 
     /***************************************************************************
-     * 
+     *
      * Button styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -307,9 +307,9 @@ public class ValoTheme {
     public static final String BUTTON_ICON_ONLY = "icon-only";
 
     /***************************************************************************
-     * 
+     *
      * Link styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -323,9 +323,9 @@ public class ValoTheme {
     public static final String LINK_LARGE = "large";
 
     /***************************************************************************
-     * 
+     *
      * TextField styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -373,9 +373,9 @@ public class ValoTheme {
     public static final String TEXTFIELD_INLINE_ICON = "inline-icon";
 
     /***************************************************************************
-     * 
+     *
      * TextArea styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -417,9 +417,9 @@ public class ValoTheme {
     public static final String TEXTAREA_ALIGN_CENTER = "align-center";
 
     /***************************************************************************
-     * 
+     *
      * DateField styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -461,9 +461,9 @@ public class ValoTheme {
     public static final String DATEFIELD_ALIGN_CENTER = "align-center";
 
     /***************************************************************************
-     * 
+     *
      * ComboBox styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -505,9 +505,9 @@ public class ValoTheme {
     public static final String COMBOBOX_ALIGN_CENTER = "align-center";
 
     /***************************************************************************
-     * 
+     *
      * CheckBox styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -521,9 +521,9 @@ public class ValoTheme {
     public static final String CHECKBOX_LARGE = "large";
 
     /***************************************************************************
-     * 
+     *
      * OptionGroup styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -545,9 +545,9 @@ public class ValoTheme {
     public static final String OPTIONGROUP_HORIZONTAL = "horizontal";
 
     /***************************************************************************
-     * 
+     *
      * Slider styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -557,9 +557,9 @@ public class ValoTheme {
     public static final String SLIDER_NO_INDICATOR = "no-indicator";
 
     /***************************************************************************
-     * 
+     *
      * ProgressBar styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -569,9 +569,9 @@ public class ValoTheme {
     public static final String PROGRESSBAR_POINT = "point";
 
     /***************************************************************************
-     * 
+     *
      * MenuBar styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -585,9 +585,9 @@ public class ValoTheme {
     public static final String MENUBAR_BORDERLESS = "borderless";
 
     /***************************************************************************
-     * 
+     *
      * Table and TreeTable styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -669,9 +669,9 @@ public class ValoTheme {
     public static final String TREETABLE_SMALL = TABLE_SMALL;
 
     /***************************************************************************
-     * 
+     *
      * DragAndDropWrapper styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -693,9 +693,9 @@ public class ValoTheme {
     public static final String DRAG_AND_DROP_WRAPPER_NO_HORIZONTAL_DRAG_HINTS = "no-horizontal-drag-hints";
 
     /***************************************************************************
-     * 
+     *
      * Panel styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -717,9 +717,9 @@ public class ValoTheme {
     public static final String PANEL_WELL = "well";
 
     /***************************************************************************
-     * 
+     *
      * SplitPanel styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -728,9 +728,9 @@ public class ValoTheme {
     public static final String SPLITPANEL_LARGE = "large";
 
     /***************************************************************************
-     * 
+     *
      * TabSheet styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -783,9 +783,9 @@ public class ValoTheme {
     public static final String TABSHEET_ONLY_SELECTED_TAB_IS_CLOSABLE = "only-selected-closable";
 
     /***************************************************************************
-     * 
+     *
      * Accordion styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -795,9 +795,9 @@ public class ValoTheme {
     public static final String ACCORDION_BORDERLESS = "borderless";
 
     /***************************************************************************
-     * 
+     *
      * Window and related styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -817,9 +817,9 @@ public class ValoTheme {
     public static final String WINDOW_BOTTOM_TOOLBAR = "v-window-bottom-toolbar";
 
     /***************************************************************************
-     * 
+     *
      * FormLayout styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -830,9 +830,9 @@ public class ValoTheme {
     public static final String FORMLAYOUT_LIGHT = "light";
 
     /***************************************************************************
-     * 
+     *
      * Layout styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -858,16 +858,16 @@ public class ValoTheme {
     /**
      * Add this style name to a CssLayout to create a grouped set of components,
      * i.e. a row of components which are joined seamlessly together.
-     * 
+     *
      * 

Example

- * + * *
      * CssLayout group = new CssLayout();
      * group.addStyleName(ValoTheme.LAYOUT_COMPONENT_GROUP);
-     * 
+     *
      * TextField field = new TextField();
      * group.addComponent(field);
-     * 
+     *
      * Button button = new Button("Action");
      * group.addComponent(button);
      * 
@@ -875,9 +875,9 @@ public class ValoTheme { public static final String LAYOUT_COMPONENT_GROUP = "v-component-group"; /*************************************************************************** - * + * * Valo menu styles - * + * **************************************************************************/ /** @@ -885,19 +885,19 @@ public class ValoTheme { * When you use the Valo menu and wish to enable responsive features of the * menu, you need to add this style name to the UI containing the menu. *

- * + * *

* You only need to add this style name to the UI containing a Valo menu, if * you're using the Responsive extension with the UI. *

- * + * *

Example

- * + * *

* To enable responsivity in the Valo menu, the following example code * should be executed in your UI containing the menu. *

- * + * *
      * Responsive.makeResponsive(this);
      * addStyleName(ValoTheme.UI_WITH_MENU);
@@ -910,7 +910,7 @@ public class ValoTheme {
      * Set the primary style name of a CssLayout to this, and
      * add any number of layouts with the {@link #MENU_PART} style inside it.
      * 

- * + * *

* The menu style is used to create a sidebar navigation menu for the * application, usually action as the main navigation for the different @@ -918,9 +918,9 @@ public class ValoTheme { * {@link #MENU_ITEM}s, and possibly some {@link #MENU_SUBTITLE}s and a * {@link #MENU_TITLE}. *

- * + * *

Example

- * + * *
      * CssLayout menuArea = new CssLayout();
      * menuArea.setPrimaryStyleName(ValoTheme.MENU_ROOT);
@@ -932,9 +932,9 @@ public class ValoTheme {
      * Add this style name to any layout and place it inside a layout with the
      * {@link #MENU_ROOT} style to build a menu component. Use the additional
      * MENU styles for individual components inside the layout.
-     * 
+     *
      * 

Example

- * + * *
      * CssLayout menu = new CssLayout();
      * menu.addStyleName(ValoTheme.MENU_PART);
@@ -948,9 +948,9 @@ public class ValoTheme {
      * captions. Useful on narrower viewport widths, since the menu width is
      * decreased quite dramatically, making more space for the content of the
      * application.
-     * 
+     *
      * 

Example

- * + * *
      * CssLayout menu = new CssLayout();
      * menu.addStyleName(ValoTheme.MENU_PART);
@@ -965,7 +965,7 @@ public class ValoTheme {
      * (intended to be placed in side a {@link #MENU_PART} layout). You can add
      * any components inside it, but usually you would place a Label inside.
      * 

- * + * *

* Any MenuBar component that you place inside this layout will match the * style of the title, allowing an easy way to add a toolbar to the title @@ -985,15 +985,15 @@ public class ValoTheme { * Set the primary style name of a Button to this style name * to create a clickable menu item in the menu. *

- * + * *

Selected item

*

* Add an additional style name selected to it to make * it the selected item in the menu. *

- * + * *

Example

- * + * *
      * Button item = new Button();
      * item.setPrimaryStyleName(ValoTheme.MENU_ITEM);
@@ -1007,9 +1007,9 @@ public class ValoTheme {
      * or {@link #MENU_ITEM} to add an additional badge indicator to the
      * subtitle/item. The Label/Button needs to allow HTML content in order to
      * use this style name.
-     * 
+     *
      * 

Examples

- * + * *
      * Button item = new Button();
      * item.setPrimaryStyleName(ValoTheme.MENU_ITEM);
@@ -1017,7 +1017,7 @@ public class ValoTheme {
      * item.setCaption("Item Caption <span class=\"" + ValoTheme.MENU_BADGE
      *         + "\">Badge text</span>");
      * 
- * + * *
      * Label item = new Label();
      * item.setPrimaryStyleName(ValoTheme.MENU_ITEM);
@@ -1034,7 +1034,7 @@ public class ValoTheme {
      * style name to create an application logo. The logo is designed to be
      * placed inside a {@link #MENU_PART} layout.
      * 

- * + * *

* The text content of the logo should be very short, since the logo area * only shows approximately three letters. Using one of the @@ -1042,9 +1042,9 @@ public class ValoTheme { * application. *

*

- * + * *

Example

- * + * *
      * Label logo = new Label(FontAwesome.ROCKET.getHtml(), ContentMode.HTML);
      * logo.setSizeUndefined();
-- 
cgit v1.2.3