eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-04 06:09:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Imported Libraries install successfully

Browse Source
This commit is contained in:
Joel Moniz
2015-03-15 11:59:00 +05:30
parent 5b5a331604
commit cc6a3feaa9
2 changed files with 102 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
java/src/processing/mode/java/JavaEditor.java
View File

@@ -26,6 +26,7 @@ import processing.app.Toolkit;
import processing.app.contrib.AvailableContribution;
import processing.app.contrib.Contribution;
import processing.app.contrib.ContributionListing;
import processing.app.contrib.ContributionManager;
import processing.app.contrib.ToolContribution;
import processing.app.syntax.JEditTextArea;
import processing.app.syntax.PdeTextAreaDefaults;
@@ -1872,9 +1873,11 @@ public class JavaEditor extends Editor {
for (String[] importStatement : pieces) {
importHeaders.add(importStatement[2]);
}
ArrayList<Contribution> installLibsHeaders = getNotInstalledAvailableLibs(importHeaders);
for (Contribution c : installLibsHeaders)
System.out.println(c.getName());
ArrayList<AvailableContribution> installLibsHeaders = getNotInstalledAvailableLibs(importHeaders);
if (!installLibsHeaders.isEmpty()) {
ContributionManager.downloadAndInstallOnImport(base,
installLibsHeaders);
}
}
}
}
@@ -1885,9 +1888,9 @@ public class JavaEditor extends Editor {
* but that are not installed.
* @param importHeaders
*/
private ArrayList<Contribution> getNotInstalledAvailableLibs(ArrayList<String> importHeadersList) {
private ArrayList<AvailableContribution> getNotInstalledAvailableLibs(ArrayList<String> importHeadersList) {
Map<String, Contribution> importMap = ContributionListing.getInstance().librariesByImportHeader;
ArrayList<Contribution> libList = new ArrayList<Contribution>();
ArrayList<AvailableContribution> libList = new ArrayList<AvailableContribution>();
for (String importHeaders : importHeadersList) {
int dot = importHeaders.lastIndexOf('.');
String entry = (dot == -1) ? importHeaders : importHeaders.substring(0,
@@ -1903,14 +1906,14 @@ public class JavaEditor extends Editor {
library = this.getMode().getLibrary(entry);
if (library == null) {
Contribution c = importMap.get(importHeaders);
if (c!=null)
libList.add(c);//System.out.println(importHeaders + "not found");
if (c!=null && c instanceof AvailableContribution)
libList.add((AvailableContribution)c);//System.out.println(importHeaders + "not found");
}
} catch (Exception e) {
// Not gonna happen (hopefully)
Contribution c = importMap.get(importHeaders);
if (c!=null)
libList.add(c);//System.out.println(importHeaders + "not found");
if (c!=null && c instanceof AvailableContribution)
libList.add((AvailableContribution)c);//System.out.println(importHeaders + "not found");
}
}
return libList;