[2143] Reduce REC/RPL usage to semantic elements only

Bug: 2143 Change-Id: I4d84a349a1e5ef90c91aff4c88b3809c05adcd06 Signed-off-by: Philippe DUL <philippe.dul@thalesgroup.com>
eclipse-capella · Aug 9, 2018 · 0683715 · 0683715
1 parent d3baa17
commit 0683715
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/common/plugins/org.polarsys.capella.common.re.ui/plugin.xml b/common/plugins/org.polarsys.capella.common.re.ui/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-  Copyright (c) 2006, 2017 THALES GLOBAL SERVICES.
+  Copyright (c) 2006, 2018 THALES GLOBAL SERVICES.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Public License v1.0
   which accompanies this distribution, and is available at
@@ -558,7 +558,7 @@
             isTopLevel="true"
             name="RPL">
          <availableForType
-               class="org.eclipse.emf.ecore.EObject">
+               class="org.polarsys.kitalpha.emde.model.Element">
          </availableForType>
          <targetBrowserId
                id="ReferencingElementBrowser">
@@ -576,7 +576,7 @@
             isTopLevel="true"
             name="REC">
          <availableForType
-               class="org.eclipse.emf.ecore.EObject">
+               class="org.polarsys.kitalpha.emde.model.Element">
          </availableForType>
          <targetBrowserId
                id="ReferencingElementBrowser">
@@ -596,7 +596,7 @@
             isTopLevel="true"
             name="REC Source Element">
          <availableForType
-               class="org.eclipse.emf.ecore.EObject">
+               class="org.polarsys.kitalpha.emde.model.Element">
          </availableForType>
          <targetBrowserId
                id="ReferencedElementBrowser">

diff --git a/...arsys.capella.common.re/src/org/polarsys/capella/common/re/handlers/CreateRecHandler.java b/...arsys.capella.common.re/src/org/polarsys/capella/common/re/handlers/CreateRecHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2016 THALES GLOBAL SERVICES.
+ * Copyright (c) 2006, 2018 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -36,6 +36,13 @@ protected ICommand createCommand(Collection<?> selection, IProgressMonitor progr
   @Override
   public void setEnabled(Object evaluationContext) {
     super.setEnabled(evaluationContext);
-  }
 
+    Collection<?> seleciton =  getInitialSelection(evaluationContext);
+    if (seleciton.isEmpty()) {
+      setBaseEnabled(false);
+      return;
+    }
+    setBaseEnabled(true);
+  }
+
 }
diff --git a/...s.capella.common.re/src/org/polarsys/capella/common/re/handlers/CreateReplicaHandler.java b/...s.capella.common.re/src/org/polarsys/capella/common/re/handlers/CreateReplicaHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2016 THALES GLOBAL SERVICES.
+ * Copyright (c) 2006, 2018 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -36,6 +36,13 @@ protected ICommand createCommand(Collection<?> selection, IProgressMonitor progr
   @Override
   public void setEnabled(Object evaluationContext) {
     super.setEnabled(evaluationContext);
+
+    Collection<?> seleciton =  getInitialSelection(evaluationContext);
+    if (seleciton.isEmpty()) {
+      setBaseEnabled(false);
+      return;
+    }
+    setBaseEnabled(true);
   }
 
 }
diff --git a/...n.transition/src/org/polarsys/capella/core/transition/common/commands/CommandHandler.java b/...n.transition/src/org/polarsys/capella/core/transition/common/commands/CommandHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2016 THALES GLOBAL SERVICES.
+ * Copyright (c) 2006, 2018 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -28,6 +28,7 @@
 import org.polarsys.capella.common.helpers.TransactionHelper;
 import org.polarsys.capella.common.helpers.operations.LongRunningListenersRegistry;
 import org.polarsys.capella.common.mdsofa.common.constant.ICommonConstants;
+import org.polarsys.capella.core.model.handler.command.CapellaResourceHelper;
 
 /**
  *
@@ -52,7 +53,6 @@ public Collection<EObject> getSemanticObjects(Collection<?> elements) {
 
   public EObject resolveSemanticObject(Object object) {
     EObject semantic = null;
-
     if (object != null) {
       if (object instanceof EObject) {
         semantic = (EObject) object;
@@ -63,6 +63,9 @@ public EObject resolveSemanticObject(Object object) {
           semantic = (EObject) adapter;
         }
       }
+      if (!(CapellaResourceHelper.isSemanticElement(semantic))) {
+        return null;
+      }
     }
     return semantic;
   }