mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 01:36:01 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2010-04-18 03:37:46 +00:00
parent 3dbeea6a38
commit 13645705f8
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java
View file

@ -88,8 +88,10 @@ public final class ToggleCommentAction extends TextEditorAction {
Shell shell= editor.getSite().getShell(); Shell shell= editor.getSite().getShell();
if (!fOperationTarget.canDoOperation(operationCode)) { if (!fOperationTarget.canDoOperation(operationCode)) {
if (shell != null) if (shell != null) {
MessageDialog.openError(shell, CEditorMessages.ToggleComment_error_title, CEditorMessages.ToggleComment_error_message); MessageDialog.openError(shell, CEditorMessages.ToggleComment_error_title,
CEditorMessages.ToggleComment_error_message);
}
return; return;
} }
@ -126,7 +128,7 @@ public final class ToggleCommentAction extends TextEditorAction {
int lineCount= 0; int lineCount= 0;
int[] lines= new int[regions.length * 2]; // [startline, endline, startline, endline, ...] int[] lines= new int[regions.length * 2]; // [startline, endline, startline, endline, ...]
// For each partition in the text selection, figure out the startline and endline. // For each partition in the text selection, figure out the startline and endline.
// Count the number of lines that are selected. // Count the number of lines that are selected.
for (int i = 0, j = 0; i < regions.length; i++, j+= 2) { for (int i = 0, j = 0; i < regions.length; i++, j+= 2) {
@ -137,25 +139,26 @@ public final class ToggleCommentAction extends TextEditorAction {
int offset= regions[i].getOffset() + length; int offset= regions[i].getOffset() + length;
if (length > 0) if (length > 0)
offset--; offset--;
// If there is no startline for this region (startline = -1), // If there is no startline for this region (startline = -1),
// then there is no endline, // then there is no endline,
// otherwise, get the line number of the endline and store it in the array. // otherwise, get the line number of the endline and store it in the array.
lines[j + 1]= (lines[j] == -1 ? -1 : document.getLineOfOffset(offset)); lines[j + 1]= (lines[j] == -1 ? -1 : document.getLineOfOffset(offset));
// Count the number of lines that are selected in this region // Count the number of lines that are selected in this region
lineCount += lines[j + 1] - lines[j] + 1; lineCount += lines[j + 1] - lines[j] + 1;
assert i < regions.length; assert i < regions.length;
assert j < regions.length * 2; assert j < regions.length * 2;
} }
// Perform the check // Perform the check
for (int i = 0, j = 0; i < regions.length; i++, j += 2) { for (int i = 0, j = 0; i < regions.length; i++, j += 2) {
String[] prefixes= fPrefixesMap.get(regions[i].getType()); String[] prefixes= fPrefixesMap.get(regions[i].getType());
if (prefixes != null && prefixes.length > 0 && lines[j] >= 0 && lines[j + 1] >= 0) if (prefixes != null && prefixes.length > 0 && lines[j] >= 0 && lines[j + 1] >= 0 &&
if (!isBlockCommented(lines[j], lines[j + 1], prefixes, document)) !isBlockCommented(lines[j], lines[j + 1], prefixes, document)) {
return false; return false;
}
} }
return true; return true;
} catch (BadLocationException e) { } catch (BadLocationException e) {
@ -223,7 +226,7 @@ public final class ToggleCommentAction extends TextEditorAction {
*/ */
private boolean isBlockCommented(int startLine, int endLine, String[] prefixes, IDocument document) { private boolean isBlockCommented(int startLine, int endLine, String[] prefixes, IDocument document) {
try { try {
// check for occurrences of prefixes in the given lines // Check for occurrences of prefixes in the given lines
for (int i= startLine; i <= endLine; i++) { for (int i= startLine; i <= endLine; i++) {
IRegion line= document.getLineInformation(i); IRegion line= document.getLineInformation(i);
String text= document.get(line.getOffset(), line.getLength()); String text= document.get(line.getOffset(), line.getLength());
@ -231,14 +234,14 @@ public final class ToggleCommentAction extends TextEditorAction {
int[] found= TextUtilities.indexOf(prefixes, text, 0); int[] found= TextUtilities.indexOf(prefixes, text, 0);
if (found[0] == -1) { if (found[0] == -1) {
// found a line which is not commented // Found a line which is not commented
return false; return false;
} }
String s= document.get(line.getOffset(), found[0]); String s= document.get(line.getOffset(), found[0]);
s= s.trim(); s= s.trim();
if (s.length() != 0) { if (s.length() != 0) {
// found a line which is not commented // Found a line which is not commented
return false; return false;
} }
} }
@ -281,7 +284,7 @@ public final class ToggleCommentAction extends TextEditorAction {
super.setEditor(editor); super.setEditor(editor);
fOperationTarget= null; fOperationTarget= null;
} }
/** /**
* For the different content types, get its default comment prefix and store the prefixes. * For the different content types, get its default comment prefix and store the prefixes.
* @param sourceViewer * @param sourceViewer