From 0d95c85386fba3946b8e9208a89d7a677ef91148 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Sat, 20 Aug 2011 16:23:05 -0700 Subject: [PATCH] Cosmetics. --- .../cdt/internal/index/tests/IndexBugsTests.java | 12 +++++------- .../index/composite/c/CompositeCStructure.java | 16 ++++++++-------- .../internal/core/pdom/dom/c/PDOMCStructure.java | 11 +++++------ 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java index e4bc6555ffc..cbbeb1f6ce3 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java @@ -551,10 +551,11 @@ public class IndexBugsTests extends BaseTestCase { fIndex.releaseReadLock(); } } + public void test164360_1() throws Exception { waitForIndexer(); IFile include= TestSourceReader.createFile(fCProject.getProject(), "test164360.h", ""); - TestScannerProvider.sIncludeFiles= new String[]{include.getLocation().toOSString()}; + TestScannerProvider.sIncludeFiles= new String[] { include.getLocation().toOSString() }; IFile file= TestSourceReader.createFile(fCProject.getProject(), "test164360.cpp", ""); TestSourceReader.waitUntilFileIsIndexed(fIndex, file, INDEX_WAIT_TIME); @@ -696,8 +697,7 @@ public class IndexBugsTests extends BaseTestCase { if (bindings[0] instanceof ICompositeType) { struct= bindings[0]; typedef= bindings[1]; - } - else { + } else { struct= bindings[1]; typedef= bindings[0]; } @@ -730,8 +730,7 @@ public class IndexBugsTests extends BaseTestCase { if (bindings[0] instanceof ICPPClassType) { struct= bindings[0]; typedef= bindings[1]; - } - else { + } else { struct= bindings[1]; typedef= bindings[0]; } @@ -1149,8 +1148,7 @@ public class IndexBugsTests extends BaseTestCase { assertEquals(1, bindings.length); IIndexBinding binding = bindings[0]; assertTrue(binding instanceof IVariable); - IIndexName[] names = index.findNames(binding, - IIndex.FIND_ALL_OCCURRENCES); + IIndexName[] names = index.findNames(binding, IIndex.FIND_ALL_OCCURRENCES); assertEquals(1, names.length); assertEquals(f4.getFullPath().toString(), names[0].getFile().getLocation().getFullPath()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCStructure.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCStructure.java index e43876a24c5..35a5891b69b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCStructure.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCStructure.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Andrew Ferguson (Symbian) - Initial implementation + * Andrew Ferguson (Symbian) - Initial implementation *******************************************************************************/ package org.eclipse.cdt.internal.core.index.composite.c; @@ -25,7 +25,7 @@ class CompositeCStructure extends CompositeCBinding implements ICompositeType, I } public IField findField(String name) { - IField preresult = ((ICompositeType)rbinding).findField(name); + IField preresult = ((ICompositeType) rbinding).findField(name); return (IField) cf.getCompositeBinding((IIndexFragmentBinding) preresult); } @@ -34,24 +34,24 @@ class CompositeCStructure extends CompositeCBinding implements ICompositeType, I } public IField[] getFields() { - IField[] result = ((ICompositeType)rbinding).getFields(); - for(int i=0; i