refactor and bugfix

MagicDraw development.iws

@@ -7,8 +7,6 @@
       <change beforePath="$PROJECT_DIR$/out/production/My Plug-in 1/action/RequirementGenerator.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/My Plug-in 1/action/RequirementGenerator.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/plugins/My Plug-in 1/src/action/BrowserAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/My Plug-in 1/src/action/BrowserAction.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/plugins/My Plug-in 1/src/action/RequirementGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/My Plug-in 1/src/action/RequirementGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/plugins/My Plug-in 1/src/action/model/RequirementComment.java" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/My Plug-in 1/src/action/model/RequirementComment.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/plugins/My Plug-in 1/src/action/model/RequirementSignal.java" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/My Plug-in 1/src/action/model/RequirementSignal.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -100,6 +98,8 @@
     <pin-to-top-manager>
       <pinned-members>
         <PinnedItemInfo parentTag="services.model.Pagination" memberName="itemRefs" />
+        <PinnedItemInfo parentTag="com.nomagic.magicdraw.ui.browser.ClassifierNode" memberName="userObject" />
+        <PinnedItemInfo parentTag="com.nomagic.magicdraw.ui.browser.ClassifierNode" memberName="mDefaultIcon" />
       </pinned-members>
     </pin-to-top-manager>
     <watches-manager>

plugins/My Plug-in 1/src/action/BrowserAction.java

@@ -63,7 +63,7 @@ public class BrowserAction extends DefaultBrowserAction {
 
                 RequirementGenerator generator = new RequirementGenerator();
 
-                generator.detectNonExistingRequirements(existingSignalNodes , requirementSignals);
+                generator.detectNonExistingRequirements(existingSignalNodes , requirementSignals, this.getStatusStr());
 
                 // filter out requirements from codebeamer.
                 filterCodebeamerRequirements(requirementSignals);
@@ -77,7 +77,9 @@ public class BrowserAction extends DefaultBrowserAction {
     // perform delta function for codebeamer and cameo requirements
     void filterCodebeamerRequirements(List<RequirementSignal> requirementSignals) {
         for (int i = 0; i < requirementSignals.size();) {
-            if(this.existingSignalNodes.stream().map(x -> x.getText()).collect(Collectors.toList()).contains(requirementSignals.get(i).name)) {
+            if(
+                    this.existingSignalNodes.stream().map(x -> x.getText()).collect(Collectors.toList()).contains(requirementSignals.get(i).name)
+            ) {
                 requirementSignals.remove(requirementSignals.get(i));
             } else i++;
         }
@@ -91,7 +93,7 @@ public class BrowserAction extends DefaultBrowserAction {
     void generateCustomerRequirements(CodebeamerService service, List<RequirementSignal> requirementSignals) {
         for(int i = 0; i < service.customerRequirements.itemRefs.length; i ++) {
             RequirementSignal signal = new RequirementSignal();
-            signal.name = service.customerRequirements.itemRefs[i].name;
+            signal.name = service.customerRequirements.itemRefs[i].name + " " + this.getStatusStr();
             // just for small purpose
             signal.comment.body = service.customerRequirements.itemRefs[i].type;
             requirementSignals.add(
@@ -104,9 +106,9 @@ public class BrowserAction extends DefaultBrowserAction {
     void generateSystemRequirements(CodebeamerService service, List<RequirementSignal> requirementSignals) {
         for(int i = 0; i < service.systemRequirements.itemRefs.length; i ++) {
             RequirementSignal signal = new RequirementSignal();
-            signal.name = service.systemRequirements.itemRefs[i].name;
+            signal.name = service.systemRequirements.itemRefs[i].name + " " + this.getStatusStr();
             // just for small purpose
-            signal.comment.body = service.systemRequirements.itemRefs[i].type;
+            signal.comment.body = this.getStatusStr() + " " + service.systemRequirements.itemRefs[i].type;
             requirementSignals.add(
                     signal
             );
@@ -141,4 +143,9 @@ public class BrowserAction extends DefaultBrowserAction {
             }
         }
     }
+
+
+    private String getStatusStr() {
+        return  "[" + this.status.name() + "]";
+    }
 }
\ No newline at end of file

plugins/My Plug-in 1/src/action/RequirementGenerator.java

@@ -66,10 +66,13 @@ public class RequirementGenerator {
      * @param nodes requirements from cameo
      * @param codebeamerRequirements - customer/system requirements from Codebeamer.
      */
-    void detectNonExistingRequirements(List<ClassifierNode> nodes, List<RequirementSignal> codebeamerRequirements) {
+    void detectNonExistingRequirements(List<ClassifierNode> nodes, List<RequirementSignal> codebeamerRequirements, String status) {
         this.requirementsToRemove = new ArrayList<>();
         for (int i = 0; i < nodes.size(); i++) {
-            if(!codebeamerRequirements.stream().map(x -> x.name).collect(Collectors.toList()).contains(nodes.get(i).getText())) {
+            if(
+                    !codebeamerRequirements.stream().map(x -> x.name).collect(Collectors.toList()).contains(nodes.get(i).getText())
+            ) {
+                if(nodes.get(i).getText().contains(status))
                     this.requirementsToRemove.add(nodes.get(i));
             }
         }