From 251e4bb19d9d23a5193f5b071c2e488259e4f017 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Fri, 1 Apr 2016 22:36:05 +0800
Subject: [PATCH] better code quality

---
 .../main/java/io/swagger/codegen/DefaultCodegen.java   | 10 +++-------
 .../SwaggerClientTest/SwaggerClientTest.userprefs      |  6 ++++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
index d9bf0c4b43f9..9cd719dbe87c 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -2220,10 +2220,9 @@ public class DefaultCodegen {
     }
 
     private void addVars(CodegenModel m, List<CodegenProperty> vars, Map<String, Property> properties, Set<String> mandatory) {
+        // convert set to list so that we can access the next entry in the loop
         List<Map.Entry<String, Property>> propertyList = new ArrayList<Map.Entry<String, Property>>(properties.entrySet());
         final int totalCount = propertyList.size();
-        //for (Iterator<Map.Entry<String, Property>> it = properties.entrySet().iterator(); it.hasNext(); ) {
-        //for (Map.Entry<String, Property> entry : properties.entrySet()) {
         for (int i = 0; i < totalCount; i++) {
             Map.Entry<String, Property> entry = propertyList.get(i);
             
@@ -2243,12 +2242,9 @@ public class DefaultCodegen {
 
                 if (i+1 != totalCount) {
                     cp.hasMore = true;
-                    // check the next entry
-                    //Map.Entry<String, Property> nextEntry = propertyList.get(i+1);
-                    //final Property nextProp = propertyList.get(i+1).getValue();
+                    // check the next entry to see if it's read only
                     if (!Boolean.TRUE.equals(propertyList.get(i+1).getValue().getReadOnly())) {
-                        cp.hasMoreNonReadOnly = true;
-                        LOGGER.info("set hasMoreNonReadONly to true");
+                        cp.hasMoreNonReadOnly = true; // next entry is not ready only
                     }
                 }
 
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
index cc1b6b0b56ad..d261de4844c4 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
@@ -1,9 +1,11 @@
 <Properties StartupItem="SwaggerClientTest.csproj">
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="TestPet.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Name.cs">
     <Files>
-      <File FileName="TestPet.cs" Line="30" Column="21" />
+      <File FileName="TestPet.cs" Line="1" Column="1" />
       <File FileName="TestOrder.cs" Line="1" Column="1" />
+      <File FileName="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Cat.cs" Line="1" Column="1" />
+      <File FileName="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Name.cs" Line="18" Column="50" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>