--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java	Fri Sep 18 11:31:15 2015 -0700
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java	Sat Sep 19 15:45:59 2015 -0700
@@ -169,12 +169,12 @@
                     display();
                 }};
 
-        private final static int TOOLTIP_SHOW_TIME = 10000;
-        private final static int TOOLTIP_START_DELAY_TIME = 1000;
-        private final static int TOOLTIP_MAX_LENGTH = 64;
-        private final static int TOOLTIP_MOUSE_CURSOR_INDENT = 5;
-        private final static Color TOOLTIP_BACKGROUND_COLOR = new Color(255, 255, 220);
-        private final static Font TOOLTIP_TEXT_FONT = XWindow.getDefaultFont();
+        private static final int TOOLTIP_SHOW_TIME = 10000;
+        private static final int TOOLTIP_START_DELAY_TIME = 1000;
+        private static final int TOOLTIP_MAX_LENGTH = 64;
+        private static final int TOOLTIP_MOUSE_CURSOR_INDENT = 5;
+        private static final Color TOOLTIP_BACKGROUND_COLOR = new Color(255, 255, 220);
+        private static final Font TOOLTIP_TEXT_FONT = XWindow.getDefaultFont();
 
         public Tooltip(Frame parent, Object target,
                 LiveArguments liveArguments)
@@ -258,15 +258,15 @@
         private final LiveArguments liveArguments;
         private final Object target;
 
-        private final static int BALLOON_SHOW_TIME = 10000;
-        private final static int BALLOON_TEXT_MAX_LENGTH = 256;
-        private final static int BALLOON_WORD_LINE_MAX_LENGTH = 16;
-        private final static int BALLOON_WORD_LINE_MAX_COUNT = 4;
-        private final static int BALLOON_ICON_WIDTH = 32;
-        private final static int BALLOON_ICON_HEIGHT = 32;
-        private final static int BALLOON_TRAY_ICON_INDENT = 0;
-        private final static Color BALLOON_CAPTION_BACKGROUND_COLOR = new Color(200, 200 ,255);
-        private final static Font BALLOON_CAPTION_FONT = new Font(Font.DIALOG, Font.BOLD, 12);
+        private static final int BALLOON_SHOW_TIME = 10000;
+        private static final int BALLOON_TEXT_MAX_LENGTH = 256;
+        private static final int BALLOON_WORD_LINE_MAX_LENGTH = 16;
+        private static final int BALLOON_WORD_LINE_MAX_COUNT = 4;
+        private static final int BALLOON_ICON_WIDTH = 32;
+        private static final int BALLOON_ICON_HEIGHT = 32;
+        private static final int BALLOON_TRAY_ICON_INDENT = 0;
+        private static final Color BALLOON_CAPTION_BACKGROUND_COLOR = new Color(200, 200 ,255);
+        private static final Font BALLOON_CAPTION_FONT = new Font(Font.DIALOG, Font.BOLD, 12);
 
         private Panel mainPanel = new Panel();
         private Panel captionPanel = new Panel();