From 50cacc1756748e2a9ba24692ad397476380af5b1 Mon Sep 17 00:00:00 2001 From: Federico Fissore Date: Wed, 5 Aug 2015 09:04:53 +0200 Subject: [PATCH] Got rid of Java 8 warnings about _ as a method name --- .../BuiltInCoreIsNewerCheck.java | 4 +- .../ui/ContributedLibraryTableCell.java | 16 +- .../ui/DropdownInstalledLibraryItem.java | 4 +- .../ui/DropdownUpdatableLibrariesItem.java | 4 +- .../libraries/ui/LibraryManagerUI.java | 14 +- .../ui/ContributedPlatformTableCell.java | 18 +- .../packages/ui/ContributionManagerUI.java | 10 +- .../packages/ui/DropdownAllCoresItem.java | 4 +- .../ui/DropdownUpdatableCoresItem.java | 4 +- .../contributions/ui/DropdownAllItem.java | 4 +- .../contributions/ui/InstallerJDialog.java | 12 +- ...tallerJDialogUncaughtExceptionHandler.java | 4 +- .../cc/arduino/packages/formatter/AStyle.java | 8 +- .../arduino/view/findreplace/FindReplace.java | 24 +- .../AdditionalBoardsManagerURLTextArea.java | 12 +- .../arduino/view/preferences/Preferences.java | 212 +++++++------- app/src/processing/app/AbstractMonitor.java | 12 - .../processing/app/AbstractTextMonitor.java | 23 +- app/src/processing/app/Base.java | 96 +++---- app/src/processing/app/Editor.java | 258 +++++++++--------- app/src/processing/app/EditorHeader.java | 12 +- app/src/processing/app/EditorStatus.java | 14 +- app/src/processing/app/EditorToolbar.java | 6 +- app/src/processing/app/NetworkMonitor.java | 8 +- app/src/processing/app/SerialMonitor.java | 4 +- app/src/processing/app/SerialPlotter.java | 9 +- app/src/processing/app/Sketch.java | 144 +++++----- app/src/processing/app/Theme.java | 4 +- app/src/processing/app/UpdateCheck.java | 12 +- .../forms/PasswordAuthorizationDialog.java | 8 +- .../app/helpers/GUIUserNotifier.java | 10 +- app/src/processing/app/tools/Archiver.java | 12 +- app/src/processing/app/tools/FixEncoding.java | 12 +- .../DownloadableContributionsDownloader.java | 10 +- .../SignatureVerificationFailedException.java | 6 +- .../libraries/ContributedLibrary.java | 4 +- .../libraries/LibrariesIndexer.java | 8 +- .../libraries/LibraryInstaller.java | 16 +- .../packages/ContributionInstaller.java | 28 +- .../packages/ContributionsIndexer.java | 4 +- .../cc/arduino/packages/DiscoveryManager.java | 4 +- .../src/cc/arduino/packages/Uploader.java | 10 +- .../packages/uploaders/SSHUploader.java | 8 +- .../packages/uploaders/SerialUploader.java | 14 +- .../cc/arduino/utils/ArchiveExtractor.java | 4 +- .../src/processing/app/BaseNoGui.java | 66 ++--- arduino-core/src/processing/app/I18n.java | 21 +- arduino-core/src/processing/app/Platform.java | 6 +- .../src/processing/app/PreferencesData.java | 8 +- arduino-core/src/processing/app/Serial.java | 12 +- .../src/processing/app/SketchCode.java | 6 +- .../src/processing/app/SketchData.java | 4 +- .../src/processing/app/debug/Compiler.java | 110 ++++---- .../app/debug/LegacyTargetBoard.java | 4 +- .../app/debug/LegacyTargetPackage.java | 4 +- .../app/debug/LegacyTargetPlatform.java | 16 +- .../app/helpers/BasicUserNotifier.java | 8 +- .../app/helpers/CommandlineParser.java | 44 +-- .../src/processing/app/i18n/update.sh | 2 +- .../app/preproc/PdePreprocessor.java | 4 +- 60 files changed, 704 insertions(+), 725 deletions(-) diff --git a/app/src/cc/arduino/contributions/BuiltInCoreIsNewerCheck.java b/app/src/cc/arduino/contributions/BuiltInCoreIsNewerCheck.java index a1c0111e9..11e84cf3b 100644 --- a/app/src/cc/arduino/contributions/BuiltInCoreIsNewerCheck.java +++ b/app/src/cc/arduino/contributions/BuiltInCoreIsNewerCheck.java @@ -48,7 +48,7 @@ import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; -import static processing.app.I18n._; +import static processing.app.I18n.tr; public class BuiltInCoreIsNewerCheck implements Runnable { @@ -93,7 +93,7 @@ public class BuiltInCoreIsNewerCheck implements Runnable { SwingUtilities.invokeLater(() -> { PreferencesData.setInteger("builtin_platform_is_newer", BaseNoGui.REVISION); assert base.hasActiveEditor(); - int chosenOption = JOptionPane.showConfirmDialog(base.getActiveEditor(), I18n.format(_("The IDE includes an updated {0} package, but you're using an older one.\nDo you want to upgrade {0}?"), installedBuiltIn.getName()), I18n.format(_("A newer {0} package is available"), installedBuiltIn.getName()), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + int chosenOption = JOptionPane.showConfirmDialog(base.getActiveEditor(), I18n.format(tr("The IDE includes an updated {0} package, but you're using an older one.\nDo you want to upgrade {0}?"), installedBuiltIn.getName()), I18n.format(tr("A newer {0} package is available"), installedBuiltIn.getName()), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (chosenOption == JOptionPane.YES_OPTION) { Action openBoardsManager = base.getOpenBoardsManager(); Event event = new Event(base.getActiveEditor(), ActionEvent.ACTION_PERFORMED, installedBuiltIn.getName()); diff --git a/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java b/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java index cdf8a9f4f..b185afc85 100644 --- a/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java +++ b/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java @@ -54,7 +54,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import static processing.app.I18n._; +import static processing.app.I18n.tr; import static processing.app.I18n.format; @SuppressWarnings("serial") @@ -72,13 +72,13 @@ public class ContributedLibraryTableCell extends InstallerTableCell { public ContributedLibraryTableCell() { { - installButton = new JButton(_("Install")); + installButton = new JButton(tr("Install")); installButton.addActionListener(e -> onInstall(editorValue.getSelected(), editorValue.getInstalled())); int width = installButton.getPreferredSize().width; installButtonPlaceholder = Box.createRigidArea(new Dimension(width, 1)); } - downgradeButton = new JButton(_("Install")); + downgradeButton = new JButton(tr("Install")); downgradeButton.addActionListener(e -> { ContributedLibrary selected = (ContributedLibrary) downgradeChooser.getSelectedItem(); onInstall(selected, editorValue.getInstalled()); @@ -234,7 +234,7 @@ public class ContributedLibraryTableCell extends InstallerTableCell { Collections.sort(uninstalledReleases, new ReverseComparator<>(new DownloadableContributionVersionComparator())); downgradeChooser.removeAllItems(); - downgradeChooser.addItem(_("Select version")); + downgradeChooser.addItem(tr("Select version")); final List uninstalledPreviousReleases = Lists.newLinkedList(); final List uninstalledNewerReleases = Lists.newLinkedList(); @@ -286,10 +286,10 @@ public class ContributedLibraryTableCell extends InstallerTableCell { upgradable = new DownloadableContributionVersionComparator().compare(selected, installed) > 0; } if (installable) { - installButton.setText(_("Install")); + installButton.setText(tr("Install")); } if (upgradable) { - installButton.setText(_("Update")); + installButton.setText(tr("Update")); } installButton.setVisible(installable || upgradable); installButtonPlaceholder.setVisible(!(installable || upgradable)); @@ -323,9 +323,9 @@ public class ContributedLibraryTableCell extends InstallerTableCell { if (installed != null) { String installedVer = installed.getParsedVersion(); if (installedVer == null) { - desc += " " + _("Version unknown"); + desc += " " + tr("Version unknown"); } else { - desc += " " + format(_("Version {0}"), installedVer); + desc += " " + format(tr("Version {0}"), installedVer); } } desc += ""; diff --git a/app/src/cc/arduino/contributions/libraries/ui/DropdownInstalledLibraryItem.java b/app/src/cc/arduino/contributions/libraries/ui/DropdownInstalledLibraryItem.java index eb3f73e35..a7da72a0c 100644 --- a/app/src/cc/arduino/contributions/libraries/ui/DropdownInstalledLibraryItem.java +++ b/app/src/cc/arduino/contributions/libraries/ui/DropdownInstalledLibraryItem.java @@ -36,7 +36,7 @@ import cc.arduino.contributions.ui.DropdownItem; import java.util.function.Predicate; -import static processing.app.I18n._; +import static processing.app.I18n.tr; public class DropdownInstalledLibraryItem implements DropdownItem { @@ -47,7 +47,7 @@ public class DropdownInstalledLibraryItem implements DropdownItem { @@ -24,7 +24,7 @@ public class DropdownUpdatableLibrariesItem implements DropdownItem { @@ -91,10 +91,10 @@ public class LibraryManagerUI extends InstallerJDialog { } public LibraryManagerUI(Frame parent, Platform platform) { - super(parent, "Library Manager", Dialog.ModalityType.APPLICATION_MODAL, _("Unable to reach Arduino.cc due to possible network issues.")); + super(parent, "Library Manager", Dialog.ModalityType.APPLICATION_MODAL, tr("Unable to reach Arduino.cc due to possible network issues.")); this.platform = platform; - filtersContainer.add(new JLabel(_("Topic")), 1); + filtersContainer.add(new JLabel(tr("Topic")), 1); filtersContainer.remove(2); typeChooser = new JComboBox(); @@ -102,7 +102,7 @@ public class LibraryManagerUI extends InstallerJDialog { typeChooser.setEnabled(false); filtersContainer.add(Box.createHorizontalStrut(5), 0); - filtersContainer.add(new JLabel(_("Type")), 1); + filtersContainer.add(new JLabel(tr("Type")), 1); filtersContainer.add(Box.createHorizontalStrut(5), 2); filtersContainer.add(typeChooser, 3); } @@ -236,7 +236,7 @@ public class LibraryManagerUI extends InstallerJDialog { clearErrorMessage(); installerThread = new Thread(() -> { try { - setProgressVisible(true, _("Installing...")); + setProgressVisible(true, tr("Installing...")); installer.install(lib, replaced); onIndexesUpdated(); // TODO: Do a better job in refreshing only the needed element //getContribModel().updateLibrary(lib); @@ -254,7 +254,7 @@ public class LibraryManagerUI extends InstallerJDialog { boolean managedByIndex = indexer.getIndex().getLibraries().contains(lib); if (!managedByIndex) { - int chosenOption = JOptionPane.showConfirmDialog(this, _("This library is not listed on Library Manager. You won't be able to reinstall it from here.\nAre you sure you want to delete it?"), _("Please confirm library deletion"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + int chosenOption = JOptionPane.showConfirmDialog(this, tr("This library is not listed on Library Manager. You won't be able to reinstall it from here.\nAre you sure you want to delete it?"), tr("Please confirm library deletion"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (chosenOption != JOptionPane.YES_OPTION) { return; } @@ -263,7 +263,7 @@ public class LibraryManagerUI extends InstallerJDialog { clearErrorMessage(); installerThread = new Thread(() -> { try { - setProgressVisible(true, _("Removing...")); + setProgressVisible(true, tr("Removing...")); installer.remove(lib); onIndexesUpdated(); // TODO: Do a better job in refreshing only the needed element //getContribModel().updateLibrary(lib); diff --git a/app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java b/app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java index 0d2449440..2fbd60901 100644 --- a/app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java +++ b/app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java @@ -55,7 +55,7 @@ import java.util.Collections; import java.util.LinkedList; import java.util.stream.Collectors; -import static processing.app.I18n._; +import static processing.app.I18n.tr; import static processing.app.I18n.format; @SuppressWarnings("serial") @@ -75,20 +75,20 @@ public class ContributedPlatformTableCell extends InstallerTableCell { public ContributedPlatformTableCell() { { - installButton = new JButton(_("Install")); + installButton = new JButton(tr("Install")); installButton.addActionListener(e -> onInstall(editorValue.getSelected(), editorValue.getInstalled())); int width = installButton.getPreferredSize().width; installButtonPlaceholder = Box.createRigidArea(new Dimension(width, 1)); } { - removeButton = new JButton(_("Remove")); + removeButton = new JButton(tr("Remove")); removeButton.addActionListener(e -> onRemove(editorValue.getInstalled())); int width = removeButton.getPreferredSize().width; removeButtonPlaceholder = Box.createRigidArea(new Dimension(width, 1)); } - downgradeButton = new JButton(_("Install")); + downgradeButton = new JButton(tr("Install")); downgradeButton.addActionListener(e -> { ContributedPlatform selected = (ContributedPlatform) downgradeChooser.getSelectedItem(); onInstall(selected, editorValue.getInstalled()); @@ -246,7 +246,7 @@ public class ContributedPlatformTableCell extends InstallerTableCell { Collections.sort(uninstalledReleases, new ReverseComparator<>(new DownloadableContributionVersionComparator())); downgradeChooser.removeAllItems(); - downgradeChooser.addItem(_("Select version")); + downgradeChooser.addItem(tr("Select version")); final java.util.List uninstalledPreviousReleases = Lists.newLinkedList(); final java.util.List uninstalledNewerReleases = Lists.newLinkedList(); @@ -300,10 +300,10 @@ public class ContributedPlatformTableCell extends InstallerTableCell { upgradable = new DownloadableContributionVersionComparator().compare(selected, installed) > 0; } if (installable) { - installButton.setText(_("Install")); + installButton.setText(tr("Install")); } if (upgradable) { - installButton.setText(_("Update")); + installButton.setText(tr("Update")); } installButton.setVisible(installable || upgradable); installButtonPlaceholder.setVisible(!(installable || upgradable)); @@ -321,11 +321,11 @@ public class ContributedPlatformTableCell extends InstallerTableCell { desc += " " + format("by {0}", author); } if (installed != null) { - desc += " " + format(_("version {0}"), installed.getParsedVersion()) + " INSTALLED"; + desc += " " + format(tr("version {0}"), installed.getParsedVersion()) + " INSTALLED"; } desc += "
"; - desc += _("Boards included in this package:") + "
"; + desc += tr("Boards included in this package:") + "
"; for (ContributedBoard board : selected.getBoards()) { desc += board.getName() + ", "; } diff --git a/app/src/cc/arduino/contributions/packages/ui/ContributionManagerUI.java b/app/src/cc/arduino/contributions/packages/ui/ContributionManagerUI.java index f9871f056..025cef5f2 100644 --- a/app/src/cc/arduino/contributions/packages/ui/ContributionManagerUI.java +++ b/app/src/cc/arduino/contributions/packages/ui/ContributionManagerUI.java @@ -45,7 +45,7 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; -import static processing.app.I18n._; +import static processing.app.I18n.tr; @SuppressWarnings("serial") public class ContributionManagerUI extends InstallerJDialog { @@ -86,7 +86,7 @@ public class ContributionManagerUI extends InstallerJDialog { } public ContributionManagerUI(Frame parent, Platform platform) { - super(parent, _("Boards Manager"), Dialog.ModalityType.APPLICATION_MODAL, _("Unable to reach Arduino.cc due to possible network issues.")); + super(parent, tr("Boards Manager"), Dialog.ModalityType.APPLICATION_MODAL, tr("Unable to reach Arduino.cc due to possible network issues.")); this.platform = platform; } @@ -169,7 +169,7 @@ public class ContributionManagerUI extends InstallerJDialog { installerThread = new Thread(() -> { List errors = new LinkedList<>(); try { - setProgressVisible(true, _("Installing...")); + setProgressVisible(true, tr("Installing...")); errors.addAll(installer.install(platformToInstall)); if (platformToRemove != null && !platformToRemove.isReadOnly()) { errors.addAll(installer.remove(platformToRemove)); @@ -192,7 +192,7 @@ public class ContributionManagerUI extends InstallerJDialog { clearErrorMessage(); if (showWarning) { - int chosenOption = JOptionPane.showConfirmDialog(this, I18n.format(_("Do you want to remove {0}?\nIf you do so you won't be able to use {0} any more."), platform.getName()), _("Please confirm boards deletion"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + int chosenOption = JOptionPane.showConfirmDialog(this, I18n.format(tr("Do you want to remove {0}?\nIf you do so you won't be able to use {0} any more."), platform.getName()), tr("Please confirm boards deletion"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (chosenOption != JOptionPane.YES_OPTION) { return; } @@ -200,7 +200,7 @@ public class ContributionManagerUI extends InstallerJDialog { installerThread = new Thread(() -> { try { - setProgressVisible(true, _("Removing...")); + setProgressVisible(true, tr("Removing...")); installer.remove(platform); onIndexesUpdated(); } catch (Exception e) { diff --git a/app/src/cc/arduino/contributions/packages/ui/DropdownAllCoresItem.java b/app/src/cc/arduino/contributions/packages/ui/DropdownAllCoresItem.java index 4cc2add1e..87b671e5a 100644 --- a/app/src/cc/arduino/contributions/packages/ui/DropdownAllCoresItem.java +++ b/app/src/cc/arduino/contributions/packages/ui/DropdownAllCoresItem.java @@ -35,12 +35,12 @@ import cc.arduino.contributions.ui.DropdownItem; import java.util.function.Predicate; -import static processing.app.I18n._; +import static processing.app.I18n.tr; public class DropdownAllCoresItem implements DropdownItem { public String toString() { - return _("All"); + return tr("All"); } @Override diff --git a/app/src/cc/arduino/contributions/packages/ui/DropdownUpdatableCoresItem.java b/app/src/cc/arduino/contributions/packages/ui/DropdownUpdatableCoresItem.java index 7fabe6c7e..5a7eeba5b 100644 --- a/app/src/cc/arduino/contributions/packages/ui/DropdownUpdatableCoresItem.java +++ b/app/src/cc/arduino/contributions/packages/ui/DropdownUpdatableCoresItem.java @@ -7,7 +7,7 @@ import cc.arduino.contributions.ui.DropdownItem; import java.util.function.Predicate; -import static processing.app.I18n._; +import static processing.app.I18n.tr; public class DropdownUpdatableCoresItem implements DropdownItem { @@ -24,7 +24,7 @@ public class DropdownUpdatableCoresItem implements DropdownItem { public String toString() { - return _("All"); + return tr("All"); } @Override diff --git a/app/src/cc/arduino/contributions/ui/InstallerJDialog.java b/app/src/cc/arduino/contributions/ui/InstallerJDialog.java index ea8ef2c09..bc69af2c4 100644 --- a/app/src/cc/arduino/contributions/ui/InstallerJDialog.java +++ b/app/src/cc/arduino/contributions/ui/InstallerJDialog.java @@ -43,7 +43,7 @@ import java.util.function.Predicate; import java.util.stream.Stream; import static cc.arduino.contributions.packages.ui.ContributionIndexTableModel.DESCRIPTION_COL; -import static processing.app.I18n._; +import static processing.app.I18n.tr; public abstract class InstallerJDialog extends JDialog { @@ -92,7 +92,7 @@ public abstract class InstallerJDialog extends JDialog { categoryChooser.setMaximumRowCount(20); categoryChooser.setEnabled(false); - filterField = new FilterJTextField(_("Filter your search...")) { + filterField = new FilterJTextField(tr("Filter your search...")) { @Override protected void onFilter(String[] _filters) { filters = _filters; @@ -106,7 +106,7 @@ public abstract class InstallerJDialog extends JDialog { filtersContainer = new JPanel(); filtersContainer.setLayout(new BoxLayout(filtersContainer, BoxLayout.X_AXIS)); filtersContainer.add(Box.createHorizontalStrut(5)); - filtersContainer.add(new JLabel(_("Type"))); + filtersContainer.add(new JLabel(tr("Type"))); filtersContainer.add(Box.createHorizontalStrut(5)); filtersContainer.add(categoryChooser); filtersContainer.add(Box.createHorizontalStrut(5)); @@ -169,7 +169,7 @@ public abstract class InstallerJDialog extends JDialog { errorMessage.setForeground(Color.RED); { - JButton cancelButton = new JButton(_("Cancel")); + JButton cancelButton = new JButton(tr("Cancel")); cancelButton.addActionListener(arg0 -> onCancelPressed()); progressBox = Box.createHorizontalBox(); @@ -177,13 +177,13 @@ public abstract class InstallerJDialog extends JDialog { progressBox.add(Box.createHorizontalStrut(5)); progressBox.add(cancelButton); - dismissErrorMessageButton = new JButton(_("OK")); + dismissErrorMessageButton = new JButton(tr("OK")); dismissErrorMessageButton.addActionListener(arg0 -> { clearErrorMessage(); setErrorMessageVisible(false); }); - closeButton = new JButton(_("Close")); + closeButton = new JButton(tr("Close")); closeButton.addActionListener(arg0 -> InstallerJDialog.this.dispatchEvent(new WindowEvent(InstallerJDialog.this, WindowEvent.WINDOW_CLOSING))); errorMessageBox = Box.createHorizontalBox(); diff --git a/app/src/cc/arduino/contributions/ui/InstallerJDialogUncaughtExceptionHandler.java b/app/src/cc/arduino/contributions/ui/InstallerJDialogUncaughtExceptionHandler.java index da950145a..df0067b90 100644 --- a/app/src/cc/arduino/contributions/ui/InstallerJDialogUncaughtExceptionHandler.java +++ b/app/src/cc/arduino/contributions/ui/InstallerJDialogUncaughtExceptionHandler.java @@ -31,7 +31,7 @@ package cc.arduino.contributions.ui; import javax.swing.*; -import static processing.app.I18n._; +import static processing.app.I18n.tr; public class InstallerJDialogUncaughtExceptionHandler implements Thread.UncaughtExceptionHandler { @@ -45,7 +45,7 @@ public class InstallerJDialogUncaughtExceptionHandler implements Thread.Uncaught @Override public void uncaughtException(Thread t, final Throwable e) { - String errorMessage = _(e.getMessage().substring(e.getMessage().indexOf(":") + 1)); + String errorMessage = tr(e.getMessage().substring(e.getMessage().indexOf(":") + 1)); if (errorMessage.startsWith("Error downloading")) { errorMessage = connectionErrorMessage; } diff --git a/app/src/cc/arduino/packages/formatter/AStyle.java b/app/src/cc/arduino/packages/formatter/AStyle.java index c1699ac6b..1e1ceb2c9 100644 --- a/app/src/cc/arduino/packages/formatter/AStyle.java +++ b/app/src/cc/arduino/packages/formatter/AStyle.java @@ -42,7 +42,7 @@ import javax.swing.text.BadLocationException; import java.io.File; import java.io.IOException; -import static processing.app.I18n._; +import static processing.app.I18n.tr; public class AStyle implements Tool { @@ -84,7 +84,7 @@ public class AStyle implements Tool { String formattedText = aStyleInterface.AStyleMain(originalText, formatterConfiguration); if (formattedText.equals(originalText)) { - editor.statusNotice(_("No changes necessary for Auto Format.")); + editor.statusNotice(tr("No changes necessary for Auto Format.")); return; } @@ -107,7 +107,7 @@ public class AStyle implements Tool { } // mark as finished - editor.statusNotice(_("Auto Format finished.")); + editor.statusNotice(tr("Auto Format finished.")); } private void setCaretPosition(SketchTextArea textArea, int line, int lineOffset) throws BadLocationException { @@ -140,7 +140,7 @@ public class AStyle implements Tool { @Override public String getMenuTitle() { - return _("Auto Format"); + return tr("Auto Format"); } } diff --git a/app/src/cc/arduino/view/findreplace/FindReplace.java b/app/src/cc/arduino/view/findreplace/FindReplace.java index 09d40bfbd..687b127a9 100644 --- a/app/src/cc/arduino/view/findreplace/FindReplace.java +++ b/app/src/cc/arduino/view/findreplace/FindReplace.java @@ -40,7 +40,7 @@ import java.awt.event.WindowEvent; import java.util.HashMap; import java.util.Map; -import static processing.app.I18n._; +import static processing.app.I18n.tr; public class FindReplace extends javax.swing.JFrame { @@ -137,25 +137,25 @@ public class FindReplace extends javax.swing.JFrame { replaceAllButton = new javax.swing.JButton(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); - setTitle(_("Find")); + setTitle(tr("Find")); - findLabel.setText(_("Find:")); + findLabel.setText(tr("Find:")); findField.setColumns(20); - replaceLabel.setText(_("Replace with:")); + replaceLabel.setText(tr("Replace with:")); replaceField.setColumns(20); ignoreCaseBox.setSelected(true); - ignoreCaseBox.setText(_("Ignore Case")); + ignoreCaseBox.setText(tr("Ignore Case")); wrapAroundBox.setSelected(true); - wrapAroundBox.setText(_("Wrap Around")); + wrapAroundBox.setText(tr("Wrap Around")); - searchAllFilesBox.setText(_("Search all Sketch Tabs")); + searchAllFilesBox.setText(tr("Search all Sketch Tabs")); - findButton.setText(_("Find")); + findButton.setText(tr("Find")); findButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { findButtonActionPerformed(evt); @@ -163,7 +163,7 @@ public class FindReplace extends javax.swing.JFrame { }); buttonsContainer.add(findButton); - previousButton.setText(_("Previous")); + previousButton.setText(tr("Previous")); previousButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { previousButtonActionPerformed(evt); @@ -171,7 +171,7 @@ public class FindReplace extends javax.swing.JFrame { }); buttonsContainer.add(previousButton); - replaceFindButton.setText(_("Replace & Find")); + replaceFindButton.setText(tr("Replace & Find")); replaceFindButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { replaceFindButtonActionPerformed(evt); @@ -179,7 +179,7 @@ public class FindReplace extends javax.swing.JFrame { }); buttonsContainer.add(replaceFindButton); - replaceButton.setText(_("Replace")); + replaceButton.setText(tr("Replace")); replaceButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { replaceButtonActionPerformed(evt); @@ -187,7 +187,7 @@ public class FindReplace extends javax.swing.JFrame { }); buttonsContainer.add(replaceButton); - replaceAllButton.setText(_("Replace All")); + replaceAllButton.setText(tr("Replace All")); replaceAllButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { replaceAllButtonActionPerformed(evt); diff --git a/app/src/cc/arduino/view/preferences/AdditionalBoardsManagerURLTextArea.java b/app/src/cc/arduino/view/preferences/AdditionalBoardsManagerURLTextArea.java index 3ebcb3d84..0c86cf546 100644 --- a/app/src/cc/arduino/view/preferences/AdditionalBoardsManagerURLTextArea.java +++ b/app/src/cc/arduino/view/preferences/AdditionalBoardsManagerURLTextArea.java @@ -40,7 +40,7 @@ import java.awt.event.WindowEvent; import java.util.Arrays; import java.util.Collection; -import static processing.app.I18n._; +import static processing.app.I18n.tr; public class AdditionalBoardsManagerURLTextArea extends javax.swing.JDialog { @@ -70,7 +70,7 @@ public class AdditionalBoardsManagerURLTextArea extends javax.swing.JDialog { unofficialListURLLabel = new javax.swing.JLabel(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); - setTitle(_("Additional Boards Manager URLs")); + setTitle(tr("Additional Boards Manager URLs")); setModal(true); setModalExclusionType(java.awt.Dialog.ModalExclusionType.APPLICATION_EXCLUDE); @@ -79,23 +79,23 @@ public class AdditionalBoardsManagerURLTextArea extends javax.swing.JDialog { additionalBoardsManagerURLs.setName(""); // NOI18N jScrollPane1.setViewportView(additionalBoardsManagerURLs); - cancel.setText(_("Cancel")); + cancel.setText(tr("Cancel")); cancel.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { cancelActionPerformed(evt); } }); - ok.setText(_("OK")); + ok.setText(tr("OK")); ok.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { okActionPerformed(evt); } }); - jLabel1.setText(_("Enter additional URLs, one for each row")); + jLabel1.setText(tr("Enter additional URLs, one for each row")); - unofficialListURLLabel.setText(_("Click for a list of unofficial boards support URLs")); + unofficialListURLLabel.setText(tr("Click for a list of unofficial boards support URLs")); unofficialListURLLabel.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); unofficialListURLLabel.addMouseListener(new java.awt.event.MouseAdapter() { public void mouseClicked(java.awt.event.MouseEvent evt) { diff --git a/app/src/cc/arduino/view/preferences/Preferences.java b/app/src/cc/arduino/view/preferences/Preferences.java index 7e0e1661f..e5b19c332 100644 --- a/app/src/cc/arduino/view/preferences/Preferences.java +++ b/app/src/cc/arduino/view/preferences/Preferences.java @@ -42,7 +42,7 @@ import java.awt.event.WindowEvent; import java.io.File; import java.util.LinkedList; -import static processing.app.I18n._; +import static processing.app.I18n.tr; public class Preferences extends javax.swing.JDialog { @@ -99,92 +99,92 @@ public class Preferences extends javax.swing.JDialog { this.base = base; this.languages = new Language[]{ - new Language(_("System Default"), "", ""), - new Language(_("Albanian"), "shqip", "sq"), - new Language(_("Arabic"), "العربية", "ar"), - new Language(_("Aragonese"), "Aragonés", "an"), - new Language(_("Belarusian"), "Беларуская мова", "be"), - new Language(_("Bulgarian"), "български", "bg"), - new Language(_("Catalan"), "Català", "ca"), - new Language(_("Chinese Simplified"), "简体中文", "zh_CN"), - new Language(_("Chinese Traditional"), "繁體中文", "zh_TW"), - new Language(_("Croatian"), "Hrvatski", "hr_HR"), - new Language(_("Czech (Czech Republic)"), "český (Czech Republic)", "cs_CZ"), - new Language(_("Danish (Denmark)"), "Dansk (Denmark)", "da_DK"), - new Language(_("Dutch"), "Nederlands", "nl"), - new Language(_("English"), "English", "en"), - new Language(_("English (United Kingdom)"), "English (United Kingdom)", "en_GB"), - new Language(_("Estonian"), "Eesti", "et"), - new Language(_("Estonian (Estonia)"), "Eesti keel", "et_EE"), - new Language(_("Filipino"), "Pilipino", "fil"), - new Language(_("Finnish"), "Suomi", "fi"), - new Language(_("French"), "Français", "fr"), - new Language(_("Canadian French"), "Canadienne-français", "fr_CA"), - new Language(_("Galician"), "Galego", "gl"), - new Language(_("Georgian"), "საქართველოს", "ka_GE"), - new Language(_("German"), "Deutsch", "de_DE"), - new Language(_("Greek"), "ελληνικά", "el_GR"), - new Language(_("Hebrew"), "עברית", "he"), - new Language(_("Hindi"), "हिंदी", "hi"), - new Language(_("Hungarian"), "Magyar", "hu"), - new Language(_("Indonesian"), "Bahasa Indonesia", "id"), - new Language(_("Italian"), "Italiano", "it_IT"), - new Language(_("Japanese"), "日本語", "ja_JP"), - new Language(_("Korean"), "한국어", "ko_KR"), - new Language(_("Latvian"), "Latviešu", "lv_LV"), - new Language(_("Lithuaninan"), "Lietuvių Kalba", "lt_LT"), - new Language(_("Norwegian Bokmål"), "Norsk bokmål", "nb_NO"), - new Language(_("Persian"), "فارسی", "fa"), - new Language(_("Polish"), "Język Polski", "pl"), - new Language(_("Portuguese (Brazil)"), "Português (Brazil)", "pt_BR"), - new Language(_("Portuguese (Portugal)"), "Português (Portugal)", "pt_PT"), - new Language(_("Romanian"), "Română", "ro"), - new Language(_("Russian"), "Русский", "ru"), - new Language(_("Slovenian"), "Slovenščina", "sl_SI"), - new Language(_("Spanish"), "Español", "es"), - new Language(_("Swedish"), "Svenska", "sv"), - new Language(_("Tamil"), "தமிழ்", "ta"), - new Language(_("Turkish"), "Türk", "tr"), - new Language(_("Ukrainian"), "Український", "uk"), - new Language(_("Vietnamese"), "Tiếng Việt", "vi"), + new Language(tr("System Default"), "", ""), + new Language(tr("Albanian"), "shqip", "sq"), + new Language(tr("Arabic"), "العربية", "ar"), + new Language(tr("Aragonese"), "Aragonés", "an"), + new Language(tr("Belarusian"), "Беларуская мова", "be"), + new Language(tr("Bulgarian"), "български", "bg"), + new Language(tr("Catalan"), "Català", "ca"), + new Language(tr("Chinese Simplified"), "简体中文", "zh_CN"), + new Language(tr("Chinese Traditional"), "繁體中文", "zh_TW"), + new Language(tr("Croatian"), "Hrvatski", "hr_HR"), + new Language(tr("Czech (Czech Republic)"), "český (Czech Republic)", "cs_CZ"), + new Language(tr("Danish (Denmark)"), "Dansk (Denmark)", "da_DK"), + new Language(tr("Dutch"), "Nederlands", "nl"), + new Language(tr("English"), "English", "en"), + new Language(tr("English (United Kingdom)"), "English (United Kingdom)", "en_GB"), + new Language(tr("Estonian"), "Eesti", "et"), + new Language(tr("Estonian (Estonia)"), "Eesti keel", "et_EE"), + new Language(tr("Filipino"), "Pilipino", "fil"), + new Language(tr("Finnish"), "Suomi", "fi"), + new Language(tr("French"), "Français", "fr"), + new Language(tr("Canadian French"), "Canadienne-français", "fr_CA"), + new Language(tr("Galician"), "Galego", "gl"), + new Language(tr("Georgian"), "საქართველოს", "ka_GE"), + new Language(tr("German"), "Deutsch", "de_DE"), + new Language(tr("Greek"), "ελληνικά", "el_GR"), + new Language(tr("Hebrew"), "עברית", "he"), + new Language(tr("Hindi"), "हिंदी", "hi"), + new Language(tr("Hungarian"), "Magyar", "hu"), + new Language(tr("Indonesian"), "Bahasa Indonesia", "id"), + new Language(tr("Italian"), "Italiano", "it_IT"), + new Language(tr("Japanese"), "日本語", "ja_JP"), + new Language(tr("Korean"), "한국어", "ko_KR"), + new Language(tr("Latvian"), "Latviešu", "lv_LV"), + new Language(tr("Lithuaninan"), "Lietuvių Kalba", "lt_LT"), + new Language(tr("Norwegian Bokmål"), "Norsk bokmål", "nb_NO"), + new Language(tr("Persian"), "فارسی", "fa"), + new Language(tr("Polish"), "Język Polski", "pl"), + new Language(tr("Portuguese (Brazil)"), "Português (Brazil)", "pt_BR"), + new Language(tr("Portuguese (Portugal)"), "Português (Portugal)", "pt_PT"), + new Language(tr("Romanian"), "Română", "ro"), + new Language(tr("Russian"), "Русский", "ru"), + new Language(tr("Slovenian"), "Slovenščina", "sl_SI"), + new Language(tr("Spanish"), "Español", "es"), + new Language(tr("Swedish"), "Svenska", "sv"), + new Language(tr("Tamil"), "தமிழ்", "ta"), + new Language(tr("Turkish"), "Türk", "tr"), + new Language(tr("Ukrainian"), "Український", "uk"), + new Language(tr("Vietnamese"), "Tiếng Việt", "vi"), }; this.missingLanguages = new Language[]{ - new Language(_("Afrikaans"), "Afrikaans", "af"), - new Language(_("Armenian"), "Հայերեն", "hy"), - new Language(_("Asturian"), "Asturianu", "ast"), - new Language(_("Basque"), "Euskara", "eu"), - new Language(_("Bengali (India)"), "বাংলা (India)", "bn_IN"), - new Language(_("Bosnian"), "Bosanski", "bs"), - new Language(_("Burmese (Myanmar)"), "ဗမာစကား", "my_MM"), - new Language(_("Chinese (China)"), "", "zh_CN"), - new Language(_("Chinese (Hong Kong)"), "", "zh_HK"), - new Language(_("Chinese (Taiwan)"), "", "zh_TW"), - new Language(_("Chinese (Taiwan) (Big5)"), "", "zh_TW.Big5"), - new Language(_("Czech"), "český", "cs"), - new Language(_("Danish"), "Dansk", "da"), - new Language(_("Dutch (Netherlands)"), "Nederlands", "nl_NL"), - new Language(_("Galician (Spain)"), "Galego (Spain)", "gl_ES"), - new Language(_("Nepali"), "नेपाली", "ne"), - new Language(_("N'Ko"), "ߒߞߏ", "nqo"), - new Language(_("Marathi"), "मराठी", "mr"), - new Language(_("Malay (Malaysia)"), "بهاس ملايو (Malaysia)", "ms_MY"), - new Language(_("Norwegian"), "Norsk", "no"), - new Language(_("Norwegian Nynorsk"), "Norsk Nynorsk", "nn"), - new Language(_("Portugese"), "Português", "pt"), - new Language(_("Persian (Iran)"), "فارسی (Iran)", "fa_IR"), - new Language(_("Slovak"), "Slovenčina", "sk"), - new Language(_("Swahili"), "كِسوَهِل", "sw"), - new Language(_("Talossan"), "Talossan", "tzl"), - new Language(_("Urdu (Pakistan)"), "اردو (Pakistan)", "ur_PK"), - new Language(_("Western Frisian"), "Western Frisian", "fy"), + new Language(tr("Afrikaans"), "Afrikaans", "af"), + new Language(tr("Armenian"), "Հայերեն", "hy"), + new Language(tr("Asturian"), "Asturianu", "ast"), + new Language(tr("Basque"), "Euskara", "eu"), + new Language(tr("Bengali (India)"), "বাংলা (India)", "bn_IN"), + new Language(tr("Bosnian"), "Bosanski", "bs"), + new Language(tr("Burmese (Myanmar)"), "ဗမာစကား", "my_MM"), + new Language(tr("Chinese (China)"), "", "zh_CN"), + new Language(tr("Chinese (Hong Kong)"), "", "zh_HK"), + new Language(tr("Chinese (Taiwan)"), "", "zh_TW"), + new Language(tr("Chinese (Taiwan) (Big5)"), "", "zh_TW.Big5"), + new Language(tr("Czech"), "český", "cs"), + new Language(tr("Danish"), "Dansk", "da"), + new Language(tr("Dutch (Netherlands)"), "Nederlands", "nl_NL"), + new Language(tr("Galician (Spain)"), "Galego (Spain)", "gl_ES"), + new Language(tr("Nepali"), "नेपाली", "ne"), + new Language(tr("N'Ko"), "ߒߞߏ", "nqo"), + new Language(tr("Marathi"), "मराठी", "mr"), + new Language(tr("Malay (Malaysia)"), "بهاس ملايو (Malaysia)", "ms_MY"), + new Language(tr("Norwegian"), "Norsk", "no"), + new Language(tr("Norwegian Nynorsk"), "Norsk Nynorsk", "nn"), + new Language(tr("Portugese"), "Português", "pt"), + new Language(tr("Persian (Iran)"), "فارسی (Iran)", "fa_IR"), + new Language(tr("Slovak"), "Slovenčina", "sk"), + new Language(tr("Swahili"), "كِسوَهِل", "sw"), + new Language(tr("Talossan"), "Talossan", "tzl"), + new Language(tr("Urdu (Pakistan)"), "اردو (Pakistan)", "ur_PK"), + new Language(tr("Western Frisian"), "Western Frisian", "fy"), }; this.warningItems = new WarningItem[]{ - new WarningItem("none", _("None")), - new WarningItem("default", _("Default")), - new WarningItem("more", _("More")), - new WarningItem("all", _("All")) + new WarningItem("none", tr("None")), + new WarningItem("default", tr("Default")), + new WarningItem("more", tr("More")), + new WarningItem("all", tr("All")) }; initComponents(); @@ -234,11 +234,11 @@ public class Preferences extends javax.swing.JDialog { saveVerifyUploadBox = new javax.swing.JCheckBox(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); - setTitle(_("Preferences")); + setTitle(tr("Preferences")); setModal(true); setResizable(false); - sketchbookLocationLabel.setText(_("Sketchbook location:")); + sketchbookLocationLabel.setText(tr("Sketchbook location:")); sketchbookLocationField.setColumns(40); @@ -249,26 +249,26 @@ public class Preferences extends javax.swing.JDialog { } }); - comboLanguageLabel.setText(_("Editor language: ")); + comboLanguageLabel.setText(tr("Editor language: ")); - requiresRestartLabel.setText(_(" (requires restart of Arduino)")); + requiresRestartLabel.setText(tr(" (requires restart of Arduino)")); - fontSizeLabel.setText(_("Editor font size: ")); + fontSizeLabel.setText(tr("Editor font size: ")); fontSizeField.setColumns(4); - showVerboseLabel.setText(_("Show verbose output during: ")); + showVerboseLabel.setText(tr("Show verbose output during: ")); - verboseCompilationBox.setText(_("compilation ")); + verboseCompilationBox.setText(tr("compilation ")); - verboseUploadBox.setText(_("upload")); + verboseUploadBox.setText(tr("upload")); - comboWarningsLabel.setText(_("Compiler warnings: ")); + comboWarningsLabel.setText(tr("Compiler warnings: ")); - additionalBoardsManagerLabel.setText(_("Additional Boards Manager URLs: ")); - additionalBoardsManagerLabel.setToolTipText(_("Enter a comma separated list of urls")); + additionalBoardsManagerLabel.setText(tr("Additional Boards Manager URLs: ")); + additionalBoardsManagerLabel.setToolTipText(tr("Enter a comma separated list of urls")); - additionalBoardsManagerField.setToolTipText(_("Enter a comma separated list of urls")); + additionalBoardsManagerField.setToolTipText(tr("Enter a comma separated list of urls")); extendedAdditionalUrlFieldWindow.setIcon(new ImageIcon(Base.getThemeImage("newwindow.gif", this))); extendedAdditionalUrlFieldWindow.setMargin(new java.awt.Insets(1, 1, 1, 1)); @@ -279,7 +279,7 @@ public class Preferences extends javax.swing.JDialog { }); morePreferencesLabel.setForeground(Color.GRAY); - morePreferencesLabel.setText(_("More preferences can be edited directly in the file")); + morePreferencesLabel.setText(tr("More preferences can be edited directly in the file")); preferencesFileLabel.setText(PreferencesData.getPreferencesFile().getAbsolutePath()); preferencesFileLabel.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); @@ -298,7 +298,7 @@ public class Preferences extends javax.swing.JDialog { }); arduinoNotRunningLabel.setForeground(Color.GRAY); - arduinoNotRunningLabel.setText(_("(edit only when Arduino is not running)")); + arduinoNotRunningLabel.setText(tr("(edit only when Arduino is not running)")); okButton.setText(I18n.PROMPT_OK); okButton.addActionListener(new java.awt.event.ActionListener() { @@ -316,25 +316,25 @@ public class Preferences extends javax.swing.JDialog { checkboxesContainer.setLayout(new javax.swing.BoxLayout(checkboxesContainer, javax.swing.BoxLayout.Y_AXIS)); - displayLineNumbersBox.setText(_("Display line numbers")); + displayLineNumbersBox.setText(tr("Display line numbers")); checkboxesContainer.add(displayLineNumbersBox); - enableCodeFoldingBox.setText(_("Enable Code Folding")); + enableCodeFoldingBox.setText(tr("Enable Code Folding")); checkboxesContainer.add(enableCodeFoldingBox); - verifyUploadBox.setText(_("Verify code after upload")); + verifyUploadBox.setText(tr("Verify code after upload")); checkboxesContainer.add(verifyUploadBox); - externalEditorBox.setText(_("Use external editor")); + externalEditorBox.setText(tr("Use external editor")); checkboxesContainer.add(externalEditorBox); - checkUpdatesBox.setText(_("Check for updates on startup")); + checkUpdatesBox.setText(tr("Check for updates on startup")); checkboxesContainer.add(checkUpdatesBox); - updateExtensionBox.setText(_("Update sketch files to new extension on save (.pde -> .ino)")); + updateExtensionBox.setText(tr("Update sketch files to new extension on save (.pde -> .ino)")); checkboxesContainer.add(updateExtensionBox); - saveVerifyUploadBox.setText(_("Save when verifying or uploading")); + saveVerifyUploadBox.setText(tr("Save when verifying or uploading")); checkboxesContainer.add(saveVerifyUploadBox); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); @@ -442,7 +442,7 @@ public class Preferences extends javax.swing.JDialog { private void browseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseButtonActionPerformed File dflt = new File(sketchbookLocationField.getText()); - File file = Base.selectFolder(_("Select new sketchbook location"), dflt, this); + File file = Base.selectFolder(tr("Select new sketchbook location"), dflt, this); if (file != null) { String path = file.getAbsolutePath(); if (BaseNoGui.getPortableFolder() != null) { @@ -481,7 +481,7 @@ public class Preferences extends javax.swing.JDialog { private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed java.util.List errors = validateData(); if (!errors.isEmpty()) { - Base.showWarning(_("Error"), errors.get(0), null); + Base.showWarning(tr("Error"), errors.get(0), null); return; } @@ -511,7 +511,7 @@ public class Preferences extends javax.swing.JDialog { private java.util.List validateData() { java.util.List errors = new LinkedList<>(); if (FileUtils.isSubDirectory(new File(sketchbookLocationField.getText()), new File(PreferencesData.get("runtime.ide.path")))) { - errors.add(_("The specified sketchbook folder contains your copy of the IDE.\nPlease choose a different folder for your sketchbook.")); + errors.add(tr("The specified sketchbook folder contains your copy of the IDE.\nPlease choose a different folder for your sketchbook.")); } return errors; } @@ -542,7 +542,7 @@ public class Preferences extends javax.swing.JDialog { PreferencesData.set("editor.font", PApplet.join(pieces, ',')); } catch (Exception e) { - System.err.println(I18n.format(_("ignoring invalid font size {0}"), newSizeText)); + System.err.println(I18n.format(tr("ignoring invalid font size {0}"), newSizeText)); } // put each of the settings into the table diff --git a/app/src/processing/app/AbstractMonitor.java b/app/src/processing/app/AbstractMonitor.java index 77681994a..cd9f47b76 100644 --- a/app/src/processing/app/AbstractMonitor.java +++ b/app/src/processing/app/AbstractMonitor.java @@ -1,11 +1,7 @@ package processing.app; -import static processing.app.I18n._; - -import java.awt.BorderLayout; import java.awt.Container; import java.awt.Dimension; -import java.awt.Font; import java.awt.Rectangle; import java.awt.Toolkit; import java.awt.event.ActionEvent; @@ -14,20 +10,12 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import javax.swing.AbstractAction; -import javax.swing.Box; -import javax.swing.BoxLayout; import javax.swing.JComponent; import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JPanel; import javax.swing.KeyStroke; -import javax.swing.SwingUtilities; import javax.swing.Timer; -import javax.swing.border.EmptyBorder; -import javax.swing.text.DefaultCaret; import cc.arduino.packages.BoardPort; -import processing.app.debug.TextAreaFIFO; import processing.app.legacy.PApplet; @SuppressWarnings("serial") diff --git a/app/src/processing/app/AbstractTextMonitor.java b/app/src/processing/app/AbstractTextMonitor.java index 5f720d702..72239a668 100644 --- a/app/src/processing/app/AbstractTextMonitor.java +++ b/app/src/processing/app/AbstractTextMonitor.java @@ -1,38 +1,29 @@ package processing.app; -import static processing.app.I18n._; +import static processing.app.I18n.tr; import java.awt.BorderLayout; import java.awt.Container; import java.awt.Dimension; import java.awt.Font; -import java.awt.Rectangle; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import javax.swing.AbstractAction; import javax.swing.Box; import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextField; -import javax.swing.KeyStroke; import javax.swing.SwingUtilities; import javax.swing.border.EmptyBorder; import javax.swing.text.DefaultCaret; import cc.arduino.packages.BoardPort; import processing.app.debug.TextAreaFIFO; -import processing.app.legacy.PApplet; @SuppressWarnings("serial") public abstract class AbstractTextMonitor extends AbstractMonitor { @@ -76,7 +67,7 @@ public abstract class AbstractTextMonitor extends AbstractMonitor { upperPane.setBorder(new EmptyBorder(4, 4, 4, 4)); textField = new JTextField(40); - sendButton = new JButton(_("Send")); + sendButton = new JButton(tr("Send")); upperPane.add(textField); upperPane.add(Box.createRigidArea(new Dimension(4, 0))); @@ -88,16 +79,16 @@ public abstract class AbstractTextMonitor extends AbstractMonitor { pane.setLayout(new BoxLayout(pane, BoxLayout.X_AXIS)); pane.setBorder(new EmptyBorder(4, 4, 4, 4)); - autoscrollBox = new JCheckBox(_("Autoscroll"), true); + autoscrollBox = new JCheckBox(tr("Autoscroll"), true); - noLineEndingAlert = new JLabel(I18n.format(_("You've pressed {0} but nothing was sent. Should you select a line ending?"), _("Send"))); + noLineEndingAlert = new JLabel(I18n.format(tr("You've pressed {0} but nothing was sent. Should you select a line ending?"), tr("Send"))); noLineEndingAlert.setToolTipText(noLineEndingAlert.getText()); noLineEndingAlert.setForeground(pane.getBackground()); Dimension minimumSize = new Dimension(noLineEndingAlert.getMinimumSize()); minimumSize.setSize(minimumSize.getWidth() / 3, minimumSize.getHeight()); noLineEndingAlert.setMinimumSize(minimumSize); - lineEndings = new JComboBox(new String[]{_("No line ending"), _("Newline"), _("Carriage return"), _("Both NL & CR")}); + lineEndings = new JComboBox(new String[]{tr("No line ending"), tr("Newline"), tr("Carriage return"), tr("Both NL & CR")}); lineEndings.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent event) { PreferencesData.setInteger("serial.line_ending", lineEndings.getSelectedIndex()); @@ -111,7 +102,7 @@ public abstract class AbstractTextMonitor extends AbstractMonitor { serialRates = new JComboBox(); for (String rate : serialRateStrings) { - serialRates.addItem(rate + " " + _("baud")); + serialRates.addItem(rate + " " + tr("baud")); } serialRates.setMaximumSize(serialRates.getMinimumSize()); @@ -157,4 +148,4 @@ public abstract class AbstractTextMonitor extends AbstractMonitor { } }); } -} \ No newline at end of file +} diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index daa2069ee..403b88f40 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -69,7 +69,7 @@ import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.Logger; -import static processing.app.I18n._; +import static processing.app.I18n.tr; /** @@ -129,7 +129,7 @@ public class Base { System.setProperty("swing.aatext", "true"); System.setProperty("java.net.useSystemProxies", "true"); - splashScreenHelper.splashText(_("Loading configuration...")); + splashScreenHelper.splashText(tr("Loading configuration...")); if (OSUtils.isMacOS()) { ThinkDifferent.init(); @@ -292,9 +292,9 @@ public class Base { } } - splashScreenHelper.splashText(_("Initializing packages...")); + splashScreenHelper.splashText(tr("Initializing packages...")); BaseNoGui.initPackages(); - splashScreenHelper.splashText(_("Preparing boards...")); + splashScreenHelper.splashText(tr("Preparing boards...")); rebuildBoardsMenu(); rebuildProgrammerMenu(); @@ -326,7 +326,7 @@ public class Base { if (!parser.isForceSavePrefs()) PreferencesData.setDoSave(showEditor); if (handleOpen(file, nextEditorLocation(), showEditor, false) == null) { - String mess = I18n.format(_("Failed to open sketch: \"{0}\""), path); + String mess = I18n.format(tr("Failed to open sketch: \"{0}\""), path); // Open failure is fatal in upload/verify mode if (parser.isVerifyOrUploadMode()) showError(null, mess, 2); @@ -371,7 +371,7 @@ public class Base { } } if (selected == null) { - System.out.println(_("Selected board is not available")); + System.out.println(tr("Selected board is not available")); System.exit(1); } @@ -420,7 +420,7 @@ public class Base { } } if (selected == null) { - System.out.println(_("Selected library is not available")); + System.out.println(tr("Selected library is not available")); System.exit(1); } @@ -448,10 +448,10 @@ public class Base { Editor editor = editors.get(0); if (parser.isUploadMode()) { - splashScreenHelper.splashText(_("Verifying and uploading...")); + splashScreenHelper.splashText(tr("Verifying and uploading...")); editor.exportHandler.run(); } else { - splashScreenHelper.splashText(_("Verifying...")); + splashScreenHelper.splashText(tr("Verifying...")); editor.runHandler.run(); } @@ -463,7 +463,7 @@ public class Base { // No errors exit gracefully System.exit(0); } else if (parser.isGuiMode()) { - splashScreenHelper.splashText(_("Starting...")); + splashScreenHelper.splashText(tr("Starting...")); installKeyboardInputMap(); @@ -726,13 +726,13 @@ public class Base { if (index == 26*26) { // In 0166, avoid running past zz by sending people outdoors. if (!breakTime) { - showWarning(_("Time for a Break"), - _("You've reached the limit for auto naming of new sketches\n" + + showWarning(tr("Time for a Break"), + tr("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); + showWarning(tr("Sunshine"), + tr("No really, time for some fresh air for you."), null); } return null; } @@ -841,7 +841,7 @@ public class Base { */ public void handleOpenPrompt() throws Exception { // get the frontmost window frame for placing file dialog - FileDialog fd = new FileDialog(activeEditor, _("Open an Arduino sketch..."), FileDialog.LOAD); + FileDialog fd = new FileDialog(activeEditor, tr("Open an Arduino sketch..."), FileDialog.LOAD); File lastFolder = new File(PreferencesData.get("last.folder", BaseNoGui.getSketchbookFolder().getAbsolutePath())); if (lastFolder.exists() && lastFolder.isFile()) { lastFolder = lastFolder.getParentFile(); @@ -1104,7 +1104,7 @@ public class Base { menu.removeAll(); // Add the single "Open" item - item = Editor.newJMenuItem(_("Open..."), 'O'); + item = Editor.newJMenuItem(tr("Open..."), 'O'); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { try { @@ -1165,7 +1165,7 @@ public class Base { return; importMenu.removeAll(); - JMenuItem menu = new JMenuItem(_("Manage Libraries...")); + JMenuItem menu = new JMenuItem(tr("Manage Libraries...")); menu.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { openManageLibrariesDialog(); @@ -1174,7 +1174,7 @@ public class Base { importMenu.add(menu); importMenu.addSeparator(); - JMenuItem addLibraryMenuItem = new JMenuItem(_("Add .ZIP Library...")); + JMenuItem addLibraryMenuItem = new JMenuItem(tr("Add .ZIP Library...")); addLibraryMenuItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { Base.this.handleAddLibrary(); @@ -1198,7 +1198,7 @@ public class Base { importMenu.addSeparator(); } lastLibType = lib.getTypes().get(0); - JMenuItem platformItem = new JMenuItem(I18n.format(_("{0} libraries"), lastLibType)); + JMenuItem platformItem = new JMenuItem(I18n.format(tr("{0} libraries"), lastLibType)); platformItem.setEnabled(false); importMenu.add(platformItem); } @@ -1209,7 +1209,7 @@ public class Base { try { activeEditor.getSketch().importLibrary(l); } catch (IOException e) { - showWarning(_("Error"), I18n.format("Unable to list header files in {0}", l.getSrcFolder()), e); + showWarning(tr("Error"), I18n.format("Unable to list header files in {0}", l.getSrcFolder()), e); } } }; @@ -1313,11 +1313,11 @@ public class Base { boardsCustomMenus = new LinkedList<>(); // The first custom menu is the "Board" selection submenu - JMenu boardMenu = new JMenu(_("Board")); + JMenu boardMenu = new JMenu(tr("Board")); boardMenu.putClientProperty("removeOnWindowDeactivation", true); MenuScroller.setScrollerFor(boardMenu); - openBoardsManager = new AbstractAction(_("Boards Manager...")) { + openBoardsManager = new AbstractAction(tr("Boards Manager...")) { public void actionPerformed(ActionEvent actionevent) { String filterText = ""; if (actionevent instanceof cc.arduino.view.Event) { @@ -1349,7 +1349,7 @@ public class Base { } } for (String customMenuTitle : customMenusTitles) { - JMenu customMenu = new JMenu(_(customMenuTitle)); + JMenu customMenu = new JMenu(tr(customMenuTitle)); customMenu.putClientProperty("removeOnWindowDeactivation", true); boardsCustomMenus.add(customMenu); } @@ -1373,7 +1373,7 @@ public class Base { // Add a title for each platform String platformLabel = targetPlatform.getPreferences().get("name"); if (platformLabel != null && !targetPlatform.getBoards().isEmpty()) { - JMenuItem menuLabel = new JMenuItem(_(platformLabel)); + JMenuItem menuLabel = new JMenuItem(tr(platformLabel)); menuLabel.setEnabled(false); boardMenu.add(menuLabel); } @@ -1436,13 +1436,13 @@ public class Base { PreferencesMap customMenus = targetPlatform.getCustomMenus(); for (final String menuId : customMenus.keySet()) { String title = customMenus.get(menuId); - JMenu menu = getBoardCustomMenu(_(title)); + JMenu menu = getBoardCustomMenu(tr(title)); if (board.hasMenu(menuId)) { PreferencesMap boardCustomMenu = board.getMenuLabels(menuId); for (String customMenuOption : boardCustomMenu.keySet()) { @SuppressWarnings("serial") - Action subAction = new AbstractAction(_(boardCustomMenu.get(customMenuOption))) { + Action subAction = new AbstractAction(tr(boardCustomMenu.get(customMenuOption))) { public void actionPerformed(ActionEvent e) { PreferencesData.set("custom_" + menuId, ((TargetBoard) getValue("board")).getId() + "_" + getValue("custom_menu_option")); onBoardOrPortChange(); @@ -1628,8 +1628,8 @@ public class Base { e1.printStackTrace(); } } else { - showWarning(_("Sketch Does Not Exist"), - _("The selected sketch no longer exists.\n" + showWarning(tr("Sketch Does Not Exist"), + tr("The selected sketch no longer exists.\n" + "You may need to restart Arduino to update\n" + "the sketchbook menu."), null); } @@ -1647,13 +1647,13 @@ public class Base { if (!builtOnce) { String complaining = I18n .format( - _("The sketch \"{0}\" cannot be used.\n" + tr("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); + showMessage(tr("Ignoring sketch with bad name"), complaining); } return false; } @@ -1692,7 +1692,7 @@ public class Base { try { activeEditor.getSketch().importLibrary(l); } catch (IOException e) { - showWarning(_("Error"), I18n.format("Unable to list header files in {0}", l.getSrcFolder()), e); + showWarning(tr("Error"), I18n.format("Unable to list header files in {0}", l.getSrcFolder()), e); } } }; @@ -1792,8 +1792,8 @@ public class Base { } if (!result) { - showError(_("You forgot your sketchbook"), - _("Arduino cannot run because it could not\n" + + showError(tr("You forgot your sketchbook"), + tr("Arduino cannot run because it could not\n" + "create a folder to store your sketchbook."), null); } @@ -1813,7 +1813,7 @@ public class Base { return folder; } - String prompt = _("Select (or create new) folder for sketches..."); + String prompt = tr("Select (or create new) folder for sketches..."); folder = selectFolder(prompt, null, null); if (folder == null) { System.exit(0); @@ -1837,8 +1837,8 @@ public class Base { BaseNoGui.getPlatform().openURL(url); } catch (Exception e) { - showWarning(_("Problem Opening URL"), - I18n.format(_("Could not open the URL\n{0}"), url), e); + showWarning(tr("Problem Opening URL"), + I18n.format(tr("Could not open the URL\n{0}"), url), e); } } @@ -1862,8 +1862,8 @@ public class Base { BaseNoGui.getPlatform().openFolder(file); } catch (Exception e) { - showWarning(_("Problem Opening Folder"), - I18n.format(_("Could not open the folder\n{0}"), file.getAbsolutePath()), e); + showWarning(tr("Problem Opening Folder"), + I18n.format(tr("Could not open the folder\n{0}"), file.getAbsolutePath()), e); } } @@ -1943,7 +1943,7 @@ public class Base { if(referenceFile.exists()){ openURL(referenceFile.getAbsolutePath()); }else{ - showWarning(_("Problem Opening URL"), I18n.format(_("Could not open the URL\n{0}"), referenceFile), null); + showWarning(tr("Problem Opening URL"), I18n.format(tr("Could not open the URL\n{0}"), referenceFile), null); } } @@ -2268,9 +2268,9 @@ public class Base { public void handleAddLibrary() { JFileChooser fileChooser = new JFileChooser(System.getProperty("user.home")); - fileChooser.setDialogTitle(_("Select a zip file or a folder containing the library you'd like to add")); + fileChooser.setDialogTitle(tr("Select a zip file or a folder containing the library you'd like to add")); fileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); - fileChooser.setFileFilter(new FileNameExtensionFilter(_("ZIP files or folders"), "zip")); + fileChooser.setFileFilter(new FileNameExtensionFilter(tr("ZIP files or folders"), "zip")); Dimension preferredSize = fileChooser.getPreferredSize(); fileChooser.setPreferredSize(new Dimension(preferredSize.width + 200, preferredSize.height + 200)); @@ -2293,7 +2293,7 @@ public class Base { zipDeflater.deflate(); File[] foldersInTmpFolder = tmpFolder.listFiles(new OnlyDirs()); if (foldersInTmpFolder.length != 1) { - throw new IOException(_("Zip doesn't contain a library")); + throw new IOException(tr("Zip doesn't contain a library")); } sourceFile = foldersInTmpFolder[0]; } catch (IOException e) { @@ -2304,18 +2304,18 @@ public class Base { File libFolder = sourceFile; if (FileUtils.isSubDirectory(new File(PreferencesData.get("sketchbook.path")), libFolder)) { - activeEditor.statusError(_("A subfolder of your sketchbook is not a valid library")); + activeEditor.statusError(tr("A subfolder of your sketchbook is not a valid library")); return; } if (FileUtils.isSubDirectory(libFolder, new File(PreferencesData.get("sketchbook.path")))) { - activeEditor.statusError(_("You can't import a folder that contains your sketchbook")); + activeEditor.statusError(tr("You can't import a folder that contains your sketchbook")); return; } String libName = libFolder.getName(); if (!BaseNoGui.isSanitaryName(libName)) { - String mess = I18n.format(_("The library \"{0}\" cannot be used.\n" + String mess = I18n.format(tr("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); @@ -2330,14 +2330,14 @@ public class Base { headers = BaseNoGui.headerListFromIncludePath(libFolder); } if (headers.length == 0) { - activeEditor.statusError(_("Specified folder/zip file does not contain a valid library")); + activeEditor.statusError(tr("Specified folder/zip file does not contain a valid library")); return; } // copy folder File destinationFolder = new File(BaseNoGui.getSketchbookLibrariesFolder(), sourceFile.getName()); if (!destinationFolder.mkdir()) { - activeEditor.statusError(I18n.format(_("A library named {0} already exists"), sourceFile.getName())); + activeEditor.statusError(I18n.format(tr("A library named {0} already exists"), sourceFile.getName())); return; } try { @@ -2346,7 +2346,7 @@ public class Base { activeEditor.statusError(e); return; } - activeEditor.statusNotice(_("Library added to your libraries. Check \"Include library\" menu")); + activeEditor.statusNotice(tr("Library added to your libraries. Check \"Include library\" menu")); } catch (IOException e) { // FIXME error when importing. ignoring :( } finally { diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java index 226785da0..575efda4f 100644 --- a/app/src/processing/app/Editor.java +++ b/app/src/processing/app/Editor.java @@ -75,7 +75,7 @@ import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import static processing.app.I18n._; +import static processing.app.I18n.tr; /** * Main editor panel for the Processing Development Environment. @@ -106,7 +106,7 @@ public class Editor extends JFrame implements RunnerListener { } private final static List BOARD_PROTOCOLS_ORDER = Arrays.asList("serial", "network"); - private final static List BOARD_PROTOCOLS_ORDER_TRANSLATIONS = Arrays.asList(_("Serial ports"), _("Network ports")); + private final static List BOARD_PROTOCOLS_ORDER_TRANSLATIONS = Arrays.asList(tr("Serial ports"), tr("Network ports")); final Base base; @@ -416,14 +416,14 @@ public class Editor extends JFrame implements RunnerListener { } if (successful == 0) { - statusError(_("No files were added to the sketch.")); + statusError(tr("No files were added to the sketch.")); } else if (successful == 1) { - statusNotice(_("One file added to the sketch.")); + statusNotice(tr("One file added to the sketch.")); } else { statusNotice( - I18n.format(_("{0} files added to the sketch."), successful)); + I18n.format(tr("{0} files added to the sketch."), successful)); } return true; } @@ -550,7 +550,7 @@ public class Editor extends JFrame implements RunnerListener { menubar.add(buildEditMenu()); - final JMenu sketchMenu = new JMenu(_("Sketch")); + final JMenu sketchMenu = new JMenu(tr("Sketch")); sketchMenu.setMnemonic(KeyEvent.VK_S); sketchMenu.addMenuListener(new StubMenuListener() { @@ -594,10 +594,10 @@ public class Editor extends JFrame implements RunnerListener { private JMenu buildFileMenu() { JMenuItem item; - fileMenu = new JMenu(_("File")); + fileMenu = new JMenu(tr("File")); fileMenu.setMnemonic(KeyEvent.VK_F); - item = newJMenuItem(_("New"), 'N'); + item = newJMenuItem(tr("New"), 'N'); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { try { @@ -609,7 +609,7 @@ public class Editor extends JFrame implements RunnerListener { }); fileMenu.add(item); - item = Editor.newJMenuItem(_("Open..."), 'O'); + item = Editor.newJMenuItem(tr("Open..."), 'O'); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { try { @@ -622,7 +622,7 @@ public class Editor extends JFrame implements RunnerListener { fileMenu.add(item); base.rebuildRecentSketchesMenuItems(); - recentSketchesMenu = new JMenu(_("Open Recent")); + recentSketchesMenu = new JMenu(tr("Open Recent")); SwingUtilities.invokeLater(new Runnable() { @Override public void run() { @@ -632,20 +632,20 @@ public class Editor extends JFrame implements RunnerListener { fileMenu.add(recentSketchesMenu); if (sketchbookMenu == null) { - sketchbookMenu = new JMenu(_("Sketchbook")); + sketchbookMenu = new JMenu(tr("Sketchbook")); MenuScroller.setScrollerFor(sketchbookMenu); base.rebuildSketchbookMenu(sketchbookMenu); } fileMenu.add(sketchbookMenu); if (examplesMenu == null) { - examplesMenu = new JMenu(_("Examples")); + examplesMenu = new JMenu(tr("Examples")); MenuScroller.setScrollerFor(examplesMenu); base.rebuildExamplesMenu(examplesMenu); } fileMenu.add(examplesMenu); - item = Editor.newJMenuItem(_("Close"), 'W'); + item = Editor.newJMenuItem(tr("Close"), 'W'); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { base.handleClose(Editor.this); @@ -653,7 +653,7 @@ public class Editor extends JFrame implements RunnerListener { }); fileMenu.add(item); - saveMenuItem = newJMenuItem(_("Save"), 'S'); + saveMenuItem = newJMenuItem(tr("Save"), 'S'); saveMenuItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { handleSave(false); @@ -661,7 +661,7 @@ public class Editor extends JFrame implements RunnerListener { }); fileMenu.add(saveMenuItem); - saveAsMenuItem = newJMenuItemShift(_("Save As..."), 'S'); + saveAsMenuItem = newJMenuItemShift(tr("Save As..."), 'S'); saveAsMenuItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { handleSaveAs(); @@ -671,7 +671,7 @@ public class Editor extends JFrame implements RunnerListener { fileMenu.addSeparator(); - item = newJMenuItemShift(_("Page Setup"), 'P'); + item = newJMenuItemShift(tr("Page Setup"), 'P'); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { handlePageSetup(); @@ -679,7 +679,7 @@ public class Editor extends JFrame implements RunnerListener { }); fileMenu.add(item); - item = newJMenuItem(_("Print"), 'P'); + item = newJMenuItem(tr("Print"), 'P'); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { handlePrint(); @@ -691,7 +691,7 @@ public class Editor extends JFrame implements RunnerListener { if (!OSUtils.isMacOS()) { fileMenu.addSeparator(); - item = newJMenuItem(_("Preferences"), ','); + item = newJMenuItem(tr("Preferences"), ','); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { base.handlePrefs(); @@ -701,7 +701,7 @@ public class Editor extends JFrame implements RunnerListener { fileMenu.addSeparator(); - item = newJMenuItem(_("Quit"), 'Q'); + item = newJMenuItem(tr("Quit"), 'Q'); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { base.handleQuit(); @@ -722,7 +722,7 @@ public class Editor extends JFrame implements RunnerListener { private void buildSketchMenu(JMenu sketchMenu) { sketchMenu.removeAll(); - JMenuItem item = newJMenuItem(_("Verify / Compile"), 'R'); + JMenuItem item = newJMenuItem(tr("Verify / Compile"), 'R'); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { handleRun(false, Editor.this.presentHandler, Editor.this.runHandler); @@ -730,7 +730,7 @@ public class Editor extends JFrame implements RunnerListener { }); sketchMenu.add(item); - item = newJMenuItem(_("Upload"), 'U'); + item = newJMenuItem(tr("Upload"), 'U'); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { handleExport(false); @@ -738,7 +738,7 @@ public class Editor extends JFrame implements RunnerListener { }); sketchMenu.add(item); - item = newJMenuItemShift(_("Upload Using Programmer"), 'U'); + item = newJMenuItemShift(tr("Upload Using Programmer"), 'U'); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { handleExport(true); @@ -747,7 +747,7 @@ public class Editor extends JFrame implements RunnerListener { sketchMenu.add(item); - item = newJMenuItemAlt(_("Export compiled Binary"), 'S'); + item = newJMenuItemAlt(tr("Export compiled Binary"), 'S'); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { handleRun(false, new ShouldSaveReadOnly(), Editor.this.presentAndSaveHandler, Editor.this.runAndSaveHandler); @@ -765,7 +765,7 @@ public class Editor extends JFrame implements RunnerListener { sketchMenu.addSeparator(); - item = newJMenuItem(_("Show Sketch Folder"), 'K'); + item = newJMenuItem(tr("Show Sketch Folder"), 'K'); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { Base.openFolder(sketch.getFolder()); @@ -775,13 +775,13 @@ public class Editor extends JFrame implements RunnerListener { item.setEnabled(Base.openFolderAvailable()); if (importMenu == null) { - importMenu = new JMenu(_("Include Library")); + importMenu = new JMenu(tr("Include Library")); MenuScroller.setScrollerFor(importMenu); base.rebuildImportMenu(importMenu); } sketchMenu.add(importMenu); - item = new JMenuItem(_("Add File...")); + item = new JMenuItem(tr("Add File...")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { sketch.handleAddFile(); @@ -792,16 +792,16 @@ public class Editor extends JFrame implements RunnerListener { private JMenu buildToolsMenu() { - toolsMenu = new JMenu(_("Tools")); + toolsMenu = new JMenu(tr("Tools")); toolsMenu.setMnemonic(KeyEvent.VK_T); addInternalTools(toolsMenu); - JMenuItem item = newJMenuItemShift(_("Serial Monitor"), 'M'); + JMenuItem item = newJMenuItemShift(tr("Serial Monitor"), 'M'); item.addActionListener(e -> handleSerial()); toolsMenu.add(item); - item = newJMenuItemShift(_("Serial Plotter"), 'L'); + item = newJMenuItemShift(tr("Serial Plotter"), 'L'); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { handlePlotter(); @@ -823,17 +823,17 @@ public class Editor extends JFrame implements RunnerListener { base.getBoardsCustomMenus().stream().forEach(toolsMenu::add); if (portMenu == null) - portMenu = new JMenu(_("Port")); + portMenu = new JMenu(tr("Port")); populatePortMenu(); toolsMenu.add(portMenu); toolsMenu.addSeparator(); base.rebuildProgrammerMenu(); - programmersMenu = new JMenu(_("Programmer")); + programmersMenu = new JMenu(tr("Programmer")); base.getProgrammerMenus().stream().forEach(programmersMenu::add); toolsMenu.add(programmersMenu); - item = new JMenuItem(_("Burn Bootloader")); + item = new JMenuItem(tr("Burn Bootloader")); item.addActionListener(e -> handleBurnBootloader()); toolsMenu.add(item); @@ -1116,11 +1116,11 @@ public class Editor extends JFrame implements RunnerListener { private void selectSerialPort(String name) { if(portMenu == null) { - System.out.println(_("serialMenu is null")); + System.out.println(tr("serialMenu is null")); return; } if (name == null) { - System.out.println(_("name is null")); + System.out.println(tr("name is null")); return; } JCheckBoxMenuItem selection = null; @@ -1192,7 +1192,7 @@ public class Editor extends JFrame implements RunnerListener { } else { lastProtocolTranslated = port.getProtocol(); } - JMenuItem lastProtocolMenuItem = new JMenuItem(_(lastProtocolTranslated)); + JMenuItem lastProtocolMenuItem = new JMenuItem(tr(lastProtocolTranslated)); lastProtocolMenuItem.setEnabled(false); portMenu.add(lastProtocolMenuItem); } @@ -1211,7 +1211,7 @@ public class Editor extends JFrame implements RunnerListener { private JMenu buildHelpMenu() { // To deal with a Mac OS X 10.5 bug, add an extra space after the name // so that the OS doesn't try to insert its slow help menu. - JMenu menu = new JMenu(_("Help")); + JMenu menu = new JMenu(tr("Help")); menu.setMnemonic(KeyEvent.VK_H); JMenuItem item; @@ -1251,7 +1251,7 @@ public class Editor extends JFrame implements RunnerListener { menu.add(item); */ - item = new JMenuItem(_("Getting Started")); + item = new JMenuItem(tr("Getting Started")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { Base.showArduinoGettingStarted(); @@ -1259,7 +1259,7 @@ public class Editor extends JFrame implements RunnerListener { }); menu.add(item); - item = new JMenuItem(_("Environment")); + item = new JMenuItem(tr("Environment")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { Base.showEnvironment(); @@ -1267,7 +1267,7 @@ public class Editor extends JFrame implements RunnerListener { }); menu.add(item); - item = new JMenuItem(_("Troubleshooting")); + item = new JMenuItem(tr("Troubleshooting")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { Base.showTroubleshooting(); @@ -1275,7 +1275,7 @@ public class Editor extends JFrame implements RunnerListener { }); menu.add(item); - item = new JMenuItem(_("Reference")); + item = new JMenuItem(tr("Reference")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { Base.showReference(); @@ -1285,18 +1285,18 @@ public class Editor extends JFrame implements RunnerListener { menu.addSeparator(); - item = new JMenuItem(_("Galileo Help")); + item = new JMenuItem(tr("Galileo Help")); item.setEnabled(false); menu.add(item); - item = new JMenuItem(_("Getting Started")); + item = new JMenuItem(tr("Getting Started")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { Base.showReference("reference/Galileo_help_files", "ArduinoIDE_guide_galileo"); } }); menu.add(item); - item = new JMenuItem(_("Troubleshooting")); + item = new JMenuItem(tr("Troubleshooting")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { Base.showReference("reference/Galileo_help_files", "Guide_Troubleshooting_Galileo"); @@ -1306,18 +1306,18 @@ public class Editor extends JFrame implements RunnerListener { menu.addSeparator(); - item = new JMenuItem(_("Edison Help")); + item = new JMenuItem(tr("Edison Help")); item.setEnabled(false); menu.add(item); - item = new JMenuItem(_("Getting Started")); + item = new JMenuItem(tr("Getting Started")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { Base.showReference("reference/Edison_help_files", "ArduinoIDE_guide_edison"); } }); menu.add(item); - item = new JMenuItem(_("Troubleshooting")); + item = new JMenuItem(tr("Troubleshooting")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { Base.showReference("reference/Edison_help_files", "Guide_Troubleshooting_Edison"); @@ -1327,7 +1327,7 @@ public class Editor extends JFrame implements RunnerListener { menu.addSeparator(); - item = newJMenuItemShift(_("Find in Reference"), 'F'); + item = newJMenuItemShift(tr("Find in Reference"), 'F'); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // if (textarea.isSelectionActive()) { @@ -1338,7 +1338,7 @@ public class Editor extends JFrame implements RunnerListener { }); menu.add(item); - item = new JMenuItem(_("Frequently Asked Questions")); + item = new JMenuItem(tr("Frequently Asked Questions")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { Base.showFAQ(); @@ -1346,10 +1346,10 @@ public class Editor extends JFrame implements RunnerListener { }); menu.add(item); - item = new JMenuItem(_("Visit Arduino.cc")); + item = new JMenuItem(tr("Visit Arduino.cc")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - Base.openURL(_("http://www.arduino.cc/")); + Base.openURL(tr("http://www.arduino.cc/")); } }); menu.add(item); @@ -1357,7 +1357,7 @@ public class Editor extends JFrame implements RunnerListener { // macosx already has its own about menu if (!OSUtils.isMacOS()) { menu.addSeparator(); - item = new JMenuItem(_("About Arduino")); + item = new JMenuItem(tr("About Arduino")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { base.handleAbout(); @@ -1371,19 +1371,19 @@ public class Editor extends JFrame implements RunnerListener { private JMenu buildEditMenu() { - JMenu menu = new JMenu(_("Edit")); + JMenu menu = new JMenu(tr("Edit")); menu.setName("menuEdit"); menu.setMnemonic(KeyEvent.VK_E); - undoItem = newJMenuItem(_("Undo"), 'Z'); + undoItem = newJMenuItem(tr("Undo"), 'Z'); undoItem.setName("menuEditUndo"); undoItem.addActionListener(undoAction = new UndoAction()); menu.add(undoItem); if (!OSUtils.isMacOS()) { - redoItem = newJMenuItem(_("Redo"), 'Y'); + redoItem = newJMenuItem(tr("Redo"), 'Y'); } else { - redoItem = newJMenuItemShift(_("Redo"), 'Z'); + redoItem = newJMenuItemShift(tr("Redo"), 'Z'); } redoItem.setName("menuEditRedo"); redoItem.addActionListener(redoAction = new RedoAction()); @@ -1393,7 +1393,7 @@ public class Editor extends JFrame implements RunnerListener { // TODO "cut" and "copy" should really only be enabled // if some text is currently selected - JMenuItem cutItem = newJMenuItem(_("Cut"), 'X'); + JMenuItem cutItem = newJMenuItem(tr("Cut"), 'X'); cutItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { handleCut(); @@ -1401,7 +1401,7 @@ public class Editor extends JFrame implements RunnerListener { }); menu.add(cutItem); - JMenuItem copyItem = newJMenuItem(_("Copy"), 'C'); + JMenuItem copyItem = newJMenuItem(tr("Copy"), 'C'); copyItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { textarea.copy(); @@ -1409,7 +1409,7 @@ public class Editor extends JFrame implements RunnerListener { }); menu.add(copyItem); - JMenuItem copyForumItem = newJMenuItemShift(_("Copy for Forum"), 'C'); + JMenuItem copyForumItem = newJMenuItemShift(tr("Copy for Forum"), 'C'); copyForumItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // SwingUtilities.invokeLater(new Runnable() { @@ -1421,7 +1421,7 @@ public class Editor extends JFrame implements RunnerListener { }); menu.add(copyForumItem); - JMenuItem copyHTMLItem = newJMenuItemAlt(_("Copy as HTML"), 'C'); + JMenuItem copyHTMLItem = newJMenuItemAlt(tr("Copy as HTML"), 'C'); copyHTMLItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // SwingUtilities.invokeLater(new Runnable() { @@ -1433,7 +1433,7 @@ public class Editor extends JFrame implements RunnerListener { }); menu.add(copyHTMLItem); - JMenuItem pasteItem = newJMenuItem(_("Paste"), 'V'); + JMenuItem pasteItem = newJMenuItem(tr("Paste"), 'V'); pasteItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { textarea.paste(); @@ -1442,7 +1442,7 @@ public class Editor extends JFrame implements RunnerListener { }); menu.add(pasteItem); - JMenuItem selectAllItem = newJMenuItem(_("Select All"), 'A'); + JMenuItem selectAllItem = newJMenuItem(tr("Select All"), 'A'); selectAllItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { textarea.selectAll(); @@ -1452,7 +1452,7 @@ public class Editor extends JFrame implements RunnerListener { menu.addSeparator(); - JMenuItem commentItem = newJMenuItem(_("Comment/Uncomment"), '/'); + JMenuItem commentItem = newJMenuItem(tr("Comment/Uncomment"), '/'); commentItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { handleCommentUncomment(); @@ -1460,7 +1460,7 @@ public class Editor extends JFrame implements RunnerListener { }); menu.add(commentItem); - JMenuItem increaseIndentItem = new JMenuItem(_("Increase Indent")); + JMenuItem increaseIndentItem = new JMenuItem(tr("Increase Indent")); increaseIndentItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, 0)); increaseIndentItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -1469,7 +1469,7 @@ public class Editor extends JFrame implements RunnerListener { }); menu.add(increaseIndentItem); - JMenuItem decreseIndentItem = new JMenuItem(_("Decrease Indent")); + JMenuItem decreseIndentItem = new JMenuItem(tr("Decrease Indent")); decreseIndentItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, InputEvent.SHIFT_MASK)); decreseIndentItem.setName("menuDecreaseIndent"); decreseIndentItem.addActionListener(new ActionListener() { @@ -1481,7 +1481,7 @@ public class Editor extends JFrame implements RunnerListener { menu.addSeparator(); - JMenuItem findItem = newJMenuItem(_("Find..."), 'F'); + JMenuItem findItem = newJMenuItem(tr("Find..."), 'F'); findItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if (find == null) { @@ -1496,7 +1496,7 @@ public class Editor extends JFrame implements RunnerListener { }); menu.add(findItem); - JMenuItem findNextItem = newJMenuItem(_("Find Next"), 'G'); + JMenuItem findNextItem = newJMenuItem(tr("Find Next"), 'G'); findNextItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if (find != null) { @@ -1506,7 +1506,7 @@ public class Editor extends JFrame implements RunnerListener { }); menu.add(findNextItem); - JMenuItem findPreviousItem = newJMenuItemShift(_("Find Previous"), 'G'); + JMenuItem findPreviousItem = newJMenuItemShift(tr("Find Previous"), 'G'); findPreviousItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if (find != null) { @@ -1517,7 +1517,7 @@ public class Editor extends JFrame implements RunnerListener { menu.add(findPreviousItem); if (OSUtils.isMacOS()) { - JMenuItem useSelectionForFindItem = newJMenuItem(_("Use Selection For Find"), 'E'); + JMenuItem useSelectionForFindItem = newJMenuItem(tr("Use Selection For Find"), 'E'); useSelectionForFindItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if (find == null) { @@ -1598,7 +1598,7 @@ public class Editor extends JFrame implements RunnerListener { } else { this.setEnabled(false); undoItem.setEnabled(false); - undoItem.setText(_("Undo")); + undoItem.setText(tr("Undo")); putValue(Action.NAME, "Undo"); } } @@ -1631,7 +1631,7 @@ public class Editor extends JFrame implements RunnerListener { } else { this.setEnabled(false); redoItem.setEnabled(false); - redoItem.setText(_("Redo")); + redoItem.setText(tr("Redo")); putValue(Action.NAME, "Redo"); } } @@ -1925,7 +1925,7 @@ public class Editor extends JFrame implements RunnerListener { String referenceFile = base.getPdeKeywords().getReference(text); if (referenceFile == null) { - statusNotice(I18n.format(_("No reference available for \"{0}\""), text)); + statusNotice(I18n.format(tr("No reference available for \"{0}\""), text)); } else { Base.showReference("Reference/" + referenceFile); } @@ -1951,7 +1951,7 @@ public class Editor extends JFrame implements RunnerListener { handleSave(true); } toolbar.activateRun(); - status.progress(_("Compiling sketch...")); + status.progress(tr("Compiling sketch...")); // do this to advance/clear the terminal window / dos prompt / etc for (int i = 0; i < 10; i++) System.out.println(); @@ -1990,10 +1990,10 @@ public class Editor extends JFrame implements RunnerListener { textarea.removeAllLineHighlights(); sketch.prepare(); sketch.build(verbose, saveHex); - statusNotice(_("Done compiling.")); + statusNotice(tr("Done compiling.")); } catch (PreferencesMapException e) { statusError(I18n.format( - _("Error while compiling: missing '{0}' configuration parameter"), + tr("Error while compiling: missing '{0}' configuration parameter"), e.getMessage())); } catch (Exception e) { status.unprogress(); @@ -2053,11 +2053,11 @@ public class Editor extends JFrame implements RunnerListener { toFront(); - String prompt = I18n.format(_("Save changes to \"{0}\"? "), sketch.getName()); + String prompt = I18n.format(tr("Save changes to \"{0}\"? "), sketch.getName()); if (!OSUtils.isMacOS()) { int result = - JOptionPane.showConfirmDialog(this, prompt, _("Close"), + JOptionPane.showConfirmDialog(this, prompt, tr("Close"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); @@ -2083,7 +2083,7 @@ public class Editor extends JFrame implements RunnerListener { // I think it's nifty that they treat their developers like dirt. JOptionPane pane = - new JOptionPane(_(" " + + new JOptionPane(tr(" " + "