Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

create a collapsible tool group per dictionary

support reorder of metablocks and form inputs
support drop of metablocks into forms in specific positions
try adding back compartment insets to get rid of scrollbars
  • Loading branch information...
commit ae5e849ffabda4cf608e8700996737cc2a553b37 1 parent 5beb934
@gregjan gregjan authored
Showing with 813 additions and 432 deletions.
  1. +5 −5 crosswalk-gmf.diagram/messages.properties
  2. +34 −0 crosswalk-gmf.diagram/src/crosswalk/diagram/custom/CompartmentChildCreateCommand.java
  3. +112 −0 crosswalk-gmf.diagram/src/crosswalk/diagram/custom/CompartmentChildCreationEditPolicy.java
  4. +39 −0 crosswalk-gmf.diagram/src/crosswalk/diagram/custom/CompartmentRepositionEObjectCommand.java
  5. +96 −0 crosswalk-gmf.diagram/src/crosswalk/diagram/custom/ReorderCompartmentEditPolicy.java
  6. +1 −1  crosswalk-gmf.diagram/src/crosswalk/diagram/edit/parts/FormEditPart.java
  7. +17 −4 crosswalk-gmf.diagram/src/crosswalk/diagram/edit/parts/FormModelBoxCompartmentEditPart.java
  8. +5 −2 crosswalk-gmf.diagram/src/crosswalk/diagram/edit/parts/MetadataBlock2EditPart.java
  9. +5 −2 crosswalk-gmf.diagram/src/crosswalk/diagram/edit/parts/MetadataBlock3EditPart.java
  10. +5 −2 crosswalk-gmf.diagram/src/crosswalk/diagram/edit/parts/MetadataBlockEditPart.java
  11. +3 −1 crosswalk-gmf.diagram/src/crosswalk/diagram/edit/parts/ParagraphEditPart.java
  12. +206 −206 crosswalk-gmf.diagram/src/crosswalk/diagram/navigator/CrosswalkNavigatorContentProvider.java
  13. +58 −58 crosswalk-gmf.diagram/src/crosswalk/diagram/navigator/CrosswalkNavigatorLabelProvider.java
  14. +1 −1  crosswalk-gmf.diagram/src/crosswalk/diagram/part/CrosswalkDiagramEditorUtil.java
  15. +10 −5 crosswalk-gmf.diagram/src/crosswalk/diagram/part/CrosswalkPaletteFactory.java
  16. +23 −0 crosswalk-gmf.edit/src/crosswalk/provider/FormItemProvider.java
  17. +1 −1  crosswalk-gmf/model/crosswalk.ecore
  18. +6 −3 crosswalk-gmf/model/crosswalk.gmfgraph
  19. +4 −4 crosswalk-gmf/model/crosswalk2-2.gmfgen
  20. +13 −4 crosswalk-gmf/src/crosswalk/CrosswalkPackage.java
  21. +1 −1  crosswalk-gmf/src/crosswalk/Form.java
  22. +1 −0  crosswalk-gmf/src/crosswalk/impl/CrosswalkPackageImpl.java
  23. +73 −132 crosswalk-gmf/src/crosswalk/impl/DelimitedFileImpl.java
  24. +93 −0 crosswalk-gmf/src/crosswalk/impl/FormImpl.java
  25. +1 −0  crosswalk-gmf/src/crosswalk/util/CrosswalkSwitch.java
View
10 crosswalk-gmf.diagram/messages.properties
@@ -203,8 +203,8 @@ InputField2CreationTool_title=Input Field
InputField2CreationTool_desc=Add an input field to a metadata block
CrossWalkModelBoxCompartmentEditPart_title=ModelBoxCompartment
DictionaryModelBoxCompartmentEditPart_title=ModelBoxCompartment
-MetadataBlockMetadataBlockInputFieldsCompartmentEditPart_title=input
-MetadataBlockMetadataBlockMappingCompartmentEditPart_title=map
+MetadataBlockMetadataBlockInputFieldsCompartmentEditPart_title=inputs
+MetadataBlockMetadataBlockMappingCompartmentEditPart_title=mapping
NavigatorGroupName_DateRecognizer_3019_incominglinks=incoming links
NavigatorGroupName_DateRecognizer_3019_outgoinglinks=outgoing links
NavigatorGroupName_OriginalNameRecordMatcher_3018_outgoinglinks=outgoing links
@@ -240,11 +240,11 @@ NavigatorGroupName_OriginalNameRecordMatcher_3011_outgoinglinks=outgoing links
NavigatorGroupName_TrimWhitespace_3014_incominglinks=incoming links
NavigatorGroupName_TrimWhitespace_3014_outgoinglinks=outgoing links
MetadataBlockMetadataBlockInputFieldsCompartment2EditPart_title=inputs
-MetadataBlockMetadataBlockMappingCompartment2EditPart_title=map
+MetadataBlockMetadataBlockMappingCompartment2EditPart_title=mapping
DictionaryTools2Group_title=Dictionary Tools
FormandDictionary2Group_title=Form and Dictionary
Paragraph3CreationTool_title=Paragraph
Paragraph3CreationTool_desc=A block of text with optional header used in forms.
FormModelBoxCompartmentEditPart_title=ModelBoxCompartment
-MetadataBlockMetadataBlockInputFieldsCompartment3EditPart_title=MetadataBlockInputFieldsCompartment
-MetadataBlockMetadataBlockMappingCompartment3EditPart_title=MetadataBlockMappingCompartment
+MetadataBlockMetadataBlockInputFieldsCompartment3EditPart_title=inputs
+MetadataBlockMetadataBlockMappingCompartment3EditPart_title=mapping
View
34 crosswalk-gmf.diagram/src/crosswalk/diagram/custom/CompartmentChildCreateCommand.java
@@ -0,0 +1,34 @@
+package crosswalk.diagram.custom;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.util.Assert;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
+
+public class CompartmentChildCreateCommand extends CreateCommand {
+ int index;
+
+ public CompartmentChildCreateCommand(TransactionalEditingDomain editingDomain, ViewDescriptor viewDescriptor,
+ View containerView, int index) {
+ super(editingDomain, viewDescriptor, containerView);
+ this.index = index;
+ }
+
+ @Override
+ protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+ View view = ViewService.getInstance().createView(viewDescriptor.getViewKind(),
+ viewDescriptor.getElementAdapter(), containerView, viewDescriptor.getSemanticHint(), index,
+ viewDescriptor.isPersisted(), viewDescriptor.getPreferencesHint());
+ Assert.isNotNull(view, "failed to create a view"); //$NON-NLS-1$
+ viewDescriptor.setView(view);
+
+ return CommandResult.newOKCommandResult(viewDescriptor);
+ }
+}
View
112 crosswalk-gmf.diagram/src/crosswalk/diagram/custom/CompartmentChildCreationEditPolicy.java
@@ -0,0 +1,112 @@
+package crosswalk.diagram.custom;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.draw2d.FlowLayout;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2d.geometry.Transposer;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.requests.DropRequest;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
+import org.eclipse.gmf.runtime.notation.View;
+
+public class CompartmentChildCreationEditPolicy extends CreationEditPolicy {
+ @Override
+ protected Command getCreateCommand(CreateViewRequest request) {
+ TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
+ CompositeTransactionalCommand cc = new CompositeTransactionalCommand(editingDomain,
+ DiagramUIMessages.AddCommand_Label);
+
+ Iterator descriptors = request.getViewDescriptors().iterator();
+
+ while (descriptors.hasNext()) {
+ CreateViewRequest.ViewDescriptor descriptor = (CreateViewRequest.ViewDescriptor) descriptors.next();
+
+ CreateCommand createCommand = new CompartmentChildCreateCommand(editingDomain, descriptor,
+ (View) (getHost().getModel()), getFeedbackIndexFor(request));
+
+ cc.compose(createCommand);
+ }
+ return new ICommandProxy(cc.reduce());
+ }
+
+ protected int getFeedbackIndexFor(Request request) {
+ List children = getHost().getChildren();
+ if (children.isEmpty())
+ return -1;
+
+ Transposer transposer = new Transposer();
+ transposer.setEnabled(!isHorizontal());
+
+ Point p = transposer.t(getLocationFromRequest(request));
+
+ // Current row bottom, initialize to above the top.
+ int rowBottom = Integer.MIN_VALUE;
+ int candidate = -1;
+ for (int i = 0; i < children.size(); i++) {
+ EditPart child = (EditPart) children.get(i);
+ Rectangle rect = transposer.t(getAbsoluteBounds(((GraphicalEditPart) child)));
+ if (rect.y > rowBottom) {
+ /*
+ * We are in a new row, so if we don't have a candidate but yet are within the previous row, then the
+ * current entry becomes the candidate. This is because we know we must be to the right of center of the
+ * last Figure in the previous row, so this Figure (which is at the start of a new row) is the candidate.
+ */
+ if (p.y <= rowBottom) {
+ if (candidate == -1)
+ candidate = i;
+ break;
+ } else
+ candidate = -1; // Mouse's Y is outside the row, so reset the candidate
+ }
+ rowBottom = Math.max(rowBottom, rect.bottom());
+ if (candidate == -1) {
+ /*
+ * See if we have a possible candidate. It is a candidate if the cursor is left of the center of this
+ * candidate.
+ */
+ if (p.x <= rect.x + (rect.width / 2))
+ candidate = i;
+ }
+ if (candidate != -1) {
+ // We have a candidate, see if the rowBottom has grown to include the mouse Y.
+ if (p.y <= rowBottom) {
+ /*
+ * Now we have determined that the cursor.Y is above the bottom of the current row of figures. Stop now,
+ * to prevent the next row from being searched
+ */
+ break;
+ }
+ }
+ }
+ return candidate;
+ }
+
+ protected boolean isHorizontal() {
+ IFigure figure = ((GraphicalEditPart) getHost()).getContentPane();
+ return ((FlowLayout) figure.getLayoutManager()).isHorizontal();
+ }
+
+ private Point getLocationFromRequest(Request request) {
+ return ((DropRequest) request).getLocation();
+ }
+
+ private Rectangle getAbsoluteBounds(GraphicalEditPart ep) {
+ Rectangle bounds = ep.getFigure().getBounds().getCopy();
+ ep.getFigure().translateToAbsolute(bounds);
+ return bounds;
+ }
+}
View
39 crosswalk-gmf.diagram/src/crosswalk/diagram/custom/CompartmentRepositionEObjectCommand.java
@@ -0,0 +1,39 @@
+package crosswalk.diagram.custom;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.emf.commands.core.commands.RepositionEObjectCommand;
+import org.eclipse.gmf.runtime.notation.View;
+
+public class CompartmentRepositionEObjectCommand extends RepositionEObjectCommand {
+ EditPart childToMove = null;
+ int newIndex = 0;
+
+ public CompartmentRepositionEObjectCommand(TransactionalEditingDomain editingDomain, String label, EList elements,
+ EObject element, int displacement) {
+ super(editingDomain, label, elements, element, displacement);
+ }
+
+ public CompartmentRepositionEObjectCommand(EditPart childToMove, TransactionalEditingDomain editingDomain,
+ String label, EList elements, EObject element, int displacement, int newIndex) {
+ super(editingDomain, label, elements, element, displacement);
+ this.childToMove = childToMove;
+ this.newIndex = newIndex;
+ }
+
+ public CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info)
+ throws ExecutionException {
+ CommandResult rs = super.doExecuteWithResult(progressMonitor, info);
+ EditPart compartment = childToMove.getParent();
+ ViewUtil.repositionChildAt((View) compartment.getModel(), (View) childToMove.getModel(), newIndex);
+ compartment.refresh();
+ return rs;
+ }
+}
View
96 crosswalk-gmf.diagram/src/crosswalk/diagram/custom/ReorderCompartmentEditPolicy.java
@@ -0,0 +1,96 @@
+package crosswalk.diagram.custom;
+
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.requests.CreateRequest;
+import org.eclipse.gmf.runtime.diagram.core.commands.AddCommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.FlowLayoutEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableEditPolicyEx;
+import org.eclipse.gmf.runtime.emf.commands.core.commands.RepositionEObjectCommand;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.notation.View;
+
+public class ReorderCompartmentEditPolicy extends FlowLayoutEditPolicy {
+ private EStructuralFeature feature = null;
+
+ public ReorderCompartmentEditPolicy(EStructuralFeature feature) {
+ super();
+ this.feature = feature;
+ }
+
+ @Override
+ protected Command createAddCommand(EditPart child, EditPart after) {
+ int index = getHost().getChildren().indexOf(after);
+ TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
+ AddCommand command = new AddCommand(editingDomain, new EObjectAdapter((View)getHost().getModel()),
+ new EObjectAdapter((View)child.getModel()), index);
+ return new ICommandProxy(command);
+ }
+
+ @Override
+ protected Command createMoveChildCommand(EditPart child, EditPart after) {
+
+ int newIndex;
+ int displacement;
+
+ int childIndex = getHost().getChildren().indexOf(child);
+ int afterIndex = getHost().getChildren().indexOf(after);
+
+ if(afterIndex == -1) {
+ newIndex = getHost().getChildren().size()-1;
+ displacement = newIndex - childIndex;
+ } else {
+ newIndex = afterIndex;
+ displacement = afterIndex - childIndex;
+ if (childIndex <= afterIndex) {
+ newIndex--;
+ displacement--;
+ }
+ }
+
+
+ TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
+
+ RepositionEObjectCommand command = new CompartmentRepositionEObjectCommand(child, editingDomain, "",
+ (EList)((View)child.getParent().getModel()).getElement().eGet(feature),
+ ((View)child.getModel()).getElement(),
+ displacement, newIndex);
+
+ //TODO ev. reintroduce target feedback (actual problem: line is not deleted after dropping)
+ eraseLayoutTargetFeedback(null);
+
+ return new ICommandProxy(command);
+ }
+
+ @Override
+ protected EditPolicy createChildEditPolicy(EditPart child) {
+ ResizableEditPolicyEx policy = new ResizableEditPolicyEx();
+ //policy.setResizeDirections(PositionConstants.EAST_WEST);
+ policy.setResizeDirections(0);
+ return policy;
+ }
+
+ @Override
+ protected Command getCreateCommand(CreateRequest request) {
+ return null;
+ }
+
+ @Override
+ protected Command getDeleteDependantCommand(Request request) {
+ return null;
+ }
+
+ @Override
+ protected Command getOrphanChildrenCommand(Request request) {
+ return null;
+ }
+
+}
View
2  crosswalk-gmf.diagram/src/crosswalk/diagram/edit/parts/FormEditPart.java
@@ -376,7 +376,7 @@ private void createContents() {
ToolbarLayout layoutFFigureFlowModelBox = new ToolbarLayout();
layoutFFigureFlowModelBox.setStretchMinorAxis(false);
- layoutFFigureFlowModelBox.setMinorAlignment(ToolbarLayout.ALIGN_CENTER);
+ layoutFFigureFlowModelBox.setMinorAlignment(ToolbarLayout.ALIGN_TOPLEFT);
layoutFFigureFlowModelBox.setSpacing(5);
layoutFFigureFlowModelBox.setVertical(true);
View
21 crosswalk-gmf.diagram/src/crosswalk/diagram/edit/parts/FormModelBoxCompartmentEditPart.java
@@ -1,9 +1,10 @@
package crosswalk.diagram.edit.parts;
+import org.eclipse.draw2d.FlowLayout;
import org.eclipse.draw2d.IFigure;
import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.gef.EditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
@@ -11,6 +12,9 @@
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
import org.eclipse.gmf.runtime.notation.View;
+import crosswalk.CrosswalkPackage;
+import crosswalk.diagram.custom.CompartmentChildCreationEditPolicy;
+import crosswalk.diagram.custom.ReorderCompartmentEditPolicy;
import crosswalk.diagram.edit.policies.FormModelBoxCompartmentCanonicalEditPolicy;
import crosswalk.diagram.edit.policies.FormModelBoxCompartmentItemSemanticEditPolicy;
import crosswalk.diagram.part.Messages;
@@ -47,23 +51,32 @@ public String getCompartmentName() {
}
/**
- * @generated
+ * @generated NOT
*/
public IFigure createFigure() {
ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
+ FlowLayout layout = new FlowLayout();
+ layout.setMajorSpacing(getMapMode().DPtoLP(5));
+ layout.setMinorSpacing(getMapMode().DPtoLP(5));
+ layout.setHorizontal(false);
+
+ result.getContentPane().setLayoutManager(layout);
result.setTitleVisibility(false);
return result;
}
/**
- * @generated
+ * @generated NOT
*/
protected void createDefaultEditPolicies() {
super.createDefaultEditPolicies();
installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new FormModelBoxCompartmentItemSemanticEditPolicy());
- installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy());
+ //installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy());
+ installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CompartmentChildCreationEditPolicy());
installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
installEditPolicy(EditPolicyRoles.CANONICAL_ROLE, new FormModelBoxCompartmentCanonicalEditPolicy());
+ installEditPolicy(EditPolicy.LAYOUT_ROLE, new ReorderCompartmentEditPolicy(
+ CrosswalkPackage.Literals.FORM__ELEMENTS));
}
/**
View
7 crosswalk-gmf.diagram/src/crosswalk/diagram/edit/parts/MetadataBlock2EditPart.java
@@ -353,11 +353,11 @@ private void createContents() {
GridData constraintFFigureMetadataBlockLabelFigure = new GridData();
constraintFFigureMetadataBlockLabelFigure.verticalAlignment = GridData.BEGINNING;
- constraintFFigureMetadataBlockLabelFigure.horizontalAlignment = GridData.CENTER;
+ constraintFFigureMetadataBlockLabelFigure.horizontalAlignment = GridData.BEGINNING;
constraintFFigureMetadataBlockLabelFigure.horizontalIndent = 0;
constraintFFigureMetadataBlockLabelFigure.horizontalSpan = 2;
constraintFFigureMetadataBlockLabelFigure.verticalSpan = 1;
- constraintFFigureMetadataBlockLabelFigure.grabExcessHorizontalSpace = true;
+ constraintFFigureMetadataBlockLabelFigure.grabExcessHorizontalSpace = false;
constraintFFigureMetadataBlockLabelFigure.grabExcessVerticalSpace = false;
this.add(fFigureMetadataBlockLabelFigure, constraintFFigureMetadataBlockLabelFigure);
@@ -382,6 +382,9 @@ private void createContents() {
fFigureMetadataBlockMapping = new RectangleFigure();
fFigureMetadataBlockMapping.setLineWidth(2);
fFigureMetadataBlockMapping.setBackgroundColor(ColorConstants.lightGray);
+
+ fFigureMetadataBlockMapping.setBorder(new MarginBorder(getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),
+ getMapMode().DPtoLP(5), getMapMode().DPtoLP(5)));
fFigureMetadataBlockMapping.setBorder(new LineBorder(null, getMapMode().DPtoLP(2)));
GridData constraintFFigureMetadataBlockMapping = new GridData();
View
7 crosswalk-gmf.diagram/src/crosswalk/diagram/edit/parts/MetadataBlock3EditPart.java
@@ -350,11 +350,11 @@ private void createContents() {
GridData constraintFFigureMetadataBlockLabelFigure = new GridData();
constraintFFigureMetadataBlockLabelFigure.verticalAlignment = GridData.BEGINNING;
- constraintFFigureMetadataBlockLabelFigure.horizontalAlignment = GridData.CENTER;
+ constraintFFigureMetadataBlockLabelFigure.horizontalAlignment = GridData.BEGINNING;
constraintFFigureMetadataBlockLabelFigure.horizontalIndent = 0;
constraintFFigureMetadataBlockLabelFigure.horizontalSpan = 2;
constraintFFigureMetadataBlockLabelFigure.verticalSpan = 1;
- constraintFFigureMetadataBlockLabelFigure.grabExcessHorizontalSpace = true;
+ constraintFFigureMetadataBlockLabelFigure.grabExcessHorizontalSpace = false;
constraintFFigureMetadataBlockLabelFigure.grabExcessVerticalSpace = false;
this.add(fFigureMetadataBlockLabelFigure, constraintFFigureMetadataBlockLabelFigure);
@@ -379,6 +379,9 @@ private void createContents() {
fFigureMetadataBlockMapping = new RectangleFigure();
fFigureMetadataBlockMapping.setLineWidth(2);
fFigureMetadataBlockMapping.setBackgroundColor(ColorConstants.lightGray);
+
+ fFigureMetadataBlockMapping.setBorder(new MarginBorder(getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),
+ getMapMode().DPtoLP(5), getMapMode().DPtoLP(5)));
fFigureMetadataBlockMapping.setBorder(new LineBorder(null, getMapMode().DPtoLP(2)));
GridData constraintFFigureMetadataBlockMapping = new GridData();
View
7 crosswalk-gmf.diagram/src/crosswalk/diagram/edit/parts/MetadataBlockEditPart.java
@@ -350,11 +350,11 @@ private void createContents() {
GridData constraintFFigureMetadataBlockLabelFigure = new GridData();
constraintFFigureMetadataBlockLabelFigure.verticalAlignment = GridData.BEGINNING;
- constraintFFigureMetadataBlockLabelFigure.horizontalAlignment = GridData.CENTER;
+ constraintFFigureMetadataBlockLabelFigure.horizontalAlignment = GridData.BEGINNING;
constraintFFigureMetadataBlockLabelFigure.horizontalIndent = 0;
constraintFFigureMetadataBlockLabelFigure.horizontalSpan = 2;
constraintFFigureMetadataBlockLabelFigure.verticalSpan = 1;
- constraintFFigureMetadataBlockLabelFigure.grabExcessHorizontalSpace = true;
+ constraintFFigureMetadataBlockLabelFigure.grabExcessHorizontalSpace = false;
constraintFFigureMetadataBlockLabelFigure.grabExcessVerticalSpace = false;
this.add(fFigureMetadataBlockLabelFigure, constraintFFigureMetadataBlockLabelFigure);
@@ -379,6 +379,9 @@ private void createContents() {
fFigureMetadataBlockMapping = new RectangleFigure();
fFigureMetadataBlockMapping.setLineWidth(2);
fFigureMetadataBlockMapping.setBackgroundColor(ColorConstants.lightGray);
+
+ fFigureMetadataBlockMapping.setBorder(new MarginBorder(getMapMode().DPtoLP(5), getMapMode().DPtoLP(5),
+ getMapMode().DPtoLP(5), getMapMode().DPtoLP(5)));
fFigureMetadataBlockMapping.setBorder(new LineBorder(null, getMapMode().DPtoLP(2)));
GridData constraintFFigureMetadataBlockMapping = new GridData();
View
4 crosswalk-gmf.diagram/src/crosswalk/diagram/edit/parts/ParagraphEditPart.java
@@ -279,12 +279,13 @@ public ParagraphFigure() {
}
/**
- * @generated
+ * @generated NOT
*/
private void createContents() {
fFigureParagraphHeadingLabel = new WrappingLabel();
fFigureParagraphHeadingLabel.setText("");
+ fFigureParagraphHeadingLabel.setTextWrap(true);
fFigureParagraphHeadingLabel.setFont(FFIGUREPARAGRAPHHEADINGLABEL_FONT);
@@ -292,6 +293,7 @@ private void createContents() {
fFigureParagraphTextLabel = new WrappingLabel();
fFigureParagraphTextLabel.setText("");
+ fFigureParagraphTextLabel.setTextWrap(true);
this.add(fFigureParagraphTextLabel);
View
412 crosswalk-gmf.diagram/src/crosswalk/diagram/navigator/CrosswalkNavigatorContentProvider.java
@@ -251,38 +251,172 @@ public void init(ICommonContentExtensionSite aConfig) {
private Object[] getViewChildren(View view, Object parentElement) {
switch (CrosswalkVisualIDRegistry.getVisualID(view)) {
- case MetadataBlockEditPart.VISUAL_ID: {
+ 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 MetadataBlock3EditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
Node sv = (Node) view;
Collection<View> connectedViews;
connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
+ 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(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
+ 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(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
+ 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(MetadataBlockMetadataBlockMappingCompartmentEditPart.VISUAL_ID));
+ 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(MetadataBlockMetadataBlockInputFieldsCompartmentEditPart.VISUAL_ID));
+ CrosswalkVisualIDRegistry
+ .getType(MetadataBlockMetadataBlockInputFieldsCompartment3EditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry.getType(InputFieldEditPart.VISUAL_ID));
result.addAll(createNavigatorItems(connectedViews, parentElement, false));
return result.toArray();
}
+ case InputFieldEditPart.VISUAL_ID: {
+ LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
+ Node sv = (Node) view;
+ CrosswalkNavigatorGroup incominglinks = new CrosswalkNavigatorGroup(
+ Messages.NavigatorGroupName_InputField_3017_incominglinks,
+ "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+ CrosswalkNavigatorGroup outgoinglinks = new CrosswalkNavigatorGroup(
+ Messages.NavigatorGroupName_InputField_3017_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 CrossWalkEditPart.VISUAL_ID: {
+ LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
+ Node sv = (Node) view;
+ Collection<View> connectedViews;
+ connectedViews = getChildrenByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry.getType(CrossWalkModelBoxCompartmentEditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry.getType(DelimitedFileEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement, false));
+ connectedViews = getChildrenByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry.getType(CrossWalkModelBoxCompartmentEditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry.getType(OriginalNameRecordMatcherEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement, false));
+ connectedViews = getChildrenByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry.getType(CrossWalkModelBoxCompartmentEditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry.getType(DateRecognizerEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement, false));
+ connectedViews = getChildrenByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry.getType(CrossWalkModelBoxCompartmentEditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry.getType(TextEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement, false));
+ connectedViews = getChildrenByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry.getType(CrossWalkModelBoxCompartmentEditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry.getType(TrimWhitespaceEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement, false));
+ connectedViews = getChildrenByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry.getType(CrossWalkModelBoxCompartmentEditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry.getType(MappedElementEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement, false));
+ connectedViews = getChildrenByType(Collections.singleton(sv),
+ CrosswalkVisualIDRegistry.getType(CrossWalkModelBoxCompartmentEditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry.getType(MetadataBlock2EditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement, false));
+ return result.toArray();
+ }
+
+ 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_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 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 InputOutputEditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
Edge sv = (Edge) view;
@@ -332,68 +466,51 @@ public void init(ICommonContentExtensionSite aConfig) {
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 TabbedDataFieldEditPart.VISUAL_ID: {
+ case MappedAttributeEditPart.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$
+ CrosswalkNavigatorGroup outgoinglinks = new CrosswalkNavigatorGroup(
+ Messages.NavigatorGroupName_MappedAttribute_3009_outgoinglinks,
+ "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
Collection<View> connectedViews;
- connectedViews = getIncomingLinksByType(Collections.singleton(sv),
+ connectedViews = getOutgoingLinksByType(Collections.singleton(sv),
CrosswalkVisualIDRegistry.getType(InputOutputEditPart.VISUAL_ID));
- incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true));
- if (!incominglinks.isEmpty()) {
- result.add(incominglinks);
+ outgoinglinks.addChildren(createNavigatorItems(connectedViews, outgoinglinks, true));
+ if (!outgoinglinks.isEmpty()) {
+ result.add(outgoinglinks);
}
return result.toArray();
}
- case MappedElement2EditPart.VISUAL_ID: {
+ case MetadataBlock2EditPart.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));
+ CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartment2EditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(MappedElement2EditPart.VISUAL_ID));
+ CrosswalkVisualIDRegistry.getType(DateRecognizerEditPart.VISUAL_ID));
result.addAll(createNavigatorItems(connectedViews, parentElement, false));
connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(MappedElementChildElementsCompartment2EditPart.VISUAL_ID));
+ CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartment2EditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(MappedAttributeEditPart.VISUAL_ID));
+ CrosswalkVisualIDRegistry.getType(TextEditPart.VISUAL_ID));
result.addAll(createNavigatorItems(connectedViews, parentElement, 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));
+ CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartment2EditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(MappedElement2EditPart.VISUAL_ID));
+ CrosswalkVisualIDRegistry.getType(TrimWhitespaceEditPart.VISUAL_ID));
result.addAll(createNavigatorItems(connectedViews, parentElement, false));
connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(MappedElementChildElementsCompartmentEditPart.VISUAL_ID));
+ CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockMappingCompartment2EditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(MappedAttributeEditPart.VISUAL_ID));
+ 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(InputFieldEditPart.VISUAL_ID));
result.addAll(createNavigatorItems(connectedViews, parentElement, false));
return result.toArray();
}
@@ -423,81 +540,68 @@ public void init(ICommonContentExtensionSite aConfig) {
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));
+ 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(MetadataBlockMetadataBlockMappingCompartment3EditPart.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(MetadataBlockMetadataBlockMappingCompartment3EditPart.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(MetadataBlockMetadataBlockMappingCompartment3EditPart.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(MetadataBlockMetadataBlockInputFieldsCompartment3EditPart.VISUAL_ID));
+ CrosswalkVisualIDRegistry.getType(MetadataBlockMetadataBlockInputFieldsCompartmentEditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
CrosswalkVisualIDRegistry.getType(InputFieldEditPart.VISUAL_ID));
result.addAll(createNavigatorItems(connectedViews, parentElement, false));
return result.toArray();
}
- case DelimitedFileEditPart.VISUAL_ID: {
+ case MappedElementEditPart.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));
+ CrosswalkVisualIDRegistry.getType(MappedElementChildElementsCompartmentEditPart.VISUAL_ID));
connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(TabbedDataFieldEditPart.VISUAL_ID));
+ 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 MetadataBlock2EditPart.VISUAL_ID: {
+ 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 = 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(InputFieldEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement, false));
+ 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();
}
@@ -518,111 +622,31 @@ public void init(ICommonContentExtensionSite aConfig) {
return result.toArray();
}
- case CrossWalkEditPart.VISUAL_ID: {
- LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
- Node sv = (Node) view;
- Collection<View> connectedViews;
- connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(CrossWalkModelBoxCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(DelimitedFileEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement, false));
- connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(CrossWalkModelBoxCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(OriginalNameRecordMatcherEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement, false));
- connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(CrossWalkModelBoxCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(DateRecognizerEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement, false));
- connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(CrossWalkModelBoxCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(TextEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement, false));
- connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(CrossWalkModelBoxCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(TrimWhitespaceEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement, false));
- connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(CrossWalkModelBoxCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(MappedElementEditPart.VISUAL_ID));
- result.addAll(createNavigatorItems(connectedViews, parentElement, false));
- connectedViews = getChildrenByType(Collections.singleton(sv),
- CrosswalkVisualIDRegistry.getType(CrossWalkModelBoxCompartmentEditPart.VISUAL_ID));
- connectedViews = getChildrenByType(connectedViews,
- CrosswalkVisualIDRegistry.getType(MetadataBlock2EditPart.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();
- }
-
- case TrimWhitespaceEditPart.VISUAL_ID: {
+ case TabbedDataFieldEditPart.VISUAL_ID: {
LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
Node sv = (Node) view;
CrosswalkNavigatorGroup incominglinks = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_TrimWhitespace_3006_incominglinks,
+ Messages.NavigatorGroupName_TabbedDataField_3002_incominglinks,
"icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
- CrosswalkNavigatorGroup outgoinglinks = new CrosswalkNavigatorGroup(
- 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 DateRecognizerEditPart.VISUAL_ID: {
+ case DelimitedFileEditPart.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(DelimitedFileDataFieldCompartmentEditPart.VISUAL_ID));
+ connectedViews = getChildrenByType(connectedViews,
+ CrosswalkVisualIDRegistry.getType(TabbedDataFieldEditPart.VISUAL_ID));
+ result.addAll(createNavigatorItems(connectedViews, parentElement, false));
return result.toArray();
}
@@ -638,44 +662,20 @@ public void init(ICommonContentExtensionSite aConfig) {
return result.toArray();
}
- case OriginalNameRecordMatcherEditPart.VISUAL_ID: {
+ case MappedElement2EditPart.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();
- }
-
- case InputFieldEditPart.VISUAL_ID: {
- LinkedList<CrosswalkAbstractNavigatorItem> result = new LinkedList<CrosswalkAbstractNavigatorItem>();
- Node sv = (Node) view;
- CrosswalkNavigatorGroup incominglinks = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_InputField_3017_incominglinks,
- "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
- CrosswalkNavigatorGroup outgoinglinks = new CrosswalkNavigatorGroup(
- Messages.NavigatorGroupName_InputField_3017_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(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();
}
}
View
116 crosswalk-gmf.diagram/src/crosswalk/diagram/navigator/CrosswalkNavigatorLabelProvider.java
@@ -125,62 +125,62 @@ public Image getImage(Object element) {
*/
public Image getImage(View view) {
switch (CrosswalkVisualIDRegistry.getVisualID(view)) {
- case MetadataBlockEditPart.VISUAL_ID:
+ case TextEditPart.VISUAL_ID:
+ return getImage("Navigator?Node?http://lib.unc.edu/schemas/crosswalk?Text", CrosswalkElementTypes.Text_3005); //$NON-NLS-1$
+ case MetadataBlock3EditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MetadataBlock", CrosswalkElementTypes.MetadataBlock_3010); //$NON-NLS-1$
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MetadataBlock", CrosswalkElementTypes.MetadataBlock_3019); //$NON-NLS-1$
+ case InputFieldEditPart.VISUAL_ID:
+ return getImage(
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?InputField", CrosswalkElementTypes.InputField_3017); //$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 ParagraphEditPart.VISUAL_ID:
return getImage(
"Navigator?Node?http://lib.unc.edu/schemas/crosswalk?Paragraph", CrosswalkElementTypes.Paragraph_3020); //$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 DateRecognizerEditPart.VISUAL_ID:
+ return getImage(
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?DateRecognizer", CrosswalkElementTypes.DateRecognizer_3004); //$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 TextEditPart.VISUAL_ID:
- return getImage("Navigator?Node?http://lib.unc.edu/schemas/crosswalk?Text", CrosswalkElementTypes.Text_3005); //$NON-NLS-1$
- case TabbedDataFieldEditPart.VISUAL_ID:
- return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?TabbedDataField", CrosswalkElementTypes.TabbedDataField_3002); //$NON-NLS-1$
- case MappedElement2EditPart.VISUAL_ID:
+ case MappedAttributeEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MappedElement", CrosswalkElementTypes.MappedElement_3008); //$NON-NLS-1$
- case MappedElementEditPart.VISUAL_ID:
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MappedAttribute", CrosswalkElementTypes.MappedAttribute_3009); //$NON-NLS-1$
+ case MetadataBlock2EditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MappedElement", CrosswalkElementTypes.MappedElement_3007); //$NON-NLS-1$
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MetadataBlock", CrosswalkElementTypes.MetadataBlock_3018); //$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 MetadataBlock3EditPart.VISUAL_ID:
+ case MetadataBlockEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MetadataBlock", CrosswalkElementTypes.MetadataBlock_3019); //$NON-NLS-1$
- case DelimitedFileEditPart.VISUAL_ID:
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MetadataBlock", CrosswalkElementTypes.MetadataBlock_3010); //$NON-NLS-1$
+ case MappedElementEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?DelimitedFile", CrosswalkElementTypes.DelimitedFile_3001); //$NON-NLS-1$
- case MetadataBlock2EditPart.VISUAL_ID:
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MappedElement", CrosswalkElementTypes.MappedElement_3007); //$NON-NLS-1$
+ case OriginalNameRecordMatcherEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MetadataBlock", CrosswalkElementTypes.MetadataBlock_3018); //$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:
- return getImage(
- "Navigator?TopLevelNode?http://lib.unc.edu/schemas/crosswalk?CrossWalk", CrosswalkElementTypes.CrossWalk_2001); //$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 TrimWhitespaceEditPart.VISUAL_ID:
+ case TabbedDataFieldEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?TrimWhitespace", CrosswalkElementTypes.TrimWhitespace_3006); //$NON-NLS-1$
- case DateRecognizerEditPart.VISUAL_ID:
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?TabbedDataField", CrosswalkElementTypes.TabbedDataField_3002); //$NON-NLS-1$
+ case DelimitedFileEditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?DateRecognizer", CrosswalkElementTypes.DateRecognizer_3004); //$NON-NLS-1$
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?DelimitedFile", CrosswalkElementTypes.DelimitedFile_3001); //$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 OriginalNameRecordMatcherEditPart.VISUAL_ID:
- return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?OriginalNameRecordMatcher", CrosswalkElementTypes.OriginalNameRecordMatcher_3003); //$NON-NLS-1$
- case InputFieldEditPart.VISUAL_ID:
+ case MappedElement2EditPart.VISUAL_ID:
return getImage(
- "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?InputField", CrosswalkElementTypes.InputField_3017); //$NON-NLS-1$
+ "Navigator?Node?http://lib.unc.edu/schemas/crosswalk?MappedElement", CrosswalkElementTypes.MappedElement_3008); //$NON-NLS-1$
}
return getImage("Navigator?UnknownElement", null); //$NON-NLS-1$
}
@@ -232,44 +232,44 @@ public String getText(View view) {
return getUnresolvedDomainElementProxyText(view);
}
switch (CrosswalkVisualIDRegistry.getVisualID(view)) {
- case MetadataBlockEditPart.VISUAL_ID:
- return getMetadataBlock_3010Text(view);
- case ParagraphEditPart.VISUAL_ID:
- return getParagraph_3020Text(view);
- case InputOutputEditPart.VISUAL_ID:
- return getInputOutput_4001Text(view);
case TextEditPart.VISUAL_ID:
return getText_3005Text(view);
- case TabbedDataFieldEditPart.VISUAL_ID:
- return getTabbedDataField_3002Text(view);
- case MappedElement2EditPart.VISUAL_ID:
- return getMappedElement_3008Text(view);
- case MappedElementEditPart.VISUAL_ID:
- return getMappedElement_3007Text(view);
- case EditingContainerEditPart.VISUAL_ID:
- return getEditingContainer_1000Text(view);
case MetadataBlock3EditPart.VISUAL_ID:
return getMetadataBlock_3019Text(view);
- case DelimitedFileEditPart.VISUAL_ID:
- return getDelimitedFile_3001Text(view);
- case MetadataBlock2EditPart.VISUAL_ID:
- return getMetadataBlock_3018Text(view);
- case FormEditPart.VISUAL_ID:
- return getForm_2003Text(view);
+ case InputFieldEditPart.VISUAL_ID:
+ return getInputField_3017Text(view);
case CrossWalkEditPart.VISUAL_ID:
return getCrossWalk_2001Text(view);
- case MappedAttributeEditPart.VISUAL_ID:
- return getMappedAttribute_3009Text(view);
+ case ParagraphEditPart.VISUAL_ID:
+ return getParagraph_3020Text(view);
case TrimWhitespaceEditPart.VISUAL_ID:
return getTrimWhitespace_3006Text(view);
case DateRecognizerEditPart.VISUAL_ID:
return getDateRecognizer_3004Text(view);
- case DictionaryEditPart.VISUAL_ID:
- return getDictionary_2002Text(view);
+ case InputOutputEditPart.VISUAL_ID:
+ return getInputOutput_4001Text(view);
+ case MappedAttributeEditPart.VISUAL_ID:
+ return getMappedAttribute_3009Text(view);
+ case MetadataBlock2EditPart.VISUAL_ID:
+ return getMetadataBlock_3018Text(view);
+ case EditingContainerEditPart.VISUAL_ID:
+ return getEditingContainer_1000Text(view);
+ case MetadataBlockEditPart.VISUAL_ID:
+ return getMetadataBlock_3010Text(view);
+ case MappedElementEditPart.VISUAL_ID:
+ return getMappedElement_3007Text(view);
case OriginalNameRecordMatcherEditPart.VISUAL_ID:
return getOriginalNameRecordMatcher_3003Text(view);
- case InputFieldEditPart.VISUAL_ID:
- return getInputField_3017Text(view);
+ case FormEditPart.VISUAL_ID:
+ return getForm_2003Text(view);
+ case TabbedDataFieldEditPart.VISUAL_ID:
+ return getTabbedDataField_3002Text(view);
+ case DelimitedFileEditPart.VISUAL_ID:
+ return getDelimitedFile_3001Text(view);
+ case DictionaryEditPart.VISUAL_ID:
+ return getDictionary_2002Text(view);
+ case MappedElement2EditPart.VISUAL_ID:
+ return getMappedElement_3008Text(view);
}
return getUnknownElementText(view);
}
View
2  crosswalk-gmf.diagram/src/crosswalk/diagram/part/CrosswalkDiagramEditorUtil.java
@@ -519,7 +519,7 @@ protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable
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.");
- // TODO form.setOutputType(MODSPackage.eINSTANCE.getModsDefinition());
+ form.setOutputType(MODSPackage.eINSTANCE.getModsDefinition());
model.setModel(form);
attachModelToResource(model, diagramResource);
View
15 crosswalk-gmf.diagram/src/crosswalk/diagram/part/CrosswalkPaletteFactory.java
@@ -45,8 +45,10 @@
* @generated NOT
*/
public void fillPalette(PaletteRoot paletteRoot) {
+ for(PaletteContainer p : createDictionaryContentsGroups()) {
+ paletteRoot.add(p);
+ }
paletteRoot.add(createMetadataMapping1Group());
- paletteRoot.add(createDictionaryContentsGroup());
paletteRoot.add(createFormandDictionary2Group());
}
@@ -84,15 +86,18 @@ private PaletteContainer createFormandDictionary2Group() {
/**
* Creates custom "Dictionary" entry palette tool group
*/
- private PaletteContainer createDictionaryContentsGroup() {
- PaletteDrawer paletteContainer = new PaletteDrawer("My Dictionaries");
- paletteContainer.setId("createCustomDictionary2Group"); //$NON-NLS-1$
+ private List<PaletteContainer> createDictionaryContentsGroups() {
+ List<PaletteContainer> result = new ArrayList<PaletteContainer>();
for (Dictionary dict : CrosswalkDiagramEditorPlugin.getInstance().getDictionaries()) {
+ PaletteDrawer paletteContainer = new PaletteDrawer(dict.getName());
+ paletteContainer.setDescription(dict.getDescription());
+ paletteContainer.setId("createCustomDictionary2Group"); //$NON-NLS-1$
for (MetadataBlock mb : dict.getBlocks()) {
paletteContainer.add(createMetadataBlockCopyTool(mb));
}
+ result.add(paletteContainer);
}
- return paletteContainer;
+ return result;
}
/**
View
23 crosswalk-gmf.edit/src/crosswalk/provider/FormItemProvider.java
@@ -67,6 +67,7 @@ public FormItemProvider(AdapterFactory adapterFactory) {
if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
+ addOutputTypePropertyDescriptor(object);
addTitlePropertyDescriptor(object);
addDescriptionPropertyDescriptor(object);
}
@@ -74,6 +75,28 @@ public FormItemProvider(AdapterFactory adapterFactory) {
}
/**
+ * This adds a property descriptor for the Output Type feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addOutputTypePropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_SchemaProvider_outputType_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_SchemaProvider_outputType_feature", "_UI_SchemaProvider_type"),
+ CrosswalkPackage.Literals.SCHEMA_PROVIDER__OUTPUT_TYPE,
+ true,
+ false,
+ true,
+ null,
+ null,
+ null));
+ }
+
+ /**
* This adds a property descriptor for the Title feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
View
2  crosswalk-gmf/model/crosswalk.ecore
@@ -178,7 +178,7 @@
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Editable" abstract="true" interface="true"/>
- <eClassifiers xsi:type="ecore:EClass" name="Form" eSuperTypes="#//Editable">
+ <eClassifiers xsi:type="ecore:EClass" name="Form" eSuperTypes="#//Editable #//SchemaProvider">
<eStructuralFeatures xsi:type="ecore:EReference" name="elements" upperBound="-1"
eType="#//FormElement" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="title" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
View
9 crosswalk-gmf/model/crosswalk.gmfgraph
@@ -255,6 +255,11 @@
<backgroundColor
xsi:type="gmfgraph:ConstantColor"
value="lightGray"/>
+ <insets
+ top="5"
+ left="5"
+ bottom="5"
+ right="5"/>
<border
xsi:type="gmfgraph:LineBorder"
width="2"/>
@@ -434,9 +439,7 @@
<layout
xsi:type="gmfgraph:FlowLayout"
vertical="true"
- forceSingleLine="true"
- majorAlignment="FILL"
- minorAlignment="FILL"/>
+ forceSingleLine="true"/>
</children>
</actualFigure>
<accessors
View
8 crosswalk-gmf/model/crosswalk2-2.gmfgen
@@ -475,7 +475,7 @@
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
className="MetadataBlockFigure"
- classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class MetadataBlockFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fFigureMetadataBlockLabelFigure; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fFigureMetadataBlockInputFieldsPane; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fFigureMetadataBlockMapping; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public MetadataBlockFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.draw2d.GridLayout layoutThis = new org.eclipse.draw2d.GridLayout();&#xA;&#x9;layoutThis.numColumns = 2;&#xA;&#x9;layoutThis.makeColumnsEqualWidth = false;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setLineWidth(3);&#xA;&#xA;this.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(0)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;));&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fFigureMetadataBlockLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fFigureMetadataBlockLabelFigure.setText(&quot;Unknown Widget&quot;);&#xA;&#x9;fFigureMetadataBlockLabelFigure.setForegroundColor(org.eclipse.draw2d.ColorConstants.darkGray);&#xA;&#xA;fFigureMetadataBlockLabelFigure.setFont(FFIGUREMETADATABLOCKLABELFIGURE_FONT);&#xA;&#xA;&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureMetadataBlockLabelFigure = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureMetadataBlockLabelFigure.verticalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureMetadataBlockLabelFigure.horizontalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureMetadataBlockLabelFigure.horizontalIndent = 0;&#xA;constraintFFigureMetadataBlockLabelFigure.horizontalSpan = 2;&#xA;constraintFFigureMetadataBlockLabelFigure.verticalSpan = 1;&#xA;constraintFFigureMetadataBlockLabelFigure.grabExcessHorizontalSpace = false;&#xA;constraintFFigureMetadataBlockLabelFigure.grabExcessVerticalSpace = false;&#xA;this.add(fFigureMetadataBlockLabelFigure, constraintFFigureMetadataBlockLabelFigure);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureMetadataBlockInputFieldsPane = new org.eclipse.draw2d.RectangleFigure();&#xA;fFigureMetadataBlockInputFieldsPane.setOutline(false);&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureMetadataBlockInputFieldsPane = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureMetadataBlockInputFieldsPane.verticalAlignment = org.eclipse.draw2d.GridData.CENTER;&#xA;constraintFFigureMetadataBlockInputFieldsPane.horizontalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureMetadataBlockInputFieldsPane.horizontalIndent = 0;&#xA;constraintFFigureMetadataBlockInputFieldsPane.horizontalSpan = 1;&#xA;constraintFFigureMetadataBlockInputFieldsPane.verticalSpan = 1;&#xA;constraintFFigureMetadataBlockInputFieldsPane.grabExcessHorizontalSpace = false;&#xA;constraintFFigureMetadataBlockInputFieldsPane.grabExcessVerticalSpace = false;&#xA;this.add(fFigureMetadataBlockInputFieldsPane, constraintFFigureMetadataBlockInputFieldsPane);&#xA;&#xA;&#xA;&#x9;org.eclipse.draw2d.GridLayout layoutFFigureMetadataBlockInputFieldsPane = new org.eclipse.draw2d.GridLayout();&#xA;&#x9;layoutFFigureMetadataBlockInputFieldsPane.numColumns = 1;&#xA;&#x9;layoutFFigureMetadataBlockInputFieldsPane.makeColumnsEqualWidth = false;&#xA;&#x9;fFigureMetadataBlockInputFieldsPane.setLayoutManager(layoutFFigureMetadataBlockInputFieldsPane);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureMetadataBlockMapping = new org.eclipse.draw2d.RectangleFigure();&#xA;fFigureMetadataBlockMapping.setLineWidth(2);&#xA;&#x9;fFigureMetadataBlockMapping.setBackgroundColor(org.eclipse.draw2d.ColorConstants.lightGray);&#xA;fFigureMetadataBlockMapping.setBorder(new org.eclipse.draw2d.LineBorder(null, getMapMode().DPtoLP(2)&#xA;));&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureMetadataBlockMapping = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureMetadataBlockMapping.verticalAlignment = org.eclipse.draw2d.GridData.CENTER;&#xA;constraintFFigureMetadataBlockMapping.horizontalAlignment = org.eclipse.draw2d.GridData.END;&#xA;constraintFFigureMetadataBlockMapping.horizontalIndent = 0;&#xA;constraintFFigureMetadataBlockMapping.horizontalSpan = 1;&#xA;constraintFFigureMetadataBlockMapping.verticalSpan = 1;&#xA;constraintFFigureMetadataBlockMapping.grabExcessHorizontalSpace = false;&#xA;constraintFFigureMetadataBlockMapping.grabExcessVerticalSpace = false;&#xA;this.add(fFigureMetadataBlockMapping, constraintFFigureMetadataBlockMapping);&#xA;&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureMetadataBlockLabelFigure() {&#xA;&#x9;&#x9;return fFigureMetadataBlockLabelFigure;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getFigureMetadataBlockInputFieldsPane() {&#xA;&#x9;&#x9;return fFigureMetadataBlockInputFieldsPane;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getFigureMetadataBlockMapping() {&#xA;&#x9;&#x9;return fFigureMetadataBlockMapping;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FFIGUREMETADATABLOCKLABELFIGURE_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 12, org.eclipse.swt.SWT.BOLD);&#xA;&#xA;"/>
+ classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class MetadataBlockFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fFigureMetadataBlockLabelFigure; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fFigureMetadataBlockInputFieldsPane; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fFigureMetadataBlockMapping; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public MetadataBlockFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.draw2d.GridLayout layoutThis = new org.eclipse.draw2d.GridLayout();&#xA;&#x9;layoutThis.numColumns = 2;&#xA;&#x9;layoutThis.makeColumnsEqualWidth = false;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setLineWidth(3);&#xA;&#xA;this.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(0)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;));&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fFigureMetadataBlockLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fFigureMetadataBlockLabelFigure.setText(&quot;Unknown Widget&quot;);&#xA;&#x9;fFigureMetadataBlockLabelFigure.setForegroundColor(org.eclipse.draw2d.ColorConstants.darkGray);&#xA;&#xA;fFigureMetadataBlockLabelFigure.setFont(FFIGUREMETADATABLOCKLABELFIGURE_FONT);&#xA;&#xA;&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureMetadataBlockLabelFigure = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureMetadataBlockLabelFigure.verticalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureMetadataBlockLabelFigure.horizontalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureMetadataBlockLabelFigure.horizontalIndent = 0;&#xA;constraintFFigureMetadataBlockLabelFigure.horizontalSpan = 2;&#xA;constraintFFigureMetadataBlockLabelFigure.verticalSpan = 1;&#xA;constraintFFigureMetadataBlockLabelFigure.grabExcessHorizontalSpace = false;&#xA;constraintFFigureMetadataBlockLabelFigure.grabExcessVerticalSpace = false;&#xA;this.add(fFigureMetadataBlockLabelFigure, constraintFFigureMetadataBlockLabelFigure);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureMetadataBlockInputFieldsPane = new org.eclipse.draw2d.RectangleFigure();&#xA;fFigureMetadataBlockInputFieldsPane.setOutline(false);&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureMetadataBlockInputFieldsPane = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureMetadataBlockInputFieldsPane.verticalAlignment = org.eclipse.draw2d.GridData.CENTER;&#xA;constraintFFigureMetadataBlockInputFieldsPane.horizontalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureMetadataBlockInputFieldsPane.horizontalIndent = 0;&#xA;constraintFFigureMetadataBlockInputFieldsPane.horizontalSpan = 1;&#xA;constraintFFigureMetadataBlockInputFieldsPane.verticalSpan = 1;&#xA;constraintFFigureMetadataBlockInputFieldsPane.grabExcessHorizontalSpace = false;&#xA;constraintFFigureMetadataBlockInputFieldsPane.grabExcessVerticalSpace = false;&#xA;this.add(fFigureMetadataBlockInputFieldsPane, constraintFFigureMetadataBlockInputFieldsPane);&#xA;&#xA;&#xA;&#x9;org.eclipse.draw2d.GridLayout layoutFFigureMetadataBlockInputFieldsPane = new org.eclipse.draw2d.GridLayout();&#xA;&#x9;layoutFFigureMetadataBlockInputFieldsPane.numColumns = 1;&#xA;&#x9;layoutFFigureMetadataBlockInputFieldsPane.makeColumnsEqualWidth = false;&#xA;&#x9;fFigureMetadataBlockInputFieldsPane.setLayoutManager(layoutFFigureMetadataBlockInputFieldsPane);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureMetadataBlockMapping = new org.eclipse.draw2d.RectangleFigure();&#xA;fFigureMetadataBlockMapping.setLineWidth(2);&#xA;&#x9;fFigureMetadataBlockMapping.setBackgroundColor(org.eclipse.draw2d.ColorConstants.lightGray);&#xA;&#xA;fFigureMetadataBlockMapping.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;));&#xA;fFigureMetadataBlockMapping.setBorder(new org.eclipse.draw2d.LineBorder(null, getMapMode().DPtoLP(2)&#xA;));&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureMetadataBlockMapping = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureMetadataBlockMapping.verticalAlignment = org.eclipse.draw2d.GridData.CENTER;&#xA;constraintFFigureMetadataBlockMapping.horizontalAlignment = org.eclipse.draw2d.GridData.END;&#xA;constraintFFigureMetadataBlockMapping.horizontalIndent = 0;&#xA;constraintFFigureMetadataBlockMapping.horizontalSpan = 1;&#xA;constraintFFigureMetadataBlockMapping.verticalSpan = 1;&#xA;constraintFFigureMetadataBlockMapping.grabExcessHorizontalSpace = false;&#xA;constraintFFigureMetadataBlockMapping.grabExcessVerticalSpace = false;&#xA;this.add(fFigureMetadataBlockMapping, constraintFFigureMetadataBlockMapping);&#xA;&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureMetadataBlockLabelFigure() {&#xA;&#x9;&#x9;return fFigureMetadataBlockLabelFigure;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getFigureMetadataBlockInputFieldsPane() {&#xA;&#x9;&#x9;return fFigureMetadataBlockInputFieldsPane;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getFigureMetadataBlockMapping() {&#xA;&#x9;&#x9;return fFigureMetadataBlockMapping;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FFIGUREMETADATABLOCKLABELFIGURE_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 12, org.eclipse.swt.SWT.BOLD);&#xA;&#xA;"/>
<modelFacet>
<metaClass
href="crosswalk.genmodel#//crosswalk/MetadataBlock"/>
@@ -584,7 +584,7 @@
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
className="MetadataBlockFigure"
- classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class MetadataBlockFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fFigureMetadataBlockLabelFigure; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fFigureMetadataBlockInputFieldsPane; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fFigureMetadataBlockMapping; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public MetadataBlockFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.draw2d.GridLayout layoutThis = new org.eclipse.draw2d.GridLayout();&#xA;&#x9;layoutThis.numColumns = 2;&#xA;&#x9;layoutThis.makeColumnsEqualWidth = false;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setLineWidth(3);&#xA;&#xA;this.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(0)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;));&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fFigureMetadataBlockLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fFigureMetadataBlockLabelFigure.setText(&quot;Unknown Widget&quot;);&#xA;&#x9;fFigureMetadataBlockLabelFigure.setForegroundColor(org.eclipse.draw2d.ColorConstants.darkGray);&#xA;&#xA;fFigureMetadataBlockLabelFigure.setFont(FFIGUREMETADATABLOCKLABELFIGURE_FONT);&#xA;&#xA;&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureMetadataBlockLabelFigure = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureMetadataBlockLabelFigure.verticalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureMetadataBlockLabelFigure.horizontalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureMetadataBlockLabelFigure.horizontalIndent = 0;&#xA;constraintFFigureMetadataBlockLabelFigure.horizontalSpan = 2;&#xA;constraintFFigureMetadataBlockLabelFigure.verticalSpan = 1;&#xA;constraintFFigureMetadataBlockLabelFigure.grabExcessHorizontalSpace = false;&#xA;constraintFFigureMetadataBlockLabelFigure.grabExcessVerticalSpace = false;&#xA;this.add(fFigureMetadataBlockLabelFigure, constraintFFigureMetadataBlockLabelFigure);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureMetadataBlockInputFieldsPane = new org.eclipse.draw2d.RectangleFigure();&#xA;fFigureMetadataBlockInputFieldsPane.setOutline(false);&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureMetadataBlockInputFieldsPane = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureMetadataBlockInputFieldsPane.verticalAlignment = org.eclipse.draw2d.GridData.CENTER;&#xA;constraintFFigureMetadataBlockInputFieldsPane.horizontalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureMetadataBlockInputFieldsPane.horizontalIndent = 0;&#xA;constraintFFigureMetadataBlockInputFieldsPane.horizontalSpan = 1;&#xA;constraintFFigureMetadataBlockInputFieldsPane.verticalSpan = 1;&#xA;constraintFFigureMetadataBlockInputFieldsPane.grabExcessHorizontalSpace = false;&#xA;constraintFFigureMetadataBlockInputFieldsPane.grabExcessVerticalSpace = false;&#xA;this.add(fFigureMetadataBlockInputFieldsPane, constraintFFigureMetadataBlockInputFieldsPane);&#xA;&#xA;&#xA;&#x9;org.eclipse.draw2d.GridLayout layoutFFigureMetadataBlockInputFieldsPane = new org.eclipse.draw2d.GridLayout();&#xA;&#x9;layoutFFigureMetadataBlockInputFieldsPane.numColumns = 1;&#xA;&#x9;layoutFFigureMetadataBlockInputFieldsPane.makeColumnsEqualWidth = false;&#xA;&#x9;fFigureMetadataBlockInputFieldsPane.setLayoutManager(layoutFFigureMetadataBlockInputFieldsPane);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureMetadataBlockMapping = new org.eclipse.draw2d.RectangleFigure();&#xA;fFigureMetadataBlockMapping.setLineWidth(2);&#xA;&#x9;fFigureMetadataBlockMapping.setBackgroundColor(org.eclipse.draw2d.ColorConstants.lightGray);&#xA;fFigureMetadataBlockMapping.setBorder(new org.eclipse.draw2d.LineBorder(null, getMapMode().DPtoLP(2)&#xA;));&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureMetadataBlockMapping = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureMetadataBlockMapping.verticalAlignment = org.eclipse.draw2d.GridData.CENTER;&#xA;constraintFFigureMetadataBlockMapping.horizontalAlignment = org.eclipse.draw2d.GridData.END;&#xA;constraintFFigureMetadataBlockMapping.horizontalIndent = 0;&#xA;constraintFFigureMetadataBlockMapping.horizontalSpan = 1;&#xA;constraintFFigureMetadataBlockMapping.verticalSpan = 1;&#xA;constraintFFigureMetadataBlockMapping.grabExcessHorizontalSpace = false;&#xA;constraintFFigureMetadataBlockMapping.grabExcessVerticalSpace = false;&#xA;this.add(fFigureMetadataBlockMapping, constraintFFigureMetadataBlockMapping);&#xA;&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureMetadataBlockLabelFigure() {&#xA;&#x9;&#x9;return fFigureMetadataBlockLabelFigure;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getFigureMetadataBlockInputFieldsPane() {&#xA;&#x9;&#x9;return fFigureMetadataBlockInputFieldsPane;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getFigureMetadataBlockMapping() {&#xA;&#x9;&#x9;return fFigureMetadataBlockMapping;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FFIGUREMETADATABLOCKLABELFIGURE_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 12, org.eclipse.swt.SWT.BOLD);&#xA;&#xA;"/>
+ classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class MetadataBlockFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fFigureMetadataBlockLabelFigure; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fFigureMetadataBlockInputFieldsPane; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fFigureMetadataBlockMapping; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public MetadataBlockFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.draw2d.GridLayout layoutThis = new org.eclipse.draw2d.GridLayout();&#xA;&#x9;layoutThis.numColumns = 2;&#xA;&#x9;layoutThis.makeColumnsEqualWidth = false;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setLineWidth(3);&#xA;&#xA;this.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(0)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;));&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fFigureMetadataBlockLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fFigureMetadataBlockLabelFigure.setText(&quot;Unknown Widget&quot;);&#xA;&#x9;fFigureMetadataBlockLabelFigure.setForegroundColor(org.eclipse.draw2d.ColorConstants.darkGray);&#xA;&#xA;fFigureMetadataBlockLabelFigure.setFont(FFIGUREMETADATABLOCKLABELFIGURE_FONT);&#xA;&#xA;&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureMetadataBlockLabelFigure = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureMetadataBlockLabelFigure.verticalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureMetadataBlockLabelFigure.horizontalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureMetadataBlockLabelFigure.horizontalIndent = 0;&#xA;constraintFFigureMetadataBlockLabelFigure.horizontalSpan = 2;&#xA;constraintFFigureMetadataBlockLabelFigure.verticalSpan = 1;&#xA;constraintFFigureMetadataBlockLabelFigure.grabExcessHorizontalSpace = false;&#xA;constraintFFigureMetadataBlockLabelFigure.grabExcessVerticalSpace = false;&#xA;this.add(fFigureMetadataBlockLabelFigure, constraintFFigureMetadataBlockLabelFigure);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureMetadataBlockInputFieldsPane = new org.eclipse.draw2d.RectangleFigure();&#xA;fFigureMetadataBlockInputFieldsPane.setOutline(false);&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureMetadataBlockInputFieldsPane = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureMetadataBlockInputFieldsPane.verticalAlignment = org.eclipse.draw2d.GridData.CENTER;&#xA;constraintFFigureMetadataBlockInputFieldsPane.horizontalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureMetadataBlockInputFieldsPane.horizontalIndent = 0;&#xA;constraintFFigureMetadataBlockInputFieldsPane.horizontalSpan = 1;&#xA;constraintFFigureMetadataBlockInputFieldsPane.verticalSpan = 1;&#xA;constraintFFigureMetadataBlockInputFieldsPane.grabExcessHorizontalSpace = false;&#xA;constraintFFigureMetadataBlockInputFieldsPane.grabExcessVerticalSpace = false;&#xA;this.add(fFigureMetadataBlockInputFieldsPane, constraintFFigureMetadataBlockInputFieldsPane);&#xA;&#xA;&#xA;&#x9;org.eclipse.draw2d.GridLayout layoutFFigureMetadataBlockInputFieldsPane = new org.eclipse.draw2d.GridLayout();&#xA;&#x9;layoutFFigureMetadataBlockInputFieldsPane.numColumns = 1;&#xA;&#x9;layoutFFigureMetadataBlockInputFieldsPane.makeColumnsEqualWidth = false;&#xA;&#x9;fFigureMetadataBlockInputFieldsPane.setLayoutManager(layoutFFigureMetadataBlockInputFieldsPane);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureMetadataBlockMapping = new org.eclipse.draw2d.RectangleFigure();&#xA;fFigureMetadataBlockMapping.setLineWidth(2);&#xA;&#x9;fFigureMetadataBlockMapping.setBackgroundColor(org.eclipse.draw2d.ColorConstants.lightGray);&#xA;&#xA;fFigureMetadataBlockMapping.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;));&#xA;fFigureMetadataBlockMapping.setBorder(new org.eclipse.draw2d.LineBorder(null, getMapMode().DPtoLP(2)&#xA;));&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureMetadataBlockMapping = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureMetadataBlockMapping.verticalAlignment = org.eclipse.draw2d.GridData.CENTER;&#xA;constraintFFigureMetadataBlockMapping.horizontalAlignment = org.eclipse.draw2d.GridData.END;&#xA;constraintFFigureMetadataBlockMapping.horizontalIndent = 0;&#xA;constraintFFigureMetadataBlockMapping.horizontalSpan = 1;&#xA;constraintFFigureMetadataBlockMapping.verticalSpan = 1;&#xA;constraintFFigureMetadataBlockMapping.grabExcessHorizontalSpace = false;&#xA;constraintFFigureMetadataBlockMapping.grabExcessVerticalSpace = false;&#xA;this.add(fFigureMetadataBlockMapping, constraintFFigureMetadataBlockMapping);&#xA;&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureMetadataBlockLabelFigure() {&#xA;&#x9;&#x9;return fFigureMetadataBlockLabelFigure;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getFigureMetadataBlockInputFieldsPane() {&#xA;&#x9;&#x9;return fFigureMetadataBlockInputFieldsPane;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getFigureMetadataBlockMapping() {&#xA;&#x9;&#x9;return fFigureMetadataBlockMapping;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FFIGUREMETADATABLOCKLABELFIGURE_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 12, org.eclipse.swt.SWT.BOLD);&#xA;&#xA;"/>
<modelFacet>
<metaClass
href="crosswalk.genmodel#//crosswalk/MetadataBlock"/>
@@ -639,7 +639,7 @@
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
className="MetadataBlockFigure"
- classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class MetadataBlockFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fFigureMetadataBlockLabelFigure; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fFigureMetadataBlockInputFieldsPane; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fFigureMetadataBlockMapping; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public MetadataBlockFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.draw2d.GridLayout layoutThis = new org.eclipse.draw2d.GridLayout();&#xA;&#x9;layoutThis.numColumns = 2;&#xA;&#x9;layoutThis.makeColumnsEqualWidth = false;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setLineWidth(3);&#xA;&#xA;this.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(0)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;));&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fFigureMetadataBlockLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fFigureMetadataBlockLabelFigure.setText(&quot;Unknown Widget&quot;);&#xA;&#x9;fFigureMetadataBlockLabelFigure.setForegroundColor(org.eclipse.draw2d.ColorConstants.darkGray);&#xA;&#xA;fFigureMetadataBlockLabelFigure.setFont(FFIGUREMETADATABLOCKLABELFIGURE_FONT);&#xA;&#xA;&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureMetadataBlockLabelFigure = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureMetadataBlockLabelFigure.verticalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureMetadataBlockLabelFigure.horizontalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureMetadataBlockLabelFigure.horizontalIndent = 0;&#xA;constraintFFigureMetadataBlockLabelFigure.horizontalSpan = 2;&#xA;constraintFFigureMetadataBlockLabelFigure.verticalSpan = 1;&#xA;constraintFFigureMetadataBlockLabelFigure.grabExcessHorizontalSpace = false;&#xA;constraintFFigureMetadataBlockLabelFigure.grabExcessVerticalSpace = false;&#xA;this.add(fFigureMetadataBlockLabelFigure, constraintFFigureMetadataBlockLabelFigure);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureMetadataBlockInputFieldsPane = new org.eclipse.draw2d.RectangleFigure();&#xA;fFigureMetadataBlockInputFieldsPane.setOutline(false);&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureMetadataBlockInputFieldsPane = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureMetadataBlockInputFieldsPane.verticalAlignment = org.eclipse.draw2d.GridData.CENTER;&#xA;constraintFFigureMetadataBlockInputFieldsPane.horizontalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureMetadataBlockInputFieldsPane.horizontalIndent = 0;&#xA;constraintFFigureMetadataBlockInputFieldsPane.horizontalSpan = 1;&#xA;constraintFFigureMetadataBlockInputFieldsPane.verticalSpan = 1;&#xA;constraintFFigureMetadataBlockInputFieldsPane.grabExcessHorizontalSpace = false;&#xA;constraintFFigureMetadataBlockInputFieldsPane.grabExcessVerticalSpace = false;&#xA;this.add(fFigureMetadataBlockInputFieldsPane, constraintFFigureMetadataBlockInputFieldsPane);&#xA;&#xA;&#xA;&#x9;org.eclipse.draw2d.GridLayout layoutFFigureMetadataBlockInputFieldsPane = new org.eclipse.draw2d.GridLayout();&#xA;&#x9;layoutFFigureMetadataBlockInputFieldsPane.numColumns = 1;&#xA;&#x9;layoutFFigureMetadataBlockInputFieldsPane.makeColumnsEqualWidth = false;&#xA;&#x9;fFigureMetadataBlockInputFieldsPane.setLayoutManager(layoutFFigureMetadataBlockInputFieldsPane);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureMetadataBlockMapping = new org.eclipse.draw2d.RectangleFigure();&#xA;fFigureMetadataBlockMapping.setLineWidth(2);&#xA;&#x9;fFigureMetadataBlockMapping.setBackgroundColor(org.eclipse.draw2d.ColorConstants.lightGray);&#xA;fFigureMetadataBlockMapping.setBorder(new org.eclipse.draw2d.LineBorder(null, getMapMode().DPtoLP(2)&#xA;));&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureMetadataBlockMapping = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureMetadataBlockMapping.verticalAlignment = org.eclipse.draw2d.GridData.CENTER;&#xA;constraintFFigureMetadataBlockMapping.horizontalAlignment = org.eclipse.draw2d.GridData.END;&#xA;constraintFFigureMetadataBlockMapping.horizontalIndent = 0;&#xA;constraintFFigureMetadataBlockMapping.horizontalSpan = 1;&#xA;constraintFFigureMetadataBlockMapping.verticalSpan = 1;&#xA;constraintFFigureMetadataBlockMapping.grabExcessHorizontalSpace = false;&#xA;constraintFFigureMetadataBlockMapping.grabExcessVerticalSpace = false;&#xA;this.add(fFigureMetadataBlockMapping, constraintFFigureMetadataBlockMapping);&#xA;&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureMetadataBlockLabelFigure() {&#xA;&#x9;&#x9;return fFigureMetadataBlockLabelFigure;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getFigureMetadataBlockInputFieldsPane() {&#xA;&#x9;&#x9;return fFigureMetadataBlockInputFieldsPane;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getFigureMetadataBlockMapping() {&#xA;&#x9;&#x9;return fFigureMetadataBlockMapping;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FFIGUREMETADATABLOCKLABELFIGURE_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 12, org.eclipse.swt.SWT.BOLD);&#xA;&#xA;"/>
+ classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class MetadataBlockFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fFigureMetadataBlockLabelFigure; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fFigureMetadataBlockInputFieldsPane; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fFigureMetadataBlockMapping; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public MetadataBlockFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.draw2d.GridLayout layoutThis = new org.eclipse.draw2d.GridLayout();&#xA;&#x9;layoutThis.numColumns = 2;&#xA;&#x9;layoutThis.makeColumnsEqualWidth = false;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setLineWidth(3);&#xA;&#xA;this.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(0)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;));&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fFigureMetadataBlockLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fFigureMetadataBlockLabelFigure.setText(&quot;Unknown Widget&quot;);&#xA;&#x9;fFigureMetadataBlockLabelFigure.setForegroundColor(org.eclipse.draw2d.ColorConstants.darkGray);&#xA;&#xA;fFigureMetadataBlockLabelFigure.setFont(FFIGUREMETADATABLOCKLABELFIGURE_FONT);&#xA;&#xA;&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureMetadataBlockLabelFigure = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureMetadataBlockLabelFigure.verticalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureMetadataBlockLabelFigure.horizontalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureMetadataBlockLabelFigure.horizontalIndent = 0;&#xA;constraintFFigureMetadataBlockLabelFigure.horizontalSpan = 2;&#xA;constraintFFigureMetadataBlockLabelFigure.verticalSpan = 1;&#xA;constraintFFigureMetadataBlockLabelFigure.grabExcessHorizontalSpace = false;&#xA;constraintFFigureMetadataBlockLabelFigure.grabExcessVerticalSpace = false;&#xA;this.add(fFigureMetadataBlockLabelFigure, constraintFFigureMetadataBlockLabelFigure);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureMetadataBlockInputFieldsPane = new org.eclipse.draw2d.RectangleFigure();&#xA;fFigureMetadataBlockInputFieldsPane.setOutline(false);&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureMetadataBlockInputFieldsPane = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureMetadataBlockInputFieldsPane.verticalAlignment = org.eclipse.draw2d.GridData.CENTER;&#xA;constraintFFigureMetadataBlockInputFieldsPane.horizontalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureMetadataBlockInputFieldsPane.horizontalIndent = 0;&#xA;constraintFFigureMetadataBlockInputFieldsPane.horizontalSpan = 1;&#xA;constraintFFigureMetadataBlockInputFieldsPane.verticalSpan = 1;&#xA;constraintFFigureMetadataBlockInputFieldsPane.grabExcessHorizontalSpace = false;&#xA;constraintFFigureMetadataBlockInputFieldsPane.grabExcessVerticalSpace = false;&#xA;this.add(fFigureMetadataBlockInputFieldsPane, constraintFFigureMetadataBlockInputFieldsPane);&#xA;&#xA;&#xA;&#x9;org.eclipse.draw2d.GridLayout layoutFFigureMetadataBlockInputFieldsPane = new org.eclipse.draw2d.GridLayout();&#xA;&#x9;layoutFFigureMetadataBlockInputFieldsPane.numColumns = 1;&#xA;&#x9;layoutFFigureMetadataBlockInputFieldsPane.makeColumnsEqualWidth = false;&#xA;&#x9;fFigureMetadataBlockInputFieldsPane.setLayoutManager(layoutFFigureMetadataBlockInputFieldsPane);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureMetadataBlockMapping = new org.eclipse.draw2d.RectangleFigure();&#xA;fFigureMetadataBlockMapping.setLineWidth(2);&#xA;&#x9;fFigureMetadataBlockMapping.setBackgroundColor(org.eclipse.draw2d.ColorConstants.lightGray);&#xA;&#xA;fFigureMetadataBlockMapping.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;));&#xA;fFigureMetadataBlockMapping.setBorder(new org.eclipse.draw2d.LineBorder(null, getMapMode().DPtoLP(2)&#xA;));&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureMetadataBlockMapping = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureMetadataBlockMapping.verticalAlignment = org.eclipse.draw2d.GridData.CENTER;&#xA;constraintFFigureMetadataBlockMapping.horizontalAlignment = org.eclipse.draw2d.GridData.END;&#xA;constraintFFigureMetadataBlockMapping.horizontalIndent = 0;&#xA;constraintFFigureMetadataBlockMapping.horizontalSpan = 1;&#xA;constraintFFigureMetadataBlockMapping.verticalSpan = 1;&#xA;constraintFFigureMetadataBlockMapping.grabExcessHorizontalSpace = false;&#xA;constraintFFigureMetadataBlockMapping.grabExcessVerticalSpace = false;&#xA;this.add(fFigureMetadataBlockMapping, constraintFFigureMetadataBlockMapping);&#xA;&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureMetadataBlockLabelFigure() {&#xA;&#x9;&#x9;return fFigureMetadataBlockLabelFigure;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getFigureMetadataBlockInputFieldsPane() {&#xA;&#x9;&#x9;return fFigureMetadataBlockInputFieldsPane;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getFigureMetadataBlockMapping() {&#xA;&#x9;&#x9;return fFigureMetadataBlockMapping;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FFIGUREMETADATABLOCKLABELFIGURE_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 12, org.eclipse.swt.SWT.BOLD);&#xA;&#xA;"/>
<modelFacet>
<metaClass
href="crosswalk.genmodel#//crosswalk/MetadataBlock"/>
@@ -887,7 +887,7 @@
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
className="FlowEditableModelFigure"
- classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class FlowEditableModelFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fFigureFlowModelBox; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fFigureModelLabelFigure; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fFigureModelNotesFigure; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public FlowEditableModelFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.draw2d.GridLayout layoutThis = new org.eclipse.draw2d.GridLayout();&#xA;&#x9;layoutThis.numColumns = 1;&#xA;&#x9;layoutThis.makeColumnsEqualWidth = true;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;&#x9;this.setBackgroundColor(org.eclipse.draw2d.ColorConstants.lightGray);&#xA;this.setPreferredSize(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(1000)&#xA;, getMapMode().DPtoLP(1000)&#xA;));&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fFigureModelLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fFigureModelLabelFigure.setText(&quot;&quot;);&#xA;&#xA;fFigureModelLabelFigure.setFont(FFIGUREMODELLABELFIGURE_FONT);&#xA;&#xA;&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureModelLabelFigure = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureModelLabelFigure.verticalAlignment = org.eclipse.draw2d.GridData.CENTER;&#xA;constraintFFigureModelLabelFigure.horizontalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureModelLabelFigure.horizontalIndent = 5;&#xA;constraintFFigureModelLabelFigure.horizontalSpan = 1;&#xA;constraintFFigureModelLabelFigure.verticalSpan = 1;&#xA;constraintFFigureModelLabelFigure.grabExcessHorizontalSpace = false;&#xA;constraintFFigureModelLabelFigure.grabExcessVerticalSpace = false;&#xA;this.add(fFigureModelLabelFigure, constraintFFigureModelLabelFigure);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureModelNotesFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fFigureModelNotesFigure.setText(&quot;&quot;);&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureModelNotesFigure = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureModelNotesFigure.verticalAlignment = org.eclipse.draw2d.GridData.CENTER;&#xA;constraintFFigureModelNotesFigure.horizontalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureModelNotesFigure.horizontalIndent = 5;&#xA;constraintFFigureModelNotesFigure.horizontalSpan = 1;&#xA;constraintFFigureModelNotesFigure.verticalSpan = 1;&#xA;constraintFFigureModelNotesFigure.grabExcessHorizontalSpace = false;&#xA;constraintFFigureModelNotesFigure.grabExcessVerticalSpace = false;&#xA;this.add(fFigureModelNotesFigure, constraintFFigureModelNotesFigure);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureFlowModelBox = new org.eclipse.draw2d.RectangleFigure();&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureFlowModelBox = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureFlowModelBox.verticalAlignment = org.eclipse.draw2d.GridData.FILL;&#xA;constraintFFigureFlowModelBox.horizontalAlignment = org.eclipse.draw2d.GridData.FILL;&#xA;constraintFFigureFlowModelBox.horizontalIndent = 0;&#xA;constraintFFigureFlowModelBox.horizontalSpan = 1;&#xA;constraintFFigureFlowModelBox.verticalSpan = 1;&#xA;constraintFFigureFlowModelBox.grabExcessHorizontalSpace = true;&#xA;constraintFFigureFlowModelBox.grabExcessVerticalSpace = true;&#xA;this.add(fFigureFlowModelBox, constraintFFigureFlowModelBox);&#xA;&#xA;&#xA;&#x9;org.eclipse.draw2d.ToolbarLayout layoutFFigureFlowModelBox = new org.eclipse.draw2d.ToolbarLayout();&#xA;&#x9;layoutFFigureFlowModelBox.setStretchMinorAxis(false);&#xA;&#x9;layoutFFigureFlowModelBox.setMinorAlignment(org.eclipse.draw2d.ToolbarLayout.ALIGN_CENTER&#xA;);&#xA;&#xA;&#x9;layoutFFigureFlowModelBox.setSpacing(5);&#xA;&#x9;layoutFFigureFlowModelBox.setVertical(true);&#xA;&#xA;&#x9;fFigureFlowModelBox.setLayoutManager(layoutFFigureFlowModelBox);&#xA;&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getFigureFlowModelBox() {&#xA;&#x9;&#x9;return fFigureFlowModelBox;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureModelLabelFigure() {&#xA;&#x9;&#x9;return fFigureModelLabelFigure;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureModelNotesFigure() {&#xA;&#x9;&#x9;return fFigureModelNotesFigure;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FFIGUREMODELLABELFIGURE_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 26, org.eclipse.swt.SWT.BOLD);&#xA;&#xA;">
+ classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class FlowEditableModelFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fFigureFlowModelBox; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fFigureModelLabelFigure; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fFigureModelNotesFigure; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public FlowEditableModelFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.draw2d.GridLayout layoutThis = new org.eclipse.draw2d.GridLayout();&#xA;&#x9;layoutThis.numColumns = 1;&#xA;&#x9;layoutThis.makeColumnsEqualWidth = true;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;&#x9;this.setBackgroundColor(org.eclipse.draw2d.ColorConstants.lightGray);&#xA;this.setPreferredSize(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(1000)&#xA;, getMapMode().DPtoLP(1000)&#xA;));&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fFigureModelLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fFigureModelLabelFigure.setText(&quot;&quot;);&#xA;&#xA;fFigureModelLabelFigure.setFont(FFIGUREMODELLABELFIGURE_FONT);&#xA;&#xA;&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureModelLabelFigure = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureModelLabelFigure.verticalAlignment = org.eclipse.draw2d.GridData.CENTER;&#xA;constraintFFigureModelLabelFigure.horizontalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureModelLabelFigure.horizontalIndent = 5;&#xA;constraintFFigureModelLabelFigure.horizontalSpan = 1;&#xA;constraintFFigureModelLabelFigure.verticalSpan = 1;&#xA;constraintFFigureModelLabelFigure.grabExcessHorizontalSpace = false;&#xA;constraintFFigureModelLabelFigure.grabExcessVerticalSpace = false;&#xA;this.add(fFigureModelLabelFigure, constraintFFigureModelLabelFigure);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureModelNotesFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fFigureModelNotesFigure.setText(&quot;&quot;);&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureModelNotesFigure = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureModelNotesFigure.verticalAlignment = org.eclipse.draw2d.GridData.CENTER;&#xA;constraintFFigureModelNotesFigure.horizontalAlignment = org.eclipse.draw2d.GridData.BEGINNING;&#xA;constraintFFigureModelNotesFigure.horizontalIndent = 5;&#xA;constraintFFigureModelNotesFigure.horizontalSpan = 1;&#xA;constraintFFigureModelNotesFigure.verticalSpan = 1;&#xA;constraintFFigureModelNotesFigure.grabExcessHorizontalSpace = false;&#xA;constraintFFigureModelNotesFigure.grabExcessVerticalSpace = false;&#xA;this.add(fFigureModelNotesFigure, constraintFFigureModelNotesFigure);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureFlowModelBox = new org.eclipse.draw2d.RectangleFigure();&#xA;&#xA;&#xA;org.eclipse.draw2d.GridData constraintFFigureFlowModelBox = new org.eclipse.draw2d.GridData();&#xA;constraintFFigureFlowModelBox.verticalAlignment = org.eclipse.draw2d.GridData.FILL;&#xA;constraintFFigureFlowModelBox.horizontalAlignment = org.eclipse.draw2d.GridData.FILL;&#xA;constraintFFigureFlowModelBox.horizontalIndent = 0;&#xA;constraintFFigureFlowModelBox.horizontalSpan = 1;&#xA;constraintFFigureFlowModelBox.verticalSpan = 1;&#xA;constraintFFigureFlowModelBox.grabExcessHorizontalSpace = true;&#xA;constraintFFigureFlowModelBox.grabExcessVerticalSpace = true;&#xA;this.add(fFigureFlowModelBox, constraintFFigureFlowModelBox);&#xA;&#xA;&#xA;&#x9;org.eclipse.draw2d.ToolbarLayout layoutFFigureFlowModelBox = new org.eclipse.draw2d.ToolbarLayout();&#xA;&#x9;layoutFFigureFlowModelBox.setStretchMinorAxis(false);&#xA;&#x9;layoutFFigureFlowModelBox.setMinorAlignment(org.eclipse.draw2d.ToolbarLayout.ALIGN_TOPLEFT&#xA;);&#xA;&#xA;&#x9;layoutFFigureFlowModelBox.setSpacing(5);&#xA;&#x9;layoutFFigureFlowModelBox.setVertical(true);&#xA;&#xA;&#x9;fFigureFlowModelBox.setLayoutManager(layoutFFigureFlowModelBox);&#xA;&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getFigureFlowModelBox() {&#xA;&#x9;&#x9;return fFigureFlowModelBox;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureModelLabelFigure() {&#xA;&#x9;&#x9;return fFigureModelLabelFigure;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureModelNotesFigure() {&#xA;&#x9;&#x9;return fFigureModelNotesFigure;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FFIGUREMODELLABELFIGURE_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 26, org.eclipse.swt.SWT.BOLD);&#xA;&#xA;">
<attributes
xsi:type="gmfgen:StyleAttributes"
fixedBackground="true"/>
View
17 crosswalk-gmf/src/crosswalk/CrosswalkPackage.java
@@ -1163,13 +1163,22 @@
int FORM = 26;
/**
+ * The feature id for the '<em><b>Output Type</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int FORM__OUTPUT_TYPE = EDITABLE_FEATURE_COUNT + 0;
+
+ /**
* The feature id for the '<em><b>Elements</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int FORM__ELEMENTS = EDITABLE_FEATURE_COUNT + 0;
+ int FORM__ELEMENTS = EDITABLE_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Title</b></em>' attribute.
@@ -1178,7 +1187,7 @@
* @generated
* @ordered
*/
- int FORM__TITLE = EDITABLE_FEATURE_COUNT + 1;
+ int FORM__TITLE = EDITABLE_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Description</b></em>' attribute.
@@ -1187,7 +1196,7 @@
* @generated
* @ordered
*/
- int FORM__DESCRIPTION = EDITABLE_FEATURE_COUNT + 2;
+ int FORM__DESCRIPTION = EDITABLE_FEATURE_COUNT + 3;
/**
* The number of structural features of the '<em>Form</em>' class.
@@ -1196,7 +1205,7 @@
* @generated
* @ordered
*/
- int FORM_FEATURE_COUNT = EDITABLE_FEATURE_COUNT + 3;
+ int FORM_FEATURE_COUNT = EDITABLE_FEATURE_COUNT + 4;
/**
* The meta object id for the '{@link crosswalk.FormElement <em>Form Element</em>}' class.
View
2  crosswalk-gmf/src/crosswalk/Form.java
@@ -26,7 +26,7 @@
* @model
* @generated
*/
-public interface Form extends Editable {
+public interface Form extends Editable, SchemaProvider {
/**
* Returns the value of the '<em><b>Elements</b></em>' containment reference list.
* The list contents are of type {@link crosswalk.FormElement}.
View
1  crosswalk-gmf/src/crosswalk/impl/CrosswalkPackageImpl.java
@@ -1350,6 +1350,7 @@ public void initializePackageContents() {
inputFieldEClass.getESuperTypes().add(this.getOutput());
inputFieldEClass.getESuperTypes().add(this.getInput());
formEClass.getESuperTypes().add(this.getEditable());
+ formEClass.getESuperTypes().add(this.getSchemaProvider());
paragraphEClass.getESuperTypes().add(this.getFormElement());
// Initialize classes and features; add operations and parameters
View
205 crosswalk-gmf/src/crosswalk/impl/DelimitedFileImpl.java
@@ -65,9 +65,9 @@
private boolean reset = false;
/**
- * The cached value of the '{@link #getFields() <em>Fields</em>}' containment reference list. <!-- begin-user-doc -->
+ * The cached value of the '{@link #getFields() <em>Fields</em>}' containment reference list.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getFields()
* @generated
* @ordered
@@ -75,9 +75,9 @@
protected EList<DataField> fields;
/**
- * The default value of the '{@link #getSourceFile() <em>Source File</em>}' attribute. <!-- begin-user-doc --> <!--
+ * The default value of the '{@link #getSourceFile() <em>Source File</em>}' attribute.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @see #getSourceFile()
* @generated
* @ordered
@@ -85,9 +85,9 @@
protected static final URI SOURCE_FILE_EDEFAULT = null;
/**
- * The cached value of the '{@link #getSourceFile() <em>Source File</em>}' attribute. <!-- begin-user-doc --> <!--
+ * The cached value of the '{@link #getSourceFile() <em>Source File</em>}' attribute.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @see #getSourceFile()
* @generated
* @ordered
@@ -95,27 +95,27 @@
protected URI sourceFile = SOURCE_FILE_EDEFAULT;
/**
- * The default value of the '{@link #getFirstDataRow() <em>First Data Row</em>}' attribute. <!-- begin-user-doc -->
+ * The default value of the '{@link #getFirstDataRow() <em>First Data Row</em>}' attribute.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getFirstDataRow()
* @generated
* @ordered
*/
protected static final int FIRST_DATA_ROW_EDEFAULT = 1;
/**
- * The cached value of the '{@link #getFirstDataRow() <em>First Data Row</em>}' attribute. <!-- begin-user-doc -->
+ * The cached value of the '{@link #getFirstDataRow() <em>First Data Row</em>}' attribute.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getFirstDataRow()
* @generated
* @ordered
*/
protected int firstDataRow = FIRST_DATA_ROW_EDEFAULT;
/**
- * The default value of the '{@link #isHeaderRow() <em>Header Row</em>}' attribute. <!-- begin-user-doc --> <!--
+ * The default value of the '{@link #isHeaderRow() <em>Header Row</em>}' attribute.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @see #isHeaderRow()
* @generated
* @ordered
@@ -123,9 +123,9 @@
protected static final boolean HEADER_ROW_EDEFAULT = true;
/**
- * The cached value of the '{@link #isHeaderRow() <em>Header Row</em>}' attribute. <!-- begin-user-doc --> <!--
+ * The cached value of the '{@link #isHeaderRow() <em>Header Row</em>}' attribute.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @see #isHeaderRow()
* @generated
* @ordered
@@ -133,17 +133,17 @@
protected boolean headerRow = HEADER_ROW_EDEFAULT;
/**
- * This is true if the Header Row attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This is true if the Header Row attribute has been set.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
protected boolean headerRowESet;
/**
- * The default value of the '{@link #getTextEncoding() <em>Text Encoding</em>}' attribute. <!-- begin-user-doc -->
+ * The default value of the '{@link #getTextEncoding() <em>Text Encoding</em>}' attribute.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getTextEncoding()
* @generated
* @ordered
@@ -151,9 +151,9 @@
protected static final String TEXT_ENCODING_EDEFAULT = "utf-8";
/**
- * The cached value of the '{@link #getTextEncoding() <em>Text Encoding</em>}' attribute. <!-- begin-user-doc -->
+ * The cached value of the '{@link #getTextEncoding() <em>Text Encoding</em>}' attribute.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getTextEncoding()
* @generated
* @ordered
@@ -161,27 +161,27 @@
protected String textEncoding = TEXT_ENCODING_EDEFAULT;
/**
- * The default value of the '{@link #getFieldDelimiter() <em>Field Delimiter</em>}' attribute. <!-- begin-user-doc
+ * The default value of the '{@link #getFieldDelimiter() <em>Field Delimiter</em>}' attribute.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
* @see #getFieldDelimiter()
* @generated
* @ordered
*/
protected static final char FIELD_DELIMITER_EDEFAULT = ',';
/**
- * The cached value of the '{@link #getFieldDelimiter() <em>Field Delimiter</em>}' attribute. <!-- begin-user-doc -->
+ * The cached value of the '{@link #getFieldDelimiter() <em>Field Delimiter</em>}' attribute.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getFieldDelimiter()
* @generated
* @ordered
*/
protected char fieldDelimiter = FIELD_DELIMITER_EDEFAULT;
/**
- * The default value of the '{@link #getTextDelimiter() <em>Text Delimiter</em>}' attribute. <!-- begin-user-doc -->
+ * The default value of the '{@link #getTextDelimiter() <em>Text Delimiter</em>}' attribute.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getTextDelimiter()
* @generated
* @ordered
@@ -189,9 +189,9 @@
protected static final char TEXT_DELIMITER_EDEFAULT = '\"';
/**
- * The cached value of the '{@link #getTextDelimiter() <em>Text Delimiter</em>}' attribute. <!-- begin-user-doc -->
+ * The cached value of the '{@link #getTextDelimiter() <em>Text Delimiter</em>}' attribute.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getTextDelimiter()
* @generated
* @ordered
@@ -199,26 +199,26 @@
protected char textDelimiter = TEXT_DELIMITER_EDEFAULT;
/**
- * This is true if the Text Delimiter attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This is true if the Text Delimiter attribute has been set.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
protected boolean textDelimiterESet;
/**
- * The default value of the '{@link #getLastDataRow() <em>Last Data Row</em>}' attribute. <!-- begin-user-doc -->
+ * The default value of the '{@link #getLastDataRow() <em>Last Data Row</em>}' attribute.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getLastDataRow()
* @generated
* @ordered
*/
protected static final int LAST_DATA_ROW_EDEFAULT = 1;
/**
- * The cached value of the '{@link #getLastDataRow() <em>Last Data Row</em>}' attribute. <!-- begin-user-doc --> <!--
+ * The cached value of the '{@link #getLastDataRow() <em>Last Data Row</em>}' attribute.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @see #getLastDataRow()
* @generated
* @ordered
@@ -226,8 +226,8 @@
protected int lastDataRow = LAST_DATA_ROW_EDEFAULT;
/**
- * This is true if the Last Data Row attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This is true if the Last Data Row attribute has been set.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -235,7 +235,6 @@
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected DelimitedFileImpl() {
@@ -244,7 +243,6 @@ protected DelimitedFileImpl() {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -254,64 +252,55 @@ protected EClass eStaticClass() {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public CrossWalk getWalk() {
- if (eContainerFeatureID() != CrosswalkPackage.DELIMITED_FILE__WALK)
- return null;
- return (CrossWalk) eContainer();
+ if (eContainerFeatureID() != CrosswalkPackage.DELIMITED_FILE__WALK) return null;
+ return (CrossWalk)eContainer();
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public NotificationChain basicSetWalk(CrossWalk newWalk, NotificationChain msgs) {
- msgs = eBasicSetContainer((InternalEObject) newWalk, CrosswalkPackage.DELIMITED_FILE__WALK, msgs);
+ msgs = eBasicSetContainer((InternalEObject)newWalk, CrosswalkPackage.DELIMITED_FILE__WALK, msgs);
return msgs;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setWalk(CrossWalk newWalk) {
- if (newWalk != eInternalContainer()
- || (eContainerFeatureID() != CrosswalkPackage.DELIMITED_FILE__WALK && newWalk != null)) {
+ if (newWalk != eInternalContainer() || (eContainerFeatureID() != CrosswalkPackage.DELIMITED_FILE__WALK && newWalk != null)) {
if (EcoreUtil.isAncestor(this, newWalk))
throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
NotificationChain msgs = null;
if (eInternalContainer() != null)
msgs = eBasicRemoveFromContainer(msgs);
if (newWalk != null)
- msgs = ((InternalEObject) newWalk).eInverseAdd(this, CrosswalkPackage.CROSS_WALK__DATA_SOURCE,
- CrossWalk.class, msgs);
+ msgs = ((InternalEObject)newWalk).eInverseAdd(this, CrosswalkPackage.CROSS_WALK__DATA_SOURCE, CrossWalk.class, msgs);
msgs = basicSetWalk(newWalk, msgs);
- if (msgs != null)
- msgs.dispatch();
- } else if (eNotificationRequired())
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, CrosswalkPackage.DELIMITED_FILE__WALK, newWalk, newWalk));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EList<DataField> getFields() {
if (fields == null) {
- fields = new EObjectContainmentWithInverseEList<DataField>(DataField.class, this,
- CrosswalkPackage.DELIMITED_FILE__FIELDS, CrosswalkPackage.DATA_FIELD__SOURCE);
+ fields = new EObjectContainmentWithInverseEList<DataField>(DataField.class, this, CrosswalkPackage.DELIMITED_FILE__FIELDS, CrosswalkPackage.DATA_FIELD__SOURCE);
}
return fields;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public URI getSourceFile() {
@@ -320,20 +309,17 @@ public URI getSourceFile() {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setSourceFile(URI newSourceFile) {
URI oldSourceFile = sourceFile;
sourceFile = newSourceFile;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CrosswalkPackage.DELIMITED_FILE__SOURCE_FILE,
- oldSourceFile, sourceFile));
+ eNotify(new ENotificationImpl(this, Notification.SET, CrosswalkPackage.DELIMITED_FILE__SOURCE_FILE, oldSourceFile, sourceFile));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public int getFirstDataRow() {
@@ -342,20 +328,17 @@ public int getFirstDataRow() {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setFirstDataRow(int newFirstDataRow) {
int oldFirstDataRow = firstDataRow;
firstDataRow = newFirstDataRow;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CrosswalkPackage.DELIMITED_FILE__FIRST_DATA_ROW,
- oldFirstDataRow, firstDataRow));
+ eNotify(new ENotificationImpl(this, Notification.SET, CrosswalkPackage.DELIMITED_FILE__FIRST_DATA_ROW, oldFirstDataRow, firstDataRow));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public boolean isHeaderRow() {
@@ -364,7 +347,6 @@ public boolean isHeaderRow() {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setHeaderRow(boolean newHeaderRow) {
@@ -373,13 +355,11 @@ public void setHeaderRow(boolean newHeaderRow) {
boolean oldHeaderRowESet = headerRowESet;
headerRowESet = true;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CrosswalkPackage.DELIMITED_FILE__HEADER_ROW,
- oldHeaderRow, headerRow, !oldHeaderRowESet));
+ eNotify(new ENotificationImpl(this, Notification.SET, CrosswalkPackage.DELIMITED_FILE__HEADER_ROW, oldHeaderRow, headerRow, !oldHeaderRowESet));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void unsetHeaderRow() {
@@ -388,13 +368,11 @@ public void unsetHeaderRow() {
headerRow = HEADER_ROW_EDEFAULT;
headerRowESet = false;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, CrosswalkPackage.DELIMITED_FILE__HEADER_ROW,
- oldHeaderRow, HEADER_ROW_EDEFAULT, oldHeaderRowESet));
+ eNotify(new ENotificationImpl(this, Notification.UNSET, CrosswalkPackage.DELIMITED_FILE__HEADER_ROW, oldHeaderRow, HEADER_ROW_EDEFAULT, oldHeaderRowESet));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public boolean isSetHeaderRow() {
@@ -403,7 +381,6 @@ public boolean isSetHeaderRow() {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public String getTextEncoding() {
@@ -412,20 +389,17 @@ public String getTextEncoding() {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setTextEncoding(String newTextEncoding) {
String oldTextEncoding = textEncoding;
textEncoding = newTextEncoding;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CrosswalkPackage.DELIMITED_FILE__TEXT_ENCODING,
- oldTextEncoding, textEncoding));
+ eNotify(new ENotificationImpl(this, Notification.SET, CrosswalkPackage.DELIMITED_FILE__TEXT_ENCODING, oldTextEncoding, textEncoding));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public char getTextDelimiter() {
@@ -434,7 +408,6 @@ public char getTextDelimiter() {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setTextDelimiter(char newTextDelimiter) {
@@ -443,13 +416,11 @@ public void setTextDelimiter(char newTextDelimiter) {
boolean oldTextDelimiterESet = textDelimiterESet;
textDelimiterESet = true;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CrosswalkPackage.DELIMITED_FILE__TEXT_DELIMITER,
- oldTextDelimiter, textDelimiter, !oldTextDelimiterESet));
+ eNotify(new ENotificationImpl(this, Notification.SET, CrosswalkPackage.DELIMITED_FILE__TEXT_DELIMITER, oldTextDelimiter, textDelimiter, !oldTextDelimiterESet));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void unsetTextDelimiter() {
@@ -458,13 +429,11 @@ public void unsetTextDelimiter() {
textDelimiter = TEXT_DELIMITER_EDEFAULT;
textDelimiterESet = false;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, CrosswalkPackage.DELIMITED_FILE__TEXT_DELIMITER,
- oldTextDelimiter, TEXT_DELIMITER_EDEFAULT, oldTextDelimiterESet));
+ eNotify(new ENotificationImpl(this, Notification.UNSET, CrosswalkPackage.DELIMITED_FILE__TEXT_DELIMITER, oldTextDelimiter, TEXT_DELIMITER_EDEFAULT, oldTextDelimiterESet));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public boolean isSetTextDelimiter() {
@@ -473,7 +442,6 @@ public boolean isSetTextDelimiter() {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public int getLastDataRow() {
@@ -482,7 +450,6 @@ public int getLastDataRow() {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setLastDataRow(int newLastDataRow) {
@@ -491,13 +458,11 @@ public void setLastDataRow(int newLastDataRow) {
boolean oldLastDataRowESet = lastDataRowESet;
lastDataRowESet = true;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, CrosswalkPackage.DELIMITED_FILE__LAST_DATA_ROW,
- oldLastDataRow, lastDataRow, !oldLastDataRowESet));
+ eNotify(new ENotificationImpl(this, Notification.SET, CrosswalkPackage.DELIMITED_FILE__LAST_DATA_ROW, oldLastDataRow, lastDataRow, !oldLastDataRowESet));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void unsetLastDataRow() {
@@ -506,13 +471,11 @@ public void unsetLastDataRow() {
lastDataRow = LAST_DATA_ROW_EDEFAULT;
lastDataRowESet = false;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, CrosswalkPackage.DELIMITED_FILE__LAST_DATA_ROW,
- oldLastDataRow, LAST_DATA_ROW_EDEFAULT, oldLastDataRowESet));
+ eNotify(new ENotificationImpl(this, Notification.UNSET, CrosswalkPackage.DELIMITED_FILE__LAST_DATA_ROW, oldLastDataRow, LAST_DATA_ROW_EDEFAULT, oldLastDataRowESet));
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public boolean isSetLastDataRow() {
@@ -721,7 +684,6 @@ public void initializeDataFields() throws DataException {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -731,16 +693,15 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No
case CrosswalkPackage.DELIMITED_FILE__WALK:
if (eInternalContainer() != null)
msgs = eBasicRemoveFromContainer(msgs);
- return basicSetWalk((CrossWalk) otherEnd, msgs);
+ return basicSetWalk((CrossWalk)otherEnd, msgs);
case CrosswalkPackage.DELIMITED_FILE__FIELDS:
- return ((InternalEList<InternalEObject>) (InternalEList<?>) getFields()).basicAdd(otherEnd, msgs);
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getFields()).basicAdd(otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -749,29 +710,26 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
case CrosswalkPackage.DELIMITED_FILE__WALK:
return basicSetWalk(null, msgs);
case CrosswalkPackage.DELIMITED_FILE__FIELDS:
- return ((InternalEList<?>) getFields()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getFields()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {