Author: scabanovich Date: 2009-05-13 12:28:09 -0400 (Wed, 13 May 2009) New Revision: 15244 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractExtendedXMLFileImpl.java Log: https://jira.jboss.org/jira/browse/JBIDE-4312 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractExtendedXMLFileImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractExtendedXMLFileImpl.java 2009-05-13 15:28:14 UTC (rev 15243) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractExtendedXMLFileImpl.java 2009-05-13 16:28:09 UTC (rev 15244) @@ -197,9 +197,15 @@ m.fireStructureChanged(this); if(!isOverlapped) getResourceMarkers().update(); } else if(isMergingChanges()) { + String oldBody = get("correctBody"); + boolean changed = body != null && !body.equals(oldBody); set("correctBody", body); set("actualBodyTimeStamp", "0"); + long ots = getTimeStamp(); mergeAll(f, update); + if(changed && ots == getTimeStamp()) { + changeTimeStamp(); + } set("actualBodyTimeStamp", "" + getTimeStamp()); if(errors1) m.fireStructureChanged(this); if(!isOverlapped) constraintChecker.check();