Skip to content

Commit 4f7118c

Browse files
author
rcartwright
committed
This commit makes RegionsTreePanel (e.g., FindResultsPanel) updating
slightly more efficient (in principle) and more robust. It also cleans up complications in some class interfaces due to our former read/write locking protocol on documents. The following files have been modified: M src/edu/rice/cs/drjava/model/definitions/indent/QuestionExistsCharInPrevStmt.java M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevStmtPlus.java M src/edu/rice/cs/drjava/model/definitions/indent/QuestionCurrLineStartsWithSkipComments.java M src/edu/rice/cs/drjava/model/definitions/indent/QuestionStartingNewStmt.java M src/edu/rice/cs/drjava/model/definitions/indent/QuestionPrevLineStartsJavaDocWithText.java M src/edu/rice/cs/drjava/model/definitions/indent/IndentRuleWithTrace.java M src/edu/rice/cs/drjava/model/definitions/indent/QuestionStartAfterOpenBrace.java M src/edu/rice/cs/drjava/model/definitions/indent/IndentRuleQuestion.java M src/edu/rice/cs/drjava/model/definitions/indent/QuestionExistsCharInStmt.java M src/edu/rice/cs/drjava/model/definitions/indent/QuestionNewParenPhrase.java M src/edu/rice/cs/drjava/model/definitions/indent/QuestionFollowedByStar.java M src/edu/rice/cs/drjava/model/definitions/ColoringGlyphPainter.java M src/edu/rice/cs/drjava/model/definitions/ColoringView.java M src/edu/rice/cs/drjava/model/definitions/DefinitionsDocumentTest.java M src/edu/rice/cs/drjava/model/definitions/DefinitionsDocument.java M src/edu/rice/cs/drjava/model/definitions/reducedmodel/SingleQuoteTest.java M src/edu/rice/cs/drjava/model/definitions/reducedmodel/Stutter.java M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelComment.java M src/edu/rice/cs/drjava/model/definitions/reducedmodel/AbstractReducedModel.java M src/edu/rice/cs/drjava/model/definitions/reducedmodel/BackSlashTest.java M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelControl.java M src/edu/rice/cs/drjava/model/definitions/reducedmodel/TokenList.java M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelDeleteTest.java M src/edu/rice/cs/drjava/model/definitions/reducedmodel/MixedQuoteTest.java M src/edu/rice/cs/drjava/model/definitions/reducedmodel/BraceReduction.java M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelTest.java M src/edu/rice/cs/drjava/model/definitions/IndentHelperTest.java M src/edu/rice/cs/drjava/model/MovingDocumentRegion.java M src/edu/rice/cs/drjava/model/RegionManager.java M src/edu/rice/cs/drjava/model/ConcreteRegionManager.java M src/edu/rice/cs/drjava/model/AbstractDJDocument.java M src/edu/rice/cs/drjava/model/DummyOpenDefDoc.java M src/edu/rice/cs/drjava/model/FindReplaceMachine.java M src/edu/rice/cs/drjava/model/AbstractGlobalModel.java M src/edu/rice/cs/drjava/model/OrderedDocumentRegion.java M src/edu/rice/cs/drjava/model/OpenDefinitionsDocument.java M src/edu/rice/cs/drjava/model/DJDocument.java M src/edu/rice/cs/drjava/project/DocFile.java M src/edu/rice/cs/drjava/ui/MainFrame.java M src/edu/rice/cs/drjava/ui/InteractionsPane.java M src/edu/rice/cs/drjava/ui/DefinitionsPane.java M src/edu/rice/cs/drjava/ui/config/ConfigFrame.java M src/edu/rice/cs/drjava/ui/RegionsTreePanel.java M src/edu/rice/cs/util/StringOpsTest.java M src/edu/rice/cs/util/StringOps.java git-svn-id: file:///tmp/test-svn/trunk@4653 fe72c1cf-3628-48e9-8b72-1c46755d3cff
1 parent b552f36 commit 4f7118c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+860
-809
lines changed

‎drjava/src/edu/rice/cs/drjava/model/AbstractDJDocument.java‎

Lines changed: 371 additions & 398 deletions
Large diffs are not rendered by default.

‎drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3480,7 +3480,7 @@ public String getQualifiedClassName(int pos) throws ClassNameNotFoundException {
34803480
return getDocument().getQualifiedClassName(pos);
34813481
}
34823482

3483-
public ReducedModelState _getStateAtCurrent() { return getDocument()._getStateAtCurrent(); }
3483+
public ReducedModelState getStateAtCurrent() { return getDocument().getStateAtCurrent(); }
34843484

34853485
public void resetUndoManager() {
34863486
// if it's not in the cache, the undo manager will be reset when it's reconstructed
@@ -3504,33 +3504,33 @@ public String getEnclosingClassName(int pos, boolean fullyQualified) throws BadL
35043504
}
35053505

35063506
/** Finds the previous brace of specified form enclosing pos. */
3507-
public int _findPrevEnclosingBrace(int pos, char opening, char closing) throws BadLocationException {
3508-
return getDocument()._findPrevEnclosingBrace(pos, opening, closing);
3507+
public int findPrevEnclosingBrace(int pos, char opening, char closing) throws BadLocationException {
3508+
return getDocument().findPrevEnclosingBrace(pos, opening, closing);
35093509
}
35103510

35113511
/** Finds the next brace of specified form enclosing pos. */
3512-
public int _findNextEnclosingBrace(int pos, char opening, char closing) throws BadLocationException {
3513-
return getDocument()._findNextEnclosingBrace(pos, opening, closing);
3512+
public int findNextEnclosingBrace(int pos, char opening, char closing) throws BadLocationException {
3513+
return getDocument().findNextEnclosingBrace(pos, opening, closing);
35143514
}
35153515

35163516
// public int findPrevNonWSCharPos(int pos) throws BadLocationException {
35173517
// return getDocument().findPrevNonWSCharPos(pos);
35183518
// }
35193519

3520-
/** Assumes read lock is already held. */
3521-
public int _getFirstNonWSCharPos(int pos) throws BadLocationException {
3522-
return getDocument()._getFirstNonWSCharPos(pos);
3520+
/**Only runs in the event thread. */
3521+
public int getFirstNonWSCharPos(int pos) throws BadLocationException {
3522+
return getDocument().getFirstNonWSCharPos(pos);
35233523
}
35243524

3525-
/** Assumes read lock is already held. */
3526-
public int _getFirstNonWSCharPos(int pos, boolean acceptComments) throws BadLocationException {
3527-
return getDocument()._getFirstNonWSCharPos(pos, acceptComments);
3525+
/** Only runs in the event thread. */
3526+
public int getFirstNonWSCharPos(int pos, boolean acceptComments) throws BadLocationException {
3527+
return getDocument().getFirstNonWSCharPos(pos, acceptComments);
35283528
}
35293529

35303530
/** Assumes read lock is already held. */
3531-
public int _getFirstNonWSCharPos (int pos, char[] whitespace, boolean acceptComments)
3531+
public int getFirstNonWSCharPos (int pos, char[] whitespace, boolean acceptComments)
35323532
throws BadLocationException {
3533-
return getDocument()._getFirstNonWSCharPos(pos, whitespace, acceptComments);
3533+
return getDocument().getFirstNonWSCharPos(pos, whitespace, acceptComments);
35343534
}
35353535

35363536
/** Assumes read lock is already held. */
@@ -3566,12 +3566,12 @@ public int _getIndentOfCurrStmt(int pos, char[] delims, char[] whitespace) throw
35663566
// return getDocument().findCharInStmtBeforePos(findChar, position);
35673567
// }
35683568

3569-
public int _findPrevDelimiter(int pos, char[] delims) throws BadLocationException {
3570-
return getDocument()._findPrevDelimiter(pos, delims);
3569+
public int findPrevDelimiter(int pos, char[] delims) throws BadLocationException {
3570+
return getDocument().findPrevDelimiter(pos, delims);
35713571
}
35723572

3573-
public int _findPrevDelimiter(int pos, char[] delims, boolean skipParenPhrases) throws BadLocationException {
3574-
return getDocument()._findPrevDelimiter(pos, delims, skipParenPhrases);
3573+
public int findPrevDelimiter(int pos, char[] delims, boolean skipParenPhrases) throws BadLocationException {
3574+
return getDocument().findPrevDelimiter(pos, delims, skipParenPhrases);
35753575
}
35763576

35773577
// public void resetReducedModelLocation() { getDocument().resetReducedModelLocation(); }
@@ -3661,7 +3661,7 @@ public void setParagraphAttributes(int offset, int length, AttributeSet s, boole
36613661
public int getNumberOfLines() { return getLineOfOffset(getLength()); }
36623662

36633663
/** Determines if pos in document is inside a comment or a string. */
3664-
public boolean _isShadowed(int pos) { return getDocument()._isShadowed(pos); }
3664+
public boolean isShadowed(int pos) { return getDocument().isShadowed(pos); }
36653665

36663666
/** Translates an offset into the components text to a line number.
36673667
* @param offset the offset >= 0

‎drjava/src/edu/rice/cs/drjava/model/ConcreteRegionManager.java‎

Lines changed: 57 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060

6161
import edu.rice.cs.drjava.ui.DrJavaErrorHandler;
6262
import edu.rice.cs.plt.lambda.Lambda;
63+
import edu.rice.cs.plt.tuple.Pair;
6364
import edu.rice.cs.util.StringOps;
6465
import edu.rice.cs.util.swing.Utilities;
6566

@@ -106,7 +107,7 @@ private SortedSet<R> getHeadSet(R r) {
106107
}
107108

108109
/** Gets the sorted set of regions greater than or equal to r. */
109-
private SortedSet<R> getTailSet(R r) {
110+
public SortedSet<R> getTailSet(R r) {
110111
SortedSet<R> oddRegions = _regions.get(r.getDocument());
111112
if (oddRegions == null || oddRegions.isEmpty()) return emptySet();
112113
return oddRegions.tailSet(r);
@@ -149,39 +150,66 @@ public R getRegionAt(OpenDefinitionsDocument odd, int offset) {
149150
else return null;
150151
}
151152

152-
public ArrayList<R> getRegionsNear(OpenDefinitionsDocument odd, int offset) {
153+
/** Finds the interval of regions in odd such that the line label (excerpt) for the region contains offset. */
154+
public Pair<R, R> getRegionInterval(OpenDefinitionsDocument odd, int offset) {
153155
// assert EventQueue.isDispatchThread();
154156

155157
// System.err.println("getRegionsNear(" + odd + ", " + offset + ") called");
156158

157-
/* Get the tailSet consisting of the ordered set of regions [start, end) such that end > offset - 120. The maximium
158-
* size of the excerpt enclosing a region is 120 characters. */
159+
/* Get the interval of regions whose line label (excerpts) contain offset. The maximium size of the excerpt
160+
* enclosing a region is 120 characters; it begins at the start of the line containing the start of the region.
161+
* Since empty regions are ignore (and deleted as soon as they are found), the end of a containing region must be
162+
* less than 120 characters from offset. Find the tail set of all regions [start, end) where offset - 120 < end.
163+
*/
159164
@SuppressWarnings("unchecked")
160-
SortedSet<R> tail = getTailSet((R) newDocumentRegion(odd, 0, offset - 119));
165+
SortedSet<R> tail = getTailSet((R) new DocumentRegion(odd, 0, offset - 119));
161166

162-
/* Search tail, selecting each region r such that r.getLineEnd() > offset and r.getLineStart < offset. The tail is
163-
* totally order on BOTH getLineStart() and getLineEnd() because the functions mapping start to lineStart and end to
164-
* lineEnd are monotonic and the tail is totally ordered on BOTH start and end. Hence, we can abandon the search as
165-
* soon as we reach a region r such that r.getLineStart() >= offset. tail may be empty. */
167+
/* Search tail, selecting first and last regions r such that r.getLineEnd() >= offset and r.getLineStart <= offset.
168+
* The tail is totally order on BOTH getLineStart() and getLineEnd() because the functions mapping start to lineStart
169+
* and end to lineEnd are monotonic and the tail is totally ordered on BOTH start and end (since regions do not
170+
* overlap). Hence, we can abandon the search as soon as we reach a region r such that r.getLineStart() > offset.
171+
* tail may be empty. */
166172

167173
if (tail.size() == 0) return null;
168174

169-
ArrayList<R> result = new ArrayList<R>(0); // For most edits, there is no match. Should we use a LinkedList?
170-
for (R r: tail) {
175+
// Find the first and last regions whose bounds (using line boundaries) contain offset
176+
Iterator<R> it = tail.iterator();
177+
R first = null;
178+
R last = null;
179+
180+
// Find first
181+
while (it.hasNext()) {
182+
R r = it.next();
183+
// System.err.println("Testing region '" + r.getString() + "'");
171184
/* Note: r may span more than one line. */
172185
int lineStart = r.getLineStartOffset();
186+
// System.err.println("lineStart = " + lineStart + " offset = " + offset);
187+
if (lineStart > offset) break; // first == null implying test following loop will return
173188
int lineEnd = r.getLineEndOffset();
174-
if (lineStart - 1 <= offset && lineEnd >= offset) {
175-
result.add(r);
176-
// System.err.println("Adding tail set region " + r + " to update list");
189+
// System.err.println("lineEnd = " + lineEnd);
190+
if (lineStart - 1 <= offset && lineEnd >= offset) { // - 1 required to handle inserting wing comment chars
191+
first = r;
192+
// System.err.println("Found first region in getRegionInterval = '" + r.getString() + "'");
193+
break;
177194
}
178-
else if (lineStart > offset) break;
179195
}
196+
if (first == null) return null;
180197

181-
return result;
198+
// Find last
199+
last = first;
200+
while (it.hasNext()) {
201+
R r = it.next();
202+
int lineStart = r.getLineStartOffset();
203+
if (lineStart > offset) break;
204+
int lineEnd = r.getLineEndOffset();
205+
if (lineStart <= offset && lineEnd >= offset) {
206+
last = r;
207+
}
208+
}
209+
// System.err.println("Found last region in getRegionInterval = '" + last + "'");
210+
return new Pair<R, R>(first, last);
182211
}
183212

184-
185213
// /** Returns the rightmost region in the given document that contains [startOffset, endOffset], or null if one does
186214
// * not exist. Only executes in the event thread. Otherwise offset args could be invalid.
187215
// * Note: this method could be implemented more cleanly using a revserseIterator on the headSet containing all
@@ -416,22 +444,26 @@ public void changeRegion(final R region, Lambda<R,Object> cmd) {
416444
finally { _lock.endRead(); }
417445
}
418446

419-
/** Updates _lineStartPos, _lineEndPos in regions following (and including) r. Removes empty regions. r is not
420-
* necessarily a region in this manager. */
421-
public void updateLines(R r) {
447+
/** Updates _lineStartPos, _lineEndPos of regions in the interval [firstRegion, lastRegion] using total ordering on
448+
* regions. Removes empty regions. firstRegion and lastRegion are not necessarily regions in this manager.
449+
*/
450+
public void updateLines(R firstRegion, R lastRegion) {
422451
// assert EventQueue.isDispatchThread();
423452

424453
/* Get the tailSet consisting of the ordered set of regions >= r. */
425454
@SuppressWarnings("unchecked")
426-
SortedSet<R> tail = getTailSet(r);
455+
SortedSet<R> tail = getTailSet(firstRegion);
427456
if (tail.size() == 0) return;
428457
OrderedDocumentRegion[] tailRegions = tail.toArray(new OrderedDocumentRegion[0]);
429458

459+
LinkedList<R> toBeRemoved = new LinkedList<R>(); // nonsense to avoid concurrent modification exception
430460
// tail can be empty if r is a constructed DocumentRegion
431-
for (OrderedDocumentRegion region: tailRegions) {
432-
// The following cast is gross, but the silly erasure based generics won't let me execute new R[0]
433-
if (region.getStartOffset() == region.getEndOffset()) removeRegion((R) region);
434-
region.update();
461+
for (R region: tail) {
462+
if (region.compareTo(lastRegion) > 0) break;
463+
if (region.getStartOffset() == region.getEndOffset()) toBeRemoved.add(region);
464+
else region.update(); // The bounds of this region must be recomputed.
465+
435466
}
467+
for (R r: toBeRemoved) removeRegion(r);
436468
}
437469
}

‎drjava/src/edu/rice/cs/drjava/model/DJDocument.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,21 +87,22 @@ public interface DJDocument extends SwingDocumentInterface {
8787
// /* Returns whether a block indent operation is in progress on this document. */
8888
// public boolean indentInProgress();
8989

90-
/** Finds the match for the closing brace immediately to the left, assuming there is such a brace. Only runs in the
91-
* event thread.
90+
/** Finds the match for the closing brace immediately to the left, assuming there is such a brace.
9291
* @return the relative distance backwards to the offset before the matching brace.
9392
*/
9493
public int balanceBackward();
9594

96-
/* Raw version of balanceForward. Assume read and reduced locks are already held. */
95+
/** Finds the match for the open brace immediately to the right, assuming there is such a brace.
96+
* @return the relative distance forwards to the offset after the matching brace.
97+
*/
9798
public int balanceForward();
9899

99100
// /** Returns the indent information for the current location. */
100101
// public IndentInfo getIndentInformation();
101102

102103
// public ReducedModelState stateAtRelLocation(int dist);
103104

104-
public ReducedModelState _getStateAtCurrent();
105+
public ReducedModelState getStateAtCurrent();
105106

106107
// public void resetReducedModelLocation();
107108

@@ -112,7 +113,7 @@ public interface DJDocument extends SwingDocumentInterface {
112113
* @return position of enclosing curly brace, or ERROR_INDEX (-1) if beginning
113114
* of document is reached.
114115
*/
115-
public int _findPrevEnclosingBrace(int pos, char opening, char closing) throws BadLocationException;
116+
public int findPrevEnclosingBrace(int pos, char opening, char closing) throws BadLocationException;
116117

117118
/** Searching forwards, finds the position of the enclosing brace.
118119
* NB: ignores comments.
@@ -122,7 +123,7 @@ public interface DJDocument extends SwingDocumentInterface {
122123
* @return position of enclosing curly brace, or ERROR_INDEX (-1) if beginning
123124
* of document is reached.
124125
*/
125-
public int _findNextEnclosingBrace(int pos, char opening, char closing) throws BadLocationException;
126+
public int findNextEnclosingBrace(int pos, char opening, char closing) throws BadLocationException;
126127

127128
/** Searching backwards, finds the position of the first character that is one
128129
* of the given delimiters. Does not look for delimiters inside paren phrases.
@@ -133,7 +134,7 @@ public interface DJDocument extends SwingDocumentInterface {
133134
* @return position of first matching delimiter, or ERROR_INDEX (-1) if beginning
134135
* of document is reached.
135136
*/
136-
public int _findPrevDelimiter(int pos, char[] delims) throws BadLocationException;
137+
public int findPrevDelimiter(int pos, char[] delims) throws BadLocationException;
137138

138139
/** Searching backwards, finds the position of the first character that is one
139140
* of the given delimiters. Will not look for delimiters inside a paren
@@ -146,7 +147,7 @@ public interface DJDocument extends SwingDocumentInterface {
146147
* @return position of first matching delimiter, or ERROR_INDEX (-1) if beginning
147148
* of document is reached.
148149
*/
149-
public int _findPrevDelimiter(int pos, char[] delims, boolean skipParenPhrases) throws BadLocationException;
150+
public int findPrevDelimiter(int pos, char[] delims, boolean skipParenPhrases) throws BadLocationException;
150151

151152
// /** This function finds the given character in the same statement as the given
152153
// * position, and before the given position. It is used by QuestionExistsCharInStmt and
@@ -247,15 +248,15 @@ public int _getIndentOfCurrStmt(int pos, char[] delims, char[] whitespace)
247248
* @return position of first non-whitespace character after pos,
248249
* or ERROR_INDEX (-1) if end of document is reached
249250
*/
250-
public int _getFirstNonWSCharPos(int pos) throws BadLocationException;
251+
public int getFirstNonWSCharPos(int pos) throws BadLocationException;
251252

252253
/** Similar to the single-argument version, but allows including comments.
253254
* @param pos Position to start from
254255
* @param acceptComments if true, find non-whitespace chars in comments
255256
* @return position of first non-whitespace character after pos,
256257
* or ERROR_INDEX (-1) if end of document is reached
257258
*/
258-
public int _getFirstNonWSCharPos(int pos, boolean acceptComments)
259+
public int getFirstNonWSCharPos(int pos, boolean acceptComments)
259260
throws BadLocationException;
260261

261262
/** Finds the position of the first non-whitespace character after pos.
@@ -266,7 +267,7 @@ public int _getFirstNonWSCharPos(int pos, boolean acceptComments)
266267
* @return position of first non-whitespace character after pos,
267268
* or ERROR_INDEX (-1) if end of document is reached
268269
*/
269-
public int _getFirstNonWSCharPos (int pos, char[] whitespace, boolean acceptComments)
270+
public int getFirstNonWSCharPos (int pos, char[] whitespace, boolean acceptComments)
270271
throws BadLocationException;
271272

272273
// public int findPrevNonWSCharPos(int pos) throws BadLocationException;

‎drjava/src/edu/rice/cs/drjava/model/DummyOpenDefDoc.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ public String getQualifiedClassName(int pos) throws ClassNameNotFoundException {
302302
}
303303

304304
public String getLexiName() { throw new UnsupportedOperationException("Dummy method"); }
305-
public ReducedModelState _getStateAtCurrent() { throw new UnsupportedOperationException("Dummy method"); }
305+
public ReducedModelState getStateAtCurrent() { throw new UnsupportedOperationException("Dummy method"); }
306306
public void resetUndoManager() { throw new UnsupportedOperationException("Dummy method"); }
307307
public File getCachedClassFile() { throw new UnsupportedOperationException("Dummy method"); }
308308
public void setCachedClassFile(File f) { throw new UnsupportedOperationException("Dummy method"); }
@@ -350,27 +350,27 @@ public void setParagraphAttributes(int offset, int length, AttributeSet s, boole
350350
// public boolean inParenPhrase(int pos) { throw new UnsupportedOperationException("Dummy method"); }
351351
// public boolean inParenPhrase() { throw new UnsupportedOperationException("Dummy method"); }
352352

353-
public int _findPrevEnclosingBrace(int pos, char opening, char closing) throws BadLocationException {
353+
public int findPrevEnclosingBrace(int pos, char opening, char closing) throws BadLocationException {
354354
throw new UnsupportedOperationException("Dummy method");
355355
}
356356

357-
public int _findNextEnclosingBrace(int pos, char opening, char closing) throws BadLocationException {
357+
public int findNextEnclosingBrace(int pos, char opening, char closing) throws BadLocationException {
358358
throw new UnsupportedOperationException("Dummy method");
359359
}
360360

361361
// public int findPrevNonWSCharPos(int pos) throws BadLocationException {
362362
// throw new UnsupportedOperationException("Dummy method");
363363
// }
364364

365-
public int _getFirstNonWSCharPos(int pos) throws BadLocationException {
365+
public int getFirstNonWSCharPos(int pos) throws BadLocationException {
366366
throw new UnsupportedOperationException("Dummy method");
367367
}
368368

369-
public int _getFirstNonWSCharPos(int pos, boolean acceptComments) throws BadLocationException {
369+
public int getFirstNonWSCharPos(int pos, boolean acceptComments) throws BadLocationException {
370370
throw new UnsupportedOperationException("Dummy method");
371371
}
372372

373-
public int _getFirstNonWSCharPos (int pos, char[] whitespace, boolean acceptComments) throws BadLocationException {
373+
public int getFirstNonWSCharPos (int pos, char[] whitespace, boolean acceptComments) throws BadLocationException {
374374
throw new UnsupportedOperationException("Dummy method");
375375
}
376376

@@ -404,11 +404,11 @@ public void indentLines(int selStart, int selEnd, Indenter.IndentReason reason,
404404
// throw new UnsupportedOperationException("Dummy method");
405405
// }
406406

407-
public int _findPrevDelimiter(int pos, char[] delims) throws BadLocationException {
407+
public int findPrevDelimiter(int pos, char[] delims) throws BadLocationException {
408408
throw new UnsupportedOperationException("Dummy method");
409409
}
410410

411-
public int _findPrevDelimiter(int pos, char[] delims, boolean skipParenPhrases) throws BadLocationException {
411+
public int findPrevDelimiter(int pos, char[] delims, boolean skipParenPhrases) throws BadLocationException {
412412
throw new UnsupportedOperationException("Dummy method");
413413
}
414414

@@ -454,7 +454,7 @@ public ArrayList<HighlightStatus> getHighlightStatus(int start, int end) {
454454
public int getNumberOfLines() { return 0; }
455455

456456
/** Determines if pos in document is inside a comment or a string. */
457-
public boolean _isShadowed(int pos) { return false; }
457+
public boolean isShadowed(int pos) { return false; }
458458

459459
/** Translates an offset into the components text to a line number.
460460
* @param offset the offset >= 0

0 commit comments

Comments
 (0)