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

getProjectDescriptionStorage should return null immediately if !project.isAccessible()

Browse source 
NON-NLS exception strings
This commit is contained in:
James Blackburn 2010-02-16 13:24:41 +00:00
parent bcbb35184c
commit b0e1d196b9
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionStorageManager.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2008 Broadcom Corporation and others. * Copyright (c) 2008, 2010 Broadcom Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -113,6 +113,10 @@ public class CProjectDescriptionStorageManager {
* @return project description storage or null * @return project description storage or null
*/ */
public AbstractCProjectDescriptionStorage getProjectDescriptionStorage(IProject project) { public AbstractCProjectDescriptionStorage getProjectDescriptionStorage(IProject project) {
if (!project.isAccessible()) {
assert(!fDescriptionStorageMap.contains(project));
return null;
}
AbstractCProjectDescriptionStorage projStorage = fDescriptionStorageMap.get(project); AbstractCProjectDescriptionStorage projStorage = fDescriptionStorageMap.get(project);
if (projStorage == null) { if (projStorage == null) {
projStorage = loadProjectStorage(project); projStorage = loadProjectStorage(project);
@ -137,7 +141,7 @@ public class CProjectDescriptionStorageManager {
public void setProjectDescription(IProject project, ICProjectDescription description, int flags, IProgressMonitor monitor) throws CoreException { public void setProjectDescription(IProject project, ICProjectDescription description, int flags, IProgressMonitor monitor) throws CoreException {
AbstractCProjectDescriptionStorage storage = fDescriptionStorageMap.get(project); AbstractCProjectDescriptionStorage storage = fDescriptionStorageMap.get(project);
if (storage == null) if (storage == null)
throw ExceptionFactory.createCoreException("Can't set ProjectDescription before getProjectDescriptionStorage!"); throw ExceptionFactory.createCoreException("Can't set ProjectDescription before getProjectDescriptionStorage!"); //$NON-NLS-1$
if (!storage.type.createsCProjectXMLFile()) if (!storage.type.createsCProjectXMLFile())
writeProjectStorageType(project, storage.type); writeProjectStorageType(project, storage.type);
storage.setProjectDescription(description, flags, monitor); storage.setProjectDescription(description, flags, monitor);
@ -256,7 +260,7 @@ public class CProjectDescriptionStorageManager {
} }
// No type found! // No type found!
CCorePlugin.log("CProjectDescriptionStorageType: " + storageTypeID + " for version: " + version + " not found!"); CCorePlugin.log("CProjectDescriptionStorageType: " + storageTypeID + " for version: " + version + " not found!"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
return null; return null;
} }
@ -278,7 +282,7 @@ public class CProjectDescriptionStorageManager {
} }
} }
} }
throw ExceptionFactory.createCoreException("No project des file found..."); throw ExceptionFactory.createCoreException("No project des file found..."); //$NON-NLS-1$
} }
@ -315,8 +319,6 @@ public class CProjectDescriptionStorageManager {
CConfigBasedDescriptorManager.getInstance().projectClosedRemove(project); CConfigBasedDescriptorManager.getInstance().projectClosedRemove(project);
} }
/** /**
* Cleanup state * Cleanup state
*/ */
@ -358,11 +360,11 @@ public class CProjectDescriptionStorageManager {
try { try {
type = new CProjectDescriptionStorageTypeProxy(el); type = new CProjectDescriptionStorageTypeProxy(el);
} catch (CoreException e) { } catch (CoreException e) {
CCorePlugin.log("Couldn't instantiate CProjectDescriptionStorageType " + CCorePlugin.log("Couldn't instantiate CProjectDescriptionStorageType " + //$NON-NLS-1$
el.getDeclaringExtension().getNamespaceIdentifier() + " " + e.getMessage()); el.getDeclaringExtension().getNamespaceIdentifier() + " " + e.getMessage()); //$NON-NLS-1$
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
CCorePlugin.log("Failed to load CProjectDescriptionStorageType " + CCorePlugin.log("Failed to load CProjectDescriptionStorageType " + //$NON-NLS-1$
el.getDeclaringExtension().getNamespaceIdentifier() + " " + e.getMessage()); el.getDeclaringExtension().getNamespaceIdentifier() + " " + e.getMessage()); //$NON-NLS-1$
} }
return type; return type;
} }