- Revision
- 1256
- Author
- rfscholte
- Date
- 2011-06-01 13:18:09 -0500 (Wed, 01 Jun 2011)
Log Message
Encapsulate line and column of LocatedDef
Modified Paths
- trunk/qdox/src/grammar/parser.y
- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/DefaultAnnotationTransformer.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/LocatedDef.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/PackageDef.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/TagDef.java
Diff
Modified: trunk/qdox/src/grammar/parser.y (1255 => 1256)
--- trunk/qdox/src/grammar/parser.y 2011-06-01 18:11:42 UTC (rev 1255) +++ trunk/qdox/src/grammar/parser.y 2011-06-01 18:18:09 UTC (rev 1256) @@ -365,7 +365,7 @@ NormalClassDeclaration: AnyModifiers_opt /* =ClassModifiers_opt */ classorinterface /* =CLASS or =INTERFACE */ IDENTIFIER TypeParameters_opt opt_extends Interfaces_opt { - cls.lineNumber = line; + cls.setLineNumber(line); cls.getModifiers().addAll(modifiers); modifiers.clear(); cls.setName( $3 ); cls.setTypeParameters(typeParams); @@ -477,7 +477,7 @@ MethodHeader: AnyModifiers_opt TypeParameters Type /* =ResultType */ IDENTIFIER PARENOPEN { builder.beginMethod(); - mth.lineNumber = lexer.getLine(); + mth.setLineNumber(lexer.getLine()); mth.getModifiers().addAll(modifiers); modifiers.clear(); mth.setTypeParams(typeParams); mth.setReturnType($3); @@ -490,7 +490,7 @@ | AnyModifiers_opt Type /* =ResultType */ IDENTIFIER PARENOPEN { builder.beginMethod(); - mth.lineNumber = lexer.getLine(); + mth.setLineNumber(lexer.getLine()); mth.getModifiers().addAll(modifiers); modifiers.clear(); mth.setReturnType($2); mth.setName($3); @@ -561,7 +561,7 @@ constructor: AnyModifiers_opt /* =ConstructorModifiers_opt */ IDENTIFIER PARENOPEN { builder.beginConstructor(); - mth.lineNumber = lexer.getLine(); + mth.setLineNumber(lexer.getLine()); mth.getModifiers().addAll(modifiers); modifiers.clear(); mth.setConstructor(true); mth.setName($2); @@ -575,7 +575,7 @@ | AnyModifiers_opt /* =ConstructorModifiers_opt */ TypeParameters IDENTIFIER PARENOPEN { builder.beginConstructor(); - mth.lineNumber = lexer.getLine(); + mth.setLineNumber(lexer.getLine()); mth.setTypeParams(typeParams); mth.getModifiers().addAll(modifiers); modifiers.clear(); mth.setConstructor(true); @@ -591,7 +591,7 @@ // 8.9 Enums EnumDeclaration: AnyModifiers_opt /* =ClassModifiers_opt*/ ENUM IDENTIFIER Interfaces_opt { - cls.lineNumber = line; + cls.setLineNumber(line); cls.getModifiers().addAll(modifiers); cls.setName( $3 ); cls.setType(ClassDef.ENUM); @@ -638,7 +638,7 @@ Annotation /* = NormalAnnotation*/: AT AnyName /* =TypeName */ { AnnoDef annotation = new AnnoDef( new TypeDef($2) ); - annotation.lineNumber = lexer.getLine(); + annotation.setLineNumber(lexer.getLine()); annotationStack.addFirst(annotation); } annotationParensOpt @@ -898,7 +898,7 @@ private void makeField(TypeDef field, String body) { FieldDef fd = new FieldDef( field.name ); - fd.lineNumber = line; + fd.setLineNumber(line); fd.getModifiers().addAll(modifiers); fd.setType( fieldType ); fd.setDimensions(field.dimensions);
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/DefaultAnnotationTransformer.java (1255 => 1256)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/DefaultAnnotationTransformer.java 2011-06-01 18:11:42 UTC (rev 1255) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/DefaultAnnotationTransformer.java 2011-06-01 18:18:09 UTC (rev 1256) @@ -104,7 +104,7 @@ * @see com.thoughtworks.qdox.builder.AnnotationTransformer#transform(com.thoughtworks.qdox.parser.structs.AnnoDef) */ public Annotation transform(AnnoDef annoDef) { - Annotation annotation = new Annotation(createType(annoDef.getTypeDef(), 0), annoDef.lineNumber); + Annotation annotation = new Annotation(createType(annoDef.getTypeDef(), 0), annoDef.getLineNumber()); for(Map.Entry<String, ElemValueDef> annoVal : annoDef.getArgs().entrySet()) { annotation.setProperty(annoVal.getKey(), annoVal.getValue().transform(this)); }
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java (1255 => 1256)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java 2011-06-01 18:11:42 UTC (rev 1255) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java 2011-06-01 18:18:09 UTC (rev 1256) @@ -84,7 +84,7 @@ public void addPackage(PackageDef packageDef) { DefaultJavaPackage jPackage = new DefaultJavaPackage(packageDef.getName()); jPackage.setClassLibrary( source.getJavaClassLibrary()); - jPackage.setLineNumber(packageDef.lineNumber); + jPackage.setLineNumber(packageDef.getLineNumber()); jPackage.setModelWriterFactory(modelWriterFactory); addJavaDoc(jPackage); setAnnotations(jPackage); @@ -105,7 +105,7 @@ public void beginClass(ClassDef def) { DefaultJavaClass newClass = new DefaultJavaClass(source); - newClass.setLineNumber(def.lineNumber); + newClass.setLineNumber(def.getLineNumber()); newClass.setModelWriterFactory(modelWriterFactory); // basic details @@ -195,7 +195,7 @@ tagList.add( docletTagFactory.createDocletTag( tagDef.getName(), tagDef.getText(), - entity, tagDef.lineNumber + entity, tagDef.getLineNumber() ) ); } @@ -220,7 +220,7 @@ public void endConstructor( MethodDef def ) { - currentConstructor.setLineNumber(def.lineNumber); + currentConstructor.setLineNumber(def.getLineNumber()); // basic details currentConstructor.setName(def.getName()); @@ -267,7 +267,7 @@ } public void endMethod(MethodDef def) { - currentMethod.setLineNumber(def.lineNumber); + currentMethod.setLineNumber(def.getLineNumber()); // basic details currentMethod.setName(def.getName()); @@ -322,7 +322,7 @@ public void addField(FieldDef def) { DefaultJavaField currentField = new DefaultJavaField(); currentField.setParentClass(classStack.getFirst()); - currentField.setLineNumber(def.lineNumber); + currentField.setLineNumber(def.getLineNumber()); currentField.setModelWriterFactory(modelWriterFactory); currentField.setName(def.getName());
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/LocatedDef.java (1255 => 1256)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/LocatedDef.java 2011-06-01 18:11:42 UTC (rev 1255) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/LocatedDef.java 2011-06-01 18:18:09 UTC (rev 1256) @@ -21,7 +21,24 @@ public class LocatedDef { - public int lineNumber; - public int columnNumber; + private int lineNumber; + private int columnNumber; + + public void setLineNumber( int lineNumber ) + { + this.lineNumber = lineNumber; + } + public int getLineNumber() + { + return lineNumber; + } + public void setColumnNumber( int columnNumber ) + { + this.columnNumber = columnNumber; + } + public int getColumnNumber() + { + return columnNumber; + } }
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/PackageDef.java (1255 => 1256)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/PackageDef.java 2011-06-01 18:11:42 UTC (rev 1255) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/PackageDef.java 2011-06-01 18:18:09 UTC (rev 1256) @@ -29,7 +29,7 @@ public PackageDef(String name, int lineNumber) { this.name = name; - this.lineNumber = lineNumber; + this.setLineNumber( lineNumber ); } /**
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/TagDef.java (1255 => 1256)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/TagDef.java 2011-06-01 18:11:42 UTC (rev 1255) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/TagDef.java 2011-06-01 18:18:09 UTC (rev 1256) @@ -31,7 +31,7 @@ { this.setName( name ); this.setText( text ); - this.lineNumber = lineNumber; + this.setLineNumber( lineNumber ); } public TagDef( String name, String text ) @@ -48,7 +48,7 @@ result.append( " => \"" ); result.append( text ); result.append( "\" @ line " ); - result.append( lineNumber ); + result.append( getLineNumber() ); return result.toString(); }
To unsubscribe from this list please visit:
