Changeset 9372 in josm

Timestamp:

2016-01-09T23:32:49+01:00 (8 years ago)

Author:

simon04

Message:

Checkstyle

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/coor/Coordinate.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/BBox.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/dialogs/relation/MemberTransferHandler.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/widgets/ImageLabel.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/widgets/SearchTextResultListPanel.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java

@@ -3 +3 @@
 
 import java.io.Serializable;
-import java.util.Objects;
 
 import org.openstreetmap.josm.data.osm.BBox;

trunk/src/org/openstreetmap/josm/data/osm/BBox.java

@@ -4 +4 @@
 import java.awt.geom.Rectangle2D;
 import java.util.Arrays;
-import java.util.Objects;
 
 import org.openstreetmap.josm.data.coor.LatLon;

trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java

@@ -12 +12 @@
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
-import java.util.concurrent.Future;
 import java.util.concurrent.RecursiveTask;
 

trunk/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.dialogs;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.DefaultListSelectionModel;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JMenuItem;
+import javax.swing.ListCellRenderer;
 
 import org.openstreetmap.josm.Main;
@@ -9 +24 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-public class MenuItemSearchDialog extends ExtendedDialog {
+public final class MenuItemSearchDialog extends ExtendedDialog {
 
     private final Selector selector;
@@ -64 +71 @@
         private final MainMenu menu;
 
-        public Selector(MainMenu menu) {
+        Selector(MainMenu menu) {
             super();
             this.menu = menu;
@@ -95 +102 @@
 
         @Override
-        public Component getListCellRendererComponent(JList<? extends JMenuItem> list, JMenuItem value, int index, boolean isSelected, boolean cellHasFocus) {
+        public Component getListCellRendererComponent(JList<? extends JMenuItem> list, JMenuItem value, int index,
+                                                      boolean isSelected, boolean cellHasFocus) {
             final JLabel label = (JLabel) def.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
             label.setText(value.getText());

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTransferHandler.java

@@ -100 +100 @@
     }
 
-    protected <T> void importData(MemberTable destination, int insertRow, Collection<T> memberData, Function<T, RelationMember> toMemberFunction) {
+    protected <T> void importData(MemberTable destination, int insertRow,
+                                  Collection<T> memberData, Function<T, RelationMember> toMemberFunction) {
         final Collection<RelationMember> membersToAdd = new ArrayList<>(memberData.size());
         for (T i : memberData) {

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

@@ -6 +6 @@
 import java.awt.GridBagLayout;
 
-import javax.swing.Icon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.widgets;
 
-import javax.swing.*;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import javax.swing.event.ListSelectionListener;
-import java.awt.*;
+import java.awt.BorderLayout;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
@@ -12 +8 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.util.*;
+import java.util.ArrayList;
 import java.util.List;
+
+import javax.swing.AbstractListModel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.event.ListSelectionListener;
 
 public abstract class SearchTextResultListPanel<T> extends JPanel {

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java

@@ -87 +87 @@
 
     private LatLon random(Bounds b) {
-        for (int i=0; i<20; i++) {
+        for (int i = 0; i < 20; i++) {
             double lat = rand.nextDouble() * (b.getMax().lat() - b.getMin().lat()) + b.getMin().lat();
             double lon = rand.nextDouble() * (b.getMax().lon() - b.getMin().lon()) + b.getMin().lon();
@@ -134 +134 @@
         }
         Bounds b = p.getWorldBoundsLatLon();
-        for (int i=0; i<NUM_IT; i++) {
+        for (int i = 0; i < NUM_IT; i++) {
             LatLon ll1 = random(b);
             EastNorth en = p.latlon2eastNorth(ll1);