rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-14 11:29:26 +01:00
Code Issues Releases Activity

MacOSX: Platform cleanup

Browse Source
This commit is contained in:
Federico Fissore 2015-06-08 14:40:23 +02:00
parent ccd7fdc0a3
commit bef09e4d03
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arduino-core/src/processing/app/macosx/Platform.java
View File

@ -127,13 +127,13 @@ public class Platform extends processing.app.Platform {
// Some of these are supposedly constants in com.apple.eio.FileManager, // Some of these are supposedly constants in com.apple.eio.FileManager,
// however they don't seem to link properly from Eclipse. // however they don't seem to link properly from Eclipse.
static final int kDocumentsFolderType = private static final int kDocumentsFolderType =
('d' << 24) | ('o' << 16) | ('c' << 8) | 's'; ('d' << 24) | ('o' << 16) | ('c' << 8) | 's';
//static final int kPreferencesFolderType = //static final int kPreferencesFolderType =
// ('p' << 24) | ('r' << 16) | ('e' << 8) | 'f'; // ('p' << 24) | ('r' << 16) | ('e' << 8) | 'f';
static final int kDomainLibraryFolderType = private static final int kDomainLibraryFolderType =
('d' << 24) | ('l' << 16) | ('i' << 8) | 'b'; ('d' << 24) | ('l' << 16) | ('i' << 8) | 'b';
static final short kUserDomain = -32763; private static final short kUserDomain = -32763;
// apple java extensions documentation // apple java extensions documentation
@ -150,12 +150,12 @@ public class Platform extends processing.app.Platform {
// /Versions/Current/Frameworks/CarbonCore.framework/Headers/ // /Versions/Current/Frameworks/CarbonCore.framework/Headers/
protected String getLibraryFolder() throws FileNotFoundException { private String getLibraryFolder() throws FileNotFoundException {
return FileManager.findFolder(kUserDomain, kDomainLibraryFolderType); return FileManager.findFolder(kUserDomain, kDomainLibraryFolderType);
} }
protected String getDocumentsFolder() throws FileNotFoundException { private String getDocumentsFolder() throws FileNotFoundException {
return FileManager.findFolder(kUserDomain, kDocumentsFolderType); return FileManager.findFolder(kUserDomain, kDocumentsFolderType);
} }
@ -168,7 +168,7 @@ public class Platform extends processing.app.Platform {
public Map<String, Object> resolveDeviceAttachedTo(String serial, Map<String, TargetPackage> packages, String devicesListOutput) { public Map<String, Object> resolveDeviceAttachedTo(String serial, Map<String, TargetPackage> packages, String devicesListOutput) {
assert packages != null; assert packages != null;
if (devicesListOutput == null) { if (devicesListOutput == null) {
return super.resolveDeviceAttachedTo(serial, packages, devicesListOutput); return super.resolveDeviceAttachedTo(serial, packages, null);
} }
try { try {