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

[xanaot <xa...@us...>]

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

Modified Files:
	NewStockAnalysis2.java 
Log Message:
Implementação de critérios default pre-selecionados 

Index: NewStockAnalysis2.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** NewStockAnalysis2.java	10 Oct 2007 21:28:09 -0000	1.5
--- NewStockAnalysis2.java	15 Oct 2007 16:14:23 -0000	1.6
***************
*** 28,289 ****
  
  /**
!  *
!  * @author  cmanssur
   */
  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;
  	private Stock stock;
!     private String[] communCriteria;
!     private String[] genericCriteria;
!     private String[] allCriteria;
!     private javax.swing.JComboBox analysisComboBox;
!     private javax.swing.JComboBox secondAnalysisComboBox;
!     private javax.swing.JLabel analysisLabel;
!     private javax.swing.JLabel secondAnalysisLabel;
!     private javax.swing.JButton cancelButton;
!     private javax.swing.JPanel criterionPanel;
!     private javax.swing.JPanel communCriterionPanel;
!     private javax.swing.JButton nextButton;
!     private javax.swing.JCheckBox criterionCheckBox;
  	private Index index;
  	private FrameHelper helper;
! 	
!     public NewStockAnalysis2(Index index, Stock stock) {
!     	this.index = index;
!     	this.stock = stock;
!         initComponents();
!         this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
!         this.setResizable(false);
!         this.setLocationByPlatform(true);
!         this.setTitle(messageBundle.getString("STOCKANALYSIS_TITLE"));
!     }
!     
!     private void initComponents() {
!     	helper = new FrameHelper();
!         nextButton = new javax.swing.JButton();
!         cancelButton = new javax.swing.JButton();
!         criterionPanel = new javax.swing.JPanel();
!         communCriterionPanel = new javax.swing.JPanel();
!         analysisLabel = new javax.swing.JLabel();
!         secondAnalysisLabel = new javax.swing.JLabel();
!         analysisComboBox = new javax.swing.JComboBox();
!         secondAnalysisComboBox = new javax.swing.JComboBox();
!         communCriteria = helper.getCommunCriteria();
!         genericCriteria = helper.getGenericCriteria();
!         allCriteria = new String[communCriteria.length + genericCriteria.length];
!         
!         int i = 0;
!         for (String criteria : communCriteria) {
  			allCriteria[i++] = criteria;
  		}
!         for (String criteria : genericCriteria) {
  			allCriteria[i++] = criteria;
  		}
  
!         nextButton.setText("Next");
!         nextButton.addActionListener(new java.awt.event.ActionListener() {
!             public void actionPerformed(java.awt.event.ActionEvent evt) {
!                 nextButtonActionPerformed(evt);
!             }
!         });
  
!         cancelButton.setText("Cancel");
!         cancelButton.addActionListener(new java.awt.event.ActionListener() {
!             public void actionPerformed(java.awt.event.ActionEvent evt) {
!                 cancelButtonActionPerformed(evt);
!             }
!         });
  
!         criterionPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Additional Criteria", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Dialog", 0, 14)));
!         criterionPanel.setLayout(new GridLayout(0, 1, 15, 15));
!         criterionPanel.setMaximumSize(new Dimension(400, 0));
!         
!         communCriterionPanel.setBorder(javax.swing.BorderFactory.createEmptyBorder());
!         communCriterionPanel.setLayout(new GridLayout(0, 3, 15, 15));
!         communCriterionPanel.setMaximumSize(new Dimension(400, 0));
!         
!         for (String criterionName : communCriteria) {
!         	criterionCheckBox = new javax.swing.JCheckBox();
  			criterionCheckBox.setText(criterionName);
! 	        criterionCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
! 	        criterionCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
! 	        communCriterionPanel.add(criterionCheckBox);
  		}
!         
!         criterionPanel.add(communCriterionPanel);
!         
!         for (String criteriaName : genericCriteria) {
!         	javax.swing.JPanel genericCriterionPanel = new javax.swing.JPanel(); 
!         	genericCriterionPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), criteriaName, javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Dialog", 1, 12)));
!         	genericCriterionPanel.setLayout(new GridLayout(0, 3, 15, 15));
!         	genericCriterionPanel.setMaximumSize(new Dimension(400, 0));
!         	
!             for (String criterionName : communCriteria) {
!             	criterionCheckBox = new javax.swing.JCheckBox();
!     			criterionCheckBox.setText(criterionName);
!     			criterionCheckBox.setFont(new java.awt.Font("Dialog", 0, 12));
!     	        criterionCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
!     	        criterionCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
!     	        genericCriterionPanel.add(criterionCheckBox);
!     		}
!             
!             criterionPanel.add(genericCriterionPanel);
  		}
-         
-         analysisLabel.setText("Analisys Criterion: ");
-         secondAnalysisLabel.setText(" of: ");
  
!         analysisComboBox.setModel(new javax.swing.DefaultComboBoxModel(allCriteria));
!         analysisComboBox.addActionListener(new java.awt.event.ActionListener() {
!             public void actionPerformed(java.awt.event.ActionEvent evt) {
!             	analysisComboBoxActionPerformed(evt);
!             }
!         });
!         secondAnalysisComboBox.setModel(new javax.swing.DefaultComboBoxModel(communCriteria));
!         analysisComboBoxActionPerformed(null);
!         
!         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
!         getContentPane().setLayout(layout);
!         layout.setHorizontalGroup(
!             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
!             .addGroup(layout.createSequentialGroup()
!                 .addGap(37, 37, 37)
!                 .addComponent(analysisLabel)
!                 .addGap(20, 20, 20)
!                 .addComponent(analysisComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
!                 .addGap(20, 20, 20)
!                 .addComponent(secondAnalysisLabel)
!                 .addGap(20, 20, 20)
!                 .addComponent(secondAnalysisComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
!             .addGroup(layout.createSequentialGroup()
!                 .addGap(227, 227, 227)
!                 .addComponent(nextButton)
!                 .addGap(18, 18, 18)
!                 .addComponent(cancelButton)
!                 .addContainerGap(269, Short.MAX_VALUE))
!             .addGroup(layout.createSequentialGroup()
!             	.addGap(24, 24, 24)
!                 .addComponent(criterionPanel)
!                 .addContainerGap(0, Short.MAX_VALUE))
!         );
!         layout.setVerticalGroup(
!             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
!             .addGroup(layout.createSequentialGroup()
!                 .addGap(24, 24, 24)
!                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
!                     .addComponent(analysisLabel)
!                     .addComponent(analysisComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
!                     .addComponent(secondAnalysisLabel)
!                     .addComponent(secondAnalysisComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
!                 .addGap(16, 16, 16)
!                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
!                 	.addComponent(criterionPanel))
!                 .addGap(23, 23, 23)
!                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
!                     .addComponent(cancelButton)
!                     .addComponent(nextButton))
!                 .addContainerGap(23, Short.MAX_VALUE))
!         );
!         pack();
!     }
  
!     protected void analysisComboBoxActionPerformed(ActionEvent evt) {	
!     	if(helper.isGenericCriteria(analysisComboBox.getSelectedItem().toString()))
!     	{
!     		secondAnalysisComboBox.setVisible(true);
!     		secondAnalysisLabel.setVisible(true);
!     	}
!     	else
!     	{
!     		secondAnalysisComboBox.setVisible(false);
!     		secondAnalysisLabel.setVisible(false);
!     	}
  	}
  
  	private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {
!         this.dispose();
!     }
  
!     private void nextButtonActionPerformed(java.awt.event.ActionEvent evt) {
!     	AnalysisCriterion selectedCriterion = null;
!     	String selectedCriterionName = analysisComboBox.getSelectedItem().toString();
  		try {
! 			if (helper.isGenericCriteria(selectedCriterionName))
! 			{
! 				selectedCriterion = helper.getSelectedGenericCriterion(selectedCriterionName, secondAnalysisComboBox.getSelectedItem().toString());
! 			}
! 			else
! 			{
! 				selectedCriterion = helper.getSelectedCommunCriterion(selectedCriterionName);
  			}
  		} catch (Exception e) {
! 			JOptionPane.showMessageDialog(null, selectedCriterionName + " " + messageBundle.getString("SELECTED_CRITERION"), "Error", 0);
  		}
!     	List<AnalysisCriterion> additionalCriteria = new ArrayList<AnalysisCriterion>();
!     	for (Component panelComponent : criterionPanel.getComponents())
!     	{
!     		if (panelComponent instanceof JPanel) {
!     			JPanel panel = (JPanel)panelComponent;
!     			if (panel.getBorder() instanceof EmptyBorder)
!     			{
!     				for (Component component : panel.getComponents()) 
!     				{
! 						if (component instanceof JCheckBox) 
! 						{
  							JCheckBox checkBox = (JCheckBox) component;
! 							if (checkBox.isSelected())
! 							{
  								AnalysisCriterion criterion = null;
  								try {
! 									criterion = helper.getSelectedCommunCriterion(checkBox.getText());
  								} catch (Exception e) {
! 									JOptionPane.showMessageDialog(null, checkBox.getText() + " " + messageBundle.getString("SELECTED_CRITERIA"), "Error", 2);
  								}
! 							
! 								if (criterion != null)
! 								{
  									additionalCriteria.add(criterion);
  								}
! 							}				
  						}
! 	    			}
! 				}
!     			else
!     			{
!     				for (Component component : panel.getComponents()) 
!     				{
! 						if (component instanceof JCheckBox) 
! 						{
  							JCheckBox checkBox = (JCheckBox) component;
! 							if (checkBox.isSelected())
! 							{
  								AnalysisCriterion criterion = null;
  								try {
! 									criterion = helper.getSelectedGenericCriterion(((TitledBorder)panel.getBorder()).getTitle(), checkBox.getText());
  								} catch (Exception e) {
! 									JOptionPane.showMessageDialog(null, checkBox.getText() + " " + messageBundle.getString("SELECTED_CRITERIA"), "Error", 2);
  								}
! 							
! 								if (criterion != null)
! 								{
  									additionalCriteria.add(criterion);
  								}
! 							}				
  						}
! 	    			}
!     			}
!     		}
!     	}
!     	if (selectedCriterion == null)
!     	{
!     		JOptionPane.showMessageDialog(null, analysisComboBox.getSelectedItem().toString() + " " + messageBundle.getString("SELECTED_CRITERION"), "Error", 0);
!     	}
!     	else
!     	{
!     		new NewStockAnalysis3(index, stock, selectedCriterion, additionalCriteria).setVisible(true);
!         	this.dispose();
!     	}
!     }
  }
--- 28,352 ----
  
  /**
!  * 
!  * @author cmanssur
   */
  public class NewStockAnalysis2 extends javax.swing.JFrame {
! 	private static final ResourceBundle messageBundle = ResourceBundle
! 			.getBundle("net.sf.tails.i18n.Messages");
! 	private static final ResourceBundle classBundle = ResourceBundle
! 			.getBundle("net.sf.tails.i18n.Classes");
  
! 	private static final long serialVersionUID = 1L;
  	private Stock stock;
! 	private String[] communCriteria;
! 	private String[] genericCriteria;
! 	private String[] allCriteria;
! 	private javax.swing.JComboBox analysisComboBox;
! 	private javax.swing.JComboBox secondAnalysisComboBox;
! 	private javax.swing.JLabel analysisLabel;
! 	private javax.swing.JLabel secondAnalysisLabel;
! 	private javax.swing.JButton cancelButton;
! 	private javax.swing.JPanel criterionPanel;
! 	private javax.swing.JPanel communCriterionPanel;
! 	private javax.swing.JButton nextButton;
! 	private javax.swing.JCheckBox criterionCheckBox;
  	private Index index;
  	private FrameHelper helper;
! 	private String defaultCriteria;
! 
! 	public NewStockAnalysis2(Index index, Stock stock) {
! 		this.index = index;
! 		this.stock = stock;
! 		initComponents();
! 		this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
! 		this.setResizable(false);
! 		this.setLocationByPlatform(true);
! 		this.setTitle(messageBundle.getString("STOCKANALYSIS_TITLE"));
! 	}
! 
! 	private void initComponents() {
! 		helper = new FrameHelper();
! 		nextButton = new javax.swing.JButton();
! 		cancelButton = new javax.swing.JButton();
! 		criterionPanel = new javax.swing.JPanel();
! 		communCriterionPanel = new javax.swing.JPanel();
! 		analysisLabel = new javax.swing.JLabel();
! 		secondAnalysisLabel = new javax.swing.JLabel();
! 		analysisComboBox = new javax.swing.JComboBox();
! 		secondAnalysisComboBox = new javax.swing.JComboBox();
! 		communCriteria = helper.getCriteria("ANALYSIS_CRITERIA");
! 		genericCriteria = helper.getCriteria("GENERIC_CRITERIA");
! 		allCriteria = new String[communCriteria.length + genericCriteria.length];
! 		defaultCriteria = classBundle.getString("DEFAULT_CRITERIA");
! 		
! 		int i = 0;
! 		for (String criteria : communCriteria) {
  			allCriteria[i++] = criteria;
  		}
! 		for (String criteria : genericCriteria) {
  			allCriteria[i++] = criteria;
  		}
  
! 		nextButton.setText("Next");
! 		nextButton.addActionListener(new java.awt.event.ActionListener() {
! 			public void actionPerformed(java.awt.event.ActionEvent evt) {
! 				nextButtonActionPerformed(evt);
! 			}
! 		});
  
! 		cancelButton.setText("Cancel");
! 		cancelButton.addActionListener(new java.awt.event.ActionListener() {
! 			public void actionPerformed(java.awt.event.ActionEvent evt) {
! 				cancelButtonActionPerformed(evt);
! 			}
! 		});
  
! 		criterionPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(
! 				javax.swing.BorderFactory.createEtchedBorder(),
! 				"Additional Criteria",
! 				javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION,
! 				javax.swing.border.TitledBorder.DEFAULT_POSITION,
! 				new java.awt.Font("Dialog", 0, 14)));
! 		criterionPanel.setLayout(new GridLayout(0, 1, 15, 15));
! 		criterionPanel.setMaximumSize(new Dimension(400, 0));
! 
! 		communCriterionPanel.setBorder(javax.swing.BorderFactory
! 				.createEmptyBorder());
! 		communCriterionPanel.setLayout(new GridLayout(0, 3, 15, 15));
! 		communCriterionPanel.setMaximumSize(new Dimension(400, 0));
! 
! 		for (String criterionName : communCriteria) {
! 			criterionCheckBox = new javax.swing.JCheckBox();
  			criterionCheckBox.setText(criterionName);
! 			criterionCheckBox.setBorder(javax.swing.BorderFactory
! 					.createEmptyBorder(0, 0, 0, 0));
! 			criterionCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
! 			criterionCheckBox.setSelected(helper.isSelectedCriteria(criterionName));
! 			communCriterionPanel.add(criterionCheckBox);
  		}
! 
! 		criterionPanel.add(communCriterionPanel);
! 
! 		for (String criteriaName : genericCriteria) {
! 			javax.swing.JPanel genericCriterionPanel = new javax.swing.JPanel();
! 			genericCriterionPanel
! 					.setBorder(javax.swing.BorderFactory
! 							.createTitledBorder(
! 									javax.swing.BorderFactory
! 											.createEtchedBorder(),
! 									criteriaName,
! 									javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION,
! 									javax.swing.border.TitledBorder.DEFAULT_POSITION,
! 									new java.awt.Font("Dialog", 1, 12)));
! 			genericCriterionPanel.setLayout(new GridLayout(0, 3, 15, 15));
! 			genericCriterionPanel.setMaximumSize(new Dimension(400, 0));
! 
! 			for (String criterionName : communCriteria) {
! 				criterionCheckBox = new javax.swing.JCheckBox();
! 				criterionCheckBox.setText(criterionName);
! 				criterionCheckBox.setFont(new java.awt.Font("Dialog", 0, 12));
! 				criterionCheckBox.setBorder(javax.swing.BorderFactory
! 						.createEmptyBorder(0, 0, 0, 0));
! 				criterionCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
! 				genericCriterionPanel.add(criterionCheckBox);
! 			}
! 
! 			criterionPanel.add(genericCriterionPanel);
  		}
  
! 		analysisLabel.setText("Analisys Criterion: ");
! 		secondAnalysisLabel.setText(" of: ");
  
! 		analysisComboBox.setModel(new javax.swing.DefaultComboBoxModel(
! 				allCriteria));
! 		analysisComboBox.setSelectedItem(defaultCriteria);
! 		analysisComboBox.addActionListener(new java.awt.event.ActionListener() {
! 			public void actionPerformed(java.awt.event.ActionEvent evt) {
! 				analysisComboBoxActionPerformed(evt);
! 			}
! 		});
! 		secondAnalysisComboBox.setModel(new javax.swing.DefaultComboBoxModel(
! 				communCriteria));
! 		analysisComboBoxActionPerformed(null);
! 
! 		javax.swing.GroupLayout layout = new javax.swing.GroupLayout(
! 				getContentPane());
! 		getContentPane().setLayout(layout);
! 		layout.setHorizontalGroup(layout.createParallelGroup(
! 				javax.swing.GroupLayout.Alignment.LEADING).addGroup(
! 				layout.createSequentialGroup().addGap(37, 37, 37).addComponent(
! 						analysisLabel).addGap(20, 20, 20).addComponent(
! 						analysisComboBox,
! 						javax.swing.GroupLayout.PREFERRED_SIZE,
! 						javax.swing.GroupLayout.DEFAULT_SIZE,
! 						javax.swing.GroupLayout.PREFERRED_SIZE).addGap(20, 20,
! 						20).addComponent(secondAnalysisLabel)
! 						.addGap(20, 20, 20).addComponent(
! 								secondAnalysisComboBox,
! 								javax.swing.GroupLayout.PREFERRED_SIZE,
! 								javax.swing.GroupLayout.DEFAULT_SIZE,
! 								javax.swing.GroupLayout.PREFERRED_SIZE))
! 				.addGroup(
! 						layout.createSequentialGroup().addGap(227, 227, 227)
! 								.addComponent(nextButton).addGap(18, 18, 18)
! 								.addComponent(cancelButton).addContainerGap(
! 										269, Short.MAX_VALUE)).addGroup(
! 						layout.createSequentialGroup().addGap(24, 24, 24)
! 								.addComponent(criterionPanel).addContainerGap(
! 										0, Short.MAX_VALUE)));
! 		layout
! 				.setVerticalGroup(layout
! 						.createParallelGroup(
! 								javax.swing.GroupLayout.Alignment.LEADING)
! 						.addGroup(
! 								layout
! 										.createSequentialGroup()
! 										.addGap(24, 24, 24)
! 										.addGroup(
! 												layout
! 														.createParallelGroup(
! 																javax.swing.GroupLayout.Alignment.BASELINE)
! 														.addComponent(
! 																analysisLabel)
! 														.addComponent(
! 																analysisComboBox,
! 																javax.swing.GroupLayout.PREFERRED_SIZE,
! 																javax.swing.GroupLayout.DEFAULT_SIZE,
! 																javax.swing.GroupLayout.PREFERRED_SIZE)
! 														.addComponent(
! 																secondAnalysisLabel)
! 														.addComponent(
! 																secondAnalysisComboBox,
! 																javax.swing.GroupLayout.PREFERRED_SIZE,
! 																javax.swing.GroupLayout.DEFAULT_SIZE,
! 																javax.swing.GroupLayout.PREFERRED_SIZE))
! 										.addGap(16, 16, 16)
! 										.addGroup(
! 												layout
! 														.createParallelGroup(
! 																javax.swing.GroupLayout.Alignment.BASELINE)
! 														.addComponent(
! 																criterionPanel))
! 										.addGap(23, 23, 23)
! 										.addGroup(
! 												layout
! 														.createParallelGroup(
! 																javax.swing.GroupLayout.Alignment.BASELINE)
! 														.addComponent(
! 																cancelButton)
! 														.addComponent(
! 																nextButton))
! 										.addContainerGap(23, Short.MAX_VALUE)));
! 		pack();
! 	}
! 
! 	protected void analysisComboBoxActionPerformed(ActionEvent evt) {
! 		if (helper.isGenericCriteria(analysisComboBox.getSelectedItem()
! 				.toString())) {
! 			secondAnalysisComboBox.setVisible(true);
! 			secondAnalysisLabel.setVisible(true);
! 		} else {
! 			secondAnalysisComboBox.setVisible(false);
! 			secondAnalysisLabel.setVisible(false);
! 		}
  	}
  
  	private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {
! 		this.dispose();
! 	}
  
! 	private void nextButtonActionPerformed(java.awt.event.ActionEvent evt) {
! 		AnalysisCriterion selectedCriterion = null;
! 		String selectedCriterionName = analysisComboBox.getSelectedItem()
! 				.toString();
  		try {
! 			if (helper.isGenericCriteria(selectedCriterionName)) {
! 				selectedCriterion = helper.getSelectedGenericCriterion(
! 						selectedCriterionName, secondAnalysisComboBox
! 								.getSelectedItem().toString());
! 			} else {
! 				selectedCriterion = helper
! 						.getSelectedCommunCriterion(selectedCriterionName);
  			}
  		} catch (Exception e) {
! 			JOptionPane
! 					.showMessageDialog(null, selectedCriterionName + " "
! 							+ messageBundle.getString("SELECTED_CRITERION"),
! 							"Error", 0);
  		}
! 		List<AnalysisCriterion> additionalCriteria = new ArrayList<AnalysisCriterion>();
! 		for (Component panelComponent : criterionPanel.getComponents()) {
! 			if (panelComponent instanceof JPanel) {
! 				JPanel panel = (JPanel) panelComponent;
! 				if (panel.getBorder() instanceof EmptyBorder) {
! 					for (Component component : panel.getComponents()) {
! 						if (component instanceof JCheckBox) {
  							JCheckBox checkBox = (JCheckBox) component;
! 							if (checkBox.isSelected()) {
  								AnalysisCriterion criterion = null;
  								try {
! 									criterion = helper
! 											.getSelectedCommunCriterion(checkBox
! 													.getText());
  								} catch (Exception e) {
! 									JOptionPane
! 											.showMessageDialog(
! 													null,
! 													checkBox.getText()
! 															+ " "
! 															+ messageBundle
! 																	.getString("SELECTED_CRITERIA"),
! 													"Error", 2);
  								}
! 
! 								if (criterion != null) {
  									additionalCriteria.add(criterion);
  								}
! 							}
  						}
! 					}
! 				} else {
! 					for (Component component : panel.getComponents()) {
! 						if (component instanceof JCheckBox) {
  							JCheckBox checkBox = (JCheckBox) component;
! 							if (checkBox.isSelected()) {
  								AnalysisCriterion criterion = null;
  								try {
! 									criterion = helper
! 											.getSelectedGenericCriterion(
! 													((TitledBorder) panel
! 															.getBorder())
! 															.getTitle(),
! 													checkBox.getText());
  								} catch (Exception e) {
! 									JOptionPane
! 											.showMessageDialog(
! 													null,
! 													checkBox.getText()
! 															+ " "
! 															+ messageBundle
! 																	.getString("SELECTED_CRITERIA"),
! 													"Error", 2);
  								}
! 
! 								if (criterion != null) {
  									additionalCriteria.add(criterion);
  								}
! 							}
  						}
! 					}
! 				}
! 			}
! 		}
! 		if (selectedCriterion == null) {
! 			JOptionPane.showMessageDialog(null, analysisComboBox
! 					.getSelectedItem().toString()
! 					+ " " + messageBundle.getString("SELECTED_CRITERION"),
! 					"Error", 0);
! 		} else {
! 			new NewStockAnalysis3(index, stock, selectedCriterion,
! 					additionalCriteria).setVisible(true);
! 			this.dispose();
! 		}
! 	}
  }