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: Carlos <ma...@us...> - 2007-10-10 19:04:09
|
Update of /cvsroot/tail/Tail/reports/templates/total In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15290/reports/templates/total Removed Files: chart.ftl footer.ftl header.ftl report.ftl Log Message: Refatoração do Report. --- report.ftl DELETED --- --- footer.ftl DELETED --- --- header.ftl DELETED --- --- chart.ftl DELETED --- |
|
From: Carlos <ma...@us...> - 2007-10-10 19:04:09
|
Update of /cvsroot/tail/Tail/Data/templates/complete In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15290/Data/templates/complete Added Files: chart.ftl footer.ftl header.ftl report.ftl Log Message: Refatoração do Report. --- NEW FILE: report.ftl --- <#include "header.ftl"> <#include "chart.ftl"> <table align="center"> <tr> <th>Period</th> <th>Date</th> <th>Strategy</th> <th>${report.applyedCriterion.class.simpleName.split("Criterion")[0]}</th> <#list criterions as criterion> <th>${criterion.class.simpleName.split("Criterion")[0]}</th> </#list> </tr> <#assign x=1> <tr class="row2"> <td>${x}</td> <td class="date">${report.slicer.slice(0).period}</td> <td class="strategy">-</td> <td>-</td> <#list criterions as criterion> <td>-</td> </#list> </tr> <#list report.decisions as decision> <#if (x%2)= 0> <tr class="row2"> <#else> <tr class="row1"> </#if> <#assign x=x+1> <td>${x}</td> <td class="date">${decision.series.period}</td> <td class="strategy"><a href=${urls.get(x - 2)}>${decision.strategy.name}</a></td> <td>${report.applyedCriterion.calculate(decision.series, decision.trades)}</td> <#list criterions as criterion> <td>${criterion.calculate(decision.series, decision.trades)}</td> </#list> </tr> </#list> <tr class="total"> <td>TOTAL</td> <td>${report.slicer.series.period}</td> <td>-</td> <td>${report.applyedCriterion.summarize(report.slicer.series, report.decisions)}</td> <#list criterions as criterion> <td>${criterion.summarize(report.slicer.series, report.decisions)}</td> </#list> </tr> </table> <#include "footer.ftl"> --- NEW FILE: footer.ftl --- </body> </html> --- NEW FILE: header.ftl --- <html> <head> <title>Walk Forward Report</title> <link rel="stylesheet" type="text/css" href="style/style.css"> </head> <body> <h1>Walk Forward Report</h1> <h2>Stock: <span class="titleHeader">${report.slicer.series.name} for: ${report.slicer.series.period}</span></h2> <h3><span class="settingsFixed">Slicer:</span><span class="settings">${report.slicer.name}</span> <span class="settingsFixed">Strategy: </span> <span class="settings">${report.decisions[0].strategy.class.simpleName}</span> <span class="settingsFixed">Criteria: </span> <span class="settings">${report.applyedCriterion.class.simpleName}</span></h3> --- NEW FILE: chart.ftl --- <table align="left"> <tr> <img src=${image}> </tr> </table> <br> <br> |
|
From: Carlos <ma...@us...> - 2007-10-10 19:04:09
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report/html In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15290/src/java/net/sf/tail/report/html Added Files: ReportHTMLGenerator.java Removed Files: CompleteHtmlGenerator.java Log Message: Refatoração do Report. --- NEW FILE: ReportHTMLGenerator.java --- package net.sf.tail.report.html; import java.io.File; import java.io.IOException; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import net.sf.tail.AnalysisCriterion; import net.sf.tail.analysis.evaluator.Decision; import net.sf.tail.report.FreemarkerProcessor; import net.sf.tail.report.Report; import freemarker.ext.beans.BeansWrapper; import freemarker.template.Configuration; public class ReportHTMLGenerator { static final String COMPLETE_TEMPLATE_DIR = "Data/templates/complete"; static final String SLICE_TEMPLATE_DIR = "Data/templates/slice"; static final String DEFAULT_TEMPLATE_DIR = "Data/templates/total"; public StringBuffer generate(Report report, String imagePath, List<String> urls) throws IOException { return generate(report, Collections.<AnalysisCriterion> emptyList(), imagePath, urls); } public StringBuffer generate(Decision decision, String image) throws IOException { return generate(decision, Collections.<AnalysisCriterion> emptyList(), image); } public StringBuffer generate(Report report, String imagePath) throws IOException { return generate(report, Collections.<AnalysisCriterion> emptyList(), imagePath); } public StringBuffer generate(Report report, List<AnalysisCriterion> criterion, String imagePath, List<String> urls) throws IOException { Configuration cfg = loadConfigurationDir(COMPLETE_TEMPLATE_DIR); Map<String, Object> map = new HashMap<String, Object>(); map.put("report", report); map.put("criterions", criterion); map.put("urls", urls); map.put("image", imagePath); FreemarkerProcessor processor = new FreemarkerProcessor(cfg); return processor.process(map, "report.ftl"); } public StringBuffer generate(Decision decision, List<AnalysisCriterion> criteria, String imagePath) throws IOException { Configuration cfg = loadConfigurationDir(SLICE_TEMPLATE_DIR); Map<String, Object> map = new HashMap<String, Object>(); map.put("decision", decision); map.put("criteria", criteria); map.put("image", imagePath); FreemarkerProcessor processor = new FreemarkerProcessor(cfg); return processor.process(map, "sliceReport.ftl"); } public StringBuffer generate(Report report, List<AnalysisCriterion> criterion, String imagePath) throws IOException { Configuration cfg = loadConfigurationDir(DEFAULT_TEMPLATE_DIR); Map<String, Object> map = new HashMap<String, Object>(); map.put("report", report); map.put("criterions", criterion); map.put("image", imagePath); FreemarkerProcessor processor = new FreemarkerProcessor(cfg); return processor.process(map, "report.ftl"); } private Configuration loadConfigurationDir(String dir) throws IOException { Configuration cfg = new Configuration(); cfg.setDirectoryForTemplateLoading(new File(dir)); cfg.setObjectWrapper(new BeansWrapper()); cfg.setDefaultEncoding("UTF-8"); return cfg; } } --- CompleteHtmlGenerator.java DELETED --- |
|
From: Carlos <ma...@us...> - 2007-10-10 19:04:09
|
Update of /cvsroot/tail/Tail/Data/templates/total In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15290/Data/templates/total Added Files: footer.ftl header.ftl chart.ftl report.ftl Log Message: Refatoração do Report. --- NEW FILE: report.ftl --- <#include "header.ftl"> <#include "chart.ftl"> <table align="center"> <tr> <th>Period</th> <th>Date</th> <th>Strategy</th> <th>${report.applyedCriterion.class.simpleName.split("Criterion")[0]}</th> <#list criterions as criterion> <th>${criterion.class.simpleName.split("Criterion")[0]}</th> </#list> </tr> <#assign x=1> <tr class="row1"> <td>${x}</td> <td class="date">${report.slicer.slice(0).period}</td> <td class="strategy">-</td> <td>-</td> <#list criterions as criterion> <td>-</td> </#list> </tr> <#list report.decisions as decision> <#if (x%2)= 0> <tr class="row1"> <#else> <tr class="row2"> </#if> <#assign x=x+1> <td>${x}</td> <td class="date">${decision.series.period}</td> <td class="strategy">${decision.strategy.name}</td> <td>${report.applyedCriterion.calculate(decision.series, decision.trades)}</td> <#list criterions as criterion> <td>${criterion.calculate(decision.series, decision.trades)}</td> </#list> </tr> </#list> <tr class="total"> <td>TOTAL</td> <td>${report.slicer.series.period}</td> <td>-</td> <td>${report.applyedCriterion.summarize(report.slicer.series, report.decisions)}</td> <#list criterions as criterion> <td>${criterion.summarize(report.slicer.series, report.decisions)}</td> </#list> </tr> </table> <#include "footer.ftl"> --- NEW FILE: footer.ftl --- </body> </html> --- NEW FILE: header.ftl --- <html> <head> <title>Walk Forward Report</title> <link rel="stylesheet" type="text/css" href="style/style.css"> </head> <body> <h1>Walk Forward Report</h1> <h2>Stock: <span class="titleHeader">${report.slicer.series.name}</span></h2> <h3><span class="settingsFixed">Slicer:</span><span class="settings">${report.slicer.name} </span> <span class="settingsFixed">Strategy: </span> <span class="settings">${report.decisions[0].strategy.class.simpleName}</span> <span class="settingsFixed">Criteria: </span> <span class="settings">${report.applyedCriterion.class.simpleName}</span></h3> --- NEW FILE: chart.ftl --- <table align="left"> <tr> <img src=${image}> </tr> </table> <br> <br> |
|
From: Carlos <ma...@us...> - 2007-10-10 19:04:08
|
Update of /cvsroot/tail/Tail/reports/templates/complete In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15290/reports/templates/complete Removed Files: header.ftl chart.ftl footer.ftl report.ftl Log Message: Refatoração do Report. --- report.ftl DELETED --- --- footer.ftl DELETED --- --- header.ftl DELETED --- --- chart.ftl DELETED --- |
|
From: Carlos <ma...@us...> - 2007-10-10 19:04:08
|
Update of /cvsroot/tail/Tail/reports/templates/slice In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15290/reports/templates/slice Removed Files: chart.ftl footer.ftl header.ftl sliceReport.ftl Log Message: Refatoração do Report. --- sliceReport.ftl DELETED --- --- header.ftl DELETED --- --- footer.ftl DELETED --- --- chart.ftl DELETED --- |
|
From: Carlos <ma...@us...> - 2007-10-10 19:03:58
|
Update of /cvsroot/tail/TailS/src/test/net/sf/tails/swing In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14949/src/test/net/sf/tails/swing Log Message: Directory /cvsroot/tail/TailS/src/test/net/sf/tails/swing added to the repository |
|
From: Carlos <ma...@us...> - 2007-10-10 19:03:58
|
Update of /cvsroot/tail/TailS/Data/templates/complete In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14949/Data/templates/complete Log Message: Directory /cvsroot/tail/TailS/Data/templates/complete added to the repository |
|
From: Carlos <ma...@us...> - 2007-10-10 19:03:58
|
Update of /cvsroot/tail/TailS/Data/templates/total In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14949/Data/templates/total Log Message: Directory /cvsroot/tail/TailS/Data/templates/total added to the repository |
|
From: Carlos <ma...@us...> - 2007-10-10 19:03:58
|
Update of /cvsroot/tail/TailS/Data/templates/slice In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14949/Data/templates/slice Log Message: Directory /cvsroot/tail/TailS/Data/templates/slice added to the repository |
|
From: Carlos <ma...@us...> - 2007-10-10 19:03:57
|
Update of /cvsroot/tail/TailS/Data/templates In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14949/Data/templates Log Message: Directory /cvsroot/tail/TailS/Data/templates added to the repository |
|
From: Carlos <ma...@us...> - 2007-10-10 19:03:54
|
Update of /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14949/src/test/net/sf/tails/swing/helper Log Message: Directory /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper added to the repository |
|
From: Carlos <ma...@us...> - 2007-10-10 19:03:54
|
Update of /cvsroot/tail/TailS/Data/Style In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14949/Data/Style Log Message: Directory /cvsroot/tail/TailS/Data/Style added to the repository |
|
From: Carlos <ma...@us...> - 2007-10-10 19:03:50
|
Update of /cvsroot/tail/Tail/Data In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14907/Data Log Message: Directory /cvsroot/tail/Tail/Data added to the repository |
|
From: Carlos <ma...@us...> - 2007-10-10 19:03:49
|
Update of /cvsroot/tail/Tail/Data/templates/complete In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14907/Data/templates/complete Log Message: Directory /cvsroot/tail/Tail/Data/templates/complete added to the repository |
|
From: Carlos <ma...@us...> - 2007-10-10 19:03:49
|
Update of /cvsroot/tail/Tail/Data/templates In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14907/Data/templates Log Message: Directory /cvsroot/tail/Tail/Data/templates added to the repository |
|
From: Carlos <ma...@us...> - 2007-10-10 19:03:49
|
Update of /cvsroot/tail/Tail/Data/templates/total In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14907/Data/templates/total Log Message: Directory /cvsroot/tail/Tail/Data/templates/total added to the repository |
|
From: xanaot <xa...@us...> - 2007-10-10 18:44:34
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/i18n In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6845/src/java/net/sf/tails/i18n Modified Files: IndicatorDescription.properties Classes.properties Log Message: Novas default strategies e alterações no arquivo de properties Index: Classes.properties =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/i18n/Classes.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Classes.properties 8 Oct 2007 19:56:56 -0000 1.1 --- Classes.properties 10 Oct 2007 18:44:32 -0000 1.2 *************** *** 1,3 **** ! ANALYSIS_CRITERIA =AverageProfitCriterion;BuyAndHoldCriterion;MaximumDrawDownCriterion;NumbersOfTicksCriterion;NumberOfTradesCriterion;RewardRiskRadioCriterion;TotalProfitCriterion;BrazilianTotalProfitCriterion;BrazilianTransactionCostsCriterion GENERIC_CRITERIA =VersusBuyAndHoldCriterion LOADERS =CedroTimeSeriesLoader \ No newline at end of file --- 1,3 ---- ! ANALYSIS_CRITERIA =AverageProfitCriterion;BuyAndHoldCriterion;MaximumDrawDownCriterion;NumberOfTicksCriterion;NumberOfTradesCriterion;RewardRiskRatioCriterion;TotalProfitCriterion;BrazilianTotalProfitCriterion;BrazilianTransactionCostsCriterion GENERIC_CRITERIA =VersusBuyAndHoldCriterion LOADERS =CedroTimeSeriesLoader \ No newline at end of file Index: IndicatorDescription.properties =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/i18n/IndicatorDescription.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IndicatorDescription.properties 24 Sep 2007 22:18:19 -0000 1.1 --- IndicatorDescription.properties 10 Oct 2007 18:44:32 -0000 1.2 *************** *** 1,3 **** ! SMAIndicator=Enter here the description ! EMAIndicator=Enter here the description --- 1,6 ---- ! SMAIndicator=Generate default strategy for SMA indicator using Indicator Crossed Indicator Strategy ! EMAIndicator=Generate default strategy for EMA indicator using Indicator Crossed Indicator Strategy ! RSIIndicator=Generate default strategy for RSI indicator using Pipe Enter Strategy ! ParabolicSarIndicator=Generate default strategy for ParabolicSar indicator using Indicator Crossed Indicator and ParabolicSar And DMI Strategy ! BollingerBandsIndicator=Generate default strategy for BollingerBands indicator using Pipe Enter Strategy \ No newline at end of file |
|
From: xanaot <xa...@us...> - 2007-10-10 18:44:34
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6845/src/java/net/sf/tails/swing/helper Modified Files: EnumIndicator.java DefaultStrategiesGenerator.java Log Message: Novas default strategies e alterações no arquivo de properties Index: EnumIndicator.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/EnumIndicator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EnumIndicator.java 8 Oct 2007 22:35:24 -0000 1.1 --- EnumIndicator.java 10 Oct 2007 18:44:32 -0000 1.2 *************** *** 2,5 **** public enum EnumIndicator { ! SMA, EMA; } --- 2,5 ---- public enum EnumIndicator { ! SMA, EMA, RSI, BOLLINGERBANDS, PARABOLICSAR; } Index: DefaultStrategiesGenerator.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/DefaultStrategiesGenerator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DefaultStrategiesGenerator.java 9 Oct 2007 00:05:52 -0000 1.2 --- DefaultStrategiesGenerator.java 10 Oct 2007 18:44:32 -0000 1.3 *************** *** 2,5 **** --- 2,6 ---- import java.util.HashSet; + import java.util.ResourceBundle; import java.util.Set; *************** *** 7,22 **** import net.sf.tail.Strategy; import net.sf.tail.TimeSeries; import net.sf.tail.indicator.simple.ClosePriceIndicator; import net.sf.tail.indicator.tracker.EMAIndicator; import net.sf.tail.indicator.tracker.SMAIndicator; import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy; public class DefaultStrategiesGenerator { public Set<Strategy> generate(TimeSeries series, EnumIndicator indicatorName, int initial, int end) { Set<Strategy> strategies = new HashSet<Strategy>(); ! Indicator<? extends Number> close = new ClosePriceIndicator(series); Indicator<? extends Number> indicator; Strategy strategy; --- 8,42 ---- import net.sf.tail.Strategy; import net.sf.tail.TimeSeries; + import net.sf.tail.indicator.helper.DirectionalMovementDownIndicator; + import net.sf.tail.indicator.helper.DirectionalMovementUpIndicator; + import net.sf.tail.indicator.helper.StandardDeviationIndicator; import net.sf.tail.indicator.simple.ClosePriceIndicator; + import net.sf.tail.indicator.simple.ConstantIndicator; import net.sf.tail.indicator.tracker.EMAIndicator; + import net.sf.tail.indicator.tracker.ParabolicSarIndicator; + import net.sf.tail.indicator.tracker.RSIIndicator; import net.sf.tail.indicator.tracker.SMAIndicator; + import net.sf.tail.indicator.tracker.bollingerbands.BollingerBandsLowerIndicator; + import net.sf.tail.indicator.tracker.bollingerbands.BollingerBandsMiddleIndicator; + import net.sf.tail.indicator.tracker.bollingerbands.BollingerBandsUpperIndicator; import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy; + import net.sf.tail.strategy.IndicatorOverIndicatorStrategy; + import net.sf.tail.strategy.ParabolicSarAndDMIStrategy; + import net.sf.tail.strategy.PipeEnterStrategy; + + import org.apache.log4j.Logger; + public class DefaultStrategiesGenerator { + private transient static Logger LOG = Logger + .getLogger(DefaultStrategiesGenerator.class); + private static final ResourceBundle indicatorDescription = ResourceBundle.getBundle("net.sf.tails.i18n.IndicatorDescription"); + public Set<Strategy> generate(TimeSeries series, EnumIndicator indicatorName, int initial, int end) { Set<Strategy> strategies = new HashSet<Strategy>(); ! ClosePriceIndicator close = new ClosePriceIndicator(series); Indicator<? extends Number> indicator; Strategy strategy; *************** *** 26,40 **** for (int i = initial; i < end; i++) { indicator = new SMAIndicator(close, i); ! strategy = new IndicatorCrossedIndicatorStrategy(close, indicator); strategies.add(strategy); } ! break; case EMA: for (int i = initial; i < end; i++) { indicator = new EMAIndicator(close, i); ! strategy = new IndicatorCrossedIndicatorStrategy(close, indicator); strategies.add(strategy); } break; } --- 46,113 ---- for (int i = initial; i < end; i++) { indicator = new SMAIndicator(close, i); ! strategy = new IndicatorCrossedIndicatorStrategy(close, ! indicator); strategies.add(strategy); } ! LOG.info(indicatorDescription.getString("SMAIndicator")); break; case EMA: for (int i = initial; i < end; i++) { indicator = new EMAIndicator(close, i); ! strategy = new IndicatorCrossedIndicatorStrategy(close, ! indicator); ! strategies.add(strategy); ! } ! LOG.info(indicatorDescription.getString("EMAIndicator")); ! break; ! case RSI: ! for (int i = initial; i < end; i++) { ! indicator = new RSIIndicator(close, i); ! strategy = new PipeEnterStrategy(new ConstantIndicator<Number>( ! 0.3d * close.getValue(i)), ! new ConstantIndicator<Number>(0.7 * close.getValue(i)), ! indicator); strategies.add(strategy); } + LOG.info(indicatorDescription.getString("RSIIndicator")); + break; + case BOLLINGERBANDS: + for (int i = initial; i < end; i++) { + indicator = new SMAIndicator(close, i); + StandardDeviationIndicator standarDeviation = new StandardDeviationIndicator( + close, i); + + BollingerBandsMiddleIndicator middle = new BollingerBandsMiddleIndicator( + indicator); + BollingerBandsLowerIndicator lower = new BollingerBandsLowerIndicator( + middle, standarDeviation); + BollingerBandsUpperIndicator upper = new BollingerBandsUpperIndicator( + middle, standarDeviation); + strategy = new PipeEnterStrategy(upper, lower, close); + + strategies.add(strategy); + } + LOG.info(indicatorDescription.getString("BollingerBandsIndicator")); + break; + case PARABOLICSAR: + indicator = new ParabolicSarIndicator(series); + strategy = new IndicatorCrossedIndicatorStrategy(close, indicator); + strategies.add(strategy); + + DirectionalMovementUpIndicator dmiUp = new DirectionalMovementUpIndicator( + series); + DirectionalMovementDownIndicator dmiDown = new DirectionalMovementDownIndicator( + series); + IndicatorOverIndicatorStrategy over = new IndicatorOverIndicatorStrategy( + dmiUp, dmiDown); + ParabolicSarIndicator parabolic = new ParabolicSarIndicator(series); + IndicatorCrossedIndicatorStrategy crossed = new IndicatorCrossedIndicatorStrategy( + close, parabolic); + + strategy = new ParabolicSarAndDMIStrategy(crossed, over); + strategies.add(strategy); + + LOG.info(indicatorDescription.getString("ParabolicSarIndicator")); + break; } |
|
From: xanaot <xa...@us...> - 2007-10-10 17:02:22
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/autocomplete In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28685/src/java/net/sf/tails/swing/frame/autocomplete Modified Files: AutoCompleteForm.java Log Message: Atualização do autocomplete e newReportFrame Index: AutoCompleteForm.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/autocomplete/AutoCompleteForm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AutoCompleteForm.java 8 Oct 2007 22:49:11 -0000 1.1 --- AutoCompleteForm.java 10 Oct 2007 17:02:24 -0000 1.2 *************** *** 1,20 **** package net.sf.tails.swing.frame.autocomplete; import java.awt.event.MouseEvent; import java.util.ResourceBundle; import javax.swing.JTable; import javax.swing.table.DefaultTableModel; public class AutoCompleteForm extends javax.swing.JFrame { ! ! /** * */ private javax.swing.JTable reportTable; private static final long serialVersionUID = 8339682604292292370L; private static String[] rubyKeyWords; private static String[] tailKeyWords; ! static{ ResourceBundle bundle = ResourceBundle.getBundle("net.sf.tails.i18n.DSL_IDE"); --- 1,23 ---- package net.sf.tails.swing.frame.autocomplete; + import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.util.ResourceBundle; import javax.swing.JTable; + import javax.swing.JTextArea; import javax.swing.table.DefaultTableModel; public class AutoCompleteForm extends javax.swing.JFrame { ! ! /** * */ private javax.swing.JTable reportTable; + private JTextArea jTextArea; private static final long serialVersionUID = 8339682604292292370L; private static String[] rubyKeyWords; private static String[] tailKeyWords; ! static{ ResourceBundle bundle = ResourceBundle.getBundle("net.sf.tails.i18n.DSL_IDE"); *************** *** 22,112 **** tailKeyWords = bundle.getString("TAIL_KEYWORDS").split(" "); } ! ! ! /** Creates new form AutoCompleteForm */ ! public AutoCompleteForm() { ! initComponents(); ! } ! ! /** This method is called from within the constructor to ! * initialize the form. ! * WARNING: Do NOT modify this code. The content of this method is ! * always regenerated by the Form Editor. ! */ ! // <editor-fold defaultstate="collapsed" desc=" Generated Code "> ! private void initComponents() { ! DefaultTableModel dtm = new DefaultTableModel(0,1); ! for (String s : tailKeyWords) { dtm.addRow(new Object[]{s}); } ! for (String s : rubyKeyWords) { dtm.addRow(new Object[]{s}); } ! reportTable = new JTable(dtm); ! ! ! ! jScrollPane1 = new javax.swing.JScrollPane(); ! jScrollPane1.setViewportView(reportTable); - reportTable.addMouseListener( new java.awt.event.MouseAdapter() { - public void mouseClicked(java.awt.event.MouseEvent evt) { - jScrollPane1MouseClicked(evt); - } - }); - - setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); - jScrollPane1.addKeyListener(new java.awt.event.KeyAdapter() { - public void keyPressed(java.awt.event.KeyEvent evt) { - jScrollPane1KeyPressed(evt); - } - }); ! ! ! javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); ! getContentPane().setLayout(layout); ! layout.setHorizontalGroup( ! layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) ! .addGroup(layout.createSequentialGroup() ! .addContainerGap() ! .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 376, Short.MAX_VALUE) ! .addContainerGap()) ! ); ! layout.setVerticalGroup( ! layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) ! .addGroup(layout.createSequentialGroup() ! .addContainerGap() ! .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 276, Short.MAX_VALUE) ! .addContainerGap()) ! ); ! pack(); ! }// </editor-fold> ! private void jScrollPane1KeyPressed(java.awt.event.KeyEvent evt) { ! // TODO add your handling code here: ! } ! ! private void jScrollPane1MouseClicked(MouseEvent evt) { ! JTable jt = (JTable)evt.getSource(); ! System.out.println(jt.getValueAt(jt.getSelectedRow(), jt.getSelectedColumn())); ! } - /** - * @param args the command line arguments - */ - public static void main(String args[]) { - java.awt.EventQueue.invokeLater(new Runnable() { - public void run() { - new AutoCompleteForm().setVisible(true); - } - }); - } - - // Variables declaration - do not modify - private javax.swing.JScrollPane jScrollPane1; - // End of variables declaration - } --- 25,118 ---- tailKeyWords = bundle.getString("TAIL_KEYWORDS").split(" "); } ! ! public AutoCompleteForm(JTextArea jTextArea){ ! this.jTextArea = jTextArea; ! initComponents(); ! } ! ! ! /** This method is called from within the constructor to ! * initialize the form. ! * WARNING: Do NOT modify this code. The content of this method is ! * always regenerated by the Form Editor. ! */ ! // <editor-fold defaultstate="collapsed" desc=" Generated Code "> ! private void initComponents() { ! DefaultTableModel dtm = new DefaultTableModel(0,1); ! for (String s : tailKeyWords) { dtm.addRow(new Object[]{s}); } ! for (String s : rubyKeyWords) { dtm.addRow(new Object[]{s}); } ! reportTable = new JTable(dtm); ! jScrollPane1 = new javax.swing.JScrollPane(); ! jScrollPane1.setViewportView(reportTable); ! reportTable.addMouseListener( new java.awt.event.MouseAdapter() { ! public void mouseClicked(java.awt.event.MouseEvent evt) { ! jScrollPane1MouseClicked(evt); ! } ! }); ! setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); ! ! this.addKeyListener(new java.awt.event.KeyAdapter() { ! public void keyPressed(java.awt.event.KeyEvent evt) { ! jScrollPane1KeyPressed(evt); ! } ! }); ! ! ! ! javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); ! getContentPane().setLayout(layout); ! layout.setHorizontalGroup( ! layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) ! .addGroup(layout.createSequentialGroup() ! .addContainerGap() ! .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 376, Short.MAX_VALUE) ! .addContainerGap()) ! ); ! layout.setVerticalGroup( ! layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) ! .addGroup(layout.createSequentialGroup() ! .addContainerGap() ! .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 276, Short.MAX_VALUE) ! .addContainerGap()) ! ); ! ! pack(); ! }// </editor-fold> ! ! private void jScrollPane1KeyPressed(java.awt.event.KeyEvent evt) { ! if (evt.getKeyCode() == KeyEvent.VK_ESCAPE) { ! this.dispose(); ! } ! } ! ! private void jScrollPane1MouseClicked(MouseEvent evt) { ! JTable jt = (JTable)evt.getSource(); ! jTextArea.append(jt.getValueAt(jt.getSelectedRow(), jt.getSelectedColumn()).toString()); ! this.dispose(); ! } ! ! /** ! * @param args the command line arguments ! */ ! public static void main(String args[]) { ! java.awt.EventQueue.invokeLater(new Runnable() { ! public void run() { ! new AutoCompleteForm(null).setVisible(true); ! } ! }); ! } ! ! // Variables declaration - do not modify ! private javax.swing.JScrollPane jScrollPane1; ! // End of variables declaration } |
|
From: xanaot <xa...@us...> - 2007-10-10 17:02:21
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28685/src/java/net/sf/tails/swing/frame/report Modified Files: NewReportFrame.java Log Message: Atualização do autocomplete e newReportFrame Index: NewReportFrame.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** NewReportFrame.java 8 Oct 2007 22:49:11 -0000 1.16 --- NewReportFrame.java 10 Oct 2007 17:02:24 -0000 1.17 *************** *** 330,335 **** switch (keyEvent.getKeyCode()) { case KeyEvent.VK_SPACE: ! System.out.println("omomomoom"); ! new AutoCompleteForm().setVisible(true); break; --- 330,334 ---- switch (keyEvent.getKeyCode()) { case KeyEvent.VK_SPACE: ! new AutoCompleteForm(customStrategyTextArea).setVisible(true); break; |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-09 00:05:52
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28020/src/java/net/sf/tails/swing/helper Modified Files: DefaultStrategiesGenerator.java Log Message: invertendo os parâmetros da geração de Set de Strategy do EMA Index: DefaultStrategiesGenerator.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/DefaultStrategiesGenerator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DefaultStrategiesGenerator.java 8 Oct 2007 22:35:24 -0000 1.1 --- DefaultStrategiesGenerator.java 9 Oct 2007 00:05:52 -0000 1.2 *************** *** 33,37 **** case EMA: for (int i = initial; i < end; i++) { ! indicator = new EMAIndicator(close, initial); strategy = new IndicatorCrossedIndicatorStrategy(close, indicator); strategies.add(strategy); --- 33,37 ---- case EMA: for (int i = initial; i < end; i++) { ! indicator = new EMAIndicator(close, i); strategy = new IndicatorCrossedIndicatorStrategy(close, indicator); strategies.add(strategy); |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-08 22:49:09
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/autocomplete In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28777/src/java/net/sf/tails/swing/frame/autocomplete Added Files: AutoCompleteForm.java Log Message: --- NEW FILE: AutoCompleteForm.java --- package net.sf.tails.swing.frame.autocomplete; import java.awt.event.MouseEvent; import java.util.ResourceBundle; import javax.swing.JTable; import javax.swing.table.DefaultTableModel; public class AutoCompleteForm extends javax.swing.JFrame { /** * */ private javax.swing.JTable reportTable; private static final long serialVersionUID = 8339682604292292370L; private static String[] rubyKeyWords; private static String[] tailKeyWords; static{ ResourceBundle bundle = ResourceBundle.getBundle("net.sf.tails.i18n.DSL_IDE"); rubyKeyWords = bundle.getString("RUBY_KEYWORDS").split(" "); tailKeyWords = bundle.getString("TAIL_KEYWORDS").split(" "); } /** Creates new form AutoCompleteForm */ public AutoCompleteForm() { initComponents(); } /** This method is called from within the constructor to * initialize the form. * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ // <editor-fold defaultstate="collapsed" desc=" Generated Code "> private void initComponents() { DefaultTableModel dtm = new DefaultTableModel(0,1); for (String s : tailKeyWords) { dtm.addRow(new Object[]{s}); } for (String s : rubyKeyWords) { dtm.addRow(new Object[]{s}); } reportTable = new JTable(dtm); jScrollPane1 = new javax.swing.JScrollPane(); jScrollPane1.setViewportView(reportTable); reportTable.addMouseListener( new java.awt.event.MouseAdapter() { public void mouseClicked(java.awt.event.MouseEvent evt) { jScrollPane1MouseClicked(evt); } }); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); jScrollPane1.addKeyListener(new java.awt.event.KeyAdapter() { public void keyPressed(java.awt.event.KeyEvent evt) { jScrollPane1KeyPressed(evt); } }); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 376, Short.MAX_VALUE) .addContainerGap()) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 276, Short.MAX_VALUE) .addContainerGap()) ); pack(); }// </editor-fold> private void jScrollPane1KeyPressed(java.awt.event.KeyEvent evt) { // TODO add your handling code here: } private void jScrollPane1MouseClicked(MouseEvent evt) { JTable jt = (JTable)evt.getSource(); System.out.println(jt.getValueAt(jt.getSelectedRow(), jt.getSelectedColumn())); } /** * @param args the command line arguments */ public static void main(String args[]) { java.awt.EventQueue.invokeLater(new Runnable() { public void run() { new AutoCompleteForm().setVisible(true); } }); } // Variables declaration - do not modify private javax.swing.JScrollPane jScrollPane1; // End of variables declaration } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-08 22:49:09
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28777/src/java/net/sf/tails/swing/frame/report Modified Files: NewReportFrame.java Log Message: Index: NewReportFrame.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** NewReportFrame.java 8 Oct 2007 22:35:24 -0000 1.15 --- NewReportFrame.java 8 Oct 2007 22:49:11 -0000 1.16 *************** *** 18,21 **** --- 18,22 ---- import net.sf.tail.dsl.ruby.RubyDSL; import net.sf.tails.swing.frame.Index; + import net.sf.tails.swing.frame.autocomplete.AutoCompleteForm; import net.sf.tails.swing.helper.DefaultStrategiesGenerator; import net.sf.tails.swing.helper.EnumIndicator; *************** *** 330,333 **** --- 331,335 ---- case KeyEvent.VK_SPACE: System.out.println("omomomoom"); + new AutoCompleteForm().setVisible(true); break; |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-08 22:49:02
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/autocomplete In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28601/src/java/net/sf/tails/swing/frame/autocomplete Log Message: Directory /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/autocomplete added to the repository |
