You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cc...@apache.org on 2009/10/25 00:44:49 UTC
svn commit: r829462 -
/felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/GrepAction.java
Author: ccustine
Date: Sat Oct 24 22:44:49 2009
New Revision: 829462
URL: http://svn.apache.org/viewvc?rev=829462&view=rev
Log:
FELIX-1802 - Grep command line prefix (-n) not working properly
Modified:
felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/GrepAction.java
Modified: felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/GrepAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/GrepAction.java?rev=829462&r1=829461&r2=829462&view=diff
==============================================================================
--- felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/GrepAction.java (original)
+++ felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/GrepAction.java Sat Oct 24 22:44:49 2009
@@ -119,10 +119,6 @@
while ((line = readLine(r)) != null) {
if (p.matcher(line).matches() ^ invertMatch) {
- if (!count && lineNumber) {
- System.out.print(String.format("%6d ", lineno++));
- }
-
Matcher matcher2 = p2.matcher(line);
StringBuffer sb = new StringBuffer();
while (matcher2.find()) {
@@ -138,9 +134,12 @@
nb++;
}
matcher2.appendTail(sb);
- lines.add(sb.toString());
+ if (!count && lineNumber) {
+ lines.add(String.format("%6d ", lineno) + sb.toString());
+ } else {
+ lines.add(sb.toString());
+ }
lineMatch = lines.size();
- lineno++;
} else {
if (lineMatch != 0 & lineMatch + after + before <= lines.size()) {
if (!count) {
@@ -163,6 +162,7 @@
lines.remove(0);
}
}
+ lineno++;
}
if (!count && lineMatch > 0) {
if (!firstPrint && before + after > 0) {