Menu
▾
▴
tail-cvs — cvs commits
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(148) |
Jun
(48) |
Jul
(107) |
Aug
(292) |
Sep
(301) |
Oct
(530) |
Nov
(142) |
Dec
(37) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
|
Feb
|
Mar
(4) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Thies <tg...@us...> - 2007-10-22 19:41:37
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/strategy In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6545/src/java/net/sf/tail/strategy Modified Files: MinValueStopperStrategy.java Log Message: Novos testes e refatoração do MinValueStopper Index: MinValueStopperStrategy.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/strategy/MinValueStopperStrategy.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MinValueStopperStrategy.java 3 Oct 2007 17:46:59 -0000 1.8 --- MinValueStopperStrategy.java 22 Oct 2007 19:41:39 -0000 1.9 *************** *** 29,34 **** public boolean shouldEnter(int index) { ! value = indicator.getValue(index).doubleValue(); ! return strategy.shouldEnter(index); } --- 29,37 ---- public boolean shouldEnter(int index) { ! if(strategy.shouldEnter(index)) { ! value = indicator.getValue(index).doubleValue(); ! return true; ! } ! return false; } *************** *** 41,45 **** public String getName() { ! return String.format("%s stoper: %s", this.getClass().getSimpleName(), ""+ loss); } } --- 44,48 ---- public String getName() { ! return String.format("%s stoper: %s over %s", this.getClass().getSimpleName(), ""+ loss, strategy.getName()); } } |
|
From: Carlos <ma...@us...> - 2007-10-22 19:04:25
|
Update of /cvsroot/tail/TailS/Data/icons In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20778/Data/icons Added Files: move_left.gif move_right.gif Removed Files: runtoline_co.gif Log Message: Update --- NEW FILE: move_left.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: move_right.gif --- (This appears to be a binary file; contents omitted.) --- runtoline_co.gif DELETED --- |
|
From: Carlos <ma...@us...> - 2007-10-22 19:04:12
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/i18n In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20683/src/java/net/sf/tails/i18n Modified Files: icons.properties Log Message: Update Index: icons.properties =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/i18n/icons.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** icons.properties 22 Oct 2007 18:10:46 -0000 1.2 --- icons.properties 22 Oct 2007 19:04:15 -0000 1.3 *************** *** 10,12 **** HELP=Data/icons/help_view.gif REPORTS_TAB=Data/icons/template_obj.gif ! SERIES_TAB=Data/icons/template_obj.gif \ No newline at end of file --- 10,14 ---- HELP=Data/icons/help_view.gif REPORTS_TAB=Data/icons/template_obj.gif ! SERIES_TAB=Data/icons/template_obj.gif ! MOVE_LEFT=Data/icons/move_left.gif ! MOVE_RIGHT=Data/icons/move_right.gif \ No newline at end of file |
|
From: Carlos <ma...@us...> - 2007-10-22 18:41:57
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/i18n In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26310/src/java/net/sf/tails/i18n Modified Files: icons.properties Folders.properties Log Message: Atualização de icons, tabs, charts e etc. Index: Folders.properties =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/i18n/Folders.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Folders.properties 10 Oct 2007 19:04:48 -0000 1.3 --- Folders.properties 22 Oct 2007 18:10:46 -0000 1.4 *************** *** 5,7 **** --- 5,8 ---- BOVESPA_DIR =Data/Bovespa XLS_DIR =Data/Xls + HTML_DIR =Data/Html STYLE_DIR =Data/Style \ No newline at end of file Index: icons.properties =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/i18n/icons.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** icons.properties 17 Oct 2007 23:15:04 -0000 1.1 --- icons.properties 22 Oct 2007 18:10:46 -0000 1.2 *************** *** 8,10 **** CONSOLE=Data/icons/clean_console.gif GRAPH=Data/icons/complete_graph.gif ! HELP=Data/icons/help_view.gif \ No newline at end of file --- 8,12 ---- CONSOLE=Data/icons/clean_console.gif GRAPH=Data/icons/complete_graph.gif ! HELP=Data/icons/help_view.gif ! REPORTS_TAB=Data/icons/template_obj.gif ! SERIES_TAB=Data/icons/template_obj.gif \ No newline at end of file |
|
From: Carlos <ma...@us...> - 2007-10-22 18:10:48
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/graphics In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26348/src/java/net/sf/tail/graphics Modified Files: SeriesDataset.java Log Message: Atualização de icons, tabs, charts e etc. Index: SeriesDataset.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/SeriesDataset.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SeriesDataset.java 17 Oct 2007 21:37:43 -0000 1.9 --- SeriesDataset.java 22 Oct 2007 18:10:50 -0000 1.10 *************** *** 81,86 **** for (int i = 0; i < indicators.size(); i++) { for (int j = firstIndex; j <= lastIndex; j++) { ! data.addValue(indicators.get(i).getValue(j), indicators.get(i).getName(), series.getTick(j).getDate() .toString("hh:mm d/M/yyyy")); } } --- 81,89 ---- for (int i = 0; i < indicators.size(); i++) { for (int j = firstIndex; j <= lastIndex; j++) { ! data.addValue(indicators.get(i).getValue(j), indicators.get(i).getName() + ": "+ series.getTick(series.getBegin()).getDateName() + " - " + series.getTick(series.getEnd()).getDateName(), series.getTick(j).getDate() .toString("hh:mm d/M/yyyy")); + + + } } |
|
From: Carlos <ma...@us...> - 2007-10-22 18:10:44
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26310/src/java/net/sf/tails/swing/frame Modified Files: Index.java Log Message: Atualização de icons, tabs, charts e etc. Index: Index.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Index.java 17 Oct 2007 23:15:04 -0000 1.25 --- Index.java 22 Oct 2007 18:10:46 -0000 1.26 *************** *** 12,15 **** --- 12,16 ---- package net.sf.tails.swing.frame; + import java.awt.Dimension; import java.awt.event.ActionEvent; import java.io.BufferedOutputStream; *************** *** 28,31 **** --- 29,33 ---- import javax.swing.JProgressBar; import javax.swing.ScrollPaneConstants; + import javax.swing.SwingConstants; import javax.swing.table.DefaultTableModel; *************** *** 46,49 **** --- 48,52 ---- private static final ResourceBundle messageBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Messages"); private static final ResourceBundle iconBundle = ResourceBundle.getBundle("net.sf.tails.i18n.icons"); + private static final ResourceBundle folderBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Folders"); private static final long serialVersionUID = 1L; *************** *** 65,68 **** --- 68,76 ---- private javax.swing.JPanel criteriaPanel; + private javax.swing.JSeparator separator3; + private javax.swing.JSeparator separator4; + private javax.swing.JSeparator separator5; + private javax.swing.JSeparator separator6; + private javax.swing.JSeparator separator7; private javax.swing.JButton newStockAnalysisButton; private javax.swing.JButton newReportButton; *************** *** 74,77 **** --- 82,87 ---- private javax.swing.JButton cleanConsoleButton; private javax.swing.JButton completeGraphButton; + private javax.swing.JButton moveLeftButton; + private javax.swing.JButton moveRightButton; private javax.swing.JButton helpButton; private javax.swing.JScrollPane reportScrollPane; *************** *** 120,127 **** newReportMenuItem = new javax.swing.JMenuItem(); openMenuItem = new javax.swing.JMenuItem(); ! separator1 = new javax.swing.JSeparator(); saveMenuItem = new javax.swing.JMenuItem(); saveAsMenuItem = new javax.swing.JMenuItem(); ! separator2 = new javax.swing.JSeparator(); exitMenuItem = new javax.swing.JMenuItem(); consoleScrollPane = new javax.swing.JScrollPane(); --- 130,137 ---- newReportMenuItem = new javax.swing.JMenuItem(); openMenuItem = new javax.swing.JMenuItem(); ! separator1 = new javax.swing.JSeparator(SwingConstants.HORIZONTAL); saveMenuItem = new javax.swing.JMenuItem(); saveAsMenuItem = new javax.swing.JMenuItem(); ! separator2 = new javax.swing.JSeparator(SwingConstants.HORIZONTAL); exitMenuItem = new javax.swing.JMenuItem(); consoleScrollPane = new javax.swing.JScrollPane(); *************** *** 132,135 **** --- 142,150 ---- criteriaPanel = new javax.swing.JPanel(); + separator3 = new javax.swing.JSeparator(SwingConstants.VERTICAL); + separator4 = new javax.swing.JSeparator(SwingConstants.VERTICAL); + separator5 = new javax.swing.JSeparator(SwingConstants.VERTICAL); + separator6 = new javax.swing.JSeparator(SwingConstants.VERTICAL); + separator7 = new javax.swing.JSeparator(SwingConstants.VERTICAL); newStockAnalysisButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("NEW_STOCKANALYSIS"))); newReportButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("NEW_REPORT"))); *************** *** 141,144 **** --- 156,161 ---- cleanConsoleButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("CONSOLE"))); completeGraphButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("GRAPH"))); + moveLeftButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("MOVE_LEFT"))); + moveRightButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("MOVE_RIGHT"))); helpButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("HELP"))); *************** *** 161,171 **** directoryFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY); ! directoryFileChooser.setCurrentDirectory(new File("Data/StockAnalysis")); xlsFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY); ! xlsFileChooser.setCurrentDirectory(new File("Data/Xls")); htmlFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY); ! htmlFileChooser.setCurrentDirectory(new File("Data/Html")); reportScrollPane.setAutoscrolls(true); --- 178,188 ---- directoryFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY); ! directoryFileChooser.setCurrentDirectory(new File(folderBundle.getString("STOCKANALYSIS_DIR"))); xlsFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY); ! xlsFileChooser.setCurrentDirectory(new File(folderBundle.getString("XLS_DIR"))); htmlFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY); ! htmlFileChooser.setCurrentDirectory(new File(folderBundle.getString("HTML_DIR"))); reportScrollPane.setAutoscrolls(true); *************** *** 182,187 **** if (stockAnalysis != null) { - //stockAnalysis.getSlicer().getSeries().getTick(stockAnalysis.getSlicer().getSeries().getBegin()).getDateName() + - //" - " + stockAnalysis.getSlicer().getSeries().getTick(stockAnalysis.getSlicer().getSeries().getEnd()).getDateName()); reportTable.setAutoCreateRowSorter(true); --- 199,202 ---- *************** *** 194,198 **** seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("")); ! chartsPane.addTab(stockAnalysis.getStock().getName(), seriesPanel); if (stockAnalysis.getReports().size() > 0) --- 209,213 ---- seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("")); ! chartsPane.addTab(stockAnalysis.getStock().getName(), new ImageIcon(iconBundle.getString("SERIES_TAB")), seriesPanel); if (stockAnalysis.getReports().size() > 0) *************** *** 202,206 **** criteriaPanel = new ChartPanel(criteriaChart.createChart("")); ! chartsPane.addTab("Reports", criteriaPanel); } } --- 217,221 ---- criteriaPanel = new ChartPanel(criteriaChart.createChart("")); ! chartsPane.addTab("Reports", new ImageIcon(iconBundle.getString("REPORTS_TAB")), criteriaPanel); } } *************** *** 215,221 **** javax.swing.JLabel noChartsLabel = new javax.swing.JLabel(); noChartsLabel.setText("- No Charts Available"); ! chartsPane.addTab("Charts", noChartsLabel); } reportScrollPane.setBorder(javax.swing.BorderFactory.createEtchedBorder()); reportScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); --- 230,247 ---- javax.swing.JLabel noChartsLabel = new javax.swing.JLabel(); noChartsLabel.setText("- No Charts Available"); ! chartsPane.addTab("Charts", new ImageIcon(iconBundle.getString("SERIES_TAB")), noChartsLabel); } + separator3.setMinimumSize(new Dimension(1, 25)); + separator4.setMinimumSize(new Dimension(1, 25)); + separator5.setMinimumSize(new Dimension(1, 25)); + separator6.setMinimumSize(new Dimension(1, 25)); + separator7.setMinimumSize(new Dimension(1, 25)); + separator3.setMaximumSize(new Dimension(1, 25)); + separator4.setMaximumSize(new Dimension(1, 25)); + separator5.setMaximumSize(new Dimension(1, 25)); + separator6.setMaximumSize(new Dimension(1, 25)); + separator7.setMaximumSize(new Dimension(1, 25)); + reportScrollPane.setBorder(javax.swing.BorderFactory.createEtchedBorder()); reportScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); *************** *** 305,308 **** --- 331,352 ---- }); + 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); + } + }); + + 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); + } + }); + helpButton.setToolTipText("Help"); helpButton.setMaximumSize(new java.awt.Dimension(25, 25)); *************** *** 401,405 **** .addGap(2) .addComponent(newReportButton) ! .addGap(2) .addComponent(openStockAnalysisButton) .addGap(2) --- 445,451 ---- .addGap(2) .addComponent(newReportButton) ! .addGap(4) ! .addComponent(separator3) ! .addGap(4) .addComponent(openStockAnalysisButton) .addGap(2) *************** *** 407,419 **** .addGap(2) .addComponent(saveAsStockAnalysisButton) ! .addGap(2) .addComponent(exportHTMLButton) .addGap(2) .addComponent(exportXLSButton) ! .addGap(2) ! .addComponent(cleanConsoleButton) ! .addGap(2) .addComponent(completeGraphButton) .addGap(2) .addComponent(helpButton) .addGap(200) --- 453,477 ---- .addGap(2) .addComponent(saveAsStockAnalysisButton) ! .addGap(4) ! .addComponent(separator4) ! .addGap(4) .addComponent(exportHTMLButton) .addGap(2) .addComponent(exportXLSButton) ! .addGap(4) ! .addComponent(separator5) ! .addGap(4) .addComponent(completeGraphButton) .addGap(2) + .addComponent(moveLeftButton) + .addGap(2) + .addComponent(moveRightButton) + .addGap(4) + .addComponent(separator6) + .addGap(4) + .addComponent(cleanConsoleButton) + .addGap(4) + .addComponent(separator7) + .addGap(4) .addComponent(helpButton) .addGap(200) *************** *** 427,438 **** .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) .addComponent(newStockAnalysisButton) ! .addComponent(newReportButton) .addComponent(openStockAnalysisButton) .addComponent(saveStockAnalysisButton) .addComponent(saveAsStockAnalysisButton) .addComponent(exportHTMLButton) .addComponent(exportXLSButton) .addComponent(cleanConsoleButton) .addComponent(completeGraphButton) .addComponent(helpButton) .addComponent(reportProgress)) --- 485,503 ---- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) .addComponent(newStockAnalysisButton) ! .addComponent(newReportButton) ! .addComponent(separator3) .addComponent(openStockAnalysisButton) .addComponent(saveStockAnalysisButton) .addComponent(saveAsStockAnalysisButton) + .addComponent(separator4) .addComponent(exportHTMLButton) .addComponent(exportXLSButton) + .addComponent(separator5) .addComponent(cleanConsoleButton) + .addComponent(separator6) .addComponent(completeGraphButton) + .addComponent(moveLeftButton) + .addComponent(moveRightButton) + .addComponent(separator7) .addComponent(helpButton) .addComponent(reportProgress)) *************** *** 451,455 **** } ! protected void cleanConsoleButtonActionPerformed(ActionEvent evt) { consoleArea.setText(""); } --- 516,530 ---- } ! protected void moveLeftButtonActionPerformed(ActionEvent evt) { ! // TODO Auto-generated method stub ! ! } ! ! protected void moveRightButtonActionPerformed(ActionEvent evt) { ! // TODO Auto-generated method stub ! ! } ! ! protected void cleanConsoleButtonActionPerformed(ActionEvent evt) { consoleArea.setText(""); } *************** *** 570,574 **** chartsPane.removeAll(); ! chartsPane.addTab(analysis.getStock().getName(), seriesPanel); if (analysis.getReports().size() > 0) --- 645,649 ---- chartsPane.removeAll(); ! chartsPane.addTab(analysis.getStock().getName(), new ImageIcon(iconBundle.getString("SERIES_TAB")), seriesPanel); if (analysis.getReports().size() > 0) *************** *** 578,582 **** criteriaPanel = new ChartPanel(criteriaChart.createChart("")); ! chartsPane.addTab("Reports", criteriaPanel); } --- 653,657 ---- criteriaPanel = new ChartPanel(criteriaChart.createChart("")); ! chartsPane.addTab("Reports", new ImageIcon(iconBundle.getString("REPORTS_TAB")), criteriaPanel); } |
|
From: Carlos <ma...@us...> - 2007-10-22 18:10:44
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26310/src/java/net/sf/tails/swing/frame/report Modified Files: NewReportFrame.java Log Message: Atualização de icons, tabs, charts e etc. Index: NewReportFrame.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** NewReportFrame.java 15 Oct 2007 21:22:47 -0000 1.22 --- NewReportFrame.java 22 Oct 2007 18:10:46 -0000 1.23 *************** *** 471,478 **** this.dispose(); } - - public static void main(String[] args) { - new NewReportFrame(null,null).setVisible(true); - } } --- 471,474 ---- |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-22 18:08:59
|
Update of /cvsroot/tail/TailS/Data/icons In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25177/Data/icons Added Files: filter_ps.gif runtoline_co.gif Log Message: --- NEW FILE: filter_ps.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: runtoline_co.gif --- (This appears to be a binary file; contents omitted.) |
|
From: xanaot <xa...@us...> - 2007-10-22 17:48:16
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/series In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15505/src/test/net/sf/tail/series Added Files: DefaultTimeSeriesTest.java Log Message: Tester para Constrained e Default TimeSeries. --- NEW FILE: DefaultTimeSeriesTest.java --- package net.sf.tail.series; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.LinkedList; import java.util.List; import net.sf.tail.Tick; import net.sf.tail.TimeSeries; import org.joda.time.DateTime; import org.joda.time.Period; import org.junit.Before; import org.junit.Test; public class DefaultTimeSeriesTest { private TimeSeries defaultSeries; private List<Tick> ticks; private String defaultName; @Before public void setUp() { ticks = new LinkedList<Tick>(); ticks.add(new Tick(new DateTime().withDate(2007, 6, 6), 1d)); ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d)); ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 3d)); ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d)); defaultName = "Series Name"; defaultSeries = new DefaultTimeSeries(defaultName, ticks); } @Test public void getEndSizeBegin() { assertEquals(0, defaultSeries.getBegin()); assertEquals(ticks.size() - 1, defaultSeries.getEnd()); assertEquals(ticks.size(), defaultSeries.getSize()); } @Test public void getPeriodName() { assertTrue(defaultSeries.getPeriodName().endsWith( ticks.get(defaultSeries.getEnd()).getDate().toString("hh:mm dd/MM/yyyy"))); assertTrue(defaultSeries.getPeriodName().startsWith( ticks.get(defaultSeries.getBegin()).getDate().toString("hh:mm dd/MM/yyyy"))); } @Test public void getName() { assertTrue(defaultSeries.getName().equals(defaultName)); } @Test public void getPeriodTest() { assertEquals(new Period(ticks.get(1).getDate().getMillis() - ticks.get(0).getDate().getMillis()), defaultSeries .getPeriod()); } } |
|
From: xanaot <xa...@us...> - 2007-10-22 17:48:16
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15505/src/java/net/sf/tail Modified Files: ConstrainedTimeSeries.java Log Message: Tester para Constrained e Default TimeSeries. Index: ConstrainedTimeSeries.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/ConstrainedTimeSeries.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ConstrainedTimeSeries.java 17 Oct 2007 23:23:35 -0000 1.8 --- ConstrainedTimeSeries.java 22 Oct 2007 17:48:19 -0000 1.9 *************** *** 21,25 **** public int getSize() { ! return end - begin; } --- 21,25 ---- public int getSize() { ! return (end - begin) + 1; } |
|
From: xanaot <xa...@us...> - 2007-10-22 17:48:16
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15505/src/test/net/sf/tail Added Files: ConstrainedTimeSeriesTest.java Log Message: Tester para Constrained e Default TimeSeries. --- NEW FILE: ConstrainedTimeSeriesTest.java --- package net.sf.tail; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.LinkedList; import java.util.List; import net.sf.tail.sample.SampleTimeSeries; import org.joda.time.DateTime; import org.joda.time.Period; import org.junit.Before; import org.junit.Test; public class ConstrainedTimeSeriesTest { private static TimeSeries series; private ConstrainedTimeSeries constrained; private List<Tick> ticks; @Before public void setUp() { ticks = new LinkedList<Tick>(); ticks.add(new Tick(new DateTime().withDate(2007, 6, 6), 1d)); ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d)); ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 3d)); ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d)); series = new SampleTimeSeries(ticks); constrained = new ConstrainedTimeSeries(series, series.getBegin(), series.getEnd()); } @Test(expected = IllegalArgumentException.class) public void constructurTesteShouldThrowsException() { @SuppressWarnings("unused") ConstrainedTimeSeries constrainedException = new ConstrainedTimeSeries(series, series.getEnd(), series.getBegin()); } @Test(expected = IllegalArgumentException.class) public void getTickTestWrongIndex() { constrained.getTick(series.getEnd() + 1); constrained.getTick(series.getBegin() - 1); } @Test public void getEndSizeBegin() { assertEquals(series.getBegin(), constrained.getBegin()); assertEquals(series.getEnd(), constrained.getEnd()); assertEquals(series.getSize(), constrained.getSize()); } @Test public void getPeriodName() { assertTrue(constrained.getPeriodName().endsWith(series.getTick(series.getEnd()).getDate().toString("hh:mm dd/MM/yyyy"))); assertTrue(constrained.getPeriodName().startsWith(series.getTick(series.getBegin()).getDate().toString("hh:mm dd/MM/yyyy"))); } @Test public void getName() { assertTrue(constrained.getName().endsWith(series.getName())); assertTrue(constrained.getName().startsWith("Constrained")); } @Test public void getPeriodTest() { assertEquals(new Period(series.getTick(series.getBegin() + 1).getDate().getMillis() - series.getTick(series.getBegin()).getDate().getMillis()), constrained.getPeriod()); } } |
|
From: Thies <tg...@us...> - 2007-10-22 17:19:45
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/criteria In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1280/src/java/net/sf/tail/analysis/criteria Modified Files: NumberOfTradesCriterion.java Log Message: Refatoração Index: NumberOfTradesCriterion.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/criteria/NumberOfTradesCriterion.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** NumberOfTradesCriterion.java 4 Sep 2007 13:09:14 -0000 1.6 --- NumberOfTradesCriterion.java 22 Oct 2007 17:19:45 -0000 1.7 *************** *** 1,5 **** package net.sf.tail.analysis.criteria; - import java.util.ArrayList; import java.util.LinkedList; import java.util.List; --- 1,4 ---- *************** *** 26,32 **** } public double calculate(TimeSeries series, Trade trade) { ! List<Trade> trades = new ArrayList<Trade>(); ! trades.add(trade); ! return calculate(series, trades); } --- 25,29 ---- } public double calculate(TimeSeries series, Trade trade) { ! return 1d; } |
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/criteria In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17803/src/test/net/sf/tail/analysis/criteria Modified Files: NumberOfTradesCriterionTest.java AverageProfitCriterionTest.java RewardRiskRatioCriterionTest.java BuyAndHoldCriterionTest.java Log Message: Novos testes Index: NumberOfTradesCriterionTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/criteria/NumberOfTradesCriterionTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** NumberOfTradesCriterionTest.java 23 Aug 2007 12:51:10 -0000 1.3 --- NumberOfTradesCriterionTest.java 22 Oct 2007 16:48:00 -0000 1.4 *************** *** 57,59 **** --- 57,67 ---- assertEquals(2d, buyAndHold.summarize(series, decisions), 0.01); } + @Test + public void testCalculateWithOneTrade() + { + Trade trade = new Trade(); + NumberOfTradesCriterion tradesCriterion = new NumberOfTradesCriterion(); + + assertEquals(1d, tradesCriterion.calculate(null, trade)); + } } Index: RewardRiskRatioCriterionTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/criteria/RewardRiskRatioCriterionTest.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** RewardRiskRatioCriterionTest.java 1 Sep 2007 13:38:29 -0000 1.12 --- RewardRiskRatioCriterionTest.java 22 Oct 2007 16:48:00 -0000 1.13 *************** *** 91,94 **** --- 91,105 ---- } + + @Test + public void testWithOneTrade() { + Trade trade = new Trade(new Operation(0, OperationType.BUY), new Operation(1, OperationType.SELL)); + + SampleTimeSeries series = new SampleTimeSeries(new double[] { 100, 95, 95, 100, 90, 95, 80, 120 }); + + + RewardRiskRatioCriterion ratioCriterion = new RewardRiskRatioCriterion(); + assertEquals((95d/100) / ((1d - 0.95d)), ratioCriterion.calculate(series, trade)); + } } Index: BuyAndHoldCriterionTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/criteria/BuyAndHoldCriterionTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BuyAndHoldCriterionTest.java 23 Aug 2007 12:51:10 -0000 1.3 --- BuyAndHoldCriterionTest.java 22 Oct 2007 16:48:00 -0000 1.4 *************** *** 68,71 **** --- 68,81 ---- assertEquals(0.7, buyAndHold.calculate(series, trades)); } + + @Test + public void testCalculateWithOneTrade() + { + SampleTimeSeries series = new SampleTimeSeries(new double[] {100, 105 }); + Trade trade = new Trade(new Operation(0, OperationType.BUY), new Operation(1, OperationType.SELL)); + AnalysisCriterion buyAndHold = new BuyAndHoldCriterion(); + assertEquals(105d/100, buyAndHold.calculate(series, trade)); + + } } Index: AverageProfitCriterionTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/criteria/AverageProfitCriterionTest.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** AverageProfitCriterionTest.java 17 Oct 2007 22:31:15 -0000 1.12 --- AverageProfitCriterionTest.java 22 Oct 2007 16:48:00 -0000 1.13 *************** *** 83,86 **** --- 83,95 ---- assertEquals(Double.NaN, averageProfit.calculate(series, trades)); } + @Test + public void testCalculateWithOneTrade() + { + series = new SampleTimeSeries(new double[] {100, 105}); + Trade trade = new Trade(new Operation(0, OperationType.BUY), new Operation(1, OperationType.SELL)); + AnalysisCriterion average = new AverageProfitCriterion(); + assertEquals(Math.pow(105d / 100, 1d/2), average.calculate(series, trade)); + + } } |
|
From: Thies <tg...@us...> - 2007-10-22 16:01:41
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/runner In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27453/src/test/net/sf/tail/runner Modified Files: HistoryRunnerTest.java Log Message: Arrumado o bug que comprava e vendia no mesmo tick Index: HistoryRunnerTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/runner/HistoryRunnerTest.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** HistoryRunnerTest.java 23 Aug 2007 12:51:11 -0000 1.13 --- HistoryRunnerTest.java 22 Oct 2007 16:01:39 -0000 1.14 *************** *** 119,123 **** trades = historyRunner.run(this.strategy, 3, 6); ! assertEquals(2, trades.size()); assertEquals(new Operation(3, OperationType.BUY), trades.get(0).getEntry()); assertEquals(new Operation(4, OperationType.SELL), trades.get(0).getExit()); --- 119,123 ---- trades = historyRunner.run(this.strategy, 3, 6); ! assertEquals(1, trades.size()); assertEquals(new Operation(3, OperationType.BUY), trades.get(0).getEntry()); assertEquals(new Operation(4, OperationType.SELL), trades.get(0).getExit()); |
|
From: Thies <tg...@us...> - 2007-10-22 16:01:41
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/runner In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27453/src/java/net/sf/tail/runner Modified Files: HistoryRunner.java Log Message: Arrumado o bug que comprava e vendia no mesmo tick Index: HistoryRunner.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/runner/HistoryRunner.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** HistoryRunner.java 4 Sep 2007 13:09:16 -0000 1.17 --- HistoryRunner.java 22 Oct 2007 16:01:42 -0000 1.18 *************** *** 44,48 **** } } ! if (lastTrade.isOpened()) { lastTrade.operate(end); LOG.debug("new trade for closing time: " + lastTrade); --- 44,48 ---- } } ! if (lastTrade.isOpened() && lastTrade.getEntry().getIndex() != end) { lastTrade.operate(end); LOG.debug("new trade for closing time: " + lastTrade); |
|
From: xanaot <xa...@us...> - 2007-10-17 23:24:05
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/series In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20540/src/java/net/sf/tail/series Modified Files: PartialMemorizedSlicer.java SerializableTimeSeries.java DefaultTimeSeries.java Log Message: Preparando para a tela INFO do Report Index: PartialMemorizedSlicer.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/series/PartialMemorizedSlicer.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PartialMemorizedSlicer.java 8 Oct 2007 19:15:28 -0000 1.5 --- PartialMemorizedSlicer.java 17 Oct 2007 23:23:35 -0000 1.6 *************** *** 179,185 **** } ! public DateTime getPeriodBegin() { return periodBegin; } } --- 179,197 ---- } ! public DateTime getDateBegin() { return periodBegin; } + public int getNumberOfSlices() { + return splittedSeries.size(); + } + + public double getAverageTicksPerSlice() { + double sum = 0; + for (TimeSeries series : splittedSeries) { + sum += series.getSize(); + } + return sum / this.getNumberOfSlices(); + } + } Index: DefaultTimeSeries.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/series/DefaultTimeSeries.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DefaultTimeSeries.java 17 Oct 2007 16:41:55 -0000 1.6 --- DefaultTimeSeries.java 17 Oct 2007 23:23:35 -0000 1.7 *************** *** 6,9 **** --- 6,11 ---- import net.sf.tail.TimeSeries; + import org.joda.time.Period; + /** * Implementação default da interface {@link TimeSeries}. *************** *** 12,16 **** * */ ! public class DefaultTimeSeries implements TimeSeries{ transient private final List<Tick> ticks; --- 14,18 ---- * */ ! public class DefaultTimeSeries implements TimeSeries { transient private final List<Tick> ticks; *************** *** 46,50 **** } ! public String getPeriod() { return ticks.get(0).getDate().toString("hh:mm dd/MM/yyyy - ") + ticks.get(this.getEnd()).getDate().toString("hh:mm dd/MM/yyyy"); --- 48,52 ---- } ! public String getPeriodName() { return ticks.get(0).getDate().toString("hh:mm dd/MM/yyyy - ") + ticks.get(this.getEnd()).getDate().toString("hh:mm dd/MM/yyyy"); *************** *** 81,85 **** return true; } ! ! } --- 83,92 ---- return true; } ! ! public Period getPeriod() { ! return new Period(Math.min(ticks.get(1).getDate().getMillis() - ticks.get(0).getDate().getMillis(), ticks ! .get(2).getDate().getMillis() ! - ticks.get(1).getDate().getMillis())); ! } ! } Index: SerializableTimeSeries.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/series/SerializableTimeSeries.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SerializableTimeSeries.java 17 Oct 2007 16:51:43 -0000 1.1 --- SerializableTimeSeries.java 17 Oct 2007 23:23:35 -0000 1.2 *************** *** 5,8 **** --- 5,10 ---- import java.io.IOException; + import org.joda.time.Period; + import net.sf.tail.Tick; import net.sf.tail.TimeSeries; *************** *** 90,95 **** } ! public String getPeriod() { ! return getSeries().getPeriod(); } --- 92,97 ---- } ! public String getPeriodName() { ! return getSeries().getPeriodName(); } *************** *** 101,103 **** --- 103,110 ---- return getSeries().getTick(i); } + + public Period getPeriod() { + return new Period(Math.min(series.getTick(series.getBegin() + 1).getDate().getMillis() - series.getTick(series.getBegin()).getDate().getMillis(), + series.getTick(series.getBegin() + 2).getDate().getMillis() - series.getTick(series.getBegin() + 1).getDate().getMillis())); + } } |
|
From: xanaot <xa...@us...> - 2007-10-17 23:24:04
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/sample In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20540/src/test/net/sf/tail/sample Modified Files: SampleTimeSeries.java Log Message: Preparando para a tela INFO do Report Index: SampleTimeSeries.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/sample/SampleTimeSeries.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** SampleTimeSeries.java 27 Aug 2007 22:46:31 -0000 1.13 --- SampleTimeSeries.java 17 Oct 2007 23:23:36 -0000 1.14 *************** *** 8,11 **** --- 8,12 ---- import org.joda.time.DateTime; + import org.joda.time.Period; public class SampleTimeSeries implements TimeSeries { *************** *** 70,76 **** } ! public String getPeriod() { return ticks.get(0).getDate().toString("hh:mm dd/MM/yyyy - ") + ticks.get(this.getEnd()).getDate().toString("hh:mm dd/MM/yyyy"); } } --- 71,82 ---- } ! public String getPeriodName() { return ticks.get(0).getDate().toString("hh:mm dd/MM/yyyy - ") + ticks.get(this.getEnd()).getDate().toString("hh:mm dd/MM/yyyy"); } + + public Period getPeriod() { + return new Period(Math.min(ticks.get(1).getDate().getMillis() - ticks.get(0).getDate().getMillis(), + ticks.get(2).getDate().getMillis()- ticks.get(1).getDate().getMillis())); + } } |
|
From: xanaot <xa...@us...> - 2007-10-17 23:24:04
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20540/src/test/net/sf/tail Modified Files: EMAWalkTest.java Log Message: Preparando para a tela INFO do Report Index: EMAWalkTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/EMAWalkTest.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** EMAWalkTest.java 17 Oct 2007 16:41:54 -0000 1.20 --- EMAWalkTest.java 17 Oct 2007 23:23:36 -0000 1.21 *************** *** 32,36 **** CedroTimeSeriesLoader loader = new CedroTimeSeriesLoader(); TimeSeries series = loader.load(new FileInputStream("BaseBovespa/diario/petr4Dia.csv"), "Petrobras Anual"); - // Generates a Set of EMAs, that trigger an ENTER/EXIT when // crossing the close price --- 32,35 ---- *************** *** 52,56 **** Report report = forward.walk(strategies, slicer, new TotalProfitCriterion()); ReportHTMLGenerator generator = new ReportHTMLGenerator(); - // talvez tenha de colocar outros criterions List<AnalysisCriterion> criterions = new ArrayList<AnalysisCriterion>(); --- 51,54 ---- |
|
From: xanaot <xa...@us...> - 2007-10-17 23:23:34
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20540/src/java/net/sf/tail/report Modified Files: Report.java Log Message: Preparando para a tela INFO do Report Index: Report.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/Report.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Report.java 17 Oct 2007 19:06:43 -0000 1.22 --- Report.java 17 Oct 2007 23:23:36 -0000 1.23 *************** *** 156,160 **** public String getSlicePeriodName() { ! return slicer.getSeries().getName() + ": " + slicer.getSeries().getPeriod(); } --- 156,160 ---- public String getSlicePeriodName() { ! return slicer.getSeries().getName() + ": " + slicer.getSeries().getPeriodName(); } |
|
From: xanaot <xa...@us...> - 2007-10-17 23:23:34
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20540/src/java/net/sf/tail Modified Files: TimeSeriesSlicer.java TimeSeries.java ConstrainedTimeSeries.java Log Message: Preparando para a tela INFO do Report Index: ConstrainedTimeSeries.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/ConstrainedTimeSeries.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ConstrainedTimeSeries.java 25 Aug 2007 12:30:01 -0000 1.7 --- ConstrainedTimeSeries.java 17 Oct 2007 23:23:35 -0000 1.8 *************** *** 1,4 **** --- 1,6 ---- package net.sf.tail; + import org.joda.time.Period; + public class ConstrainedTimeSeries implements TimeSeries { *************** *** 45,51 **** } ! public String getPeriod() { return series.getTick(begin).getDate().toString("hh:mm dd/MM/yyyy - ") + series.getTick(end).getDate().toString("hh:mm dd/MM/yyyy"); } } --- 47,58 ---- } ! public String getPeriodName() { return series.getTick(begin).getDate().toString("hh:mm dd/MM/yyyy - ") + series.getTick(end).getDate().toString("hh:mm dd/MM/yyyy"); } + + public Period getPeriod() { + return new Period(Math.min(series.getTick(series.getBegin() + 1).getDate().getMillis() - series.getTick(series.getBegin()).getDate().getMillis(), + series.getTick(series.getBegin() + 2).getDate().getMillis() - series.getTick(series.getBegin() + 1).getDate().getMillis())); + } } Index: TimeSeries.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/TimeSeries.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TimeSeries.java 15 Oct 2007 20:23:25 -0000 1.10 --- TimeSeries.java 17 Oct 2007 23:23:35 -0000 1.11 *************** *** 1,4 **** --- 1,6 ---- package net.sf.tail; + import org.joda.time.Period; + /** *************** *** 21,24 **** String getName(); ! String getPeriod(); } --- 23,28 ---- String getName(); ! String getPeriodName(); ! ! Period getPeriod(); } Index: TimeSeriesSlicer.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/TimeSeriesSlicer.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TimeSeriesSlicer.java 8 Oct 2007 19:15:28 -0000 1.11 --- TimeSeriesSlicer.java 17 Oct 2007 23:23:35 -0000 1.12 *************** *** 18,22 **** Period getPeriod(); ! DateTime getPeriodBegin(); TimeSeriesSlicer applyForSeries(TimeSeries series); --- 18,26 ---- Period getPeriod(); ! DateTime getDateBegin(); ! ! int getNumberOfSlices(); ! ! double getAverageTicksPerSlice(); TimeSeriesSlicer applyForSeries(TimeSeries series); |
|
From: xanaot <xa...@us...> - 2007-10-17 23:23:34
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/evaluator In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20540/src/java/net/sf/tail/analysis/evaluator Modified Files: Decision.java Log Message: Preparando para a tela INFO do Report Index: Decision.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/evaluator/Decision.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Decision.java 3 Sep 2007 21:55:28 -0000 1.14 --- Decision.java 17 Oct 2007 23:23:36 -0000 1.15 *************** *** 83,87 **** public String getName() { ! return series.getName() + ": " + series.getPeriod(); } --- 83,87 ---- public String getName() { ! return series.getName() + ": " + series.getPeriodName(); } |
|
From: Carlos <ma...@us...> - 2007-10-17 23:22:07
|
Update of /cvsroot/tail/TailS/Data/icons In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20059/Data/icons Added Files: export_htm.gif complete_graph.gif export_xls.gif Removed Files: complete_graph.GIF export_htm.GIF export_xls.GIF Log Message: atualizando gifs --- NEW FILE: export_htm.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: complete_graph.gif --- (This appears to be a binary file; contents omitted.) --- export_htm.GIF DELETED --- --- NEW FILE: export_xls.gif --- (This appears to be a binary file; contents omitted.) --- complete_graph.GIF DELETED --- --- export_xls.GIF DELETED --- |
|
From: Carlos <ma...@us...> - 2007-10-17 23:15:03
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16835/src/java/net/sf/tails/swing/frame Modified Files: Index.java Log Message: Colocados icones na tela principal. Index: Index.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Index.java 17 Oct 2007 21:37:39 -0000 1.24 --- Index.java 17 Oct 2007 23:15:04 -0000 1.25 *************** *** 12,15 **** --- 12,16 ---- package net.sf.tails.swing.frame; + import java.awt.event.ActionEvent; import java.io.BufferedOutputStream; import java.io.File; *************** *** 21,24 **** --- 22,26 ---- import java.util.ResourceBundle; + import javax.swing.ImageIcon; import javax.swing.JFileChooser; import javax.swing.JFrame; *************** *** 43,46 **** --- 45,49 ---- public class Index extends javax.swing.JFrame { private static final ResourceBundle messageBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Messages"); + private static final ResourceBundle iconBundle = ResourceBundle.getBundle("net.sf.tails.i18n.icons"); private static final long serialVersionUID = 1L; *************** *** 62,68 **** private javax.swing.JPanel criteriaPanel; ! private javax.swing.JButton addReportButton; ! private javax.swing.JButton htmlButton; ! private javax.swing.JButton xlsButton; private javax.swing.JScrollPane reportScrollPane; private javax.swing.JTable reportTable; --- 65,78 ---- private javax.swing.JPanel criteriaPanel; ! private javax.swing.JButton newStockAnalysisButton; ! private javax.swing.JButton newReportButton; ! private javax.swing.JButton openStockAnalysisButton; ! private javax.swing.JButton saveStockAnalysisButton; ! private javax.swing.JButton saveAsStockAnalysisButton; ! private javax.swing.JButton exportHTMLButton; ! private javax.swing.JButton exportXLSButton; ! private javax.swing.JButton cleanConsoleButton; ! private javax.swing.JButton completeGraphButton; ! private javax.swing.JButton helpButton; private javax.swing.JScrollPane reportScrollPane; private javax.swing.JTable reportTable; *************** *** 122,128 **** criteriaPanel = new javax.swing.JPanel(); ! addReportButton = new javax.swing.JButton(); ! htmlButton = new javax.swing.JButton(); ! xlsButton = new javax.swing.JButton(); reportScrollPane = new javax.swing.JScrollPane(); reportTable = new javax.swing.JTable(); --- 132,146 ---- criteriaPanel = new javax.swing.JPanel(); ! newStockAnalysisButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("NEW_STOCKANALYSIS"))); ! newReportButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("NEW_REPORT"))); ! openStockAnalysisButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("OPEN"))); ! saveStockAnalysisButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("SAVE"))); ! saveAsStockAnalysisButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("SAVE_AS"))); ! exportHTMLButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("HTML"))); ! exportXLSButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("XLS"))); ! cleanConsoleButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("CONSOLE"))); ! completeGraphButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("GRAPH"))); ! helpButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("HELP"))); ! reportScrollPane = new javax.swing.JScrollPane(); reportTable = new javax.swing.JTable(); *************** *** 205,223 **** reportScrollPane.setViewportView(reportTable); reportScrollPane.setViewportBorder(javax.swing.BorderFactory.createEtchedBorder()); ! ! addReportButton.setFont(new java.awt.Font("Dialog", 0, 12)); ! addReportButton.setText("Add Report"); ! addReportButton.setMaximumSize(new java.awt.Dimension(101, 25)); ! addReportButton.setMinimumSize(new java.awt.Dimension(101, 25)); ! addReportButton.setPreferredSize(new java.awt.Dimension(101, 25)); ! addReportButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { newReportActionPerformed(evt); } }); ! ! htmlButton.setFont(new java.awt.Font("Dialog", 0, 12)); ! htmlButton.setText("Export to HTML"); ! htmlButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { htmlButtonActionPerformed(evt); --- 223,276 ---- reportScrollPane.setViewportView(reportTable); reportScrollPane.setViewportBorder(javax.swing.BorderFactory.createEtchedBorder()); ! ! newStockAnalysisButton.setToolTipText("New Stock Analysis..."); ! newStockAnalysisButton.setMaximumSize(new java.awt.Dimension(25, 25)); ! newStockAnalysisButton.setMinimumSize(new java.awt.Dimension(25, 25)); ! newStockAnalysisButton.addActionListener(new java.awt.event.ActionListener() { ! public void actionPerformed(java.awt.event.ActionEvent evt) { ! stockAnalysisMenuItemActionPerformed(evt); ! } ! }); ! ! newReportButton.setToolTipText("New Report..."); ! newReportButton.setMaximumSize(new java.awt.Dimension(25, 25)); ! newReportButton.setMinimumSize(new java.awt.Dimension(25, 25)); ! newReportButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { newReportActionPerformed(evt); } }); ! ! openStockAnalysisButton.setToolTipText("Open..."); ! openStockAnalysisButton.setMaximumSize(new java.awt.Dimension(25, 25)); ! openStockAnalysisButton.setMinimumSize(new java.awt.Dimension(25, 25)); ! openStockAnalysisButton.addActionListener(new java.awt.event.ActionListener() { ! public void actionPerformed(java.awt.event.ActionEvent evt) { ! openStockAnalysisMenuItemActionPerformed(evt); ! } ! }); ! ! saveStockAnalysisButton.setToolTipText("Save"); ! saveStockAnalysisButton.setMaximumSize(new java.awt.Dimension(25, 25)); ! saveStockAnalysisButton.setMinimumSize(new java.awt.Dimension(25, 25)); ! saveStockAnalysisButton.addActionListener(new java.awt.event.ActionListener() { ! public void actionPerformed(java.awt.event.ActionEvent evt) { ! saveMenuItemActionPerformed(evt); ! } ! }); ! ! saveAsStockAnalysisButton.setToolTipText("Save as..."); ! saveAsStockAnalysisButton.setMaximumSize(new java.awt.Dimension(25, 25)); ! saveAsStockAnalysisButton.setMinimumSize(new java.awt.Dimension(25, 25)); ! saveAsStockAnalysisButton.addActionListener(new java.awt.event.ActionListener() { ! public void actionPerformed(java.awt.event.ActionEvent evt) { ! saveAsMenuItemActionPerformed(evt); ! } ! }); ! ! exportHTMLButton.setToolTipText("Export to HTML..."); ! exportHTMLButton.setMaximumSize(new java.awt.Dimension(25, 25)); ! exportHTMLButton.setMinimumSize(new java.awt.Dimension(25, 25)); ! exportHTMLButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { htmlButtonActionPerformed(evt); *************** *** 225,235 **** }); ! xlsButton.setFont(new java.awt.Font("Dialog", 0, 12)); ! xlsButton.setText("Export to XLS"); ! xlsButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { xlsButtonActionPerformed(evt); } }); fileMenu.setMnemonic('f'); --- 278,316 ---- }); ! exportXLSButton.setToolTipText("Export to XLS..."); ! exportXLSButton.setMaximumSize(new java.awt.Dimension(25, 25)); ! exportXLSButton.setMinimumSize(new java.awt.Dimension(25, 25)); ! exportXLSButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { xlsButtonActionPerformed(evt); } }); + + cleanConsoleButton.setToolTipText("Clean Console"); + cleanConsoleButton.setMaximumSize(new java.awt.Dimension(25, 25)); + cleanConsoleButton.setMinimumSize(new java.awt.Dimension(25, 25)); + cleanConsoleButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + cleanConsoleButtonActionPerformed(evt); + } + }); + + completeGraphButton.setToolTipText("Generate Detailed Graphics"); + 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) { + completeGraphButtonActionPerformed(evt); + } + }); + + helpButton.setToolTipText("Help"); + helpButton.setMaximumSize(new java.awt.Dimension(25, 25)); + helpButton.setMinimumSize(new java.awt.Dimension(25, 25)); + helpButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + helpButtonActionPerformed(evt); + } + }); fileMenu.setMnemonic('f'); *************** *** 317,325 **** .addComponent(chartsPane, javax.swing.GroupLayout.DEFAULT_SIZE, 776, Short.MAX_VALUE) .addGroup(layout.createSequentialGroup() ! .addComponent(addReportButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) ! .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) ! .addComponent(htmlButton) ! .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) ! .addComponent(xlsButton) .addGap(200) .addComponent(reportProgress))) --- 398,420 ---- .addComponent(chartsPane, javax.swing.GroupLayout.DEFAULT_SIZE, 776, Short.MAX_VALUE) .addGroup(layout.createSequentialGroup() ! .addComponent(newStockAnalysisButton) ! .addGap(2) ! .addComponent(newReportButton) ! .addGap(2) ! .addComponent(openStockAnalysisButton) ! .addGap(2) ! .addComponent(saveStockAnalysisButton) ! .addGap(2) ! .addComponent(saveAsStockAnalysisButton) ! .addGap(2) ! .addComponent(exportHTMLButton) ! .addGap(2) ! .addComponent(exportXLSButton) ! .addGap(2) ! .addComponent(cleanConsoleButton) ! .addGap(2) ! .addComponent(completeGraphButton) ! .addGap(2) ! .addComponent(helpButton) .addGap(200) .addComponent(reportProgress))) *************** *** 329,337 **** layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() ! .addContainerGap(10, 10) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) ! .addComponent(xlsButton, 0, 0, Short.MAX_VALUE) ! .addComponent(htmlButton, 0, 0, Short.MAX_VALUE) ! .addComponent(addReportButton, javax.swing.GroupLayout.PREFERRED_SIZE, 17, Short.MAX_VALUE) .addComponent(reportProgress)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) --- 424,439 ---- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() ! .addContainerGap(2, 2) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) ! .addComponent(newStockAnalysisButton) ! .addComponent(newReportButton) ! .addComponent(openStockAnalysisButton) ! .addComponent(saveStockAnalysisButton) ! .addComponent(saveAsStockAnalysisButton) ! .addComponent(exportHTMLButton) ! .addComponent(exportXLSButton) ! .addComponent(cleanConsoleButton) ! .addComponent(completeGraphButton) ! .addComponent(helpButton) .addComponent(reportProgress)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) *************** *** 349,353 **** } ! private void xlsButtonActionPerformed(java.awt.event.ActionEvent evt) { if (reportTable.getSelectedRow() == -1) { --- 451,469 ---- } ! protected void cleanConsoleButtonActionPerformed(ActionEvent evt) { ! consoleArea.setText(""); ! } ! ! protected void helpButtonActionPerformed(ActionEvent evt) { ! // TODO AQUI ! ! } ! ! protected void completeGraphButtonActionPerformed(ActionEvent evt) { ! // TODO AQUI ! ! } ! ! private void xlsButtonActionPerformed(java.awt.event.ActionEvent evt) { if (reportTable.getSelectedRow() == -1) { |
|
From: Carlos <ma...@us...> - 2007-10-17 23:15:02
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/i18n In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16835/src/java/net/sf/tails/i18n Added Files: icons.properties Log Message: Colocados icones na tela principal. --- NEW FILE: icons.properties --- NEW_STOCKANALYSIS=Data/icons/new_stock_analysis.gif NEW_REPORT=Data/icons/new_report.gif OPEN=Data/icons/open.gif SAVE=Data/icons/save_edit.gif SAVE_AS=Data/icons/saveas_edit.gif HTML=Data/icons/export_htm.gif XLS=Data/icons/export_xls.gif CONSOLE=Data/icons/clean_console.gif GRAPH=Data/icons/complete_graph.gif HELP=Data/icons/help_view.gif |
|
From: Carlos <ma...@us...> - 2007-10-17 22:39:53
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv793/src/java/net/sf/tails/swing/frame/stockAnalysis Modified Files: NewStockAnalysis2.java NewStockAnalysis.java NewStockAnalysis3.java Log Message: Ajeitando detalhes de alinhamento Index: NewStockAnalysis2.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis2.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** NewStockAnalysis2.java 17 Oct 2007 16:51:36 -0000 1.8 --- NewStockAnalysis2.java 17 Oct 2007 22:39:55 -0000 1.9 *************** *** 104,111 **** 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)); --- 104,108 ---- criterionPanel.setBorder(javax.swing.BorderFactory.createTitledBorder( javax.swing.BorderFactory.createEtchedBorder(), ! "Additional Criteria")); criterionPanel.setLayout(new GridLayout(0, 1, 15, 15)); criterionPanel.setMaximumSize(new Dimension(400, 0)); *************** *** 173,241 **** 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(); } --- 170,208 ---- 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() ! .addContainerGap(280, 320) ! .addComponent(nextButton) ! .addGap(18, 18, 18) ! .addComponent(cancelButton) ! .addContainerGap()) ! .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(); } Index: NewStockAnalysis.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** NewStockAnalysis.java 17 Oct 2007 16:51:36 -0000 1.8 --- NewStockAnalysis.java 17 Oct 2007 22:39:55 -0000 1.9 *************** *** 94,98 **** 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))); stockButtonGroup.add(newRadioButton); newRadioButton.setSelected(true); --- 94,98 ---- seriesFileChooser.setCurrentDirectory(new File(folderBundle.getString("BOVESPA_DIR"))); ! stockPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Stock")); stockButtonGroup.add(newRadioButton); newRadioButton.setSelected(true); Index: NewStockAnalysis3.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis3.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** NewStockAnalysis3.java 17 Oct 2007 16:51:36 -0000 1.9 --- NewStockAnalysis3.java 17 Oct 2007 22:39:55 -0000 1.10 *************** *** 160,174 **** .addComponent(yearsLabel) .addComponent(daysLabel) ! .addComponent(hoursLabel)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(slicesPeriodPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) ! .addComponent(hoursField, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ! .addComponent(daysField, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ! .addComponent(yearsField, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ! .addComponent(monthsField, javax.swing.GroupLayout.DEFAULT_SIZE, 39, Short.MAX_VALUE))) ! .addGroup(javax.swing.GroupLayout.Alignment.LEADING, slicesPeriodPanelLayout.createSequentialGroup() ! .addComponent(minutesLabel) ! .addGap(8, 8, 8) ! .addComponent(minutesField, javax.swing.GroupLayout.DEFAULT_SIZE, 40, Short.MAX_VALUE))) .addGap(468, 468, 468)) ); --- 160,172 ---- .addComponent(yearsLabel) .addComponent(daysLabel) ! .addComponent(hoursLabel) ! .addComponent(minutesLabel)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(slicesPeriodPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) ! .addComponent(hoursField, 40, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ! .addComponent(daysField, 40, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ! .addComponent(yearsField, 40, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ! .addComponent(monthsField, 40, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ! .addComponent(minutesField, 40, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) .addGap(468, 468, 468)) ); |
