X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fsal%2Fyang-prototype%2Fcode-generator%2Fbinding-java-api-generator%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fjava%2Fapi%2Fgenerator%2FInterfaceGenerator.java;h=fe0b24f890711969f4a6c446597919101caa2581;hp=16d63efe1b527fe48d7da11cb468ab4bda54da7d;hb=c9006d027a5c5b639e57aa7b8484ec1ff3497dc8;hpb=a84e3c483f492477ace9f6da6908754cb257c225;ds=sidebyside

diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/InterfaceGenerator.java b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/InterfaceGenerator.java
index 16d63efe1b..fe0b24f890 100644
--- a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/InterfaceGenerator.java
+++ b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/InterfaceGenerator.java
@@ -12,97 +12,81 @@ import static org.opendaylight.controller.sal.java.api.generator.Constants.*;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.opendaylight.controller.sal.binding.model.api.CodeGenerator;
-import org.opendaylight.controller.sal.binding.model.api.Constant;
-import org.opendaylight.controller.sal.binding.model.api.Enumeration;
-import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject;
-import org.opendaylight.controller.sal.binding.model.api.GeneratedType;
-import org.opendaylight.controller.sal.binding.model.api.MethodSignature;
-import org.opendaylight.controller.sal.binding.model.api.Type;
+import org.opendaylight.controller.sal.binding.model.api.*;
 
 public final class InterfaceGenerator implements CodeGenerator {
 
-	private Map<String, LinkedHashMap<String, Integer>> imports;
+    private Map<String, String> imports;
 
-	private String generateEnums(List<Enumeration> enums) {
-		String result = "";
-		if (enums != null) {
-			EnumGenerator enumGenerator = new EnumGenerator();
-			for (Enumeration en : enums) {
-				try {
-					result = result
-							+ (enumGenerator.generateInnerEnumeration(en, TAB).toString() + NL);
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-		return result;
-	}
+    private String generateEnums(List<Enumeration> enums) {
+        String result = "";
+        if (enums != null) {
+            EnumGenerator enumGenerator = new EnumGenerator();
+            for (Enumeration en : enums) {
+                try {
+                    result = result + (enumGenerator.generateInnerEnumeration(en, TAB).toString() + NL);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return result;
+    }
 
-	private String generateConstants(List<Constant> constants, String pkgName) {
-		String result = "";
-		if (constants != null) {
-			for (Constant c : constants) {
-				result = result
-						+ GeneratorUtil
-								.createConstant(c, TAB, imports, pkgName) + NL;
-			}
-			result.concat(NL);
-		}
-		return result;
-	}
+    private String generateConstants(List<Constant> constants, String pkgName) {
+        String result = "";
+        if (constants != null) {
+            for (Constant c : constants) {
+                result = result + GeneratorUtil.createConstant(c, TAB, imports, pkgName) + NL;
+            }
+            result.concat(NL);
+        }
+        return result;
+    }
 
-	public String generateMethods(List<MethodSignature> methods, String pkgName) {
-		String result = "";
+    public String generateMethods(List<MethodSignature> methods, String pkgName) {
+        String result = "";
 
-		if (methods != null) {
-			for (MethodSignature m : methods) {
-				result = result
-						+ GeneratorUtil.createMethodDeclaration(m, TAB,
-								imports, pkgName) + NL;
-			}
-			result = result + NL;
-		}
-		return result;
-	}
+        if (methods != null) {
+            for (MethodSignature m : methods) {
+                result = result + GeneratorUtil.createMethodDeclaration(m, TAB, imports, pkgName) + NL;
+            }
+            result = result + NL;
+        }
+        return result;
+    }
 
-	public Writer generate(Type type) throws IOException {
-		Writer writer = new StringWriter();
-		if (type instanceof GeneratedType
-				&& !(type instanceof GeneratedTransferObject)) {
-			GeneratedType genType = (GeneratedType) type;
-			imports = GeneratorUtil.createImports(genType);
+    public Writer generate(Type type) throws IOException {
+        Writer writer = new StringWriter();
+        if (type instanceof GeneratedType && !(type instanceof GeneratedTransferObject)) {
+            final GeneratedType genType = (GeneratedType) type;
+            imports = GeneratorUtil.createImports(genType);
 
-			final String currentPkg = genType.getPackageName();
-			final List<Constant> constants = genType.getConstantDefinitions();
-			final List<MethodSignature> methods = genType
-					.getMethodDefinitions();
-			final List<Enumeration> enums = genType.getEnumerations();
+            final String currentPkg = genType.getPackageName();
+            final List<Constant> constants = genType.getConstantDefinitions();
+            final List<MethodSignature> methods = genType.getMethodDefinitions();
+            final List<Enumeration> enums = genType.getEnumerations();
 
-			writer.write(GeneratorUtil.createPackageDeclaration(genType
-					.getPackageName()));
-			writer.write(NL);
+            writer.write(GeneratorUtil.createPackageDeclaration(genType.getPackageName()));
+            writer.write(NL);
 
-			List<String> importLines = GeneratorUtil.createImportLines(imports);
-			for (String line : importLines) {
-				writer.write(line + NL);
-			}
-			writer.write(NL);
-			writer.write(GeneratorUtil.createIfcDeclaration(genType, "",
-					imports));
-			writer.write(NL);
+            final List<String> importLines = GeneratorUtil.createImportLines(imports);
+            for (String line : importLines) {
+                writer.write(line + NL);
+            }
+            writer.write(NL);
+            writer.write(GeneratorUtil.createIfcDeclaration(genType, "", imports));
+            writer.write(NL);
 
-			writer.write(generateEnums(enums));
-			writer.write(generateConstants(constants, currentPkg));
-			writer.write(generateMethods(methods, currentPkg));
+            writer.write(generateEnums(enums));
+            writer.write(generateConstants(constants, currentPkg));
+            writer.write(generateMethods(methods, currentPkg));
 
-			writer.write(RCB);
-		}
-		return writer;
-	}
+            writer.write(RCB);
+        }
+        return writer;
+    }
 }