Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoracuccuru2011-07-07 06:09:44 -0400
committeracuccuru2011-07-07 06:09:44 -0400
commitd3f33ee90c18512031fe8d8c5adc7ddbe3ab92ed (patch)
treedcfcd7362fadc2bff112643d80742c92f312262f /extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui
parente13902371af40c4e4934a82a7b7b8005145ef658 (diff)
downloadorg.eclipse.papyrus-d3f33ee90c18512031fe8d8c5adc7ddbe3ab92ed.tar.gz
org.eclipse.papyrus-d3f33ee90c18512031fe8d8c5adc7ddbe3ab92ed.tar.xz
org.eclipse.papyrus-d3f33ee90c18512031fe8d8c5adc7ddbe3ab92ed.zip
Merged bug corrections applied on the branch
Diffstat (limited to 'extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui')
-rw-r--r--extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui/.settings/net.sf.jautodoc.prefs2
-rw-r--r--extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui/META-INF/MANIFEST.MF7
-rw-r--r--extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui/plugin.xml9
3 files changed, 6 insertions, 12 deletions
diff --git a/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui/.settings/net.sf.jautodoc.prefs b/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui/.settings/net.sf.jautodoc.prefs
index 06c5cbf6c7b..86c405767e1 100644
--- a/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui/.settings/net.sf.jautodoc.prefs
+++ b/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui/.settings/net.sf.jautodoc.prefs
@@ -1,4 +1,4 @@
-#Tue Apr 26 16:04:19 CEST 2011
+#Thu Jul 07 10:59:07 CEST 2011
add_header=true
eclipse.preferences.version=1
header_text=/*****************************************************************************\r\n * Copyright (c) 2011 CEA LIST.\r\n *\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n * CEA LIST - Initial API and implementation\r\n *\r\n *****************************************************************************/
diff --git a/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui/META-INF/MANIFEST.MF b/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui/META-INF/MANIFEST.MF
index 3a1023e21e2..30247ae307b 100644
--- a/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui/META-INF/MANIFEST.MF
@@ -21,9 +21,12 @@ Require-Bundle: org.eclipse.papyrus.operation.editor.xtext;visibility:=reexport,
org.eclipse.papyrus.properties.runtime;bundle-version="0.8.0",
org.eclipse.xtext.gmf.glue;bundle-version="0.8.0",
org.eclipse.papyrus.alf;bundle-version="0.8.0",
- org.eclipse.papyrus.alf.ui;bundle-version="0.8.0"
+ org.eclipse.papyrus.alf.ui;bundle-version="0.8.0",
+ org.eclipse.papyrus.diagram.common;bundle-version="0.8.0",
+ org.eclipse.papyrus.profile;bundle-version="0.8.0"
Import-Package: org.apache.log4j,
org.apache.commons.logging
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Activator: org.eclipse.papyrus.operation.editor.xtext.ui.internal.OperationActivator
-Export-Package: org.eclipse.papyrus.operation.editor.xtext.ui.contentassist.antlr
+Export-Package: org.eclipse.papyrus.operation.editor.xtext.ui.contentassist.antlr,
+ org.eclipse.papyrus.operation.editor.xtext.ui.internal
diff --git a/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui/plugin.xml b/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui/plugin.xml
index 9c8028a7d37..af19817f366 100644
--- a/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui/plugin.xml
+++ b/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui/plugin.xml
@@ -190,13 +190,4 @@
</popupeditor>
</DirectEditor>
</extension>
- <extension
- point="org.eclipse.papyrus.extensionpoints.editors.DirectEditor">
- <DirectEditor
- contributor="CEA LIST"
- language="ALF"
- objectToEdit="org.eclipse.uml2.uml.Operation">
- </DirectEditor>
- </extension>
-
</plugin>

Back to the top