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

More accurate check for resource existence accounting for variables.

Browse source
This commit is contained in:
Andrew Gvozdev 2011-12-20 09:59:13 -05:00
parent aa67c9cce3
commit 0847bf37d8
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/LanguageSettingsImages.java
View file

@ -21,9 +21,9 @@ import org.eclipse.jface.viewers.IDecoration;
import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Image;
import org.eclipse.cdt.core.settings.model.ACPathEntry; import org.eclipse.cdt.core.settings.model.ACPathEntry;
import org.eclipse.cdt.core.settings.model.CMacroEntry;
import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
import org.eclipse.cdt.core.settings.model.ICSettingEntry; import org.eclipse.cdt.core.settings.model.ICSettingEntry;
import org.eclipse.cdt.core.settings.model.util.CDataUtil;
import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.CUIPlugin;
@ -47,18 +47,18 @@ public class LanguageSettingsImages {
* Returns image for the given entry from internally managed repository including * Returns image for the given entry from internally managed repository including
* necessary overlays. This method is shortcut for {@link #getImage(ICLanguageSettingEntry, String)} * necessary overlays. This method is shortcut for {@link #getImage(ICLanguageSettingEntry, String)}
* when no project is available. * when no project is available.
* *
* @param entry - language settings entry to get an image for. * @param entry - language settings entry to get an image for.
* @return the image for the entry with appropriate overlays. * @return the image for the entry with appropriate overlays.
*/ */
public static Image getImage(ICLanguageSettingEntry entry) { public static Image getImage(ICLanguageSettingEntry entry) {
return getImage(entry, null); return getImage(entry, null);
} }
/** /**
* Returns image for the given entry from internally managed repository including * Returns image for the given entry from internally managed repository including
* necessary overlays. * necessary overlays.
* *
* @param entry - language settings entry to get an image for. * @param entry - language settings entry to get an image for.
* @param projectName - pass project name if available. That lets to put "project" metaphor * @param projectName - pass project name if available. That lets to put "project" metaphor
* on the image. Pass {@code null} if no project name is available. * on the image. Pass {@code null} if no project name is available.
@ -76,7 +76,7 @@ public class LanguageSettingsImages {
if (imageKey!=null) { if (imageKey!=null) {
if ((entry.getFlags()&ICSettingEntry.UNDEFINED) == ICSettingEntry.UNDEFINED) if ((entry.getFlags()&ICSettingEntry.UNDEFINED) == ICSettingEntry.UNDEFINED)
return CDTSharedImages.getImageOverlaid(imageKey, CDTSharedImages.IMG_OVR_INACTIVE, IDecoration.BOTTOM_LEFT); return CDTSharedImages.getImageOverlaid(imageKey, CDTSharedImages.IMG_OVR_INACTIVE, IDecoration.BOTTOM_LEFT);
if (entry instanceof ACPathEntry) { if (entry instanceof ACPathEntry) {
String overlayKey=null; String overlayKey=null;
IStatus status = getStatus(entry); IStatus status = getStatus(entry);
@ -105,7 +105,7 @@ public class LanguageSettingsImages {
// have to trust paths which contain variables // have to trust paths which contain variables
if (entry.getName().contains("${")) //$NON-NLS-1$ if (entry.getName().contains("${")) //$NON-NLS-1$
return true; return true;
boolean exists = true; boolean exists = true;
boolean isWorkspacePath = (entry.getFlags() & ICSettingEntry.VALUE_WORKSPACE_PATH) != 0; boolean isWorkspacePath = (entry.getFlags() & ICSettingEntry.VALUE_WORKSPACE_PATH) != 0;
if (isWorkspacePath) { if (isWorkspacePath) {
@ -119,17 +119,25 @@ public class LanguageSettingsImages {
} }
return exists; return exists;
} }
/** /**
* Defines status object for the status message line. * Defines status object for the status message line.
* *
* @param entry - the entry to check status on. * @param entry - the entry to check status on.
* @return a status object defining severity and message. * @return a status object defining severity and message.
*/ */
public static IStatus getStatus(ICLanguageSettingEntry entry) { public static IStatus getStatus(ICLanguageSettingEntry entry) {
if (entry instanceof ACPathEntry) { if (entry instanceof ACPathEntry) {
if (!entry.isResolved()) {
ICLanguageSettingEntry[] entries = CDataUtil.resolveEntries(new ICLanguageSettingEntry[] {entry}, null);
if (entries != null && entries.length > 0) {
entry = entries[0];
}
}
ACPathEntry acEntry = (ACPathEntry)entry; ACPathEntry acEntry = (ACPathEntry)entry;
IPath path = new Path(acEntry.getName()); String acEntryName = acEntry.getName();
IPath path = new Path(acEntryName);
if (!path.isAbsolute()) { if (!path.isAbsolute()) {
String msg = "Using relative paths is ambiguous and not recommended. It can cause unexpected side-effects."; String msg = "Using relative paths is ambiguous and not recommended. It can cause unexpected side-effects.";
return new Status(IStatus.INFO, CUIPlugin.PLUGIN_ID, msg); return new Status(IStatus.INFO, CUIPlugin.PLUGIN_ID, msg);
@ -142,7 +150,7 @@ public class LanguageSettingsImages {
msg = "The selected folder does not exist or not accessible."; msg = "The selected folder does not exist or not accessible.";
return new Status(IStatus.WARNING, CUIPlugin.PLUGIN_ID, msg); return new Status(IStatus.WARNING, CUIPlugin.PLUGIN_ID, msg);
} }
} }
return Status.OK_STATUS; return Status.OK_STATUS;
} }