[Tail-cvs] TailS/src/java/net/sf/tails/swing/frame Index.java, 1.27

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	Index.java 
Log Message:
Update denovo... TailS quase 100%... gogogo...

Index: Index.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Index.java	22 Oct 2007 18:10:46 -0000	1.26
--- Index.java	22 Oct 2007 20:11:48 -0000	1.27
***************
*** 27,31 ****
--- 27,33 ----
  import javax.swing.JFrame;
  import javax.swing.JOptionPane;
+ import javax.swing.JPanel;
  import javax.swing.JProgressBar;
+ import javax.swing.JTabbedPane;
  import javax.swing.ScrollPaneConstants;
  import javax.swing.SwingConstants;
***************
*** 50,53 ****
--- 52,56 ----
  	private static final ResourceBundle folderBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Folders");
  	
+ 	final int DEFAULT_CHART_SIZE = 30;
  	private static final long serialVersionUID = 1L;
  	private StockAnalysis stockAnalysis;
***************
*** 93,96 ****
--- 96,103 ----
      private javax.swing.JTextArea consoleArea;
      private FrameHelper helper;
+     private SeriesChart seriesChart;
+     private SeriesDataset seriesDataset; 
+     private CriteriaChart criteriaChart;
+     private CriteriaDataset criteriaDataset; 
  
  	private JProgressBar reportProgress;
***************
*** 205,211 ****
  			reportTable.setEnabled(true);
  			
! 			SeriesDataset seriesDataset = new SeriesDataset(stockAnalysis.getSlicer().getSeries(), 20);
! 			SeriesChart seriesChart = new SeriesChart(seriesDataset);
! 			seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart(""));
  			
  			chartsPane.addTab(stockAnalysis.getStock().getName(), new ImageIcon(iconBundle.getString("SERIES_TAB")), seriesPanel);
--- 212,218 ----
  			reportTable.setEnabled(true);
  			
! 			seriesDataset = new SeriesDataset(stockAnalysis.getSlicer().getSeries(), DEFAULT_CHART_SIZE);
! 			seriesChart = new SeriesChart(seriesDataset);
! 			seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("", true));
  			
  			chartsPane.addTab(stockAnalysis.getStock().getName(), new ImageIcon(iconBundle.getString("SERIES_TAB")), seriesPanel);
***************
*** 213,221 ****
  			if (stockAnalysis.getReports().size() > 0)
  			{
! 				CriteriaDataset criteriaDataset = new CriteriaDataset(stockAnalysis.getReports(), stockAnalysis.getSlicer().getSeries(), 20);
! 				CriteriaChart criteriaChart = new CriteriaChart(criteriaDataset);
! 				criteriaPanel = new ChartPanel(criteriaChart.createChart(""));
  				
! 				chartsPane.addTab("Reports", new ImageIcon(iconBundle.getString("REPORTS_TAB")), criteriaPanel);
  			}
  		}
--- 220,233 ----
  			if (stockAnalysis.getReports().size() > 0)
  			{
! 				criteriaDataset = new CriteriaDataset(stockAnalysis.getReports(), stockAnalysis.getSlicer().getSeries(), DEFAULT_CHART_SIZE);
! 				criteriaChart = new CriteriaChart(criteriaDataset);
! 				criteriaPanel = new ChartPanel(criteriaChart.createChart("", true));
  				
! 				chartsPane.addTab("Reports Comparision", new ImageIcon(iconBundle.getString("REPORTS_TAB")), criteriaPanel);
! 			}
! 			else
! 			{
! 				exportHTMLButton.setEnabled(false);
! 				exportXLSButton.setEnabled(false);
  			}
  		}
***************
*** 231,234 ****
--- 243,252 ----
          	noChartsLabel.setText("- No Charts Available");
          	chartsPane.addTab("Charts", new ImageIcon(iconBundle.getString("SERIES_TAB")), noChartsLabel);
+         	
+         	completeGraphButton.setEnabled(false);
+         	moveRightButton.setEnabled(false);
+         	moveLeftButton.setEnabled(false);
+ 			exportHTMLButton.setEnabled(false);
+ 			exportXLSButton.setEnabled(false);
          }
          
***************
*** 331,338 ****
          });
          
!         completeGraphButton.setToolTipText("Move Left");
!         completeGraphButton.setMaximumSize(new java.awt.Dimension(25, 25));
!         completeGraphButton.setMinimumSize(new java.awt.Dimension(25, 25));
!         completeGraphButton.addActionListener(new java.awt.event.ActionListener() {
              public void actionPerformed(java.awt.event.ActionEvent evt) {
                  moveLeftButtonActionPerformed(evt);
--- 349,356 ----
          });
          
!         moveLeftButton.setToolTipText("Move Left");
!         moveLeftButton.setMaximumSize(new java.awt.Dimension(25, 25));
!         moveLeftButton.setMinimumSize(new java.awt.Dimension(25, 25));
!         moveLeftButton.addActionListener(new java.awt.event.ActionListener() {
              public void actionPerformed(java.awt.event.ActionEvent evt) {
                  moveLeftButtonActionPerformed(evt);
***************
*** 340,347 ****
          });
          
!         completeGraphButton.setToolTipText("Move Right");
!         completeGraphButton.setMaximumSize(new java.awt.Dimension(25, 25));
!         completeGraphButton.setMinimumSize(new java.awt.Dimension(25, 25));
!         completeGraphButton.addActionListener(new java.awt.event.ActionListener() {
              public void actionPerformed(java.awt.event.ActionEvent evt) {
              	moveRightButtonActionPerformed(evt);
--- 358,365 ----
          });
          
!         moveRightButton.setToolTipText("Move Right");
!         moveRightButton.setMaximumSize(new java.awt.Dimension(25, 25));
!         moveRightButton.setMinimumSize(new java.awt.Dimension(25, 25));
!         moveRightButton.addActionListener(new java.awt.event.ActionListener() {
              public void actionPerformed(java.awt.event.ActionEvent evt) {
              	moveRightButtonActionPerformed(evt);
***************
*** 517,527 ****
  
      protected void moveLeftButtonActionPerformed(ActionEvent evt) {
! 		// TODO Auto-generated method stub
! 		
  	}
  
  	protected void moveRightButtonActionPerformed(ActionEvent evt) {
! 		// TODO Auto-generated method stub
! 		
  	}
  
--- 535,559 ----
  
      protected void moveLeftButtonActionPerformed(ActionEvent evt) {
! 		seriesDataset.moveLeft();
! 		seriesChart = new SeriesChart(seriesDataset);
! 		seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("", true));
!     	if(chartsPane.getComponentCount() > 1)
!     	{
!     		criteriaDataset.moveLeft();
!     		criteriaChart = new CriteriaChart(criteriaDataset);
!     		criteriaPanel = new ChartPanel(criteriaChart.createChart("", true));
!     	}
  	}
  
  	protected void moveRightButtonActionPerformed(ActionEvent evt) {
! 		seriesDataset.moveRight();
! 		seriesChart = new SeriesChart(seriesDataset);
! 		seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("", true));
!     	if(chartsPane.getComponentCount() > 1)
!     	{
!     		criteriaDataset.moveRight();
!     		criteriaChart = new CriteriaChart(criteriaDataset);
!     		criteriaPanel = new ChartPanel(criteriaChart.createChart("", true));
!     	}
  	}
  
***************
*** 536,540 ****
  
  	protected void completeGraphButtonActionPerformed(ActionEvent evt) {
! 		// TODO AQUI
  		
  	}
--- 568,592 ----
  
  	protected void completeGraphButtonActionPerformed(ActionEvent evt) {
! 	    JTabbedPane charts = new JTabbedPane();
! 		JFrame graph = new JFrame("Complete Graphic");
! 		JPanel seriesPanel = new JPanel();
! 		SeriesDataset completeSeriesDataset = new SeriesDataset(stockAnalysis.getSlicer().getSeries(), stockAnalysis.getSlicer().getSeries().getSize());
! 		SeriesChart completeSeriesChart = new SeriesChart(completeSeriesDataset);
! 		seriesPanel = new org.jfree.chart.ChartPanel(completeSeriesChart.createChart("", false));
! 		charts.addTab(stockAnalysis.getStock().getName(), seriesPanel);
! 		
!     	if(chartsPane.getComponentCount() > 1)
!     	{
!     		JPanel reportPanel = new JPanel();
!     		CriteriaDataset completeCriteriaDataset = new CriteriaDataset(stockAnalysis.getReports(), stockAnalysis.getSlicer().getSeries(), stockAnalysis.getSlicer().getSeries().getSize());
!     		CriteriaChart completeCriteriaChart = new CriteriaChart(completeCriteriaDataset);
!     		reportPanel = new org.jfree.chart.ChartPanel(completeCriteriaChart.createChart("", false));
!     		charts.addTab("Reports Comparision", reportPanel);
!     	}
! 		
! 		graph.add(charts);
! 		graph.setMinimumSize(new Dimension(800, 500));
! 		graph.setLocationByPlatform(true);
! 		graph.setVisible(true);
  		
  	}
***************
*** 640,657 ****
  		reportScrollPane.setViewportView(reportTable);
  		
! 		SeriesDataset seriesDataset = new SeriesDataset(analysis.getSlicer().getSeries(), analysis.getSlicer().getSeries().getSize());
! 		SeriesChart seriesChart = new SeriesChart(seriesDataset);
! 		seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart(""));
  		
  		chartsPane.removeAll();
  		chartsPane.addTab(analysis.getStock().getName(), new ImageIcon(iconBundle.getString("SERIES_TAB")), seriesPanel);
  		
  		if (analysis.getReports().size() > 0)
  		{
! 			CriteriaDataset criteriaDataset = new CriteriaDataset(analysis.getReports(), analysis.getSlicer().getSeries(), analysis.getSlicer().getSeries().getSize());
! 			CriteriaChart criteriaChart = new CriteriaChart(criteriaDataset);
! 			criteriaPanel = new ChartPanel(criteriaChart.createChart(""));
  			
  			chartsPane.addTab("Reports", new ImageIcon(iconBundle.getString("REPORTS_TAB")), criteriaPanel);
  		}
  
--- 692,716 ----
  		reportScrollPane.setViewportView(reportTable);
  		
! 		seriesDataset = new SeriesDataset(analysis.getSlicer().getSeries(), DEFAULT_CHART_SIZE);
! 		seriesChart = new SeriesChart(seriesDataset);
! 		seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("", true));
  		
  		chartsPane.removeAll();
  		chartsPane.addTab(analysis.getStock().getName(), new ImageIcon(iconBundle.getString("SERIES_TAB")), seriesPanel);
  		
+     	completeGraphButton.setEnabled(true);
+     	moveRightButton.setEnabled(true);
+     	moveLeftButton.setEnabled(true);
+ 		
  		if (analysis.getReports().size() > 0)
  		{
! 			criteriaDataset = new CriteriaDataset(analysis.getReports(), analysis.getSlicer().getSeries(), DEFAULT_CHART_SIZE);
! 			criteriaChart = new CriteriaChart(criteriaDataset);
! 			criteriaPanel = new ChartPanel(criteriaChart.createChart("", true));
  			
  			chartsPane.addTab("Reports", new ImageIcon(iconBundle.getString("REPORTS_TAB")), criteriaPanel);
+ 			
+ 			exportHTMLButton.setEnabled(true);
+ 			exportXLSButton.setEnabled(true);
  		}