java_gen: adapt to of_g removal, new ir
diff --git a/java_gen/templates/of_factories.java b/java_gen/templates/of_factories.java
index f8c9a80..f9ec015 100644
--- a/java_gen/templates/of_factories.java
+++ b/java_gen/templates/of_factories.java
@@ -26,7 +26,6 @@
//:: # under the EPL.
//::
//:: import itertools
-//:: import of_g
//:: include('_copyright.java')
//:: include('_autogen.java')
@@ -43,13 +42,13 @@
switch(version) {
//:: for v in versions:
case ${v.constant_version}:
- return org.projectfloodlight.openflow.protocol.ver${v.of_version}.OFFactoryVer${v.of_version}.INSTANCE;
+ return org.projectfloodlight.openflow.protocol.ver${v.dotless_version}.OFFactoryVer${v.dotless_version}.INSTANCE;
//:: #endfor
default:
throw new IllegalArgumentException("Unknown version: "+version);
}
}
-
+
private static class GenericReader implements OFMessageReader<OFMessage> {
public OFMessage readFrom(ChannelBuffer bb) throws OFParseError {
short wireVersion = U8.f(bb.getByte(0));
@@ -57,7 +56,7 @@
switch (wireVersion) {
//:: for v in versions:
case ${v.int_version}:
- factory = org.projectfloodlight.openflow.protocol.ver${v.of_version}.OFFactoryVer${v.of_version}.INSTANCE;
+ factory = org.projectfloodlight.openflow.protocol.ver${v.dotless_version}.OFFactoryVer${v.dotless_version}.INSTANCE;
break;
//:: #endfor
default: