Author: mduerig
Date: Fri Jul 4 10:34:45 2014
New Revision: 1607830
URL: http://svn.apache.org/r1607830
Log:
OAK-1950: Add GlobalNameMapper(NodeState) constructor
Added the new constructor
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/GlobalNameMapper.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/GlobalNameMapper.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/GlobalNameMapper.java?rev=1607830&r1=1607829&r2=1607830&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/GlobalNameMapper.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/GlobalNameMapper.java
Fri Jul 4 10:34:45 2014
@@ -16,6 +16,17 @@
*/
package org.apache.jackrabbit.oak.namepath;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.oak.api.Type.STRING;
+import static org.apache.jackrabbit.oak.api.Type.STRINGS;
+import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
+import static
org.apache.jackrabbit.oak.plugins.name.NamespaceConstants.NAMESPACES_PATH;
+import static
org.apache.jackrabbit.oak.plugins.name.NamespaceConstants.REP_NSDATA;
+import static
org.apache.jackrabbit.oak.plugins.name.NamespaceConstants.REP_PREFIXES;
+import static
org.apache.jackrabbit.oak.plugins.name.NamespaceConstants.REP_URIS;
+import static org.apache.jackrabbit.oak.plugins.name.Namespaces.encodeUri;
+
import java.util.Collections;
import java.util.Map;
import java.util.Map.Entry;
@@ -27,19 +38,10 @@ import javax.jcr.RepositoryException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.core.ImmutableRoot;
import org.apache.jackrabbit.oak.plugins.tree.ImmutableTree;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.apache.jackrabbit.oak.api.Type.STRING;
-import static org.apache.jackrabbit.oak.api.Type.STRINGS;
-import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
-import static
org.apache.jackrabbit.oak.plugins.name.NamespaceConstants.NAMESPACES_PATH;
-import static
org.apache.jackrabbit.oak.plugins.name.NamespaceConstants.REP_NSDATA;
-import static
org.apache.jackrabbit.oak.plugins.name.NamespaceConstants.REP_PREFIXES;
-import static
org.apache.jackrabbit.oak.plugins.name.NamespaceConstants.REP_URIS;
-import static org.apache.jackrabbit.oak.plugins.name.Namespaces.encodeUri;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
/**
* Name mapper with no local prefix remappings. URI to prefix mappings
@@ -77,6 +79,10 @@ public class GlobalNameMapper implements
this.nsdata = namespaces.getChild(REP_NSDATA);
}
+ public GlobalNameMapper(NodeState root) {
+ this(new ImmutableRoot(root));
+ }
+
public GlobalNameMapper(Map<String, String> mappings) {
NodeBuilder forward = EMPTY_NODE.builder();
NodeBuilder reverse = EMPTY_NODE.builder();