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

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2015-02-18 15:25:53 -08:00
parent 3cf5ec86ee
commit 340b507e38
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SurroundWithTemplateMenuAction.java
View file

@ -12,7 +12,6 @@
package org.eclipse.cdt.internal.ui.actions; package org.eclipse.cdt.internal.ui.actions;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator;
import java.util.List; import java.util.List;
import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.Assert;
@ -152,8 +151,9 @@ public class SurroundWithTemplateMenuAction implements IWorkbenchWindowPulldownD
menu.add(NONE_APPLICABLE_ACTION); menu.add(NONE_APPLICABLE_ACTION);
} else { } else {
menu.add(new Separator(TEMPLATE_GROUP)); menu.add(new Separator(TEMPLATE_GROUP));
for (int i= 0; i < actions.length; i++) for (int i= 0; i < actions.length; i++) {
menu.add(actions[i]); menu.add(actions[i]);
}
} }
menu.add(new Separator(CONFIG_GROUP)); menu.add(new Separator(CONFIG_GROUP));
@ -221,7 +221,7 @@ public class SurroundWithTemplateMenuAction implements IWorkbenchWindowPulldownD
CEditor editor= (CEditor) activePart; CEditor editor= (CEditor) activePart;
IAction[] actions= getTemplateActions(editor); IAction[] actions= getTemplateActions(editor);
if ( actions == null || actions.length <= 0) { if (actions == null || actions.length <= 0) {
ActionContributionItem item= new ActionContributionItem(NONE_APPLICABLE_ACTION); ActionContributionItem item= new ActionContributionItem(NONE_APPLICABLE_ACTION);
item.fill(menu, -1); item.fill(menu, -1);
} else { } else {
@ -236,7 +236,6 @@ public class SurroundWithTemplateMenuAction implements IWorkbenchWindowPulldownD
ActionContributionItem configAction= new ActionContributionItem(new ConfigureTemplatesAction()); ActionContributionItem configAction= new ActionContributionItem(new ConfigureTemplatesAction());
configAction.fill(menu, -1); configAction.fill(menu, -1);
} }
protected void initMenu() { protected void initMenu() {
@ -262,7 +261,7 @@ public class SurroundWithTemplateMenuAction implements IWorkbenchWindowPulldownD
private static IAction[] getTemplateActions(CEditor editor) { private static IAction[] getTemplateActions(CEditor editor) {
ITextSelection textSelection= getTextSelection(editor); ITextSelection textSelection= getTextSelection(editor);
if (textSelection == null || textSelection.getLength() == 0) if (textSelection == null || textSelection.isEmpty())
return null; return null;
ITranslationUnit tu= CUIPlugin.getDefault().getWorkingCopyManager().getWorkingCopy(editor.getEditorInput()); ITranslationUnit tu= CUIPlugin.getDefault().getWorkingCopyManager().getWorkingCopy(editor.getEditorInput());
@ -270,7 +269,7 @@ public class SurroundWithTemplateMenuAction implements IWorkbenchWindowPulldownD
return null; return null;
TemplateCompletionProposalComputer templateComputer = new TemplateCompletionProposalComputer(); TemplateCompletionProposalComputer templateComputer = new TemplateCompletionProposalComputer();
CContentAssistInvocationContext context = new CContentAssistInvocationContext( editor.getViewer(), textSelection.getOffset(), editor, true, false ); CContentAssistInvocationContext context = new CContentAssistInvocationContext(editor.getViewer(), textSelection.getOffset(), editor, true, false);
try { try {
List<ICompletionProposal> proposals= templateComputer.computeCompletionProposals(context, null); List<ICompletionProposal> proposals= templateComputer.computeCompletionProposals(context, null);
@ -295,13 +294,11 @@ public class SurroundWithTemplateMenuAction implements IWorkbenchWindowPulldownD
return (ITextSelection)selection; return (ITextSelection)selection;
} }
private static IAction[] getActionsFromProposals(List<ICompletionProposal> proposals, final int offset, private static IAction[] getActionsFromProposals(List<ICompletionProposal> proposals,
final ITextViewer viewer) { final int offset, final ITextViewer viewer) {
List<Action> result= new ArrayList<>(); List<Action> result= new ArrayList<>();
int j = 1; int j = 1;
for (Iterator<ICompletionProposal> it= proposals.iterator(); it.hasNext();) { for (final ICompletionProposal proposal : proposals) {
final ICompletionProposal proposal= it.next();
StringBuilder actionName= new StringBuilder(); StringBuilder actionName= new StringBuilder();
if (j < 10) { if (j < 10) {
actionName.append('&').append(j).append(' '); actionName.append('&').append(j).append(' ');
@ -310,7 +307,7 @@ public class SurroundWithTemplateMenuAction implements IWorkbenchWindowPulldownD
Action action= new Action(actionName.toString()) { Action action= new Action(actionName.toString()) {
@Override @Override
public void run() { public void run() {
applyProposal(proposal, viewer, (char)0, 0, offset); applyProposal(proposal, viewer, (char) 0, 0, offset);
} }
}; };
@ -357,7 +354,7 @@ public class SurroundWithTemplateMenuAction implements IWorkbenchWindowPulldownD
registry.register(helper); registry.register(helper);
} }
((ICompletionProposalExtension2)proposal).apply(viewer, trigger, stateMask, offset); ((ICompletionProposalExtension2) proposal).apply(viewer, trigger, stateMask, offset);
Point selection= proposal.getSelection(document); Point selection= proposal.getSelection(document);
if (selection != null) { if (selection != null) {