Changeset 32395 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java

Timestamp:

2016-06-24T09:10:57+02:00 (8 years ago)

Author:

donvip

Message:

checkstyle, update to JOSM 10279

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java (modified) (10 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package relcontext.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Dialog.ModalityType;
 import java.awt.GridBagLayout;
-import java.util.Collection;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import static org.openstreetmap.josm.tools.I18n.tr;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
+
 import javax.swing.Box;
 import javax.swing.JDialog;
@@ -16 +18 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.command.AddCommand;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -24 +28 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Shortcut;
+
 import relcontext.ChosenRelation;
 
@@ -36 +41 @@
     protected ChosenRelation chRel;
 
-    public CreateRelationAction( ChosenRelation chRel ) {
+    public CreateRelationAction(ChosenRelation chRel) {
         super(tr("New"), "data/relation", tr("Create a relation from selected objects"),
                 Shortcut.registerShortcut("reltoolbox:create", tr("Relation Toolbox: {0}", tr("Create a new relation")),
-                KeyEvent.VK_N, Shortcut.ALT_CTRL), false);
+                        KeyEvent.VK_N, Shortcut.ALT_CTRL), false);
         this.chRel = chRel;
         updateEnabledState();
@@ -48 +53 @@
     }
 
-    public void actionPerformed( ActionEvent e ) {
+    @Override
+    public void actionPerformed(ActionEvent e) {
         String type = askForType();
-        if( type == null )
+        if (type == null )
             return;
 
         Relation rel = new Relation();
-        if( type.length() > 0 )
+        if (type.length() > 0 ) {
             rel.put("type", type);
-        for( OsmPrimitive selected : getCurrentDataSet().getSelected() )
+        }
+        for (OsmPrimitive selected : getCurrentDataSet().getSelected() ) {
             rel.addMember(new RelationMember("", selected));
+        }
 
         Main.main.undoRedo.add(new AddCommand(rel));
 
-        if( chRel != null ) {
+        if (chRel != null) {
             chRel.set(rel);
         }
@@ -68 +76 @@
     @Override
     protected void updateEnabledState() {
-        if( getCurrentDataSet() == null ) {
+        if (getCurrentDataSet() == null) {
             setEnabled(false);
         } else {
@@ -76 +84 @@
 
     @Override
-    protected void updateEnabledState( Collection<? extends OsmPrimitive> selection ) {
+    protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
         setEnabled(selection != null && !selection.isEmpty());
     }
@@ -82 +90 @@
     // Thanks to TagInfo for the list
     private static final List<String> RELATION_TYPES = Arrays.asList(new String[] {
-        "multipolygon", "boundary", "route", "site", "restriction", "associatedStreet", "public_transport",
-        "street", "collection", "address", "enforcement", "destination_sign", "route_master", "junction",
-        "waterway", "bridge", "tunnel", "surveillance"
+            "multipolygon", "boundary", "route", "site", "restriction", "associatedStreet", "public_transport",
+            "street", "collection", "address", "enforcement", "destination_sign", "route_master", "junction",
+            "waterway", "bridge", "tunnel", "surveillance"
     });
 
@@ -111 +119 @@
 
         keys.getEditor().addActionListener(new ActionListener() {
-            public void actionPerformed( ActionEvent e ) {
+            @Override
+            public void actionPerformed(ActionEvent e) {
                 dlg.setVisible(false);
                 optionPane.setValue(JOptionPane.OK_OPTION);
@@ -120 +129 @@
 
         Object answer = optionPane.getValue();
-        if( answer == null || answer == JOptionPane.UNINITIALIZED_VALUE
-                || (answer instanceof Integer && (Integer)answer != JOptionPane.OK_OPTION) ) {
+        if (answer == null || answer == JOptionPane.UNINITIALIZED_VALUE
+                || (answer instanceof Integer && (Integer)answer != JOptionPane.OK_OPTION))
             return null;
-        }
 
         String result = keys.getEditor().getItem().toString().trim();