Changeset 8441 in josm for trunk

Timestamp:

2015-06-02T14:03:31+02:00 (9 years ago)

Author:

Don-vip

Message:

see #11209 - add debug messages

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ImageryAdjustAction.java (modified) (1 diff)
• actions/mapmode/SelectAction.java (modified) (1 diff)
• gui/ExtendedDialog.java (modified) (3 diffs)
• gui/MainMenu.java (modified) (1 diff)
• gui/MenuScroller.java (modified) (1 diff)
• gui/tagging/ac/AutoCompletingComboBox.java (modified) (3 diffs)
• gui/util/AdvancedKeyPressDetector.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java

@@ -132 +132 @@
             if (offsetDialog != null) {
                 offsetDialog.updateOffset();
+            }
+            if (Main.isDebugEnabled()) {
+                Main.debug(getClass().getName()+" consuming event "+kev);
             }
             kev.consume();

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -647 +647 @@
         if (!Main.isDisplayingMapView() ||
                 !repeatedKeySwitchLassoOption || !getShortcut().isEvent(e)) return;
+        if (Main.isDebugEnabled()) {
+            Main.debug(getClass().getName()+" consuming event "+e);
+        }
         e.consume();
         if (!lassoMode) {

trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

@@ -456 +456 @@
                 // and the result differs from its default value
                 result = ExtendedDialog.DialogClosedOtherwise;
+                if (Main.isDebugEnabled()) {
+                    Main.debug(getClass().getName()+" ESC action performed ("+actionEvent+") from "+new Exception().getStackTrace()[1]);
+                }
                 setVisible(false);
             }
@@ -482 +485 @@
         if (visible) {
             repaint();
+        }
+
+        if (Main.isDebugEnabled()) {
+            Main.debug(getClass().getName()+".setVisible("+visible+") from "+new Exception().getStackTrace()[1]);
         }
 
@@ -646 +653 @@
 
     class HelpAction extends AbstractAction {
+        /**
+         * Constructs a new {@code HelpAction}.
+         */
         public HelpAction() {
             putValue(SHORT_DESCRIPTION, tr("Show help information"));

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -966 +966 @@
                         Action menuAction = selectedItem.getAction();
                         menuAction.actionPerformed(new ActionEvent(this, ActionEvent.ACTION_PERFORMED, null));
+                        if (Main.isDebugEnabled()) {
+                            Main.debug(getClass().getName()+" consuming event "+e);
+                        }
                         e.consume();
                     }

trunk/src/org/openstreetmap/josm/gui/MenuScroller.java

@@ -507 +507 @@
             firstIndex += mwe.getWheelRotation();
             refreshMenu();
+            if (Main.isDebugEnabled()) {
+                Main.debug(getClass().getName()+" consuming event "+mwe);
+            }
             mwe.consume();
         }

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java

@@ -46 +46 @@
      */
     class AutoCompletingComboBoxDocument extends PlainDocument {
-        private JosmComboBox<AutoCompletionListItem> comboBox;
+        private final JosmComboBox<AutoCompletionListItem> comboBox;
         private boolean selecting = false;
 
@@ -88 +88 @@
             // if the current offset isn't at the end of the document we don't autocomplete.
             // If a highlighted autocompleted suffix was present and we get here Swing has
-            // already removed it from the document. getLength() therefore doesn't include the
-            // autocompleted suffix.
+            // already removed it from the document. getLength() therefore doesn't include the autocompleted suffix.
             if (offs + str.length() < getLength()) {
                 return;
@@ -109 +108 @@
                     item = lookupItem(curText, true);
                 } catch (NumberFormatException e) {
-                    // either the new text or the current text isn't a number. We continue with
-                    // autocompletion
+                    // either the new text or the current text isn't a number. We continue with autocompletion
                     item = lookupItem(curText, false);
                 }

trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java

@@ -123 +123 @@
 
     private void processKeyEvent(KeyEvent e) {
+        if (Main.isDebugEnabled()) {
+            Main.debug("AdvancedKeyPressDetector enabled="+enabled+" => processKeyEvent("+e+") from "+new Exception().getStackTrace()[2]);
+        }
         if (e.getID() == KeyEvent.KEY_PRESSED) {
             if (timer.isRunning()) {
@@ -130 +133 @@
                     if (isFocusInMainWindow()) {
                         for (KeyPressReleaseListener q: keyListeners) {
+                            if (Main.isDebugEnabled()) {
+                                Main.debug(q+" => doKeyPressed("+e+")");
+                            }
                             q.doKeyPressed(e);
                         }
@@ -142 +148 @@
                         if (isFocusInMainWindow()) {
                             for (KeyPressReleaseListener q: keyListeners) {
+                                if (Main.isDebugEnabled()) {
+                                    Main.debug(q+" => doKeyReleased("+e+")");
+                                }
                                 q.doKeyReleased(e);
                             }
@@ -192 +201 @@
     public final void setEnabled(boolean enabled) {
         this.enabled = enabled;
+        if (Main.isDebugEnabled()) {
+            Main.debug("AdvancedKeyPressDetector enabled="+enabled+" from "+new Exception().getStackTrace()[1]);
+        }
     }