Revision: 3596
http://vexi.svn.sourceforge.net/vexi/?rev=3596&view=rev
Author: mkpg2
Date: 2009-08-11 02:33:39 +0000 (Tue, 11 Aug 2009)
Log Message:
-----------
Development & Fixes.
Modified Paths:
--------------
trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/JSDoc.java
trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/Page.java
trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/Scraper.java
trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/Section.java
trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/about.ftl
trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/leftindex.ftl
trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/page.ftl
trunk/tools/vexitools.jsdoc/src_dev/vexi/jsdoc/RunOnVexi.java
Added Paths:
-----------
trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/SimpleBoolean.java
trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/index.html
Removed Paths:
-------------
trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/mainframe.html
Property Changed:
----------------
trunk/tools/vexitools.jsdoc/
Property changes on: trunk/tools/vexitools.jsdoc
___________________________________________________________________
Modified: svn:ignore
- vexijs
vexijs_debug
+ vexijs
vexijs_debug
vexi_jsdoc*
Modified: trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/JSDoc.java
===================================================================
--- trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/JSDoc.java
2009-08-10 13:43:46 UTC (rev 3595)
+++ trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/JSDoc.java
2009-08-11 02:33:39 UTC (rev 3596)
@@ -13,7 +13,7 @@
public String version = "<unknown version>";
public String build = "<unknown build>";
- Page overview = null;
+ Page intro = null;
final TreeMap<String,Page> concepts = new TreeMap();
final TreeMap<String,Page> libraries = new TreeMap();
final TreeMap<String,Page> objects = new TreeMap();
@@ -76,29 +76,35 @@
while(!todo.isEmpty()){
Location loc = todo.remove();
+ Page page = null;
+ if(loc.jppfile!=null){
+ Reader r = path.findJpp(loc.jppfile);
+ Scraper scraper = new Scraper(this,r,loc);
+ System.err.println("* processing:
"+loc.jppfile+" "+loc.longname());
+ page = scraper.process();
+ boolean error = false;
+ for(Problem p: scraper.err.list){
+ System.err.println(" "+p.toString());
+ if("ERROR".equals(p.type)) error = true;
+ }
+ if(error){
+ System.err.println("There were errors
in scraping " +loc.jppfile+" Not generating.");
+ continue;
+ }
+ }else{
+ page = new Page(null, loc, false);
+ }
- Reader r = path.findJpp(loc.jppfile);
- Scraper scraper = new Scraper(this,r,loc);
- System.err.println("* processing: "+loc.jppfile+"
"+loc.longname());
- Page page = scraper.process();
- boolean error = false;
- for(Problem p: scraper.err.list){
- System.err.println(" "+p.toString());
- if("ERROR".equals(p.type)) error = true;
- }
- if(error){
- System.err.println("There were errors in
scraping " +loc.jppfile+" Not generating.");
- continue;
- }else{
- if(loc.pagetype==PageType.Concept) {
- if("Overview".equals(loc.longname()))
- overview = page;
+ if(loc.pagetype==PageType.Concept) {
+ if("Overview".equals(loc.longname()))
+ intro = page;
+ else
concepts.put(loc.longname(), page);
- }
- else if(loc.pagetype==PageType.Library)
libraries.put(loc.longname(), page);
- else objects.put(loc.longname(), page);
}
+ else if(loc.pagetype==PageType.Library)
libraries.put(loc.longname(), page);
+ else objects.put(loc.longname(), page);
+
}
@@ -107,10 +113,10 @@
rootModel.put("build", build);
- if(overview!=null) generate(overview, "page.ftl",
overview.filename()+".html");
- for(Page s: concepts.values())
generate(s,"page.ftl",s.filename()+".html");
- for(Page s: libraries.values())
generate(s,"page.ftl",s.filename()+".html");
- for(Page s: objects.values())
generate(s,"page.ftl",s.filename()+".html");
+ if(intro!=null) generate(intro, "page.ftl",
intro.filename()+".html");
+ for(Page s: concepts.values()) if(s!=null)
generate(s,"page.ftl",s.filename()+".html");
+ for(Page s: libraries.values()) if(s!=null)
generate(s,"page.ftl",s.filename()+".html");
+ for(Page s: objects.values()) if(s!=null)
generate(s,"page.ftl",s.filename()+".html");
rootModel.put("generation_date",new
Date(System.currentTimeMillis()));
@@ -118,7 +124,7 @@
rootModel.put("libraries", new ArrayList(libraries.values()));
rootModel.put("objects", new ArrayList(objects.values()));
- copy("mainframe.html");
+ copy("index.html");
generate(rootModel,"leftindex");
generate(rootModel,"about");
}
Modified: trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/Page.java
===================================================================
--- trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/Page.java
2009-08-10 13:43:46 UTC (rev 3595)
+++ trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/Page.java
2009-08-11 02:33:39 UTC (rev 3596)
@@ -13,10 +13,16 @@
Section current;
private Map<String,String> propToSection = new HashMap();
+ final boolean hasFile;
+
public Page(Errors err, Location location){
+ this(err, location, true);
+ }
+ public Page(Errors err, Location location, boolean hasFile){
super(err);
this.location = location;
defaultSection = new Section(err,"");
+ this.hasFile = hasFile;
}
public String shortname(){ return location.shortName(); }
@@ -84,7 +90,9 @@
}
public TemplateModel get(String s) {
- if("header".equals(s)){
+ if("hasfile".equals(s)){
+ return new SimpleBoolean(hasFile);
+ }else if("header".equals(s)){
String r = location.longname();
String humanname = (String)super.getProp("humanname");
if(humanname!=null)
Modified: trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/Scraper.java
===================================================================
--- trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/Scraper.java
2009-08-10 13:43:46 UTC (rev 3595)
+++ trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/Scraper.java
2009-08-11 02:33:39 UTC (rev 3596)
@@ -234,7 +234,7 @@
if(jpp.indexOf('.')==-1)
jpp = lookingFor.package_()+"."+jpp;
Reader r = jsdoc.path.getJpp(jpp) ;
- if(r==null) err.newWarning("Could not find referenced
jpp: "+jpp);
+ if(r==null) err.newWarning("Could not find referenced
jpp '"+jpp+"' for '"+key+"'");
else{
String longname = lookingFor.longname()+"."+key;
jsdoc.todo.add(new
Location(library?PageType.Library:PageType.Object, jpp, longname));
Modified: trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/Section.java
===================================================================
--- trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/Section.java
2009-08-10 13:43:46 UTC (rev 3595)
+++ trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/Section.java
2009-08-11 02:33:39 UTC (rev 3596)
@@ -71,7 +71,7 @@
}
return new SimpleSequence(r);
}else if("has_initial_value_col".equals(s)){
- return new TemplateBooleanModel(){public boolean
getAsBoolean() {return has_initial_value_col; }};
+ return new SimpleBoolean(has_initial_value_col);
}
return super.get(s);
}
Added: trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/SimpleBoolean.java
===================================================================
--- trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/SimpleBoolean.java
(rev 0)
+++ trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/SimpleBoolean.java
2009-08-11 02:33:39 UTC (rev 3596)
@@ -0,0 +1,12 @@
+package org.vexi.tools.jsdoc;
+
+import freemarker.template.*;
+
+public class SimpleBoolean implements TemplateBooleanModel{
+ final boolean val;
+ public SimpleBoolean(boolean val){ this.val = val; }
+ public boolean getAsBoolean() throws TemplateModelException {
+ return val;
+ }
+
+}
Property changes on:
trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/SimpleBoolean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/about.ftl
===================================================================
--- trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/about.ftl
2009-08-10 13:43:46 UTC (rev 3595)
+++ trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/about.ftl
2009-08-11 02:33:39 UTC (rev 3596)
@@ -8,15 +8,6 @@
<h1><a name="top"></a>Vexi ${version} ${build} Javascript Reference</h1>
<p><i>Generated using jsdoc:
${generation_date?datetime?string.medium}</i></p>
</div>
- <div>
- <p>A complete documentation of all system objects that are to be used in
creating Vexi
- ${version} applications. This is reference material only and contains no
examples or
- explanations beyond descriptions of specific properties.</p>
-
- <p>If there are any discrepancies between this reference and the
implementation then please
- log it at the <a href="http://sourceforge.net/projects/vexi";
target="_blank">project website</a> on
- Sourceforge.</p>
- </div>
</body>
</html>
\ No newline at end of file
Copied: trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/index.html (from
rev 3583, trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/mainframe.html)
===================================================================
--- trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/index.html
(rev 0)
+++ trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/index.html
2009-08-11 02:33:39 UTC (rev 3596)
@@ -0,0 +1,10 @@
+<html>
+
+<frameset cols="25%,75%">
+
+ <frame src="leftindex.html"/>
+ <frame src="Overview.html" name="mainFrame"/>
+
+</frameset>
+
+</html>
\ No newline at end of file
Property changes on:
trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/index.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/leftindex.ftl
===================================================================
--- trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/leftindex.ftl
2009-08-10 13:43:46 UTC (rev 3595)
+++ trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/leftindex.ftl
2009-08-11 02:33:39 UTC (rev 3596)
@@ -1,15 +1,18 @@
<#macro sectionlist sections>
<#list sections as s>
- <a href="${s.filename}.html" target="mainFrame">${s.longname}</a><br/>
+ <#if s.hasfile>
+ <a href="${s.filename}.html"
target="mainFrame">${s.longname}</a><br/>
+ <#else>
+ ${s.longname}<br/>
+ </#if>
</#list>
</#macro>
<html>
<body>
- <a href="about.html" target="mainFrame">About</a>
+ <div align="right"><font size="-1"><a href="about.html"
target="mainFrame" >about</a></font></div>
+ <a href="Overview.html" target="mainFrame">Overview</a>
<br/><br/>
<font size="+1">Concepts</font><br/>
- <a href="Overview.html" target="mainFrame">Overview</a>
- <br/><br/>
<@sectionlist sections=concepts/>
<br/>
<font size="+1">Libraries</font><br/>
Deleted: trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/mainframe.html
===================================================================
--- trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/mainframe.html
2009-08-10 13:43:46 UTC (rev 3595)
+++ trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/mainframe.html
2009-08-11 02:33:39 UTC (rev 3596)
@@ -1,10 +0,0 @@
-<html>
-
-<frameset cols="25%,75%">
-
- <frame src="leftindex.html"/>
- <frame src="overview.html" name="mainFrame"/>
-
-</frameset>
-
-</html>
\ No newline at end of file
Modified: trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/page.ftl
===================================================================
--- trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/page.ftl
2009-08-10 13:43:46 UTC (rev 3595)
+++ trunk/tools/vexitools.jsdoc/src/org/vexi/tools/jsdoc/page.ftl
2009-08-11 02:33:39 UTC (rev 3596)
@@ -20,8 +20,8 @@
<tbody>
<#list s.props as p>
<tr>
- <td><span><#if p.link?exists><a
href="${p.link}">${p.name}</a><#else>${p.name}</#if></span></td>
- <td><span>${p.type}</span></td>
+ <td><code><#if p.link?exists><a
href="${p.link}">${p.name}</a><#else>${p.name}</#if></code></td>
+ <td>${p.type}</td>
<#if s.has_initial_value_col><td>${p.initial_value}</td></#if>
<td>${p.desc}</td>
</tr>
Modified: trunk/tools/vexitools.jsdoc/src_dev/vexi/jsdoc/RunOnVexi.java
===================================================================
--- trunk/tools/vexitools.jsdoc/src_dev/vexi/jsdoc/RunOnVexi.java
2009-08-10 13:43:46 UTC (rev 3595)
+++ trunk/tools/vexitools.jsdoc/src_dev/vexi/jsdoc/RunOnVexi.java
2009-08-11 02:33:39 UTC (rev 3596)
@@ -12,17 +12,23 @@
path.addProject("org.vexi.core");
-// JSDoc jsdoc_debug = new JSDoc(path, new File("vexijs_debug"),
"vexi.js", "org.vexi.js.VexiJS");
+// JSDoc jsdoc_debug = new JSDoc(path, new
File("vexi_jsdoc_debug"), "vexi.js", "org.vexi.js.VexiJS");
// jsdoc_debug.doIt();
// if(true) return;
- JSDoc jsdoc = new JSDoc(path, new File("vexijs"));
+ JSDoc jsdoc = new JSDoc(path, new File("vexi_jsdoc"));
jsdoc.addLibraryRoot("vexi", "org.vexi.core.Vexi");
jsdoc.addConcept("Overview", "org.vexi.core.Vexi");
+ jsdoc.addConcept("Biscuits", "org.vexi.core.Vexi");
jsdoc.addConcept("Box Model", "org.vexi.core.Box");
+ jsdoc.addConcept("Cloning", null);
jsdoc.addConcept("Special Variables",
"org.ibex.js.Interpreter");
+ jsdoc.addConcept("Streams", "org.vexi.core.Vexi");
+ jsdoc.addConcept("Surfaces", "org.vexi.core.Vexi");
+ jsdoc.addConcept("Templates", "org.vexi.core.Vexi");
jsdoc.addConcept("Threading", "org.vexi.core.Vexi");
+ jsdoc.addConcept("Traps", null);
jsdoc.version = "3.0";
jsdoc.build = "3543";
jsdoc.doIt();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
