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

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2014-01-02 16:44:38 -08:00
parent cafab91ca1
commit c95730601b
10 changed files with 284 additions and 284 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

405
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java
View file

File diff suppressed because it is too large Load diff

22
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ISourceReference.java
View file

@ -14,9 +14,9 @@ package org.eclipse.cdt.core.model;
/** /**
* Common protocol for C elements that have associated source code. * Common protocol for C elements that have associated source code.
* <p> * <p>
* Note: For <code>IBinary</code>, <code>IArchive</code> and other members * Note: For {@code IBinary}, {@code IArchive} and other members
* derived from a binary type, the implementation returns source iff the * derived from a binary type, the implementation returns source iff the element
* element has attached source code and debuging information. * has attached source code and debugging information.
* *
* @noextend This interface is not intended to be extended by clients. * @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients. * @noimplement This interface is not intended to be implemented by clients.
@ -27,12 +27,11 @@ public interface ISourceReference {
* <p> * <p>
* For binary files, this returns the source of the entire translation unit * For binary files, this returns the source of the entire translation unit
* associated with the binary file (if there is one). * associated with the binary file (if there is one).
* </p>
* *
* @return the source code, or <code>null</code> if this element has no * @return the source code, or {@code null} if this element has no
* associated source code * associated source code
* @exception CModelException if this element does not exist or if an * @exception CModelException if this element does not exist or if an
* exception occurs while accessing its corresponding resource * exception occurs while accessing its corresponding resource
*/ */
String getSource() throws CModelException; String getSource() throws CModelException;
@ -41,17 +40,16 @@ public interface ISourceReference {
* <p> * <p>
* For binary files, this returns the range of the entire translation unit * For binary files, this returns the range of the entire translation unit
* associated with the binary file (if there is one). * associated with the binary file (if there is one).
* </p>
* *
* @return the source range, or <code>null</code> if if this element has no * @return the source range, or {@code null} if if this element has no
* associated source code * associated source code
* @exception CModelException if this element does not exist or if an * @exception CModelException if this element does not exist or if an
* exception occurs while accessing its corresponding resource * exception occurs while accessing its corresponding resource
*/ */
ISourceRange getSourceRange() throws CModelException; ISourceRange getSourceRange() throws CModelException;
/** /**
* Returns the translation unit in which this member is declared, or <code>null</code> * Returns the translation unit in which this member is declared, or {@code null}
* if this member is not declared in a translation unit (for example, a binary type). * if this member is not declared in a translation unit (for example, a binary type).
*/ */
ITranslationUnit getTranslationUnit(); ITranslationUnit getTranslationUnit();

98
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndexManager.java
View file

@ -8,7 +8,7 @@
* Contributors: * Contributors:
* Markus Schorn - initial API and implementation * Markus Schorn - initial API and implementation
* Sergey Prigogin (Google) * Sergey Prigogin (Google)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.core.index; package org.eclipse.cdt.core.index;
import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePlugin;
@ -21,10 +21,10 @@ import org.eclipse.core.runtime.IProgressMonitor;
/** /**
* Starting point for working with the index. The manager can be obtained via * Starting point for working with the index. The manager can be obtained via
* {@link CCorePlugin#getIndexManager()}. * {@link CCorePlugin#getIndexManager()}.
* *
* @noextend This interface is not intended to be extended by clients. * @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients. * @noimplement This interface is not intended to be implemented by clients.
* *
* @since 4.0 * @since 4.0
*/ */
public interface IIndexManager extends IPDOMManager { public interface IIndexManager extends IPDOMManager {
@ -41,27 +41,27 @@ public interface IIndexManager extends IPDOMManager {
* added to the resulting index. * added to the resulting index.
*/ */
public static final int ADD_DEPENDENT = 0x2; public static final int ADD_DEPENDENT = 0x2;
/** /**
* @deprecated Extension fragments are now used depending on their configuration. * @deprecated Extension fragments are now used depending on their configuration.
* Use one of the ADD_EXTENSION_XX flags instead. * Use one of the ADD_EXTENSION_XX flags instead.
*/ */
@Deprecated @Deprecated
public static final int SKIP_PROVIDED = 0x4; public static final int SKIP_PROVIDED = 0x4;
/** /**
* Constant for passing to getIndex methods. This constant, when set, indicates that each index * Constant for passing to getIndex methods. This constant, when set, indicates that each index
* content provided via the ReadOnlyIndexFragmentProvider or ReadOnlyPDOMProvider, which is not * content provided via the ReadOnlyIndexFragmentProvider or ReadOnlyPDOMProvider, which is not
* disabled for navigation shall be included in the resulting index. * disabled for navigation shall be included in the resulting index.
* *
* @since 5.4 * @since 5.4
*/ */
public static final int ADD_EXTENSION_FRAGMENTS_NAVIGATION = 0x8; public static final int ADD_EXTENSION_FRAGMENTS_NAVIGATION = 0x8;
/** /**
* Constant for passing to getIndex methods. This constant, when set, indicates that the each index * Constant for passing to getIndex methods. This constant, when set, indicates that the each
* content provided via the ReadOnlyIndexFragmentProvider or ReadOnlyPDOMProvider, which is not * index content provided via the ReadOnlyIndexFragmentProvider or ReadOnlyPDOMProvider, which
* disabled for content assist shall be included in the resulting index. * is not disabled for content assist shall be included in the resulting index.
* *
* @since 5.4 * @since 5.4
*/ */
@ -69,8 +69,8 @@ public interface IIndexManager extends IPDOMManager {
/** /**
* Constant for passing to getIndex methods. This constant, when set, indicates that each index * Constant for passing to getIndex methods. This constant, when set, indicates that each index
* content provided via the ReadOnlyIndexFragmentProvider or ReadOnlyPDOMProvider, which is not * content provided via the ReadOnlyIndexFragmentProvider or ReadOnlyPDOMProvider, which is not
* disabled for add import shall be included in the resulting index. * disabled for add import shall be included in the resulting index.
* *
* @since 5.4 * @since 5.4
*/ */
@ -78,8 +78,8 @@ public interface IIndexManager extends IPDOMManager {
/** /**
* Constant for passing to getIndex methods. This constant, when set, indicates that each index * Constant for passing to getIndex methods. This constant, when set, indicates that each index
* content provided via the ReadOnlyIndexFragmentProvider or ReadOnlyPDOMProvider, which is not * content provided via the ReadOnlyIndexFragmentProvider or ReadOnlyPDOMProvider, which is not
* disabled for the call hierarchy shall be included in the resulting index. * disabled for the call hierarchy shall be included in the resulting index.
* *
* @since 5.4 * @since 5.4
*/ */
@ -87,8 +87,8 @@ public interface IIndexManager extends IPDOMManager {
/** /**
* Constant for passing to getIndex methods. This constant, when set, indicates that each index * Constant for passing to getIndex methods. This constant, when set, indicates that each index
* content provided via the ReadOnlyIndexFragmentProvider or ReadOnlyPDOMProvider, which is not * content provided via the ReadOnlyIndexFragmentProvider or ReadOnlyPDOMProvider, which is not
* disabled for the type hierarchy shall be included in the resulting index. * disabled for the type hierarchy shall be included in the resulting index.
* *
* @since 5.4 * @since 5.4
*/ */
@ -96,8 +96,8 @@ public interface IIndexManager extends IPDOMManager {
/** /**
* Constant for passing to getIndex methods. This constant, when set, indicates that each index * Constant for passing to getIndex methods. This constant, when set, indicates that each index
* content provided via the ReadOnlyIndexFragmentProvider or ReadOnlyPDOMProvider, which is not * content provided via the ReadOnlyIndexFragmentProvider or ReadOnlyPDOMProvider, which is not
* disabled for the include browser shall be included in the resulting index. * disabled for the include browser shall be included in the resulting index.
* *
* @since 5.4 * @since 5.4
*/ */
@ -105,28 +105,28 @@ public interface IIndexManager extends IPDOMManager {
/** /**
* Constant for passing to getIndex methods. This constant, when set, indicates that each index * Constant for passing to getIndex methods. This constant, when set, indicates that each index
* content provided via the ReadOnlyIndexFragmentProvider or ReadOnlyPDOMProvider, which is not * content provided via the ReadOnlyIndexFragmentProvider or ReadOnlyPDOMProvider, which is not
* disabled for the search shall be included in the resulting index. * disabled for the search shall be included in the resulting index.
* *
* @since 5.4 * @since 5.4
*/ */
public static final int ADD_EXTENSION_FRAGMENTS_SEARCH = 0x200; public static final int ADD_EXTENSION_FRAGMENTS_SEARCH = 0x200;
/** /**
* Constant for passing to getIndex methods. This constant, when set, indicates that each index * Constant for passing to getIndex methods. This constant, when set, indicates that each index
* content provided via the ReadOnlyIndexFragmentProvider or ReadOnlyPDOMProvider, which is not * content provided via the ReadOnlyIndexFragmentProvider or ReadOnlyPDOMProvider, which is not
* disabled for the editor shall be included in the resulting index. * disabled for the editor shall be included in the resulting index.
* *
* @since 5.5 * @since 5.5
*/ */
public static final int ADD_EXTENSION_FRAGMENTS_EDITOR = 0x400; public static final int ADD_EXTENSION_FRAGMENTS_EDITOR = 0x400;
/** /**
* Constant for indicating that there is no time out period for joining the indexer job. * Constant for indicating that there is no time out period for joining the indexer job.
* @see IIndexManager#joinIndexer(int, IProgressMonitor) * @see IIndexManager#joinIndexer(int, IProgressMonitor)
*/ */
public static final int FOREVER= -1; public static final int FOREVER= -1;
/** /**
* Constant for requesting an update of all translation units. * Constant for requesting an update of all translation units.
*/ */
@ -155,7 +155,7 @@ public interface IIndexManager extends IPDOMManager {
* This flag modifies behavior of UPDATE_CHECK_TIMESTAMPS. Both, the timestamp and the hash * This flag modifies behavior of UPDATE_CHECK_TIMESTAMPS. Both, the timestamp and the hash
* of the contents of a translation unit, have to change in order to trigger re-indexing. * of the contents of a translation unit, have to change in order to trigger re-indexing.
* Checking for content changes may reduce indexing overhead for projects that use code * Checking for content changes may reduce indexing overhead for projects that use code
* generation since generated files are sometimes recreated with identical contents. * generation since generated files are sometimes recreated with identical contents.
* @since 5.2 * @since 5.2
*/ */
public static final int UPDATE_CHECK_CONTENTS_HASH= 0x10; public static final int UPDATE_CHECK_CONTENTS_HASH= 0x10;
@ -163,7 +163,7 @@ public interface IIndexManager extends IPDOMManager {
/** /**
* Include files that are otherwise would be excluded from the index. This flag is sticky * Include files that are otherwise would be excluded from the index. This flag is sticky
* for the duration of the Eclipse session. If the files are later updated without this flag, * for the duration of the Eclipse session. If the files are later updated without this flag,
* they remain in the index. * they remain in the index.
* @since 5.3 * @since 5.3
*/ */
public static final int FORCE_INDEX_INCLUSION= 0x20; public static final int FORCE_INDEX_INCLUSION= 0x20;
@ -199,18 +199,23 @@ public interface IIndexManager extends IPDOMManager {
IIndex getIndex(ICProject[] projects) throws CoreException; IIndex getIndex(ICProject[] projects) throws CoreException;
/** /**
* Returns the index for the given project. You can specify to add dependencies or dependent projects. * Returns the index for the given project. You can specify to add dependencies or dependent
* projects.
*
* @param project the project to get the index for * @param project the project to get the index for
* @param options <code>0</code> or a combination of {@link #ADD_DEPENDENCIES} and {@link #ADD_DEPENDENT}. * @param options <code>0</code> or a combination of {@link #ADD_DEPENDENCIES} and
* {@link #ADD_DEPENDENT}.
* @return an index for the project * @return an index for the project
* @throws CoreException * @throws CoreException
*/ */
IIndex getIndex(ICProject project, int options) throws CoreException; IIndex getIndex(ICProject project, int options) throws CoreException;
/** /**
* Returns the index for the given projects. You can specify to add dependencies or dependent projects. * Returns the index for the given projects. You can specify to add dependencies or dependent
* projects.
* @param projects the projects to get the index for * @param projects the projects to get the index for
* @param options <code>0</code> or a combination of {@link #ADD_DEPENDENCIES} and {@link #ADD_DEPENDENT}. * @param options <code>0</code> or a combination of {@link #ADD_DEPENDENCIES} and
* {@link #ADD_DEPENDENT}.
* @return an index for the projects * @return an index for the projects
* @throws CoreException * @throws CoreException
*/ */
@ -227,7 +232,7 @@ public interface IIndexManager extends IPDOMManager {
* @param listener the listener to unregister. * @param listener the listener to unregister.
*/ */
void removeIndexChangeListener(IIndexChangeListener listener); void removeIndexChangeListener(IIndexChangeListener listener);
/** /**
* Registers a listener that will be notified whenever the indexer changes its state. * Registers a listener that will be notified whenever the indexer changes its state.
* @param listener the listener to register. * @param listener the listener to register.
@ -239,33 +244,33 @@ public interface IIndexManager extends IPDOMManager {
* @param listener the listener to unregister. * @param listener the listener to unregister.
*/ */
void removeIndexerStateListener(IIndexerStateListener listener); void removeIndexerStateListener(IIndexerStateListener listener);
/** /**
* Joins the indexer and reports progress. * Joins the indexer and reports progress.
* @param waitMaxMillis time limit in millis after which the method returns with <code>false</code>, * @param waitMaxMillis time limit in milliseconds after which the method returns with
* or {@link #FOREVER}. * {@code false}, or {@link #FOREVER}.
* @param monitor a monitor to report progress. * @param monitor a monitor to report progress.
* @return <code>true</code>, if the indexer went idle in the given time. * @return <code>true</code>, if the indexer went idle in the given time.
*/ */
boolean joinIndexer(int waitMaxMillis, IProgressMonitor monitor); boolean joinIndexer(int waitMaxMillis, IProgressMonitor monitor);
/** /**
* Checks whether the indexer is currently idle. The indexer is idle, when there is currently no request * Checks whether the indexer is currently idle. The indexer is idle, when there is currently no request
* to update files of an index and no initialization for a project is performed. However, the indexer becomes * to update files of an index and no initialization for a project is performed. However, the indexer becomes
* idle, when the setup of a project is postponed (check with {@link #isIndexerSetupPostponed(ICProject)}). * idle, when the setup of a project is postponed (check with {@link #isIndexerSetupPostponed(ICProject)}).
*/ */
boolean isIndexerIdle(); boolean isIndexerIdle();
/** /**
* Returns whether an indexer is selected for the project. * Returns whether an indexer is selected for the project.
* @since 4.0 * @since 4.0
*/ */
boolean isProjectIndexed(ICProject proj); boolean isProjectIndexed(ICProject proj);
/** /**
* Return whether the indexer-setup for a project is currently postponed. Note, * Return whether the indexer-setup for a project is currently postponed. Note,
* that a postponed setup does not prevent the indexer from becoming idle ({@link #isIndexerIdle()}. * that a postponed setup does not prevent the indexer from becoming idle ({@link #isIndexerIdle()}.
* The fact that the indexer-setup for a project is no longer postponed, will be reported using * The fact that the indexer-setup for a project is no longer postponed, will be reported using
* {@link IndexerSetupParticipant#onIndexerSetup(ICProject)}. * {@link IndexerSetupParticipant#onIndexerSetup(ICProject)}.
*/ */
boolean isIndexerSetupPostponed(ICProject proj); boolean isIndexerSetupPostponed(ICProject proj);
@ -283,7 +288,7 @@ public interface IIndexManager extends IPDOMManager {
*/ */
@Override @Override
public void setIndexerId(ICProject project, String indexerId); public void setIndexerId(ICProject project, String indexerId);
/** /**
* Clears the entire index of the project and schedules the indexer. * Clears the entire index of the project and schedules the indexer.
* @since 4.0 * @since 4.0
@ -302,22 +307,23 @@ public interface IIndexManager extends IPDOMManager {
* @since 4.0 * @since 4.0
*/ */
public void update(ICElement[] tuSelection, int options) throws CoreException; public void update(ICElement[] tuSelection, int options) throws CoreException;
/** /**
* Export index for usage within a team. * Export index for usage within a team.
* @param project a project for which the pdom is to be exported. * @param project a project for which the PDOM is to be exported.
* @param location the target location for the database. * @param location the target location for the database.
* @param options currently none are supported. * @param options currently none are supported.
* @throws CoreException * @throws CoreException
* @since 4.0 * @since 4.0
*/ */
public void export(ICProject project, String location, int options, IProgressMonitor monitor) throws CoreException; public void export(ICProject project, String location, int options, IProgressMonitor monitor)
throws CoreException;
/** /**
* Adds a participant for the indexer-setup * Adds a participant for the indexer-setup
*/ */
public void addIndexerSetupParticipant(IndexerSetupParticipant participant); public void addIndexerSetupParticipant(IndexerSetupParticipant participant);
/** /**
* Removes a participant for the indexer-setup * Removes a participant for the indexer-setup
*/ */

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragment.java
View file

@ -328,7 +328,7 @@ public interface IIndexFragment {
IIndexFragmentFile[] getDefectiveFiles() throws CoreException; IIndexFragmentFile[] getDefectiveFiles() throws CoreException;
/** /**
* @return an array of files containg unresolved includes. * @return an array of files containing unresolved includes.
*/ */
IIndexFragmentFile[] getFilesWithUnresolvedIncludes() throws CoreException; IIndexFragmentFile[] getFilesWithUnresolvedIncludes() throws CoreException;

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IWritableIndexFragment.java
View file

@ -10,7 +10,6 @@
* Andrew Ferguson (Symbian) * Andrew Ferguson (Symbian)
* Sergey Prigogin (Google) * Sergey Prigogin (Google)
******************************************************************************/ ******************************************************************************/
package org.eclipse.cdt.internal.core.index; package org.eclipse.cdt.internal.core.index;
import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTName;
@ -26,7 +25,6 @@ import org.eclipse.core.runtime.CoreException;
* The interface that an actual storage for an index has to implement. * The interface that an actual storage for an index has to implement.
*/ */
public interface IWritableIndexFragment extends IIndexFragment { public interface IWritableIndexFragment extends IIndexFragment {
/** /**
* Clears the entire fragment. * Clears the entire fragment.
*/ */

24
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java
View file

@ -521,7 +521,7 @@ public class PDOMManager implements IWritableIndexManager, IListener {
enqueue(new NotifyCModelManagerTask(cproject.getProject())); enqueue(new NotifyCModelManagerTask(cproject.getProject()));
} }
} }
if (IndexerPreferences.getReindexOnIndexerChange(cproject.getProject())) { if (IndexerPreferences.getReindexOnIndexerChange(cproject.getProject())) {
enqueue(new PDOMRebuildTask(indexer)); enqueue(new PDOMRebuildTask(indexer));
} }
@ -575,9 +575,9 @@ public class PDOMManager implements IWritableIndexManager, IListener {
IndexUpdatePolicy policy= createPolicy(project); IndexUpdatePolicy policy= createPolicy(project);
boolean rebuild= boolean rebuild=
pdom.isClearedBecauseOfVersionMismatch() || pdom.isClearedBecauseOfVersionMismatch() ||
pdom.isCreatedFromScratch() || pdom.isCreatedFromScratch() ||
policy.isInitialRebuildRequested(); policy.isInitialRebuildRequested();
if (rebuild) { if (rebuild) {
if (IPDOMManager.ID_NO_INDEXER.equals(indexer.getID())) { if (IPDOMManager.ID_NO_INDEXER.equals(indexer.getID())) {
rebuild= false; rebuild= false;
@ -1535,7 +1535,7 @@ public class PDOMManager implements IWritableIndexManager, IListener {
/** /**
* @param cproject the project to check * @param cproject the project to check
* @return whether the content in the project fragment of the specified project's index * @return whether the content in the project fragment of the specified project's index
* is complete (contains all sources) and up to date. * is complete (contains all sources) and up to date.
* @throws CoreException * @throws CoreException
*/ */
public boolean isProjectContentSynced(ICProject cproject) throws CoreException { public boolean isProjectContentSynced(ICProject cproject) throws CoreException {
@ -1544,11 +1544,11 @@ public class PDOMManager implements IWritableIndexManager, IListener {
} }
/** /**
* Checks whether the index is in sync with the file system. * Checks whether the index is in sync with the file system.
* @param cproject the project to check * @param cproject the project to check
* @return <code>null</code> when the content in the project fragment of the specified project's index * @return {@code null} when the content in the project fragment of the specified project's
* is complete (contains all sources) and up to date; or an @link{IStatus} indicating the first * index is complete (contains all sources) and up to date; or an {@link IStatus} indicating
* occurrence of an index file found not up-to-date, along with its include trail. * the first occurrence of an index file found not up-to-date, along with its include trail.
* @throws CoreException in case of a file access or other internal error * @throws CoreException in case of a file access or other internal error
*/ */
public IStatus getProjectContentSyncState(ICProject cproject) throws CoreException { public IStatus getProjectContentSyncState(ICProject cproject) throws CoreException {
@ -1567,7 +1567,7 @@ public class PDOMManager implements IWritableIndexManager, IListener {
IResource resource= tu.getResource(); IResource resource= tu.getResource();
if (resource instanceof IFile && isSubjectToIndexing(tu.getLanguage())) { if (resource instanceof IFile && isSubjectToIndexing(tu.getLanguage())) {
IIndexFileLocation location= IndexLocationFactory.getWorkspaceIFL((IFile) resource); IIndexFileLocation location= IndexLocationFactory.getWorkspaceIFL((IFile) resource);
syncStatus = areSynchronized(new HashSet<IIndexFileLocation>(), index, resource, location); syncStatus = areSynchronized(new HashSet<IIndexFileLocation>(), index, resource, location);
if (syncStatus != null) { if (syncStatus != null) {
return syncStatus; return syncStatus;
} }
@ -1613,7 +1613,7 @@ public class PDOMManager implements IWritableIndexManager, IListener {
return new MultiStatus(CCorePlugin.PLUGIN_ID, IStatus.OK, "No index file found for: " + location, null); //$NON-NLS-1$ return new MultiStatus(CCorePlugin.PLUGIN_ID, IStatus.OK, "No index file found for: " + location, null); //$NON-NLS-1$
for (IIndexFile file : files) { for (IIndexFile file : files) {
long diff = resource.getLocalTimeStamp() - file.getTimestamp(); long diff = resource.getLocalTimeStamp() - file.getTimestamp();
if (diff != 0) { if (diff != 0) {
return new MultiStatus(CCorePlugin.PLUGIN_ID, IStatus.OK, return new MultiStatus(CCorePlugin.PLUGIN_ID, IStatus.OK,
"Index timestamp for '" //$NON-NLS-1$ "Index timestamp for '" //$NON-NLS-1$
@ -1632,7 +1632,7 @@ public class PDOMManager implements IWritableIndexManager, IListener {
String path= newLocation.getFullPath(); String path= newLocation.getFullPath();
if (path != null) { if (path != null) {
IResource newResource= ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(path)); IResource newResource= ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(path));
MultiStatus m = areSynchronized(trail, index, newResource, newLocation); MultiStatus m = areSynchronized(trail, index, newResource, newLocation);
if (m != null) { if (m != null) {
m.add(new Status(IStatus.INFO, CCorePlugin.PLUGIN_ID, m.add(new Status(IStatus.INFO, CCorePlugin.PLUGIN_ID,
"Included by " + file.getLocation().getFullPath())); //$NON-NLS-1$ "Included by " + file.getLocation().getFullPath())); //$NON-NLS-1$

3
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/SearchTestSuite.java
View file

@ -6,9 +6,8 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Andrew Ferguson (Symbian) - Initial implementation * Andrew Ferguson (Symbian) - Initial implementation
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.ui.tests.search; package org.eclipse.cdt.ui.tests.search;
import junit.framework.TestSuite; import junit.framework.TestSuite;

1
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/UpdateUnresolvedIncludesAction.java
View file

@ -13,7 +13,6 @@ package org.eclipse.cdt.internal.ui.actions;
import org.eclipse.cdt.core.index.IIndexManager; import org.eclipse.cdt.core.index.IIndexManager;
public class UpdateUnresolvedIncludesAction extends AbstractUpdateIndexAction { public class UpdateUnresolvedIncludesAction extends AbstractUpdateIndexAction {
@Override @Override
protected int getUpdateOptions() { protected int getUpdateOptions() {
return IIndexManager.UPDATE_UNRESOLVED_INCLUDES; return IIndexManager.UPDATE_UNRESOLVED_INCLUDES;

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/UpdateUnresolvedIncludesHandler.java
View file

@ -10,7 +10,6 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.ui.actions; package org.eclipse.cdt.internal.ui.actions;
/** /**
* Handler for {@link org.eclipse.cdt.internal.ui.actions.UpdateIndexWithModifiedFilesAction} * Handler for {@link org.eclipse.cdt.internal.ui.actions.UpdateIndexWithModifiedFilesAction}
* *
@ -18,7 +17,6 @@ package org.eclipse.cdt.internal.ui.actions;
* @noinstantiate This class is not intended to be instantiated by clients. * @noinstantiate This class is not intended to be instantiated by clients.
*/ */
public class UpdateUnresolvedIncludesHandler extends AbstractUpdateIndexHandler { public class UpdateUnresolvedIncludesHandler extends AbstractUpdateIndexHandler {
private final UpdateUnresolvedIncludesAction updateAction = new UpdateUnresolvedIncludesAction(); private final UpdateUnresolvedIncludesAction updateAction = new UpdateUnresolvedIncludesAction();
@Override @Override

9
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchElement.java
View file

@ -24,18 +24,17 @@ import org.eclipse.cdt.core.index.IIndexFileLocation;
* @author Doug Schaefer * @author Doug Schaefer
*/ */
public class CSearchElement implements IAdaptable { public class CSearchElement implements IAdaptable {
private final IIndexFileLocation location; private final IIndexFileLocation location;
public CSearchElement(IIndexFileLocation loc) { public CSearchElement(IIndexFileLocation loc) {
this.location= loc; this.location= loc;
} }
@Override @Override
public int hashCode() { public int hashCode() {
return location.hashCode(); return location.hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (!(obj instanceof CSearchElement)) if (!(obj instanceof CSearchElement))
@ -47,7 +46,7 @@ public class CSearchElement implements IAdaptable {
final IIndexFileLocation getLocation() { final IIndexFileLocation getLocation() {
return location; return location;
} }
@Override @Override
@SuppressWarnings({ "unchecked", "rawtypes" }) @SuppressWarnings({ "unchecked", "rawtypes" })
public Object getAdapter(Class adapterType) { public Object getAdapter(Class adapterType) {