mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-16 12:45:41 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source 
Change-Id: I3f589111ad5e765ebfaa56829ff24ec437f084f8
This commit is contained in:
Sergey Prigogin 2014-08-01 18:33:31 -07:00
parent bfb4854e5d
commit af7c0a635b
1 changed files with 11 additions and 20 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/text/CFormattingStrategy.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2008 QNX Software Systems and others. * Copyright (c) 2000, 2014 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -11,7 +11,8 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.ui.text; package org.eclipse.cdt.internal.ui.text;
import java.util.LinkedList; import java.util.ArrayDeque;
import java.util.Deque;
import java.util.Map; import java.util.Map;
import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.BadLocationException;
@ -34,32 +35,29 @@ import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil;
*/ */
public class CFormattingStrategy extends ContextBasedFormattingStrategy { public class CFormattingStrategy extends ContextBasedFormattingStrategy {
/** Documents to be formatted by this strategy */ /** Documents to be formatted by this strategy */
private final LinkedList<IDocument> fDocuments= new LinkedList<IDocument>(); private final Deque<IDocument> fDocuments= new ArrayDeque<>();
/** Partitions to be formatted by this strategy */ /** Partitions to be formatted by this strategy */
private final LinkedList<TypedPosition> fPartitions= new LinkedList<TypedPosition>(); private final Deque<TypedPosition> fPartitions= new ArrayDeque<>();
/** /**
* Creates a new java formatting strategy. * Creates a new formatting strategy.
*/ */
public CFormattingStrategy() { public CFormattingStrategy() {
super(); super();
} }
/*
* @see org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy#format()
*/
@Override @Override
public void format() { public void format() {
super.format(); super.format();
final IDocument document= fDocuments.removeFirst(); IDocument document= fDocuments.removeFirst();
final TypedPosition partition= fPartitions.removeFirst(); TypedPosition partition= fPartitions.removeFirst();
if (document != null && partition != null) { if (document != null && partition != null) {
try { try {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
final Map<String, String> preferences = getPreferences(); Map<String, String> preferences = getPreferences();
final TextEdit edit = CodeFormatterUtil.format( TextEdit edit = CodeFormatterUtil.format(
CodeFormatter.K_TRANSLATION_UNIT, document.get(), CodeFormatter.K_TRANSLATION_UNIT, document.get(),
partition.getOffset(), partition.getLength(), 0, partition.getOffset(), partition.getLength(), 0,
TextUtilities.getDefaultLineDelimiter(document), TextUtilities.getDefaultLineDelimiter(document),
@ -70,16 +68,12 @@ public class CFormattingStrategy extends ContextBasedFormattingStrategy {
} catch (MalformedTreeException e) { } catch (MalformedTreeException e) {
CUIPlugin.log(e); CUIPlugin.log(e);
} catch (BadLocationException e) { } catch (BadLocationException e) {
// Can only happen on concurrent document modification - log and // Can only happen on concurrent document modification - log and bail out.
// bail out
CUIPlugin.log(e); CUIPlugin.log(e);
} }
} }
} }
/*
* @see org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy#formatterStarts(org.eclipse.jface.text.formatter.IFormattingContext)
*/
@Override @Override
public void formatterStarts(final IFormattingContext context) { public void formatterStarts(final IFormattingContext context) {
super.formatterStarts(context); super.formatterStarts(context);
@ -94,9 +88,6 @@ public class CFormattingStrategy extends ContextBasedFormattingStrategy {
} }
} }
/*
* @see org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy#formatterStops()
*/
@Override @Override
public void formatterStops() { public void formatterStops() {
super.formatterStops(); super.formatterStops();