mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-04 07:35:24 +02:00
Code Issues Wiki Activity

Bug 351898 - [expressions] Invalid expressions do not show errors in the

Browse source 
value column.
This commit is contained in:
Pawel Piech 2011-07-12 13:55:40 -07:00
parent 120d96abea
commit 9970e94efa
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/PropertiesUpdateStatus.java
View file

@ -10,6 +10,7 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.dsf.ui.viewmodel.properties; package org.eclipse.cdt.dsf.ui.viewmodel.properties;
import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
@ -113,8 +114,11 @@ public class PropertiesUpdateStatus extends DsfMultiStatus {
PropertiesUpdateStatus newStatus, Set<String> properties) PropertiesUpdateStatus newStatus, Set<String> properties)
{ {
PropertiesUpdateStatus mergedStatus = new PropertiesUpdateStatus(); PropertiesUpdateStatus mergedStatus = new PropertiesUpdateStatus();
// Copy the property status map from the base status.
mergedStatus.fPropertiesStatus.putAll(baseStatus.fPropertiesStatus); mergedStatus.fPropertiesStatus.putAll(baseStatus.fPropertiesStatus);
// Add in the property statuses from the new status, but only for the
// specified properties.
for (String property : properties) { for (String property : properties) {
IStatus propertyStatus = newStatus.getStatus(property); IStatus propertyStatus = newStatus.getStatus(property);
if (propertyStatus != null) { if (propertyStatus != null) {
@ -123,13 +127,30 @@ public class PropertiesUpdateStatus extends DsfMultiStatus {
mergedStatus.fPropertiesStatus.remove(property); mergedStatus.fPropertiesStatus.remove(property);
} }
} }
Set<IStatus> children = new HashSet<IStatus>((baseStatus.getChildren().length + newStatus.getChildren().length) * 4/3);
// Children of merged status should contain all statuses that are found in the fPropertiesStatus map, but
// without duplicates.
Set<IStatus> children = new HashSet<IStatus>((baseStatus.getChildren().length + newStatus.getChildren().length) * 4/3);
children.addAll(mergedStatus.fPropertiesStatus.values()); children.addAll(mergedStatus.fPropertiesStatus.values());
for (IStatus child : children) { for (IStatus child : children) {
mergedStatus.add(child); mergedStatus.add(child);
} }
// Merged status should contain all children statuses that were added without a corresponding property to the
// base status and to the new status.
Collection<IStatus> baseStatusPropertyChildren = baseStatus.fPropertiesStatus.values();
for (IStatus baseStatusChild : baseStatus.getChildren()) {
if (!baseStatusPropertyChildren.contains(baseStatusChild)) {
mergedStatus.add(baseStatusChild);
}
}
Collection<IStatus> newStatusPropertyChildren = newStatus.fPropertiesStatus.values();
for (IStatus newStatusChild : newStatus.getChildren()) {
if (!newStatusPropertyChildren.contains(newStatusChild)) {
mergedStatus.add(newStatusChild);
}
}
return mergedStatus; return mergedStatus;
} }