src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java

rev 1580 : 6727661: Code improvement and warnings removing from the swing/plaf packages
Summary: Removed unnecessary castings and other warnings
Reviewed-by: alexp
Contributed-by: Florian Brunner <fbrunnerlist@gmx.ch>
rev 1582 : 8020708: NLS mnemonics missing in SwingSet2/JInternalFrame demo
Reviewed-by: malenkov, leonidr

*** 266,288 ****
          addSystemMenuItems(windowMenu);
          enableActions();
      }
  
      protected void addSystemMenuItems(JMenu systemMenu) {
!         JMenuItem mi = (JMenuItem)systemMenu.add(restoreAction);
!         mi.setMnemonic('R');
!         mi = (JMenuItem)systemMenu.add(moveAction);
!         mi.setMnemonic('M');
!         mi = (JMenuItem)systemMenu.add(sizeAction);
!         mi.setMnemonic('S');
!         mi = (JMenuItem)systemMenu.add(iconifyAction);
!         mi.setMnemonic('n');
!         mi = (JMenuItem)systemMenu.add(maximizeAction);
!         mi.setMnemonic('x');
          systemMenu.add(new JSeparator());
!         mi = (JMenuItem)systemMenu.add(closeAction);
!         mi.setMnemonic('C');
      }
  
      protected JMenu createSystemMenu() {
          return new JMenu("    ");
      }
--- 266,297 ----
          addSystemMenuItems(windowMenu);
          enableActions();
      }
  
      protected void addSystemMenuItems(JMenu systemMenu) {
!         JMenuItem mi = systemMenu.add(restoreAction);
!         mi.setMnemonic(getButtonMnemonic("restore"));
!         mi = systemMenu.add(moveAction);
!         mi.setMnemonic(getButtonMnemonic("move"));
!         mi = systemMenu.add(sizeAction);
!         mi.setMnemonic(getButtonMnemonic("size"));
!         mi = systemMenu.add(iconifyAction);
!         mi.setMnemonic(getButtonMnemonic("minimize"));
!         mi = systemMenu.add(maximizeAction);
!         mi.setMnemonic(getButtonMnemonic("maximize"));
          systemMenu.add(new JSeparator());
!         mi = systemMenu.add(closeAction);
!         mi.setMnemonic(getButtonMnemonic("close"));
!     }
! 
!     private static int getButtonMnemonic(String button) {
!         try {
!             return Integer.parseInt(UIManager.getString(
!                     "InternalFrameTitlePane." + button + "Button.mnemonic"));
!         } catch (NumberFormatException e) {
!             return -1;
!         }
      }
  
      protected JMenu createSystemMenu() {
          return new JMenu("    ");
      }
*** 411,421 ****
      private class Handler implements LayoutManager, PropertyChangeListener {
          //
          // PropertyChangeListener
          //
          public void propertyChange(PropertyChangeEvent evt) {
!             String prop = (String)evt.getPropertyName();
  
              if (prop == JInternalFrame.IS_SELECTED_PROPERTY) {
                  repaint();
                  return;
              }
--- 420,430 ----
      private class Handler implements LayoutManager, PropertyChangeListener {
          //
          // PropertyChangeListener
          //
          public void propertyChange(PropertyChangeEvent evt) {
!             String prop = evt.getPropertyName();
  
              if (prop == JInternalFrame.IS_SELECTED_PROPERTY) {
                  repaint();
                  return;
              }
*** 426,448 ****
                  enableActions();
                  return;
              }
  
              if ("closable" == prop) {
!                 if ((Boolean)evt.getNewValue() == Boolean.TRUE) {
                      add(closeButton);
                  } else {
                      remove(closeButton);
                  }
              } else if ("maximizable" == prop) {
!                 if ((Boolean)evt.getNewValue() == Boolean.TRUE) {
                      add(maxButton);
                  } else {
                      remove(maxButton);
                  }
              } else if ("iconable" == prop) {
!                 if ((Boolean)evt.getNewValue() == Boolean.TRUE) {
                      add(iconButton);
                  } else {
                      remove(iconButton);
                  }
              }
--- 435,457 ----
                  enableActions();
                  return;
              }
  
              if ("closable" == prop) {
!                 if (evt.getNewValue() == Boolean.TRUE) {
                      add(closeButton);
                  } else {
                      remove(closeButton);
                  }
              } else if ("maximizable" == prop) {
!                 if (evt.getNewValue() == Boolean.TRUE) {
                      add(maxButton);
                  } else {
                      remove(maxButton);
                  }
              } else if ("iconable" == prop) {
!                 if (evt.getNewValue() == Boolean.TRUE) {
                      add(iconButton);
                  } else {
                      remove(iconButton);
                  }
              }
*** 772,788 ****
              if (opacity instanceof Boolean) {
                  setOpaque(((Boolean)opacity).booleanValue());
              }
          }
          public boolean isFocusTraversable() { return false; }
!         public void requestFocus() {};
          public AccessibleContext getAccessibleContext() {
              AccessibleContext ac = super.getAccessibleContext();
              if (uiKey != null) {
                  ac.setAccessibleName(UIManager.getString(uiKey));
                  uiKey = null;
              }
              return ac;
          }
!     };  // end NoFocusButton
  
  }   // End Title Pane Class
--- 781,797 ----
              if (opacity instanceof Boolean) {
                  setOpaque(((Boolean)opacity).booleanValue());
              }
          }
          public boolean isFocusTraversable() { return false; }
!         public void requestFocus() {}
          public AccessibleContext getAccessibleContext() {
              AccessibleContext ac = super.getAccessibleContext();
              if (uiKey != null) {
                  ac.setAccessibleName(UIManager.getString(uiKey));
                  uiKey = null;
              }
              return ac;
          }
!     }  // end NoFocusButton
  
  }   // End Title Pane Class