Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

crosswalk metadata profiles implemented

crosswalks working for ACLs
changed ACL namespace to comply with EMF convention
  • Loading branch information...
commit ff305289e945115029a680a350d714da7f5e51be 1 parent a93edc6
@gregjan gregjan authored
Showing with 724 additions and 683 deletions.
  1. +1 −1  access-control/model/acl.ecore
  2. +1 −1  access-control/src/edu/unc/lib/schemas/acl/AclPackage.java
  3. +1 −1  access-control/src/edu/unc/lib/schemas/acl/impl/AclFactoryImpl.java
  4. +11 −11 crosswalk-gmf.diagram/src/crosswalk/diagram/custom/MappedModelUtil.java
  5. +4 −4 crosswalk-gmf.diagram/src/crosswalk/diagram/custom/OutputProfileFactory.java
  6. +339 −339 crosswalk-gmf.diagram/src/crosswalk/diagram/navigator/CrosswalkNavigatorContentProvider.java
  7. +67 −67 crosswalk-gmf.diagram/src/crosswalk/diagram/navigator/CrosswalkNavigatorLabelProvider.java
  8. +8 −8 crosswalk-gmf.diagram/src/crosswalk/diagram/part/CrosswalkDiagramEditorUtil.java
  9. +1 −0  crosswalk-gmf.edit/plugin.properties
  10. +2 −23 crosswalk-gmf.edit/src/crosswalk/provider/OutputProfileItemProvider.java
  11. +2 −1  crosswalk-gmf/META-INF/MANIFEST.MF
  12. +2 −2 crosswalk-gmf/model/crosswalk.ecore
  13. +1 −1  crosswalk-gmf/model/crosswalk.genmodel
  14. +14 −14 crosswalk-gmf/src/crosswalk/CrosswalkPackage.java
  15. +18 −0 crosswalk-gmf/src/crosswalk/OutputMetadataSections.java
  16. +25 −24 crosswalk-gmf/src/crosswalk/OutputProfile.java
  17. +13 −0 crosswalk-gmf/src/crosswalk/RecordMatches.java
  18. +6 −6 crosswalk-gmf/src/crosswalk/impl/CrosswalkPackageImpl.java
  19. +4 −8 crosswalk-gmf/src/crosswalk/impl/MappedElementImpl.java
  20. +5 −2 crosswalk-gmf/src/crosswalk/impl/OriginalNameRecordMatcherImpl.java
  21. +37 −36 crosswalk-gmf/src/crosswalk/impl/OutputProfileImpl.java
  22. +2 −2 etc/acl.xsd
  23. +160 −132 workbench_plugin/src/main/java/unc/lib/cdr/workbench/xwalk/CrosswalkJob.java
View
2  access-control/model/acl.ecore
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="acl" nsURI="http://cdr.unc.edu/definitions/acl#" nsPrefix="acl">
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="acl" nsURI="http://cdr.unc.edu/definitions/acl" nsPrefix="acl">
<eClassifiers xsi:type="ecore:EClass" name="AccessControlType">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="accessControl_._type"/>
View
2  access-control/src/edu/unc/lib/schemas/acl/AclPackage.java
@@ -50,7 +50,7 @@
* <!-- end-user-doc -->
* @generated
*/
- String eNS_URI = "http://cdr.unc.edu/definitions/acl#";
+ String eNS_URI = "http://cdr.unc.edu/definitions/acl";
/**
* The package namespace name.
View
2  access-control/src/edu/unc/lib/schemas/acl/impl/AclFactoryImpl.java
@@ -40,7 +40,7 @@
*/
public static AclFactory init() {
try {
- AclFactory theAclFactory = (AclFactory)EPackage.Registry.INSTANCE.getEFactory("http://cdr.unc.edu/definitions/acl#");
+ AclFactory theAclFactory = (AclFactory)EPackage.Registry.INSTANCE.getEFactory("http://cdr.unc.edu/definitions/acl");
if (theAclFactory != null) {
return theAclFactory;
}
View
22 crosswalk-gmf.diagram/src/crosswalk/diagram/custom/MappedModelUtil.java
@@ -24,6 +24,7 @@
import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.EcorePackage;
@@ -75,18 +76,12 @@
ContextProvider cp = (ContextProvider) next;
if (!cp.getOutputProfiles().isEmpty()) {
for (OutputProfile profile : cp.getOutputProfiles()) {
- if (profile.isStartMappingAtChildren()) {
- System.out
- .println("mapping child features from profile: "
- + profile.getName());
+ if(profile.isStartMappingAtChildren()) {
mappedParentTypes.add(profile
- .getParentMappedElement().eClass());
+ .getParentMappedFeature().getEReferenceType());
} else {
- System.out
- .println("mapping parent feature from profile: "
- + profile.getName());
- result.add(profile.getParentMappedElement()
- .eContainmentFeature());
+ mappedParentTypes.add(profile
+ .getParentMappedFeature().getEContainingClass());
}
}
break;
@@ -112,7 +107,12 @@
}
for (EStructuralFeature a : parentType.getEAllReferences()
.toArray(new EStructuralFeature[0])) {
- System.err.println(a.getName());
+ if ("attribute"
+ .equals(a
+ .getEAnnotation(
+ "http:///org/eclipse/emf/ecore/util/ExtendedMetaData")
+ .getDetails().get("kind")))
+ continue;
int count = 0;
for (MappedElement m : elementsMappedAlready) {
if (m.getMappedFeature() != null
View
8 crosswalk-gmf.diagram/src/crosswalk/diagram/custom/OutputProfileFactory.java
@@ -1,7 +1,7 @@
package crosswalk.diagram.custom;
-import edu.unc.lib.schemas.acl.AclFactory;
-import gov.loc.mods.mods.MODSFactory;
+import edu.unc.lib.schemas.acl.AclPackage;
+import gov.loc.mods.mods.MODSPackage;
import crosswalk.CrosswalkFactory;
import crosswalk.OutputMetadataSections;
import crosswalk.OutputProfile;
@@ -15,7 +15,7 @@ public static OutputProfile getMODSProfile() {
result.setMetadataLabel("Crosswalked Description");
result.setMetadataType("MODS");
result.setMetadataSection(OutputMetadataSections.DMD_SEC);
- result.setParentMappedElement(MODSFactory.eINSTANCE.createModsDefinition());
+ result.setParentMappedFeature(MODSPackage.eINSTANCE.getDocumentRoot_Mods());
result.setStartMappingAtChildren(true);
return result;
}
@@ -27,7 +27,7 @@ public static OutputProfile getACLProfile() {
result.setMetadataLabel("Crosswalked Access Control");
result.setMetadataType("CDRACL");
result.setMetadataSection(OutputMetadataSections.RIGHTS_MD);
- result.setParentMappedElement(AclFactory.eINSTANCE.createAccessControlType());
+ result.setParentMappedFeature(AclPackage.eINSTANCE.getDocumentRoot_AccessControl());
result.setStartMappingAtChildren(false);
return result;
}
View
678 crosswalk-gmf.diagram/src/crosswalk/diagram/navigator/CrosswalkNavigatorContentProvider.java
@@ -266,55 +266,6 @@ public void init(ICommonContentExtensionSite aConfig) {
private Object[] getViewChildren(View view, Object parentElement) {
switch (CrosswalkVisualIDRegistry.getVisualID(view)) {
- case TabbedDataFieldEditPart.VISUAL_ID: {
- LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
- Node sv = (Node) view;
- CrosswalkNavigatorGroup incominglinks = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_TabbedDataField_3002_incominglinks,
- "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
- Collection<View> connectedViews;
- connectedViews = getIncomingLinksByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(InputOutputEditPart.VISUAL_ID));
- incominglinks.addChildren(createNavigatorItems(connectedViews,
- incominglinks, true));
- if (!incominglinks.isEmpty()) {
- result.add(incominglinks);
- }
- return result.toArray();
- }
-
- case EditingContainerEditPart.VISUAL_ID: {
- LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
- Diagram sv = (Diagram) view;
- CrosswalkNavigatorGroup links = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_EditingContainer_1000_links,
- "icons/linksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
- Collection<View> connectedViews;
- connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(CrossWalkEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement,
- false));
- connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(DictionaryEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement,
- false));
- connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(FormEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement,
- false));
- connectedViews = getDiagramLinksByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(InputOutputEditPart.VISUAL_ID));
- links.addChildren(createNavigatorItems(connectedViews, links, false));
- if (!links.isEmpty()) {
- result.add(links);
- }
- return result.toArray();
- }
-
case TextEditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
Node sv = (Node) view;
@@ -333,178 +284,106 @@ public void init(ICommonContentExtensionSite aConfig) {
return result.toArray();
}
- case DateRecognizerEditPart.VISUAL_ID: {
- LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
- Node sv = (Node) view;
- CrosswalkNavigatorGroup incominglinks = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_DateRecognizer_3004_incominglinks,
- "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
- CrosswalkNavigatorGroup outgoinglinks = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_DateRecognizer_3004_outgoinglinks,
- "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
- Collection<View> connectedViews;
- connectedViews = getIncomingLinksByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(InputOutputEditPart.VISUAL_ID));
- incominglinks.addChildren(createNavigatorItems(connectedViews,
- incominglinks, true));
- connectedViews = getOutgoingLinksByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(InputOutputEditPart.VISUAL_ID));
- outgoinglinks.addChildren(createNavigatorItems(connectedViews,
- outgoinglinks, true));
- if (!incominglinks.isEmpty()) {
- result.add(incominglinks);
- }
- if (!outgoinglinks.isEmpty()) {
- result.add(outgoinglinks);
- }
- return result.toArray();
- }
-
- case DateInputFieldEditPart.VISUAL_ID: {
- LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
- Node sv = (Node) view;
- CrosswalkNavigatorGroup incominglinks = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_DateInputField_3024_incominglinks,
- "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
- CrosswalkNavigatorGroup outgoinglinks = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_DateInputField_3024_outgoinglinks,
- "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
- Collection<View> connectedViews;
- connectedViews = getIncomingLinksByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(InputOutputEditPart.VISUAL_ID));
- incominglinks.addChildren(createNavigatorItems(connectedViews,
- incominglinks, true));
- connectedViews = getOutgoingLinksByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(InputOutputEditPart.VISUAL_ID));
- outgoinglinks.addChildren(createNavigatorItems(connectedViews,
- outgoinglinks, true));
- if (!incominglinks.isEmpty()) {
- result.add(incominglinks);
- }
- if (!outgoinglinks.isEmpty()) {
- result.add(outgoinglinks);
- }
- return result.toArray();
- }
-
- case MetadataBlockEditPart.VISUAL_ID: {
+ case InputOutputEditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
- Node sv = (Node) view;
+ Edge sv = (Edge) view;
+ CrosswalkNavigatorGroup target = new CrosswalkNavigatorGroup(
+ Messages.NavigatorGroupName_InputOutput_4001_target,
+ "icons/linkTargetNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+ CrosswalkNavigatorGroup source = new CrosswalkNavigatorGroup(
+ Messages.NavigatorGroupName_InputOutput_4001_source,
+ "icons/linkSourceNavigatorGroup.gif", parentElement); //$NON-NLS-1$
Collection<View> connectedViews;
- connectedViews = getChildrenByType(
- Collections.singleton(sv),
+ connectedViews = getLinksTargetByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
+ .getType(TabbedDataFieldEditPart.VISUAL_ID));
+ target.addChildren(createNavigatorItems(connectedViews, target,
+ true));
+ connectedViews = getLinksTargetByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
.getType(DateRecognizerEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement,
- false));
- connectedViews = getChildrenByType(
- Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
+ target.addChildren(createNavigatorItems(connectedViews, target,
+ true));
+ connectedViews = getLinksTargetByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry.getType(TextEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement,
- false));
- connectedViews = getChildrenByType(
- Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
+ target.addChildren(createNavigatorItems(connectedViews, target,
+ true));
+ connectedViews = getLinksTargetByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
.getType(TrimWhitespaceEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement,
- false));
- connectedViews = getChildrenByType(
- Collections.singleton(sv),
+ target.addChildren(createNavigatorItems(connectedViews, target,
+ true));
+ connectedViews = getLinksTargetByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
+ .getType(TextInputFieldEditPart.VISUAL_ID));
+ target.addChildren(createNavigatorItems(connectedViews, target,
+ true));
+ connectedViews = getLinksTargetByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(MappedElementEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement,
- false));
- connectedViews = getChildrenByType(
- Collections.singleton(sv),
+ .getType(CurrentDateEditPart.VISUAL_ID));
+ target.addChildren(createNavigatorItems(connectedViews, target,
+ true));
+ connectedViews = getLinksTargetByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(MetadataBlockMetadataBlockInputFieldsCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
+ .getType(CurrentUsernameEditPart.VISUAL_ID));
+ target.addChildren(createNavigatorItems(connectedViews, target,
+ true));
+ connectedViews = getLinksTargetByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(TextInputFieldEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement,
- false));
- connectedViews = getChildrenByType(
+ .getType(DateInputFieldEditPart.VISUAL_ID));
+ target.addChildren(createNavigatorItems(connectedViews, target,
+ true));
+ connectedViews = getLinksSourceByType(
Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
+ .getType(OriginalNameRecordMatcherEditPart.VISUAL_ID));
+ source.addChildren(createNavigatorItems(connectedViews, source,
+ true));
+ connectedViews = getLinksSourceByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(CurrentDateEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement,
- false));
- connectedViews = getChildrenByType(
- Collections.singleton(sv),
+ .getType(DateRecognizerEditPart.VISUAL_ID));
+ source.addChildren(createNavigatorItems(connectedViews, source,
+ true));
+ connectedViews = getLinksSourceByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
+ .getType(TrimWhitespaceEditPart.VISUAL_ID));
+ source.addChildren(createNavigatorItems(connectedViews, source,
+ true));
+ connectedViews = getLinksSourceByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(CurrentUsernameEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement,
- false));
- connectedViews = getChildrenByType(
- Collections.singleton(sv),
+ .getType(MappedAttributeEditPart.VISUAL_ID));
+ source.addChildren(createNavigatorItems(connectedViews, source,
+ true));
+ connectedViews = getLinksSourceByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(MetadataBlockMetadataBlockInputFieldsCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
+ .getType(TextInputFieldEditPart.VISUAL_ID));
+ source.addChildren(createNavigatorItems(connectedViews, source,
+ true));
+ connectedViews = getLinksSourceByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
.getType(DateInputFieldEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement,
- false));
- return result.toArray();
- }
-
- case CurrentDateEditPart.VISUAL_ID: {
- LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
- Node sv = (Node) view;
- CrosswalkNavigatorGroup incominglinks = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_CurrentDate_3021_incominglinks,
- "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
- Collection<View> connectedViews;
- connectedViews = getIncomingLinksByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(InputOutputEditPart.VISUAL_ID));
- incominglinks.addChildren(createNavigatorItems(connectedViews,
- incominglinks, true));
- if (!incominglinks.isEmpty()) {
- result.add(incominglinks);
+ source.addChildren(createNavigatorItems(connectedViews, source,
+ true));
+ if (!target.isEmpty()) {
+ result.add(target);
+ }
+ if (!source.isEmpty()) {
+ result.add(source);
}
return result.toArray();
}
- case FormEditPart.VISUAL_ID: {
+ case DelimitedFileEditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
Node sv = (Node) view;
Collection<View> connectedViews;
- connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(FormModelBoxCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry
- .getType(MetadataBlock3EditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement,
- false));
- connectedViews = getChildrenByType(Collections.singleton(sv),
+ connectedViews = getChildrenByType(
+ Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(FormModelBoxCompartmentEditPart.VISUAL_ID));
+ .getType(DelimitedFileDataFieldCompartmentEditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry
- .getType(ParagraphEditPart.VISUAL_ID));
+ .getType(TabbedDataFieldEditPart.VISUAL_ID));
result.addAll(createNavigatorItems(connectedViews, parentElement,
false));
return result.toArray();
@@ -590,103 +469,115 @@ public void init(ICommonContentExtensionSite aConfig) {
return result.toArray();
}
- case InputOutputEditPart.VISUAL_ID: {
+ case OriginalNameRecordMatcherEditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
- Edge sv = (Edge) view;
- CrosswalkNavigatorGroup target = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_InputOutput_4001_target,
- "icons/linkTargetNavigatorGroup.gif", parentElement); //$NON-NLS-1$
- CrosswalkNavigatorGroup source = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_InputOutput_4001_source,
- "icons/linkSourceNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+ Node sv = (Node) view;
+ CrosswalkNavigatorGroup outgoinglinks = new CrosswalkNavigatorGroup(
+ Messages.NavigatorGroupName_OriginalNameRecordMatcher_3003_outgoinglinks,
+ "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
Collection<View> connectedViews;
- connectedViews = getLinksTargetByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(TabbedDataFieldEditPart.VISUAL_ID));
- target.addChildren(createNavigatorItems(connectedViews, target,
- true));
- connectedViews = getLinksTargetByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(DateRecognizerEditPart.VISUAL_ID));
- target.addChildren(createNavigatorItems(connectedViews, target,
- true));
- connectedViews = getLinksTargetByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(TextEditPart.VISUAL_ID));
- target.addChildren(createNavigatorItems(connectedViews, target,
- true));
- connectedViews = getLinksTargetByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(TrimWhitespaceEditPart.VISUAL_ID));
- target.addChildren(createNavigatorItems(connectedViews, target,
- true));
- connectedViews = getLinksTargetByType(Collections.singleton(sv),
+ connectedViews = getOutgoingLinksByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(TextInputFieldEditPart.VISUAL_ID));
- target.addChildren(createNavigatorItems(connectedViews, target,
- true));
- connectedViews = getLinksTargetByType(Collections.singleton(sv),
+ .getType(InputOutputEditPart.VISUAL_ID));
+ outgoinglinks.addChildren(createNavigatorItems(connectedViews,
+ outgoinglinks, true));
+ if (!outgoinglinks.isEmpty()) {
+ result.add(outgoinglinks);
+ }
+ return result.toArray();
+ }
+
+ case FormEditPart.VISUAL_ID: {
+ LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
+ Node sv = (Node) view;
+ Collection<View> connectedViews;
+ connectedViews = getChildrenByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(CurrentDateEditPart.VISUAL_ID));
- target.addChildren(createNavigatorItems(connectedViews, target,
- true));
- connectedViews = getLinksTargetByType(Collections.singleton(sv),
+ .getType(FormModelBoxCompartmentEditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry
- .getType(CurrentUsernameEditPart.VISUAL_ID));
- target.addChildren(createNavigatorItems(connectedViews, target,
- true));
- connectedViews = getLinksTargetByType(Collections.singleton(sv),
+ .getType(MetadataBlock3EditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement,
+ false));
+ connectedViews = getChildrenByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(DateInputFieldEditPart.VISUAL_ID));
- target.addChildren(createNavigatorItems(connectedViews, target,
- true));
- connectedViews = getLinksSourceByType(
- Collections.singleton(sv),
+ .getType(FormModelBoxCompartmentEditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry
- .getType(OriginalNameRecordMatcherEditPart.VISUAL_ID));
- source.addChildren(createNavigatorItems(connectedViews, source,
- true));
- connectedViews = getLinksSourceByType(Collections.singleton(sv),
+ .getType(ParagraphEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement,
+ false));
+ return result.toArray();
+ }
+
+ case EditingContainerEditPart.VISUAL_ID: {
+ LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
+ Diagram sv = (Diagram) view;
+ CrosswalkNavigatorGroup links = new CrosswalkNavigatorGroup(
+ Messages.NavigatorGroupName_EditingContainer_1000_links,
+ "icons/linksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+ Collection<View> connectedViews;
+ connectedViews = getChildrenByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(DateRecognizerEditPart.VISUAL_ID));
- source.addChildren(createNavigatorItems(connectedViews, source,
- true));
- connectedViews = getLinksSourceByType(Collections.singleton(sv),
+ .getType(CrossWalkEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement,
+ false));
+ connectedViews = getChildrenByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(TrimWhitespaceEditPart.VISUAL_ID));
- source.addChildren(createNavigatorItems(connectedViews, source,
- true));
- connectedViews = getLinksSourceByType(Collections.singleton(sv),
+ .getType(DictionaryEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement,
+ false));
+ connectedViews = getChildrenByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry.getType(FormEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement,
+ false));
+ connectedViews = getDiagramLinksByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(MappedAttributeEditPart.VISUAL_ID));
- source.addChildren(createNavigatorItems(connectedViews, source,
- true));
- connectedViews = getLinksSourceByType(Collections.singleton(sv),
+ .getType(InputOutputEditPart.VISUAL_ID));
+ links.addChildren(createNavigatorItems(connectedViews, links, false));
+ if (!links.isEmpty()) {
+ result.add(links);
+ }
+ return result.toArray();
+ }
+
+ case DateInputFieldEditPart.VISUAL_ID: {
+ LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
+ Node sv = (Node) view;
+ CrosswalkNavigatorGroup incominglinks = new CrosswalkNavigatorGroup(
+ Messages.NavigatorGroupName_DateInputField_3024_incominglinks,
+ "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+ CrosswalkNavigatorGroup outgoinglinks = new CrosswalkNavigatorGroup(
+ Messages.NavigatorGroupName_DateInputField_3024_outgoinglinks,
+ "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+ Collection<View> connectedViews;
+ connectedViews = getIncomingLinksByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(TextInputFieldEditPart.VISUAL_ID));
- source.addChildren(createNavigatorItems(connectedViews, source,
- true));
- connectedViews = getLinksSourceByType(Collections.singleton(sv),
+ .getType(InputOutputEditPart.VISUAL_ID));
+ incominglinks.addChildren(createNavigatorItems(connectedViews,
+ incominglinks, true));
+ connectedViews = getOutgoingLinksByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(DateInputFieldEditPart.VISUAL_ID));
- source.addChildren(createNavigatorItems(connectedViews, source,
- true));
- if (!target.isEmpty()) {
- result.add(target);
+ .getType(InputOutputEditPart.VISUAL_ID));
+ outgoinglinks.addChildren(createNavigatorItems(connectedViews,
+ outgoinglinks, true));
+ if (!incominglinks.isEmpty()) {
+ result.add(incominglinks);
}
- if (!source.isEmpty()) {
- result.add(source);
+ if (!outgoinglinks.isEmpty()) {
+ result.add(outgoinglinks);
}
return result.toArray();
}
- case TrimWhitespaceEditPart.VISUAL_ID: {
+ case DateRecognizerEditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
Node sv = (Node) view;
CrosswalkNavigatorGroup incominglinks = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_TrimWhitespace_3006_incominglinks,
+ Messages.NavigatorGroupName_DateRecognizer_3004_incominglinks,
"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
CrosswalkNavigatorGroup outgoinglinks = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_TrimWhitespace_3006_outgoinglinks,
+ Messages.NavigatorGroupName_DateRecognizer_3004_outgoinglinks,
"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
Collection<View> connectedViews;
connectedViews = getIncomingLinksByType(Collections.singleton(sv),
@@ -726,68 +617,50 @@ public void init(ICommonContentExtensionSite aConfig) {
return result.toArray();
}
- case MappedElementEditPart.VISUAL_ID: {
+ case CurrentDateEditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
Node sv = (Node) view;
+ CrosswalkNavigatorGroup incominglinks = new CrosswalkNavigatorGroup(
+ Messages.NavigatorGroupName_CurrentDate_3021_incominglinks,
+ "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
Collection<View> connectedViews;
- connectedViews = getChildrenByType(
- Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(MappedElementChildElementsCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry
- .getType(MappedElement2EditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement,
- false));
- connectedViews = getChildrenByType(
- Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(MappedElementChildElementsCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
+ connectedViews = getIncomingLinksByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(MappedAttributeEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement,
- false));
+ .getType(InputOutputEditPart.VISUAL_ID));
+ incominglinks.addChildren(createNavigatorItems(connectedViews,
+ incominglinks, true));
+ if (!incominglinks.isEmpty()) {
+ result.add(incominglinks);
+ }
return result.toArray();
}
- case TextInputFieldEditPart.VISUAL_ID: {
+ case TabbedDataFieldEditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
Node sv = (Node) view;
CrosswalkNavigatorGroup incominglinks = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_TextInputField_3023_incominglinks,
+ Messages.NavigatorGroupName_TabbedDataField_3002_incominglinks,
"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
- CrosswalkNavigatorGroup outgoinglinks = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_TextInputField_3023_outgoinglinks,
- "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
Collection<View> connectedViews;
connectedViews = getIncomingLinksByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
.getType(InputOutputEditPart.VISUAL_ID));
incominglinks.addChildren(createNavigatorItems(connectedViews,
incominglinks, true));
- connectedViews = getOutgoingLinksByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(InputOutputEditPart.VISUAL_ID));
- outgoinglinks.addChildren(createNavigatorItems(connectedViews,
- outgoinglinks, true));
if (!incominglinks.isEmpty()) {
result.add(incominglinks);
}
- if (!outgoinglinks.isEmpty()) {
- result.add(outgoinglinks);
- }
return result.toArray();
}
- case MetadataBlock3EditPart.VISUAL_ID: {
+ case MetadataBlockEditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
Node sv = (Node) view;
Collection<View> connectedViews;
connectedViews = getChildrenByType(
Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(MetadataBlockMetadataBlockMappingCompartment3EditPart.VISUAL_ID));
+ .getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry
.getType(DateRecognizerEditPart.VISUAL_ID));
@@ -796,7 +669,7 @@ public void init(ICommonContentExtensionSite aConfig) {
connectedViews = getChildrenByType(
Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(MetadataBlockMetadataBlockMappingCompartment3EditPart.VISUAL_ID));
+ .getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry.getType(TextEditPart.VISUAL_ID));
result.addAll(createNavigatorItems(connectedViews, parentElement,
@@ -804,7 +677,7 @@ public void init(ICommonContentExtensionSite aConfig) {
connectedViews = getChildrenByType(
Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(MetadataBlockMetadataBlockMappingCompartment3EditPart.VISUAL_ID));
+ .getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry
.getType(TrimWhitespaceEditPart.VISUAL_ID));
@@ -813,7 +686,7 @@ public void init(ICommonContentExtensionSite aConfig) {
connectedViews = getChildrenByType(
Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(MetadataBlockMetadataBlockMappingCompartment3EditPart.VISUAL_ID));
+ .getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry
.getType(MappedElementEditPart.VISUAL_ID));
@@ -822,7 +695,7 @@ public void init(ICommonContentExtensionSite aConfig) {
connectedViews = getChildrenByType(
Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(MetadataBlockMetadataBlockInputFieldsCompartment3EditPart.VISUAL_ID));
+ .getType(MetadataBlockMetadataBlockInputFieldsCompartmentEditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry
.getType(TextInputFieldEditPart.VISUAL_ID));
@@ -831,7 +704,7 @@ public void init(ICommonContentExtensionSite aConfig) {
connectedViews = getChildrenByType(
Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(MetadataBlockMetadataBlockMappingCompartment3EditPart.VISUAL_ID));
+ .getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry
.getType(CurrentDateEditPart.VISUAL_ID));
@@ -840,7 +713,7 @@ public void init(ICommonContentExtensionSite aConfig) {
connectedViews = getChildrenByType(
Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(MetadataBlockMetadataBlockMappingCompartment3EditPart.VISUAL_ID));
+ .getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry
.getType(CurrentUsernameEditPart.VISUAL_ID));
@@ -849,7 +722,7 @@ public void init(ICommonContentExtensionSite aConfig) {
connectedViews = getChildrenByType(
Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(MetadataBlockMetadataBlockInputFieldsCompartment3EditPart.VISUAL_ID));
+ .getType(MetadataBlockMetadataBlockInputFieldsCompartmentEditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry
.getType(DateInputFieldEditPart.VISUAL_ID));
@@ -858,31 +731,6 @@ public void init(ICommonContentExtensionSite aConfig) {
return result.toArray();
}
- case MappedElement2EditPart.VISUAL_ID: {
- LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
- Node sv = (Node) view;
- Collection<View> connectedViews;
- connectedViews = getChildrenByType(
- Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(MappedElementChildElementsCompartment2EditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry
- .getType(MappedElement2EditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement,
- false));
- connectedViews = getChildrenByType(
- Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(MappedElementChildElementsCompartment2EditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry
- .getType(MappedAttributeEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement,
- false));
- return result.toArray();
- }
-
case MappedAttributeEditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
Node sv = (Node) view;
@@ -901,56 +749,183 @@ public void init(ICommonContentExtensionSite aConfig) {
return result.toArray();
}
- case OriginalNameRecordMatcherEditPart.VISUAL_ID: {
+ case TrimWhitespaceEditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
Node sv = (Node) view;
+ CrosswalkNavigatorGroup incominglinks = new CrosswalkNavigatorGroup(
+ Messages.NavigatorGroupName_TrimWhitespace_3006_incominglinks,
+ "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
CrosswalkNavigatorGroup outgoinglinks = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_OriginalNameRecordMatcher_3003_outgoinglinks,
+ Messages.NavigatorGroupName_TrimWhitespace_3006_outgoinglinks,
"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
Collection<View> connectedViews;
+ connectedViews = getIncomingLinksByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry
+ .getType(InputOutputEditPart.VISUAL_ID));
+ incominglinks.addChildren(createNavigatorItems(connectedViews,
+ incominglinks, true));
connectedViews = getOutgoingLinksByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry
.getType(InputOutputEditPart.VISUAL_ID));
outgoinglinks.addChildren(createNavigatorItems(connectedViews,
outgoinglinks, true));
+ if (!incominglinks.isEmpty()) {
+ result.add(incominglinks);
+ }
if (!outgoinglinks.isEmpty()) {
result.add(outgoinglinks);
}
return result.toArray();
}
- case DelimitedFileEditPart.VISUAL_ID: {
+ case DictionaryEditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
Node sv = (Node) view;
Collection<View> connectedViews;
connectedViews = getChildrenByType(
Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(DelimitedFileDataFieldCompartmentEditPart.VISUAL_ID));
+ .getType(DictionaryModelBoxCompartmentEditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry
- .getType(TabbedDataFieldEditPart.VISUAL_ID));
+ .getType(MetadataBlockEditPart.VISUAL_ID));
result.addAll(createNavigatorItems(connectedViews, parentElement,
false));
return result.toArray();
}
- case DictionaryEditPart.VISUAL_ID: {
+ case MappedElement2EditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
Node sv = (Node) view;
Collection<View> connectedViews;
connectedViews = getChildrenByType(
Collections.singleton(sv),
CrosswalkVisualIDRegistry
- .getType(DictionaryModelBoxCompartmentEditPart.VISUAL_ID));
+ .getType(MappedElementChildElementsCompartment2EditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry
- .getType(MetadataBlockEditPart.VISUAL_ID));
+ .getType(MappedElement2EditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement,
+ false));
+ connectedViews = getChildrenByType(
+ Collections.singleton(sv),
+ CrosswalkVisualIDRegistry
+ .getType(MappedElementChildElementsCompartment2EditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry
+ .getType(MappedAttributeEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement,
+ false));
+ return result.toArray();
+ }
+
+ case MetadataBlock3EditPart.VISUAL_ID: {
+ LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
+ Node sv = (Node) view;
+ Collection<View> connectedViews;
+ connectedViews = getChildrenByType(
+ Collections.singleton(sv),
+ CrosswalkVisualIDRegistry
+ .getType(MetadataBlockMetadataBlockMappingCompartment3EditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry
+ .getType(DateRecognizerEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement,
+ false));
+ connectedViews = getChildrenByType(
+ Collections.singleton(sv),
+ CrosswalkVisualIDRegistry
+ .getType(MetadataBlockMetadataBlockMappingCompartment3EditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry.getType(TextEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement,
+ false));
+ connectedViews = getChildrenByType(
+ Collections.singleton(sv),
+ CrosswalkVisualIDRegistry
+ .getType(MetadataBlockMetadataBlockMappingCompartment3EditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry
+ .getType(TrimWhitespaceEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement,
+ false));
+ connectedViews = getChildrenByType(
+ Collections.singleton(sv),
+ CrosswalkVisualIDRegistry
+ .getType(MetadataBlockMetadataBlockMappingCompartment3EditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry
+ .getType(MappedElementEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement,
+ false));
+ connectedViews = getChildrenByType(
+ Collections.singleton(sv),
+ CrosswalkVisualIDRegistry
+ .getType(MetadataBlockMetadataBlockInputFieldsCompartment3EditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry
+ .getType(TextInputFieldEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement,
+ false));
+ connectedViews = getChildrenByType(
+ Collections.singleton(sv),
+ CrosswalkVisualIDRegistry
+ .getType(MetadataBlockMetadataBlockMappingCompartment3EditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry
+ .getType(CurrentDateEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement,
+ false));
+ connectedViews = getChildrenByType(
+ Collections.singleton(sv),
+ CrosswalkVisualIDRegistry
+ .getType(MetadataBlockMetadataBlockMappingCompartment3EditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry
+ .getType(CurrentUsernameEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement,
+ false));
+ connectedViews = getChildrenByType(
+ Collections.singleton(sv),
+ CrosswalkVisualIDRegistry
+ .getType(MetadataBlockMetadataBlockInputFieldsCompartment3EditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry
+ .getType(DateInputFieldEditPart.VISUAL_ID));
result.addAll(createNavigatorItems(connectedViews, parentElement,
false));
return result.toArray();
}
+ case TextInputFieldEditPart.VISUAL_ID: {
+ LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
+ Node sv = (Node) view;
+ CrosswalkNavigatorGroup incominglinks = new CrosswalkNavigatorGroup(
+ Messages.NavigatorGroupName_TextInputField_3023_incominglinks,
+ "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+ CrosswalkNavigatorGroup outgoinglinks = new CrosswalkNavigatorGroup(
+ Messages.NavigatorGroupName_TextInputField_3023_outgoinglinks,
+ "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+ Collection<View> connectedViews;
+ connectedViews = getIncomingLinksByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry
+ .getType(InputOutputEditPart.VISUAL_ID));
+ incominglinks.addChildren(createNavigatorItems(connectedViews,
+ incominglinks, true));
+ connectedViews = getOutgoingLinksByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry
+ .getType(InputOutputEditPart.VISUAL_ID));
+ outgoinglinks.addChildren(createNavigatorItems(connectedViews,
+ outgoinglinks, true));
+ if (!incominglinks.isEmpty()) {
+ result.add(incominglinks);
+ }
+ if (!outgoinglinks.isEmpty()) {
+ result.add(outgoinglinks);
+ }
+ return result.toArray();
+ }
+
case MetadataBlock2EditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
Node sv = (Node) view;
@@ -1028,6 +1003,31 @@ public void init(ICommonContentExtensionSite aConfig) {
false));
return result.toArray();
}
+
+ case MappedElementEditPart.VISUAL_ID: {
+ LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
+ Node sv = (Node) view;
+ Collection<View> connectedViews;
+ connectedViews = getChildrenByType(
+ Collections.singleton(sv),
+ CrosswalkVisualIDRegistry
+ .getType(MappedElementChildElementsCompartmentEditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry
+ .getType(MappedElement2EditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement,
+ false));
+ connectedViews = getChildrenByType(
+ Collections.singleton(sv),
+ CrosswalkVisualIDRegistry
+ .getType(MappedElementChildElementsCompartmentEditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry
+ .getType(MappedAttributeEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement,
+ false));
+ return result.toArray();
+ }
}
return EMPTY_ARRAY;
}
View
134 crosswalk-gmf.diagram/src/crosswalk/diagram/navigator/CrosswalkNavigatorLabelProvider.java
@@ -138,72 +138,72 @@ public Image getImage(Object element) {
*/
public Image getImage(View view) {
switch (CrosswalkVisualIDRegistry.getVisualID(view)) {
- case TabbedDataFieldEditPart.VISUAL_ID:
- return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?TabbedDataField", CrosswalkElementTypes.TabbedDataField_3002); //$NON-NLS-1$
- case EditingContainerEditPart.VISUAL_ID:
- return getImage(
- "Navigator?Diagram?http://lib.unc.edu/schemas/crosswalk?EditingContainer", CrosswalkElementTypes.EditingContainer_1000); //$NON-NLS-1$
case TextEditPart.VISUAL_ID:
return getImage(
"Navigator?Node?http://lib.unc.edu/schemas/crosswalk?Text", CrosswalkElementTypes.Text_3005); //$NON-NLS-1$
- case DateRecognizerEditPart.VISUAL_ID:
+ case InputOutputEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?DateRecognizer", CrosswalkElementTypes.DateRecognizer_3004); //$NON-NLS-1$
- case DateInputFieldEditPart.VISUAL_ID:
+ "Navigator?Link?http://lib.unc.edu/schemas/crosswalk?Input?Output", CrosswalkElementTypes.InputOutput_4001); //$NON-NLS-1$
+ case DelimitedFileEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?DateInputField", CrosswalkElementTypes.DateInputField_3024); //$NON-NLS-1$
- case MetadataBlockEditPart.VISUAL_ID:
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?DelimitedFile", CrosswalkElementTypes.DelimitedFile_3001); //$NON-NLS-1$
+ case CrossWalkEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MetadataBlock", CrosswalkElementTypes.MetadataBlock_3010); //$NON-NLS-1$
- case CurrentDateEditPart.VISUAL_ID:
+ "Navigator?TopLevelNode?http://lib.unc.edu/schemas/crosswalk?CrossWalk", CrosswalkElementTypes.CrossWalk_2001); //$NON-NLS-1$
+ case OriginalNameRecordMatcherEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?CurrentDate", CrosswalkElementTypes.CurrentDate_3021); //$NON-NLS-1$
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?OriginalNameRecordMatcher", CrosswalkElementTypes.OriginalNameRecordMatcher_3003); //$NON-NLS-1$
case FormEditPart.VISUAL_ID:
return getImage(
"Navigator?TopLevelNode?http://lib.unc.edu/schemas/crosswalk?Form", CrosswalkElementTypes.Form_2003); //$NON-NLS-1$
- case CrossWalkEditPart.VISUAL_ID:
+ case EditingContainerEditPart.VISUAL_ID:
return getImage(
- "Navigator?TopLevelNode?http://lib.unc.edu/schemas/crosswalk?CrossWalk", CrosswalkElementTypes.CrossWalk_2001); //$NON-NLS-1$
- case InputOutputEditPart.VISUAL_ID:
+ "Navigator?Diagram?http://lib.unc.edu/schemas/crosswalk?EditingContainer", CrosswalkElementTypes.EditingContainer_1000); //$NON-NLS-1$
+ case DateInputFieldEditPart.VISUAL_ID:
return getImage(
- "Navigator?Link?http://lib.unc.edu/schemas/crosswalk?Input?Output", CrosswalkElementTypes.InputOutput_4001); //$NON-NLS-1$
- case TrimWhitespaceEditPart.VISUAL_ID:
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?DateInputField", CrosswalkElementTypes.DateInputField_3024); //$NON-NLS-1$
+ case DateRecognizerEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?TrimWhitespace", CrosswalkElementTypes.TrimWhitespace_3006); //$NON-NLS-1$
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?DateRecognizer", CrosswalkElementTypes.DateRecognizer_3004); //$NON-NLS-1$
case CurrentUsernameEditPart.VISUAL_ID:
return getImage(
"Navigator?Node?http://lib.unc.edu/schemas/crosswalk?CurrentUsername", CrosswalkElementTypes.CurrentUsername_3022); //$NON-NLS-1$
- case MappedElementEditPart.VISUAL_ID:
- return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MappedElement", CrosswalkElementTypes.MappedElement_3007); //$NON-NLS-1$
- case TextInputFieldEditPart.VISUAL_ID:
+ case CurrentDateEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?TextInputField", CrosswalkElementTypes.TextInputField_3023); //$NON-NLS-1$
- case MetadataBlock3EditPart.VISUAL_ID:
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?CurrentDate", CrosswalkElementTypes.CurrentDate_3021); //$NON-NLS-1$
+ case TabbedDataFieldEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MetadataBlock", CrosswalkElementTypes.MetadataBlock_3019); //$NON-NLS-1$
- case MappedElement2EditPart.VISUAL_ID:
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?TabbedDataField", CrosswalkElementTypes.TabbedDataField_3002); //$NON-NLS-1$
+ case MetadataBlockEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MappedElement", CrosswalkElementTypes.MappedElement_3008); //$NON-NLS-1$
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MetadataBlock", CrosswalkElementTypes.MetadataBlock_3010); //$NON-NLS-1$
case MappedAttributeEditPart.VISUAL_ID:
return getImage(
"Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MappedAttribute", CrosswalkElementTypes.MappedAttribute_3009); //$NON-NLS-1$
- case OriginalNameRecordMatcherEditPart.VISUAL_ID:
+ case TrimWhitespaceEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?OriginalNameRecordMatcher", CrosswalkElementTypes.OriginalNameRecordMatcher_3003); //$NON-NLS-1$
- case DelimitedFileEditPart.VISUAL_ID:
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?TrimWhitespace", CrosswalkElementTypes.TrimWhitespace_3006); //$NON-NLS-1$
+ case ParagraphEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?DelimitedFile", CrosswalkElementTypes.DelimitedFile_3001); //$NON-NLS-1$
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?Paragraph", CrosswalkElementTypes.Paragraph_3020); //$NON-NLS-1$
case DictionaryEditPart.VISUAL_ID:
return getImage(
"Navigator?TopLevelNode?http://lib.unc.edu/schemas/crosswalk?Dictionary", CrosswalkElementTypes.Dictionary_2002); //$NON-NLS-1$
+ case MappedElement2EditPart.VISUAL_ID:
+ return getImage(
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MappedElement", CrosswalkElementTypes.MappedElement_3008); //$NON-NLS-1$
+ case MetadataBlock3EditPart.VISUAL_ID:
+ return getImage(
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MetadataBlock", CrosswalkElementTypes.MetadataBlock_3019); //$NON-NLS-1$
+ case TextInputFieldEditPart.VISUAL_ID:
+ return getImage(
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?TextInputField", CrosswalkElementTypes.TextInputField_3023); //$NON-NLS-1$
case MetadataBlock2EditPart.VISUAL_ID:
return getImage(
"Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MetadataBlock", CrosswalkElementTypes.MetadataBlock_3018); //$NON-NLS-1$
- case ParagraphEditPart.VISUAL_ID:
+ case MappedElementEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?Paragraph", CrosswalkElementTypes.Paragraph_3020); //$NON-NLS-1$
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MappedElement", CrosswalkElementTypes.MappedElement_3007); //$NON-NLS-1$
}
return getImage("Navigator?UnknownElement", null); //$NON-NLS-1$
}
@@ -257,50 +257,50 @@ public String getText(View view) {
return getUnresolvedDomainElementProxyText(view);
}
switch (CrosswalkVisualIDRegistry.getVisualID(view)) {
- case TabbedDataFieldEditPart.VISUAL_ID:
- return getTabbedDataField_3002Text(view);
- case EditingContainerEditPart.VISUAL_ID:
- return getEditingContainer_1000Text(view);
case TextEditPart.VISUAL_ID:
return getText_3005Text(view);
- case DateRecognizerEditPart.VISUAL_ID:
- return getDateRecognizer_3004Text(view);
- case DateInputFieldEditPart.VISUAL_ID:
- return getDateInputField_3024Text(view);
- case MetadataBlockEditPart.VISUAL_ID:
- return getMetadataBlock_3010Text(view);
- case CurrentDateEditPart.VISUAL_ID:
- return getCurrentDate_3021Text(view);
- case FormEditPart.VISUAL_ID:
- return getForm_2003Text(view);
- case CrossWalkEditPart.VISUAL_ID:
- return getCrossWalk_2001Text(view);
case InputOutputEditPart.VISUAL_ID:
return getInputOutput_4001Text(view);
- case TrimWhitespaceEditPart.VISUAL_ID:
- return getTrimWhitespace_3006Text(view);
+ case DelimitedFileEditPart.VISUAL_ID:
+ return getDelimitedFile_3001Text(view);
+ case CrossWalkEditPart.VISUAL_ID:
+ return getCrossWalk_2001Text(view);
+ case OriginalNameRecordMatcherEditPart.VISUAL_ID:
+ return getOriginalNameRecordMatcher_3003Text(view);
+ case FormEditPart.VISUAL_ID:
+ return getForm_2003Text(view);
+ case EditingContainerEditPart.VISUAL_ID:
+ return getEditingContainer_1000Text(view);
+ case DateInputFieldEditPart.VISUAL_ID:
+ return getDateInputField_3024Text(view);
+ case DateRecognizerEditPart.VISUAL_ID:
+ return getDateRecognizer_3004Text(view);
case CurrentUsernameEditPart.VISUAL_ID:
return getCurrentUsername_3022Text(view);
- case MappedElementEditPart.VISUAL_ID:
- return getMappedElement_3007Text(view);
- case TextInputFieldEditPart.VISUAL_ID:
- return getTextInputField_3023Text(view);
- case MetadataBlock3EditPart.VISUAL_ID:
- return getMetadataBlock_3019Text(view);
- case MappedElement2EditPart.VISUAL_ID:
- return getMappedElement_3008Text(view);
+ case CurrentDateEditPart.VISUAL_ID:
+ return getCurrentDate_3021Text(view);
+ case TabbedDataFieldEditPart.VISUAL_ID:
+ return getTabbedDataField_3002Text(view);
+ case MetadataBlockEditPart.VISUAL_ID:
+ return getMetadataBlock_3010Text(view);
case MappedAttributeEditPart.VISUAL_ID:
return getMappedAttribute_3009Text(view);
- case OriginalNameRecordMatcherEditPart.VISUAL_ID:
- return getOriginalNameRecordMatcher_3003Text(view);
- case DelimitedFileEditPart.VISUAL_ID:
- return getDelimitedFile_3001Text(view);
+ case TrimWhitespaceEditPart.VISUAL_ID:
+ return getTrimWhitespace_3006Text(view);
+ case ParagraphEditPart.VISUAL_ID:
+ return getParagraph_3020Text(view);
case DictionaryEditPart.VISUAL_ID:
return getDictionary_2002Text(view);
+ case MappedElement2EditPart.VISUAL_ID:
+ return getMappedElement_3008Text(view);
+ case MetadataBlock3EditPart.VISUAL_ID:
+ return getMetadataBlock_3019Text(view);
+ case TextInputFieldEditPart.VISUAL_ID:
+ return getTextInputField_3023Text(view);
case MetadataBlock2EditPart.VISUAL_ID:
return getMetadataBlock_3018Text(view);
- case ParagraphEditPart.VISUAL_ID:
- return getParagraph_3020Text(view);
+ case MappedElementEditPart.VISUAL_ID:
+ return getMappedElement_3007Text(view);
}
return getUnknownElementText(view);
}
View
16 crosswalk-gmf.diagram/src/crosswalk/diagram/part/CrosswalkDiagramEditorUtil.java
@@ -15,10 +15,6 @@
*/
package crosswalk.diagram.part;
-import edu.unc.lib.schemas.acl.AclPackage;
-import gov.loc.mods.mods.MODSFactory;
-import gov.loc.mods.mods.MODSPackage;
-
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
@@ -544,8 +540,10 @@ protected CommandResult doExecuteWithResult(
Dictionary dict = CrosswalkFactory.eINSTANCE.createDictionary();
dict.setName("Dictionary Title");
dict.setDescription("This is the dictionary description. Click on this text or the title to edit.");
- dict.getOutputProfiles().add(OutputProfileFactory.getMODSProfile());
- dict.getOutputProfiles().add(OutputProfileFactory.getACLProfile());
+ dict.getOutputProfiles().add(
+ OutputProfileFactory.getMODSProfile());
+ dict.getOutputProfiles().add(
+ OutputProfileFactory.getACLProfile());
model.setModel(dict);
attachModelToResource(model, diagramResource);
@@ -601,8 +599,10 @@ protected CommandResult doExecuteWithResult(
Form form = CrosswalkFactory.eINSTANCE.createForm();
form.setTitle("Form Title");
form.setDescription("This is a description of the form. Click on this text or the title to edit.");
- form.getOutputProfiles().add(OutputProfileFactory.getMODSProfile());
- form.getOutputProfiles().add(OutputProfileFactory.getACLProfile());
+ form.getOutputProfiles().add(
+ OutputProfileFactory.getMODSProfile());
+ form.getOutputProfiles().add(
+ OutputProfileFactory.getACLProfile());
model.setModel(form);
attachModelToResource(model, diagramResource);
View
1  crosswalk-gmf.edit/plugin.properties
@@ -214,3 +214,4 @@ _UI_OutputMetadataSections_dmdSec_literal = dmdSec
_UI_OutputMetadataSections_techMD_literal = techMD
_UI_OutputMetadataSections_digiprovMD_literal = digiprovMD
_UI_OutputMetadataSections_sourceMD_literal = sourceMD
+_UI_OutputProfile_parentMappedFeature_feature = Parent Mapped Feature
View
25 crosswalk-gmf.edit/src/crosswalk/provider/OutputProfileItemProvider.java
@@ -64,7 +64,6 @@ public OutputProfileItemProvider(AdapterFactory adapterFactory) {
if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
- addParentMappedElementPropertyDescriptor(object);
addStartMappingAtChildrenPropertyDescriptor(object);
addNamePropertyDescriptor(object);
addDescriptionPropertyDescriptor(object);
@@ -75,28 +74,6 @@ public OutputProfileItemProvider(AdapterFactory adapterFactory) {
}
/**
- * This adds a property descriptor for the Parent Mapped Element feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addParentMappedElementPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_OutputProfile_parentMappedElement_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_OutputProfile_parentMappedElement_feature", "_UI_OutputProfile_type"),
- CrosswalkPackage.Literals.OUTPUT_PROFILE__PARENT_MAPPED_ELEMENT,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
* This adds a property descriptor for the Start Mapping At Children feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -218,6 +195,7 @@ protected void addMetadataTypePropertyDescriptor(Object object) {
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
if (childrenFeatures == null) {
super.getChildrenFeatures(object);
+ childrenFeatures.add(CrosswalkPackage.Literals.OUTPUT_PROFILE__PARENT_MAPPED_FEATURE);
childrenFeatures.add(CrosswalkPackage.Literals.OUTPUT_PROFILE__METADATA_SECTION);
}
return childrenFeatures;
@@ -280,6 +258,7 @@ public void notifyChanged(Notification notification) {
case CrosswalkPackage.OUTPUT_PROFILE__METADATA_TYPE:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
+ case CrosswalkPackage.OUTPUT_PROFILE__PARENT_MAPPED_FEATURE:
case CrosswalkPackage.OUTPUT_PROFILE__METADATA_SECTION:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
View
3  crosswalk-gmf/META-INF/MANIFEST.MF
@@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.core.runtime,
mods.model;bundle-version="0.0.0";visibility:=reexport,
mets.model;bundle-version="0.0.0";visibility:=reexport,
org.slf4j.log4j12;bundle-version="1.6.6",
- access-control;bundle-version="4.1.2";visibility:=reexport
+ access-control;bundle-version="4.1.2";visibility:=reexport,
+ org.slf4j.pde;bundle-version="4.1.2";visibility:=reexport
Bundle-ClassPath: .,
lib/opencsv-2.2.jar
Import-Package: org.slf4j
View
4 crosswalk-gmf/model/crosswalk.ecore
@@ -257,8 +257,8 @@
<eLiterals name="MultipleLines" value="1"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="OutputProfile">
- <eStructuralFeatures xsi:type="ecore:EReference" name="parentMappedElement" lowerBound="1"
- eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="parentMappedFeature" lowerBound="1"
+ eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="startMappingAtChildren"
lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
defaultValueLiteral="true"/>
View
2  crosswalk-gmf/model/crosswalk.genmodel
@@ -194,7 +194,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute crosswalk.ecore#//DateInputField/datePrecision"/>
</genClasses>
<genClasses ecoreClass="crosswalk.ecore#//OutputProfile">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference crosswalk.ecore#//OutputProfile/parentMappedElement"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference crosswalk.ecore#//OutputProfile/parentMappedFeature"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute crosswalk.ecore#//OutputProfile/startMappingAtChildren"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute crosswalk.ecore#//OutputProfile/name"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute crosswalk.ecore#//OutputProfile/description"/>
View
28 crosswalk-gmf/src/crosswalk/CrosswalkPackage.java
@@ -1746,13 +1746,13 @@
int OUTPUT_PROFILE = 32;
/**
- * The feature id for the '<em><b>Parent Mapped Element</b></em>' reference.
+ * The feature id for the '<em><b>Parent Mapped Feature</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int OUTPUT_PROFILE__PARENT_MAPPED_ELEMENT = 0;
+ int OUTPUT_PROFILE__PARENT_MAPPED_FEATURE = 0;
/**
* The feature id for the '<em><b>Start Mapping At Children</b></em>' attribute.
@@ -3007,26 +3007,26 @@
EClass getOutputProfile();
/**
- * Returns the meta object for the attribute '{@link crosswalk.OutputProfile#getMetadataSection <em>Metadata Section</em>}'.
+ * Returns the meta object for the reference '{@link crosswalk.OutputProfile#getParentMappedFeature <em>Parent Mapped Feature</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Metadata Section</em>'.
- * @see crosswalk.OutputProfile#getMetadataSection()
+ * @return the meta object for the reference '<em>Parent Mapped Feature</em>'.
+ * @see crosswalk.OutputProfile#getParentMappedFeature()
* @see #getOutputProfile()
* @generated
*/
- EAttribute getOutputProfile_MetadataSection();
+ EReference getOutputProfile_ParentMappedFeature();
/**
- * Returns the meta object for the reference '{@link crosswalk.OutputProfile#getParentMappedElement <em>Parent Mapped Element</em>}'.
+ * Returns the meta object for the attribute '{@link crosswalk.OutputProfile#getMetadataSection <em>Metadata Section</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Parent Mapped Element</em>'.
- * @see crosswalk.OutputProfile#getParentMappedElement()
+ * @return the meta object for the attribute '<em>Metadata Section</em>'.
+ * @see crosswalk.OutputProfile#getMetadataSection()
* @see #getOutputProfile()
* @generated
*/
- EReference getOutputProfile_ParentMappedElement();
+ EAttribute getOutputProfile_MetadataSection();
/**
* Returns the meta object for the attribute '{@link crosswalk.OutputProfile#isStartMappingAtChildren <em>Start Mapping At Children</em>}'.
@@ -4094,20 +4094,20 @@
EClass OUTPUT_PROFILE = eINSTANCE.getOutputProfile();
/**
- * The meta object literal for the '<em><b>Metadata Section</b></em>' attribute feature.
+ * The meta object literal for the '<em><b>Parent Mapped Feature</b></em>' reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EAttribute OUTPUT_PROFILE__METADATA_SECTION = eINSTANCE.getOutputProfile_MetadataSection();
+ EReference OUTPUT_PROFILE__PARENT_MAPPED_FEATURE = eINSTANCE.getOutputProfile_ParentMappedFeature();
/**
- * The meta object literal for the '<em><b>Parent Mapped Element</b></em>' reference feature.
+ * The meta object literal for the '<em><b>Metadata Section</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EReference OUTPUT_PROFILE__PARENT_MAPPED_ELEMENT = eINSTANCE.getOutputProfile_ParentMappedElement();
+ EAttribute OUTPUT_PROFILE__METADATA_SECTION = eINSTANCE.getOutputProfile_MetadataSection();
/**
* The meta object literal for the '<em><b>Start Mapping At Children</b></em>' attribute feature.
View
18 crosswalk-gmf/src/crosswalk/OutputMetadataSections.java
@@ -2,11 +2,14 @@
*/
package crosswalk;
+import gov.loc.mets.MetsPackage;
+
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.eclipse.emf.common.util.Enumerator;
+import org.eclipse.emf.ecore.EReference;
/**
* <!-- begin-user-doc -->
@@ -286,4 +289,19 @@ public String toString() {
return literal;
}
+ public EReference getDivReference() {
+ EReference result = null;
+ switch(this) {
+ case DIGIPROV_MD:
+ case RIGHTS_MD:
+ case SOURCE_MD:
+ case TECH_MD:
+ result = MetsPackage.eINSTANCE.getDivType_MdSec();
+ break;
+ case DMD_SEC:
+ result = MetsPackage.eINSTANCE.getDivType_DmdSec();
+ }
+ return result;
+ }
+
} //OutputMetadataSections
View
49 crosswalk-gmf/src/crosswalk/OutputProfile.java
@@ -3,6 +3,7 @@
package crosswalk;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
/**
* <!-- begin-user-doc -->
@@ -12,7 +13,7 @@
* <p>
* The following features are supported:
* <ul>
- * <li>{@link crosswalk.OutputProfile#getParentMappedElement <em>Parent Mapped Element</em>}</li>
+ * <li>{@link crosswalk.OutputProfile#getParentMappedFeature <em>Parent Mapped Feature</em>}</li>
* <li>{@link crosswalk.OutputProfile#isStartMappingAtChildren <em>Start Mapping At Children</em>}</li>
* <li>{@link crosswalk.OutputProfile#getName <em>Name</em>}</li>
* <li>{@link crosswalk.OutputProfile#getDescription <em>Description</em>}</li>
@@ -28,59 +29,59 @@
*/
public interface OutputProfile extends EObject {
/**
- * Returns the value of the '<em><b>Metadata Section</b></em>' attribute.
- * The literals are from the enumeration {@link crosswalk.OutputMetadataSections}.
+ * Returns the value of the '<em><b>Parent Mapped Feature</b></em>' reference.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Metadata Section</em>' containment reference isn't clear,
+ * If the meaning of the '<em>Parent Mapped Feature</em>' containment reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Metadata Section</em>' attribute.
- * @see crosswalk.OutputMetadataSections
- * @see #setMetadataSection(OutputMetadataSections)
- * @see crosswalk.CrosswalkPackage#getOutputProfile_MetadataSection()
+ * @return the value of the '<em>Parent Mapped Feature</em>' reference.
+ * @see #setParentMappedFeature(EReference)
+ * @see crosswalk.CrosswalkPackage#getOutputProfile_ParentMappedFeature()
* @model required="true"
* @generated
*/
- OutputMetadataSections getMetadataSection();
+ EReference getParentMappedFeature();
/**
- * Sets the value of the '{@link crosswalk.OutputProfile#getMetadataSection <em>Metadata Section</em>}' attribute.
+ * Sets the value of the '{@link crosswalk.OutputProfile#getParentMappedFeature <em>Parent Mapped Feature</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Metadata Section</em>' attribute.
- * @see crosswalk.OutputMetadataSections
- * @see #getMetadataSection()
+ * @param value the new value of the '<em>Parent Mapped Feature</em>' reference.
+ * @see #getParentMappedFeature()
* @generated
*/
- void setMetadataSection(OutputMetadataSections value);
+ void setParentMappedFeature(EReference value);
/**
- * Returns the value of the '<em><b>Parent Mapped Element</b></em>' reference.
+ * Returns the value of the '<em><b>Metadata Section</b></em>' attribute.
+ * The literals are from the enumeration {@link crosswalk.OutputMetadataSections}.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Parent Mapped Element</em>' reference isn't clear,
+ * If the meaning of the '<em>Metadata Section</em>' containment reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Parent Mapped Element</em>' reference.
- * @see #setParentMappedElement(EObject)
- * @see crosswalk.CrosswalkPackage#getOutputProfile_ParentMappedElement()
+ * @return the value of the '<em>Metadata Section</em>' attribute.
+ * @see crosswalk.OutputMetadataSections
+ * @see #setMetadataSection(OutputMetadataSections)
+ * @see crosswalk.CrosswalkPackage#getOutputProfile_MetadataSection()
* @model required="true"
* @generated
*/
- EObject getParentMappedElement();
+ OutputMetadataSections getMetadataSection();
/**
- * Sets the value of the '{@link crosswalk.OutputProfile#getParentMappedElement <em>Parent Mapped Element</em>}' reference.
+ * Sets the value of the '{@link crosswalk.OutputProfile#getMetadataSection <em>Metadata Section</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Parent Mapped Element</em>' reference.
- * @see #getParentMappedElement()
+ * @param value the new value of the '<em>Metadata Section</em>' attribute.
+ * @see crosswalk.OutputMetadataSections
+ * @see #getMetadataSection()
* @generated
*/
- void setParentMappedElement(EObject value);
+ void setMetadataSection(OutputMetadataSections value);
/**
* Returns the value of the '<em><b>Start Mapping At Children</b></em>' attribute.
View
13 crosswalk-gmf/src/crosswalk/RecordMatches.java
@@ -21,6 +21,7 @@
import java.util.Set;
/**
+ * Captures the outcome of a record to div matching operation.
* @author Gregory Jansen
*
*/
@@ -41,14 +42,26 @@ public RecordMatches(Map<DivType, String> matches2, Map<String, Set<String>> rec
this.divCollisions = divCollisions;
}
+ /**
+ * The div and the record id that was matched to it.
+ * @return
+ */
public Map<DivType, String> getMatches() {
return matches;
}
+ /**
+ * The record ids that had overlap in their match patterns.
+ * @return
+ */
public Map<String, Set<String>> getRecordCollisions() {
return recordCollisions;
}
+ /**
+ * The divs that had overlap in their match patterns.
+ * @return
+ */
public Map<String, Set<DivType>> getResourceCollisions() {
return divCollisions;
}
View
12 crosswalk-gmf/src/crosswalk/impl/CrosswalkPackageImpl.java
@@ -1384,8 +1384,8 @@ public EClass getOutputProfile() {
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getOutputProfile_MetadataSection() {
- return (EAttribute)outputProfileEClass.getEStructuralFeatures().get(6);
+ public EReference getOutputProfile_ParentMappedFeature() {
+ return (EReference)outputProfileEClass.getEStructuralFeatures().get(0);
}
/**
@@ -1393,8 +1393,8 @@ public EAttribute getOutputProfile_MetadataSection() {
* <!-- end-user-doc -->
* @generated
*/
- public EReference getOutputProfile_ParentMappedElement() {
- return (EReference)outputProfileEClass.getEStructuralFeatures().get(0);
+ public EAttribute getOutputProfile_MetadataSection() {
+ return (EAttribute)outputProfileEClass.getEStructuralFeatures().get(6);
}
/**
@@ -1694,7 +1694,7 @@ public void createPackageContents() {
createEAttribute(dateInputFieldEClass, DATE_INPUT_FIELD__DATE_PRECISION);
outputProfileEClass = createEClass(OUTPUT_PROFILE);
- createEReference(outputProfileEClass, OUTPUT_PROFILE__PARENT_MAPPED_ELEMENT);
+ createEReference(outputProfileEClass, OUTPUT_PROFILE__PARENT_MAPPED_FEATURE);
createEAttribute(outputProfileEClass, OUTPUT_PROFILE__START_MAPPING_AT_CHILDREN);
createEAttribute(outputProfileEClass, OUTPUT_PROFILE__NAME);
createEAttribute(outputProfileEClass, OUTPUT_PROFILE__DESCRIPTION);
@@ -1978,7 +1978,7 @@ public void initializePackageContents() {
initEAttribute(getDateInputField_DatePrecision(), this.getDatePrecision(), "datePrecision", "Day", 1, 1, DateInputField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(outputProfileEClass, OutputProfile.class, "OutputProfile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getOutputProfile_ParentMappedElement(), ecorePackage.getEObject(), null, "parentMappedElement", null, 1, 1, OutputProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getOutputProfile_ParentMappedFeature(), ecorePackage.getEReference(), null, "parentMappedFeature", null, 1, 1, OutputProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getOutputProfile_StartMappingAtChildren(), ecorePackage.getEBoolean(), "startMappingAtChildren", "true", 1, 1, OutputProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getOutputProfile_Name(), ecorePackage.getEString(), "name", "Profile Name", 1, 1, OutputProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getOutputProfile_Description(), ecorePackage.getEString(), "description", "Description", 1, 1, OutputProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
View
12 crosswalk-gmf/src/crosswalk/impl/MappedElementImpl.java
@@ -15,11 +15,6 @@
*/
package crosswalk.impl;
-import gov.loc.mods.mods.AccessConditionDefinition;
-import gov.loc.mods.mods.MODSPackage;
-import gov.loc.mods.mods.impl.AccessConditionDefinitionImpl;
-import gov.loc.mods.mods.impl.ExtensionDefinitionImpl;
-
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
@@ -41,7 +36,7 @@
import org.eclipse.emf.ecore.util.FeatureMapUtil;
import org.eclipse.emf.ecore.util.InternalEList;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.slf4j.LoggerFactory;
import crosswalk.CrosswalkPackage;
import crosswalk.MappedAttribute;
@@ -300,9 +295,10 @@ else if (eNotificationRequired())
public void updateRecord(EObject record) {
if (this.getMappedFeature() != null && this.getMappedFeature().getEReferenceType() != null) {
EClass mytype = this.getMappedFeature().getEReferenceType();
- LOG.debug("my type: " + mytype.toString());
+ //System.out.println("my type: " + mytype.toString());
+ if(!record.eClass().getEAllContainments().contains(this.getMappedFeature())) return;
EObject myobject = mytype.getEPackage().getEFactoryInstance().create(mytype);
- LOG.debug("my object: " + myobject.toString());
+ //System.out.println("my object: " + myobject.toString());
for (MappedAttribute ma : this.getAttributes()) {
View
7 crosswalk-gmf/src/crosswalk/impl/OriginalNameRecordMatcherImpl.java
@@ -342,7 +342,11 @@ public void run() throws DataException {
LOG.debug("Running the original name record matcher.");
Map<DivType, String> matches = new HashMap<DivType, String>();
+
+ // pattern to set of divs
Map<String, Set<DivType>> divPatterns = new HashMap<String, Set<DivType>>();
+
+ // pattern to set of record ids
Map<String, Set<String>> recordPatterns = new HashMap<String, Set<String>>();
try {
@@ -355,10 +359,9 @@ public void run() throws DataException {
DataSource ds = crosswalk.getDataSource();
ds.Reset();
try {
- processRecord(ds, recordPatterns);
while (true) {
- ds.NextRecord();
processRecord(ds, recordPatterns);
+ ds.NextRecord();
}
} catch (RecordOutOfRangeException e) {
// expected
View
73 crosswalk-gmf/src/crosswalk/impl/OutputProfileImpl.java
@@ -10,6 +10,7 @@
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.InternalEObject;
@@ -23,7 +24,7 @@
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link crosswalk.impl.OutputProfileImpl#getParentMappedElement <em>Parent Mapped Element</em>}</li>
+ * <li>{@link crosswalk.impl.OutputProfileImpl#getParentMappedFeature <em>Parent Mapped Feature</em>}</li>
* <li>{@link crosswalk.impl.OutputProfileImpl#isStartMappingAtChildren <em>Start Mapping At Children</em>}</li>
* <li>{@link crosswalk.impl.OutputProfileImpl#getName <em>Name</em>}</li>
* <li>{@link crosswalk.impl.OutputProfileImpl#getDescription <em>Description</em>}</li>
@@ -37,14 +38,14 @@
*/
public class OutputProfileImpl extends EObjectImpl implements OutputProfile {
/**
- * The cached value of the '{@link #getParentMappedElement() <em>Parent Mapped Element</em>}' reference.
+ * The cached value of the '{@link #getParentMappedFeature() <em>Parent Mapped Feature</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getParentMappedElement()
+ * @see #getParentMappedFeature()
* @generated
* @ordered
*/
- protected EObject parentMappedElement;
+ protected EReference parentMappedFeature;
/**
* The default value of the '{@link #isStartMappingAtChildren() <em>Start Mapping At Children</em>}' attribute.
@@ -190,8 +191,16 @@ protected EClass eStaticClass() {
* <!-- end-user-doc -->
* @generated
*/
- public OutputMetadataSections getMetadataSection() {
- return metadataSection;
+ public EReference getParentMappedFeature() {
+ if (parentMappedFeature != null && parentMappedFeature.eIsProxy()) {
+ InternalEObject oldParentMappedFeature = (InternalEObject)parentMappedFeature;
+ parentMappedFeature = (EReference)eResolveProxy(oldParentMappedFeature);
+ if (parentMappedFeature != oldParentMappedFeature) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, CrosswalkPackage.OUTPUT_PROFILE__PARENT_MAPPED_FEATURE, oldParentMappedFeature, parentMappedFeature));
+ }
+ }
+ return parentMappedFeature;
}
/**
@@ -199,11 +208,8 @@ public OutputMetadataSections getMetadataSection() {
* <!-- end-user-doc -->
* @generated
*/
- public void setMetadataSection(OutputMetadataSections newMetadataSection) {
- OutputMetadataSections oldMetadataSection = metadataSection;
- metadataSection = newMetadataSection == null ? METADATA_SECTION_EDEFAULT : newMetadataSection;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CrosswalkPackage.OUTPUT_PROFILE__METADATA_SECTION, oldMetadataSection, metadataSection));
+ public EReference basicGetParentMappedFeature() {
+ return parentMappedFeature;
}
/**
@@ -211,16 +217,11 @@ public void setMetadataSection(OutputMetadataSections newMetadataSection) {
* <!-- end-user-doc -->
* @generated
*/
- public EObject getParentMappedElement() {
- if (parentMappedElement != null && parentMappedElement.eIsProxy()) {
- InternalEObject oldParentMappedElement = (InternalEObject)parentMappedElement;
- parentMappedElement = eResolveProxy(oldParentMappedElement);
- if (parentMappedElement != oldParentMappedElement) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, CrosswalkPackage.OUTPUT_PROFILE__PARENT_MAPPED_ELEMENT, oldParentMappedElement, parentMappedElement));
- }
- }
- return parentMappedElement;
+ public void setParentMappedFeature(EReference newParentMappedFeature) {
+ EReference oldParentMappedFeature = parentMappedFeature;
+ parentMappedFeature = newParentMappedFeature;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, CrosswalkPackage.OUTPUT_PROFILE__PARENT_MAPPED_FEATURE, oldParentMappedFeature, parentMappedFeature));
}
/**
@@ -228,8 +229,8 @@ public EObject getParentMappedElement() {
* <!-- end-user-doc -->
* @generated
*/
- public EObject basicGetParentMappedElement() {
- return parentMappedElement;
+ public OutputMetadataSections getMetadataSection() {
+ return metadataSection;
}
/**
@@ -237,11 +238,11 @@ public EObject basicGetParentMappedElement() {
* <!-- end-user-doc -->
* @generated
*/
- public void setParentMappedElement(EObject newParentMappedElement) {
- EObject oldParentMappedElement = parentMappedElement;
- parentMappedElement = newParentMappedElement;
+ public void setMetadataSection(OutputMetadataSections newMetadataSection) {
+ OutputMetadataSections oldMetadataSection = metadataSection;
+ metadataSection = newMetadataSection == null ? METADATA_SECTION_EDEFAULT : newMetadataSection;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CrosswalkPackage.OUTPUT_PROFILE__PARENT_MAPPED_ELEMENT, oldParentMappedElement, parentMappedElement));
+ eNotify(new ENotificationImpl(this, Notification.SET, CrosswalkPackage.OUTPUT_PROFILE__METADATA_SECTION, oldMetadataSection, metadataSection));
}
/**
@@ -357,9 +358,9 @@ public void setMetadataType(String newMetadataType) {
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case CrosswalkPackage.OUTPUT_PROFILE__PARENT_MAPPED_ELEMENT:
- if (resolve) return getParentMappedElement();
- return basicGetParentMappedElement();
+ case CrosswalkPackage.OUTPUT_PROFILE__PARENT_MAPPED_FEATURE:
+ if (resolve) return getParentMappedFeature();
+ return basicGetParentMappedFeature();
case CrosswalkPackage.OUTPUT_PROFILE__START_MAPPING_AT_CHILDREN:
return isStartMappingAtChildren();
case CrosswalkPackage.OUTPUT_PROFILE__NAME:
@@ -384,8 +385,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case CrosswalkPackage.OUTPUT_PROFILE__PARENT_MAPPED_ELEMENT:
- setParentMappedElement((EObject)newValue);
+ case CrosswalkPackage.OUTPUT_PROFILE__PARENT_MAPPED_FEATURE:
+ setParentMappedFeature((EReference)newValue);
return;
case CrosswalkPackage.OUTPUT_PROFILE__START_MAPPING_AT_CHILDREN:
setStartMappingAtChildren((Boolean)newValue);
@@ -417,8 +418,8 @@ public void eSet(int featureID, Object newValue) {
@Override
public void eUnset(int featureID) {
switch (featureID) {
- case CrosswalkPackage.OUTPUT_PROFILE__PARENT_MAPPED_ELEMENT:
- setParentMappedElement((EObject)null);
+ case CrosswalkPackage.OUTPUT_PROFILE__PARENT_MAPPED_FEATURE:
+ setParentMappedFeature((EReference)null);
return;