Skip to content

Commit 658fbc3

Browse files
author
jantje
committed
#1339 move uninstall to boardsmanager
1 parent c5154a7 commit 658fbc3

File tree

2 files changed

+13
-24
lines changed

2 files changed

+13
-24
lines changed

io.sloeber.core/src/io/sloeber/core/api/BoardsManager.java

+13-1
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,19 @@ public static IStatus updatePlatforms(List<ArduinoPlatformVersion> platformsToIn
331331
}
332332

333333
public static IStatus uninstall(ArduinoPlatformVersion curPlatform, IProgressMonitor monitor) {
334-
return curPlatform.remove(monitor);
334+
if (!curPlatform.isInstalled()) {
335+
return Status.OK_STATUS;
336+
}
337+
338+
File installFolder = curPlatform.getInstallPath().toFile();
339+
try {
340+
FileUtils.deleteDirectory(installFolder);
341+
} catch (IOException e) {
342+
return new Status(IStatus.ERROR, Activator.getId(), "Failed to remove folder" + installFolder.toString(), //$NON-NLS-1$
343+
e);
344+
}
345+
346+
return Status.OK_STATUS;
335347
}
336348

337349
public static TreeMap<String, String> getAllmenus() {

io.sloeber.core/src/io/sloeber/core/api/Json/ArduinoPlatformVersion.java

-23
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,16 @@
1010
import static io.sloeber.core.Gson.GsonConverter.*;
1111

1212
import java.io.File;
13-
import java.io.IOException;
1413
import java.util.ArrayList;
1514
import java.util.Arrays;
1615
import java.util.List;
1716

18-
import org.apache.commons.io.FileUtils;
1917
import org.eclipse.core.runtime.IPath;
20-
import org.eclipse.core.runtime.IProgressMonitor;
21-
import org.eclipse.core.runtime.IStatus;
22-
import org.eclipse.core.runtime.Status;
2318

2419
import com.google.gson.JsonElement;
2520
import com.google.gson.JsonObject;
2621
import com.google.gson.JsonParseException;
2722

28-
import io.sloeber.core.Activator;
2923
import io.sloeber.core.api.VersionNumber;
3024
import io.sloeber.core.common.Const;
3125

@@ -110,23 +104,6 @@ public List<IPath> getIncludePath() {
110104
installPath.append(Const.VARIANTS_FOLDER_NAME + "/{build.variant}")); //$NON-NLS-1$
111105
}
112106

113-
//TODO delete
114-
public IStatus remove(IProgressMonitor monitor) {
115-
// Check if we're installed
116-
if (!isInstalled()) {
117-
return Status.OK_STATUS;
118-
}
119-
120-
try {
121-
FileUtils.deleteDirectory(getInstallPath().toFile());
122-
} catch (IOException e) {
123-
return new Status(IStatus.ERROR, Activator.getId(), "Failed to remove folder" + getInstallPath().toString(), //$NON-NLS-1$
124-
e);
125-
}
126-
127-
return Status.OK_STATUS;
128-
}
129-
130107
@Override
131108
public int hashCode() {
132109
final int prime = 31;

0 commit comments

Comments
 (0)