Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

Timestamp:

2015-06-20T23:42:21+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

File:

• trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (modified) (16 diffs)

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

@@ -182 +182 @@
         p.add(new JScrollPane(help), BorderLayout.CENTER);
 
-        addWindowListener(new WindowAdapter(){
+        addWindowListener(new WindowAdapter() {
             @Override public void windowClosing(WindowEvent e) {
                 setVisible(false);
@@ -190 +190 @@
         p.add(buildToolBar(), BorderLayout.NORTH);
         help.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "Close");
-        help.getActionMap().put("Close", new AbstractAction(){
+        help.getActionMap().put("Close", new AbstractAction() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -208 +208 @@
                     WindowGeometry.centerInWindow(
                             getParent(),
-                            new Dimension(600,400)
+                            new Dimension(600, 400)
                     )
             ).applySafe(this);
@@ -215 +215 @@
         }
         if (Main.main != null && Main.main.menu != null && Main.main.menu.windowMenu != null) {
-            if(windowMenuItem != null && !visible) {
+            if (windowMenuItem != null && !visible) {
                 Main.main.menu.windowMenu.remove(windowMenuItem);
                 windowMenuItem = null;
             }
-            if(windowMenuItem == null && visible) {
+            if (windowMenuItem == null && visible) {
                 windowMenuItem = MainMenu.add(Main.main.menu.windowMenu, focusAction, MainMenu.WINDOW_MENU_GROUP.VOLATILE);
             }
@@ -306 +306 @@
         try {
             content = reader.fetchHelpTopicContent(url, true);
-        } catch(MissingHelpContentException e) {
+        } catch (MissingHelpContentException e) {
             url = HelpUtil.getHelpTopicUrl(HelpUtil.buildAbsoluteHelpTopic(relativeHelpTopic, LocaleType.BASELANGUAGE));
             try {
                 content = reader.fetchHelpTopicContent(url, true);
-            } catch(MissingHelpContentException e1) {
+            } catch (MissingHelpContentException e1) {
                 url = HelpUtil.getHelpTopicUrl(HelpUtil.buildAbsoluteHelpTopic(relativeHelpTopic, LocaleType.ENGLISH));
                 try {
                     content = reader.fetchHelpTopicContent(url, true);
-                } catch(MissingHelpContentException e2) {
+                } catch (MissingHelpContentException e2) {
                     this.url = url;
                     handleMissingHelpContent(relativeHelpTopic);
                     return;
-                } catch(HelpContentReaderException e2) {
+                } catch (HelpContentReaderException e2) {
                     Main.error(e2);
                     handleHelpContentReaderException(relativeHelpTopic, e2);
                     return;
                 }
-            } catch(HelpContentReaderException e1) {
+            } catch (HelpContentReaderException e1) {
                 Main.error(e1);
                 handleHelpContentReaderException(relativeHelpTopic, e1);
                 return;
             }
-        } catch(HelpContentReaderException e) {
+        } catch (HelpContentReaderException e) {
             Main.error(e);
             handleHelpContentReaderException(relativeHelpTopic, e);
@@ -349 +349 @@
         try {
             content = reader.fetchHelpTopicContent(url, true);
-        } catch(MissingHelpContentException e) {
+        } catch (MissingHelpContentException e) {
             this.url = url;
             handleMissingHelpContent(absoluteHelpTopic);
             return;
-        } catch(HelpContentReaderException e) {
+        } catch (HelpContentReaderException e) {
             Main.error(e);
             handleHelpContentReaderException(absoluteHelpTopic, e);
@@ -386 +386 @@
                 history.setCurrentUrl(url);
                 this.url = url;
-            } catch(Exception e) {
+            } catch (Exception e) {
                 Main.warn(e);
                 HelpAwareOptionPane.showOptionDialog(
@@ -439 +439 @@
 
     class EditAction extends AbstractAction {
+        /**
+         * Constructs a new {@code EditAction}.
+         */
         public EditAction() {
             putValue(SHORT_DESCRIPTION, tr("Edit the current help page"));
-            putValue(SMALL_ICON,ImageProvider.get("dialogs", "edit"));
+            putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit"));
         }
 
@@ -447 +450 @@
         public void actionPerformed(ActionEvent e) {
             String url = getUrl();
-            if(url == null)
+            if (url == null)
                 return;
             if (!url.startsWith(HelpUtil.getWikiBaseHelpUrl())) {
@@ -484 +487 @@
     static class BackAction extends AbstractAction implements Observer {
         private transient HelpBrowserHistory history;
+
         public BackAction(HelpBrowserHistory history) {
             this.history = history;
@@ -496 +500 @@
             history.back();
         }
+
         @Override
         public void update(Observable o, Object arg) {
@@ -504 +509 @@
     static class ForwardAction extends AbstractAction implements Observer {
         private transient HelpBrowserHistory history;
+
         public ForwardAction(HelpBrowserHistory history) {
             this.history = history;
@@ -516 +522 @@
             history.forward();
         }
+
         @Override
         public void update(Observable o, Object arg) {
@@ -523 +530 @@
 
     class HomeAction extends AbstractAction  {
+        /**
+         * Constructs a new {@code HomeAction}.
+         */
         public HomeAction() {
             putValue(SHORT_DESCRIPTION, tr("Go to the JOSM help home page"));
@@ -578 +588 @@
             Object value = set.getAttribute(Tag.A);
             if (!(value instanceof SimpleAttributeSet)) return null;
-            SimpleAttributeSet atts = (SimpleAttributeSet)value;
+            SimpleAttributeSet atts = (SimpleAttributeSet) value;
             value = atts.getAttribute(javax.swing.text.html.HTML.Attribute.HREF);
             if (value == null) return null;
-            String s = (String)value;
+            String s = (String) value;
             if (s.matches("#.*"))
                 return s.substring(1);
@@ -592 +602 @@
                 return;
             if (e.getURL() == null || e.getURL().toString().startsWith(url+"#")) {
-                // Probably hyperlink event on a an A-element with a href consisting of
-                // a fragment only, i.e. "#ALocalFragment".
-                //
+                // Probably hyperlink event on a an A-element with a href consisting of a fragment only, i.e. "#ALocalFragment".
                 String fragment = getUrlFragment(e);
                 if (fragment != null) {