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

List of contribs to be installed due to import now obtained

Browse Source
This commit is contained in:
Joel Moniz
2015-03-14 20:48:56 +05:30
parent 07a87e8461
commit 5b5a331604
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -23,6 +24,8 @@ import org.eclipse.jdt.core.compiler.IProblem;
import processing.app.*;
import processing.app.Toolkit;
import processing.app.contrib.AvailableContribution;
import processing.app.contrib.Contribution;
import processing.app.contrib.ContributionListing;
import processing.app.contrib.ToolContribution;
import processing.app.syntax.JEditTextArea;
import processing.app.syntax.PdeTextAreaDefaults;
@@ -1869,20 +1872,22 @@ public class JavaEditor extends Editor {
for (String[] importStatement : pieces) {
importHeaders.add(importStatement[2]);
}
ArrayList<String> installLibsHeaders = getUninstalledAvailableLib(importHeaders);
for (String s : installLibsHeaders)
System.out.println(s);
ArrayList<Contribution> installLibsHeaders = getNotInstalledAvailableLibs(importHeaders);
for (Contribution c : installLibsHeaders)
System.out.println(c.getName());
}
}
}
}
/**
* Returns the name of the
* Returns a list of AvailableContributions of those libraries that the user wants imported,
* but that are not installed.
* @param importHeaders
*/
private ArrayList<String> getUninstalledAvailableLib(ArrayList<String> importHeadersList) {
ArrayList<String> libList = new ArrayList<String>();
private ArrayList<Contribution> getNotInstalledAvailableLibs(ArrayList<String> importHeadersList) {
Map<String, Contribution> importMap = ContributionListing.getInstance().librariesByImportHeader;
ArrayList<Contribution> libList = new ArrayList<Contribution>();
for (String importHeaders : importHeadersList) {
int dot = importHeaders.lastIndexOf('.');
String entry = (dot == -1) ? importHeaders : importHeaders.substring(0,
@@ -1896,11 +1901,16 @@ public class JavaEditor extends Editor {
Library library = null;
try {
library = this.getMode().getLibrary(entry);
if (library == null)
libList.add(importHeaders);//System.out.println(importHeaders + "not found");
if (library == null) {
Contribution c = importMap.get(importHeaders);
if (c!=null)
libList.add(c);//System.out.println(importHeaders + "not found");
}
} catch (Exception e) {
// Not gonna happen (hopefully)
libList.add(importHeaders);//System.out.println(importHeaders + "not found");
Contribution c = importMap.get(importHeaders);
if (c!=null)
libList.add(c);//System.out.println(importHeaders + "not found");
}
}
return libList;