diff options
Diffstat (limited to 'plugins/developer')
5 files changed, 7 insertions, 120 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/Editor.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/Editor.xtend index 760b8b2e38c..590c26f7440 100644 --- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/Editor.xtend +++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/Editor.xtend @@ -481,8 +481,8 @@ def selectionChanged (GenEditorView it)''' «generatedMemberComment» @Override public void selectionChanged(org.eclipse.ui.IWorkbenchPart part, org.eclipse.jface.viewers.ISelection selection) { - if (getSite().getPage().getActiveEditor() instanceof org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor) { - org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor editor = (org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor) getSite().getPage().getActiveEditor(); + if (getSite().getPage().getActiveEditor() instanceof org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor) { + org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor editor = (org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor) getSite().getPage().getActiveEditor(); // If not the active editor, ignore selection changed. if (this.equals(editor.getActiveEditor())) { updateActions(getSelectionActions()); diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/manifest.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/manifest.xtend index 47cf84a0fcd..90283e76a92 100644 --- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/manifest.xtend +++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/manifest.xtend @@ -46,6 +46,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.papyrus.infra.gmfdiag.common, org.eclipse.papyrus.uml.service.types, org.eclipse.papyrus.infra.widgets, + org.eclipse.papyrus.infra.ui, + org.eclipse.papyrus.infra.core.sashwindows.di, «IF printingEnabled» org.eclipse.gmf.runtime.diagram.ui.printing, org.eclipse.gmf.runtime.diagram.ui.printing.render, «ENDIF» diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/xtend-gen/org/eclipse/papyrus/elementtypesconfigurations/developer/generator/ElementTypeRegistryGenerator.java b/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/xtend-gen/org/eclipse/papyrus/elementtypesconfigurations/developer/generator/ElementTypeRegistryGenerator.java deleted file mode 100644 index 585e65a24e8..00000000000 --- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/xtend-gen/org/eclipse/papyrus/elementtypesconfigurations/developer/generator/ElementTypeRegistryGenerator.java +++ /dev/null @@ -1,116 +0,0 @@ -package org.eclipse.papyrus.elementtypesconfigurations.developer.generator; - -import com.google.common.collect.Iterables; -import org.eclipse.emf.common.util.TreeIterator; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration; -import org.eclipse.xtend2.lib.StringConcatenation; -import org.eclipse.xtext.xbase.lib.IteratorExtensions; - -@SuppressWarnings("all") -public class ElementTypeRegistryGenerator { - public static Iterable<EObject> allContentsIterable(final Resource resource) { - TreeIterator<EObject> _allContents = resource.getAllContents(); - return IteratorExtensions.<EObject>toIterable(_allContents); - } - - public static String camelToUnderScore(final String in) { - String regex = "([a-z])([A-Z])"; - String replacement = "$1_$2"; - return in.replaceAll(regex, replacement); - } - - public static String safeName(final String in) { - String result = ElementTypeRegistryGenerator.camelToUnderScore(in); - String _replaceAll = result.replaceAll("[^A-Za-z0-9]", "_"); - result = _replaceAll; - String _replaceAll_1 = result.replaceAll("_{2,}", "_"); - result = _replaceAll_1; - String _upperCase = result.toUpperCase(); - result = _upperCase; - String _replaceAll_2 = result.replaceAll("UML_", ""); - result = _replaceAll_2; - return result; - } - - public static CharSequence generateRegistry(final Resource it, final String outputType) { - StringConcatenation _builder = new StringConcatenation(); - _builder.append("/*****************************************************************************"); - _builder.newLine(); - _builder.append(" "); - _builder.append("* Copyright (c) 2014 CEA LIST."); - _builder.newLine(); - _builder.append(" "); - _builder.append("*"); - _builder.newLine(); - _builder.append(" "); - _builder.append("* All rights reserved. This program and the accompanying materials"); - _builder.newLine(); - _builder.append(" "); - _builder.append("* are made available under the terms of the Eclipse Public License v1.0"); - _builder.newLine(); - _builder.append(" "); - _builder.append("* which accompanies this distribution, and is available at"); - _builder.newLine(); - _builder.append(" "); - _builder.append("* http://www.eclipse.org/legal/epl-v10.html"); - _builder.newLine(); - _builder.append(" "); - _builder.append("*"); - _builder.newLine(); - _builder.append(" "); - _builder.append("* Contributors:"); - _builder.newLine(); - _builder.append(" "); - _builder.append("* \t\tCEA LIST - Initial API and implementation"); - _builder.newLine(); - _builder.append(" "); - _builder.append("*"); - _builder.newLine(); - _builder.append(" "); - _builder.append("*****************************************************************************/"); - _builder.newLine(); - _builder.append("import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;"); - _builder.newLine(); - _builder.append("import org.eclipse.gmf.runtime.emf.type.core.IHintedType;"); - _builder.newLine(); - _builder.newLine(); - _builder.append("public class "); - _builder.append(outputType, ""); - _builder.append(" extends AbstractElementTypeEnumerator {"); - _builder.newLineIfNotEmpty(); - _builder.newLine(); - _builder.append("\t"); - _builder.append("/** Constant for UML nature */"); - _builder.newLine(); - _builder.append("\t"); - _builder.append("public static final String UML_NATURE = \"UML_Nature\";"); - _builder.newLine(); - _builder.append("\t"); - _builder.newLine(); - { - Iterable<EObject> _allContentsIterable = ElementTypeRegistryGenerator.allContentsIterable(it); - Iterable<ElementTypeConfiguration> _filter = Iterables.<ElementTypeConfiguration>filter(_allContentsIterable, ElementTypeConfiguration.class); - for(final ElementTypeConfiguration elementTypeConfiguration : _filter) { - _builder.append("\t"); - _builder.append("public static final IHintedType "); - String _name = elementTypeConfiguration.getName(); - String _safeName = ElementTypeRegistryGenerator.safeName(_name); - String _upperCase = _safeName.toUpperCase(); - _builder.append(_upperCase, "\t"); - _builder.append(" = (IHintedType)getElementType(\""); - String _identifier = elementTypeConfiguration.getIdentifier(); - _builder.append(_identifier, "\t"); - _builder.append("\"); //$NON-NLS-1$"); - _builder.newLineIfNotEmpty(); - _builder.append("\t"); - _builder.newLine(); - } - } - _builder.newLine(); - _builder.append("}"); - _builder.newLine(); - return _builder; - } -} diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF index 50466118b98..5800a5549da 100644 --- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF @@ -19,7 +19,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.emf.ecore.edit;bundle-version="2.9.0",
org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
com.google.guava;bundle-version="11.0.0",
- org.eclipse.uml2.uml.profile.standard;bundle-version="1.0.100"
+ org.eclipse.uml2.uml.profile.standard;bundle-version="1.0.100",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/IDMAbstractHandler.java b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/IDMAbstractHandler.java index 6bbd14fe10d..bd09f994fc3 100644 --- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/IDMAbstractHandler.java +++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/IDMAbstractHandler.java @@ -34,9 +34,9 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;
-import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForHandlers;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
import org.eclipse.ui.ISelectionService;
import org.eclipse.ui.PlatformUI;
import org.eclipse.uml2.uml.Element;
|