Code Review
/
yangtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug 981: Removed direct access to parent fields.
[yangtools.git]
/
yang
/
yang-parser-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
yangtools
/
yang
/
parser
/
builder
/
impl
/
ChoiceCaseBuilder.java
diff --git
a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java
b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java
index dd82fbef442f9c1994adcec94d5ce7e02d3bc755..82c648f7d83623f0a4a663f914d9f9041a4695a4 100644
(file)
--- a/
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java
+++ b/
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java
@@
-194,7
+194,7
@@
public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder im
@Override
public void addTypedef(final TypeDefinitionBuilder typedefBuilder) {
@Override
public void addTypedef(final TypeDefinitionBuilder typedefBuilder) {
- throw new YangParseException(
moduleName, line
, "Can not add type definition to choice case.");
+ throw new YangParseException(
getModuleName(), typedefBuilder.getLine()
, "Can not add type definition to choice case.");
}
@Override
}
@Override
@@
-204,7
+204,7
@@
public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder im
@Override
public void setConfiguration(final boolean configuration) {
@Override
public void setConfiguration(final boolean configuration) {
- throw new YangParseException(
moduleName, line
, "Can not add config statement to choice case.");
+ throw new YangParseException(
getModuleName(), getLine()
, "Can not add config statement to choice case.");
}
@Override
}
@Override
@@
-244,11
+244,11
@@
public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder im
} else if (!schemaPath.equals(other.schemaPath)) {
return false;
}
} else if (!schemaPath.equals(other.schemaPath)) {
return false;
}
- if (
parentBuilder
== null) {
- if (other.
parentBuilder
!= null) {
+ if (
getParent()
== null) {
+ if (other.
getParent()
!= null) {
return false;
}
return false;
}
- } else if (!
parentBuilder.equals(other.parentBuilder
)) {
+ } else if (!
getParent().equals(other.getParent()
)) {
return false;
}
return true;
return false;
}
return true;