[Tail-cvs] TailS/src/java/net/sf/tails/swing/frame/stockAnalysis NewStockAnalysis2.java, 1.2 NewStockAnalysis.java, 1.2 NewStockAnalysis3.java, 1.2

[Carlos <ma...@us...>]

Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15823/src/java/net/sf/tails/swing/frame/stockAnalysis

Modified Files:
	NewStockAnalysis2.java NewStockAnalysis.java 
	NewStockAnalysis3.java 
Log Message:
Atualizando telas que tinha algo hard coded e jogadas para arquivos de properties (mensagens de erro, pastas e packages etc).

Index: NewStockAnalysis2.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NewStockAnalysis2.java	1 Oct 2007 23:16:58 -0000	1.1
--- NewStockAnalysis2.java	3 Oct 2007 20:48:43 -0000	1.2
***************
*** 12,15 ****
--- 12,16 ----
  import java.util.ArrayList;
  import java.util.List;
+ import java.util.ResourceBundle;
  
  import javax.swing.JCheckBox;
***************
*** 27,30 ****
--- 28,32 ----
   */
  public class NewStockAnalysis2 extends javax.swing.JFrame {
+ 	private static final ResourceBundle messageBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Messages");
  
     	private static final long serialVersionUID = 1L;
***************
*** 46,50 ****
          this.setResizable(false);
          this.setLocationByPlatform(true);
!         this.setTitle("New Stock Analysis");
      }
      
--- 48,52 ----
          this.setResizable(false);
          this.setLocationByPlatform(true);
!         this.setTitle(messageBundle.getString("STOCKANALYSIS_TITLE"));
      }
      
***************
*** 138,142 ****
  			selectedCriterion = FrameHelper.getSelectedCriterion(analysisComboBox.getSelectedItem().toString());
  		} catch (Exception e) {
! 			JOptionPane.showMessageDialog(null, analysisComboBox.getSelectedItem().toString() + " doesn't exists in library, choose another one.", "Error", 0);
  		}
      	List<AnalysisCriterion> additionalCriteria = new ArrayList<AnalysisCriterion>();
--- 140,144 ----
  			selectedCriterion = FrameHelper.getSelectedCriterion(analysisComboBox.getSelectedItem().toString());
  		} catch (Exception e) {
! 			JOptionPane.showMessageDialog(null, analysisComboBox.getSelectedItem().toString() + messageBundle.getString("SELECTED_CRITERION"), "Error", 0);
  		}
      	List<AnalysisCriterion> additionalCriteria = new ArrayList<AnalysisCriterion>();
***************
*** 151,155 ****
  						criterion = FrameHelper.getSelectedCriterion(checkBox.getText());
  					} catch (Exception e) {
! 						JOptionPane.showMessageDialog(null, checkBox.getText() + " doesn't exists in library, list may be incomplete.", "Error", 2);
  					}
  					
--- 153,157 ----
  						criterion = FrameHelper.getSelectedCriterion(checkBox.getText());
  					} catch (Exception e) {
! 						JOptionPane.showMessageDialog(null, checkBox.getText() + messageBundle.getString("SELECTED_CRITERIA"), "Error", 2);
  					}
  					
***************
*** 163,167 ****
      	if (selectedCriterion == null)
      	{
!     		JOptionPane.showMessageDialog(null, analysisComboBox.getSelectedItem().toString() + " doesn't exists in library, choose another one.", "Error", 0);
      	}
      	else
--- 165,169 ----
      	if (selectedCriterion == null)
      	{
!     		JOptionPane.showMessageDialog(null, analysisComboBox.getSelectedItem().toString() + messageBundle.getString("SELECTED_CRITERION"), "Error", 0);
      	}
      	else

Index: NewStockAnalysis.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NewStockAnalysis.java	1 Oct 2007 23:16:58 -0000	1.1
--- NewStockAnalysis.java	3 Oct 2007 20:48:43 -0000	1.2
***************
*** 14,17 ****
--- 14,18 ----
  import java.io.OutputStream;
  import java.io.PrintWriter;
+ import java.util.ResourceBundle;
  
  import javax.swing.JFileChooser;
***************
*** 29,33 ****
   */
  public class NewStockAnalysis extends javax.swing.JFrame {
!     
  	private static final long serialVersionUID = -8970828566986978459L;
      private javax.swing.JButton cancelButton;
--- 30,36 ----
   */
  public class NewStockAnalysis extends javax.swing.JFrame {
! 	private static final ResourceBundle messageBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Messages");
! 	private static final ResourceBundle folderBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Folders");
! 	
  	private static final long serialVersionUID = -8970828566986978459L;
      private javax.swing.JButton cancelButton;
***************
*** 59,63 ****
          this.setResizable(false);
          this.setLocationByPlatform(true);
!         this.setTitle("New Stock Analysis");
      }
      
--- 62,66 ----
          this.setResizable(false);
          this.setLocationByPlatform(true);
!         this.setTitle(messageBundle.getString("STOCKANALYSIS_TITLE"));
      }
      
***************
*** 85,91 ****
  
          stockFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY);
!         stockFileChooser.setCurrentDirectory(new File("Data/Stock"));
          seriesFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY);
!         seriesFileChooser.setCurrentDirectory(new File("Data/Bovespa"));
          
          stockPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Stock", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Dialog", 0, 14), new java.awt.Color(0, 0, 0)));
--- 88,94 ----
  
          stockFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY);
!         stockFileChooser.setCurrentDirectory(new File(folderBundle.getString("STOCK_DIR")));
          seriesFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY);
!         seriesFileChooser.setCurrentDirectory(new File(folderBundle.getString("BOVESPA_DIR")));
          
          stockPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Stock", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Dialog", 0, 14), new java.awt.Color(0, 0, 0)));
***************
*** 104,108 ****
  
          stockButtonGroup.add(loadRadioButton);
!         loadRadioButton.setText(" Load Stock From File");
          loadRadioButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
          loadRadioButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
--- 107,111 ----
  
          stockButtonGroup.add(loadRadioButton);
!         loadRadioButton.setText("Load Stock From File");
          loadRadioButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
          loadRadioButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
***************
*** 271,275 ****
  	    if (stockAnalysisField.getText().equals(""))
  	    {
! 			JOptionPane.showMessageDialog(null, "Please enter stock analysis name.", "Error", 2);
  	    }
  	    else 
--- 274,278 ----
  	    if (stockAnalysisField.getText().equals(""))
  	    {
! 			JOptionPane.showMessageDialog(null, messageBundle.getString("STOCKANALYSIS_NAME"), "Error", 2);
  	    }
  	    else 
***************
*** 281,285 ****
  	    		if (stockNameField.getText().equals("") || seriesField.getText().equals(""))
  	    		{
! 	    			JOptionPane.showMessageDialog(null, "Please enter stock name and series address.", "Error", 2);
  	    		}
  	    		else
--- 284,288 ----
  	    		if (stockNameField.getText().equals("") || seriesField.getText().equals(""))
  	    		{
! 	    			JOptionPane.showMessageDialog(null, messageBundle.getString("SERIES_FIELDS"), "Error", 2);
  	    		}
  	    		else
***************
*** 288,292 ****
  						stock = new Stock(stockNameField.getText(), seriesField.getText(), FrameHelper.getSelectedLoader(seriesFormatComboBox.getSelectedItem().toString()));
  						String xmlFile = stockSerializer.toXML(stock);
! 		                String filePath = "Data/Stock/" + stockNameField.getText();
  		            	File stockAnalysisXML = new File(filePath + ".xml");
  		        		OutputStream out;
--- 291,295 ----
  						stock = new Stock(stockNameField.getText(), seriesField.getText(), FrameHelper.getSelectedLoader(seriesFormatComboBox.getSelectedItem().toString()));
  						String xmlFile = stockSerializer.toXML(stock);
! 		                String filePath = folderBundle.getString("STOCK_DIR") + stockNameField.getText();
  		            	File stockAnalysisXML = new File(filePath + ".xml");
  		        		OutputStream out;
***************
*** 303,307 ****
  						
  					} catch (Exception e) {
! 						JOptionPane.showMessageDialog(null, "Invalid series file, please select a valid one.", "Error", 0);
  					}
  	    		}
--- 306,310 ----
  						
  					} catch (Exception e) {
! 						JOptionPane.showMessageDialog(null, messageBundle.getString("SERIES_FILE"), "Error", 0);
  					}
  	    		}
***************
*** 311,315 ****
  	    		if (stockField.getText().equals(""))
  	    		{
! 	    			JOptionPane.showMessageDialog(null, "Please enter stock adress.", "Error", 2);
  	    		}
  	    		else
--- 314,318 ----
  	    		if (stockField.getText().equals(""))
  	    		{
! 	    			JOptionPane.showMessageDialog(null, messageBundle.getString("STOCK_ADDRESS"), "Error", 2);
  	    		}
  	    		else
***************
*** 321,325 ****
  		    	        this.dispose();
  					} catch (Exception e) {
! 						JOptionPane.showMessageDialog(null, "Invalid stock file, please select a valid one.", "Error", 0);
  					}
  	    		}
--- 324,328 ----
  		    	        this.dispose();
  					} catch (Exception e) {
! 						JOptionPane.showMessageDialog(null, messageBundle.getString("STOCK_FILE"), "Error", 0);
  					}
  	    		}

Index: NewStockAnalysis3.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis3.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NewStockAnalysis3.java	1 Oct 2007 23:16:58 -0000	1.1
--- NewStockAnalysis3.java	3 Oct 2007 20:48:43 -0000	1.2
***************
*** 9,12 ****
--- 9,13 ----
  
  import java.util.List;
+ import java.util.ResourceBundle;
  
  import javax.swing.JFrame;
***************
*** 33,36 ****
--- 34,38 ----
   */
  public class NewStockAnalysis3 extends javax.swing.JFrame {
+ 	private static final ResourceBundle messageBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Messages");
  	
  	private static final long serialVersionUID = 1L;
***************
*** 66,70 ****
          this.setResizable(false);
          this.setLocationByPlatform(true);
!         this.setTitle("New Stock Analysis");
      }
      
--- 68,72 ----
          this.setResizable(false);
          this.setLocationByPlatform(true);
!         this.setTitle(messageBundle.getString("STOCKANALYSIS_TITLE"));
      }
      
***************
*** 260,264 ****
  			startDate = FrameHelper.getDate(startDateField.getText());
  		} catch (Exception e) {
! 			JOptionPane.showMessageDialog(null, "Please enter a valid start date (dd/mm/yyyy).", "Error", 2);
  			return;
  		}
--- 262,266 ----
  			startDate = FrameHelper.getDate(startDateField.getText());
  		} catch (Exception e) {
! 			JOptionPane.showMessageDialog(null, messageBundle.getString("START_DATE"), "Error", 2);
  			return;
  		}
***************
*** 266,270 ****
  		if(yearsField.getText().equals("") || monthsField.getText().equals("") || daysField.getText().equals("") || hoursField.getText().equals("") || minutesField.getText().equals(""))
  		{
! 			JOptionPane.showMessageDialog(null, "Please fill all Slices Period fields (zero if not using it).", "Error", 2);
  			return;
  		}
--- 268,272 ----
  		if(yearsField.getText().equals("") || monthsField.getText().equals("") || daysField.getText().equals("") || hoursField.getText().equals("") || minutesField.getText().equals(""))
  		{
! 			JOptionPane.showMessageDialog(null, messageBundle.getString("PERIOD_FIELDS"), "Error", 2);
  			return;
  		}
***************
*** 278,284 ****
  		{
  			if(year==0 && month==0 && day==0 && hour==0 && minute==0)
! 				JOptionPane.showMessageDialog(null, "One or more Slices Period field must be greater than zero.", "Error", 2);
  			else
! 				JOptionPane.showMessageDialog(null, "All Slices Period field must be equal or greater than zero.", "Error", 2);
  			return;
  		}
--- 280,286 ----
  		{
  			if(year==0 && month==0 && day==0 && hour==0 && minute==0)
! 				JOptionPane.showMessageDialog(null, messageBundle.getString("POSITIVE_PERIOD_FIELDS"), "Error", 2);
  			else
! 				JOptionPane.showMessageDialog(null, messageBundle.getString("NEGATIVE_PERIOD_FIELDS"), "Error", 2);
  			return;
  		}