Changeset 34660 in osm for applications/editors/josm/plugins/pdfimport/src/org

Timestamp:

2018-09-15T14:44:00+02:00 (6 years ago)

Author:

donvip

Message:

fix UnnecessaryParentheses warnings

Location:

applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport

Files:

• FilePlacement18.java (modified) (3 diffs)
• LayerInfo.java (modified) (1 diff)
• LoadPdfDialog.java (modified) (2 diffs)

applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/FilePlacement18.java

@@ -324 +324 @@
                             maxEastField.getValue(), maxNorthField.getValue());
                 } catch (Exception e) {
-                    Hint=(tr("Check numbers"));
+                    Hint = tr("Check numbers");
                     return;
                 }
                 String transformError = placement.prepareTransform();
                 if (transformError != null) {
-                    Hint=(transformError);
+                    Hint = transformError;
                     return;
                 }
@@ -335 +335 @@
             } finally {
                 hintField.setText(Hint);
-                if (dependsOnValid!=null) dependsOnValid.setEnabled(fc.valid && panel.isEnabled());
+                if (dependsOnValid != null)
+                    dependsOnValid.setEnabled(fc.valid && panel.isEnabled());
             }
 
@@ -342 +343 @@
 
         public void setDependsOnValid(JComponent c) {
-            dependsOnValid=c;
+            dependsOnValid = c;
         }
 

applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/LayerInfo.java

@@ -31 +31 @@
     @Override
     public boolean equals(Object o) {
+        if (!(o instanceof LayerInfo)) {
+            return false;
+        }
         LayerInfo l = (LayerInfo) o;
         boolean eq = this.width == l.width &&
         this.divider == l.divider &&
         this.dash == l.dash;
-
 
         if (this.fill != null) {

applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/LoadPdfDialog.java

@@ -145 +145 @@
 
             removeSmallObjectsSize = new GuiFieldDouble(Preferences.getRemoveSmallValue());
-            removeSmallObjectsCheck = new GuiFieldBool(tr("Remove objects smaller than"),Preferences.isRemoveSmall());
+            removeSmallObjectsCheck = new GuiFieldBool(tr("Remove objects smaller than"), Preferences.isRemoveSmall());
             removeSmallObjectsCheck.setCompanion(removeSmallObjectsSize);
 
-            removeLargeObjectsSize = new GuiFieldDouble((Preferences.getRemoveLargeValue()));
-            removeLargeObjectsCheck = new GuiFieldBool(tr("Remove objects larger than"),Preferences.isRemoveLarge());
+            removeLargeObjectsSize = new GuiFieldDouble(Preferences.getRemoveLargeValue());
+            removeLargeObjectsCheck = new GuiFieldBool(tr("Remove objects larger than"), Preferences.isRemoveLarge());
             removeLargeObjectsCheck.setCompanion(removeLargeObjectsSize);
 
@@ -156 +156 @@
             colorFilterCheck.setCompanion(colorFilterColor);
 
-            removeParallelSegmentsTolerance = new GuiFieldDouble((Preferences.getRemoveParallelValue()));
-            removeParallelSegmentsCheck = new GuiFieldBool(tr("Remove parallel lines"),Preferences.isRemoveParallel());
+            removeParallelSegmentsTolerance = new GuiFieldDouble(Preferences.getRemoveParallelValue());
+            removeParallelSegmentsCheck = new GuiFieldBool(tr("Remove parallel lines"), Preferences.isRemoveParallel());
             removeParallelSegmentsCheck.setCompanion(removeParallelSegmentsTolerance);
 
-            limitPathCount = new GuiFieldInteger((Preferences.getLimitPathValue()));
-            limitPathCountCheck = new GuiFieldBool(tr("Take only first X paths"),Preferences.isLimitPath());
+            limitPathCount = new GuiFieldInteger(Preferences.getLimitPathValue());
+            limitPathCountCheck = new GuiFieldBool(tr("Take only first X paths"), Preferences.isLimitPath());
             limitPathCountCheck.setCompanion(limitPathCount);
 
-            splitOnColorChangeCheck = new GuiFieldBool(tr("Color/width change"),Preferences.isLayerAttribChange());
+            splitOnColorChangeCheck = new GuiFieldBool(tr("Color/width change"), Preferences.isLayerAttribChange());
             splitOnShapeClosedCheck = new GuiFieldBool(tr("Shape closed"), Preferences.isLayerClosed());