CW#534: Remove "border" even if it's before frame/thumb

WPCleaner · Oct 3, 2020 · 84f0db0 · 84f0db0
1 parent 4e38042
commit 84f0db0
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/WikipediaCleaner/src/org/wikipediacleaner/api/check/algorithm/CheckErrorAlgorithm534.java b/WikipediaCleaner/src/org/wikipediacleaner/api/check/algorithm/CheckErrorAlgorithm534.java
@@ -161,7 +161,7 @@ public static AutomaticReplacement suggestReplacement(
       }
 
       // Check that the suggestion can be applied
-      if (replacement.targetMagicWord != null){
+      if (replacement.targetMagicWord != null) {
         String mwName = replacement.targetMagicWord;
         boolean paramFound = false;
         for (Parameter paramTmp : params) {
@@ -603,7 +603,12 @@ public boolean analyze(
               } else
               if (MagicWord.IMG_FRAMED.equals(mwName) ||
                   MagicWord.IMG_THUMBNAIL.equals(mwName)) {
-                paramsFormat.add(param);
+                if (paramsFormat.isEmpty() ||
+                    !MagicWord.IMG_BORDER.equals(paramsFormat.get(paramsFormat.size() - 1).getMagicWord().getName())) {
+                  paramsFormat.add(param);
+                } else {
+                  paramsFormat.add(paramsFormat.size() - 1, param);
+                }
               } else
               // Horizontal alignment option: one of left, right, center, none
               if (MagicWord.IMG_CENTER.equals(mwName) ||