Author: yonik
Date: Thu Jul 27 10:47:18 2006
New Revision: 426165
URL: http://svn.apache.org/viewvc?rev=426165&view=rev
Log:
don't indent single element maps and arrays
Modified:
incubator/solr/trunk/src/java/org/apache/solr/request/JSONResponseWriter.java
Modified:
incubator/solr/trunk/src/java/org/apache/solr/request/JSONResponseWriter.java
URL:
http://svn.apache.org/viewvc/incubator/solr/trunk/src/java/org/apache/solr/request/JSONResponseWriter.java?rev=426165&r1=426164&r2=426165&view=diff
==============================================================================
---
incubator/solr/trunk/src/java/org/apache/solr/request/JSONResponseWriter.java
(original)
+++
incubator/solr/trunk/src/java/org/apache/solr/request/JSONResponseWriter.java
Thu Jul 27 10:47:18 2006
@@ -417,6 +417,8 @@
isFirstVal=true;
}
+ boolean doIndent = excludeOuter || val.size() > 1;
+
for (Map.Entry entry : (Set<Map.Entry>)val.entrySet()) {
Object e = entry.getKey();
String k = e==null ? null : e.toString();
@@ -428,7 +430,7 @@
writer.write(',');
}
- indent();
+ if (doIndent) indent();
writeKey(k,true);
writeVal(k,v);
}
@@ -455,7 +457,7 @@
} else {
writer.write(',');
}
- if (sz>0) indent();
+ if (sz>1) indent();
writeVal(null, o);
}
decLevel();