Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixed implementation of TypeProviderImpl for Leafref resolving.
[controller.git]
/
opendaylight
/
sal
/
yang-prototype
/
code-generator
/
yang-model-parser-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
yang
/
model
/
parser
/
impl
/
YangModelParserListenerImpl.java
diff --git
a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/impl/YangModelParserListenerImpl.java
b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/impl/YangModelParserListenerImpl.java
index 6d51868d98be3e025976c2f46366a1a882a8d5c4..6675b8068d6a892d231a02bc4fbd59479f564b36 100644
(file)
--- a/
opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/impl/YangModelParserListenerImpl.java
+++ b/
opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/impl/YangModelParserListenerImpl.java
@@
-13,6
+13,7
@@
import java.net.URI;
import java.text.DateFormat;
\r
import java.text.ParseException;
\r
import java.text.SimpleDateFormat;
\r
import java.text.DateFormat;
\r
import java.text.ParseException;
\r
import java.text.SimpleDateFormat;
\r
+import java.util.ArrayList;
\r
import java.util.Collections;
\r
import java.util.Date;
\r
import java.util.List;
\r
import java.util.Collections;
\r
import java.util.Date;
\r
import java.util.List;
\r
@@
-82,7
+83,7
@@
final class YangModelParserListenerImpl extends YangParserBaseListener {
private String yangModelPrefix;
\r
private Date revision = new Date(0L);
\r
\r
private String yangModelPrefix;
\r
private Date revision = new Date(0L);
\r
\r
-
private final
DateFormat simpleDateFormat = new SimpleDateFormat(
\r
+
final static
DateFormat simpleDateFormat = new SimpleDateFormat(
\r
"yyyy-mm-dd");
\r
private final Stack<String> actualPath = new Stack<String>();
\r
\r
"yyyy-mm-dd");
\r
private final Stack<String> actualPath = new Stack<String>();
\r
\r
@@
-321,7
+322,9
@@
final class YangModelParserListenerImpl extends YangParserBaseListener {
if ("union".equals(typeName)) {
\r
moduleBuilder.addUnionType(getActualPath());
\r
} else {
\r
if ("union".equals(typeName)) {
\r
moduleBuilder.addUnionType(getActualPath());
\r
} else {
\r
- type = parseTypeBody(typeName, typeBody, getActualPath(),
\r
+ List<String> typePath = new ArrayList<String>(actualPath);
\r
+ typePath.remove(0);
\r
+ type = parseTypeBody(typeName, typeBody, typePath,
\r
namespace, revision, yangModelPrefix);
\r
moduleBuilder.setType(type, getActualPath());
\r
}
\r
namespace, revision, yangModelPrefix);
\r
moduleBuilder.setType(type, getActualPath());
\r
}
\r