XWIKI-22433: Provide consistency in info / warning / error class usag…

…es in templates * Part E - reverted java changes
xwiki · Oct 15, 2024 · 07dfee6 · 07dfee6
1 parent 6fbafbd
commit 07dfee6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 27 deletions.
diff --git a/...i-platform-security-requiredrights/xwiki-platform-security-requiredrights-default/pom.xml b/...i-platform-security-requiredrights/xwiki-platform-security-requiredrights-default/pom.xml
@@ -76,11 +76,5 @@
       <version>${commons.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.rendering</groupId>
-      <artifactId>xwiki-rendering-macro-message</artifactId>
-      <version>${rendering.version}</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/...org/xwiki/platform/security/requiredrights/internal/display/XObjectDisplayerProvider.java b/...org/xwiki/platform/security/requiredrights/internal/display/XObjectDisplayerProvider.java
@@ -21,31 +21,28 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import javax.inject.Inject;
-import javax.inject.Named;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 
 import org.xwiki.component.annotation.Component;
 import org.xwiki.localization.ContextualLocalizationManager;
+import org.xwiki.localization.Translation;
 import org.xwiki.rendering.block.Block;
 import org.xwiki.rendering.block.CompositeBlock;
 import org.xwiki.rendering.block.FormatBlock;
 import org.xwiki.rendering.block.GroupBlock;
-import org.xwiki.rendering.internal.macro.message.WarningMessageMacro;
 import org.xwiki.rendering.listener.Format;
 
 import com.xpn.xwiki.XWikiContext;
 import com.xpn.xwiki.objects.BaseObject;
 import com.xpn.xwiki.objects.classes.BaseClass;
 import com.xpn.xwiki.objects.classes.PropertyClass;
 import com.xpn.xwiki.objects.classes.TextAreaClass;
-import org.xwiki.rendering.macro.MacroExecutionException;
-import org.xwiki.rendering.macro.box.BoxMacroParameters;
-import org.xwiki.rendering.transformation.MacroTransformationContext;
 
 /**
  * Provider for a displayer for an XObject.
@@ -62,10 +59,6 @@ public class XObjectDisplayerProvider extends AbstractBlockSupplierProvider<Base
 
     @Inject
     private ContextualLocalizationManager contextualLocalizationManager;
-
-    @Inject
-    @Named("warning")
-    private WarningMessageMacro warningMacro;
 
     @Override
     public Supplier<Block> get(BaseObject object, Object... parameters)
@@ -92,27 +85,20 @@ public Supplier<Block> get(BaseObject object, Object... parameters)
             .map(p -> new PropertyDisplay(p.getName(), null, p.getValue().toString(), false))
             .collect(Collectors.toList());
 
-        String removedPropertiesMessage =
-            this.contextualLocalizationManager.getTranslationPlain("core.editors.object.removeDeprecatedProperties.info",xClass.getPrettyName());
+        Translation removedPropertiesMessage =
+            this.contextualLocalizationManager.getTranslation("core.editors.object.removeDeprecatedProperties.info");
         return () -> {
             // Display the properties
             Block propertiesBlock = renderProperties(propertyNamesHintsValues);
             Block result = new CompositeBlock(List.of(propertiesBlock));
 
             // Display deprecated properties
             if (!deprecatedPropertyNamesValues.isEmpty()) {
-                BoxMacroParameters warningParams = new BoxMacroParameters();
-                warningParams.setCssClass("deprecatedProperties");
-                Block deprecatedPropertiesBlock = null;
-                try {
-                    deprecatedPropertiesBlock = new GroupBlock(warningMacro.execute(warningParams, 
-                        removedPropertiesMessage, new MacroTransformationContext()));
-                } catch (MacroExecutionException e) {
-                    throw new RuntimeException(e);
-                }
+                Block deprecatedPropertiesBlock =
+                    new GroupBlock(Map.of(CLASS_ATTRIBUTE, "box warningmessage deprecatedProperties"));
                 if (removedPropertiesMessage != null) {
                     deprecatedPropertiesBlock.addChild(
-                        new FormatBlock(List.of(), Format.BOLD));
+                        new FormatBlock(List.of(removedPropertiesMessage.render(xClass.getPrettyName())), Format.BOLD));
                 }
                 deprecatedPropertiesBlock.addChild(renderProperties(deprecatedPropertyNamesValues));
                 result.addChild(deprecatedPropertiesBlock);