mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2011-05-20 19:05:21 +00:00
parent ac2279adea
commit ad1982ec67
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java
View file

@ -90,7 +90,7 @@ public class ExternalExportProjectProvider extends AbstractExportProjectProvider
// -id // -id
fragmentId= getSingleString(OPT_FRAGMENT_ID); fragmentId= getSingleString(OPT_FRAGMENT_ID);
return createCCProject("__"+System.currentTimeMillis(), source, includeFiles); //$NON-NLS-1$ return createCCProject("__" + System.currentTimeMillis(), source, includeFiles); //$NON-NLS-1$
} }
/** /**
@ -109,18 +109,15 @@ public class ExternalExportProjectProvider extends AbstractExportProjectProvider
* @return a new project * @return a new project
* @throws CoreException * @throws CoreException
*/ */
private ICProject createCCProject( private ICProject createCCProject(final String projectName, final File location,
final String projectName, final List<String> includeFiles) throws CoreException {
final File location,
final List<String> includeFiles
) throws CoreException {
final IWorkspace ws = ResourcesPlugin.getWorkspace(); final IWorkspace ws = ResourcesPlugin.getWorkspace();
final ICProject newProject[] = new ICProject[1]; final ICProject newProject[] = new ICProject[1];
ws.run(new IWorkspaceRunnable() { ws.run(new IWorkspaceRunnable() {
public void run(IProgressMonitor monitor) throws CoreException { public void run(IProgressMonitor monitor) throws CoreException {
IWorkspace workspace= ResourcesPlugin.getWorkspace(); IWorkspace workspace= ResourcesPlugin.getWorkspace();
IProject project= workspace.getRoot().getProject("__prebuilt_index_temp__"+System.currentTimeMillis()); //$NON-NLS-1$ IProject project= workspace.getRoot().getProject("__prebuilt_index_temp__" + System.currentTimeMillis()); //$NON-NLS-1$
IProjectDescription description = workspace.newProjectDescription(project.getName()); IProjectDescription description = workspace.newProjectDescription(project.getName());
CCorePlugin.getDefault().createCProject(description, project, NPM, PREBUILT_PROJECT_OWNER); CCorePlugin.getDefault().createCProject(description, project, NPM, PREBUILT_PROJECT_OWNER);
CCorePlugin.getDefault().convertProjectFromCtoCC(project, NPM); CCorePlugin.getDefault().convertProjectFromCtoCC(project, NPM);
@ -175,7 +172,8 @@ public class ExternalExportProjectProvider extends AbstractExportProjectProvider
} }
private ICConfigurationDescription newCfg(ICProjectDescription des, String project, String config) throws CoreException { private ICConfigurationDescription newCfg(ICProjectDescription des, String project, String config) throws CoreException {
CDefaultConfigurationData data= new CDefaultConfigurationData(project+"."+config, project+" "+config+" name", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ CDefaultConfigurationData data= new CDefaultConfigurationData(project + "." + config, //$NON-NLS-1$
project + " " + config + " name", null); //$NON-NLS-1$ //$NON-NLS-2$
data.initEmptyData(); data.initEmptyData();
return des.createConfiguration(CCorePlugin.DEFAULT_PROVIDER_ID, data); return des.createConfiguration(CCorePlugin.DEFAULT_PROVIDER_ID, data);
} }
@ -190,12 +188,12 @@ public class ExternalExportProjectProvider extends AbstractExportProjectProvider
/* /*
* @see org.eclipse.cdt.core.index.export.IExportProjectProvider#getExportProperties() * @see org.eclipse.cdt.core.index.export.IExportProjectProvider#getExportProperties()
*/ */
public Map<String,String> getExportProperties() { public Map<String, String> getExportProperties() {
Map<String,String> properties= new HashMap<String,String>(); Map<String, String> properties= new HashMap<String, String>();
Date now= Calendar.getInstance().getTime(); Date now= Calendar.getInstance().getTime();
properties.put(ORG_ECLIPSE_CDT_CORE_INDEX_EXPORT_DATESTAMP, properties.put(ORG_ECLIPSE_CDT_CORE_INDEX_EXPORT_DATESTAMP,
DateFormat.getDateInstance().format(now) DateFormat.getDateInstance().format(now)
+" "+DateFormat.getTimeInstance().format(now)); //$NON-NLS-1$ + " " + DateFormat.getTimeInstance().format(now)); //$NON-NLS-1$
properties.put(IIndexFragment.PROPERTY_FRAGMENT_ID, fragmentId); properties.put(IIndexFragment.PROPERTY_FRAGMENT_ID, fragmentId);
return properties; return properties;
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java
View file

@ -467,7 +467,7 @@ public class IndexUI {
if (props == null || !"true".equals(props.get(IndexerPreferences.KEY_INDEX_ALL_FILES)) || //$NON-NLS-1$ if (props == null || !"true".equals(props.get(IndexerPreferences.KEY_INDEX_ALL_FILES)) || //$NON-NLS-1$
(!"true".equals(props.get(IndexerPreferences.KEY_INDEX_UNUSED_HEADERS_WITH_DEFAULT_LANG)) && //$NON-NLS-1$ (!"true".equals(props.get(IndexerPreferences.KEY_INDEX_UNUSED_HEADERS_WITH_DEFAULT_LANG)) && //$NON-NLS-1$
!"true".equals(props.get(IndexerPreferences.KEY_INDEX_UNUSED_HEADERS_WITH_ALTERNATE_LANG)))) { //$NON-NLS-1$ !"true".equals(props.get(IndexerPreferences.KEY_INDEX_UNUSED_HEADERS_WITH_ALTERNATE_LANG)))) { //$NON-NLS-1$
msg= msg+ " " + Messages.IndexUI_infoSelectIndexAllFiles; //$NON-NLS-1$ msg= msg + " " + Messages.IndexUI_infoSelectIndexAllFiles; //$NON-NLS-1$
} }
} }
return msg; return msg;