Index: trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (revision 8377) @@ -84,6 +84,6 @@ private UserInfo userInfo; - public DownloadOpenChangesetsTask() { - super(tr("Downloading open changesets ...", false /* don't ignore exceptions */)); + private DownloadOpenChangesetsTask() { + super(tr("Downloading open changesets ..."), false /* don't ignore exceptions */); } Index: trunk/src/org/openstreetmap/josm/actions/DistributeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/DistributeAction.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/actions/DistributeAction.java (revision 8377) @@ -111,5 +111,5 @@ * @return true in this case */ - private Boolean checkDistributeWay(Collection ways, Collection nodes) { + private boolean checkDistributeWay(Collection ways, Collection nodes) { if(ways.size() == 1 && nodes.size() <= 2) { Way w = ways.iterator().next(); Index: trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java (revision 8377) @@ -57,5 +57,5 @@ tr("Adjust the position of this imagery layer"), Main.map, cursor); - putValue("toolbar", false); + putValue("toolbar", Boolean.FALSE); this.layer = layer; } Index: trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (revision 8377) @@ -36,5 +36,5 @@ super(name, "mapmode/"+iconName, tooltip, shortcut, false); this.cursor = cursor; - putValue("active", false); + putValue("active", Boolean.FALSE); } @@ -53,5 +53,5 @@ */ public void enterMode() { - putValue("active", true); + putValue("active", Boolean.TRUE); Main.map.mapView.setNewCursor(cursor, this); updateStatusLine(); @@ -62,5 +62,5 @@ */ public void exitMode() { - putValue("active", false); + putValue("active", Boolean.FALSE); Main.map.mapView.resetCursor(this); } Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 8377) @@ -505,14 +505,14 @@ if (s.mode == SearchMode.replace) { if (matcher.match(osm)) { - p.set(osm, true); + p.set(osm, Boolean.TRUE); } else { - p.set(osm, false); + p.set(osm, Boolean.FALSE); } } else if (s.mode == SearchMode.add && !p.get(osm) && matcher.match(osm)) { - p.set(osm, true); + p.set(osm, Boolean.TRUE); } else if (s.mode == SearchMode.remove && p.get(osm) && matcher.match(osm)) { - p.set(osm, false); + p.set(osm, Boolean.FALSE); } else if (s.mode == SearchMode.in_selection && p.get(osm) && !matcher.match(osm)) { - p.set(osm, false); + p.set(osm, Boolean.FALSE); } } @@ -523,5 +523,4 @@ tr("Error"), JOptionPane.ERROR_MESSAGE - ); } Index: trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java (revision 8377) @@ -18,5 +18,5 @@ //not currently used. I'm planning on using this to keep track of new actions that need to be uploaded - private Boolean isNew; + private boolean isNew; /** @@ -33,5 +33,5 @@ * @param isNew Whether or not this comment is new and needs to be uploaded */ - public NoteComment(Date createDate, User user, String commentText, Action action, Boolean isNew) { + public NoteComment(Date createDate, User user, String commentText, Action action, boolean isNew) { this.text = commentText; this.user = user; @@ -61,10 +61,10 @@ } - public void setIsNew(Boolean isNew) { + public void setIsNew(boolean isNew) { this.isNew = isNew; } /** @return true if this is a new comment/action and needs to be uploaded to the API */ - public Boolean getIsNew() { + public boolean getIsNew() { return isNew; } Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 8377) @@ -954,10 +954,10 @@ Node firstNode = viaWay.firstNode(); Node lastNode = viaWay.lastNode(); - Boolean onewayvia = false; + Boolean onewayvia = Boolean.FALSE; String onewayviastr = viaWay.get("oneway"); if(onewayviastr != null) { if("-1".equals(onewayviastr)) { - onewayvia = true; + onewayvia = Boolean.TRUE; Node tmp = firstNode; firstNode = lastNode; @@ -966,5 +966,5 @@ onewayvia = OsmUtils.getOsmBoolean(onewayviastr); if (onewayvia == null) { - onewayvia = false; + onewayvia = Boolean.FALSE; } } Index: trunk/src/org/openstreetmap/josm/data/validation/TestError.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/TestError.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/data/validation/TestError.java (revision 8377) @@ -33,5 +33,5 @@ public class TestError implements Comparable, DataSetListener { /** is this error on the ignore list */ - private Boolean ignored = false; + private boolean ignored = false; /** Severity */ private Severity severity; @@ -208,5 +208,5 @@ } - public Boolean getIgnored() { + public boolean getIgnored() { return ignored; } Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 8377) @@ -349,5 +349,5 @@ } - Boolean skipLoadingPlugins = false; + boolean skipLoadingPlugins = false; if (args.containsKey(Option.SKIP_PLUGINS)) { skipLoadingPlugins = true; Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 8377) @@ -774,5 +774,5 @@ } - public static interface FreezeActionProperties { + private static interface FreezeActionProperties { String PROP_SELECTED = FreezeActionProperties.class.getName() + ".selected"; } @@ -782,10 +782,10 @@ * */ - class FreezeAction extends AbstractAction implements ItemListener, FreezeActionProperties { - - public FreezeAction() { + private class FreezeAction extends AbstractAction implements ItemListener, FreezeActionProperties { + + private FreezeAction() { putValue(Action.NAME, tr("Freeze")); putValue(Action.SHORT_DESCRIPTION, tr("Freeze the current list of merged elements.")); - putValue(PROP_SELECTED, false); + putValue(PROP_SELECTED, Boolean.FALSE); setEnabled(true); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 8377) @@ -173,6 +173,6 @@ layerList.addMouseListener(new PopupMenuHandler()); layerList.setBackground(UIManager.getColor("Button.background")); - layerList.putClientProperty("terminateEditOnFocusLost", true); - layerList.putClientProperty("JTable.autoStartsEdit", false); + layerList.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE); + layerList.putClientProperty("JTable.autoStartsEdit", Boolean.FALSE); layerList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); layerList.setTableHeader(null); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (revision 8377) @@ -140,5 +140,5 @@ tblStyles.setSelectionModel(selectionModel= new DefaultListSelectionModel()); tblStyles.addMouseListener(new PopupMenuHandler()); - tblStyles.putClientProperty("terminateEditOnFocusLost", true); + tblStyles.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE); tblStyles.setBackground(UIManager.getColor("Panel.background")); tblStyles.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 8377) @@ -312,6 +312,6 @@ setIsShowing(true); windowMenuItem.setState(true); - toggleAction.putValue("selected", false); - toggleAction.putValue("selected", true); + toggleAction.putValue("selected", Boolean.FALSE); + toggleAction.putValue("selected", Boolean.TRUE); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java (revision 8377) @@ -33,5 +33,5 @@ /** * Asynchronous task to send a changeset query to the OSM API. - * + * @since 2689 */ public class ChangesetQueryTask extends PleaseWaitRunnable implements ChangesetDownloadTask{ @@ -57,5 +57,5 @@ */ public ChangesetQueryTask(ChangesetQuery query) { - super(tr("Querying and downloading changesets",false /* don't ignore exceptions */)); + super(tr("Querying and downloading changesets"), false /* don't ignore exceptions */); CheckParameterUtil.ensureParameterNotNull(query, "query"); this.query = query; Index: trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (revision 8377) @@ -55,5 +55,5 @@ setBackground(UIManager.getColor("Button.background")); setIntercellSpacing(new Dimension(6, 0)); - putClientProperty("terminateEditOnFocusLost", true); + putClientProperty("terminateEditOnFocusLost", Boolean.TRUE); popupMenu = new VersionTablePopupMenu(); addMouseListener(new MouseListener()); Index: trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java (revision 8377) @@ -59,5 +59,5 @@ putValue(NAME, file); putValue("help", ht("/Action/OpenRecent")); - putValue("toolbar", false); + putValue("toolbar", Boolean.FALSE); } @Override Index: trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (revision 8377) @@ -40,5 +40,5 @@ zIndex = c.get(Z_INDEX, 0f, Float.class); objectZIndex = c.get(OBJECT_Z_INDEX, 0f, Float.class); - isModifier = c.get(MODIFIER, false, Boolean.class); + isModifier = c.get(MODIFIER, Boolean.FALSE, Boolean.class); } Index: trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (revision 8377) @@ -369,5 +369,5 @@ if (defaultNodesIdx == cacheIdx) return defaultNodes; - defaultNodes = fromCanvas("default-points", true, Boolean.class); + defaultNodes = fromCanvas("default-points", Boolean.TRUE, Boolean.class); defaultNodesIdx = cacheIdx; return defaultNodes; @@ -380,5 +380,5 @@ if (defaultLinesIdx == cacheIdx) return defaultLines; - defaultLines = fromCanvas("default-lines", true, Boolean.class); + defaultLines = fromCanvas("default-lines", Boolean.TRUE, Boolean.class); defaultLinesIdx = cacheIdx; return defaultLines; Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java (revision 8377) @@ -64,5 +64,5 @@ c = new Cascade(); if (!"default".equals(layer) && !"*".equals(layer)) { - c.put(MODIFIER, true); + c.put(MODIFIER, Boolean.TRUE); } } Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (revision 8377) @@ -969,8 +969,8 @@ Boolean b = Cascade.convertTo(arg.evaluate(env), boolean.class); if (b == null || !b) { - return false; + return Boolean.FALSE; } } - return true; + return Boolean.TRUE; } } @@ -996,8 +996,8 @@ Boolean b = Cascade.convertTo(arg.evaluate(env), boolean.class); if (b != null && b) { - return true; + return Boolean.TRUE; } } - return false; + return Boolean.FALSE; } } Index: trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 8377) @@ -327,5 +327,5 @@ tblIconPaths.getColumnModel().getColumn(0).setCellEditor(new FileOrUrlCellEditor(false)); tblIconPaths.setRowHeight(20); - tblIconPaths.putClientProperty("terminateEditOnFocusLost", true); + tblIconPaths.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE); iconPathsModel.setIconPaths(getInitialIconPathsList()); Index: trunk/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java (revision 8377) @@ -90,5 +90,5 @@ * @see #active */ - public SourceEntry(String url, String name, String title, Boolean active) { + public SourceEntry(String url, String name, String title, boolean active) { this(url, false, null, name, title, active); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java (revision 8377) @@ -69,5 +69,5 @@ ListSettingTableModel listModel = new ListSettingTableModel(); JTable table = new JTable(listModel); - table.putClientProperty("terminateEditOnFocusLost", true); + table.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE); table.setTableHeader(null); Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java (revision 8377) @@ -102,5 +102,5 @@ tableModel = new ListTableModel(); table = new JTable(tableModel); - table.putClientProperty("terminateEditOnFocusLost", true); + table.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE); table.setTableHeader(null); Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java (revision 8377) @@ -120,5 +120,5 @@ tableModel = new MapTableModel(); table = new JTable(tableModel); - table.putClientProperty("terminateEditOnFocusLost", true); + table.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE); table.getTableHeader().getColumnModel().getColumn(0).setHeaderValue(tr("Key")); table.getTableHeader().getColumnModel().getColumn(1).setHeaderValue(tr("Value")); Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java (revision 8377) @@ -53,5 +53,5 @@ model = new AllSettingsTableModel(); setModel(model); - putClientProperty("terminateEditOnFocusLost", true); + putClientProperty("terminateEditOnFocusLost", Boolean.TRUE); getColumnModel().getColumn(1).setCellRenderer(new SettingCellRenderer()); getColumnModel().getColumn(1).setCellEditor(new SettingCellEditor()); Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (revision 8377) @@ -276,5 +276,5 @@ @Override public boolean ok() { - Boolean ret = false; + boolean ret = false; for(String d : del) { Main.pref.put("color."+d, null); @@ -282,6 +282,5 @@ for (int i = 0; i < colors.getRowCount(); ++i) { String key = (String)colors.getValueAt(i, 0); - if(Main.pref.putColor(key, (Color)colors.getValueAt(i, 1))) - { + if(Main.pref.putColor(key, (Color)colors.getValueAt(i, 1))) { if(key.startsWith("mappaint.")) { ret = true; Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 8377) @@ -302,5 +302,5 @@ } }; - activeTable.putClientProperty("terminateEditOnFocusLost", true); + activeTable.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE); defaultModel = new ImageryDefaultLayerTableModel(); Index: trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java (revision 8377) @@ -84,5 +84,5 @@ if (selectedPluginsMap.get(pi) == null) { if (activePlugins.contains(pi.name)) { - selectedPluginsMap.put(pi, true); + selectedPluginsMap.put(pi, Boolean.TRUE); } } Index: trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java (revision 8377) @@ -108,5 +108,5 @@ requestedState.title = title; } - requestedState.intermediate = false; + requestedState.intermediate = Boolean.FALSE; } else { checkState(State.IN_TASK); @@ -126,5 +126,5 @@ requestedState.title = title; } - requestedState.intermediate = true; + requestedState.intermediate = Boolean.TRUE; } else { checkState(State.IN_TASK); Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 8377) @@ -555,9 +555,9 @@ return null; case KEY: - return tags.containsKey(key) ? true : null; + return tags.containsKey(key) ? Boolean.TRUE : null; case KEY_REQUIRED: return tags.containsKey(key); case KEY_VALUE: - return tags.containsKey(key) && getValues().contains(tags.get(key)) ? true : null; + return tags.containsKey(key) && getValues().contains(tags.get(key)) ? Boolean.TRUE : null; case KEY_VALUE_REQUIRED: return tags.containsKey(key) && getValues().contains(tags.get(key)); Index: trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java (revision 8377) @@ -46,10 +46,9 @@ protected void feedbackInvalid(String msg) { if (valid == null || valid || !Objects.equals(msg, this.msg)) { - // only provide feedback if the validity has changed. This avoids - // unnecessary UI updates. + // only provide feedback if the validity has changed. This avoids unnecessary UI updates. tc.setBorder(ERROR_BORDER); tc.setBackground(ERROR_BACKGROUND); tc.setToolTipText(msg); - valid = false; + valid = Boolean.FALSE; this.msg = msg; } @@ -62,10 +61,9 @@ protected void feedbackValid(String msg) { if (valid == null || !valid || !Objects.equals(msg, this.msg)) { - // only provide feedback if the validity has changed. This avoids - // unnecessary UI updates. + // only provide feedback if the validity has changed. This avoids unnecessary UI updates. tc.setBorder(UIManager.getBorder("TextField.border")); tc.setBackground(UIManager.getColor("TextField.background")); tc.setToolTipText(msg == null ? "" : msg); - valid = true; + valid = Boolean.TRUE; this.msg = msg; } Index: trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java (revision 8377) @@ -184,5 +184,5 @@ public void propertyChange(PropertyChangeEvent evt) { if ("editable".equals(evt.getPropertyName())) { - if (evt.getNewValue().equals(true)) { + if (evt.getNewValue().equals(Boolean.TRUE)) { enableMenu(); } else { Index: trunk/src/org/openstreetmap/josm/gui/widgets/JosmEditorPane.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/JosmEditorPane.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/gui/widgets/JosmEditorPane.java (revision 8377) @@ -125,5 +125,5 @@ defaults.put("EditorPane[Enabled].backgroundPainter", bgColor); pane.putClientProperty("Nimbus.Overrides", defaults); - pane.putClientProperty("Nimbus.Overrides.InheritDefaults", true); + pane.putClientProperty("Nimbus.Overrides.InheritDefaults", Boolean.TRUE); pane.setBackground(bgColor); } Index: trunk/src/org/openstreetmap/josm/io/NoteReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/NoteReader.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/io/NoteReader.java (revision 8377) @@ -55,5 +55,5 @@ private Action noteAction; private Date commentCreateDate; - private Boolean commentIsNew; + private boolean commentIsNew; private List notes; private String commentText; @@ -119,5 +119,5 @@ commentIsNew = false; } else { - commentIsNew = Boolean.valueOf(isNew); + commentIsNew = Boolean.parseBoolean(isNew); } break; @@ -145,5 +145,5 @@ commentUsername = null; commentCreateDate = null; - commentIsNew = null; + commentIsNew = false; commentText = null; } Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (revision 8377) @@ -134,5 +134,6 @@ * @param san SubjectAlternativeName extension (optional) */ - private static X509Certificate generateCertificate(String dn, KeyPair pair, int days, String algorithm, String san) throws GeneralSecurityException, IOException { + private static X509Certificate generateCertificate(String dn, KeyPair pair, int days, String algorithm, String san) + throws GeneralSecurityException, IOException { PrivateKey privkey = pair.getPrivate(); X509CertInfo info = new X509CertInfo(); @@ -166,7 +167,7 @@ CertificateExtensions ext = new CertificateExtensions(); // Critical: Not CA, max path len 0 - ext.set(BasicConstraintsExtension.NAME, new BasicConstraintsExtension(true, false, 0)); + ext.set(BasicConstraintsExtension.NAME, new BasicConstraintsExtension(Boolean.TRUE, false, 0)); // Critical: only allow TLS ("serverAuth" = 1.3.6.1.5.5.7.3.1) - ext.set(ExtendedKeyUsageExtension.NAME, new ExtendedKeyUsageExtension(true, + ext.set(ExtendedKeyUsageExtension.NAME, new ExtendedKeyUsageExtension(Boolean.TRUE, new Vector(Arrays.asList(new ObjectIdentifier("1.3.6.1.5.5.7.3.1"))))); @@ -185,5 +186,5 @@ } // Non critical - ext.set(SubjectAlternativeNameExtension.NAME, new SubjectAlternativeNameExtension(false, gnames)); + ext.set(SubjectAlternativeNameExtension.NAME, new SubjectAlternativeNameExtension(Boolean.FALSE, gnames)); } Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (revision 8377) @@ -80,5 +80,5 @@ Class eawtFullScreenUtilities = Class.forName("com.apple.eawt.FullScreenUtilities"); eawtFullScreenUtilities.getDeclaredMethod("setWindowCanFullScreen", - new Class[]{Window.class, boolean.class}).invoke(eawtFullScreenUtilities, window, true); + new Class[]{Window.class, boolean.class}).invoke(eawtFullScreenUtilities, window, Boolean.TRUE); } catch (ReflectiveOperationException | SecurityException | IllegalArgumentException e) { Main.warn("Failed to register with OSX: " + e); Index: trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java (revision 8376) +++ trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java (revision 8377) @@ -29,7 +29,7 @@ for (Area a : leftHandTrafficPolygons) { if (a.contains(ll.lon(), ll.lat())) - return true; + return Boolean.TRUE; } - return false; + return Boolean.FALSE; } @@ -40,9 +40,9 @@ PolygonIntersection is = Geometry.polygonIntersection(abox, a, 1e-10 /* using deg and not meters */); if (is == PolygonIntersection.FIRST_INSIDE_SECOND) - return true; + return Boolean.TRUE; if (is != PolygonIntersection.OUTSIDE) return null; } - return false; + return Boolean.FALSE; } }