Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Package names for enclosed Types of TOs were changed to fully qualified. Fully...
[controller.git]
/
opendaylight
/
sal
/
yang-prototype
/
code-generator
/
yang-model-parser-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
yang
/
parser
/
builder
/
impl
/
AugmentationSchemaBuilderImpl.java
diff --git
a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java
b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java
index 7fcee2ef52aff579ce707673d31c8c34171482bc..cdb751f81bed1a703a60991d1fb16693bc4b2d11 100644
(file)
--- a/
opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java
+++ b/
opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java
@@
-52,11
+52,10
@@
public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain
private SchemaPath finalAugmentTarget;
private final Set<UsesNodeBuilder> usesNodes = new HashSet<UsesNodeBuilder>();
private SchemaPath finalAugmentTarget;
private final Set<UsesNodeBuilder> usesNodes = new HashSet<UsesNodeBuilder>();
- private final List<UnknownSchemaNodeBuilder> addedUnknownNodes = new ArrayList<UnknownSchemaNodeBuilder>();
private boolean resolved;
private boolean resolved;
- AugmentationSchemaBuilderImpl(final int line, final String augmentTargetStr) {
- super(line, null);
+ AugmentationSchemaBuilderImpl(final
String moduleName, final
int line, final String augmentTargetStr) {
+ super(
moduleName,
line, null);
this.augmentTargetStr = augmentTargetStr;
final SchemaPath targetPath = ParserListenerUtils.parseAugmentPath(augmentTargetStr);
dirtyAugmentTarget = targetPath;
this.augmentTargetStr = augmentTargetStr;
final SchemaPath targetPath = ParserListenerUtils.parseAugmentPath(augmentTargetStr);
dirtyAugmentTarget = targetPath;
@@
-75,7
+74,7
@@
public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain
@Override
public void addGrouping(GroupingBuilder grouping) {
@Override
public void addGrouping(GroupingBuilder grouping) {
- throw new YangParseException(line, "augment can not contains grouping statement");
+ throw new YangParseException(
moduleName,
line, "augment can not contains grouping statement");
}
@Override
}
@Override
@@
-159,7
+158,7
@@
public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain
@Override
public void addTypedef(TypeDefinitionBuilder type) {
@Override
public void addTypedef(TypeDefinitionBuilder type) {
- throw new YangParseException(line, "Augmentation can not contains typedef statement.");
+ throw new YangParseException(
moduleName,
line, "Augmentation can not contains typedef statement.");
}
@Override
}
@Override
@@
-194,15
+193,6
@@
public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain
return augmentTargetStr;
}
return augmentTargetStr;
}
- public List<UnknownSchemaNodeBuilder> getUnknownNodes() {
- return addedUnknownNodes;
- }
-
- @Override
- public void addUnknownSchemaNode(UnknownSchemaNodeBuilder unknownNode) {
- addedUnknownNodes.add(unknownNode);
- }
-
@Override
public int hashCode() {
final int prime = 17;
@Override
public int hashCode() {
final int prime = 17;