[Jreepad-CVS] jreepad/src/jreepad JreepadPrefs.java, 1.23, 1.24 PrefsDialog.java, 1.1, 1.2 JreepadView.java, 1.44, 1.45

[PeWu <pe...@us...>]

Update of /cvsroot/jreepad/jreepad/src/jreepad
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8169/src/jreepad

Modified Files:
	JreepadPrefs.java PrefsDialog.java JreepadView.java 
Log Message:
Added option to set the date format (for inserting the current date)

Index: JreepadView.java
===================================================================
RCS file: /cvsroot/jreepad/jreepad/src/jreepad/JreepadView.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** JreepadView.java	7 Feb 2007 23:01:01 -0000	1.44
--- JreepadView.java	1 Mar 2007 12:11:00 -0000	1.45
***************
*** 27,30 ****
--- 27,33 ----
  import java.io.IOException;
  import java.io.InputStreamReader;
+ import java.text.DateFormat;
+ import java.text.SimpleDateFormat;
+ import java.util.Date;
  import java.util.Vector;
  
***************
*** 417,424 ****
    }
  
-   private java.text.DateFormat dateFormat = java.text.DateFormat.getDateInstance();
    private String getCurrentDate()
    {
!     return dateFormat.format(new java.util.Date());
    }
  
--- 420,444 ----
    }
  
    private String getCurrentDate()
    {
! 	DateFormat dateFormat = null;
! 	String format = getPrefs().dateFormat;
! 
!     if (!format.equals(""))
!     {
! 	  try
! 	  {
! 	    dateFormat = new SimpleDateFormat(format);
! 	  }
! 	  catch (IllegalArgumentException e)
! 	  {
! 		  // Default format will be set
! 		  // TODO: Log this
! 	  }
!     }
!     if (dateFormat == null)
! 	  dateFormat = DateFormat.getDateInstance();
! 
!     return dateFormat.format(new Date());
    }
  

Index: JreepadPrefs.java
===================================================================
RCS file: /cvsroot/jreepad/jreepad/src/jreepad/JreepadPrefs.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** JreepadPrefs.java	6 Feb 2007 18:33:09 -0000	1.23
--- JreepadPrefs.java	1 Mar 2007 12:10:59 -0000	1.24
***************
*** 133,136 ****
--- 133,141 ----
    boolean showGreenStrip;
  
+   /**
+    * Date format string used to format inserted date.
+    */
+   public String dateFormat;
+ 
    JreepadPrefs(Dimension wndSize) {
      // Grab the prefs object from wherever Java's API has put it...
***************
*** 241,245 ****
      showGreenStrip = prefs.getBoolean("SHOWGREENSTRIP", true);
  
! 
    }
  
--- 246,250 ----
      showGreenStrip = prefs.getBoolean("SHOWGREENSTRIP", true);
  
!     dateFormat = prefs.get("DATEFORMAT", "");
    }
  
***************
*** 317,320 ****
--- 322,327 ----
      prefs.putBoolean("SHOWGREENSTRIP", showGreenStrip);
  
+     prefs.put("DATEFORMAT", dateFormat);
+ 
  
      try{

Index: PrefsDialog.java
===================================================================
RCS file: /cvsroot/jreepad/jreepad/src/jreepad/PrefsDialog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PrefsDialog.java	28 Jan 2007 21:29:30 -0000	1.1
--- PrefsDialog.java	1 Mar 2007 12:10:59 -0000	1.2
***************
*** 2,8 ****
--- 2,10 ----
  
  import java.awt.Component;
+ import java.awt.Dimension;
  import java.awt.Frame;
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
+ import java.text.SimpleDateFormat;
  
  import javax.swing.BorderFactory;
***************
*** 13,16 ****
--- 15,19 ----
  import javax.swing.JDialog;
  import javax.swing.JLabel;
+ import javax.swing.JOptionPane;
  import javax.swing.JPanel;
  import javax.swing.JSpinner;
***************
*** 32,35 ****
--- 35,39 ----
      private JComboBox fileFormatSelector;
      private JCheckBox showGreenStripCheckBox;
+     private JTextField dateFormatField;
      private JComboBox defaultSearchModeSelector;
      private JSpinner wrapWidthSpinner;
***************
*** 95,98 ****
--- 99,110 ----
          showGreenStripCheckBox.setHorizontalAlignment(SwingConstants.LEFT);
  
+         hBox = Box.createHorizontalBox();
+         hBox.setAlignmentX(Component.LEFT_ALIGNMENT);
+         hBox.add(new JLabel(JreepadViewer.lang.getString("PREFS_DATEFORMAT_LABEL"), SwingConstants.LEFT));
+         dateFormatField = new JTextField(getPrefs().dateFormat, 30);
+         hBox.add(dateFormatField);
+         hBox.add(new JLabel("(" + JreepadViewer.lang.getString("PREFS_DATEFORMAT_LABEL2") + ")", SwingConstants.LEFT));
+         genPrefVBox.add(hBox);
+ 
          JPanel genPanel = new JPanel();
          genPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
***************
*** 266,269 ****
--- 278,296 ----
                      getPrefs().showGreenStrip = showGreenStripCheckBox.isSelected();
  
+                     String dateFormat = dateFormatField.getText();
+                     try
+                     {
+                     	new SimpleDateFormat(dateFormat);
+                     }
+                     catch (IllegalArgumentException ex)
+                     {
+                     	JOptionPane.showMessageDialog(PrefsDialog.this,
+                             JreepadViewer.lang.getString("MSG_INVALID_DATEFORMAT"),
+                             JreepadViewer.lang.getString("TITLE_INVALID_DATEFORMAT") ,
+                             JOptionPane.ERROR_MESSAGE);
+                     	return;
+                     }
+                     getPrefs().dateFormat = dateFormat;
+ 
                      // If exporting as HTML then we ignore this checkbox
                      if (htmlExportModeSelector.getSelectedIndex() != 2)