Utilities::getRowCount -> LineDocumentUtils::getLineCount

mbien · mbien · commit b4204ec9a348 · 2025-12-02T19:53:11.000+01:00
diff --git a/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/EmbeddedSectionsHighlighting.java b/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/EmbeddedSectionsHighlighting.java
@@ -37,7 +37,6 @@
 import org.netbeans.api.lexer.TokenHierarchyListener;
 import org.netbeans.api.lexer.TokenSequence;
 import org.netbeans.editor.BaseDocument;
-import org.netbeans.editor.Utilities;
 import org.netbeans.lib.editor.util.swing.DocumentUtilities;
 import org.netbeans.spi.editor.highlighting.HighlightsLayer;
 import org.netbeans.spi.editor.highlighting.HighlightsLayerFactory;
@@ -200,7 +199,7 @@ public boolean moveNext() {
                                     }
 
                                     // adjust the sections end to the end of the last line
-                                    int lines = Utilities.getRowCount((BaseDocument) document);
+                                    int lines = LineDocumentUtils.getLineCount((BaseDocument) document);
                                     int lastLineEndOffset;
                                     if (endLine + 1 < lines) {
                                         lastLineEndOffset = LineDocumentUtils.getLineStartFromIndex((BaseDocument) document, endLine + 1);
diff --git a/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/embedding/EmbeddedSectionsHighlighting.java b/groovy/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/embedding/EmbeddedSectionsHighlighting.java
@@ -36,7 +36,6 @@
 import org.netbeans.api.lexer.TokenHierarchyListener;
 import org.netbeans.api.lexer.TokenSequence;
 import org.netbeans.editor.BaseDocument;
-import org.netbeans.editor.Utilities;
 import org.netbeans.lib.editor.util.swing.DocumentUtilities;
 import org.netbeans.modules.groovy.gsp.lexer.GspLexerLanguage;
 import org.netbeans.modules.groovy.gsp.lexer.GspTokenId;
@@ -188,7 +187,7 @@ public boolean moveNext() {
                                     }
 
                                     // adjust the sections end to the end of the last line
-                                    int lines = Utilities.getRowCount((BaseDocument) document);
+                                    int lines = LineDocumentUtils.getLineCount((BaseDocument) document);
                                     int lastLineEndOffset;
                                     if (endLine + 1 < lines) {
                                         lastLineEndOffset = LineDocumentUtils.getLineStartFromIndex((BaseDocument) document, endLine + 1);
diff --git a/ide/diff/src/org/netbeans/modules/diff/builtin/visualizer/editable/LineNumbersActionsBar.java b/ide/diff/src/org/netbeans/modules/diff/builtin/visualizer/editable/LineNumbersActionsBar.java
@@ -404,7 +404,7 @@ protected void paintComponent(Graphics gr) {
                 int yOffset;
                 int localLineHeight = rec.height;
                 int linesDrawn = clip.height / localLineHeight + 4;  // draw past clipping rectangle to avoid partially drawn numbers
-                int docLines = Utilities.getRowCount((BaseDocument) master.getEditorPane().getDocument());
+                int docLines = LineDocumentUtils.getLineCount((BaseDocument) master.getEditorPane().getDocument());
                 if (lineNumber + linesDrawn > docLines) {
                     linesDrawn = docLines - lineNumber;
                 }
diff --git a/ide/editor.deprecated.pre65formatting/src/org/netbeans/editor/Formatter.java b/ide/editor.deprecated.pre65formatting/src/org/netbeans/editor/Formatter.java
@@ -499,7 +499,7 @@ public void run () {
                             endPos - 1 : endPos;
 
                         int pos = LineDocumentUtils.getLineStartOffset(doc, startPos );
-                        for (int lineCnt = Utilities.getRowCount(doc, startPos, end);
+                        for (int lineCnt = LineDocumentUtils.getLineCount(doc, startPos, end);
                                 lineCnt > 0; lineCnt--
                             ) {
                             int indent = Utilities.getRowIndent(doc, pos);
diff --git a/ide/editor.errorstripe/src/org/netbeans/modules/editor/errorstripe/AnnotationView.java b/ide/editor.errorstripe/src/org/netbeans/modules/editor/errorstripe/AnnotationView.java
@@ -59,7 +59,6 @@
 
 import org.netbeans.editor.BaseDocument;
 import org.netbeans.editor.BaseTextUI;
-import org.netbeans.editor.Utilities;
 import org.netbeans.lib.editor.util.StringEscapeUtils;
 import org.netbeans.modules.editor.errorstripe.caret.CaretMark;
 import org.netbeans.modules.editor.errorstripe.privatespi.Mark;
@@ -184,7 +183,7 @@ private synchronized void updateForNewDocument() {
             while (position == _modelToView(startLine - 1, componentHeight, usableHeight) && startLine > 0)
                 startLine--;
 
-            while ((endLine + 1) < Utilities.getRowCount(doc) && position == _modelToView(endLine + 1, componentHeight, usableHeight))
+            while ((endLine + 1) < LineDocumentUtils.getLineCount(doc) && position == _modelToView(endLine + 1, componentHeight, usableHeight))
                 endLine++;
 
             return new int[] {startLine, endLine};
@@ -474,7 +473,7 @@ public void run() {
     }
     
     private void documentChange() {
-        fullRepaint(lines != Utilities.getRowCount(doc));
+        fullRepaint(lines != LineDocumentUtils.getLineCount(doc));
     }
     
     private double getComponentHeight() {
@@ -550,11 +549,11 @@ private int getYFromPos(int offset) throws BadLocationException {
     }
     
     private synchronized int getModelToViewImpl(int line) throws BadLocationException {
-        int docLines = Utilities.getRowCount(doc);
+        int docLines = LineDocumentUtils.getLineCount(doc);
         
         if (modelToViewCache == null || height != pane.getHeight() || lines != docLines) {
-            modelToViewCache = new int[Utilities.getRowCount(doc) + 2];
-            lines = Utilities.getRowCount(doc);
+            modelToViewCache = new int[LineDocumentUtils.getLineCount(doc) + 2];
+            lines = LineDocumentUtils.getLineCount(doc);
             height = pane.getHeight();
         }
         
diff --git a/ide/editor.errorstripe/test/unit/src/org/netbeans/modules/editor/errorstripe/AnnotationViewTest.java b/ide/editor.errorstripe/test/unit/src/org/netbeans/modules/editor/errorstripe/AnnotationViewTest.java
@@ -30,7 +30,6 @@
 import org.netbeans.api.editor.document.LineDocumentUtils;
 import org.netbeans.editor.BaseDocument;
 import org.netbeans.editor.BaseKit;
-import org.netbeans.editor.Utilities;
 import org.netbeans.junit.NbTestCase;
 import org.netbeans.modules.editor.errorstripe.caret.CaretMarkProviderCreator;
 import org.netbeans.modules.editor.errorstripe.privatespi.Mark;
@@ -121,7 +120,7 @@ public void testGetLinesSpanIsContinuous() throws Exception {
         performTest(new Action() {
             public void test(AnnotationView aView, BaseDocument document) throws Exception {
                 int startLine = 1;
-                int linesCount = Utilities.getRowCount(document);
+                int linesCount = LineDocumentUtils.getLineCount(document);
                 
                 while (startLine < linesCount) {
                     int[] span = aView.getLinesSpan(startLine);
diff --git a/ide/editor.lib/src/org/netbeans/editor/BaseKit.java b/ide/editor.lib/src/org/netbeans/editor/BaseKit.java
@@ -4314,7 +4314,7 @@ public void run () {
                         endPos - 1 : endPos;
 
                     int lineStartOffset = LineDocumentUtils.getLineStartOffset(doc, startPos );
-                    int lineCount = Utilities.getRowCount(doc, startPos, end);
+                    int lineCount = LineDocumentUtils.getLineCount(doc, startPos, end);
                     Integer delta = null;
                     for (int i = lineCount - 1; i >= 0; i--) {
                         int indent = Utilities.getRowIndent(doc, lineStartOffset);
@@ -4379,7 +4379,7 @@ public void run () {
                         endPos - 1 : endPos;
 
                     int lineStartOffset = LineDocumentUtils.getLineStartOffset(doc, startPos );
-                    int lineCount = Utilities.getRowCount(doc, startPos, end);
+                    int lineCount = LineDocumentUtils.getLineCount(doc, startPos, end);
                     for (int i = lineCount - 1; i >= 0; i--) {
                         int indent = Utilities.getRowIndent(doc, lineStartOffset);
                         int newIndent = (indent == -1) ? 0 : // Zero indent if row is white
diff --git a/ide/editor.lib/src/org/netbeans/editor/ext/ExtKit.java b/ide/editor.lib/src/org/netbeans/editor/ext/ExtKit.java
@@ -917,7 +917,7 @@ public void run () {
                                         endPos = LineDocumentUtils.getLineEndOffset(doc, caretInfo.getDot());
                                     }
 
-                                    int lineCount = Utilities.getRowCount(doc, startPos, endPos);
+                                    int lineCount = LineDocumentUtils.getLineCount(doc, startPos, endPos);
                                     boolean comment = forceComment != null ? forceComment : !allComments(doc, startPos, lineCount);
 
                                     if (comment) {
@@ -951,7 +951,7 @@ public void run () {
                                     endPos = LineDocumentUtils.getLineEndOffset(doc, caret.getDot());
                                 }
 
-                                int lineCount = Utilities.getRowCount(doc, startPos, endPos);
+                                int lineCount = LineDocumentUtils.getLineCount(doc, startPos, endPos);
                                 boolean comment = forceComment != null ? forceComment : !allComments(doc, startPos, lineCount);
 
                                 if (comment) {
diff --git a/ide/editor.lib/src/org/netbeans/editor/ext/GotoDialogSupport.java b/ide/editor.lib/src/org/netbeans/editor/ext/GotoDialogSupport.java
@@ -207,7 +207,7 @@ protected boolean performGoto() {
                 
                 BaseDocument doc = Utilities.getDocument(c);
                 if (doc != null) {
-                    int rowCount = Utilities.getRowCount(doc);
+                    int rowCount = LineDocumentUtils.getLineCount(doc);
                     if (line > rowCount)
                         line = rowCount;
                     
diff --git a/ide/languages/src/org/netbeans/modules/languages/features/CodeCommentAction.java b/ide/languages/src/org/netbeans/modules/languages/features/CodeCommentAction.java
@@ -71,7 +71,7 @@ public void run () {
                         try {
                             int end = (endPos > 0 && LineDocumentUtils.getLineStartOffset(doc, endPos) == endPos) ?
                                 endPos-1 : endPos;
-                            int lineCnt = Utilities.getRowCount(doc, startPos, end);
+                            int lineCnt = LineDocumentUtils.getLineCount(doc, startPos, end);
                             List<String> mimeTypes = new ArrayList<>(lineCnt);
                             int pos = startPos;
                             for (int x = lineCnt ; x > 0; x--) {
diff --git a/ide/languages/src/org/netbeans/modules/languages/features/CodeUncommentAction.java b/ide/languages/src/org/netbeans/modules/languages/features/CodeUncommentAction.java
@@ -71,7 +71,7 @@ public void run () {
                         try {
                             int end = (endPos > 0 && LineDocumentUtils.getLineStartOffset(doc, endPos) == endPos) ?
                                 endPos - 1 : endPos;
-                            int lineCnt = Utilities.getRowCount(doc, startPos, end);
+                            int lineCnt = LineDocumentUtils.getLineCount(doc, startPos, end);
                             List<String> mimeTypes = new ArrayList<>(lineCnt);
                             int pos = startPos;
                             for (int x = lineCnt ; x > 0; x--) {
diff --git a/ide/languages/src/org/netbeans/modules/languages/features/ToggleCommentAction.java b/ide/languages/src/org/netbeans/modules/languages/features/ToggleCommentAction.java
@@ -72,7 +72,7 @@ public void run () {
                             if (endPos > 0 && LineDocumentUtils.getLineStartOffset(doc, endPos) == endPos) {
                                 endPos--;
                             }
-                            int lineCnt = Utilities.getRowCount(doc, startPos, endPos);
+                            int lineCnt = LineDocumentUtils.getLineCount(doc, startPos, endPos);
                             List<String> mimeTypes = new ArrayList<>(lineCnt);
                             int pos = startPos;
                             boolean commented = isCommented;
diff --git a/ide/xml.text/src/org/netbeans/modules/xml/text/syntax/XMLKit.java b/ide/xml.text/src/org/netbeans/modules/xml/text/syntax/XMLKit.java
@@ -207,7 +207,7 @@ public void actionPerformed(ActionEvent evt, JTextComponent target) {
                         }
 
                         int pos = startPos;
-                        int lineCnt = Utilities.getRowCount(doc, startPos, endPos);                            
+                        int lineCnt = LineDocumentUtils.getLineCount(doc, startPos, endPos);                            
 
                         for (;lineCnt > 0; lineCnt--) {
                             doc.insertString(pos, commentStartString, null); 
@@ -267,7 +267,7 @@ public void actionPerformed(ActionEvent evt, JTextComponent target) {
                         }
 
                         int pos = startPos;
-                        int lineCnt = Utilities.getRowCount(doc, startPos, endPos);
+                        int lineCnt = LineDocumentUtils.getLineCount(doc, startPos, endPos);
                         char[] startChars, endChars;
 
                         for (; lineCnt > 0; lineCnt-- ) {

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ protected void paintComponent(Graphics gr) {`
`404`	`404`	`int yOffset;`
`405`	`405`	`int localLineHeight = rec.height;`
`406`	`406`	`int linesDrawn = clip.height / localLineHeight + 4; // draw past clipping rectangle to avoid partially drawn numbers`
`407`		`- int docLines = Utilities.getRowCount((BaseDocument) master.getEditorPane().getDocument());`
	`407`	`+ int docLines = LineDocumentUtils.getLineCount((BaseDocument) master.getEditorPane().getDocument());`
`408`	`408`	`if (lineNumber + linesDrawn > docLines) {`
`409`	`409`	`linesDrawn = docLines - lineNumber;`
`410`	`410`	`}`
Original file line number	Diff line number	Diff line change
`@@ -917,7 +917,7 @@ public void run () {`
`917`	`917`	`endPos = LineDocumentUtils.getLineEndOffset(doc, caretInfo.getDot());`
`918`	`918`	`}`
`919`	`919`
`920`		`- int lineCount = Utilities.getRowCount(doc, startPos, endPos);`
	`920`	`+ int lineCount = LineDocumentUtils.getLineCount(doc, startPos, endPos);`
`921`	`921`	`boolean comment = forceComment != null ? forceComment : !allComments(doc, startPos, lineCount);`
`922`	`922`
`923`	`923`	`if (comment) {`
`@@ -951,7 +951,7 @@ public void run () {`
`951`	`951`	`endPos = LineDocumentUtils.getLineEndOffset(doc, caret.getDot());`
`952`	`952`	`}`
`953`	`953`
`954`		`- int lineCount = Utilities.getRowCount(doc, startPos, endPos);`
	`954`	`+ int lineCount = LineDocumentUtils.getLineCount(doc, startPos, endPos);`
`955`	`955`	`boolean comment = forceComment != null ? forceComment : !allComments(doc, startPos, lineCount);`
`956`	`956`
`957`	`957`	`if (comment) {`