Rename contentMode to descriptionContentMode in MenuItem (#10494)

1 files changed, 10 insertions, 10 deletions

diff --git a/client/src/main/java/com/vaadin/client/ui/VMenuBar.java b/client/src/main/java/com/vaadin/client/ui/VMenuBar.java
index 144f6117d0..684527a380 100644
--- a/client/src/main/java/com/vaadin/client/ui/VMenuBar.java
+++ b/client/src/main/java/com/vaadin/client/ui/VMenuBar.java
@@ -57,8 +57,8 @@ import com.vaadin.shared.ui.ContentMode;
 import com.vaadin.shared.ui.menubar.MenuBarConstants;
 
 public class VMenuBar extends FocusableFlowPanel
-        implements CloseHandler<PopupPanel>, KeyPressHandler, KeyDownHandler,
-        FocusHandler, SubPartAware, MouseOutHandler, MouseOverHandler {
+implements CloseHandler<PopupPanel>, KeyPressHandler, KeyDownHandler,
+FocusHandler, SubPartAware, MouseOutHandler, MouseOverHandler {
 
     // The hierarchy of VMenuBar is a bit weird as VMenuBar is the Paintable,
     // used for the root menu but also used for the sub menus.
@@ -793,7 +793,7 @@ public class VMenuBar extends FocusableFlowPanel
      *
      */
     public static class CustomMenuItem extends Widget
-            implements HasHTML, SubPartAware {
+    implements HasHTML, SubPartAware {
 
         protected String html = null;
         protected Command command = null;
@@ -805,7 +805,7 @@ public class VMenuBar extends FocusableFlowPanel
         protected boolean checked = false;
         protected boolean selected = false;
         protected String description = null;
-        protected ContentMode contentMode = null;
+        protected ContentMode descriptionContentMode = null;
 
         private String styleName;
 
@@ -1116,23 +1116,23 @@ public class VMenuBar extends FocusableFlowPanel
             }
 
             if (uidl.hasAttribute(
-                    MenuBarConstants.ATTRIBUTE_ITEM_CONTENT_MODE)) {
+                    MenuBarConstants.ATTRIBUTE_ITEM_DESCRIPTION_CONTENT_MODE)) {
                 String contentModeString = uidl.getStringAttribute(
-                        MenuBarConstants.ATTRIBUTE_ITEM_CONTENT_MODE);
-                contentMode = ContentMode.valueOf(contentModeString);
+                        MenuBarConstants.ATTRIBUTE_ITEM_DESCRIPTION_CONTENT_MODE);
+                descriptionContentMode = ContentMode.valueOf(contentModeString);
             } else {
-                contentMode = ContentMode.PREFORMATTED;
+                descriptionContentMode = ContentMode.PREFORMATTED;
             }
 
             updateStyleNames();
         }
 
         public TooltipInfo getTooltip() {
-            if (description == null || contentMode == null) {
+            if (description == null || descriptionContentMode == null) {
                 return null;
             }
 
-            return new TooltipInfo(description, contentMode, null,
+            return new TooltipInfo(description, descriptionContentMode, null,
                     this);
         }