From 66276b5ced6057405645b510d15b8f2256a63aeb Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Mon, 4 Aug 2014 14:51:09 +0200 Subject: [PATCH] [New] added StrolchQuery.getSelection() and cleaned up some constants --- .../li/strolch/command/UpdateResourceCollectionCommand.java | 2 +- .../java/li/strolch/service/test/XmlExportServiceTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/li/strolch/command/UpdateResourceCollectionCommand.java b/src/main/java/li/strolch/command/UpdateResourceCollectionCommand.java index 2b6b65d67..b72b599ee 100644 --- a/src/main/java/li/strolch/command/UpdateResourceCollectionCommand.java +++ b/src/main/java/li/strolch/command/UpdateResourceCollectionCommand.java @@ -62,7 +62,7 @@ public class UpdateResourceCollectionCommand extends Command { } ResourceMap resourceMap = tx().getResourceMap(); - for (Resource resource : resources) { + for (Resource resource : this.resources) { if (!resourceMap.hasElement(tx(), resource.getType(), resource.getId())) { String msg = "The Resource {0} can not be updated as it does not exist!"; msg = MessageFormat.format(msg, resource.getLocator()); diff --git a/src/test/java/li/strolch/service/test/XmlExportServiceTest.java b/src/test/java/li/strolch/service/test/XmlExportServiceTest.java index 356fd27d6..43e517e3a 100644 --- a/src/test/java/li/strolch/service/test/XmlExportServiceTest.java +++ b/src/test/java/li/strolch/service/test/XmlExportServiceTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import java.io.File; import java.io.FilenameFilter; -import li.strolch.model.Tags; +import li.strolch.runtime.StrolchConstants; import li.strolch.service.XmlExportModelArgument; import li.strolch.service.XmlExportModelService; import li.strolch.service.XmlImportModelArgument; @@ -92,7 +92,7 @@ public class XmlExportServiceTest { XmlExportModelArgument arg = new XmlExportModelArgument(); arg.modelFileName = "TestExportOnlyResTemplates.xml"; arg.doOrders = false; - arg.resourceTypes.add(Tags.TEMPLATE); + arg.resourceTypes.add(StrolchConstants.TEMPLATE); arg.multiFile = true; ServiceResult result = runtimeMock.getServiceHandler().doService(null, service, arg); RuntimeMock.assertServiceResult(ServiceResultState.SUCCESS, ServiceResult.class, result);