Changeset 9575 in josm for trunk

Timestamp:

2016-01-23T04:06:51+01:00 (9 years ago)

Author:

Don-vip

Message:

add unit tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanelTest.java (added)
• test/unit/org/openstreetmap/josm/gui/io/ChangesetManagementPanelTest.java (added)
• test/unit/org/openstreetmap/josm/gui/io/TagSettingsPanelTest.java (added)
• test/unit/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanelTest.java (added)
• test/unit/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanelTest.java (added)
• test/unit/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanelTest.java (added)

trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java

@@ -17 +17 @@
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
+import org.openstreetmap.josm.io.Capabilities;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -67 +68 @@
         //
         boolean useOneChangeset = true;
-        int maxChunkSize = OsmApi.getOsmApi().getCapabilities().getMaxChangesetSize();
+        Capabilities capabilities = OsmApi.getOsmApi().getCapabilities();
+        int maxChunkSize = capabilities != null ? capabilities.getMaxChangesetSize() : -1;
         if (maxChunkSize > 0 && numObjects > maxChunkSize) {
             useOneChangeset = false;

trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java

@@ -34 +34 @@
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import org.openstreetmap.josm.io.Capabilities;
 import org.openstreetmap.josm.io.OsmApi;
 
@@ -226 +227 @@
         add(new JPanel(), gc);
 
-        int maxChunkSize = OsmApi.getOsmApi().getCapabilities().getMaxChangesetSize();
+        Capabilities capabilities = OsmApi.getOsmApi().getCapabilities();
+        int maxChunkSize = capabilities != null ? capabilities.getMaxChangesetSize() : -1;
         pnlMultiChangesetPolicyPanel.setVisible(
                 maxChunkSize > 0 && numUploadedObjects > maxChunkSize

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

@@ -3 +3 @@
 
 import java.awt.Component;
+import java.awt.GraphicsEnvironment;
 import java.awt.Toolkit;
 import java.awt.datatransfer.Clipboard;
@@ -132 +133 @@
             final JTextComponent editorComponent = comboBox.getEditorComponent();
             // save unix system selection (middle mouse paste)
-            Clipboard sysSel = Toolkit.getDefaultToolkit().getSystemSelection();
+            Clipboard sysSel = GraphicsEnvironment.isHeadless() ? null : Toolkit.getDefaultToolkit().getSystemSelection();
             if (sysSel != null) {
                 Transferable old = Utils.getTransferableContent(sysSel);