Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

Commit

Permalink
removed the passing of feature into compartment drop custom commands,…
Browse files Browse the repository at this point in the history 
… it can be extracted from part/view instead
  • Loading branch information
@gregjan
gregjan committed Apr 17, 2013
1 parent c6d8d97 commit 967c47a
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 45 deletions.
5 changes: 2 additions & 3 deletions crosswalk-gmf.diagram/src/crosswalk/diagram/custom/CompartmentChildCreateCommand.java
View file
Expand Up @@ -33,10 +33,9 @@ public class CompartmentChildCreateCommand extends CreateCommand {
private EStructuralFeature feature;

public CompartmentChildCreateCommand(TransactionalEditingDomain editingDomain, ViewDescriptor viewDescriptor,
View containerView, int index, EStructuralFeature feature) {
View containerView, int index) {
super(editingDomain, viewDescriptor, containerView);
this.index = index;
this.feature = feature;
}

@Override
Expand All @@ -49,7 +48,7 @@ protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable
viewDescriptor.setView(view);

if (index > -1) {
EList nodes = (EList) getContainerView().getElement().eGet(feature);
EList nodes = (EList) getContainerView().getElement().eGet(view.getElement().eContainingFeature());
Object o = nodes.remove(nodes.size() - 1);
nodes.add(index, o);
}
Expand Down
7 changes: 2 additions & 5 deletions crosswalk-gmf.diagram/src/crosswalk/diagram/custom/CompartmentChildCreationEditPolicy.java
View file
Expand Up @@ -40,12 +40,9 @@
import org.eclipse.gmf.runtime.notation.View;

public class CompartmentChildCreationEditPolicy extends CreationEditPolicy {

private EStructuralFeature feature;

public CompartmentChildCreationEditPolicy(EStructuralFeature feature) {
public CompartmentChildCreationEditPolicy() {
super();
this.feature = feature;
}

@Override
Expand All @@ -59,7 +56,7 @@ protected Command getCreateCommand(CreateViewRequest request) {
while (descriptors.hasNext()) {
CreateViewRequest.ViewDescriptor descriptor = (CreateViewRequest.ViewDescriptor) descriptors.next();
CreateCommand createCommand = new CompartmentChildCreateCommand(editingDomain, descriptor,
(View) (getHost().getModel()), getFeedbackIndexFor(request), feature);
(View) (getHost().getModel()), getFeedbackIndexFor(request));

cc.compose(createCommand);
}
Expand Down
6 changes: 3 additions & 3 deletions crosswalk-gmf.diagram/src/crosswalk/diagram/custom/ReorderCompartmentEditPolicy.java
View file
Expand Up @@ -33,11 +33,9 @@
import org.eclipse.gmf.runtime.notation.View;

public class ReorderCompartmentEditPolicy extends FlowLayoutEditPolicy {
private EStructuralFeature feature = null;

public ReorderCompartmentEditPolicy(EStructuralFeature feature) {
public ReorderCompartmentEditPolicy() {
super();
this.feature = feature;
}

@Override
Expand Down Expand Up @@ -73,6 +71,8 @@ protected Command createMoveChildCommand(EditPart child, EditPart after) {

TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();

EStructuralFeature feature = ((View)child.getModel()).getElement().eContainingFeature();

RepositionEObjectCommand command = new CompartmentRepositionEObjectCommand(child, editingDomain, "",
(EList)((View)child.getParent().getModel()).getElement().eGet(feature),
((View)child.getModel()).getElement(),
Expand Down
6 changes: 2 additions & 4 deletions crosswalk-gmf.diagram/src/crosswalk/diagram/edit/parts/FormModelBoxCompartmentEditPart.java
View file
Expand Up @@ -94,11 +94,9 @@ protected void createDefaultEditPolicies() {
new FormModelBoxCompartmentItemSemanticEditPolicy());
//installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy());
installEditPolicy(EditPolicyRoles.CREATION_ROLE,
new CompartmentChildCreationEditPolicy(
CrosswalkPackage.Literals.FORM__ELEMENTS));
new CompartmentChildCreationEditPolicy());
installEditPolicy(EditPolicy.LAYOUT_ROLE,
new ReorderCompartmentEditPolicy(
CrosswalkPackage.Literals.FORM__ELEMENTS));
new ReorderCompartmentEditPolicy());
installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,
new DragDropEditPolicy());
installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
Expand Down
6 changes: 2 additions & 4 deletions ...am/src/crosswalk/diagram/edit/parts/MappedElementChildAttributesCompartment2EditPart.java
View file
Expand Up @@ -77,11 +77,9 @@ protected void createDefaultEditPolicies() {
EditPolicyRoles.SEMANTIC_ROLE,
new MappedElementChildAttributesCompartment2ItemSemanticEditPolicy());
installEditPolicy(EditPolicyRoles.CREATION_ROLE,
new CompartmentChildCreationEditPolicy(
CrosswalkPackage.Literals.MAPPED_ELEMENT__ATTRIBUTES));
new CompartmentChildCreationEditPolicy());
installEditPolicy(EditPolicy.LAYOUT_ROLE,
new ReorderCompartmentEditPolicy(
CrosswalkPackage.Literals.MAPPED_ELEMENT__ATTRIBUTES));
new ReorderCompartmentEditPolicy());
installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,
new DragDropEditPolicy());
installEditPolicy(
Expand Down
6 changes: 2 additions & 4 deletions ...ram/src/crosswalk/diagram/edit/parts/MappedElementChildAttributesCompartmentEditPart.java
View file
Expand Up @@ -78,12 +78,10 @@ protected void createDefaultEditPolicies() {
new MappedElementChildAttributesCompartmentItemSemanticEditPolicy());
installEditPolicy(
EditPolicyRoles.CREATION_ROLE,
new CompartmentChildCreationEditPolicy(
CrosswalkPackage.Literals.MAPPED_ELEMENT__ATTRIBUTES));
new CompartmentChildCreationEditPolicy());
installEditPolicy(
EditPolicy.LAYOUT_ROLE,
new ReorderCompartmentEditPolicy(
CrosswalkPackage.Literals.MAPPED_ELEMENT__ATTRIBUTES));
new ReorderCompartmentEditPolicy());
installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,
new DragDropEditPolicy());
installEditPolicy(
Expand Down
7 changes: 3 additions & 4 deletions ...gram/src/crosswalk/diagram/edit/parts/MappedElementChildElementsCompartment2EditPart.java
View file
Expand Up @@ -18,6 +18,7 @@
import org.eclipse.draw2d.FlowLayout;
import org.eclipse.draw2d.IFigure;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.command.AddCommand;
import org.eclipse.gef.EditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
Expand Down Expand Up @@ -94,12 +95,10 @@ protected void createDefaultEditPolicies() {
new MappedElementChildElementsCompartment2ItemSemanticEditPolicy());
installEditPolicy(
EditPolicyRoles.CREATION_ROLE,
new CompartmentChildCreationEditPolicy(
CrosswalkPackage.Literals.MAPPED_ELEMENT__CHILD_ELEMENTS));
new CompartmentChildCreationEditPolicy());
installEditPolicy(
EditPolicy.LAYOUT_ROLE,
new ReorderCompartmentEditPolicy(
CrosswalkPackage.Literals.MAPPED_ELEMENT__CHILD_ELEMENTS));
new ReorderCompartmentEditPolicy());
installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,
new DragDropEditPolicy());
installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
Expand Down
6 changes: 2 additions & 4 deletions ...agram/src/crosswalk/diagram/edit/parts/MappedElementChildElementsCompartmentEditPart.java
View file
Expand Up @@ -94,12 +94,10 @@ protected void createDefaultEditPolicies() {
new MappedElementChildElementsCompartmentItemSemanticEditPolicy());
installEditPolicy(
EditPolicyRoles.CREATION_ROLE,
new CompartmentChildCreationEditPolicy(
CrosswalkPackage.Literals.MAPPED_ELEMENT__CHILD_ELEMENTS));
new CompartmentChildCreationEditPolicy());
installEditPolicy(
EditPolicy.LAYOUT_ROLE,
new ReorderCompartmentEditPolicy(
CrosswalkPackage.Literals.MAPPED_ELEMENT__CHILD_ELEMENTS));
new ReorderCompartmentEditPolicy());
installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,
new DragDropEditPolicy());
installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
Expand Down
6 changes: 2 additions & 4 deletions ...osswalk/diagram/edit/parts/MetadataBlockMetadataBlockInputFieldsCompartment2EditPart.java
View file
Expand Up @@ -79,11 +79,9 @@ protected void createDefaultEditPolicies() {
EditPolicyRoles.SEMANTIC_ROLE,
new MetadataBlockMetadataBlockInputFieldsCompartment2ItemSemanticEditPolicy());
installEditPolicy(EditPolicyRoles.CREATION_ROLE,
new CompartmentChildCreationEditPolicy(
CrosswalkPackage.Literals.METADATA_BLOCK__PORTS));
new CompartmentChildCreationEditPolicy());
installEditPolicy(EditPolicy.LAYOUT_ROLE,
new ReorderCompartmentEditPolicy(
CrosswalkPackage.Literals.METADATA_BLOCK__PORTS));
new ReorderCompartmentEditPolicy());
installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,
new DragDropEditPolicy());
installEditPolicy(
Expand Down
6 changes: 2 additions & 4 deletions ...osswalk/diagram/edit/parts/MetadataBlockMetadataBlockInputFieldsCompartment3EditPart.java
View file
Expand Up @@ -79,11 +79,9 @@ protected void createDefaultEditPolicies() {
EditPolicyRoles.SEMANTIC_ROLE,
new MetadataBlockMetadataBlockInputFieldsCompartment3ItemSemanticEditPolicy());
installEditPolicy(EditPolicyRoles.CREATION_ROLE,
new CompartmentChildCreationEditPolicy(
CrosswalkPackage.Literals.METADATA_BLOCK__PORTS));
new CompartmentChildCreationEditPolicy());
installEditPolicy(EditPolicy.LAYOUT_ROLE,
new ReorderCompartmentEditPolicy(
CrosswalkPackage.Literals.METADATA_BLOCK__PORTS));
new ReorderCompartmentEditPolicy());
installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,
new DragDropEditPolicy());
installEditPolicy(
Expand Down
6 changes: 2 additions & 4 deletions ...rosswalk/diagram/edit/parts/MetadataBlockMetadataBlockInputFieldsCompartmentEditPart.java
View file
Expand Up @@ -79,11 +79,9 @@ protected void createDefaultEditPolicies() {
EditPolicyRoles.SEMANTIC_ROLE,
new MetadataBlockMetadataBlockInputFieldsCompartmentItemSemanticEditPolicy());
installEditPolicy(EditPolicyRoles.CREATION_ROLE,
new CompartmentChildCreationEditPolicy(
CrosswalkPackage.Literals.METADATA_BLOCK__PORTS));
new CompartmentChildCreationEditPolicy());
installEditPolicy(EditPolicy.LAYOUT_ROLE,
new ReorderCompartmentEditPolicy(
CrosswalkPackage.Literals.METADATA_BLOCK__PORTS));
new ReorderCompartmentEditPolicy());
installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,
new DragDropEditPolicy());
installEditPolicy(
Expand Down
3 changes: 1 addition & 2 deletions workbench_plugin/src/main/java/unc/lib/cdr/workbench/rcp/ApplicationActionBarAdvisor.java
View file
Expand Up @@ -107,16 +107,15 @@ protected void fillMenuBar(IMenuManager menuBar) {
menu.add(new Separator());
menuBar.add(menu);
}

}

@Override
protected void fillCoolBar(ICoolBarManager coolBar) {
ToolBarManager toolbar = new ToolBarManager(SWT.FLAT);
coolBar.add(toolbar);
toolbar.add(newWizardDropDownAction);
toolbar.add(saveAction);
toolbar.add(saveAsAction);
coolBar.add(toolbar);
}

}

0 comments on commit 967c47a

Please sign in to comment.