diff options
9 files changed, 7 insertions, 52 deletions
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.toolsmiths.feature/pom.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.toolsmiths.feature/pom.xml index 8aa7ee13b2a..471db76f2ba 100644 --- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.toolsmiths.feature/pom.xml +++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.toolsmiths.feature/pom.xml @@ -6,7 +6,6 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> <artifactId>org.eclipse.papyrus.tests.toolsmiths.feature</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/XYLayoutWithConstrainedResizedEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/XYLayoutWithConstrainedResizedEditPolicy.java index 5d9f35974c4..66338b35428 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/XYLayoutWithConstrainedResizedEditPolicy.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/XYLayoutWithConstrainedResizedEditPolicy.java @@ -9,7 +9,7 @@ * Contributors: * * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * C�line Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 520154 + * Celine Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 520154 * *****************************************************************************/ package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies; @@ -158,10 +158,8 @@ public class XYLayoutWithConstrainedResizedEditPolicy extends XYLayoutEditPolicy final CompoundCommand resize = new CompoundCommand("Resize Command");//$NON-NLS-1$ IGraphicalEditPart child; final List<?> children = request.getEditParts(); - final int direction = request.getResizeDirection(); boolean isConstrainedResize = request.isConstrainedResize(); - boolean forceLocation = isConstrainedResize;// && (direction == PositionConstants.WEST || direction == PositionConstants.NORTH || direction == PositionConstants.NORTH_WEST );//|| direction == PositionConstants.NORTH_EAST || direction == - // PositionConstants.SOUTH_WEST); + boolean forceLocation = isConstrainedResize; for (int i = 0; i < children.size(); i++) { child = (IGraphicalEditPart) children.get(i); resize.add(createChangeConstraintCommand(request, child, translateToModelConstraint(getConstraintFor(request, child)))); diff --git a/plugins/toolsmiths/org.eclipse.papyrus.def/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.def/pom.xml index 784f65949f1..6cdd1dbbd69 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.def/pom.xml +++ b/plugins/toolsmiths/org.eclipse.papyrus.def/pom.xml @@ -8,7 +8,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.def</artifactId> - <groupId>org.eclipse.papyrus</groupId> <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.xml index 326f764f1e5..49a45598a98 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.xml @@ -21,7 +21,6 @@ <extension-point id="editorAssistantProvider" name="editorAssistantProvider" schema="schema/editorAssistantProvider.exsd"/> <extension-point id="viewInfo" name="viewInfo" schema="schema/viewInfo.exsd"/> <extension-point id="moskittEditorFactory" name="moskittEditorFactory" schema="schema/moskittEditorFactory.exsd"/> - <extension-point id="aspectToolProvider" name="aspectToolProvider" schema="schema/aspectToolProvider.exsd"/> <extension-point id="htmlRendererContributor" name="htmlRendererContributor" schema="schema/htmlRendererContributor.exsd"/> <extension point="org.eclipse.ui.views"> diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/TypeSelectorCellEditor.java b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/TypeSelectorCellEditor.java index db2ff07e064..049dec59e19 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/TypeSelectorCellEditor.java +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/TypeSelectorCellEditor.java @@ -84,8 +84,6 @@ public class TypeSelectorCellEditor extends TextCellEditor { Control control = super.createControl(parent); // Install content assist - - return control; } @@ -97,7 +95,6 @@ public class TypeSelectorCellEditor extends TextCellEditor { * @param contentProposalProvider The associated {@link ContentProposalAdapter}. */ protected void installContentAssistantProvider( IContentProposalProvider contentProposalProvider) { -// KeyStroke keyStroke = KeyStroke.getInstance("Ctrl+Space"); KeyStroke keyStroke = null; char[] autoActivationCharacters = null; int autoActivationDelay = 500; @@ -119,8 +116,6 @@ public class TypeSelectorCellEditor extends TextCellEditor { public void proposalAccepted(IContentProposal proposal) { // set the corresponding type if( proposal instanceof TypeContentProposalBase ) { - TypeContentProposalBase typeProposal = (TypeContentProposalBase)proposal; -// setType(typeProposal.getType()); } } diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/handler/UpdateProfileHandler.java b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/handler/UpdateProfileHandler.java index aeb3b0686c8..df402e564e2 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/handler/UpdateProfileHandler.java +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/handler/UpdateProfileHandler.java @@ -51,9 +51,6 @@ public class UpdateProfileHandler extends AbstractProfileBaseHandler { private List<NamedElement> cachedSelectionAsNamedElement; - private String stereotypeNameInput; - private String profileNameInput; - /** * Object used to hold the update values. */ @@ -97,12 +94,6 @@ public class UpdateProfileHandler extends AbstractProfileBaseHandler { // Check if an element is selected. List<NamedElement> selected = getSelectionAsNamedElements(context); - -// System.err.println("Add Profile called. Selected elements:"); -// for( NamedElement ele : selected) { -// System.err.println(ele.getName()); -// } -// System.err.println("********************"); if( selected.isEmpty()) { // Stop if no NamedElement is selected @@ -111,21 +102,14 @@ public class UpdateProfileHandler extends AbstractProfileBaseHandler { // Open the dialog to ask the new name // TODO dialog should not be in the transaction !! put it outside ! -// String inputName = null; - // PRofileDialog + // ProfileDialog StereotypeUpdateDialog newDialog = new StereotypeUpdateDialog(Display.getCurrent().getActiveShell(), "Update Stereotype", selected.get(0), new ArrayList<Class>( getSelectedElementMetaclasses(context)) ); if(newDialog.open() == Window.OK) { // Lookup commands stereoptypeModel = newDialog.getStereotypeModel(); -// CommandBuilderVisitor commandBuilderVisitor = new CommandBuilderVisitor(); -// stereoptypeModel.accept(commandBuilderVisitor); -// if( ! commandBuilderVisitor.isExecutionRequested() ) { -// return false; -// } - // old fashion updateArgs = newDialog.getUpdateArgs(); @@ -137,10 +121,6 @@ public class UpdateProfileHandler extends AbstractProfileBaseHandler { return false; } - stereotypeNameInput = updateArgs.getStereotypeName(); - profileNameInput = updateArgs.getProfileName(); - - return true; } @@ -182,22 +162,11 @@ public class UpdateProfileHandler extends AbstractProfileBaseHandler { @Override protected void doExecute(ExecutionEvent event, IEvaluationContext context) { -// System.err.println("Add Profile called. Selected elements:"); List<NamedElement> selected = getSelectionAsNamedElements(context); -// for( NamedElement ele : selected) { -// System.err.println(ele.getName()); -// } -// System.err.println("********************"); -// -// if( selected.isEmpty()) { -// return; -// } // Try to apply the stereotype ProfileApplicator profileApplicator = new ProfileApplicator(selected.get(0)); try { -// profileApplicator.applyStereotype2(profileNameInput, stereotypeNameInput); -// profileApplicator.updateStereotype(updateArgs); profileApplicator.updateStereotype(stereoptypeModel); } catch (DraftProfileException e) { e.printStackTrace(); @@ -213,8 +182,6 @@ public class UpdateProfileHandler extends AbstractProfileBaseHandler { protected void resetCachedValues() { super.resetCachedValues(); cachedSelectionAsNamedElement = null; - stereotypeNameInput = null; - profileNameInput = null; } /** diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src/org/eclipse/papyrus/uml/textedit/state/xtext/validation/UmlStateJavaValidator.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src/org/eclipse/papyrus/uml/textedit/state/xtext/validation/UmlStateJavaValidator.java index 9d0b457892d..f30404d8671 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src/org/eclipse/papyrus/uml/textedit/state/xtext/validation/UmlStateJavaValidator.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src/org/eclipse/papyrus/uml/textedit/state/xtext/validation/UmlStateJavaValidator.java @@ -19,7 +19,6 @@ import java.util.List; import org.eclipse.emf.ecore.EObject; import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesUtils; -import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization; import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.BehaviorKind; import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.DoRule; import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.EntryRule; diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/plugin.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/plugin.xml index 5e17171b317..6c80b783e67 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/plugin.xml +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/plugin.xml @@ -344,7 +344,7 @@ point="org.eclipse.papyrus.extensionpoints.editors.DirectEditor"> <DirectEditor contributor="CEA LIST" - icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValueSpecification.gif" + icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValueSpecificationAction.gif" language="Advanced Value Specification Textual Editor" objectToEdit="org.eclipse.uml2.uml.ValueSpecification"> <popupeditor @@ -357,7 +357,7 @@ <DirectEditor additionalConstraint="org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.constraint.MultiplicityLowerValueDirectEditorConstraint" contributor="CEA LIST" - icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValueSpecification.gif" + icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValueSpecificationAction.gif" language="Advanced Value Specification Textual Editor" objectToEdit="org.eclipse.uml2.uml.ValueSpecification"> <popupeditor @@ -370,7 +370,7 @@ <DirectEditor additionalConstraint="org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.constraint.MultiplicityUpperValueDirectEditorConstraint" contributor="CEA LIST" - icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValueSpecification.gif" + icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValueSpecificationAction.gif" language="Advanced Value Specification Textual Editor" objectToEdit="org.eclipse.uml2.uml.ValueSpecification"> <popupeditor diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestStaticFeatureRepresentation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestStaticFeatureRepresentation.java index 6cd665a07f7..13fe8cf18e0 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestStaticFeatureRepresentation.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestStaticFeatureRepresentation.java @@ -28,10 +28,9 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory; import org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx; import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper; -import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater; import org.eclipse.papyrus.commands.ICreationCommand; import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper; +import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater; import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand; import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.CustomUMLDiagramUpdater; import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart; |