Author: olli
Date: Thu Oct 3 09:47:25 2013
New Revision: 1528772
URL: http://svn.apache.org/r1528772
Log:
SLING-2917 remove unused param PathEntry from method createNode(Node, String,
URL, PathEntry, DefaultContentCreator):Node
Modified:
sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java
Modified:
sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java?rev=1528772&r1=1528771&r2=1528772&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java
(original)
+++
sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java
Thu Oct 3 09:47:25 2013
@@ -358,7 +358,7 @@ public class Loader extends BaseImportLo
if (nodeDescriptor != null) {
node = processedEntries.get(nodeDescriptor);
if (node == null) {
- node = createNode(parent, name, nodeDescriptor,
configuration, contentCreator);
+ node = createNode(parent, name, nodeDescriptor,
contentCreator);
processedEntries.put(nodeDescriptor.toString(), node);
}
} else {
@@ -412,7 +412,7 @@ public class Loader extends BaseImportLo
Node node = null;
if (foundProvider) {
- node = createNode(parent, name, file, configuration,
contentCreator);
+ node = createNode(parent, name, file, contentCreator);
if (node != null) {
log.debug("Created node as {} {}", node.getPath(), name);
processedEntries.put(file.toString(), node);
@@ -437,7 +437,7 @@ public class Loader extends BaseImportLo
if (nodeDescriptor != null && processedEntries.get(nodeDescriptor)
== null) {
try {
contentCreator.setIgnoreOverwriteFlag(true);
- node = createNode(parent, name, nodeDescriptor,
configuration, contentCreator);
+ node = createNode(parent, name, nodeDescriptor,
contentCreator);
processedEntries.put(nodeDescriptor.toString(), node);
} finally {
contentCreator.setIgnoreOverwriteFlag(false);
@@ -455,12 +455,11 @@ public class Loader extends BaseImportLo
* @param parent The parent node
* @param name The name of the new content node
* @param resourceUrl The resource url.
- * @param configuration
* @param contentCreator
* @return
* @throws RepositoryException
*/
- private Node createNode(Node parent, String name, URL resourceUrl,
PathEntry configuration, final DefaultContentCreator contentCreator) throws
RepositoryException {
+ private Node createNode(Node parent, String name, URL resourceUrl, final
DefaultContentCreator contentCreator) throws RepositoryException {
final String resourcePath = resourceUrl.getPath().toLowerCase();
try {
