/*
 * See the NOTICE file distributed with this work for additional
 * information regarding copyright ownership.
 *
 * This is free software; you can redistribute it and/or modify it
 * under the terms of the GNU Lesser General Public License as
 * published by the Free Software Foundation; either version 2.1 of
 * the License, or (at your option) any later version.
 *
 * This software is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this software; if not, write to the Free
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */
package com.xpn.xwiki.internal.model.reference;

import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;

import org.xwiki.component.annotation.Component;
import org.xwiki.model.EntityType;
import org.xwiki.model.reference.EntityReference;
import org.xwiki.model.reference.EntityReferenceResolver;
import org.xwiki.model.reference.ObjectReference;
import org.xwiki.model.reference.ObjectReferenceResolver;

/**
 * Specialized version of {@link org.xwiki.model.reference.EntityReferenceResolver} which can be considered a helper
 * component to resolve {@link ObjectReference} objects from Entity Reference (when they miss some parent references or
 * have NULL values). The behavior is the one defined in
 * {@link com.xpn.xwiki.internal.model.reference.CurrentEntityReferenceValueProvider}.
 * 
 * @version $Id$
 * @since 3.3M1
 */
@Component
@Named("current/reference")
@Singleton
public class CurrentReferenceObjectReferenceResolver implements ObjectReferenceResolver<EntityReference>
{
    @Inject
    @Named("current/reference")
    private EntityReferenceResolver<EntityReference> entityReferenceResolver;

    @Override
    public ObjectReference resolve(EntityReference objectReferenceRepresentation, Object... parameters)
    {
        return new ObjectReference(this.entityReferenceResolver.resolve(objectReferenceRepresentation,
            EntityType.OBJECT, parameters));
    }

    @Override
    public ObjectReference resolve(EntityReference objectReferenceRepresentation)
    {
        return new ObjectReference(this.entityReferenceResolver.resolve(objectReferenceRepresentation,
            EntityType.OBJECT));
    }
}

@@ -1907,16 +1907,96 @@
 ence%3E%0A%7B%0A
+    /**%0A     * Used to actually resolve the provided entity references.%0A     */%0A
     @Inj

Fix javadoc