mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 11:55:40 +02:00
Code Issues Wiki Activity

fix for problem found with encoding work. dstore file parent not being resolved properly when at the root.

Browse source
This commit is contained in:
David McKnight 2007-04-24 21:00:11 +00:00
parent 05e87c7c55
commit 4a61087b23
1 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFile.java
View file

@ -17,6 +17,7 @@
package org.eclipse.rse.internal.subsystems.files.dstore; package org.eclipse.rse.internal.subsystems.files.dstore;
import org.eclipse.dstore.core.model.DE;
import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataElement;
import org.eclipse.dstore.core.model.DataStore; import org.eclipse.dstore.core.model.DataStore;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
@ -60,11 +61,33 @@ public class DStoreFile extends AbstractRemoteFile implements IRemoteFile
{ {
// parentFile is already null // parentFile is already null
//parentFile = null; //parentFile = null;
DataStore ds = _dstoreHostFile.getDataElement().getDataStore();
DataElement element = ds.createObject(null, IUniversalDataStoreConstants.UNIVERSAL_FOLDER_DESCRIPTOR, "");
element.setAttribute(DE.A_VALUE, pathOnly);
DStoreHostFile hostParent = new DStoreHostFile(element);
parentFile = new DStoreFile((FileServiceSubSystem)ss, _context, (IRemoteFile)null, hostParent);
} }
else if (!(pathOnly.charAt(pathOnly.length()-1)==sep)) else if (!(pathOnly.charAt(pathOnly.length()-1)==sep))
{ {
DataStore ds = _dstoreHostFile.getDataElement().getDataStore(); DataStore ds = _dstoreHostFile.getDataElement().getDataStore();
DataElement element = ds.createObject(null, IUniversalDataStoreConstants.UNIVERSAL_FOLDER_DESCRIPTOR, pathOnly+sep);
int nameSep = pathOnly.lastIndexOf(sep);
String parentName = pathOnly;
String parentPath = pathOnly;
if (nameSep > 0)
{
parentName = pathOnly.substring(nameSep);
parentPath = pathOnly.substring(0, nameSep);
}
else
{
parentName = pathOnly.substring(nameSep);
parentPath = "" + sep;
}
DataElement element = ds.createObject(null, IUniversalDataStoreConstants.UNIVERSAL_FOLDER_DESCRIPTOR, parentName);
element.setAttribute(DE.A_VALUE, parentPath);
DStoreHostFile hostParent = new DStoreHostFile(element); DStoreHostFile hostParent = new DStoreHostFile(element);
parentFile = new DStoreFile((FileServiceSubSystem)ss, _context, (IRemoteFile)null, hostParent); parentFile = new DStoreFile((FileServiceSubSystem)ss, _context, (IRemoteFile)null, hostParent);