Changeset 5453 in josm for trunk/src/org

Timestamp:

2012-08-18T21:10:08+02:00 (12 years ago)

Author:

Don-vip

Message:

fix OsmPrimitiveTypesComboBox

File:

• trunk/src/org/openstreetmap/josm/gui/widgets/OsmPrimitiveTypesComboBox.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/widgets/OsmPrimitiveTypesComboBox.java

@@ -5 +5 @@
 
 /**
+ * A Combo box containing OSM primitive types (Node, Way, Relation).
  * @author Matthias Julius
+ * @see OsmPrimitiveType#dataValues
+ * @since 2923
  */
 public class OsmPrimitiveTypesComboBox extends JosmComboBox {
 
+    /**
+     * Constructs a new {@code OsmPrimitiveTypesComboBox}.
+     */
     public OsmPrimitiveTypesComboBox() {
-        super(OsmPrimitiveType.dataValues());
+        super(OsmPrimitiveType.dataValues().toArray());
     }
 
+    /**
+     * Replies the currently selected {@code OsmPrimitiveType}.
+     * @return the currently selected {@code OsmPrimitiveType}.
+     */
     public OsmPrimitiveType getType() {
-        try {
-            return (OsmPrimitiveType)this.getSelectedItem();
-        } catch (Exception e) {
-            return null;
-        }
+        Object selectedItem = this.getSelectedItem();
+        return selectedItem instanceof OsmPrimitiveType ? (OsmPrimitiveType) selectedItem : null;
     }
 }