rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-01 12:24:14 +01:00
Code Issues Releases Activity

Rolling back changes that added support for libraries in the user's directory, as it wasn't properly implemented. svn merge -c -589

Browse Source
This commit is contained in:
David A. Mellis 2009-05-30 09:06:19 +00:00
parent 2357f22387
commit 12773c014a
3 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/LibraryManager.java
View File

@ -34,7 +34,7 @@ import javax.swing.*;
*/
public class LibraryManager {
private File coreLibDir, userLibDir;
private File libDir;
private List libraries = new ArrayList();
private Target target;
@ -44,11 +44,9 @@ public class LibraryManager {
public LibraryManager() throws IOException
{
String userDir = System.getProperty("user.dir") + File.separator;
coreLibDir = new File(
libDir = new File(
((!Base.isMacOS()) ? "" : userDir) + "hardware" + File.separator +
"libraries");
userLibDir =
new File(Sketchbook.getSketchbookPath() + File.separator + "libraries");
target = new Target(
System.getProperty("user.dir") + File.separator + "hardware" +
File.separator + "cores",
@ -72,15 +70,9 @@ public class LibraryManager {
}
};
libraries.clear();
File[] userLibs = userLibDir.listFiles(onlyDirs);
if (userLibs != null) {
for(int i = 0; i < userLibs.length; ++i){
libraries.add(new Library(this, userLibs[i]));
}
}
File[] coreLibs = coreLibDir.listFiles(onlyDirs);
for(int i = 0; i < coreLibs.length; ++i){
libraries.add(new Library(this, coreLibs[i]));
File[] libs = libDir.listFiles(onlyDirs);
for(int i = 0; i < libs.length; ++i){
libraries.add(new Library(this, libs[i]));
}
}

1
app/Sketch.java
View File

@ -2238,7 +2238,6 @@ public class Sketch {
public boolean isReadOnly() {
String apath = folder.getAbsolutePath();
if (apath.startsWith(Sketchbook.examplesPath) ||
apath.startsWith(Sketchbook.userLibrariesPath) ||
apath.startsWith(Sketchbook.librariesPath)) {
return true;

11
app/Sketchbook.java
View File

@ -68,9 +68,6 @@ public class Sketchbook {
static File librariesFolder;
static String librariesPath;
static File userLibrariesFolder;
static String userLibrariesPath;
// maps imported packages to their library folder
static Hashtable importToLibraryTable = new Hashtable();
@ -134,14 +131,11 @@ public class Sketchbook {
//System.out.println("resetting sketchbook path");
File sketchbookFolder = Base.getDefaultSketchbookFolder();
//System.out.println("default is " + sketchbookFolder);
sketchbookPath = sketchbookFolder.getAbsolutePath();
Preferences.set("sketchbook.path", sketchbookPath);
Preferences.set("sketchbook.path",
sketchbookFolder.getAbsolutePath());
if (!sketchbookFolder.exists()) sketchbookFolder.mkdirs();
}
userLibrariesFolder = new File(sketchbookPath, "libraries");
userLibrariesPath = userLibrariesFolder.getAbsolutePath();
openMenu = new JMenu("Sketchbook");
popupMenu = new JMenu("Sketchbook");
importMenu = new JMenu("Import Library");
@ -392,7 +386,6 @@ public class Sketchbook {
if (addLibraries(importMenu, examplesFolder)) {
importMenu.addSeparator();
}
addLibraries(importMenu, userLibrariesFolder);
addLibraries(importMenu, librariesFolder);
//System.out.println("libraries cp is now " + librariesClassPath);