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

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2013-10-29 10:58:12 -07:00
parent 012e777293
commit e363ba7f04
5 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AbstractContentAssistTest.java
View file

@ -45,7 +45,6 @@ import org.eclipse.cdt.internal.ui.text.contentassist.CContentAssistProcessor;
import org.eclipse.cdt.internal.ui.text.contentassist.RelevanceConstants;
public abstract class AbstractContentAssistTest extends BaseUITestCase {
public static final int COMPARE_ID_STRINGS = 0;
public static final int COMPARE_DISP_STRINGS = 1;
public static final int COMPARE_REP_STRINGS = 2;
@ -65,8 +64,7 @@ public abstract class AbstractContentAssistTest extends BaseUITestCase {
super.setUp();
if (fIsCpp) {
fCProject= CProjectHelper.createCCProject(getName(), "unused", IPDOMManager.ID_FAST_INDEXER);
}
else {
} else {
fCProject= CProjectHelper.createCProject(getName(), "unused", IPDOMManager.ID_FAST_INDEXER);
}
fCFile= setUpProjectContent(fCProject.getProject());
@ -134,7 +132,7 @@ public abstract class AbstractContentAssistTest extends BaseUITestCase {
}
}
boolean allFound = true ; // for the time being, let's be optimistic
boolean allFound = true; // for the time being, let's be optimistic
for (String element : expected) {
boolean found = false;
@ -148,7 +146,7 @@ public abstract class AbstractContentAssistTest extends BaseUITestCase {
}
}
if (!found) {
allFound = false ;
allFound = false;
if (CTestPlugin.getDefault().isDebugging()) {
System.out.println( "Lookup failed for " + element); //$NON-NLS-1$
}
@ -160,7 +158,6 @@ public abstract class AbstractContentAssistTest extends BaseUITestCase {
} else if (doCheckExtraResults()) {
assertEquals("Extra results!", toString(expected), toString(resultStrings));
}
}
protected void assertContentAssistResults(int offset, int length, String[] expected, boolean isCompletion, boolean isTemplate, int compareType) throws Exception {
@ -258,7 +255,7 @@ public abstract class AbstractContentAssistTest extends BaseUITestCase {
* Override to relax checking of extra results
*/
protected boolean doCheckExtraResults() {
return true ;
return true;
}
/**
@ -274,5 +271,4 @@ public abstract class AbstractContentAssistTest extends BaseUITestCase {
protected IDocument getDocument() {
return EditorTestHelper.getDocument(fEditor);
}
}

1
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ParameterHintTests.java
View file

@ -20,7 +20,6 @@ import org.eclipse.core.resources.IProject;
import org.eclipse.cdt.core.testplugin.util.BaseTestCase;
public class ParameterHintTests extends AbstractContentAssistTest {
private static final String HEADER_FILE_NAME = "PHTest.h";
private static final String SOURCE_FILE_NAME = "PHTest.cpp";

7
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java
View file

@ -43,7 +43,6 @@ import org.eclipse.cdt.internal.ui.actions.StructureSelectPreviousAction;
import org.eclipse.cdt.internal.ui.actions.StructureSelectionAction;
public class CEditorActionContributor extends TextEditorActionContributor {
private RetargetTextEditorAction fContentAssist;
private RetargetTextEditorAction fContextInformation;
private TogglePresentationAction fTogglePresentation;
@ -120,7 +119,6 @@ public class CEditorActionContributor extends TextEditorActionContributor {
*/
@Override
public void contributeToMenu(IMenuManager menu) {
super.contributeToMenu(menu);
IMenuManager editMenu= menu.findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);
@ -187,7 +185,6 @@ public class CEditorActionContributor extends TextEditorActionContributor {
*/
@Override
public void setActiveEditor(IEditorPart part) {
super.setActiveEditor(part);
ITextEditor textEditor= null;
@ -246,12 +243,8 @@ public class CEditorActionContributor extends TextEditorActionContributor {
CEditor cEditor= (CEditor) part;
cEditor.fillActionBars(bars);
}
}
/* (non-Javadoc)
* @see org.eclipse.ui.IEditorActionBarContributor#dispose()
*/
@Override
public void dispose() {
setActiveEditor(null);

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/Messages.java
View file

@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Markus Schorn - initial API and implementation
* Markus Schorn - initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.internal.ui.viewsupport;
@ -14,12 +14,14 @@ import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.cdt.internal.ui.viewsupport.messages"; //$NON-NLS-1$
public static String EditorOpener_fileDoesNotExist;
public static String IndexedFilesCache_jobName;
public static String IndexUI_infoNotInIndex;
public static String IndexUI_infoNotInSource;
public static String IndexUI_infoSelectIndexAllFiles;
public static String SelectionListenerWithASTManager_jobName;
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);

12
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/messages.properties
View file

@ -1,11 +1,11 @@
################################################################################
# Copyright (c) 2007, 2008 Wind River Systems, Inc. and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
# Copyright (c) 2007, 2008 Wind River Systems, Inc. and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
# Contributors:
# Markus Schorn - initial API and implementation
################################################################################
EditorOpener_fileDoesNotExist=File ''{0}'' no longer exists