Skip to content
Browse files

enhanced forms model:

 - rows attribute added to text inputs
 - valid values attribute added to text inputs (local vocab, list of strings)
 - added precision setting to any dates supplied to date inputs
  • Loading branch information...
1 parent fa165a9 commit 29851fc4b2b446320485892ad35c1b93746f3c85 @gregjan gregjan committed
View
406 crosswalk-gmf.diagram/src/crosswalk/diagram/navigator/CrosswalkNavigatorContentProvider.java
@@ -254,11 +254,11 @@ public void init(ICommonContentExtensionSite aConfig) {
private Object[] getViewChildren(View view, Object parentElement) {
switch (CrosswalkVisualIDRegistry.getVisualID(view)) {
- case TabbedDataFieldEditPart.VISUAL_ID: {
+ case CurrentUsernameEditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
Node sv = (Node) view;
CrosswalkNavigatorGroup incominglinks = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_TabbedDataField_3002_incominglinks,
+ Messages.NavigatorGroupName_CurrentUsername_3022_incominglinks,
"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
Collection<View> connectedViews;
connectedViews = getIncomingLinksByType(Collections.singleton(sv),
@@ -270,6 +270,23 @@ public void init(ICommonContentExtensionSite aConfig) {
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();
+ }
+
case DictionaryEditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
Node sv = (Node) view;
@@ -282,73 +299,86 @@ public void init(ICommonContentExtensionSite aConfig) {
return result.toArray();
}
- case TextEditPart.VISUAL_ID: {
+ case DateInputFieldEditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
Node sv = (Node) view;
CrosswalkNavigatorGroup incominglinks = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_Text_3005_incominglinks,
+ 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 DelimitedFileEditPart.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));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(TabbedDataFieldEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement, false));
- return result.toArray();
- }
-
- case MappedElement2EditPart.VISUAL_ID: {
+ 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 = 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));
+ 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 FormEditPart.VISUAL_ID: {
+ 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 = 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),
- CrosswalkVisualIDRegistry.getType(FormModelBoxCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(ParagraphEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement, false));
+ 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 OriginalNameRecordMatcherEditPart.VISUAL_ID: {
+ case MappedAttributeEditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
Node sv = (Node) view;
CrosswalkNavigatorGroup outgoinglinks = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_OriginalNameRecordMatcher_3003_outgoinglinks,
+ Messages.NavigatorGroupName_MappedAttribute_3009_outgoinglinks,
"icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
Collection<View> connectedViews;
connectedViews = getOutgoingLinksByType(Collections.singleton(sv),
@@ -360,50 +390,76 @@ public void init(ICommonContentExtensionSite aConfig) {
return result.toArray();
}
- case MetadataBlockEditPart.VISUAL_ID: {
+ 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 TextEditPart.VISUAL_ID: {
+ LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
+ Node sv = (Node) view;
+ CrosswalkNavigatorGroup incominglinks = new CrosswalkNavigatorGroup(
+ Messages.NavigatorGroupName_Text_3005_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(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(DateRecognizerEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement, false));
- connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(TextEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement, false));
- connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(TrimWhitespaceEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement, false));
- connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(MappedElementEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement, false));
- connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockInputFieldsCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(TextInputFieldEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement, false));
- connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(CurrentDateEditPart.VISUAL_ID));
+ CrosswalkVisualIDRegistry.getType(CrossWalkEditPart.VISUAL_ID));
result.addAll(createNavigatorItems(connectedViews, parentElement, false));
connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(CurrentUsernameEditPart.VISUAL_ID));
+ CrosswalkVisualIDRegistry.getType(DictionaryEditPart.VISUAL_ID));
result.addAll(createNavigatorItems(connectedViews, parentElement, false));
connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockInputFieldsCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(DateInputFieldEditPart.VISUAL_ID));
+ 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 OriginalNameRecordMatcherEditPart.VISUAL_ID: {
+ LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
+ Node sv = (Node) view;
+ CrosswalkNavigatorGroup outgoinglinks = new CrosswalkNavigatorGroup(
+ Messages.NavigatorGroupName_OriginalNameRecordMatcher_3003_outgoinglinks,
+ "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+ Collection<View> connectedViews;
+ connectedViews = getOutgoingLinksByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry.getType(InputOutputEditPart.VISUAL_ID));
+ outgoinglinks.addChildren(createNavigatorItems(connectedViews, outgoinglinks, true));
+ if (!outgoinglinks.isEmpty()) {
+ result.add(outgoinglinks);
+ }
return result.toArray();
}
@@ -481,19 +537,52 @@ public void init(ICommonContentExtensionSite aConfig) {
return result.toArray();
}
- case CurrentUsernameEditPart.VISUAL_ID: {
+ case MetadataBlock2EditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
Node sv = (Node) view;
- CrosswalkNavigatorGroup incominglinks = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_CurrentUsername_3022_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);
- }
+ connectedViews = getChildrenByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartment2EditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry.getType(DateRecognizerEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement, false));
+ connectedViews = getChildrenByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartment2EditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry.getType(TextEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement, false));
+ connectedViews = getChildrenByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartment2EditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry.getType(TrimWhitespaceEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement, false));
+ connectedViews = getChildrenByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartment2EditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry.getType(MappedElementEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement, false));
+ connectedViews = getChildrenByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry
+ .getType(MetadataBlockMetadataBlockInputFieldsCompartment2EditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry.getType(TextInputFieldEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement, false));
+ connectedViews = getChildrenByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartment2EditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry.getType(CurrentDateEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement, false));
+ connectedViews = getChildrenByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartment2EditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry.getType(CurrentUsernameEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement, false));
+ connectedViews = getChildrenByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry
+ .getType(MetadataBlockMetadataBlockInputFieldsCompartment2EditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry.getType(DateInputFieldEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement, false));
return result.toArray();
}
@@ -513,28 +602,20 @@ public void init(ICommonContentExtensionSite aConfig) {
return result.toArray();
}
- case DateRecognizerEditPart.VISUAL_ID: {
+ case FormEditPart.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);
- }
+ 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),
+ CrosswalkVisualIDRegistry.getType(FormModelBoxCompartmentEditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry.getType(ParagraphEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement, false));
return result.toArray();
}
@@ -647,162 +728,81 @@ public void init(ICommonContentExtensionSite aConfig) {
return result.toArray();
}
- case TextInputFieldEditPart.VISUAL_ID: {
+ case DelimitedFileEditPart.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);
- }
+ connectedViews = getChildrenByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry.getType(DelimitedFileDataFieldCompartmentEditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry.getType(TabbedDataFieldEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement, false));
return result.toArray();
}
- case MappedElementEditPart.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(MappedElementChildElementsCompartmentEditPart.VISUAL_ID));
+ 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(MappedElementChildElementsCompartmentEditPart.VISUAL_ID));
+ CrosswalkVisualIDRegistry.getType(MappedElementChildElementsCompartment2EditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry.getType(MappedAttributeEditPart.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(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 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 MetadataBlock2EditPart.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(MetadataBlockMetadataBlockMappingCompartment2EditPart.VISUAL_ID));
+ CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry.getType(DateRecognizerEditPart.VISUAL_ID));
result.addAll(createNavigatorItems(connectedViews, parentElement, false));
connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartment2EditPart.VISUAL_ID));
+ CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry.getType(TextEditPart.VISUAL_ID));
result.addAll(createNavigatorItems(connectedViews, parentElement, false));
connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartment2EditPart.VISUAL_ID));
+ CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry.getType(TrimWhitespaceEditPart.VISUAL_ID));
result.addAll(createNavigatorItems(connectedViews, parentElement, false));
connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartment2EditPart.VISUAL_ID));
+ CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry.getType(MappedElementEditPart.VISUAL_ID));
result.addAll(createNavigatorItems(connectedViews, parentElement, false));
connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(MetadataBlockMetadataBlockInputFieldsCompartment2EditPart.VISUAL_ID));
+ CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockInputFieldsCompartmentEditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry.getType(TextInputFieldEditPart.VISUAL_ID));
result.addAll(createNavigatorItems(connectedViews, parentElement, false));
connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartment2EditPart.VISUAL_ID));
+ CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry.getType(CurrentDateEditPart.VISUAL_ID));
result.addAll(createNavigatorItems(connectedViews, parentElement, false));
connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartment2EditPart.VISUAL_ID));
+ CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry.getType(CurrentUsernameEditPart.VISUAL_ID));
result.addAll(createNavigatorItems(connectedViews, parentElement, false));
connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry
- .getType(MetadataBlockMetadataBlockInputFieldsCompartment2EditPart.VISUAL_ID));
+ CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockInputFieldsCompartmentEditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry.getType(DateInputFieldEditPart.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;
- CrosswalkNavigatorGroup outgoinglinks = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_MappedAttribute_3009_outgoinglinks,
- "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
- Collection<View> connectedViews;
- connectedViews = getOutgoingLinksByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(InputOutputEditPart.VISUAL_ID));
- outgoinglinks.addChildren(createNavigatorItems(connectedViews, outgoinglinks, true));
- if (!outgoinglinks.isEmpty()) {
- result.add(outgoinglinks);
- }
- return result.toArray();
- }
}
return EMPTY_ARRAY;
}
View
120 crosswalk-gmf.diagram/src/crosswalk/diagram/navigator/CrosswalkNavigatorLabelProvider.java
@@ -132,71 +132,71 @@ public Image getImage(Object element) {
*/
public Image getImage(View view) {
switch (CrosswalkVisualIDRegistry.getVisualID(view)) {
- case TabbedDataFieldEditPart.VISUAL_ID:
+ case CurrentUsernameEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?TabbedDataField", CrosswalkElementTypes.TabbedDataField_3002); //$NON-NLS-1$
+ "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 DictionaryEditPart.VISUAL_ID:
return getImage(
"Navigator?TopLevelNode?http://lib.unc.edu/schemas/crosswalk?Dictionary", CrosswalkElementTypes.Dictionary_2002); //$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 DateInputFieldEditPart.VISUAL_ID:
+ return getImage(
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?DateInputField", CrosswalkElementTypes.DateInputField_3024); //$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 DateRecognizerEditPart.VISUAL_ID:
+ return getImage(
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?DateRecognizer", CrosswalkElementTypes.DateRecognizer_3004); //$NON-NLS-1$
case ParagraphEditPart.VISUAL_ID:
return getImage(
"Navigator?Node?http://lib.unc.edu/schemas/crosswalk?Paragraph", CrosswalkElementTypes.Paragraph_3020); //$NON-NLS-1$
- case DelimitedFileEditPart.VISUAL_ID:
+ case MappedAttributeEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?DelimitedFile", CrosswalkElementTypes.DelimitedFile_3001); //$NON-NLS-1$
- case MappedElement2EditPart.VISUAL_ID:
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MappedAttribute", CrosswalkElementTypes.MappedAttribute_3009); //$NON-NLS-1$
+ case TabbedDataFieldEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MappedElement", CrosswalkElementTypes.MappedElement_3008); //$NON-NLS-1$
- case FormEditPart.VISUAL_ID:
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?TabbedDataField", CrosswalkElementTypes.TabbedDataField_3002); //$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 EditingContainerEditPart.VISUAL_ID:
return getImage(
- "Navigator?TopLevelNode?http://lib.unc.edu/schemas/crosswalk?Form", CrosswalkElementTypes.Form_2003); //$NON-NLS-1$
+ "Navigator?Diagram?http://lib.unc.edu/schemas/crosswalk?EditingContainer", CrosswalkElementTypes.EditingContainer_1000); //$NON-NLS-1$
case OriginalNameRecordMatcherEditPart.VISUAL_ID:
return getImage(
"Navigator?Node?http://lib.unc.edu/schemas/crosswalk?OriginalNameRecordMatcher", CrosswalkElementTypes.OriginalNameRecordMatcher_3003); //$NON-NLS-1$
- case MetadataBlockEditPart.VISUAL_ID:
- return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MetadataBlock", CrosswalkElementTypes.MetadataBlock_3010); //$NON-NLS-1$
case TrimWhitespaceEditPart.VISUAL_ID:
return getImage(
"Navigator?Node?http://lib.unc.edu/schemas/crosswalk?TrimWhitespace", CrosswalkElementTypes.TrimWhitespace_3006); //$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 CurrentUsernameEditPart.VISUAL_ID:
+ case MetadataBlock2EditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?CurrentUsername", CrosswalkElementTypes.CurrentUsername_3022); //$NON-NLS-1$
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MetadataBlock", CrosswalkElementTypes.MetadataBlock_3018); //$NON-NLS-1$
case CurrentDateEditPart.VISUAL_ID:
return getImage(
"Navigator?Node?http://lib.unc.edu/schemas/crosswalk?CurrentDate", CrosswalkElementTypes.CurrentDate_3021); //$NON-NLS-1$
- case DateRecognizerEditPart.VISUAL_ID:
+ case FormEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?DateRecognizer", CrosswalkElementTypes.DateRecognizer_3004); //$NON-NLS-1$
+ "Navigator?TopLevelNode?http://lib.unc.edu/schemas/crosswalk?Form", CrosswalkElementTypes.Form_2003); //$NON-NLS-1$
case CrossWalkEditPart.VISUAL_ID:
return getImage(
"Navigator?TopLevelNode?http://lib.unc.edu/schemas/crosswalk?CrossWalk", CrosswalkElementTypes.CrossWalk_2001); //$NON-NLS-1$
case InputOutputEditPart.VISUAL_ID:
return getImage(
"Navigator?Link?http://lib.unc.edu/schemas/crosswalk?Input?Output", CrosswalkElementTypes.InputOutput_4001); //$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 MappedElementEditPart.VISUAL_ID:
- return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MappedElement", CrosswalkElementTypes.MappedElement_3007); //$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 DateInputFieldEditPart.VISUAL_ID:
+ case DelimitedFileEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?DateInputField", CrosswalkElementTypes.DateInputField_3024); //$NON-NLS-1$
- case MetadataBlock2EditPart.VISUAL_ID:
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?DelimitedFile", CrosswalkElementTypes.DelimitedFile_3001); //$NON-NLS-1$
+ case MappedElement2EditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MetadataBlock", CrosswalkElementTypes.MetadataBlock_3018); //$NON-NLS-1$
- case MappedAttributeEditPart.VISUAL_ID:
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MappedElement", CrosswalkElementTypes.MappedElement_3008); //$NON-NLS-1$
+ case MetadataBlockEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MappedAttribute", CrosswalkElementTypes.MappedAttribute_3009); //$NON-NLS-1$
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MetadataBlock", CrosswalkElementTypes.MetadataBlock_3010); //$NON-NLS-1$
}
return getImage("Navigator?UnknownElement", null); //$NON-NLS-1$
}
@@ -248,50 +248,50 @@ public String getText(View view) {
return getUnresolvedDomainElementProxyText(view);
}
switch (CrosswalkVisualIDRegistry.getVisualID(view)) {
- case TabbedDataFieldEditPart.VISUAL_ID:
- return getTabbedDataField_3002Text(view);
+ case CurrentUsernameEditPart.VISUAL_ID:
+ return getCurrentUsername_3022Text(view);
+ case MappedElementEditPart.VISUAL_ID:
+ return getMappedElement_3007Text(view);
case DictionaryEditPart.VISUAL_ID:
return getDictionary_2002Text(view);
- case TextEditPart.VISUAL_ID:
- return getText_3005Text(view);
+ case DateInputFieldEditPart.VISUAL_ID:
+ return getDateInputField_3024Text(view);
+ case TextInputFieldEditPart.VISUAL_ID:
+ return getTextInputField_3023Text(view);
+ case DateRecognizerEditPart.VISUAL_ID:
+ return getDateRecognizer_3004Text(view);
case ParagraphEditPart.VISUAL_ID:
return getParagraph_3020Text(view);
- case DelimitedFileEditPart.VISUAL_ID:
- return getDelimitedFile_3001Text(view);
- case MappedElement2EditPart.VISUAL_ID:
- return getMappedElement_3008Text(view);
- case FormEditPart.VISUAL_ID:
- return getForm_2003Text(view);
+ case MappedAttributeEditPart.VISUAL_ID:
+ return getMappedAttribute_3009Text(view);
+ case TabbedDataFieldEditPart.VISUAL_ID:
+ return getTabbedDataField_3002Text(view);
+ case TextEditPart.VISUAL_ID:
+ return getText_3005Text(view);
+ case EditingContainerEditPart.VISUAL_ID:
+ return getEditingContainer_1000Text(view);
case OriginalNameRecordMatcherEditPart.VISUAL_ID:
return getOriginalNameRecordMatcher_3003Text(view);
- case MetadataBlockEditPart.VISUAL_ID:
- return getMetadataBlock_3010Text(view);
case TrimWhitespaceEditPart.VISUAL_ID:
return getTrimWhitespace_3006Text(view);
case MetadataBlock3EditPart.VISUAL_ID:
return getMetadataBlock_3019Text(view);
- case CurrentUsernameEditPart.VISUAL_ID:
- return getCurrentUsername_3022Text(view);
+ case MetadataBlock2EditPart.VISUAL_ID:
+ return getMetadataBlock_3018Text(view);
case CurrentDateEditPart.VISUAL_ID:
return getCurrentDate_3021Text(view);
- case DateRecognizerEditPart.VISUAL_ID:
- return getDateRecognizer_3004Text(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 TextInputFieldEditPart.VISUAL_ID:
- return getTextInputField_3023Text(view);
- case MappedElementEditPart.VISUAL_ID:
- return getMappedElement_3007Text(view);
- case EditingContainerEditPart.VISUAL_ID:
- return getEditingContainer_1000Text(view);
- case DateInputFieldEditPart.VISUAL_ID:
- return getDateInputField_3024Text(view);
- case MetadataBlock2EditPart.VISUAL_ID:
- return getMetadataBlock_3018Text(view);
- case MappedAttributeEditPart.VISUAL_ID:
- return getMappedAttribute_3009Text(view);
+ case DelimitedFileEditPart.VISUAL_ID:
+ return getDelimitedFile_3001Text(view);
+ case MappedElement2EditPart.VISUAL_ID:
+ return getMappedElement_3008Text(view);
+ case MetadataBlockEditPart.VISUAL_ID:
+ return getMetadataBlock_3010Text(view);
}
return getUnknownElementText(view);
}
View
2 crosswalk-gmf.edit/plugin.properties
@@ -181,3 +181,5 @@ _UI_DatePrecision_day_literal = day
_UI_DatePrecision_hour_literal = hour
_UI_DatePrecision_minute_literal = minute
_UI_DatePrecision_second_literal = second
+_UI_TextInputField_validValues_feature = Valid Values
+_UI_TextInputField_rows_feature = Rows
View
48 crosswalk-gmf.edit/src/crosswalk/provider/TextInputFieldItemProvider.java
@@ -65,6 +65,8 @@ public TextInputFieldItemProvider(AdapterFactory adapterFactory) {
addMaxSizePropertyDescriptor(object);
addVocabularyURLPropertyDescriptor(object);
addAllowFreeTextPropertyDescriptor(object);
+ addValidValuesPropertyDescriptor(object);
+ addRowsPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
@@ -158,6 +160,50 @@ protected void addAllowFreeTextPropertyDescriptor(Object object) {
}
/**
+ * This adds a property descriptor for the Valid Values feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addValidValuesPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_TextInputField_validValues_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_TextInputField_validValues_feature", "_UI_TextInputField_type"),
+ CrosswalkPackage.Literals.TEXT_INPUT_FIELD__VALID_VALUES,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
+ * This adds a property descriptor for the Rows feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addRowsPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_TextInputField_rows_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_TextInputField_rows_feature", "_UI_TextInputField_type"),
+ CrosswalkPackage.Literals.TEXT_INPUT_FIELD__ROWS,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
* This returns TextInputField.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -198,6 +244,8 @@ public void notifyChanged(Notification notification) {
case CrosswalkPackage.TEXT_INPUT_FIELD__MAX_SIZE:
case CrosswalkPackage.TEXT_INPUT_FIELD__VOCABULARY_URL:
case CrosswalkPackage.TEXT_INPUT_FIELD__ALLOW_FREE_TEXT:
+ case CrosswalkPackage.TEXT_INPUT_FIELD__VALID_VALUES:
+ case CrosswalkPackage.TEXT_INPUT_FIELD__ROWS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
View
4 crosswalk-gmf/model/crosswalk.ecore
@@ -170,6 +170,10 @@
unsettable="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="allowFreeText" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="validValues" upperBound="-1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="rows" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+ defaultValueLiteral="1"/>
<eGenericSuperTypes eClassifier="#//InputField">
<eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eGenericSuperTypes>
View
2 crosswalk-gmf/model/crosswalk.genmodel
@@ -139,6 +139,8 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute crosswalk.ecore#//TextInputField/maxSize"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute crosswalk.ecore#//TextInputField/vocabularyURL"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute crosswalk.ecore#//TextInputField/allowFreeText"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute crosswalk.ecore#//TextInputField/validValues"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute crosswalk.ecore#//TextInputField/rows"/>
</genClasses>
<genClasses image="false" ecoreClass="crosswalk.ecore#//ContextProvider">
<genFeatures property="None" notify="false" createChild="false" propertySortChoices="true"
View
4 crosswalk-gmf/model/crosswalk2-2.gmfgen
@@ -1440,10 +1440,10 @@
</diagram>
<plugin
provider="UNC Chapel Hill Libraries"
- version="4.0.0.qualifier">
+ version="4.0.1.qualifier">
<requiredPlugins>org.eclipse.draw2d</requiredPlugins>
<requiredPlugins>org.eclipse.gmf.runtime.draw2d.ui</requiredPlugins>
- <requiredPlugins>org.eclipse.gmf.tooling.runtime</requiredPlugins>
+ <requiredPlugins>org.eclipse.gmf.runtime.tooling</requiredPlugins>
</plugin>
<editor/>
<navigator>
View
58 crosswalk-gmf/src/crosswalk/CrosswalkPackage.java
@@ -1324,13 +1324,31 @@
int TEXT_INPUT_FIELD__ALLOW_FREE_TEXT = INPUT_FIELD_FEATURE_COUNT + 3;
/**
+ * The feature id for the '<em><b>Valid Values</b></em>' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int TEXT_INPUT_FIELD__VALID_VALUES = INPUT_FIELD_FEATURE_COUNT + 4;
+
+ /**
+ * The feature id for the '<em><b>Rows</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int TEXT_INPUT_FIELD__ROWS = INPUT_FIELD_FEATURE_COUNT + 5;
+
+ /**
* The number of structural features of the '<em>Text Input Field</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int TEXT_INPUT_FIELD_FEATURE_COUNT = INPUT_FIELD_FEATURE_COUNT + 4;
+ int TEXT_INPUT_FIELD_FEATURE_COUNT = INPUT_FIELD_FEATURE_COUNT + 6;
/**
* The meta object id for the '{@link crosswalk.MappingContainer <em>Mapping Container</em>}' class.
@@ -2553,6 +2571,28 @@
EAttribute getTextInputField_AllowFreeText();
/**
+ * Returns the meta object for the attribute list '{@link crosswalk.TextInputField#getValidValues <em>Valid Values</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute list '<em>Valid Values</em>'.
+ * @see crosswalk.TextInputField#getValidValues()
+ * @see #getTextInputField()
+ * @generated
+ */
+ EAttribute getTextInputField_ValidValues();
+
+ /**
+ * Returns the meta object for the attribute '{@link crosswalk.TextInputField#getRows <em>Rows</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Rows</em>'.
+ * @see crosswalk.TextInputField#getRows()
+ * @see #getTextInputField()
+ * @generated
+ */
+ EAttribute getTextInputField_Rows();
+
+ /**
* Returns the meta object for class '{@link crosswalk.ContextProvider <em>Context Provider</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3525,6 +3565,22 @@
EAttribute TEXT_INPUT_FIELD__ALLOW_FREE_TEXT = eINSTANCE.getTextInputField_AllowFreeText();
/**
+ * The meta object literal for the '<em><b>Valid Values</b></em>' attribute list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute TEXT_INPUT_FIELD__VALID_VALUES = eINSTANCE.getTextInputField_ValidValues();
+
+ /**
+ * The meta object literal for the '<em><b>Rows</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute TEXT_INPUT_FIELD__ROWS = eINSTANCE.getTextInputField_Rows();
+
+ /**
* The meta object literal for the '{@link crosswalk.impl.ContextProviderImpl <em>Context Provider</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
View
47 crosswalk-gmf/src/crosswalk/TextInputField.java
@@ -6,6 +6,8 @@
*/
package crosswalk;
+import org.eclipse.emf.common.util.EList;
+
/**
* <!-- begin-user-doc -->
@@ -19,6 +21,8 @@
* <li>{@link crosswalk.TextInputField#getMaxSize <em>Max Size</em>}</li>
* <li>{@link crosswalk.TextInputField#getVocabularyURL <em>Vocabulary URL</em>}</li>
* <li>{@link crosswalk.TextInputField#isAllowFreeText <em>Allow Free Text</em>}</li>
+ * <li>{@link crosswalk.TextInputField#getValidValues <em>Valid Values</em>}</li>
+ * <li>{@link crosswalk.TextInputField#getRows <em>Rows</em>}</li>
* </ul>
* </p>
*
@@ -161,4 +165,47 @@
*/
void setAllowFreeText(boolean value);
+ /**
+ * Returns the value of the '<em><b>Valid Values</b></em>' attribute list.
+ * The list contents are of type {@link java.lang.String}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Valid Values</em>' attribute list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Valid Values</em>' attribute list.
+ * @see crosswalk.CrosswalkPackage#getTextInputField_ValidValues()
+ * @model
+ * @generated
+ */
+ EList<String> getValidValues();
+
+ /**
+ * Returns the value of the '<em><b>Rows</b></em>' attribute.
+ * The default value is <code>"1"</code>.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Rows</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Rows</em>' attribute.
+ * @see #setRows(int)
+ * @see crosswalk.CrosswalkPackage#getTextInputField_Rows()
+ * @model default="1" required="true"
+ * @generated
+ */
+ int getRows();
+
+ /**
+ * Sets the value of the '{@link crosswalk.TextInputField#getRows <em>Rows</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Rows</em>' attribute.
+ * @see #getRows()
+ * @generated
+ */
+ void setRows(int value);
+
} // TextInputField
View
22 crosswalk-gmf/src/crosswalk/impl/CrosswalkPackageImpl.java
@@ -1070,6 +1070,24 @@ public EAttribute getTextInputField_AllowFreeText() {
* <!-- end-user-doc -->
* @generated
*/
+ public EAttribute getTextInputField_ValidValues() {
+ return (EAttribute)textInputFieldEClass.getEStructuralFeatures().get(4);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getTextInputField_Rows() {
+ return (EAttribute)textInputFieldEClass.getEStructuralFeatures().get(5);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getContextProvider() {
return contextProviderEClass;
}
@@ -1474,6 +1492,8 @@ public void createPackageContents() {
createEAttribute(textInputFieldEClass, TEXT_INPUT_FIELD__MAX_SIZE);
createEAttribute(textInputFieldEClass, TEXT_INPUT_FIELD__VOCABULARY_URL);
createEAttribute(textInputFieldEClass, TEXT_INPUT_FIELD__ALLOW_FREE_TEXT);
+ createEAttribute(textInputFieldEClass, TEXT_INPUT_FIELD__VALID_VALUES);
+ createEAttribute(textInputFieldEClass, TEXT_INPUT_FIELD__ROWS);
contextProviderEClass = createEClass(CONTEXT_PROVIDER);
createEReference(contextProviderEClass, CONTEXT_PROVIDER__OUTPUT_TYPE);
@@ -1745,6 +1765,8 @@ public void initializePackageContents() {
initEAttribute(getTextInputField_MaxSize(), ecorePackage.getEInt(), "maxSize", "256", 1, 1, TextInputField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getTextInputField_VocabularyURL(), ecorePackage.getEString(), "vocabularyURL", null, 0, 1, TextInputField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getTextInputField_AllowFreeText(), ecorePackage.getEBoolean(), "allowFreeText", "true", 1, 1, TextInputField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTextInputField_ValidValues(), ecorePackage.getEString(), "validValues", null, 0, -1, TextInputField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTextInputField_Rows(), ecorePackage.getEInt(), "rows", "1", 1, 1, TextInputField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(contextProviderEClass, ContextProvider.class, "ContextProvider", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getContextProvider_OutputType(), ecorePackage.getEClass(), null, "outputType", null, 1, 1, ContextProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
View
12 crosswalk-gmf/src/crosswalk/impl/DateInputFieldImpl.java
@@ -10,11 +10,13 @@
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import crosswalk.CrosswalkPackage;
+import crosswalk.DataException;
import crosswalk.DateInputField;
import crosswalk.DatePrecision;
+import crosswalk.util.ImpreciseDate;
/**
* <!-- begin-user-doc -->
@@ -163,4 +165,12 @@ public String toString() {
return result.toString();
}
+ @Override
+ public Object getResult() throws DataException {
+ Date date = (Date)super.getResult();
+ ImpreciseDate impdate = new ImpreciseDate(date);
+ impdate.setPrecision(getDatePrecision());
+ return impdate;
+ }
+
} //DateInputFieldImpl
View
94 crosswalk-gmf/src/crosswalk/impl/TextInputFieldImpl.java
@@ -7,11 +7,14 @@
package crosswalk.impl;
import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
import crosswalk.CrosswalkPackage;
import crosswalk.TextInputField;
+import java.util.Collection;
/**
* <!-- begin-user-doc -->
@@ -24,6 +27,8 @@
* <li>{@link crosswalk.impl.TextInputFieldImpl#getMaxSize <em>Max Size</em>}</li>
* <li>{@link crosswalk.impl.TextInputFieldImpl#getVocabularyURL <em>Vocabulary URL</em>}</li>
* <li>{@link crosswalk.impl.TextInputFieldImpl#isAllowFreeText <em>Allow Free Text</em>}</li>
+ * <li>{@link crosswalk.impl.TextInputFieldImpl#getValidValues <em>Valid Values</em>}</li>
+ * <li>{@link crosswalk.impl.TextInputFieldImpl#getRows <em>Rows</em>}</li>
* </ul>
* </p>
*
@@ -120,6 +125,36 @@
protected boolean allowFreeText = ALLOW_FREE_TEXT_EDEFAULT;
/**
+ * The cached value of the '{@link #getValidValues() <em>Valid Values</em>}' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getValidValues()
+ * @generated
+ * @ordered
+ */
+ protected EList<String> validValues;
+
+ /**
+ * The default value of the '{@link #getRows() <em>Rows</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getRows()
+ * @generated
+ * @ordered
+ */
+ protected static final int ROWS_EDEFAULT = 1;
+
+ /**
+ * The cached value of the '{@link #getRows() <em>Rows</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getRows()
+ * @generated
+ * @ordered
+ */
+ protected int rows = ROWS_EDEFAULT;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -252,6 +287,39 @@ public void setAllowFreeText(boolean newAllowFreeText) {
* <!-- end-user-doc -->
* @generated
*/
+ public EList<String> getValidValues() {
+ if (validValues == null) {
+ validValues = new EDataTypeUniqueEList<String>(String.class, this, CrosswalkPackage.TEXT_INPUT_FIELD__VALID_VALUES);
+ }
+ return validValues;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public int getRows() {
+ return rows;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setRows(int newRows) {
+ int oldRows = rows;
+ rows = newRows;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, CrosswalkPackage.TEXT_INPUT_FIELD__ROWS, oldRows, rows));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
@@ -263,6 +331,10 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
return getVocabularyURL();
case CrosswalkPackage.TEXT_INPUT_FIELD__ALLOW_FREE_TEXT:
return isAllowFreeText();
+ case CrosswalkPackage.TEXT_INPUT_FIELD__VALID_VALUES:
+ return getValidValues();
+ case CrosswalkPackage.TEXT_INPUT_FIELD__ROWS:
+ return getRows();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -272,6 +344,7 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
* <!-- end-user-doc -->
* @generated
*/
+ @SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
@@ -287,6 +360,13 @@ public void eSet(int featureID, Object newValue) {
case CrosswalkPackage.TEXT_INPUT_FIELD__ALLOW_FREE_TEXT:
setAllowFreeText((Boolean)newValue);
return;
+ case CrosswalkPackage.TEXT_INPUT_FIELD__VALID_VALUES:
+ getValidValues().clear();
+ getValidValues().addAll((Collection<? extends String>)newValue);
+ return;
+ case CrosswalkPackage.TEXT_INPUT_FIELD__ROWS:
+ setRows((Integer)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -311,6 +391,12 @@ public void eUnset(int featureID) {
case CrosswalkPackage.TEXT_INPUT_FIELD__ALLOW_FREE_TEXT:
setAllowFreeText(ALLOW_FREE_TEXT_EDEFAULT);
return;
+ case CrosswalkPackage.TEXT_INPUT_FIELD__VALID_VALUES:
+ getValidValues().clear();
+ return;
+ case CrosswalkPackage.TEXT_INPUT_FIELD__ROWS:
+ setRows(ROWS_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -331,6 +417,10 @@ public boolean eIsSet(int featureID) {
return isSetVocabularyURL();
case CrosswalkPackage.TEXT_INPUT_FIELD__ALLOW_FREE_TEXT:
return allowFreeText != ALLOW_FREE_TEXT_EDEFAULT;
+ case CrosswalkPackage.TEXT_INPUT_FIELD__VALID_VALUES:
+ return validValues != null && !validValues.isEmpty();
+ case CrosswalkPackage.TEXT_INPUT_FIELD__ROWS:
+ return rows != ROWS_EDEFAULT;
}
return super.eIsSet(featureID);
}
@@ -353,6 +443,10 @@ public String toString() {
if (vocabularyURLESet) result.append(vocabularyURL); else result.append("<unset>");
result.append(", allowFreeText: ");
result.append(allowFreeText);
+ result.append(", validValues: ");
+ result.append(validValues);
+ result.append(", rows: ");
+ result.append(rows);
result.append(')');
return result.toString();
}

0 comments on commit 29851fc

Please sign in to comment.
Something went wrong with that request. Please try again.