Update method accessors and dialog

Author: oshando

swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/data/MethodWrapper.java

@@ -61,10 +61,8 @@ public MethodWrapper(Method method) {
      * @param methodName Name of method
      * @param parameters List of method's parameters
      * @param returnType Method's return type
-     * @param className Method's fully qualified class name
      */
-    public MethodWrapper(String methodName, List<String> parameters, String returnType,
-                         String className) {
+    public MethodWrapper(String methodName, List<String> parameters, String returnType) {
 
         this.method = new Method(methodName, parameters, returnType);
         status = MethodStatus.NONE;
@@ -103,7 +101,7 @@ public String getMethodName(boolean fullyQualifiedName) {
         if (!fullyQualifiedName)
             return trimProperty(method.getClassName() + "." + method.getName());
         else
-            return method.getClassName() + "." + method.getName();
+            return method.getName();
     }
 
     /**
@@ -179,10 +177,8 @@ public ArrayList<String> getCWEList() {
 
         ArrayList<String> cweList = new ArrayList<String>();
 
-        for (Category category : method.getAllCategories()) {
-            if (category.isCwe()) {
+        for (Category category : method.getCwe()) {
                 cweList.add(category.toString());
-            }
         }
 
         return cweList;
@@ -195,12 +191,12 @@ public ArrayList<String> getCWEList() {
      */
     public ArrayList<String> getTypesList(boolean capitalize) {
 
-        ArrayList<String> typesList = new ArrayList<String>();
+        ArrayList<String> typesList = new ArrayList<>();
 
-        for (Category category : method.getAllCategories()) {
-            if (!category.isCwe() && !capitalize) {
+        for (Category category : method.getSrm()) {
+            if (!capitalize) {
                 typesList.add(category.toString());
-            } else if (!category.isCwe())
+            } else
                 typesList.add(Formatter.toTitleCase(category.toString()));
         }
 
@@ -221,12 +217,12 @@ public Set<Category> getCategories() {
      */
     public void setCategories(Set<Category> categories) {
 
-        Set<Category> cweCategories = null;
-        Set<Category> srmCategories = null;
+        Set<Category> cweCategories = new HashSet<>();
+        Set<Category> srmCategories = new HashSet<>();
+
         for(Category category: categories) {
             if (category.isCwe()) {
                 cweCategories.add(category);
-            } else if (category.isNone()) {
             } else {
                 srmCategories.add(category);
             }
@@ -244,16 +240,16 @@ public String getUpdateOperation() {
     }
 
     /**
-     * Returns whether or not the method is a training method
-     * @return Whether or not the method is a training method
+     * Returns whether the method is a training method
+     * @return Whether the method is a training method
      */
     public boolean isTrainingMethod() {
         return isTrainingMethod;
     }
 
     /**
-     * Set whether or not the method is a training method
-     * @param trainingMethod Whether or not the method is a training method
+     * Set whether the method is a training method
+     * @param trainingMethod Whether the method is a training method
      */
     public void setTrainingMethod(boolean trainingMethod) {
         isTrainingMethod = trainingMethod;

swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/dialog/MethodDialog.java

@@ -53,9 +53,10 @@ public class MethodDialog extends DialogWrapper {
 
     /**
      * Initializes dialog to show method properties
-     * @param methods Method data that will be shown in dialog
-     * @param signature Method Signature
-     * @param project Active project
+     *
+     * @param methods    Method data that will be shown in dialog
+     * @param signature  Method Signature
+     * @param project    Active project
      * @param categories List of all possible method categories
      */
     public MethodDialog(HashMap<String, MethodWrapper> methods, String signature, Project project, Set<Category> categories) {
@@ -149,7 +150,7 @@ public void mouseClicked(MouseEvent e) {
                     availableCategories.remove(selectedCategory);
 
                     selectedModel.addElement(selectedCategory);
-                    method.getCategories().add(selectedCategory);
+                    method.getMethod().addCategory(selectedCategory);
                     methodTypes.setText(StringUtils.join(method.getTypesList(true), ", "));
                     methodCwes.setText(StringUtils.join(method.getCWEList(), ", "));
                 }
@@ -167,21 +168,21 @@ public void mouseClicked(MouseEvent e) {
                     JList value = (JList) e.getSource();
                     selectedCategory = (Category) value.getSelectedValue();
 
-                    if (method.getTypesList(false).size() == 1 && !selectedCategory.isCwe()) {
+                    /*if (method.getTypesList(false).size() == 1 && !selectedCategory.isCwe()) {
                         JBPopupFactory.getInstance()
                                 .createHtmlTextBalloonBuilder(resourceBundle.getString("Messages.Error.CategoryNotSelected"), MessageType.ERROR, null)
                                 .createBalloon()
                                 .show(JBPopupFactory.getInstance().guessBestPopupLocation((JComponent) selectedList), Balloon.Position.below);
-                    } else {
+                    } else {*/
 
-                        selectedModel.removeElement(selectedCategory);
-                        method.getCategories().remove(selectedCategory);
-                        methodTypes.setText(StringUtils.join(method.getTypesList(true), ", "));
-                        methodCwes.setText(StringUtils.join(method.getCWEList(), ", "));
+                    selectedModel.removeElement(selectedCategory);
+                    method.getMethod().removeCategory(selectedCategory);
+                    methodTypes.setText(StringUtils.join(method.getTypesList(true), ", "));
+                    methodCwes.setText(StringUtils.join(method.getCWEList(), ", "));
 
-                        availableModel.addElement(selectedCategory);
-                        availableCategories.add(selectedCategory);
-                    }
+                    availableModel.addElement(selectedCategory);
+                    availableCategories.add(selectedCategory);
+                    //   }
                 }
             }
         });
@@ -202,7 +203,8 @@ public void actionPerformed(ActionEvent e) {
 
     /**
      * Loads method details in the dialog
-     * @param signature Method signature
+     *
+     * @param signature  Method signature
      * @param categories List of all possible method categories
      */
     private void updateFields(String signature, Set<Category> categories) {
@@ -224,17 +226,14 @@ private void updateFields(String signature, Set<Category> categories) {
 
         for (Category category : selectedCategories) {
 
-            if (availableCategories.contains(category)) {
-                availableCategories.remove(category);
-            }
+            availableCategories.remove(category);
         }
 
         selectedModel = addCategoriesToModel(selectedCategories, false);
         selectedList.setModel(selectedModel);
 
         availableModel = addCategoriesToModel(availableCategories, false);
         availableList.setModel(availableModel);
-
     }
 
     @Override
@@ -250,6 +249,7 @@ public void doCancelAction() {
 
     /**
      * Deep copy of method categories
+     *
      * @param categories Method categories
      * @return New Set of method categories
      */
@@ -303,7 +303,8 @@ protected void doOKAction() {
 
     /**
      * Shows error message
-     * @param message Message
+     *
+     * @param message  Message
      * @param location Where on screen the message should be shown
      */
     private void showErrorMessage(String message, JComponent location) {
@@ -321,8 +322,9 @@ protected JComponent createCenterPanel() {
 
     /**
      * Add categories to the List model
+     *
      * @param categories Method categories
-     * @param showCwe Condition to show CWEs or not
+     * @param showCwe    Condition to show CWEs or not
      * @return return List Model for List
      */
     private DefaultListModel<Category> addCategoriesToModel(Set<Category> categories, boolean showCwe) {