From: Patrick G. <sf...@us...> - 2005-08-30 17:22:43
|
Update of /cvsroot/smartfrog/core/smartfrog/src/org/smartfrog/sfcore/languages/sf/predicates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5238/smartfrog/src/org/smartfrog/sfcore/languages/sf/predicates Modified Files: TBD.java BasePredicate.java Log Message: improved error message for predicates Index: BasePredicate.java =================================================================== RCS file: /cvsroot/smartfrog/core/smartfrog/src/org/smartfrog/sfcore/languages/sf/predicates/BasePredicate.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** BasePredicate.java 28 Jul 2005 12:49:51 -0000 1.7 --- BasePredicate.java 30 Aug 2005 17:22:32 -0000 1.8 *************** *** 28,31 **** --- 28,32 ---- import org.smartfrog.sfcore.languages.sf.PhaseAction; import org.smartfrog.sfcore.languages.sf.SmartFrogCompileResolutionException; + import org.smartfrog.sfcore.reference.Reference; import java.util.Stack; *************** *** 60,67 **** */ public void doit() throws SmartFrogCompileResolutionException { // check that the predicate is being applied to a component which is the parent, and not merely linked if (stack.peek() != component.sfParent()) throw new SmartFrogCompileResolutionException( MessageUtil.formatMessage(MessageKeys.CANNOT_LINK_TO_PREDICATE, ! ((ComponentDescription) stack.peek()).sfCompleteName())); --- 61,72 ---- */ public void doit() throws SmartFrogCompileResolutionException { + ComponentDescription comeFrom = (ComponentDescription)stack.peek(); + Reference ref = comeFrom.sfCompleteName(); + // check that the predicate is being applied to a component which is the parent, and not merely linked if (stack.peek() != component.sfParent()) throw new SmartFrogCompileResolutionException( MessageUtil.formatMessage(MessageKeys.CANNOT_LINK_TO_PREDICATE, ! ref, ! comeFrom.sfAttributeKeyFor(this))); Index: TBD.java =================================================================== RCS file: /cvsroot/smartfrog/core/smartfrog/src/org/smartfrog/sfcore/languages/sf/predicates/TBD.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TBD.java 30 Aug 2005 17:15:45 -0000 1.5 --- TBD.java 30 Aug 2005 17:22:32 -0000 1.6 *************** *** 55,59 **** Object name = comeFrom.sfAttributeKeyFor(component); throw new SmartFrogCompileResolutionException ( ! "attribute is still TBD (to be defined) in attribute " + name , null, ref, "predicate", null ); } --- 55,59 ---- Object name = comeFrom.sfAttributeKeyFor(component); throw new SmartFrogCompileResolutionException ( ! "attribute " + name + " is still TBD (to be defined)", null, ref, "predicate", null ); } |