Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/AtlUIPlugin.java36
-rw-r--r--plugins/org.eclipse.m2m.atl.common/model/ATL.ecore2
-rw-r--r--plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OCLPackage.java2
-rw-r--r--plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclModel.java2
4 files changed, 3 insertions, 39 deletions
diff --git a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/AtlUIPlugin.java b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/AtlUIPlugin.java
index 82326d51..dc77682e 100644
--- a/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/AtlUIPlugin.java
+++ b/plugins/org.eclipse.m2m.atl.adt.ui/src/org/eclipse/m2m/atl/adt/ui/AtlUIPlugin.java
@@ -16,17 +16,10 @@ import java.util.HashMap;
import java.util.Map;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import java.util.logging.Level;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IDebugEventSetListener;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.m2m.atl.common.ATLLogger;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.WorkbenchException;
import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -60,35 +53,6 @@ public class AtlUIPlugin extends AbstractUIPlugin {
} catch (MissingResourceException x) {
resourceBundle = null;
}
- addDebugEventListener();
- }
-
- /**
- * Adds a debug event listener
- */
- private void addDebugEventListener() {
- DebugPlugin.getDefault().addDebugEventListener(new IDebugEventSetListener() {
- public void handleDebugEvents(final DebugEvent[] debugEvents) {
- for (DebugEvent debugEvent : debugEvents) {
- if (debugEvent.getKind() == DebugEvent.SUSPEND) {
- switchToDebugPerspective();
- break;
- }
- }
- }
- });
- }
-
- /**
- * Switches to the debugging perspective.
- */
- private void switchToDebugPerspective() {
- try {
- PlatformUI.getWorkbench().showPerspective("org.eclipse.debug.ui.DebugPerspective",
- PlatformUI.getWorkbench().getActiveWorkbenchWindow());
- } catch (WorkbenchException e) {
- ATLLogger.log(Level.SEVERE, e.getMessage(), e);
- }
}
/**
diff --git a/plugins/org.eclipse.m2m.atl.common/model/ATL.ecore b/plugins/org.eclipse.m2m.atl.common/model/ATL.ecore
index 4f1d6f5f..8604f809 100644
--- a/plugins/org.eclipse.m2m.atl.common/model/ATL.ecore
+++ b/plugins/org.eclipse.m2m.atl.common/model/ATL.ecore
@@ -443,7 +443,7 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false"
unique="false" lowerBound="1" eType="#/2/String"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="metamodel" ordered="false"
- lowerBound="1" eType="#/1/OclModel" eOpposite="#/1/OclModel/model"/>
+ eType="#/1/OclModel" eOpposite="#/1/OclModel/model"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="elements" ordered="false"
upperBound="-1" eType="#/1/OclModelElement" eOpposite="#/1/OclModelElement/model"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="model" ordered="false"
diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OCLPackage.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OCLPackage.java
index e2a34761..7652bdc6 100644
--- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OCLPackage.java
+++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OCLPackage.java
@@ -12473,7 +12473,7 @@ public class OCLPackage extends EPackageImpl {
initEClass(oclModelEClass, OclModel.class, "OclModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getOclModel_Name(), thePrimitiveTypesPackage.getString(), "name", null, 1, 1, OclModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
- initEReference(getOclModel_Metamodel(), this.getOclModel(), this.getOclModel_Model(), "metamodel", null, 1, 1, OclModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+ initEReference(getOclModel_Metamodel(), this.getOclModel(), this.getOclModel_Model(), "metamodel", null, 0, 1, OclModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEReference(getOclModel_Elements(), this.getOclModelElement(), this.getOclModelElement_Model(), "elements", null, 0, -1, OclModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEReference(getOclModel_Model(), this.getOclModel(), this.getOclModel_Metamodel(), "model", null, 0, -1, OclModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
diff --git a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclModel.java b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclModel.java
index 5b2496ff..08ad847f 100644
--- a/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclModel.java
+++ b/plugins/org.eclipse.m2m.atl.common/src/org/eclipse/m2m/atl/common/OCL/OclModel.java
@@ -163,7 +163,7 @@ public class OclModel extends LocatedElement {
* @see #setMetamodel(OclModel)
* @see org.eclipse.m2m.atl.common.OCL.OCLPackage#getOclModel_Metamodel()
* @see org.eclipse.m2m.atl.common.OCL.OclModel#getModel
- * @model opposite="model" required="true" ordered="false"
+ * @model opposite="model" ordered="false"
* @generated
*/
public OclModel getMetamodel() {

Back to the top