From: Patrick G. <sf...@us...> - 2006-08-25 15:43:36
|
Update of /cvsroot/smartfrog/core/smartfrog/src/org/smartfrog In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv8345/smartfrog/src/org/smartfrog Modified Files: SFParse.java Log Message: Added phase sfAsCompleteName, shown on -v and -d. Old -d as funny description mode no longer works Index: SFParse.java =================================================================== RCS file: /cvsroot/smartfrog/core/smartfrog/src/org/smartfrog/SFParse.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** SFParse.java 20 Jul 2006 17:30:25 -0000 1.15 --- SFParse.java 25 Aug 2006 15:43:31 -0000 1.16 *************** *** 34,42 **** import org.smartfrog.sfcore.common.SmartFrogException; import org.smartfrog.sfcore.common.SmartFrogParseException; - import org.smartfrog.sfcore.languages.sf.predicates.BasePredicate; import org.smartfrog.sfcore.parser.Phases; import org.smartfrog.sfcore.parser.SFParser; import org.smartfrog.sfcore.security.SFClassLoader; import org.smartfrog.sfcore.common.ExitCodes; /** --- 34,42 ---- import org.smartfrog.sfcore.common.SmartFrogException; import org.smartfrog.sfcore.common.SmartFrogParseException; import org.smartfrog.sfcore.parser.Phases; import org.smartfrog.sfcore.parser.SFParser; import org.smartfrog.sfcore.security.SFClassLoader; import org.smartfrog.sfcore.common.ExitCodes; + import org.smartfrog.sfcore.componentdescription.ComponentDescription; /** *************** *** 96,102 **** long parseTime=System.currentTimeMillis(); try { - if (opts.description) { - BasePredicate.keepPredicates = true; - } String language = getLanguageFromUrl(fileUrl); --- 96,99 ---- *************** *** 128,132 **** is.close(); } catch (IOException swallowed) { ! } } --- 125,129 ---- is.close(); } catch (IOException swallowed) { ! // } } *************** *** 139,152 **** phase = (String) e.nextElement(); try { ! if (phase.equals("predicate")&& (opts.description)) { ! top = top.sfResolvePhase("description"); ! printDescription(top,"stdout_txt"); ! } else { ! top = top.sfResolvePhase(phase); ! if (opts.verbose&&!opts.quiet) { ! printPhase(phase, top.toString()); ! } ! report.add(" "+phase+" phase: OK"); } } catch (Exception ex) { //report.add(" "+ phase +" phase: "+ex.getMessage()); --- 136,144 ---- phase = (String) e.nextElement(); try { ! top = top.sfResolvePhase(phase); ! if (opts.verbose && !opts.quiet) { ! printPhase(phase, top.toString()); } + report.add(" " + phase + " phase: OK"); } catch (Exception ex) { //report.add(" "+ phase +" phase: "+ex.getMessage()); *************** *** 155,158 **** --- 147,157 ---- } } + + ComponentDescription cd = top.sfAsComponentDescription(); + + if ((opts.description) || opts.verbose) { + printPhase("sfAsComponentDescription", cd.toString()); + } + parseTime=System.currentTimeMillis()-parseTime; //org.smartfrog.sfcore.common.Logger.log(" * "+fileUrl +" parsed in "+ parseTime + " millisecs."); *************** *** 182,186 **** */ private static void parseFiles (Vector list){ ! StringBuffer strb = new StringBuffer(); String file = ""; Vector report= new Vector(); --- 181,185 ---- */ private static void parseFiles (Vector list){ ! StringBuffer strb; String file = ""; Vector report= new Vector(); *************** *** 193,201 **** //If it's not an empty line if (file.trim().length() > 0) { ! strb.append( ! "-----------------------------------------------\n"); ! strb.append("- Parsing: " + file+"\n"); ! strb.append( ! "-----------------------------------------------"); if (!opts.quiet) SFSystem.sfLog().out(strb.toString()); report.add(parseFile(file)); --- 192,200 ---- //If it's not an empty line if (file.trim().length() > 0) { ! strb.append("-----------------------------------------------\n") ! .append("- Parsing: ") ! .append(file) ! .append("\n") ! .append("-----------------------------------------------"); if (!opts.quiet) SFSystem.sfLog().out(strb.toString()); report.add(parseFile(file)); *************** *** 203,212 **** } catch (Throwable thr){ strb = new StringBuffer(); ! strb.append( ! "-----------------------------------------------"); ! strb.append("- Error parsing: "+ file+"\n"); ! strb.append("- "+thr.getMessage()+"\n"); ! strb.append( ! "-----------------------------------------------"); if (!opts.quiet) SFSystem.sfLog().err(strb.toString(),thr); } --- 202,213 ---- } catch (Throwable thr){ strb = new StringBuffer(); ! strb.append("-----------------------------------------------") ! .append("- Error parsing: ") ! .append(file) ! .append("\n") ! .append("- ") ! .append(thr.getMessage()) ! .append("\n") ! .append("-----------------------------------------------"); if (!opts.quiet) SFSystem.sfLog().err(strb.toString(),thr); } *************** *** 342,373 **** /** - * Special method to print description with a particular presentation format. - * - * @param top the phases to be printed - * @param format the presentation format - */ - private static void printDescription(Phases top, String format) { - //@TODO: add different formats like html, xhtml, pdf , txt, ... - try { - if (!opts.quiet) { - if (opts.verbose) - SFSystem.sfLog().out( - "******************** component description *********************"); - if (opts.description) { - SFSystem.sfLog().out("Description of sfConfig component\n\n"); - top.sfResolvePhase("description"); - SFSystem.sfLog().out(top.sfAsComponentDescription().toString()); - } else - SFSystem.sfLog().out(top.sfAsComponentDescription().toString()); - } - } catch (Exception ex) { - if (SFSystem.sfLog().isErrorEnabled()){ - SFSystem.sfLog().error(ex); - } - //Logger.log(ex); - } - } - - /** * Prints the total parsing report. * --- 343,346 ---- *************** *** 425,429 **** StringBuffer st = new StringBuffer("<tr>"+"\n"); for (Enumeration e = report.elements(); e.hasMoreElements(); ) { ! st.append("<td>"+e.nextElement().toString()+"<td/>"+"\n"); } st.append("<tr/>"+"\n"); --- 398,402 ---- StringBuffer st = new StringBuffer("<tr>"+"\n"); for (Enumeration e = report.elements(); e.hasMoreElements(); ) { ! st.append("<td>").append(e.nextElement().toString()).append("<td/>\n"); } st.append("<tr/>"+"\n"); |