You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/04/10 08:08:56 UTC
svn commit: r1672556 -
/sling/trunk/contrib/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
Author: cziegeler
Date: Fri Apr 10 06:08:55 2015
New Revision: 1672556
URL: http://svn.apache.org/r1672556
Log:
SLING-4579 : Regression introduced by SLING-4512 : JCR API used in i18n implementation
Modified:
sling/trunk/contrib/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
Modified: sling/trunk/contrib/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java?rev=1672556&r1=1672555&r2=1672556&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java (original)
+++ sling/trunk/contrib/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java Fri Apr 10 06:08:55 2015
@@ -46,8 +46,6 @@ public class JcrResourceBundle extends R
private static final Logger log = LoggerFactory.getLogger(JcrResourceBundle.class);
- static final String RT_MESSAGE_ENTRY = "sling:MessageEntry";
-
static final String MIXIN_MESSAGE = "sling:Message";
static final String PROP_KEY = "sling:key";
@@ -290,26 +288,10 @@ public class JcrResourceBundle extends R
private void scanForSlingMessages(final Resource rsrc, final Map<String, Object> targetDictionary) {
final ValueMap vm = rsrc.adaptTo(ValueMap.class);
if ( vm != null ) {
- // resource type check, as in JCR a mixin might be used, a simple resource type checking
- // does unfortunately not work
- boolean checked = rsrc.isResourceType(RT_MESSAGE_ENTRY);
- if ( !checked ) {
- final String[] mixins = vm.get(PROP_MIXINS, String[].class);
- if ( mixins != null ) {
- for(final String m : mixins) {
- if ( MIXIN_MESSAGE.equals(m) ) {
- checked = true;
- break;
- }
- }
- }
- }
- if ( checked ) {
- final String value = vm.get(PROP_VALUE, String.class);
- if ( value != null ) {
- final String key = vm.get(PROP_KEY, rsrc.getName());
- targetDictionary.put(key, value);
- }
+ final String value = vm.get(PROP_VALUE, String.class);
+ if ( value != null ) {
+ final String key = vm.get(PROP_KEY, rsrc.getName());
+ targetDictionary.put(key, value);
}
}