p1.patch
| new/src/com/goldencode/artifacts/ArtifactManager.java 2026-04-16 12:45:44 +0000 | ||
|---|---|---|
| 665 | 665 |
String resolvedProgram = operation.resolve(file); |
| 666 | 666 |
if (resolvedProgram != null) |
| 667 | 667 |
{
|
| 668 |
String newRelativePath = getPathToProjectFolder(file, suffix);
|
|
| 668 |
String newRelativePath = getPathToProjectFolder(resolvedProgram, suffix);
|
|
| 669 | 669 |
Artifact newArtifact = addArtifact(newRelativePath); |
| 670 | 670 |
convertedArtifacts.add(newArtifact); |
| 671 | 671 |
} |
| ... | ... | |
| 702 | 702 |
String resolvedProgram = op.resolve(program); |
| 703 | 703 |
if (resolvedProgram != null) |
| 704 | 704 |
{
|
| 705 |
String absolutePath = absoluteFilename(program);
|
|
| 706 |
Artifact artifact = addArtifact(program, absolutePath);
|
|
| 705 |
String absolutePath = absoluteFilename(resolvedProgram);
|
|
| 706 |
Artifact artifact = addArtifact(resolvedProgram, absolutePath);
|
|
| 707 | 707 |
createdArtifacts.add(artifact); |
| 708 | 708 |
} |
| 709 | 709 |
} |
| new/src/com/goldencode/p2j/convert/ConversionDriver.java 2026-04-16 12:39:42 +0000 | ||
|---|---|---|
| 735 | 735 |
return cfg.getPkg() + "." + javaName; |
| 736 | 736 |
}; |
| 737 | 737 |
|
| 738 |
Set<String> allCvtFiles = new HashSet<>();
|
|
| 738 |
Set<String> allCvtFiles = new TreeSet<>();
|
|
| 739 | 739 |
List<String> relativeNames = ArtifactManager.getArtifactsRelativePath(asts); |
| 740 |
for (String file : relativeNames)
|
|
| 740 |
for (Artifact artifact : asts.getArtifacts())
|
|
| 741 | 741 |
{
|
| 742 |
file = FileOperationsWorker.findFile(file, null);
|
|
| 742 |
String file = artifact.getAbsolutePath();
|
|
| 743 | 743 |
allCvtFiles.add(file); |
| 744 | 744 |
} |
| 745 | 745 |
allCvtFiles.addAll(relativeNames); |
| ... | ... | |
| 853 | 853 |
} |
| 854 | 854 |
} |
| 855 | 855 |
|
| 856 |
Collections.sort(proxyFiles); |
|
| 857 |
|
|
| 856 | 858 |
if (!proxyFiles.isEmpty()) |
| 857 | 859 |
{
|
| 858 | 860 |
ArtifactCollection proxyAsts = |
| new/src/com/goldencode/p2j/convert/GenerateLegacyProxyOpenClient.java 2026-04-16 09:01:05 +0000 | ||
|---|---|---|
| 197 | 197 |
{
|
| 198 | 198 |
Artifact a = proxyIter.next(); |
| 199 | 199 |
String cvtPath = ArtifactManager.getPathToProjectFolder(a, FileExtensions.AST_POSTFIX); |
| 200 |
cvtPath = ArtifactManager.normalizeFilename(cvtPath); |
|
| 200 | 201 |
if (astArtifact.getRelativePath().equals(cvtPath)) |
| 201 | 202 |
{
|
| 202 | 203 |
ok = true; |