Author: rombert
Date: Fri Sep 19 11:12:59 2014
New Revision: 1626180
URL: http://svn.apache.org/r1626180
Log:
SLING-3956 - [windows] Serialization files are not taken into account
for folders
Paths returned from serializationManager.getSerializationFilePath are in
OS format, so treat the accordingly.
Modified:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ResourceChangeCommandFactory.java
Modified:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ResourceChangeCommandFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ResourceChangeCommandFactory.java?rev=1626180&r1=1626179&r2=1626180&view=diff
==============================================================================
---
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ResourceChangeCommandFactory.java
(original)
+++
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ResourceChangeCommandFactory.java
Fri Sep 19 11:12:59 2014
@@ -252,7 +252,7 @@ public class ResourceChangeCommandFactor
String resourceLocation = '/' +
changedResource.getFullPath().makeRelativeTo(syncDirectory.getFullPath())
.toPortableString();
- IPath serializationFilePath =
Path.fromPortableString(serializationManager.getSerializationFilePath(
+ IPath serializationFilePath =
Path.fromOSString(serializationManager.getSerializationFilePath(
resourceLocation, serializationKind));
IResource serializationResource =
syncDirectory.findMember(serializationFilePath);
@@ -505,7 +505,7 @@ public class ResourceChangeCommandFactor
// make sure that a 'plain' folder being deleted does not signal that
the content structure
// was rearranged under a covering parent aggregate
if (resource.getType() == IResource.FOLDER) {
- IPath serializationFilePath =
Path.fromPortableString(serializationManager.getSerializationFilePath(
+ IPath serializationFilePath =
Path.fromOSString(serializationManager.getSerializationFilePath(
resourceLocation, SerializationKind.FOLDER));
ResourceProxy coveringParentData =
findSerializationDataFromCoveringParent(resource, syncDirectory,
