|
21 | 21 | import processing.app.packages.UserLibrary;
|
22 | 22 |
|
23 | 23 | import java.io.*;
|
24 |
| -import java.net.URISyntaxException; |
25 | 24 | import java.util.*;
|
26 | 25 | import java.util.logging.Level;
|
27 | 26 | import java.util.logging.Logger;
|
@@ -635,7 +634,7 @@ static public void initPackages() throws Exception {
|
635 | 634 | loadHardware(getHardwareFolder());
|
636 | 635 | loadContributedHardware(indexer);
|
637 | 636 | loadHardware(getSketchbookHardwareFolder());
|
638 |
| - createToolPreferences(indexer); |
| 637 | + createToolPreferences(indexer.getInstalledTools(), true); |
639 | 638 |
|
640 | 639 | librariesIndexer = new LibrariesIndexer(BaseNoGui.getSettingsFolder(), indexer);
|
641 | 640 | File librariesIndexFile = librariesIndexer.getIndexFile();
|
@@ -826,12 +825,13 @@ static protected void loadContributedHardware(ContributionsIndexer indexer) {
|
826 | 825 | }
|
827 | 826 | }
|
828 | 827 |
|
829 |
| - static private void createToolPreferences(ContributionsIndexer indexer) { |
830 |
| - // Remove previous runtime preferences |
831 |
| - final String prefix = "runtime.tools."; |
832 |
| - PreferencesData.removeAllKeysWithPrefix(prefix); |
| 828 | + public static void createToolPreferences(Collection<ContributedTool> installedTools, boolean removeOldKeys) { |
| 829 | + String prefix = "runtime.tools."; |
| 830 | + if (removeOldKeys) { |
| 831 | + PreferencesData.removeAllKeysWithPrefix(prefix); |
| 832 | + } |
833 | 833 |
|
834 |
| - for (ContributedTool tool : indexer.getInstalledTools()) { |
| 834 | + for (ContributedTool tool : installedTools) { |
835 | 835 | File installedFolder = tool.getDownloadableContribution(getPlatform()).getInstalledFolder();
|
836 | 836 | if (installedFolder != null) {
|
837 | 837 | PreferencesData.set(prefix + tool.getName() + ".path", installedFolder.getAbsolutePath());
|
|
0 commit comments