Fix for Bug 149935
diff --git a/plugins/org.eclipse.epf.library/layout/xsl/artifact_descriptor.xsl b/plugins/org.eclipse.epf.library/layout/xsl/artifact_descriptor.xsl
index a7051cf..bd70b65 100755
--- a/plugins/org.eclipse.epf.library/layout/xsl/artifact_descriptor.xsl
+++ b/plugins/org.eclipse.epf.library/layout/xsl/artifact_descriptor.xsl
@@ -165,12 +165,12 @@
<xsl:variable name="deliverableParts" select="referenceList[@name='deliverableParts']/Element"/>
<xsl:variable name="impacts" select="referenceList[@name='impacts']/Element[@Type='WorkProductDescriptor']"/>
<xsl:variable name="impactedBy" select="referenceList[@name='impactedBy']/Element[@Type='WorkProductDescriptor']"/>
- <xsl:variable name="mandatoryInputTo" select="referenceList[@name='mandatoryInputTo']/Element[@Type='TaskDescriptor']"/>
+ <xsl:variable name="mandatoryInputTo" select="referenceList[@name='WorkProductDescriptor_MandatoryInputTo_TaskDescriptors']/Element[@Type='TaskDescriptor']"/>
<xsl:variable name="optionalInputTo" select="referenceList[@name='OptionalInputTo']/Element[@Type='TaskDescriptor']"/>
<xsl:variable name="externalInputTo" select="referenceList[@name='externalInputTo']/Element[@Type='TaskDescriptor']"/>
- <xsl:variable name="outputFrom" select="referenceList[@name='outputFrom']/Element[@Type='TaskDescriptor']"/>
+ <xsl:variable name="outputFrom" select="referenceList[@name='WorkProductDescriptor_OutputFrom_TaskDescriptors']/Element[@Type='TaskDescriptor']"/>
<xsl:variable name="superActivities" select="referenceList[@name='superActivities']/Element[@Type='Activity']"/>
- <xsl:variable name="responsibleRole" select="reference[@name='responsibleRole']/Element[@Type='RoleDescriptor']"/>
+ <xsl:variable name="responsibleRole" select="referenceList[@name='WorkProductDescriptor_ResponsibleRoleDescriptors']/Element[@Type='RoleDescriptor']"/>
<xsl:variable name="workedOnBy" select="referenceList[@name='workedOnBy']/Element"/>
<xsl:if test="count($mandatoryInputTo) + count($optionalInputTo) + count($outputFrom) + count($impacts) + count($impactedBy)> 0">
diff --git a/plugins/org.eclipse.epf.library/layout/xsl/role_descriptor.xsl b/plugins/org.eclipse.epf.library/layout/xsl/role_descriptor.xsl
index 1ab7abf..d7082b3 100755
--- a/plugins/org.eclipse.epf.library/layout/xsl/role_descriptor.xsl
+++ b/plugins/org.eclipse.epf.library/layout/xsl/role_descriptor.xsl
@@ -155,9 +155,9 @@
</xsl:template>
<xsl:template name="relationshipsSection">
- <xsl:variable name="performs" select="referenceList[@name='performsAsOwner']/Element"/>
+ <xsl:variable name="performs" select="referenceList[@name='RoleDescriptor_PrimaryTaskDescriptors']/Element"/>
<xsl:variable name="responsibleFor" select="referenceList[@name='responsibleFor']/Element"/>
- <xsl:variable name="additionallyPerforms" select="referenceList[@name='performsAdditionally']/Element"/>
+ <xsl:variable name="additionallyPerforms" select="referenceList[@name='RoleDescriptor_AdditionalTaskDescriptors']/Element"/>
<xsl:variable name="modifies" select="referenceList[@name='modifies']/Element"/>
<div class="sectionHeading"><xsl:value-of select="$relationshipsText"/></div>
<div class="sectionContent">
diff --git a/plugins/org.eclipse.epf.library/src/org/eclipse/epf/library/layout/elements/AbstractElementLayout.java b/plugins/org.eclipse.epf.library/src/org/eclipse/epf/library/layout/elements/AbstractElementLayout.java
index 9e50c9c..d3e69f9 100755
--- a/plugins/org.eclipse.epf.library/src/org/eclipse/epf/library/layout/elements/AbstractElementLayout.java
+++ b/plugins/org.eclipse.epf.library/src/org/eclipse/epf/library/layout/elements/AbstractElementLayout.java
@@ -14,6 +14,7 @@
import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -567,6 +568,13 @@
}
}
}
+
+ Collection oppositeProperties = new ArrayList(element.getOppositeFeatures());
+ for (Iterator z= oppositeProperties.iterator(); z.hasNext(); )
+ {
+ OppositeFeature ofeature = (OppositeFeature) z.next();
+ loadFeature(ofeature, elementXml, includeReferences);
+ }
}
public void addReference(Object feature, XmlElement elementXml, String referenceName,
