From 74dea286a773d989581999bf5376140d57606346 Mon Sep 17 00:00:00 2001 From: Federico Fissore Date: Wed, 29 Apr 2015 09:10:26 +0200 Subject: [PATCH] MacOSX: double click on a .ino file works again. Fixes #2888 --- app/lib/apple.jar | Bin 11719 -> 25467 bytes app/src/processing/app/Base.java | 405 +++++++++--------- .../processing/app/macosx/ThinkDifferent.java | 160 +++---- build/build.xml | 2 +- 4 files changed, 284 insertions(+), 283 deletions(-) diff --git a/app/lib/apple.jar b/app/lib/apple.jar index d1aa7851db46760b274f0bbe99ed4773e4315750..6659a81c69fc189cf966dd79f5824b486c9c0281 100644 GIT binary patch delta 16840 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 bn+~4yV6U|@(e&i?y9@28pM delta 4264 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 editors = Collections.synchronizedList(new ArrayList()); Editor activeEditor; @@ -119,6 +121,10 @@ public class Base { splashScreenHelper.splashText(_("Loading configuration...")); + if (OSUtils.isMacOS()) { + ThinkDifferent.init(); + } + try { guardedMain(args); } catch (Throwable e) { @@ -126,12 +132,12 @@ public class Base { System.exit(255); } } - + static public void guardedMain(String args[]) throws Exception { Runtime.getRuntime().addShutdownHook(new Thread(DeleteFilesOnShutdown.INSTANCE)); BaseNoGui.initLogger(); - + BaseNoGui.notifier = new GUIUserNotifier(); initPlatform(); @@ -207,7 +213,7 @@ public class Base { untitledFolder = createTempFolder("untitled"); DeleteFilesOnShutdown.add(untitledFolder); - new Base(args); + INSTANCE = new Base(args); } @@ -231,9 +237,9 @@ public class Base { Class.forName("com.sun.jdi.VirtualMachine"); } catch (ClassNotFoundException cnfe) { showError(_("Please install JDK 1.5 or later"), - _("Arduino requires a full JDK (not just a JRE)\n" + - "to run. Please install JDK 1.5 or later.\n" + - "More information can be found in the reference."), cnfe); + _("Arduino requires a full JDK (not just a JRE)\n" + + "to run. Please install JDK 1.5 or later.\n" + + "More information can be found in the reference."), cnfe); } } @@ -247,8 +253,6 @@ public class Base { public Base(String[] args) throws Exception { getPlatform().init(); - if (OSUtils.isMacOS()) - ThinkDifferent.init(this); String sketchbookPath = BaseNoGui.getSketchbookPath(); @@ -268,13 +272,13 @@ public class Base { BaseNoGui.initPackages(); splashScreenHelper.splashText(_("Preparing boards...")); rebuildBoardsMenu(); - + // Setup board-dependent variables. onBoardOrPortChange(); CommandlineParser parser = CommandlineParser.newCommandlineParser(args); - for (String path: parser.getFilenames()) { + for (String path : parser.getFilenames()) { // Correctly resolve relative paths File file = absoluteFile(path); @@ -312,6 +316,7 @@ public class Base { ContributionsIndexer indexer = new ContributionsIndexer(BaseNoGui.getSettingsFolder()); ContributionInstaller installer = new ContributionInstaller(indexer) { private String lastStatus = ""; + @Override protected void onProgress(Progress progress) { if (!lastStatus.equals(progress.getStatus())) { @@ -357,6 +362,7 @@ public class Base { LibrariesIndexer indexer = new LibrariesIndexer(BaseNoGui.getSettingsFolder()); LibraryInstaller installer = new LibraryInstaller(indexer) { private String lastStatus = ""; + @Override protected void onProgress(Progress progress) { if (!lastStatus.equals(progress.getStatus())) { @@ -374,7 +380,7 @@ public class Base { for (String library : parser.getLibraryToInstall().split(",")) { String[] libraryToInstallParts = library.split(":"); - ContributedLibrary selected=null; + ContributedLibrary selected = null; if (libraryToInstallParts.length == 2) { selected = indexer.getIndex().find(libraryToInstallParts[0], VersionHelper.valueOf(libraryToInstallParts[1]).toString()); } else if (libraryToInstallParts.length == 1) { @@ -400,63 +406,60 @@ public class Base { System.exit(0); } else if (parser.isVerifyOrUploadMode()) { - splashScreenHelper.close(); - // Set verbosity for command line build - Preferences.set("build.verbose", "" + parser.isDoVerboseBuild()); - Preferences.set("upload.verbose", "" + parser.isDoVerboseUpload()); - Preferences.set("runtime.preserve.temp.files", Boolean.toString(parser.isPreserveTempFiles())); + splashScreenHelper.close(); + // Set verbosity for command line build + Preferences.set("build.verbose", "" + parser.isDoVerboseBuild()); + Preferences.set("upload.verbose", "" + parser.isDoVerboseUpload()); + Preferences.set("runtime.preserve.temp.files", Boolean.toString(parser.isPreserveTempFiles())); - // Make sure these verbosity preferences are only for the - // current session - Preferences.setDoSave(false); + // Make sure these verbosity preferences are only for the + // current session + Preferences.setDoSave(false); - Editor editor = editors.get(0); + Editor editor = editors.get(0); - if (parser.isUploadMode()) { - splashScreenHelper.splashText(_("Verifying and uploading...")); - editor.exportHandler.run(); - } else { - splashScreenHelper.splashText(_("Verifying...")); - editor.runHandler.run(); - } + if (parser.isUploadMode()) { + splashScreenHelper.splashText(_("Verifying and uploading...")); + editor.exportHandler.run(); + } else { + splashScreenHelper.splashText(_("Verifying...")); + editor.runHandler.run(); + } - // Error during build or upload - int res = editor.status.mode; - if (res == EditorStatus.ERR) - System.exit(1); + // Error during build or upload + int res = editor.status.mode; + if (res == EditorStatus.ERR) + System.exit(1); - // No errors exit gracefully + // No errors exit gracefully + System.exit(0); + } else if (parser.isGuiMode()) { + splashScreenHelper.splashText(_("Starting...")); + + // Check if there were previously opened sketches to be restored + restoreSketches(); + + // Create a new empty window (will be replaced with any files to be opened) + if (editors.isEmpty()) { + handleNew(); + } + + // Check for updates + if (Preferences.getBoolean("update.check")) { + new UpdateCheck(this); + } + } else if (parser.isNoOpMode()) { + // Do nothing (intended for only changing preferences) + System.exit(0); + } else if (parser.isGetPrefMode()) { + String value = Preferences.get(parser.getGetPref(), null); + if (value != null) { + System.out.println(value); System.exit(0); + } else { + System.exit(4); } - else if (parser.isGuiMode()) { - splashScreenHelper.splashText(_("Starting...")); - - // Check if there were previously opened sketches to be restored - restoreSketches(); - - // Create a new empty window (will be replaced with any files to be opened) - if (editors.isEmpty()) { - handleNew(); - } - - // Check for updates - if (Preferences.getBoolean("update.check")) { - new UpdateCheck(this); - } - } - else if (parser.isNoOpMode()) { - // Do nothing (intended for only changing preferences) - System.exit(0); - } - else if (parser.isGetPrefMode()) { - String value = Preferences.get(parser.getGetPref(), null); - if (value != null) { - System.out.println(value); - System.exit(0); - } else { - System.exit(4); - } - } + } } /** @@ -464,7 +467,8 @@ public class Base { * sketch that was used (if any), and restores other Editor settings. * The complement to "storePreferences", this is called when the * application is first launched. - * @throws Exception + * + * @throws Exception */ protected boolean restoreSketches() throws Exception { // figure out window placement @@ -544,7 +548,7 @@ public class Base { // In case of a crash, save untitled sketches if they contain changes. // (Added this for release 0158, may not be a good idea.) if (path.startsWith(untitledPath) && - !editor.getSketch().isModified()) { + !editor.getSketch().isModified()) { continue; } if (BaseNoGui.getPortableFolder() != null) { @@ -570,8 +574,7 @@ public class Base { String untitledPath = untitledFolder.getAbsolutePath(); if (path.startsWith(untitledPath)) { path = ""; - } else - if (BaseNoGui.getPortableFolder() != null) { + } else if (BaseNoGui.getPortableFolder() != null) { path = FileUtils.relativePath(BaseNoGui.getPortableFolder().toString(), path); if (path == null) path = ""; @@ -621,10 +624,10 @@ public class Base { if (activeEditor == null) { Rectangle screen = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDefaultConfiguration().getBounds(); // If no current active editor, use default placement - return new int[] { - (screen.width - defaultWidth) / 2, - (screen.height - defaultHeight) / 2, - defaultWidth, defaultHeight, 0 + return new int[]{ + (screen.width - defaultWidth) / 2, + (screen.height - defaultHeight) / 2, + defaultWidth, defaultHeight, 0 }; } else { @@ -643,14 +646,14 @@ public class Base { location[1] += OVER; if (location[0] == OVER || - location[2] == OVER || - location[0] + location[2] > screen.width || - location[1] + location[3] > screen.height) { + location[2] == OVER || + location[0] + location[2] > screen.width || + location[1] + location[3] > screen.height) { // Warp the next window to a randomish location on screen. - return new int[] { - (int) (Math.random() * (screen.width - defaultWidth)), - (int) (Math.random() * (screen.height - defaultHeight)), - defaultWidth, defaultHeight, 0 + return new int[]{ + (int) (Math.random() * (screen.width - defaultWidth)), + (int) (Math.random() * (screen.height - defaultHeight)), + defaultWidth, defaultHeight, 0 }; } @@ -665,14 +668,15 @@ public class Base { boolean breakTime = false; String[] months = { - "jan", "feb", "mar", "apr", "may", "jun", - "jul", "aug", "sep", "oct", "nov", "dec" + "jan", "feb", "mar", "apr", "may", "jun", + "jul", "aug", "sep", "oct", "nov", "dec" }; /** * Handle creating a sketch folder, return its base .pde file * or null if the operation was canceled. - * @param shift whether shift is pressed, which will invert prompt setting + * + * @param shift whether shift is pressed, which will invert prompt setting * @param noPrompt disable prompt, no matter the setting */ protected File createNewUntitled() throws IOException { @@ -698,12 +702,12 @@ public class Base { // In 0159, avoid running past z by sending people outdoors. if (!breakTime) { showWarning(_("Time for a Break"), - _("You've reached the limit for auto naming of new sketches\n" + - "for the day. How about going for a walk instead?"), null); + _("You've reached the limit for auto naming of new sketches\n" + + "for the day. How about going for a walk instead?"), null); breakTime = true; } else { showWarning(_("Sunshine"), - _("No really, time for some fresh air for you."), null); + _("No really, time for some fresh air for you."), null); } return null; } @@ -728,7 +732,8 @@ public class Base { /** * Create a new untitled document in a new sketch window. - * @throws Exception + * + * @throws Exception */ public void handleNew() throws Exception { try { @@ -779,9 +784,11 @@ public class Base { /** * Open a sketch, replacing the sketch in the current window. + * * @param path Location of the primary pde file for the sketch. */ public void handleOpenReplace(File file) { + System.out.println("handleOpenReplace"); if (!activeEditor.checkModified()) { return; // sketch was modified, and user canceled } @@ -798,7 +805,8 @@ public class Base { /** * Prompt for a sketch to open, and open it in a new window. - * @throws Exception + * + * @throws Exception */ public void handleOpenPrompt() throws Exception { // get the frontmost window frame for placing file dialog @@ -834,10 +842,11 @@ public class Base { /** * Open a sketch in a new window. + * * @param file File to open * @return the Editor object, so that properties (like 'untitled') - * can be set by the caller - * @throws Exception + * can be set by the caller + * @throws Exception */ public Editor handleOpen(File file) throws Exception { return handleOpen(file, nextEditorLocation(), true); @@ -923,6 +932,7 @@ public class Base { /** * Close a sketch as specified by its editor window. + * * @param editor Editor object of the sketch to be closed. * @return true if succeeded in closing, false if canceled. */ @@ -942,26 +952,26 @@ public class Base { // if (Preferences.getBoolean("sketchbook.closing_last_window_quits") || // (editor.untitled && !editor.getSketch().isModified())) { if (OSUtils.isMacOS()) { - Object[] options = { "OK", "Cancel" }; + Object[] options = {"OK", "Cancel"}; String prompt = - _(" " + - " " + - "Are you sure you want to Quit?" + - "

Closing the last open sketch will quit Arduino."); + _(" " + + " " + + "Are you sure you want to Quit?" + + "

Closing the last open sketch will quit Arduino."); int result = JOptionPane.showOptionDialog(editor, - prompt, - _("Quit"), - JOptionPane.YES_NO_OPTION, - JOptionPane.QUESTION_MESSAGE, - null, - options, - options[0]); + prompt, + _("Quit"), + JOptionPane.YES_NO_OPTION, + JOptionPane.QUESTION_MESSAGE, + null, + options, + options[0]); if (result == JOptionPane.NO_OPTION || - result == JOptionPane.CLOSED_OPTION) { + result == JOptionPane.CLOSED_OPTION) { return false; } } @@ -1004,9 +1014,11 @@ public class Base { /** * Handler for File → Quit. + * * @return false if canceled, true otherwise. */ public boolean handleQuit() { + System.out.println("handleQuit"); // If quit is canceled, this will be replaced anyway // by a later handleQuit() that is not canceled. storeSketches(); @@ -1037,6 +1049,7 @@ public class Base { /** * Attempt to close each open sketch in preparation for quitting. + * * @return false if canceled along the way */ protected boolean handleQuitEach() { @@ -1084,14 +1097,14 @@ public class Base { // Add the single "Open" item item = Editor.newJMenuItem(_("Open..."), 'O'); item.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - try { - handleOpenPrompt(); - } catch (Exception e1) { - e1.printStackTrace(); - } + public void actionPerformed(ActionEvent e) { + try { + handleOpenPrompt(); + } catch (Exception e1) { + e1.printStackTrace(); } - }); + } + }); menu.add(item); menu.addSeparator(); @@ -1117,7 +1130,7 @@ public class Base { //System.out.println("rebuilding sketchbook menu"); //new Exception().printStackTrace(); try { - menu.removeAll(); + menu.removeAll(); addSketches(menu, getSketchbookFolder(), false); //addSketches(menu, getSketchbookFolder()); } catch (IOException e) { @@ -1165,7 +1178,7 @@ public class Base { // Split between user supplied libraries and IDE libraries TargetPlatform targetPlatform = getTargetPlatform(); - + if (targetPlatform != null) { LibraryList ideLibs = getIDELibs(); LibraryList userLibs = getUserLibs(); @@ -1215,7 +1228,7 @@ public class Base { addSketchesSubmenu(menu, lib, false); LibraryList userLibs = getUserLibs(); - if (userLibs.size()>0) { + if (userLibs.size() > 0) { menu.addSeparator(); userLibs.sort(); for (UserLibrary lib : userLibs) @@ -1249,7 +1262,7 @@ public class Base { managerUI.setIndexer(BaseNoGui.librariesIndexer); managerUI.setVisible(true); // Manager dialog is modal, waits here until closed - + //handleAddLibrary(); onBoardOrPortChange(); rebuildImportMenu(Editor.importMenu); @@ -1302,7 +1315,7 @@ public class Base { // If there are no platforms installed we are done if (BaseNoGui.packages.size() == 0) return; - + // Separate "Install boards..." command from installed boards boardMenu.add(new JSeparator()); @@ -1346,8 +1359,8 @@ public class Base { // Cycle through all boards of this platform for (TargetBoard board : targetPlatform.getBoards().values()) { JMenuItem item = createBoardMenusAndCustomMenus(boardsCustomMenus, menuItemsToClickAfterStartup, - buttonGroupsMap, - board, targetPlatform, targetPackage); + buttonGroupsMap, + board, targetPlatform, targetPackage); boardMenu.add(item); boardsButtonGroup.add(item); } @@ -1368,7 +1381,7 @@ public class Base { final List boardsCustomMenus, List menuItemsToClickAfterStartup, Map buttonGroupsMap, TargetBoard board, TargetPlatform targetPlatform, TargetPackage targetPackage) - throws Exception { + throws Exception { String selPackage = Preferences.get("target_package"); String selPlatform = Preferences.get("target_platform"); String selBoard = Preferences.get("board"); @@ -1376,13 +1389,13 @@ public class Base { String boardId = board.getId(); String packageName = targetPackage.getId(); String platformName = targetPlatform.getId(); - + // Setup a menu item for the current board @SuppressWarnings("serial") Action action = new AbstractAction(board.getName()) { public void actionPerformed(ActionEvent actionevent) { - selectBoard((TargetBoard)getValue("b")); - filterVisibilityOfSubsequentBoardMenus(boardsCustomMenus, (TargetBoard)getValue("b"), 1); + selectBoard((TargetBoard) getValue("b")); + filterVisibilityOfSubsequentBoardMenus(boardsCustomMenus, (TargetBoard) getValue("b"), 1); onBoardOrPortChange(); rebuildImportMenu(Editor.importMenu); @@ -1394,7 +1407,7 @@ public class Base { JRadioButtonMenuItem item = new JRadioButtonMenuItem(action); if (selBoard.equals(boardId) && selPackage.equals(packageName) - && selPlatform.equals(platformName)) { + && selPlatform.equals(platformName)) { menuItemsToClickAfterStartup.add(item); } @@ -1402,14 +1415,14 @@ public class Base { for (final String menuId : customMenus.keySet()) { String title = customMenus.get(menuId); JMenu menu = getBoardCustomMenu(_(title)); - + if (board.hasMenu(menuId)) { PreferencesMap boardCustomMenu = board.getMenuLabels(menuId); for (String customMenuOption : boardCustomMenu.keySet()) { @SuppressWarnings("serial") Action subAction = new AbstractAction(_(boardCustomMenu.get(customMenuOption))) { public void actionPerformed(ActionEvent e) { - Preferences.set("custom_" + menuId, ((TargetBoard)getValue("board")).getId() + "_" + getValue("custom_menu_option")); + Preferences.set("custom_" + menuId, ((TargetBoard) getValue("board")).getId() + "_" + getValue("custom_menu_option")); onBoardOrPortChange(); } }; @@ -1431,7 +1444,7 @@ public class Base { } } } - + return item; } @@ -1523,7 +1536,7 @@ public class Base { @SuppressWarnings("serial") AbstractAction action = new AbstractAction(targetPlatform - .getProgrammer(programmer).get("name")) { + .getProgrammer(programmer).get("name")) { public void actionPerformed(ActionEvent actionevent) { Preferences.set("programmer", "" + getValue("id")); } @@ -1582,13 +1595,13 @@ public class Base { private boolean addSketchesSubmenu(JMenu menu, UserLibrary lib, boolean replaceExisting) - throws IOException { + throws IOException { return addSketchesSubmenu(menu, lib.getName(), lib.getInstalledFolder(), - replaceExisting); + replaceExisting); } private boolean addSketchesSubmenu(JMenu menu, String name, File folder, - final boolean replaceExisting) throws IOException { + final boolean replaceExisting) throws IOException { ActionListener listener = new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -1610,7 +1623,7 @@ public class Base { } } else { showWarning(_("Sketch Does Not Exist"), - _("The selected sketch no longer exists.\n" + _("The selected sketch no longer exists.\n" + "You may need to restart Arduino to update\n" + "the sketchbook menu."), null); } @@ -1627,13 +1640,13 @@ public class Base { if (!BaseNoGui.isSanitaryName(name)) { if (!builtOnce) { String complaining = I18n - .format( - _("The sketch \"{0}\" cannot be used.\n" - + "Sketch names must contain only basic letters and numbers\n" - + "(ASCII-only with no spaces, " - + "and it cannot start with a number).\n" - + "To get rid of this message, remove the sketch from\n" - + "{1}"), name, entry.getAbsolutePath()); + .format( + _("The sketch \"{0}\" cannot be used.\n" + + "Sketch names must contain only basic letters and numbers\n" + + "(ASCII-only with no spaces, " + + "and it cannot start with a number).\n" + + "To get rid of this message, remove the sketch from\n" + + "{1}"), name, entry.getAbsolutePath()); showMessage(_("Ignoring sketch with bad name"), complaining); } return false; @@ -1778,8 +1791,6 @@ public class Base { // return PConstants.OTHER; // } // } - - static public Platform getPlatform() { return BaseNoGui.getPlatform(); } @@ -1815,6 +1826,7 @@ public class Base { * Convenience method to get a File object for the specified filename inside * the settings folder. * For now, only used by Preferences to get the preferences.txt file. + * * @param filename A file inside the settings folder. * @return filename wrapped as a File object inside the settings folder */ @@ -1872,7 +1884,7 @@ public class Base { //Get the core libraries static public File getCoreLibraries(String path) { - return getContentFile(path); + return getContentFile(path); } static public String getHardwarePath() { @@ -1973,8 +1985,8 @@ public class Base { if (!result) { showError(_("You forgot your sketchbook"), - _("Arduino cannot run because it could not\n" + - "create a folder to store your sketchbook."), null); + _("Arduino cannot run because it could not\n" + + "create a folder to store your sketchbook."), null); } return sketchbookFolder; @@ -2018,13 +2030,14 @@ public class Base { } catch (Exception e) { showWarning(_("Problem Opening URL"), - I18n.format(_("Could not open the URL\n{0}"), url), e); + I18n.format(_("Could not open the URL\n{0}"), url), e); } } /** * Used to determine whether to disable the "Show Sketch Folder" option. + * * @return true If a means of opening a folder is known to be available. */ static protected boolean openFolderAvailable() { @@ -2042,7 +2055,7 @@ public class Base { } catch (Exception e) { showWarning(_("Problem Opening Folder"), - I18n.format(_("Could not open the folder\n{0}"), file.getAbsolutePath()), e); + I18n.format(_("Could not open the folder\n{0}"), file.getAbsolutePath()), e); } } @@ -2109,12 +2122,12 @@ public class Base { ActionListener disposer) { KeyStroke stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0); root.registerKeyboardAction(disposer, stroke, - JComponent.WHEN_IN_FOCUSED_WINDOW); + JComponent.WHEN_IN_FOCUSED_WINDOW); int modifiers = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(); stroke = KeyStroke.getKeyStroke('W', modifiers); root.registerKeyboardAction(disposer, stroke, - JComponent.WHEN_IN_FOCUSED_WINDOW); + JComponent.WHEN_IN_FOCUSED_WINDOW); } @@ -2208,15 +2221,14 @@ public class Base { // ................................................................... - // incomplete static public int showYesNoCancelQuestion(Editor editor, String title, String primary, String secondary) { if (!OSUtils.isMacOS()) { int result = - JOptionPane.showConfirmDialog(null, primary + "\n" + secondary, title, - JOptionPane.YES_NO_CANCEL_OPTION, - JOptionPane.QUESTION_MESSAGE); + JOptionPane.showConfirmDialog(null, primary + "\n" + secondary, title, + JOptionPane.YES_NO_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE); return result; // if (result == JOptionPane.YES_OPTION) { // @@ -2234,18 +2246,18 @@ public class Base { // Pane formatting adapted from the Quaqua guide // http://www.randelshofer.ch/quaqua/guide/joptionpane.html JOptionPane pane = - new JOptionPane(" " + - " " + - "Do you want to save changes to this sketch
" + - " before closing?" + - "

If you don't save, your changes will be lost.", - JOptionPane.QUESTION_MESSAGE); + new JOptionPane(" " + + " " + + "Do you want to save changes to this sketch
" + + " before closing?" + + "

If you don't save, your changes will be lost.", + JOptionPane.QUESTION_MESSAGE); - String[] options = new String[] { - "Save", "Cancel", "Don't Save" + String[] options = new String[]{ + "Save", "Cancel", "Don't Save" }; pane.setOptions(options); @@ -2255,7 +2267,7 @@ public class Base { // on macosx, setting the destructive property places this option // away from the others at the lefthand side pane.putClientProperty("Quaqua.OptionPane.destructiveOption", - new Integer(2)); + new Integer(2)); JDialog dialog = pane.createDialog(editor, null); dialog.setVisible(true); @@ -2287,29 +2299,29 @@ public class Base { // } static public int showYesNoQuestion(Frame editor, String title, - String primary, String secondary) { + String primary, String secondary) { if (!OSUtils.isMacOS()) { return JOptionPane.showConfirmDialog(editor, - "" + - "" + primary + "" + - "
" + secondary, title, - JOptionPane.YES_NO_OPTION, - JOptionPane.QUESTION_MESSAGE); + "" + + "" + primary + "" + + "
" + secondary, title, + JOptionPane.YES_NO_OPTION, + JOptionPane.QUESTION_MESSAGE); } else { // Pane formatting adapted from the Quaqua guide // http://www.randelshofer.ch/quaqua/guide/joptionpane.html JOptionPane pane = - new JOptionPane(" " + - " " + - "" + primary + "" + - "

" + secondary + "

", - JOptionPane.QUESTION_MESSAGE); + new JOptionPane(" " + + " " + + "" + primary + "" + + "

" + secondary + "

", + JOptionPane.QUESTION_MESSAGE); - String[] options = new String[] { - "Yes", "No" + String[] options = new String[]{ + "Yes", "No" }; pane.setOptions(options); @@ -2367,7 +2379,6 @@ public class Base { return null; } */ - static public File getContentFile(String name) { return BaseNoGui.getContentFile(name); } @@ -2393,7 +2404,8 @@ public class Base { tracker.addImage(image, 0); try { tracker.waitForAll(); - } catch (InterruptedException e) { } + } catch (InterruptedException e) { + } return image; } @@ -2427,7 +2439,7 @@ public class Base { byte buffer[] = new byte[size]; int offset = 0; int bytesRead; - while ((bytesRead = input.read(buffer, offset, size-offset)) != -1) { + while ((bytesRead = input.read(buffer, offset, size - offset)) != -1) { offset += bytesRead; if (bytesRead == 0) break; } @@ -2437,20 +2449,19 @@ public class Base { } - /** * Read from a file with a bunch of attribute/value pairs * that are separated by = and ignore comments with #. */ - static public HashMap readSettings(File inputFile) { - HashMap outgoing = new HashMap(); + static public HashMap readSettings(File inputFile) { + HashMap outgoing = new HashMap(); if (!inputFile.exists()) return outgoing; // return empty hash String lines[] = PApplet.loadStrings(inputFile); for (int i = 0; i < lines.length; i++) { int hash = lines[i].indexOf('#'); String line = (hash == -1) ? - lines[i].trim() : lines[i].substring(0, hash).trim(); + lines[i].trim() : lines[i].substring(0, hash).trim(); if (line.length() == 0) continue; int equals = line.indexOf('='); @@ -2470,9 +2481,9 @@ public class Base { static public void copyFile(File sourceFile, File targetFile) throws IOException { InputStream from = - new BufferedInputStream(new FileInputStream(sourceFile)); + new BufferedInputStream(new FileInputStream(sourceFile)); OutputStream to = - new BufferedOutputStream(new FileOutputStream(targetFile)); + new BufferedOutputStream(new FileOutputStream(targetFile)); byte[] buffer = new byte[16 * 1024]; int bytesRead; while ((bytesRead = from.read(buffer)) != -1) { @@ -2563,7 +2574,7 @@ public class Base { for (int i = 0; i < files.length; i++) { if (files[i].equals(".") || (files[i].equals("..")) || - files[i].equals(".DS_Store")) continue; + files[i].equals(".DS_Store")) continue; File fella = new File(folder, files[i]); if (fella.isDirectory()) { size += calcFolderSize(fella); @@ -2657,9 +2668,9 @@ public class Base { String libName = libFolder.getName(); if (!BaseNoGui.isSanitaryName(libName)) { String mess = I18n.format(_("The library \"{0}\" cannot be used.\n" - + "Library names must contain only basic letters and numbers.\n" - + "(ASCII only and no spaces, and it cannot start with a number)"), - libName); + + "Library names must contain only basic letters and numbers.\n" + + "(ASCII only and no spaces, and it cannot start with a number)"), + libName); activeEditor.statusError(mess); return; } @@ -2686,4 +2697,12 @@ public class Base { public static DiscoveryManager getDiscoveryManager() { return BaseNoGui.getDiscoveryManager(); } + + public Editor getActiveEditor() { + return activeEditor; + } + + public List getEditors() { + return new LinkedList(editors); + } } diff --git a/app/src/processing/app/macosx/ThinkDifferent.java b/app/src/processing/app/macosx/ThinkDifferent.java index e14770a9b..1f243a8d4 100644 --- a/app/src/processing/app/macosx/ThinkDifferent.java +++ b/app/src/processing/app/macosx/ThinkDifferent.java @@ -22,113 +22,95 @@ package processing.app.macosx; -import processing.app.Base; - import com.apple.eawt.*; +import processing.app.Base; +import processing.app.Editor; import java.io.File; +import java.util.List; /** * Deal with issues related to thinking different. This handles the basic * Mac OS X menu commands (and apple events) for open, about, prefs, etc. - * + *

* Based on OSXAdapter.java from Apple DTS. - * - * As of 0140, this code need not be built on platforms other than OS X, + *

+ * As of 0140, this code need not be built on platforms other than OS X, * because of the new platform structure which isolates through reflection. */ -public class ThinkDifferent implements ApplicationListener { +public class ThinkDifferent { - // pseudo-singleton model; no point in making multiple instances - // of the EAWT application or our adapter - private static ThinkDifferent adapter; - // http://developer.apple.com/documentation/Java/Reference/1.4.2/appledoc/api/com/apple/eawt/Application.html - private static Application application; + private static final int MAX_WAIT_FOR_BASE = 10000; - // reference to the app where the existing quit, about, prefs code is - private Base base; + static public void init() { + Application application = Application.getApplication(); + application.setAboutHandler(new AboutHandler() { + @Override + public void handleAbout(AppEvent.AboutEvent aboutEvent) { + if (waitForBase()) { + Base.INSTANCE.handleAbout(); + } + } + }); + application.setPreferencesHandler(new PreferencesHandler() { + @Override + public void handlePreferences(AppEvent.PreferencesEvent preferencesEvent) { + if (waitForBase()) { + Base.INSTANCE.handlePrefs(); + } + } + }); + application.setOpenFileHandler(new OpenFilesHandler() { + @Override + public void openFiles(final AppEvent.OpenFilesEvent openFilesEvent) { + if (waitForBase()) { + for (File file : openFilesEvent.getFiles()) { + try { + Base.INSTANCE.handleOpen(file); + List editors = Base.INSTANCE.getEditors(); + if (editors.size() == 2 && editors.get(0).getSketch().isUntitled()) { + Base.INSTANCE.handleClose(editors.get(0)); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + } + } + }); + application.setQuitHandler(new QuitHandler() { + @Override + public void handleQuitRequestWith(AppEvent.QuitEvent quitEvent, QuitResponse quitResponse) { + if (waitForBase()) { + if (Base.INSTANCE.handleClose(Base.INSTANCE.getActiveEditor())) { + quitResponse.performQuit(); + } else { + quitResponse.cancelQuit(); + } + } + } + }); + } - - static public void init(Base base) { - if (application == null) { - //application = new com.apple.eawt.Application(); - application = com.apple.eawt.Application.getApplication(); - } - if (adapter == null) { - adapter = new ThinkDifferent(base); - } - application.addApplicationListener(adapter); - application.setEnabledAboutMenu(true); - application.setEnabledPreferencesMenu(true); - } - - - public ThinkDifferent(Base base) { - this.base = base; - } - - - // implemented handler methods. These are basically hooks into existing - // functionality from the main app, as if it came over from another platform. - public void handleAbout(ApplicationEvent ae) { - if (base != null) { - ae.setHandled(true); - base.handleAbout(); - } else { - throw new IllegalStateException("handleAbout: Base instance detached from listener"); - } - } - - - public void handlePreferences(ApplicationEvent ae) { - if (base != null) { - base.handlePrefs(); - ae.setHandled(true); - } else { - throw new IllegalStateException("handlePreferences: Base instance detached from listener"); + private static boolean waitForBase() { + int slept = 0; + while (Base.INSTANCE == null) { + if (slept >= MAX_WAIT_FOR_BASE) { + return false; + } + sleep(100); + slept += 100; } + return true; } - - public void handleOpenApplication(ApplicationEvent ae) { - } - - - public void handleOpenFile(ApplicationEvent ae) { -// System.out.println("got open file event " + ae.getFilename()); - String filename = ae.getFilename(); + private static void sleep(int millis) { try { - base.handleOpen(new File(filename)); - } catch (Exception e) { - e.printStackTrace(); - } - ae.setHandled(true); - } - - - public void handlePrintFile(ApplicationEvent ae) { - // TODO implement os x print handler here (open app, call handlePrint, quit) - } - - - public void handleQuit(ApplicationEvent ae) { - if (base != null) { - /* - / You MUST setHandled(false) if you want to delay or cancel the quit. - / This is important for cross-platform development -- have a universal quit - / routine that chooses whether or not to quit, so the functionality is identical - / on all platforms. This example simply cancels the AppleEvent-based quit and - / defers to that universal method. - */ - boolean result = base.handleQuit(); - ae.setHandled(result); - } else { - throw new IllegalStateException("handleQuit: Base instance detached from listener"); + Thread.sleep(100); + } catch (InterruptedException e) { + //ignore } } - - - public void handleReOpenApplication(ApplicationEvent arg0) { - } + } \ No newline at end of file diff --git a/build/build.xml b/build/build.xml index 894b2027a..a99486e57 100644 --- a/build/build.xml +++ b/build/build.xml @@ -324,7 +324,7 @@ + role="Editor" ispackage="false">