[jsword-svn] common/java/limbo/org/crosswire/common/swing s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/common/java/limbo/org/crosswire/common/swing
In directory www.crosswire.org:/tmp/cvs-serv10921/java/limbo/org/crosswire/common/swing

Modified Files:
	MenuUtil.java AppletFrame.java EirPanel.java 
Log Message:
intellij refactor - not critical

Index: MenuUtil.java
===================================================================
RCS file: /cvs/jsword/common/java/limbo/org/crosswire/common/swing/MenuUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MenuUtil.java	21 Sep 2004 17:45:47 -0000	1.2
--- MenuUtil.java	28 Nov 2004 21:34:09 -0000	1.3
***************
*** 204,211 ****
          JButton button = new JButton(new ImageIcon(url)
          {
!             public float getAlignmentY()
              {
                  return 0.5f;
              }
          });
          button.setRequestFocusEnabled(false);
--- 204,212 ----
          JButton button = new JButton(new ImageIcon(url)
          {
! 			public float getAlignmentY()
              {
                  return 0.5f;
              }
+             private static final long serialVersionUID = 3256726182224539701L;
          });
          button.setRequestFocusEnabled(false);

Index: EirPanel.java
===================================================================
RCS file: /cvs/jsword/common/java/limbo/org/crosswire/common/swing/EirPanel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EirPanel.java	27 Jun 2004 22:09:00 -0000	1.1
--- EirPanel.java	28 Nov 2004 21:34:09 -0000	1.2
***************
*** 41,45 ****
  public class EirPanel extends JPanel
  {
!     // I18N: This class has not been internationalized, because it is not used.
      /**
       * A method to be exposed by our children
--- 41,45 ----
  public class EirPanel extends JPanel
  {
! 	// I18N: This class has not been internationalized, because it is not used.
      /**
       * A method to be exposed by our children
***************
*** 50,63 ****
      public void showInDialog(Component parent, String title, boolean modal)
      {
!         if (dlg_main != null)
          {
!             dlg_main.setVisible(true);
              return;
          }
  
          // I18N: migrate this to an ActionFactory
!         btn_ok = new JButton();
!         btn_ok.setText(Msg.CLOSE.toString());
!         btn_ok.addActionListener(new ActionListener()
          {
              public void actionPerformed(ActionEvent ev)
--- 50,63 ----
      public void showInDialog(Component parent, String title, boolean modal)
      {
!         if (dlgMain != null)
          {
!             dlgMain.setVisible(true);
              return;
          }
  
          // I18N: migrate this to an ActionFactory
!         btnOk = new JButton();
!         btnOk.setText(Msg.CLOSE.toString());
!         btnOk.addActionListener(new ActionListener()
          {
              public void actionPerformed(ActionEvent ev)
***************
*** 67,85 ****
          });
  
!         pnl_buttons = new JPanel();
!         pnl_buttons.add(btn_ok, null);
  
          this.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
  
!         pnl_main = new JPanel();
!         pnl_main.setLayout(new BorderLayout());
!         pnl_main.add(pnl_buttons, BorderLayout.SOUTH);
!         pnl_main.add(this, BorderLayout.CENTER);
  
!         dlg_main = new JDialog(JOptionPane.getFrameForComponent(parent));
!         dlg_main.getContentPane().add(pnl_main);
!         dlg_main.setTitle(title);
!         dlg_main.setModal(modal);
!         dlg_main.addWindowListener(new WindowAdapter()
          {
              public void windowClosed(WindowEvent ev)
--- 67,85 ----
          });
  
!         pnlButtons = new JPanel();
!         pnlButtons.add(btnOk, null);
  
          this.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
  
!         pnlMain = new JPanel();
!         pnlMain.setLayout(new BorderLayout());
!         pnlMain.add(pnlButtons, BorderLayout.SOUTH);
!         pnlMain.add(this, BorderLayout.CENTER);
  
!         dlgMain = new JDialog(JOptionPane.getFrameForComponent(parent));
!         dlgMain.getContentPane().add(pnlMain);
!         dlgMain.setTitle(title);
!         dlgMain.setModal(modal);
!         dlgMain.addWindowListener(new WindowAdapter()
          {
              public void windowClosed(WindowEvent ev)
***************
*** 88,94 ****
              }
          });
!         dlg_main.pack();
!         dlg_main.setVisible(true);
!         dlg_main.setLocationRelativeTo(parent);
      }
  
--- 88,94 ----
              }
          });
!         dlgMain.pack();
!         dlgMain.setVisible(true);
!         dlgMain.setLocationRelativeTo(parent);
      }
  
***************
*** 98,111 ****
      protected void close()
      {
!         if (dlg_main != null)
          {
!             dlg_main.dispose();
!             dlg_main = null;
          }
      }
  
!     private JDialog dlg_main;
!     private JPanel pnl_main;
!     private JPanel pnl_buttons;
!     private JButton btn_ok;
  }
--- 98,116 ----
      protected void close()
      {
!         if (dlgMain != null)
          {
!             dlgMain.dispose();
!             dlgMain = null;
          }
      }
  
!     private JDialog dlgMain;
!     private JPanel pnlMain;
!     private JPanel pnlButtons;
!     private JButton btnOk;
! 
!     /**
!      * Serialization ID
!      */
!     private static final long serialVersionUID = 3617013061509265206L;
  }

Index: AppletFrame.java
===================================================================
RCS file: /cvs/jsword/common/java/limbo/org/crosswire/common/swing/AppletFrame.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AppletFrame.java	27 Jun 2004 22:09:00 -0000	1.1
--- AppletFrame.java	28 Nov 2004 21:34:09 -0000	1.2
***************
*** 42,46 ****
  public class AppletFrame extends JFrame
  {
!     /**
       * Creates a Frame and runs an Applet in the frame.
       * Mirrors the actions of a Browser in an application.
--- 42,46 ----
  public class AppletFrame extends JFrame
  {
! 	/**
       * Creates a Frame and runs an Applet in the frame.
       * Mirrors the actions of a Browser in an application.
***************
*** 118,121 ****
--- 118,126 ----
  
      /**
+      * Serialization ID
+      */
+     private static final long serialVersionUID = 3256727290326364725L;
+ 
+     /**
       * So that we can be an AppletStub
       */