From ea60dcb9b54e6d7854673f7b55ad29e7d9282b15 Mon Sep 17 00:00:00 2001 From: Vladimir Kononovich Date: Mon, 8 Apr 2019 17:02:19 +0300 Subject: [PATCH] getRawLocation patch #383 --- .../ghidraprojectcreator/utils/GhidraModuleUtils.java | 2 +- .../ghidraprojectcreator/utils/GhidraProjectUtils.java | 2 +- .../wizards/ExportGhidraModuleWizard.java | 4 ++-- .../wizards/pages/ConfigureGradleWizardPage.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/utils/GhidraModuleUtils.java b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/utils/GhidraModuleUtils.java index 395716dd7f..a1d1182469 100644 --- a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/utils/GhidraModuleUtils.java +++ b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/utils/GhidraModuleUtils.java @@ -222,7 +222,7 @@ public class GhidraModuleUtils { } File ghidraInstallDir = ghidraLayout.getApplicationInstallationDir().getFile(false); - File antFile = new File(project.getRawLocation().toFile(), ".antProperties.xml"); // hidden + File antFile = new File(project.getLocation().toFile(), ".antProperties.xml"); // hidden try (PrintWriter writer = new PrintWriter(new FileWriter(antFile))) { writer.println( diff --git a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/utils/GhidraProjectUtils.java b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/utils/GhidraProjectUtils.java index a8cd463549..8bbaf370a1 100644 --- a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/utils/GhidraProjectUtils.java +++ b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/utils/GhidraProjectUtils.java @@ -352,7 +352,7 @@ public class GhidraProjectUtils { IFolder ghidraFolder = javaProject.getProject().getFolder(GhidraProjectUtils.GHIDRA_FOLDER_NAME); IPath oldGhidraInstallPath = ghidraFolder.exists() - ? new Path(ghidraFolder.getRawLocation().toFile().getAbsolutePath()) + ? new Path(ghidraFolder.getLocation().toFile().getAbsolutePath()) : null; // Loop through the project's existing classpath to decide what to keep (things that aren't diff --git a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/wizards/ExportGhidraModuleWizard.java b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/wizards/ExportGhidraModuleWizard.java index cc81659917..0a76f9cfdf 100644 --- a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/wizards/ExportGhidraModuleWizard.java +++ b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/wizards/ExportGhidraModuleWizard.java @@ -111,7 +111,7 @@ public class ExportGhidraModuleWizard extends Wizard implements INewWizard { // Get path to Ghidra installation directory String ghidraInstallDirPath = project.getFolder( - GhidraProjectUtils.GHIDRA_FOLDER_NAME).getRawLocation().toOSString(); + GhidraProjectUtils.GHIDRA_FOLDER_NAME).getLocation().toOSString(); // Get project's java. Gradle should use the same version. // TODO: It's more correct to get this from the project's classpath, since Ghidra's @@ -126,7 +126,7 @@ public class ExportGhidraModuleWizard extends Wizard implements INewWizard { // Setup the Gradle build attributes List tasks = new ArrayList<>(); - String workingDir = project.getRawLocation().toOSString(); + String workingDir = project.getLocation().toOSString(); String gradleDist = gradleDistribution.toString(); String gradleUserHome = ""; String javaHome = javaHomeDir.getAbsolutePath(); diff --git a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/wizards/pages/ConfigureGradleWizardPage.java b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/wizards/pages/ConfigureGradleWizardPage.java index de448f9463..d68bab71a1 100644 --- a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/wizards/pages/ConfigureGradleWizardPage.java +++ b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/wizards/pages/ConfigureGradleWizardPage.java @@ -144,7 +144,7 @@ public class ConfigureGradleWizardPage extends WizardPage { if (visible) { IProject project = projectPage.getGhidraModuleProject().getProject(); IFolder ghidraFolder = project.getFolder(GhidraProjectUtils.GHIDRA_FOLDER_NAME); - File ghidraDir = ghidraFolder.getRawLocation().toFile(); + File ghidraDir = ghidraFolder.getLocation().toFile(); try { GhidraApplicationLayout ghidraLayout = new GhidraApplicationLayout(ghidraDir); ApplicationProperties props = ghidraLayout.getApplicationProperties();