Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Leherbauer2008-04-04 07:34:48 +0000
committerAnton Leherbauer2008-04-04 07:34:48 +0000
commit97170d3d09f60496ef3002490601cbc533e17402 (patch)
tree4833c324fd2b1ced6497f353316fdd01d7b98efc /core/org.eclipse.cdt.core/model/org
parentdcf186c8c1316f9ea92e6cab26176d41133a8787 (diff)
downloadorg.eclipse.cdt-97170d3d09f60496ef3002490601cbc533e17402.tar.gz
org.eclipse.cdt-97170d3d09f60496ef3002490601cbc533e17402.tar.xz
org.eclipse.cdt-97170d3d09f60496ef3002490601cbc533e17402.zip
Fix for 225316: CoreModel does not issue event when resolution of IInclude changes
Diffstat (limited to 'core/org.eclipse.cdt.core/model/org')
-rw-r--r--core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Include.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Include.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Include.java
index b2c989452c9..a5fbefd7cb6 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Include.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Include.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 QNX Software Systems and others.
+ * Copyright (c) 2000, 2008 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -104,9 +104,11 @@ public class Include extends SourceManipulation implements IInclude {
}
public static boolean equals(IInclude lhs, IInclude rhs) {
- return CElement.equals(lhs, rhs) &&
- lhs.isActive() == rhs.isActive() &&
- lhs.isResolved() == rhs.isResolved() &&
- lhs.isLocal() == rhs.isLocal();
+ return CElement.equals(lhs, rhs)
+ && lhs.isActive() == rhs.isActive()
+ && lhs.isResolved() == rhs.isResolved()
+ && lhs.isLocal() == rhs.isLocal()
+ && (lhs.getFullFileName() == rhs.getFullFileName()
+ || lhs.getFullFileName() != null && lhs.getFullFileName().equals(rhs.getFullFileName()));
}
}

Back to the top