Skip to content

Commit 338c36f

Browse files
committed
GH-53 Re-enabled configuring max number of results in OQL console using a system property, contd.
- fixed <no results> message - fixed HTML - fixed I18N
1 parent 153c2b1 commit 338c36f

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/oql/OQLConsoleView.java

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,11 @@
125125
"OQLConsoleView_ObjectsTooltip=Objects",
126126
"OQLConsoleView_HTMLTooltip=Results:",
127127
"OQLConsoleView_Details=Details:",
128-
"OQLConsoleView_EngineNotAvailable=<OQL engine not available>"
128+
"OQLConsoleView_EngineNotAvailable=<OQL engine not available>",
129+
"OQLConsoleView_NoResults2=no results",
130+
"OQLConsoleView_TooManyResults=too many results",
131+
"OQLConsoleView_QueryError=Query error",
132+
"OQLConsoleView_BadQuery=Bad OQL query"
129133

130134
})
131135
public class OQLConsoleView extends HeapViewerFeature {
@@ -583,11 +587,11 @@ public boolean visit(Object o) {
583587

584588
if (counter.get() == 0) {
585589
sb.append("<tr><td>"); // NOI18N
586-
sb.append("&lt;too many results&gt"); // NOI18N
590+
sb.append("&lt;" + Bundle.OQLConsoleView_TooManyResults() + "&gt;"); // NOI18N
587591
sb.append("</td></tr>"); // NOI18N
588-
} else if (counter.get() == 100) {
592+
} else if (counter.get() == RESULTS_LIMIT) {
589593
sb.append("<tr><td>"); // NOI18N
590-
sb.append("&lt;no results&gt"); // NOI18N
594+
sb.append("&lt;" + Bundle.OQLConsoleView_NoResults2() + "&gt;"); // NOI18N
591595
sb.append("</td></tr>" ); // NOI18N
592596
}
593597

@@ -596,10 +600,10 @@ public boolean visit(Object o) {
596600
finalizeQuery(sb.toString());
597601
} catch (OQLException oQLException) {
598602
StringBuilder errorMessage = new StringBuilder();
599-
errorMessage.append("<h2>").append("Query error").append("</h2>"); // NOI18N
600-
errorMessage.append("Bad OQL query"); // NOI18N
601-
errorMessage.append("<hr>"); // noi18n
602-
errorMessage.append(oQLException.getLocalizedMessage().replace("\n", "<br>").replace("\r", "<br>"));
603+
errorMessage.append("<h2>").append(Bundle.OQLConsoleView_QueryError()).append("</h2>"); // NOI18N
604+
errorMessage.append(Bundle.OQLConsoleView_BadQuery()); // NOI18N
605+
errorMessage.append("<hr>"); // NOI18N
606+
errorMessage.append(oQLException.getLocalizedMessage().replace("\n", "<br>").replace("\r", "<br>")); // NOI18N
603607

604608
finalizeQuery(errorMessage.toString());
605609
}

0 commit comments

Comments
 (0)