|
Lines 122-128
Link Here
|
| 122 |
// Retrieve already existing module folder if applicable |
122 |
// Retrieve already existing module folder if applicable |
| 123 |
ModuleFolder mf = (ModuleFolder) getExistingModuleResource(members,newPath); |
123 |
ModuleFolder mf = (ModuleFolder) getExistingModuleResource(members,newPath); |
| 124 |
if (mf == null) { |
124 |
if (mf == null) { |
| 125 |
mf = new ModuleFolder(cc, cc.getName(), newPath); |
125 |
mf = new ModuleFolder(cc, cc.getName(), path); |
| 126 |
ModuleFolder parent = (ModuleFolder) getExistingModuleResource(members, path); |
126 |
ModuleFolder parent = (ModuleFolder) getExistingModuleResource(members, path); |
| 127 |
if (path.isEmpty()) |
127 |
if (path.isEmpty()) |
| 128 |
members.add(mf); |
128 |
members.add(mf); |
|
Lines 246-252
Link Here
|
| 246 |
// Otherwise, if it is a folder, check its children for the existing resource path |
246 |
// Otherwise, if it is a folder, check its children for the existing resource path |
| 247 |
// but only check if the beginning segments are a match |
247 |
// but only check if the beginning segments are a match |
| 248 |
if(moduleResource instanceof IModuleFolder && |
248 |
if(moduleResource instanceof IModuleFolder && |
| 249 |
startsWith(moduleSegments, pathSegments) && |
249 |
startsWith(moduleSegments, pathSegments) && pathSegments.length > moduleSegments.length && |
| 250 |
moduleResource.getName().equals(pathSegments[moduleSegments.length > 0 ? moduleSegments.length : 0])) |
250 |
moduleResource.getName().equals(pathSegments[moduleSegments.length > 0 ? moduleSegments.length : 0])) |
| 251 |
if (((IModuleFolder)moduleResource).members()!=null) |
251 |
if (((IModuleFolder)moduleResource).members()!=null) |
| 252 |
return getExistingModuleResource(Arrays.asList(((IModuleFolder)moduleResource).members()),path); |
252 |
return getExistingModuleResource(Arrays.asList(((IModuleFolder)moduleResource).members()),path); |
