Changeset 8345 in josm for trunk

Timestamp:

2015-05-11T10:52:33+02:00 (9 years ago)

Author:

Don-vip

Message:

code style - Useless parentheses around expressions should be removed to prevent any misunderstanding

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• actions/AddImageryLayerAction.java (modified) (1 diff)
• actions/AutoScaleAction.java (modified) (1 diff)
• actions/SaveActionBase.java (modified) (1 diff)
• actions/mapmode/ExtrudeAction.java (modified) (1 diff)
• actions/mapmode/ImproveWayAccuracyAction.java (modified) (1 diff)
• actions/mapmode/ModifiersSpec.java (modified) (2 diffs)
• actions/mapmode/ParallelWayAction.java (modified) (5 diffs)
• actions/mapmode/SelectAction.java (modified) (1 diff)
• actions/search/SearchAction.java (modified) (2 diffs)
• data/cache/JCSCacheManager.java (modified) (1 diff)
• data/cache/JCSCachedTileLoaderJob.java (modified) (1 diff)
• data/coor/EastNorth.java (modified) (1 diff)
• data/coor/QuadTiling.java (modified) (2 diffs)
• data/imagery/WmsCache.java (modified) (1 diff)
• data/osm/OsmPrimitive.java (modified) (1 diff)
• data/osm/Way.java (modified) (2 diffs)
• data/osm/visitor/paint/AbstractMapRenderer.java (modified) (1 diff)
• data/osm/visitor/paint/StyledMapRenderer.java (modified) (2 diffs)
• data/osm/visitor/paint/WireframeMapRenderer.java (modified) (1 diff)
• data/projection/datum/NTV2GridShiftFile.java (modified) (1 diff)
• data/projection/proj/LambertConformalConic.java (modified) (1 diff)
• data/projection/proj/TransverseMercator.java (modified) (3 diffs)
• data/validation/routines/DomainValidator.java (modified) (1 diff)
• data/validation/routines/RegexValidator.java (modified) (1 diff)
• data/validation/tests/Coastlines.java (modified) (1 diff)
• data/validation/tests/DuplicateRelation.java (modified) (1 diff)
• data/validation/tests/DuplicateWay.java (modified) (1 diff)
• gui/ConditionalOptionPaneUtil.java (modified) (1 diff)
• gui/NavigatableComponent.java (modified) (2 diffs)
• gui/dialogs/DialogsPanel.java (modified) (1 diff)
• gui/dialogs/LayerListDialog.java (modified) (1 diff)
• gui/dialogs/properties/PropertiesDialog.java (modified) (4 diffs)
• gui/dialogs/relation/MemberTableLinkedCellRenderer.java (modified) (1 diff)
• gui/dialogs/relation/sort/RelationNodeMap.java (modified) (1 diff)
• gui/history/HistoryBrowserDialogManager.java (modified) (1 diff)
• gui/layer/NoteLayer.java (modified) (1 diff)
• gui/layer/TMSLayer.java (modified) (3 diffs)
• gui/layer/ValidatorLayer.java (modified) (1 diff)
• gui/layer/WMSLayer.java (modified) (3 diffs)
• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (2 diffs)
• gui/layer/geoimage/ImageDisplay.java (modified) (1 diff)
• gui/mappaint/NodeElemStyle.java (modified) (2 diffs)
• gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (2 diffs)
• gui/mappaint/mapcss/Selector.java (modified) (1 diff)
• gui/mappaint/xml/XmlStyleSource.java (modified) (2 diffs)
• gui/preferences/ToolbarPreferences.java (modified) (2 diffs)
• gui/preferences/shortcut/PrefJPanel.java (modified) (1 diff)
• gui/tagging/TagEditorPanel.java (modified) (1 diff)
• gui/tagging/TaggingPreset.java (modified) (1 diff)
• gui/tagging/TaggingPresetMenu.java (modified) (1 diff)
• gui/util/AdvancedKeyPressDetector.java (modified) (1 diff)
• gui/widgets/FileChooserManager.java (modified) (1 diff)
• gui/widgets/MultiSplitLayout.java (modified) (2 diffs)
• io/BoundingBoxDownloader.java (modified) (1 diff)
• io/CacheFiles.java (modified) (1 diff)
• io/Capabilities.java (modified) (1 diff)
• io/GpxReader.java (modified) (1 diff)
• io/OsmApi.java (modified) (2 diffs)
• io/OsmWriter.java (modified) (1 diff)
• io/UTFInputStreamReader.java (modified) (1 diff)
• io/imagery/WMSGrabber.java (modified) (1 diff)
• plugins/PluginHandler.java (modified) (1 diff)
• tools/ColorHelper.java (modified) (1 diff)
• tools/Geometry.java (modified) (3 diffs)
• tools/I18n.java (modified) (1 diff)
• tools/OsmUrlToBounds.java (modified) (1 diff)
• tools/Shortcut.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -963 +963 @@
 
         geometry = WindowGeometry.mainWindow("gui.geometry",
-            (args.containsKey(Option.GEOMETRY) ? args.get(Option.GEOMETRY).iterator().next() : null),
+            args.containsKey(Option.GEOMETRY) ? args.get(Option.GEOMETRY).iterator().next() : null,
             !args.containsKey(Option.NO_MAXIMIZE) && Main.pref.getBoolean("gui.maximized", false));
     }

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -95 +95 @@
     protected ImageryInfo getWMSLayerInfo() {
         try {
-            assert (ImageryType.WMS_ENDPOINT.equals(info.getImageryType()));
+            assert ImageryType.WMS_ENDPOINT.equals(info.getImageryType());
             final WMSImagery wms = new WMSImagery();
             wms.attemptGetCapabilities(info.getUrl());

trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

@@ -249 +249 @@
                 JOptionPane.showMessageDialog(
                         Main.parent,
-                        ("selection".equals(mode) ? tr("Nothing selected to zoom to.") : tr("No conflicts to zoom to")),
+                        "selection".equals(mode) ? tr("Nothing selected to zoom to.") : tr("No conflicts to zoom to"),
                         tr("Information"),
                         JOptionPane.INFORMATION_MESSAGE);

trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java

@@ -194 +194 @@
             dialog.setButtonIcons(new String[] {"save_as", "cancel"});
             dialog.showDialog();
-            return (dialog.getValue() == 1);
+            return dialog.getValue() == 1;
         }
         return true;

trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

@@ -1125 +1125 @@
 
         double cx = center.getX(), cy = center.getY();
-        double k = (mirror ? -1 : 1);
+        double k = mirror ? -1 : 1;
         Point2D ra1 = new Point2D.Double(cx + raoffsetx, cy + raoffsety);
         Point2D ra3 = new Point2D.Double(cx - raoffsety*k, cy + raoffsetx*k);

trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java

@@ -412 +412 @@
                         for (Pair<Node, Node> wpp : wpps) {
                             ++i;
-                            if ((wpp.a.equals(candidateSegment.getFirstNode())
-                                    && wpp.b.equals(candidateSegment.getSecondNode()) || (wpp.b.equals(candidateSegment.getFirstNode()) && wpp.a.equals(candidateSegment.getSecondNode())))) {
+                            boolean ab = wpp.a.equals(candidateSegment.getFirstNode())
+                                    && wpp.b.equals(candidateSegment.getSecondNode());
+                            boolean ba = wpp.b.equals(candidateSegment.getFirstNode())
+                                    && wpp.a.equals(candidateSegment.getSecondNode());
+                            if (ab || ba) {
                                 virtualSegments.add(new WaySegment(w, i));
                             }

trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java

@@ -20 +20 @@
      */
     public ModifiersSpec(String str) {
-        assert (str.length() == 3);
+        assert str.length() == 3;
         char a = str.charAt(0);
         char s = str.charAt(1);
@@ -46 +46 @@
 
     private boolean match(final int a, final int knownValue) {
-        assert (knownValue == ON | knownValue == OFF);
+        assert knownValue == ON | knownValue == OFF;
         return a == knownValue || a == UNKNOWN;
     }

trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java

@@ -245 +245 @@
         boolean oldAlt = alt, oldShift = shift, oldCtrl = ctrl;
         updateKeyModifiers(modifiers);
-        return (oldAlt != alt || oldShift != shift || oldCtrl != ctrl);
+        return oldAlt != alt || oldShift != shift || oldCtrl != ctrl;
     }
 
@@ -288 +288 @@
             ((Boolean) this.getValue("active"));
         // @formatter:on
-        assert (areWeSane); // mad == bad
+        assert areWeSane; // mad == bad
         return areWeSane;
     }
@@ -498 +498 @@
     //// We keep the source ways and the selection in sync so the user can see the source way's tags
     private void addSourceWay(Way w) {
-        assert (sourceWays != null);
+        assert sourceWays != null;
         getCurrentDataSet().addSelected(w);
         w.setHighlighted(true);
@@ -505 +505 @@
 
     private void removeSourceWay(Way w) {
-        assert (sourceWays != null);
+        assert sourceWays != null;
         getCurrentDataSet().clearSelection(w);
         w.setHighlighted(false);
@@ -512 +512 @@
 
     private void clearSourceWays() {
-        assert (sourceWays != null);
+        assert sourceWays != null;
         getCurrentDataSet().clearSelection(sourceWays);
         for (Way w : sourceWays) {

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -953 +953 @@
             else if (mode == Mode.MOVE && (System.currentTimeMillis() - mouseDownTime >= initialMoveDelay)) {
                 final boolean canMerge = getCurrentDataSet()!=null && !getCurrentDataSet().getSelectedNodes().isEmpty();
-                final String mergeHelp = canMerge ? (" " + tr("Ctrl to merge with nearest node.")) : "";
+                final String mergeHelp = canMerge ? " " + tr("Ctrl to merge with nearest node.") : "";
                 return tr("Release the mouse button to stop moving.") + mergeHelp;
             } else if (mode == Mode.ROTATE)

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -601 +601 @@
                     /*case sensitive*/  trc("search", "CS") :
                         /*case insensitive*/  trc("search", "CI");
-                    String rx = regexSearch ? (", " +
-                            /*regex search*/ trc("search", "RX")) : "";
-                    String all = allElements ? (", " +
-                            /*all elements*/ trc("search", "A")) : "";
+                    String rx = regexSearch ? ", " +
+                            /*regex search*/ trc("search", "RX") : "";
+                    String all = allElements ? ", " +
+                            /*all elements*/ trc("search", "A") : "";
                     return "\"" + text + "\" (" + cs + rx + all + ", " + mode + ")";
         }
@@ -613 +613 @@
                 return false;
             SearchSetting o = (SearchSetting) other;
-            return (o.caseSensitive == this.caseSensitive
+            return o.caseSensitive == this.caseSensitive
                     && o.regexSearch == this.regexSearch
                     && o.allElements == this.allElements
                     && o.mode.equals(this.mode)
-                    && o.text.equals(this.text));
+                    && o.text.equals(this.text);
         }
 

trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java

@@ -52 +52 @@
         File cacheDir = new File(Main.pref.getCacheDirectory(), "jcs");
 
-        if ((!cacheDir.exists() && !cacheDir.mkdirs()))
+        if (!cacheDir.exists() && !cacheDir.mkdirs())
             throw new IOException("Cannot access cache directory");
 

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -439 +439 @@
         urlConn.setRequestMethod("HEAD");
         long lastModified = urlConn.getLastModified();
-        return (
-                (attributes.getEtag() != null && attributes.getEtag().equals(urlConn.getRequestProperty("ETag"))) ||
-                (lastModified != 0 && lastModified <= attributes.getLastModification())
-                );
+        return (attributes.getEtag() != null && attributes.getEtag().equals(urlConn.getRequestProperty("ETag"))) ||
+               (lastModified != 0 && lastModified <= attributes.getLastModification());
     }
 

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

@@ -132 +132 @@
      */
     public boolean equalsEpsilon(EastNorth other, double e) {
-        return (Math.abs(x - other.x) < e && Math.abs(y - other.y) < e);
+        return Math.abs(x - other.x) < e && Math.abs(y - other.y) < e;
     }
 }

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

@@ -9 +9 @@
 
     public static final int NR_LEVELS = 24;
-    public static final double WORLD_PARTS = (1 << NR_LEVELS);
+    public static final double WORLD_PARTS = 1 << NR_LEVELS;
 
     public static final int TILES_PER_LEVEL_SHIFT = 2; // Has to be 2. Other parts of QuadBuckets code rely on it
@@ -53 +53 @@
         for (i = NR_LEVELS-1; i >= 0; i--)
         {
-            long xbit = ((x >> i) & 1);
-            long ybit = ((y >> i) & 1);
+            long xbit = (x >> i) & 1;
+            long ybit = (y >> i) & 1;
             tile <<= 2;
             // Note that x is the MSB

trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java

@@ -360 +360 @@
     public synchronized boolean hasExactMatch(Projection projection, double pixelPerDegree, double east, double north) {
         ProjectionEntries projectionEntries = getProjectionEntries(projection);
-        CacheEntry entry = findEntry(projectionEntries, pixelPerDegree, east, north);
-        return (entry != null);
+        return findEntry(projectionEntries, pixelPerDegree, east, north) != null;
     }
 

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

@@ -519 +519 @@
      */
     public boolean isDisabledAndHidden() {
-        return (((flags & FLAG_DISABLED) != 0) && ((flags & FLAG_HIDE_IF_DISABLED) != 0));
+        return ((flags & FLAG_DISABLED) != 0) && ((flags & FLAG_HIDE_IF_DISABLED) != 0);
     }
 

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

@@ -363 +363 @@
         boolean locked = writeLock();
         try {
-            boolean closed = (lastNode() == n && firstNode() == n);
+            boolean closed = lastNode() == n && firstNode() == n;
             int i;
             List<Node> copy = getNodes();
@@ -391 +391 @@
         boolean locked = writeLock();
         try {
-            boolean closed = (lastNode() == firstNode() && selection.contains(lastNode()));
+            boolean closed = lastNode() == firstNode() && selection.contains(lastNode());
             List<Node> copy = new ArrayList<>();
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java

@@ -184 +184 @@
         double xd = Math.abs(p1.getX()-p2.getX());
         double yd = Math.abs(p1.getY()-p2.getY());
-        return (xd+yd > space);
+        return xd + yd > space;
     }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -866 +866 @@
             return;
         g.setColor(highlightColorTransparent);
-        float w = (line.getLineWidth() + highlightLineWidth);
+        float w = line.getLineWidth() + highlightLineWidth;
         if (useWiderHighlight) w+=widerHighlight;
         while(w >= line.getLineWidth()) {
@@ -995 +995 @@
          */
         double distanceFromVia=14;
-        double dx = (pFrom.x >= pVia.x) ? (pFrom.x - pVia.x) : (pVia.x - pFrom.x);
-        double dy = (pFrom.y >= pVia.y) ? (pFrom.y - pVia.y) : (pVia.y - pFrom.y);
+        double dx = pFrom.x >= pVia.x ? pFrom.x - pVia.x : pVia.x - pFrom.x;
+        double dy = pFrom.y >= pVia.y ? pFrom.y - pVia.y : pVia.y - pFrom.y;
 
         double fromAngle;

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java

@@ -264 +264 @@
             }
 
-            final int size = max((ds.isSelected(n) ? selectedNodeSize : 0),
-                    (isNodeTagged(n) ? taggedNodeSize : 0),
-                    (n.isConnectionNode() ? connectionNodeSize : 0),
+            final int size = max(ds.isSelected(n) ? selectedNodeSize : 0,
+                    isNodeTagged(n) ? taggedNodeSize : 0,
+                    n.isConnectionNode() ? connectionNodeSize : 0,
                     unselectedNodeSize);
 

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java

@@ -276 +276 @@
 
     public boolean isLoaded() {
-        return (topLevelSubGrid != null);
+        return topLevelSubGrid != null;
     }
 

trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java

@@ -129 +129 @@
     protected double t(double lat_rad) {
         return tan(PI/4 - lat_rad / 2.0)
-            / pow(( (1.0 - e * sin(lat_rad)) / (1.0 + e * sin(lat_rad))) , e/2);
+            / pow((1.0 - e * sin(lat_rad)) / (1.0 + e * sin(lat_rad)), e/2);
     }
 

trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java

@@ -229 +229 @@
 
         /* Precalculate epsilon */
-        double epsilon = (315.0 * pow(n, 4.0) / 512.0);
+        double epsilon = 315.0 * pow(n, 4.0) / 512.0;
 
         /* Now calculate the sum of the series and return */
@@ -276 +276 @@
 
         /* Precalculate epsilon_ (Eq. 10.22) */
-        double epsilon_ = (1097.0 * pow(n, 4.0) / 512.0);
+        double epsilon_ = 1097.0 * pow(n, 4.0) / 512.0;
 
         /* Now calculate the sum of the series (Eq. 10.21) */
@@ -284 +284 @@
             + (epsilon_ * sin(8.0 * y_));
     }
-
 }

trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java

@@ -170 +170 @@
      */
     public boolean isValidInfrastructureTld(String iTld) {
-        return Arrays.binarySearch(INFRASTRUCTURE_TLDS, (chompLeadingDot(iTld.toLowerCase()))) >= 0;
+        return Arrays.binarySearch(INFRASTRUCTURE_TLDS, chompLeadingDot(iTld.toLowerCase())) >= 0;
     }
 

trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java

@@ -107 +107 @@
         }
         patterns = new Pattern[regexs.length];
-        int flags =  (caseSensitive ? 0: Pattern.CASE_INSENSITIVE);
+        int flags = caseSensitive ? 0: Pattern.CASE_INSENSITIVE;
         for (int i = 0; i < regexs.length; i++) {
             if (regexs[i] == null || regexs[i].length() == 0) {

trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java

@@ -237 +237 @@
     public boolean isFixable(TestError testError) {
         if (testError.getTester() instanceof Coastlines)
-            return (testError.getCode() == REVERSED_COASTLINE);
+            return testError.getCode() == REVERSED_COASTLINE;
 
         return false;

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java

@@ -309 +309 @@
             }
         }
-        return (relationsWithRelations <= 1);
+        return relationsWithRelations <= 1;
     }
 }

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java

@@ -323 +323 @@
             }
         }
-        return (waysWithRelations <= 1);
+        return waysWithRelations <= 1;
     }
 }

trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java

@@ -162 +162 @@
         MessagePanel pnl = new MessagePanel(message, isInBulkOperation(preferenceKey));
         ret = JOptionPane.showConfirmDialog(parent, pnl, title, optionType, messageType);
-        if ((isYesOrNo(ret))) {
+        if (isYesOrNo(ret)) {
             pnl.getNotShowAgain().store(preferenceKey, ret);
         }

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -1292 +1292 @@
     public static double perDist(Point2D pt, Point2D a, Point2D b) {
         if (pt != null && a != null && b != null) {
-            double pd = (
+            double pd =
                     (a.getX()-pt.getX())*(b.getX()-a.getX()) -
-                    (a.getY()-pt.getY())*(b.getY()-a.getY()) );
+                    (a.getY()-pt.getY())*(b.getY()-a.getY());
             return Math.abs(pd) / a.distance(b);
         }
@@ -1310 +1310 @@
     public static Point2D project(Point2D pt, Point2D a, Point2D b) {
         if (pt != null && a != null && b != null) {
-            double r = ((
+            double r = (
                     (pt.getX()-a.getX())*(b.getX()-a.getX()) +
                     (pt.getY()-a.getY())*(b.getY()-a.getY()) )
-                    / a.distanceSq(b));
+                    / a.distanceSq(b);
             return project(r, a, b);
         }

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

@@ -157 +157 @@
                     final int ph = dlg.getPreferredHeight();
                     final int ah = dlg.getSize().height;
-                    dlg.setPreferredSize(new Dimension(Integer.MAX_VALUE, (ah < 20 ? ph : ah)));
+                    dlg.setPreferredSize(new Dimension(Integer.MAX_VALUE, ah < 20 ? ph : ah));
                 }
             }

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

@@ -147 +147 @@
         for(int i=0; i < 10; i++) {
             visibilityToggleShortcuts[i] = Shortcut.registerShortcut("subwindow:layers:toggleLayer" + (i+1),
-                    tr("Toggle visibility of layer: {0}", (i+1)), k[i], Shortcut.ALT);
+                    tr("Toggle visibility of layer: {0}", i+1), k[i], Shortcut.ALT);
             visibilityToggleActions[i] = new ToggleLayerIndexVisibility(i);
             Main.registerActionShortcut(visibilityToggleActions[i], visibilityToggleShortcuts[i]);

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -325 +325 @@
                     return this;
                 Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column);
-                boolean isDisabledAndHidden = (((Relation)table.getValueAt(row, 0))).isDisabledAndHidden();
+                boolean isDisabledAndHidden = ((Relation)table.getValueAt(row, 0)).isDisabledAndHidden();
                 if (c instanceof JLabel) {
                     JLabel label = (JLabel) c;
@@ -341 +341 @@
                     boolean isSelected, boolean hasFocus, int row, int column) {
                 Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column);
-                boolean isDisabledAndHidden = (((Relation)table.getValueAt(row, 0))).isDisabledAndHidden();
+                boolean isDisabledAndHidden = ((Relation)table.getValueAt(row, 0)).isDisabledAndHidden();
                 if (c instanceof JLabel) {
                     JLabel label = (JLabel)c;
@@ -795 +795 @@
                 int row = tagTable.rowAtPoint(e.getPoint());
                 if (row > -1) {
-                    boolean focusOnKey = (tagTable.columnAtPoint(e.getPoint()) == 0);
+                    boolean focusOnKey = tagTable.columnAtPoint(e.getPoint()) == 0;
                     editHelper.editTag(row, focusOnKey);
                 } else {
@@ -942 +942 @@
             int rowCount = membershipTable.getRowCount();
             if (rowCount > 1) {
-                nextRelation = (Relation)membershipData.getValueAt((row + 1 < rowCount ? row + 1 : row - 1), 0);
+                nextRelation = (Relation)membershipData.getValueAt(row + 1 < rowCount ? row + 1 : row - 1, 0);
             }
 

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

@@ -186 +186 @@
         }
 
-        if ((arrow != null)) {
+        if (arrow != null) {
             g.drawImage(arrow, xoff+xowloop-3, (y1 + y2) / 2 - 2, null);
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java

@@ -86 +86 @@
 
             Way w = m.getWay();
-            if ((RelationSortUtils.roundaboutType(w) != NONE)) {
+            if (RelationSortUtils.roundaboutType(w) != NONE) {
                 for (Node nd : w.getNodes()) {
                     addPair(nd, i);

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java

@@ -226 +226 @@
             else
                 // reload if the history object of the selected object is not in the cache yet
-                return (!p.isNew() && h.getByVersion(p.getUniqueId()) == null);
+                return !p.isNew() && h.getByVersion(p.getUniqueId()) == null;
         }
     };

trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java

@@ -149 +149 @@
             for (int x = 0; x < 2; x++) {
                 Dimension d = toolTip.getUI().getPreferredSize(toolTip);
-                d.width = Math.min(d.width, (mv.getWidth() / 2));
+                d.width = Math.min(d.width, mv.getWidth() / 2);
                 if (d.width > 0 && d.height > 0) {
                     toolTip.setSize(d);

trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -310 +310 @@
                         try {
                             String xml = attributionLoader.updateIfRequiredString();
-                            return parseAttributionText(new InputSource(new StringReader((xml))));
+                            return parseAttributionText(new InputSource(new StringReader(xml)));
                         } catch (IOException ex) {
                             Main.warn("Could not connect to Bing API. Will retry in " + waitTimeSec + " seconds.");
@@ -749 +749 @@
      */
     Tile getTile(int x, int y, int zoom) {
-        int max = (1 << zoom);
+        int max = 1 << zoom;
         if (x < 0 || x >= max || y < 0 || y >= max)
             return null;
@@ -794 +794 @@
     @Override
     public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) {
-        boolean done = ((infoflags & (ERROR | FRAMEBITS | ALLBITS)) != 0);
+        boolean done = (infoflags & (ERROR | FRAMEBITS | ALLBITS)) != 0;
         needRedraw = true;
         if (Main.isDebugEnabled()) {

trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java

@@ -73 +73 @@
                 Object tn = errorMessages.nextElement().getUserObject();
                 if (tn instanceof TestError) {
-                    paintVisitor.visit(((TestError) tn));
+                    paintVisitor.visit((TestError) tn);
                 }
             }

trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

@@ -394 +394 @@
      */
     public int getBaseImageWidth() {
-        int overlap = PROP_OVERLAP.get() ? (PROP_OVERLAP_EAST.get() * imageSize / 100) : 0;
+        int overlap = PROP_OVERLAP.get() ? PROP_OVERLAP_EAST.get() * imageSize / 100 : 0;
         return imageSize + overlap;
     }
@@ -403 +403 @@
      */
     public int getBaseImageHeight() {
-        int overlap = PROP_OVERLAP.get() ? (PROP_OVERLAP_NORTH.get() * imageSize / 100) : 0;
+        int overlap = PROP_OVERLAP.get() ? PROP_OVERLAP_NORTH.get() * imageSize / 100 : 0;
         return imageSize + overlap;
     }
@@ -1081 +1081 @@
     @Override
     public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) {
-        boolean done = ((infoflags & (ERROR | FRAMEBITS | ALLBITS)) != 0);
+        boolean done = (infoflags & (ERROR | FRAMEBITS | ALLBITS)) != 0;
         Main.map.repaint(done ? 0 : 100);
         return !done;

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -144 +144 @@
             FileFilter filter = new FileFilter(){
                 @Override public boolean accept(File f) {
-                    return (f.isDirectory()
+                    return f.isDirectory()
                             || f .getName().toLowerCase().endsWith(".gpx")
-                            || f.getName().toLowerCase().endsWith(".gpx.gz"));
+                            || f.getName().toLowerCase().endsWith(".gpx.gz");
                 }
                 @Override public String getDescription() {
@@ -1180 +1180 @@
         // Time between the track point and the previous one, 5 sec if first point, i.e. photos take
         // 5 sec before the first track point can be assumed to be take at the starting position
-        long interval = prevWpTime > 0 ? (Math.abs(curWpTime - prevWpTime)) : 5*1000;
+        long interval = prevWpTime > 0 ? Math.abs(curWpTime - prevWpTime) : 5*1000;
         int ret = 0;
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

@@ -324 +324 @@
                 checkPointInVisibleRect(p, visibleRect);
                 Rectangle rect = new Rectangle(
-                        (p.x < mousePointInImg.x ? p.x : mousePointInImg.x),
-                        (p.y < mousePointInImg.y ? p.y : mousePointInImg.y),
-                        (p.x < mousePointInImg.x ? mousePointInImg.x - p.x : p.x - mousePointInImg.x),
-                        (p.y < mousePointInImg.y ? mousePointInImg.y - p.y : p.y - mousePointInImg.y));
+                        p.x < mousePointInImg.x ? p.x : mousePointInImg.x,
+                        p.y < mousePointInImg.y ? p.y : mousePointInImg.y,
+                        p.x < mousePointInImg.x ? mousePointInImg.x - p.x : p.x - mousePointInImg.x,
+                        p.y < mousePointInImg.y ? mousePointInImg.y - p.y : p.y - mousePointInImg.y);
                 checkVisibleRectSize(image, rect);
                 checkVisibleRectPos(image, rect);

trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java

@@ -83 +83 @@
         public String toString() {
             return "symbol=" + symbol + " size=" + size +
-                    (stroke != null ? (" stroke=" + stroke + " strokeColor=" + strokeColor) : "") +
-                    (fillColor != null ? (" fillColor=" + fillColor) : "");
+                    (stroke != null ? " stroke=" + stroke + " strokeColor=" + strokeColor : "") +
+                    (fillColor != null ? " fillColor=" + fillColor : "");
         }
     }
@@ -325 +325 @@
                 }
 
-                final int size = Utils.max((selected ? settings.getSelectedNodeSize() : 0),
-                        (n.isTagged() ? settings.getTaggedNodeSize() : 0),
-                        (isConnection ? settings.getConnectionNodeSize() : 0),
+                final int size = Utils.max(selected ? settings.getSelectedNodeSize() : 0,
+                        n.isTagged() ? settings.getTaggedNodeSize() : 0,
+                        isConnection ? settings.getConnectionNodeSize() : 0,
                         settings.getUnselectedNodeSize());
 

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -536 +536 @@
 
         for (MapCSSRule r : rules) {
-            if ((r.selector instanceof GeneralSelector)) {
+            if (r.selector instanceof GeneralSelector) {
                 GeneralSelector gs = (GeneralSelector) r.selector;
                 if (gs.getBase().equals("setting")) {
@@ -578 +578 @@
 
         for (MapCSSRule r : rules) {
-            if ((r.selector instanceof GeneralSelector)) {
+            if (r.selector instanceof GeneralSelector) {
                 GeneralSelector gs = (GeneralSelector) r.selector;
                 if (gs.getBase().equals(type)) {

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -651 +651 @@
         @Override
         public String toString() {
-            return base + (Range.ZERO_TO_INFINITY.equals(range) ? "" : range) + Utils.join("", conds) + (subpart != null ? ("::" + subpart) : "");
+            return base + (Range.ZERO_TO_INFINITY.equals(range) ? "" : range) + Utils.join("", conds)
+                    + (subpart != null ? "::" + subpart : "");
         }
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

@@ -303 +303 @@
 
         if (osm instanceof Node || (osm instanceof Relation && "restriction".equals(osm.get("type")))) {
-            IconPrototype icon = getNode(osm, (useMinMaxScale ? scale : null), mc);
+            IconPrototype icon = getNode(osm, useMinMaxScale ? scale : null, mc);
             if (icon != null) {
                 def.put(ICON_IMAGE, icon.icon);
@@ -318 +318 @@
         } else if (osm instanceof Way || (osm instanceof Relation && ((Relation)osm).isMultipolygon())) {
             WayPrototypesRecord p = new WayPrototypesRecord();
-            get(osm, pretendWayIsClosed || !(osm instanceof Way) || ((Way) osm).isClosed(), p, (useMinMaxScale ? scale : null), mc);
+            get(osm, pretendWayIsClosed || !(osm instanceof Way) || ((Way) osm).isClosed(), p, useMinMaxScale ? scale : null, mc);
             if (p.line != null) {
                 def.put(WIDTH, new Float(p.line.getWidth()));

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -322 +322 @@
         @Override
         public int getRowCount() {
-            int adaptable = ((currentAction.getAction() instanceof AdaptableAction) ? 2 : 0);
+            int adaptable = (currentAction.getAction() instanceof AdaptableAction) ? 2 : 0;
             if (currentAction.isSeparator() || !(currentAction.getAction() instanceof ParameterizedAction))
                 return adaptable;
@@ -903 +903 @@
         for (MenuElement item : menuElement.getSubElements()) {
             if (item instanceof JMenuItem) {
-                JMenuItem menuItem = ((JMenuItem)item);
+                JMenuItem menuItem = (JMenuItem)item;
                 if (menuItem.getAction() != null) {
                     Action action = menuItem.getAction();

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

@@ -361 +361 @@
             try {
                 final TableRowSorter<? extends TableModel> sorter =
-                    ((TableRowSorter<? extends TableModel> )shortcutTable.getRowSorter());
+                    (TableRowSorter<? extends TableModel> )shortcutTable.getRowSorter();
                 if (expr == null) {
                     sorter.setRowFilter(null);

trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java

@@ -183 +183 @@
         AutoCompletionList acList = new AutoCompletionList();
 
-        TagCellEditor editor = ((TagCellEditor) tagTable.getColumnModel().getColumn(0).getCellEditor());
+        TagCellEditor editor = (TagCellEditor) tagTable.getColumnModel().getColumn(0).getCellEditor();
         editor.setAutoCompletionManager(autocomplete);
         editor.setAutoCompletionList(acList);

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -108 +108 @@
         putValue(Action.NAME, getName());
         putValue("toolbar", "tagging_" + getRawName());
-        putValue(OPTIONAL_TOOLTIP_TEXT, (group != null ?
+        putValue(OPTIONAL_TOOLTIP_TEXT, group != null ?
                 tr("Use preset ''{0}'' of group ''{1}''", getLocaleName(), group.getName()) :
-                    tr("Use preset ''{0}''", getLocaleName())));
+                    tr("Use preset ''{0}''", getLocaleName()));
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java

@@ -42 +42 @@
         putValue(Action.NAME, getName());
         /** Tooltips should be shown for the toolbar buttons, but not in the menu. */
-        putValue(OPTIONAL_TOOLTIP_TEXT, (group != null ?
+        putValue(OPTIONAL_TOOLTIP_TEXT, group != null ?
                 tr("Preset group {1} / {0}", getLocaleName(), group.getName()) :
-                    tr("Preset group {0}", getLocaleName())));
+                    tr("Preset group {0}", getLocaleName()));
         putValue("toolbar", "tagginggroup_" + getRawName());
     }

trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java

@@ -126 +126 @@
             if (timer.isRunning()) {
                 timer.stop();
-            } else if (set.add((e.getKeyCode())) && enabled) {
+            } else if (set.add(e.getKeyCode()) && enabled) {
                 synchronized (this) {
                     if (isFocusInMainWindow()) {

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

@@ -72 +72 @@
         this.lastDirProperty = lastDirProperty == null || lastDirProperty.isEmpty() ? "lastDirectory" : lastDirProperty;
         this.curDir = Main.pref.get(this.lastDirProperty).isEmpty() ?
-                (defaultDir == null || defaultDir.isEmpty() ? "." : defaultDir)
+                defaultDir == null || defaultDir.isEmpty() ? "." : defaultDir
                 : Main.pref.get(this.lastDirProperty);
     }

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

@@ -560 +560 @@
             Split split = (Split)root;
             boolean grow = split.isRowLayout()
-            ? (split.getBounds().width <= bounds.width)
+            ? split.getBounds().width <= bounds.width
                     : (split.getBounds().height <= bounds.height);
             if (grow) {
@@ -1122 +1122 @@
 
     private static void parseAttribute(String name, StreamTokenizer st, Node node) throws Exception {
-        if ((st.nextToken() != '=')) {
+        if (st.nextToken() != '=') {
             throwParseException(st, "expected '=' after " + name);
         }

trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

@@ -50 +50 @@
         String url = "trackpoints?bbox="+b.getMinLon()+","+b.getMinLat()+","+b.getMaxLon()+","+b.getMaxLat()+"&page=";
         for (int i = 0;!done;++i) {
-            progressMonitor.subTask(tr("Downloading points {0} to {1}...", i * 5000, ((i + 1) * 5000)));
+            progressMonitor.subTask(tr("Downloading points {0} to {1}...", i * 5000, (i + 1) * 5000));
             try (InputStream in = getInputStream(url+i, progressMonitor.createSubTaskMonitor(1, true))) {
                 if (in == null) {

trunk/src/org/openstreetmap/josm/io/CacheFiles.java

@@ -375 +375 @@
         if(CacheFiles.EXPIRE_NEVER == this.expire)
             return false;
-        return (file.lastModified() < (System.currentTimeMillis() - expire*1000));
+        return file.lastModified() < (System.currentTimeMillis() - expire*1000);
     }
 }

trunk/src/org/openstreetmap/josm/io/Capabilities.java

@@ -73 +73 @@
         Map<String, String> e = capabilities.get(element);
         if (e == null) return false;
-        return (e.get(attribute) != null);
+        return e.get(attribute) != null;
     }
 

trunk/src/org/openstreetmap/josm/io/GpxReader.java

@@ -551 +551 @@
                 String message = e.getMessage();
                 if (e instanceof SAXParseException) {
-                    SAXParseException spe = ((SAXParseException)e);
+                    SAXParseException spe = (SAXParseException)e;
                     message += " " + tr("(at line {0}, column {1})", spe.getLineNumber(), spe.getColumnNumber());
                 }

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -420 +420 @@
         CheckParameterUtil.ensureParameterNotNull(changeset, "changeset");
         try {
-            progressMonitor.beginTask((tr("Creating changeset...")));
+            progressMonitor.beginTask(tr("Creating changeset..."));
             initialize(progressMonitor);
             String ret = "";
@@ -430 +430 @@
                 throw new OsmTransferException(tr("Unexpected format of ID replied by the server. Got ''{0}''.", ret));
             }
-            progressMonitor.setCustomText((tr("Successfully opened changeset {0}",changeset.getId())));
+            progressMonitor.setCustomText(tr("Successfully opened changeset {0}",changeset.getId()));
         } finally {
             progressMonitor.finishTask();

trunk/src/org/openstreetmap/josm/io/OsmWriter.java

@@ -90 +90 @@
     protected static final Comparator<OsmPrimitive> byIdComparator = new Comparator<OsmPrimitive>() {
         @Override public int compare(OsmPrimitive o1, OsmPrimitive o2) {
-            return (o1.getUniqueId()<o2.getUniqueId() ? -1 : (o1.getUniqueId()==o2.getUniqueId() ? 0 : 1));
+            return o1.getUniqueId()<o2.getUniqueId() ? -1 : (o1.getUniqueId()==o2.getUniqueId() ? 0 : 1);
         }
     };

trunk/src/org/openstreetmap/josm/io/UTFInputStreamReader.java

@@ -54 +54 @@
 
         if (unread > 0) {
-            pushbackStream.unread(bom, (n - unread), unread);
+            pushbackStream.unread(bom, n - unread, unread);
         } else if (unread < -1) {
             pushbackStream.unread(bom, 0, 0);

trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java

@@ -247 +247 @@
         }
 
-        if ((!request.isReal() && !layer.hasAutoDownload())){
+        if (!request.isReal() && !layer.hasAutoDownload()){
             request.finish(State.NOT_IN_CACHE, null, null);
             return true;

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -1367 +1367 @@
             }), GBC.eol());
 
-            JosmTextArea description = new JosmTextArea((info.description == null ? tr("no description available")
-                    : info.description));
+            JosmTextArea description = new JosmTextArea(info.description == null ? tr("no description available")
+                    : info.description);
             description.setEditable(false);
             description.setFont(new JLabel().getFont().deriveFont(Font.ITALIC));

trunk/src/org/openstreetmap/josm/tools/ColorHelper.java

@@ -32 +32 @@
                     Integer.parseInt(html.substring(2,4),16),
                     Integer.parseInt(html.substring(4,6),16),
-                    (html.length() == 8 ? Integer.parseInt(html.substring(6,8),16) : 255));
+                    html.length() == 8 ? Integer.parseInt(html.substring(6,8),16) : 255);
         } catch (NumberFormatException e) {
             return null;

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -449 +449 @@
         CheckParameterUtil.ensureValidCoordinates(secondNode, "secondNode");
 
-        double dy1 = (firstNode.getY() - commonNode.getY());
-        double dy2 = (secondNode.getY() - commonNode.getY());
-        double dx1 = (firstNode.getX() - commonNode.getX());
-        double dx2 = (secondNode.getX() - commonNode.getX());
+        double dy1 = firstNode.getY() - commonNode.getY();
+        double dy2 = secondNode.getY() - commonNode.getY();
+        double dx1 = firstNode.getX() - commonNode.getX();
+        double dx2 = secondNode.getX() - commonNode.getX();
 
         return dy1 * dx2 - dx1 * dy2 > 0;
@@ -651 +651 @@
         dlat = lat2 - lat1;
 
-        double a = (Math.pow(Math.sin(dlat/2), 2) + Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(dlon/2), 2));
+        double a = Math.pow(Math.sin(dlat/2), 2) + Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(dlon/2), 2);
         double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
         return 6367000 * c;
@@ -668 +668 @@
         dlat = lat2 - lat1;
 
-        double a = (Math.pow(Math.sin(dlat/2), 2) + Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(dlon/2), 2));
+        double a = Math.pow(Math.sin(dlat/2), 2) + Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(dlon/2), 2);
         double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
         return 6367000 * c;

trunk/src/org/openstreetmap/josm/tools/I18n.java

@@ -694 +694 @@
         switch(pluralMode) {
         case MODE_NOTONE: /* bg, da, de, el, en, en_GB, es, et, eu, fi, gl, is, it, iw_IL, nb, nl, sv */
-            return ((n != 1) ? 1 : 0);
+            return (n != 1) ? 1 : 0;
         case MODE_NONE: /* id, ja, km, tr, zh_CN, zh_TW */
             return 0;
         case MODE_GREATERONE: /* fr, pt_BR */
-            return ((n > 1) ? 1 : 0);
+            return (n > 1) ? 1 : 0;
         case MODE_CS:
-            return ((n == 1) ? 0 : (((n >= 2) && (n <= 4)) ? 1 : 2));
+            return (n == 1) ? 0 : (((n >= 2) && (n <= 4)) ? 1 : 2);
         //case MODE_AR:
         //    return ((n == 0) ? 0 : ((n == 1) ? 1 : ((n == 2) ? 2 : ((((n % 100) >= 3)
         //            && ((n % 100) <= 10)) ? 3 : ((((n % 100) >= 11) && ((n % 100) <= 99)) ? 4 : 5)))));
         case MODE_PL:
-            return ((n == 1) ? 0 : (((((n % 10) >= 2) && ((n % 10) <= 4))
-                    && (((n % 100) < 10) || ((n % 100) >= 20))) ? 1 : 2));
+            return (n == 1) ? 0 : (((((n % 10) >= 2) && ((n % 10) <= 4))
+                    && (((n % 100) < 10) || ((n % 100) >= 20))) ? 1 : 2);
         //case MODE_RO:
         //    return ((n == 1) ? 0 : ((((n % 100) > 19) || (((n % 100) == 0) && (n != 0))) ? 2 : 1));
         case MODE_LT:
-            return (((n % 10) == 1) && ((n % 100) != 11) ? 0 : (((n % 10) >= 2)
-                    && (((n % 100) < 10) || ((n % 100) >= 20)) ? 1 : 2));
+            return ((n % 10) == 1) && ((n % 100) != 11) ? 0 : (((n % 10) >= 2)
+                    && (((n % 100) < 10) || ((n % 100) >= 20)) ? 1 : 2);
         case MODE_RU:
-            return ((((n % 10) == 1) && ((n % 100) != 11)) ? 0 : (((((n % 10) >= 2)
-                    && ((n % 10) <= 4)) && (((n % 100) < 10) || ((n % 100) >= 20))) ? 1 : 2));
+            return (((n % 10) == 1) && ((n % 100) != 11)) ? 0 : (((((n % 10) >= 2)
+                    && ((n % 10) <= 4)) && (((n % 100) < 10) || ((n % 100) >= 20))) ? 1 : 2);
         case MODE_SK:
-            return ((n == 1) ? 1 : (((n >= 2) && (n <= 4)) ? 2 : 0));
+            return (n == 1) ? 1 : (((n >= 2) && (n <= 4)) ? 2 : 0);
         //case MODE_SL:
         //    return (((n % 100) == 1) ? 1 : (((n % 100) == 2) ? 2 : ((((n % 100) == 3)

trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

@@ -291 +291 @@
     public static String getURL(double dlat, double dlon, int zoom) {
         // Truncate lat and lon to something more sensible
-        int decimals = (int) Math.pow(10, (zoom / 3));
-        double lat = (Math.round(dlat * decimals));
+        int decimals = (int) Math.pow(10, zoom / 3);
+        double lat = Math.round(dlat * decimals);
         lat /= decimals;
-        double lon = (Math.round(dlon * decimals));
+        double lon = Math.round(dlon * decimals);
         lon /= decimals;
         return Main.getOSMWebsite() + "/#map="+zoom+"/"+lat+"/"+lon;

trunk/src/org/openstreetmap/josm/tools/Shortcut.java

@@ -148 +148 @@
     // create a shortcut object from an string as saved in the preferences
     private Shortcut(String prefString) {
-        List<String> s = (new ArrayList<>(Main.pref.getCollection(prefString)));
+        List<String> s = new ArrayList<>(Main.pref.getCollection(prefString));
         this.shortText = prefString.substring(15);
         this.longText = s.get(0);