Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Added line number to error messages.
[controller.git]
/
opendaylight
/
sal
/
yang-prototype
/
code-generator
/
yang-model-parser-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
yang
/
model
/
parser
/
builder
/
impl
/
DeviationBuilder.java
diff --git
a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/builder/impl/DeviationBuilder.java
b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/builder/impl/DeviationBuilder.java
index 6e1bb6424e0eb5cf6141779fb7d686f2d4a9df2e..53fcbf5fd2377d64f4434ff8ae733924d32fefc9 100644
(file)
--- a/
opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/builder/impl/DeviationBuilder.java
+++ b/
opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/builder/impl/DeviationBuilder.java
@@
-14,11
+14,12
@@
import org.opendaylight.controller.yang.model.parser.builder.api.Builder;
import org.opendaylight.controller.yang.model.parser.util.YangModelBuilderUtil;
public class DeviationBuilder implements Builder {
import org.opendaylight.controller.yang.model.parser.util.YangModelBuilderUtil;
public class DeviationBuilder implements Builder {
-
private final DeviationImpl instance;
private final DeviationImpl instance;
+ private final int line;
- DeviationBuilder(String targetPathStr) {
- SchemaPath targetPath = YangModelBuilderUtil
+ DeviationBuilder(final String targetPathStr, final int line) {
+ this.line = line;
+ final SchemaPath targetPath = YangModelBuilderUtil
.parseAugmentPath(targetPathStr);
instance = new DeviationImpl(targetPath);
}
.parseAugmentPath(targetPathStr);
instance = new DeviationImpl(targetPath);
}
@@
-28,14
+29,19
@@
public class DeviationBuilder implements Builder {
return instance;
}
return instance;
}
- public void setDeviate(String deviate) {
- if (deviate.equals("not-supported")) {
+ @Override
+ public int getLine() {
+ return line;
+ }
+
+ public void setDeviate(final String deviate) {
+ if ("not-supported".equals(deviate)) {
instance.setDeviate(Deviate.NOT_SUPPORTED);
instance.setDeviate(Deviate.NOT_SUPPORTED);
- } else if (
deviate.equals("add"
)) {
+ } else if (
"add".equals(deviate
)) {
instance.setDeviate(Deviate.ADD);
instance.setDeviate(Deviate.ADD);
- } else if (
deviate.equals("replace"
)) {
+ } else if (
"replace".equals(deviate
)) {
instance.setDeviate(Deviate.REPLACE);
instance.setDeviate(Deviate.REPLACE);
- } else if (
deviate.equals("delete"
)) {
+ } else if (
"delete".equals(deviate
)) {
instance.setDeviate(Deviate.DELETE);
} else {
throw new IllegalArgumentException(
instance.setDeviate(Deviate.DELETE);
} else {
throw new IllegalArgumentException(
@@
-43,17
+49,16
@@
public class DeviationBuilder implements Builder {
}
}
}
}
- public void setReference(String reference) {
+ public void setReference(
final
String reference) {
instance.setReference(reference);
}
private static class DeviationImpl implements Deviation {
instance.setReference(reference);
}
private static class DeviationImpl implements Deviation {
-
- private SchemaPath targetPath;
+ private final SchemaPath targetPath;
private Deviate deviate;
private String reference;
private Deviate deviate;
private String reference;
- private DeviationImpl(SchemaPath targetPath) {
+ private DeviationImpl(
final
SchemaPath targetPath) {
this.targetPath = targetPath;
}
this.targetPath = targetPath;
}
@@
-67,7
+72,7
@@
public class DeviationBuilder implements Builder {
return deviate;
}
return deviate;
}
- private void setDeviate(Deviate deviate) {
+ private void setDeviate(
final
Deviate deviate) {
this.deviate = deviate;
}
this.deviate = deviate;
}
@@
-76,7
+81,7
@@
public class DeviationBuilder implements Builder {
return reference;
}
return reference;
}
- private void setReference(String reference) {
+ private void setReference(
final
String reference) {
this.reference = reference;
}
this.reference = reference;
}
@@
-131,11
+136,12
@@
public class DeviationBuilder implements Builder {
@Override
public String toString() {
@Override
public String toString() {
- StringBuilder sb = new StringBuilder(DeviationImpl.class.getSimpleName());
+ StringBuilder sb = new StringBuilder(
+ DeviationImpl.class.getSimpleName());
sb.append("[");
sb.append("[");
- sb.append("targetPath="+ targetPath);
- sb.append(", deviate="+ deviate);
- sb.append(", reference="+ reference);
+ sb.append("targetPath="
+ targetPath);
+ sb.append(", deviate="
+ deviate);
+ sb.append(", reference="
+ reference);
sb.append("]");
return sb.toString();
}
sb.append("]");
return sb.toString();
}