44 plugins/com.aptana.index.core/src/com/aptana/index/core/IndexRequestJob.java
View file
@@ -33,6 +33,8 @@
import org.eclipse.core.runtime.content.IContentTypeManager;
import org.eclipse.core.runtime.jobs.Job;

import com.aptana.core.logging.IdeLog;

abstract class IndexRequestJob extends Job
{
/**
@@ -119,19 +121,19 @@ private IFileStoreIndexingParticipant createParticipant(IConfigurationElement ke
}
catch (NumberFormatException e)
{
// TODO: Adding logging once we fix the circular dependency from aptana.core
IndexPlugin.logError(e.getMessage(), e);
IdeLog.logError(IndexPlugin.getDefault(), e);
}

IFileStoreIndexingParticipant result = (IFileStoreIndexingParticipant) key.createExecutableExtension(ATTR_CLASS);
IFileStoreIndexingParticipant result = (IFileStoreIndexingParticipant) key
.createExecutableExtension(ATTR_CLASS);

result.setPriority(priority);

return result;
}
catch (CoreException e)
{
IndexPlugin.logError(e);
IdeLog.logError(IndexPlugin.getDefault(), e);
}

return null;
@@ -203,7 +205,8 @@ private List<IIndexFileContributor> getFileContributors()

if (registry != null)
{
IExtensionPoint extensionPoint = registry.getExtensionPoint(IndexPlugin.PLUGIN_ID, FILE_CONTRIBUTORS_ID);
IExtensionPoint extensionPoint = registry
.getExtensionPoint(IndexPlugin.PLUGIN_ID, FILE_CONTRIBUTORS_ID);

if (extensionPoint != null)
{
@@ -215,13 +218,14 @@ private List<IIndexFileContributor> getFileContributors()
{
try
{
IIndexFileContributor participant = (IIndexFileContributor) element.createExecutableExtension(ATTR_CLASS);
IIndexFileContributor participant = (IIndexFileContributor) element
.createExecutableExtension(ATTR_CLASS);

fileContributors.add(participant);
}
catch (CoreException e)
{
IndexPlugin.logError(e);
IdeLog.logError(IndexPlugin.getDefault(), e);
}
}
}
@@ -247,7 +251,8 @@ private Map<IConfigurationElement, Set<IContentType>> getFileIndexingParticipant
return map;
}

IExtensionPoint extensionPoint = registry.getExtensionPoint(IndexPlugin.PLUGIN_ID, FILE_INDEXING_PARTICIPANTS_ID);
IExtensionPoint extensionPoint = registry.getExtensionPoint(IndexPlugin.PLUGIN_ID,
FILE_INDEXING_PARTICIPANTS_ID);
if (extensionPoint == null)
{
return map;
@@ -295,7 +300,8 @@ private List<IIndexFilterParticipant> getFilterParticipants()

if (registry != null)
{
IExtensionPoint extensionPoint = registry.getExtensionPoint(IndexPlugin.PLUGIN_ID, INDEX_FILTER_PARTICIPANTS_ID);
IExtensionPoint extensionPoint = registry.getExtensionPoint(IndexPlugin.PLUGIN_ID,
INDEX_FILTER_PARTICIPANTS_ID);

if (extensionPoint != null)
{
@@ -307,13 +313,14 @@ private List<IIndexFilterParticipant> getFilterParticipants()
{
try
{
IIndexFilterParticipant participant = (IIndexFilterParticipant) element.createExecutableExtension(ATTR_CLASS);
IIndexFilterParticipant participant = (IIndexFilterParticipant) element
.createExecutableExtension(ATTR_CLASS);

this.filterParticipants.add(participant);
}
catch (CoreException e)
{
IndexPlugin.logError(e);
IdeLog.logError(IndexPlugin.getDefault(), e);
}
}
}
@@ -371,7 +378,8 @@ protected boolean hasType(IFileStore store, Set<IContentType> types)
* @param monitor
* @throws CoreException
*/
protected void indexFileStores(Index index, Set<IFileStore> fileStores, IProgressMonitor monitor) throws CoreException
protected void indexFileStores(Index index, Set<IFileStore> fileStores, IProgressMonitor monitor)
throws CoreException
{
fileStores = this.filterFileStores(fileStores);

@@ -424,7 +432,7 @@ protected void indexFileStores(Index index, Set<IFileStore> fileStores, IProgres
}
catch (CoreException e)
{
IndexPlugin.logError(e);
IdeLog.logError(IndexPlugin.getDefault(), e);
}
}
}
@@ -442,7 +450,8 @@ protected void indexFileStores(Index index, Set<IFileStore> fileStores, IProgres
* @param fileStores
* @return
*/
protected List<Map.Entry<IFileStoreIndexingParticipant, Set<IFileStore>>> mapParticipantsToFiles(Set<IFileStore> fileStores)
protected List<Map.Entry<IFileStoreIndexingParticipant, Set<IFileStore>>> mapParticipantsToFiles(
Set<IFileStore> fileStores)
{
Map<IFileStoreIndexingParticipant, Set<IFileStore>> participantMap = new HashMap<IFileStoreIndexingParticipant, Set<IFileStore>>();
Map<IConfigurationElement, Set<IContentType>> participants = getFileIndexingParticipants();
@@ -472,12 +481,13 @@ protected List<Map.Entry<IFileStoreIndexingParticipant, Set<IFileStore>>> mapPar
}
}

List<Map.Entry<IFileStoreIndexingParticipant, Set<IFileStore>>> result =
new ArrayList<Map.Entry<IFileStoreIndexingParticipant, Set<IFileStore>>>(participantMap.entrySet());
List<Map.Entry<IFileStoreIndexingParticipant, Set<IFileStore>>> result = new ArrayList<Map.Entry<IFileStoreIndexingParticipant, Set<IFileStore>>>(
participantMap.entrySet());

Collections.sort(result, new Comparator<Map.Entry<IFileStoreIndexingParticipant, Set<IFileStore>>>()
{
public int compare(Entry<IFileStoreIndexingParticipant, Set<IFileStore>> arg0, Entry<IFileStoreIndexingParticipant, Set<IFileStore>> arg1)
public int compare(Entry<IFileStoreIndexingParticipant, Set<IFileStore>> arg0,
Entry<IFileStoreIndexingParticipant, Set<IFileStore>> arg1)
{
// sort higher first
return arg1.getKey().getPriority() - arg0.getKey().getPriority();
6 plugins/com.aptana.index.core/src/com/aptana/index/core/IndexUtil.java
View file
@@ -13,6 +13,8 @@

import org.mortbay.util.ajax.JSON.Convertible;

import com.aptana.core.logging.IdeLog;

/**
* IndexUtil
*/
@@ -58,11 +60,11 @@ public static <T extends Convertible> List<T> createList(Object object, Class<T>
}
catch (InstantiationException e)
{
IndexPlugin.logError(e.getMessage(), e);
IdeLog.logError(IndexPlugin.getDefault(), e);
}
catch (IllegalAccessException e)
{
IndexPlugin.logError(e.getMessage(), e);
IdeLog.logError(IndexPlugin.getDefault(), e);
}
}
}
7 plugins/com.aptana.index.core/src/com/aptana/index/core/RemoveIndexOfFilesOfProjectJob.java
View file
@@ -18,6 +18,8 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubMonitor;

import com.aptana.core.logging.IdeLog;

public class RemoveIndexOfFilesOfProjectJob extends IndexRequestJob
{

@@ -67,11 +69,10 @@ public IStatus run(IProgressMonitor monitor)
}
catch (IOException e)
{
IndexPlugin.logError(e.getMessage(), e);
IdeLog.logError(IndexPlugin.getDefault(), e);
}
sub.done();
}
return Status.OK_STATUS;
}

}
}