diff --git a/.github/scripts/generate-quality-report.py b/.github/scripts/generate-quality-report.py index a04911e002..5006871ff4 100755 --- a/.github/scripts/generate-quality-report.py +++ b/.github/scripts/generate-quality-report.py @@ -908,7 +908,9 @@ def _is_exempt(f: Finding) -> bool: "MissingOverride", "ControlStatementBraces", "UnnecessaryFullyQualifiedName", - "UseCollectionIsEmpty" + "UseCollectionIsEmpty", + "UnusedPrivateField", + "UnnecessaryLocalBeforeReturn" } violations = [f for f in pmd.findings if f.rule in forbidden_pmd_rules] if violations: diff --git a/CodenameOne/src/com/codename1/ads/AdsService.java b/CodenameOne/src/com/codename1/ads/AdsService.java index 2d8622f0b7..4393499b74 100644 --- a/CodenameOne/src/com/codename1/ads/AdsService.java +++ b/CodenameOne/src/com/codename1/ads/AdsService.java @@ -56,8 +56,7 @@ protected AdsService() { */ public static AdsService createAdsService() { try { - AdsService adsService = (AdsService) service.newInstance(); - return adsService; + return (AdsService) service.newInstance(); } catch (InstantiationException ex) { ex.printStackTrace(); } catch (IllegalAccessException ex) { diff --git a/CodenameOne/src/com/codename1/charts/models/MultipleCategorySeries.java b/CodenameOne/src/com/codename1/charts/models/MultipleCategorySeries.java index 7752d0b736..ef9cdb47f1 100644 --- a/CodenameOne/src/com/codename1/charts/models/MultipleCategorySeries.java +++ b/CodenameOne/src/com/codename1/charts/models/MultipleCategorySeries.java @@ -146,7 +146,6 @@ public String[] getTitles(int index) { * @return the XY series */ public XYSeries toXYSeries() { - XYSeries xySeries = new XYSeries(mTitle); - return xySeries; + return new XYSeries(mTitle); } } diff --git a/CodenameOne/src/com/codename1/charts/models/XYSeries.java b/CodenameOne/src/com/codename1/charts/models/XYSeries.java index 38559d577f..b8caefc36c 100644 --- a/CodenameOne/src/com/codename1/charts/models/XYSeries.java +++ b/CodenameOne/src/com/codename1/charts/models/XYSeries.java @@ -102,8 +102,7 @@ private static double ulp(double value) { return Double.longBitsToDouble(bits) - Double.longBitsToDouble(bits - 1); } double nextValue = Double.longBitsToDouble(bits + 1); - double result = nextValue - value; - return result; + return nextValue - value; } public int getScaleNumber() { @@ -536,8 +535,7 @@ public int getIndexForKey(K key) { Collections.sort(indexList, null); sorted = true; } - int out = Collections.binarySearch(indexList, key, null); - return out; + return Collections.binarySearch(indexList, key, null); } } } diff --git a/CodenameOne/src/com/codename1/charts/util/ColorUtil.java b/CodenameOne/src/com/codename1/charts/util/ColorUtil.java index 34e4ce1cb0..2b5d7be920 100644 --- a/CodenameOne/src/com/codename1/charts/util/ColorUtil.java +++ b/CodenameOne/src/com/codename1/charts/util/ColorUtil.java @@ -39,33 +39,27 @@ public class ColorUtil { public static int argb(int a, int r, int g, int b) { - IColor c = new IColor(a, r, g, b); - return c.argb; + return new IColor(a, r, g, b).argb; } public static int alpha(int c) { - IColor pc = new IColor(c); - return pc.alpha; + return new IColor(c).alpha; } public static int red(int c) { - IColor pc = new IColor(c); - return pc.red; + return new IColor(c).red; } public static int green(int c) { - IColor pc = new IColor(c); - return pc.green; + return new IColor(c).green; } public static int blue(int c) { - IColor pc = new IColor(c); - return pc.blue; + return new IColor(c).blue; } public static int rgb(int r, int g, int b) { - IColor c = new IColor(r, g, b); - return c.argb; + return new IColor(r, g, b).argb; } diff --git a/CodenameOne/src/com/codename1/charts/util/NumberFormat.java b/CodenameOne/src/com/codename1/charts/util/NumberFormat.java index 73c7007d94..7cddd8bd18 100644 --- a/CodenameOne/src/com/codename1/charts/util/NumberFormat.java +++ b/CodenameOne/src/com/codename1/charts/util/NumberFormat.java @@ -61,12 +61,10 @@ public double parseDouble(String format) throws ParseException { return Double.parseDouble(t); } catch (Exception err) { try { - double val = L10NManager.getInstance().parseDouble(format); - return val; + return L10NManager.getInstance().parseDouble(format); } catch (Exception err2) { try { - double v2 = L10NManager.getInstance().parseCurrency(format); - return v2; + return L10NManager.getInstance().parseCurrency(format); } catch (Exception err3) { Log.e(err3); return 0; diff --git a/CodenameOne/src/com/codename1/charts/views/PieMapper.java b/CodenameOne/src/com/codename1/charts/views/PieMapper.java index ee5c0eba11..f8040021a2 100644 --- a/CodenameOne/src/com/codename1/charts/views/PieMapper.java +++ b/CodenameOne/src/com/codename1/charts/views/PieMapper.java @@ -116,8 +116,7 @@ public boolean isOnPieChart(Point screenPoint) { mCenterY - screenPoint.getY(), 2)); double radiusSquared = mPieChartRadius * mPieChartRadius; - boolean isOnPieChart = sqValue <= radiusSquared; - return isOnPieChart; + return sqValue <= radiusSquared; } /** diff --git a/CodenameOne/src/com/codename1/db/ThreadSafeDatabase.java b/CodenameOne/src/com/codename1/db/ThreadSafeDatabase.java index b50796960d..be9490a13f 100644 --- a/CodenameOne/src/com/codename1/db/ThreadSafeDatabase.java +++ b/CodenameOne/src/com/codename1/db/ThreadSafeDatabase.java @@ -72,6 +72,7 @@ public void run() throws IOException { private void invokeWithException(final RunnableWithIOException r) throws IOException { IOException err = et.run(new RunnableWithResultSync() { @Override + @SuppressWarnings("PMD.UnnecessaryLocalBeforeReturn") public IOException run() { try { r.run(); @@ -89,6 +90,7 @@ public IOException run() { private Object invokeWithException(final RunnableWithResponseOrIOException r) throws IOException { Object ret = et.run(new RunnableWithResultSync() { @Override + @SuppressWarnings("PMD.UnnecessaryLocalBeforeReturn") public Object run() { try { return r.run(); diff --git a/CodenameOne/src/com/codename1/impl/CodenameOneImplementation.java b/CodenameOne/src/com/codename1/impl/CodenameOneImplementation.java index 5fb814938f..c64996caa2 100644 --- a/CodenameOne/src/com/codename1/impl/CodenameOneImplementation.java +++ b/CodenameOne/src/com/codename1/impl/CodenameOneImplementation.java @@ -122,7 +122,6 @@ public abstract class CodenameOneImplementation { */ private static final int RTL_RANGE_BEGIN = 0x590; private static final int RTL_RANGE_END = 0x7BF; - private static boolean pollingThreadRunning; private static PushCallback callback; private static PurchaseCallback purchaseCallback; private static Runnable onCurrentFormChange; @@ -268,7 +267,6 @@ public static Class getObjectArrayClass() { * Stops the polling push loop */ protected static void stopPolling() { - pollingThreadRunning = false; } /** diff --git a/CodenameOne/src/com/codename1/io/CSVParser.java b/CodenameOne/src/com/codename1/io/CSVParser.java index a58b9acbd6..40ce421ce8 100644 --- a/CodenameOne/src/com/codename1/io/CSVParser.java +++ b/CodenameOne/src/com/codename1/io/CSVParser.java @@ -98,8 +98,7 @@ private int peekNextChar() throws IOException { } bufferOffset = 0; } - int response = buffer[bufferOffset]; - return response; + return buffer[bufferOffset]; } /** diff --git a/CodenameOne/src/com/codename1/io/ConnectionRequest.java b/CodenameOne/src/com/codename1/io/ConnectionRequest.java index c86d643992..fad4821beb 100644 --- a/CodenameOne/src/com/codename1/io/ConnectionRequest.java +++ b/CodenameOne/src/com/codename1/io/ConnectionRequest.java @@ -449,8 +449,7 @@ public static Map fetchJSON(String url) throws IOException { } } JSONParser jp = new JSONParser(); - Map result = jp.parseJSON(new InputStreamReader(new ByteArrayInputStream(cr.getResponseData()), "UTF-8")); - return result; + return jp.parseJSON(new InputStreamReader(new ByteArrayInputStream(cr.getResponseData()), "UTF-8")); } /** diff --git a/CodenameOne/src/com/codename1/io/Util.java b/CodenameOne/src/com/codename1/io/Util.java index af68ade7df..6eb54669c9 100644 --- a/CodenameOne/src/com/codename1/io/Util.java +++ b/CodenameOne/src/com/codename1/io/Util.java @@ -2532,14 +2532,13 @@ private static long getUniqueDeviceID() { * @return */ private static long generateLongFromDeviceInfo() { - long random = CN.getDeviceDensity() + return CN.getDeviceDensity() * CN.getDisplayHeight() * CN.getDisplayWidth() * CN.convertToPixels(10) * Long.parseLong(sanitizeString(CN.getPlatformName()), 36) * Long.parseLong(sanitizeString(CN.getProperty("User-Agent", "1")), 36) * Long.parseLong(sanitizeString(CN.getProperty("OSVer", "1")), 36); - return random; } /** diff --git a/CodenameOne/src/com/codename1/io/gzip/Deflate.java b/CodenameOne/src/com/codename1/io/gzip/Deflate.java index 9564674f2b..99e1ac546c 100644 --- a/CodenameOne/src/com/codename1/io/gzip/Deflate.java +++ b/CodenameOne/src/com/codename1/io/gzip/Deflate.java @@ -74,24 +74,19 @@ final class Deflate { static final private int Z_DEFAULT_STRATEGY = 0; static final private int Z_NO_FLUSH = 0; static final private int Z_PARTIAL_FLUSH = 1; - static final private int Z_SYNC_FLUSH = 2; static final private int Z_FULL_FLUSH = 3; static final private int Z_FINISH = 4; static final private int Z_OK = 0; static final private int Z_STREAM_END = 1; static final private int Z_NEED_DICT = 2; - static final private int Z_ERRNO = -1; static final private int Z_STREAM_ERROR = -2; static final private int Z_DATA_ERROR = -3; - static final private int Z_MEM_ERROR = -4; static final private int Z_BUF_ERROR = -5; - static final private int Z_VERSION_ERROR = -6; static final private int INIT_STATE = 42; static final private int BUSY_STATE = 113; static final private int FINISH_STATE = 666; // The deflate compression method static final private int Z_DEFLATED = 8; - static final private int STORED_BLOCK = 0; static final private int STATIC_TREES = 1; static final private int DYN_TREES = 2; // The three kinds of block type diff --git a/CodenameOne/src/com/codename1/io/gzip/Deflater.java b/CodenameOne/src/com/codename1/io/gzip/Deflater.java index be6bc98520..a5d629466b 100644 --- a/CodenameOne/src/com/codename1/io/gzip/Deflater.java +++ b/CodenameOne/src/com/codename1/io/gzip/Deflater.java @@ -37,25 +37,9 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING final public class Deflater extends ZStream { static final private int MAX_WBITS = 15; // 32K LZ77 window - static final private int DEF_WBITS = MAX_WBITS; - - static final private int Z_NO_FLUSH = 0; - static final private int Z_PARTIAL_FLUSH = 1; - static final private int Z_SYNC_FLUSH = 2; - static final private int Z_FULL_FLUSH = 3; - static final private int Z_FINISH = 4; - - static final private int MAX_MEM_LEVEL = 9; - static final private int Z_OK = 0; static final private int Z_STREAM_END = 1; - static final private int Z_NEED_DICT = 2; - static final private int Z_ERRNO = -1; static final private int Z_STREAM_ERROR = -2; - static final private int Z_DATA_ERROR = -3; - static final private int Z_MEM_ERROR = -4; - static final private int Z_BUF_ERROR = -5; - static final private int Z_VERSION_ERROR = -6; private boolean finished = false; diff --git a/CodenameOne/src/com/codename1/io/gzip/InfBlocks.java b/CodenameOne/src/com/codename1/io/gzip/InfBlocks.java index c4ebe393d2..fef3b9f2d7 100644 --- a/CodenameOne/src/com/codename1/io/gzip/InfBlocks.java +++ b/CodenameOne/src/com/codename1/io/gzip/InfBlocks.java @@ -43,13 +43,9 @@ final class InfBlocks { static final private int[] inflate_mask = {0x00000000, 0x00000001, 0x00000003, 0x00000007, 0x0000000f, 0x0000001f, 0x0000003f, 0x0000007f, 0x000000ff, 0x000001ff, 0x000003ff, 0x000007ff, 0x00000fff, 0x00001fff, 0x00003fff, 0x00007fff, 0x0000ffff}; static final private int Z_OK = 0; static final private int Z_STREAM_END = 1; - static final private int Z_NEED_DICT = 2; - static final private int Z_ERRNO = -1; static final private int Z_STREAM_ERROR = -2; static final private int Z_DATA_ERROR = -3; - static final private int Z_MEM_ERROR = -4; static final private int Z_BUF_ERROR = -5; - static final private int Z_VERSION_ERROR = -6; static final private int TYPE = 0; // get type bits (3, including end bit) static final private int LENS = 1; // get lengths for stored diff --git a/CodenameOne/src/com/codename1/io/gzip/InfCodes.java b/CodenameOne/src/com/codename1/io/gzip/InfCodes.java index 07f5774412..e3b4476337 100644 --- a/CodenameOne/src/com/codename1/io/gzip/InfCodes.java +++ b/CodenameOne/src/com/codename1/io/gzip/InfCodes.java @@ -45,13 +45,8 @@ final class InfCodes { static final private int Z_OK = 0; static final private int Z_STREAM_END = 1; - static final private int Z_NEED_DICT = 2; - static final private int Z_ERRNO = -1; static final private int Z_STREAM_ERROR = -2; static final private int Z_DATA_ERROR = -3; - static final private int Z_MEM_ERROR = -4; - static final private int Z_BUF_ERROR = -5; - static final private int Z_VERSION_ERROR = -6; // waiting for "i:"=input, // "o:"=output, diff --git a/CodenameOne/src/com/codename1/io/gzip/InfTree.java b/CodenameOne/src/com/codename1/io/gzip/InfTree.java index 3dc35eff98..849e3e7637 100644 --- a/CodenameOne/src/com/codename1/io/gzip/InfTree.java +++ b/CodenameOne/src/com/codename1/io/gzip/InfTree.java @@ -202,14 +202,9 @@ final class InfTree { static final int BMAX = 15; // maximum bit length of any code static final private int MANY = 1440; static final private int Z_OK = 0; - static final private int Z_STREAM_END = 1; - static final private int Z_NEED_DICT = 2; - static final private int Z_ERRNO = -1; - static final private int Z_STREAM_ERROR = -2; static final private int Z_DATA_ERROR = -3; static final private int Z_MEM_ERROR = -4; static final private int Z_BUF_ERROR = -5; - static final private int Z_VERSION_ERROR = -6; int[] hn = null; // hufts used in space int[] v = null; // work area for huftBuild int[] c = null; // bit length count table diff --git a/CodenameOne/src/com/codename1/io/gzip/Inflate.java b/CodenameOne/src/com/codename1/io/gzip/Inflate.java index 49a4159c6f..0849a07704 100644 --- a/CodenameOne/src/com/codename1/io/gzip/Inflate.java +++ b/CodenameOne/src/com/codename1/io/gzip/Inflate.java @@ -42,21 +42,15 @@ final class Inflate { static final int Z_FULL_FLUSH = 3; static final int Z_FINISH = 4; static final int INFLATE_ANY = 0x40000000; - static final private int MAX_WBITS = 15; // 32K LZ77 window // preset dictionary flag in zlib header static final private int PRESET_DICT = 0x20; static final private int Z_DEFLATED = 8; static final private int Z_OK = 0; static final private int Z_STREAM_END = 1; static final private int Z_NEED_DICT = 2; - static final private int Z_ERRNO = -1; static final private int Z_STREAM_ERROR = -2; static final private int Z_DATA_ERROR = -3; - static final private int Z_MEM_ERROR = -4; static final private int Z_BUF_ERROR = -5; - static final private int Z_VERSION_ERROR = -6; - static final private int METHOD = 0; // waiting for method byte - static final private int FLAG = 1; // waiting for flag byte static final private int DICT4 = 2; // four dictionary check bytes to go static final private int DICT3 = 3; // three dictionary check bytes to go static final private int DICT2 = 4; // two dictionary check bytes to go @@ -169,6 +163,7 @@ int inflateInit(int w) { return Z_OK; } + @SuppressWarnings("PMD.UnnecessaryLocalBeforeReturn") int inflate(int f) { int hold = 0; diff --git a/CodenameOne/src/com/codename1/io/gzip/Inflater.java b/CodenameOne/src/com/codename1/io/gzip/Inflater.java index aae93fa803..c52c36433f 100644 --- a/CodenameOne/src/com/codename1/io/gzip/Inflater.java +++ b/CodenameOne/src/com/codename1/io/gzip/Inflater.java @@ -40,23 +40,9 @@ final public class Inflater extends ZStream { static final private int MAX_WBITS = 15; // 32K LZ77 window static final private int DEF_WBITS = MAX_WBITS; - static final private int Z_NO_FLUSH = 0; - static final private int Z_PARTIAL_FLUSH = 1; - static final private int Z_SYNC_FLUSH = 2; - static final private int Z_FULL_FLUSH = 3; - static final private int Z_FINISH = 4; - - static final private int MAX_MEM_LEVEL = 9; - static final private int Z_OK = 0; static final private int Z_STREAM_END = 1; - static final private int Z_NEED_DICT = 2; - static final private int Z_ERRNO = -1; static final private int Z_STREAM_ERROR = -2; - static final private int Z_DATA_ERROR = -3; - static final private int Z_MEM_ERROR = -4; - static final private int Z_BUF_ERROR = -5; - static final private int Z_VERSION_ERROR = -6; private boolean finished = false; public Inflater() { @@ -144,9 +130,8 @@ public int end() { if (istate == null) { return Z_STREAM_ERROR; } - int ret = istate.inflateEnd(); // istate = null; - return ret; + return istate.inflateEnd(); } public int sync() { diff --git a/CodenameOne/src/com/codename1/io/gzip/Tree.java b/CodenameOne/src/com/codename1/io/gzip/Tree.java index 1ef30dbdd7..1103fb762d 100644 --- a/CodenameOne/src/com/codename1/io/gzip/Tree.java +++ b/CodenameOne/src/com/codename1/io/gzip/Tree.java @@ -120,8 +120,6 @@ final class Tree { // The lengths of the bit length codes are sent in order of decreasing // probability, to avoid transmitting the lengths for unused bit // length codes. - static final private int BL_CODES = 19; - static final private int D_CODES = 30; static final private int LITERALS = 256; static final private int LENGTH_CODES = 29; static final private int L_CODES = (LITERALS + 1 + LENGTH_CODES); diff --git a/CodenameOne/src/com/codename1/io/gzip/ZStream.java b/CodenameOne/src/com/codename1/io/gzip/ZStream.java index b16e230d8e..605d1831d4 100644 --- a/CodenameOne/src/com/codename1/io/gzip/ZStream.java +++ b/CodenameOne/src/com/codename1/io/gzip/ZStream.java @@ -135,9 +135,8 @@ public int inflateEnd() { if (istate == null) { return Z_STREAM_ERROR; } - int ret = istate.inflateEnd(); // istate = null; - return ret; + return istate.inflateEnd(); } public int inflateSync() { diff --git a/CodenameOne/src/com/codename1/io/rest/RequestBuilder.java b/CodenameOne/src/com/codename1/io/rest/RequestBuilder.java index 66ffed1d78..b8a61663a2 100644 --- a/CodenameOne/src/com/codename1/io/rest/RequestBuilder.java +++ b/CodenameOne/src/com/codename1/io/rest/RequestBuilder.java @@ -562,8 +562,7 @@ public Response getAsBytes() { ConnectionRequest request = createRequest(false); fetched = true; CN.addToQueueAndWait(request); - Response res = new Response(request.getResponseCode(), request.getResponseData(), request.getResponseErrorMessage()); - return res; + return new Response(request.getResponseCode(), request.getResponseData(), request.getResponseErrorMessage()); } /** diff --git a/CodenameOne/src/com/codename1/javascript/JSObject.java b/CodenameOne/src/com/codename1/javascript/JSObject.java index 0d536c85c0..313fab111a 100644 --- a/CodenameOne/src/com/codename1/javascript/JSObject.java +++ b/CodenameOne/src/com/codename1/javascript/JSObject.java @@ -215,10 +215,6 @@ public class JSObject { */ private static final String R1 = "ca_weblite_codename1_js_JSObject_R1"; - /** - * Javascript register variable 2. - */ - private static final String R2 = "ca_weblite_codename1_js_JSObject_R2"; /** * The Javascript context that this object belongs to. */ diff --git a/CodenameOne/src/com/codename1/maps/MapComponent.java b/CodenameOne/src/com/codename1/maps/MapComponent.java index 3df197821d..94628f3305 100644 --- a/CodenameOne/src/com/codename1/maps/MapComponent.java +++ b/CodenameOne/src/com/codename1/maps/MapComponent.java @@ -764,8 +764,7 @@ public int getLayersConut() { * (index < 0 || index >= size()) */ public Layer getLayerAt(int index) { - Layer l = ((LayerWithZoomLevels) _layers.elementAt(index)).layer; - return l; + return ((LayerWithZoomLevels) _layers.elementAt(index)).layer; } /** diff --git a/CodenameOne/src/com/codename1/maps/ProxyHttpTile.java b/CodenameOne/src/com/codename1/maps/ProxyHttpTile.java index 84f3530c3a..7f940cc379 100644 --- a/CodenameOne/src/com/codename1/maps/ProxyHttpTile.java +++ b/CodenameOne/src/com/codename1/maps/ProxyHttpTile.java @@ -35,7 +35,6 @@ */ public class ProxyHttpTile extends Tile { - private final String _url; private Tile _tile; /** @@ -47,7 +46,6 @@ public class ProxyHttpTile extends Tile { */ public ProxyHttpTile(Dimension tileSize, BoundingBox bbox, final String url) { super(tileSize, bbox, null); - _url = url; String cacheId = url.substring(url.indexOf(":") + 1); cacheId = StringUtil.replaceAll(cacheId, "\\", "_"); cacheId = StringUtil.replaceAll(cacheId, "/", "_"); diff --git a/CodenameOne/src/com/codename1/maps/providers/TiledProvider.java b/CodenameOne/src/com/codename1/maps/providers/TiledProvider.java index 808b270306..3cbbb43320 100644 --- a/CodenameOne/src/com/codename1/maps/providers/TiledProvider.java +++ b/CodenameOne/src/com/codename1/maps/providers/TiledProvider.java @@ -60,14 +60,13 @@ public TiledProvider(String url, Projection projection, Dimension tileSize) { * @return the image url of the tile */ protected String url(int zoomLevel, int xTile, int yTile) { - String sb = _url + "/" + + return _url + "/" + zoomLevel + "/" + xTile + "/" + yTile + ".png"; - return sb; } private int tileNo(double pos, double pos0, double scale) { diff --git a/CodenameOne/src/com/codename1/payment/Receipt.java b/CodenameOne/src/com/codename1/payment/Receipt.java index 334ef0710d..4a689038da 100644 --- a/CodenameOne/src/com/codename1/payment/Receipt.java +++ b/CodenameOne/src/com/codename1/payment/Receipt.java @@ -392,7 +392,7 @@ public void setInternalId(String internalId) { @Override public String toString() { - String sb = "Receipt {" + + return "Receipt {" + "sku:" + sku + ", " + "expiryDate:" + expiryDate + ", " + "cancellationDate:" + cancellationDate + ", " + @@ -402,7 +402,6 @@ public String toString() { "transactionId:" + transactionId + ", " + "storeCode:" + storeCode + ", " + "internalId:" + internalId + "}"; - return sb; } diff --git a/CodenameOne/src/com/codename1/social/GoogleConnect.java b/CodenameOne/src/com/codename1/social/GoogleConnect.java index 47ae044e9e..6843e6f31a 100644 --- a/CodenameOne/src/com/codename1/social/GoogleConnect.java +++ b/CodenameOne/src/com/codename1/social/GoogleConnect.java @@ -94,8 +94,7 @@ protected Oauth2 createOauth2() { params.put("approval_prompt", "force"); params.put("access_type", "offline"); - Oauth2 auth = new Oauth2(oauth2URL, clientId, redirectURI, scope, tokenURL, clientSecret, params); - return auth; + return new Oauth2(oauth2URL, clientId, redirectURI, scope, tokenURL, clientSecret, params); } @Override diff --git a/CodenameOne/src/com/codename1/social/Login.java b/CodenameOne/src/com/codename1/social/Login.java index af353b4d69..56dc8c8150 100644 --- a/CodenameOne/src/com/codename1/social/Login.java +++ b/CodenameOne/src/com/codename1/social/Login.java @@ -424,8 +424,7 @@ public void setOauth2URL(String oauth2URL) { * on the simulator */ protected Oauth2 createOauth2() { - Oauth2 auth = new Oauth2(oauth2URL, clientId, redirectURI, scope); - return auth; + return new Oauth2(oauth2URL, clientId, redirectURI, scope); } /** diff --git a/CodenameOne/src/com/codename1/ui/Button.java b/CodenameOne/src/com/codename1/ui/Button.java index 132e68efd2..bbbb05719f 100644 --- a/CodenameOne/src/com/codename1/ui/Button.java +++ b/CodenameOne/src/com/codename1/ui/Button.java @@ -102,8 +102,6 @@ public class Button extends Label implements ReleasableComponent, ActionSource bindListener; - private int pressedX; - private int pressedY; /** * Constructs a button with an empty string for its text. @@ -722,8 +720,6 @@ public void released(int x, int y) { @Override public void keyPressed(int keyCode) { if (Display.getInstance().getGameAction(keyCode) == Display.GAME_FIRE) { - pressedX = -1; - pressedY = -1; pressed(); } } @@ -793,8 +789,6 @@ public void pointerPressed(int x, int y) { if (pointerPressedListeners != null && pointerPressedListeners.hasListeners()) { pointerPressedListeners.fireActionEvent(new ActionEvent(this, ActionEvent.Type.PointerPressed, x, y)); } - pressedX = x; - pressedY = y; pressed(); Form f = getComponentForm(); // might happen when programmatically triggering press diff --git a/CodenameOne/src/com/codename1/ui/CommonProgressAnimations.java b/CodenameOne/src/com/codename1/ui/CommonProgressAnimations.java index 707e28e798..c46fd49045 100644 --- a/CodenameOne/src/com/codename1/ui/CommonProgressAnimations.java +++ b/CodenameOne/src/com/codename1/ui/CommonProgressAnimations.java @@ -203,8 +203,7 @@ protected void paintBackground(Graphics g) { @Override protected Dimension calcPreferredSize() { - Dimension out = new Dimension(CN.convertToPixels(8f), CN.convertToPixels(8f)); - return out; + return new Dimension(CN.convertToPixels(8f), CN.convertToPixels(8f)); } @@ -230,8 +229,7 @@ public static EmptyAnimation markComponentLoading(Component cmp) { @Override protected Dimension calcPreferredSize() { - Dimension out = new Dimension(CN.convertToPixels(8f), CN.convertToPixels(8f)); - return out; + return new Dimension(CN.convertToPixels(8f), CN.convertToPixels(8f)); } } @@ -376,8 +374,8 @@ protected Dimension calcPreferredSize() { int charHeight = f.getHeight(); int leading = charHeight / 2; - Dimension out = new Dimension(charWidth * cols + getStyle().getHorizontalPadding(), rows * (charHeight + leading) - leading + getStyle().getVerticalPadding()); - return out; + return new Dimension(charWidth * cols + getStyle().getHorizontalPadding(), + rows * (charHeight + leading) - leading + getStyle().getVerticalPadding()); } /** diff --git a/CodenameOne/src/com/codename1/ui/Component.java b/CodenameOne/src/com/codename1/ui/Component.java index 829edaf7fe..62de9ddf3d 100644 --- a/CodenameOne/src/com/codename1/ui/Component.java +++ b/CodenameOne/src/com/codename1/ui/Component.java @@ -236,7 +236,6 @@ public class Component implements Animation, StyleListener, Editable { * is too slow to be useful. This may not be the case on other platforms, but, for now, we'll leave this flag on. * Later on, after evaluation, this flag will likely be removed, and the best strategy will be decided upon. */ - private static final boolean useLightweightElevationShadow = true; static int restoreDragPercentage = -1; /** * A flag to dictate whether style changes should trigger a revalidate() call @@ -5347,8 +5346,7 @@ public void pointerPressed(int[] x, int[] y) { * @return true if a press in this point might indicate the desire to begin a drag operation */ protected boolean isDragAndDropOperation(int x, int y) { - Component leadParent = LeadUtil.leadParentImpl(this); - return leadParent.draggable; + return LeadUtil.leadParentImpl(this).draggable; } /** diff --git a/CodenameOne/src/com/codename1/ui/Display.java b/CodenameOne/src/com/codename1/ui/Display.java index a60a4d3d12..e7ec0b6d0a 100644 --- a/CodenameOne/src/com/codename1/ui/Display.java +++ b/CodenameOne/src/com/codename1/ui/Display.java @@ -278,7 +278,6 @@ public final class Display extends CN1Constants { private static final int POINTER_HOVER_PRESSED = 12; private static final int KEY_PRESSED = 4; private static final int KEY_RELEASED = 5; - private static final int KEY_LONG_PRESSED = 6; private static final int SIZE_CHANGED = 7; private static final int HIDE_NOTIFY = 9; private static final int SHOW_NOTIFY = 10; @@ -992,8 +991,7 @@ private void restoreMenu(Form f) { */ public boolean isInTransition() { if (animationQueue != null && !animationQueue.isEmpty()) { - Animation ani = animationQueue.get(0); - return ani instanceof Transition; + return animationQueue.get(0) instanceof Transition; } return false; } diff --git a/CodenameOne/src/com/codename1/ui/Image.java b/CodenameOne/src/com/codename1/ui/Image.java index 7e2731ccd6..a1db34083b 100644 --- a/CodenameOne/src/com/codename1/ui/Image.java +++ b/CodenameOne/src/com/codename1/ui/Image.java @@ -190,8 +190,7 @@ public static Image createImage(InputStream stream) throws IOException { */ public static Image createImage(int[] rgb, int width, int height) { try { - Image i = new Image(Display.impl.createImage(rgb, width, height)); - return i; + return new Image(Display.impl.createImage(rgb, width, height)); } catch (OutOfMemoryError err) { // Images have a major bug on many phones where they sometimes throw // an OOM with no reason. A system.gc followed by the same call over @@ -613,8 +612,7 @@ && pack(buf, 4, 2, false) == 0) { tag = pack(jpeg, offset, 2, littleEndian); if (tag == 0x0112) { // We do not really care about type and count, do we? - int orientation = pack(jpeg, offset + 8, 2, littleEndian); - return orientation; + return pack(jpeg, offset + 8, 2, littleEndian); } offset += 12; length -= 12; @@ -1237,8 +1235,7 @@ public int[] getRGBCached() { int[] getRGBCache() { if (rgbCache != null) { - int[] rgb = (int[]) Display.getInstance().extractHardRef(rgbCache); - return rgb; + return (int[]) Display.getInstance().extractHardRef(rgbCache); } return null; } diff --git a/CodenameOne/src/com/codename1/ui/IndexedImage.java b/CodenameOne/src/com/codename1/ui/IndexedImage.java index 9481d9e2d1..e91b50c20a 100644 --- a/CodenameOne/src/com/codename1/ui/IndexedImage.java +++ b/CodenameOne/src/com/codename1/ui/IndexedImage.java @@ -132,8 +132,7 @@ public static IndexedImage pack(int[] rgb, int width, int height) { } - IndexedImage i = new IndexedImage(width, height, tempPalette, rgb); - return i; + return new IndexedImage(width, height, tempPalette, rgb); } /** diff --git a/CodenameOne/src/com/codename1/ui/Toolbar.java b/CodenameOne/src/com/codename1/ui/Toolbar.java index 09f7c4e44d..2cb1a9e36b 100644 --- a/CodenameOne/src/com/codename1/ui/Toolbar.java +++ b/CodenameOne/src/com/codename1/ui/Toolbar.java @@ -2718,8 +2718,7 @@ protected Component createCommandComponent(Vector commands) { @Override protected Button createBackCommandButton() { - Button back = new Button(getBackCommand()); - return back; + return new Button(getBackCommand()); } @Override diff --git a/CodenameOne/src/com/codename1/ui/Transform.java b/CodenameOne/src/com/codename1/ui/Transform.java index 1a5e77bc61..7ec48adf22 100644 --- a/CodenameOne/src/com/codename1/ui/Transform.java +++ b/CodenameOne/src/com/codename1/ui/Transform.java @@ -127,8 +127,7 @@ public static Transform makeIdentity() { */ public static Transform makeRotation(float angle, float x, float y, float z) { Object t = Display.impl.makeTransformRotation(angle, x, y, z); - Transform out = new Transform(t); - return out; + return new Transform(t); } public static Transform makeRotation(float angle, float x, float y) { @@ -213,8 +212,7 @@ public static Transform makeAffine(double m00, */ public static Transform makePerspective(float fovy, float aspect, float zNear, float zFar) { Object t = Display.impl.makeTransformPerspective(fovy, aspect, zNear, zFar); - Transform out = new Transform(t); - return out; + return new Transform(t); } /** @@ -232,8 +230,7 @@ public static Transform makePerspective(float fovy, float aspect, float zNear, f public static Transform makeOrtho(float left, float right, float bottom, float top, float near, float far) { Object t = Display.impl.makeTransformOrtho(left, right, bottom, top, near, far); - Transform out = new Transform(t); - return out; + return new Transform(t); } /** @@ -255,8 +252,7 @@ public static Transform makeCamera(float eyeX, float eyeY, float eyeZ, float centerX, float centerY, float centerZ, float upX, float upY, float upZ) { Object t = Display.impl.makeTransformCamera(eyeX, eyeY, eyeZ, centerX, centerY, centerZ, upX, upY, upZ); - Transform out = new Transform(t); - return out; + return new Transform(t); } /** @@ -651,8 +647,7 @@ private Transform makeInverse() { } else { initNativeTransform(); Object t = impl.makeTransformInverse(nativeTransform); - Transform out = new Transform(t); - return out; + return new Transform(t); } } @@ -904,8 +899,7 @@ public boolean equals(Transform t2) { if (type == TYPE_IDENTITY && t2.type == TYPE_IDENTITY) { return true; } - boolean out = impl.transformEqualsImpl(this, t2); - return out; + return impl.transformEqualsImpl(this, t2); } @Override diff --git a/CodenameOne/src/com/codename1/ui/animations/CommonTransitions.java b/CodenameOne/src/com/codename1/ui/animations/CommonTransitions.java index 4fa375f503..062ef6283c 100644 --- a/CodenameOne/src/com/codename1/ui/animations/CommonTransitions.java +++ b/CodenameOne/src/com/codename1/ui/animations/CommonTransitions.java @@ -129,8 +129,7 @@ private CommonTransitions(int type) { * @return empty transition */ public static CommonTransitions createEmpty() { - CommonTransitions t = new CommonTransitions(TYPE_EMPTY); - return t; + return new CommonTransitions(TYPE_EMPTY); } /** @@ -152,8 +151,7 @@ public static CommonTransitions createSlideFadeTitle(boolean forward, int durati * Creates a dialog pulsate transition */ public static CommonTransitions createDialogPulsate() { - CommonTransitions c = new CommonTransitions(TYPE_PULSATE_DIALOG); - return c; + return new CommonTransitions(TYPE_PULSATE_DIALOG); } /** @@ -675,8 +673,7 @@ private Motion createMotion(int startOffset, int dest, int speed) { @Override public boolean animate() { if (timeline != null) { - boolean val = timeline.animate(); - return val; + return timeline.animate(); } if (motion == null) { return false; diff --git a/CodenameOne/src/com/codename1/ui/animations/FlipTransition.java b/CodenameOne/src/com/codename1/ui/animations/FlipTransition.java index 2715bdf664..2cb01bb902 100644 --- a/CodenameOne/src/com/codename1/ui/animations/FlipTransition.java +++ b/CodenameOne/src/com/codename1/ui/animations/FlipTransition.java @@ -45,8 +45,6 @@ public class FlipTransition extends Transition { private static final int STATE_MOVE_AWAY = 1; private static final int STATE_FLIP = 2; private static final int STATE_MOVE_CLOSER = 3; - private static final boolean firstFinished = false; - private static final boolean started = false; // Assume supported optimistically // will be switched off in paint. private boolean perspectiveSupported = true; diff --git a/CodenameOne/src/com/codename1/ui/geom/GeneralPath.java b/CodenameOne/src/com/codename1/ui/geom/GeneralPath.java index 3c050c3a09..ed6b05dc30 100644 --- a/CodenameOne/src/com/codename1/ui/geom/GeneralPath.java +++ b/CodenameOne/src/com/codename1/ui/geom/GeneralPath.java @@ -124,7 +124,6 @@ public final class GeneralPath implements Shape { * The path rule */ int rule; - private boolean dirty = false; /** * Constructs a GeneralPath with the default ({@link #WIND_NON_ZERO}) @@ -573,7 +572,6 @@ public void setWindingRule(int rule) { // awt.209=Invalid winding rule value throw new IllegalArgumentException("Invalid winding rule"); //$NON-NLS-1$ } - dirty = true; this.rule = rule; } @@ -620,7 +618,6 @@ public void moveTo(float x, float y) { points[pointSize++] = x; points[pointSize++] = y; } - dirty = true; } public void lineTo(double x, double y) { @@ -638,7 +635,6 @@ public void lineTo(float x, float y) { types[typeSize++] = PathIterator.SEG_LINETO; points[pointSize++] = x; points[pointSize++] = y; - dirty = true; } public void quadTo(double x1, double y1, double x2, double y2) { @@ -660,7 +656,6 @@ public void quadTo(float x1, float y1, float x2, float y2) { points[pointSize++] = y1; points[pointSize++] = x2; points[pointSize++] = y2; - dirty = true; } public void curveTo(double x1, double y1, double x2, double y2, double x3, double y3) { @@ -692,7 +687,6 @@ public void curveTo(float x1, float y1, float x2, float y2, float x3, float y3) points[pointSize++] = y2; points[pointSize++] = x3; points[pointSize++] = y3; - dirty = true; } /** @@ -1001,7 +995,6 @@ public void closePath() { if (typeSize == 0 || types[typeSize - 1] != PathIterator.SEG_CLOSE) { checkBuf(0, true); types[typeSize++] = PathIterator.SEG_CLOSE; - dirty = true; } } @@ -1026,7 +1019,6 @@ public void append(Shape shape, boolean connect) { append(p, connect); } - dirty = true; } /** @@ -1083,7 +1075,6 @@ private void append(PathIterator path, boolean connect, float[] tmpCoordsBuf) { path.next(); connect = false; } - dirty = true; } /** @@ -1132,7 +1123,6 @@ public void getCurrentPoint(float[] point) { public void reset() { typeSize = 0; pointSize = 0; - dirty = true; } /** @@ -1379,7 +1369,6 @@ public Shape createTransformedShape(Transform m) { * @param t The transform to apply to all points in the path. */ public void setPath(GeneralPath p, Transform t) { - dirty = true; typeSize = p.typeSize; pointSize = p.pointSize; rule = p.rule; diff --git a/CodenameOne/src/com/codename1/ui/geom/Geometry.java b/CodenameOne/src/com/codename1/ui/geom/Geometry.java index dcc924cc36..bc398365dd 100644 --- a/CodenameOne/src/com/codename1/ui/geom/Geometry.java +++ b/CodenameOne/src/com/codename1/ui/geom/Geometry.java @@ -726,13 +726,11 @@ private BezierCurve segment(double t0, double t1) { double x3 = (x[1] - x[0]) * t1 + x[0]; double y3 = (y[1] - y[0]) * t1 + y[0]; - BezierCurve b1 = new BezierCurve(x0, y0, + return new BezierCurve(x0, y0, x3, y3, xt, yt ); - return b1; - } else if (n() == 3) { if (t0 != 0) { throw new IllegalArgumentException("Only supports t0=0 right now with cubics"); diff --git a/CodenameOne/src/com/codename1/ui/html/CSSEngine.java b/CodenameOne/src/com/codename1/ui/html/CSSEngine.java index b45d0d462b..4cf7fb6483 100644 --- a/CodenameOne/src/com/codename1/ui/html/CSSEngine.java +++ b/CodenameOne/src/com/codename1/ui/html/CSSEngine.java @@ -68,7 +68,6 @@ class CSSEngine { */ private final static int INDENT_LIST_STYLE_POSITION = 15; // The possible values of the 'text-transform' attribute - private static final int TEXT_TRANSFORM_NONE = 0; private static final int TEXT_TRANSFORM_UPPERCASE = 1; private static final int TEXT_TRANSFORM_LOWERCASE = 2; private static final int TEXT_TRANSFORM_CAPITALIZE = 3; @@ -82,23 +81,17 @@ class CSSEngine { private static final int INPUT_REQUIRED_FALSE = 1; // The possible values of the 'background-attachment' attribute private static final int BG_ATTACHMENT_FIXED = 0; - private static final int BG_ATTACHMENT_SCROLL = 1; // The possible values of the 'white-space' attribute private static final int WHITE_SPACE_NORMAL = 0; private static final int WHITE_SPACE_PRE = 1; private static final int WHITE_SPACE_NOWRAP = 2; // The possible values of the 'display' attribute - private static final int DISPLAY_INLINE = 0; - private static final int DISPLAY_BLOCK = 1; - private static final int DISPLAY_LIST_ITEM = 2; private static final int DISPLAY_NONE = 3; private static final int DISPLAY_MARQUEE = 4; // The possible values of the 'font-variant' attribute - private static final int FONT_VARIANT_NORMAL = 0; private static final int FONT_VARIANT_SMALLCAPS = 1; // The possible values of the 'list-style-position' attribute private static final int LIST_STYLE_POSITION_INSIDE = 0; - private static final int LIST_STYLE_POSITION_OUTSIDE = 1; // The possible values of the 'border-style' attribute private static final int BORDER_STYLE_NONE = 0; private static final int BORDER_STYLE_SOLID = 1; @@ -119,21 +112,14 @@ class CSSEngine { private static final int STYLE = 1; private static final int COLOR = 2; // The possible values of the 'visibility' attribute - private static final int VISIBILITY_HIDDEN = 0; private static final int VISIBILITY_VISIBLE = 1; - private static final int VISIBILITY_COLLAPSE = 2; // collapse behaves the same as hidden in most browsers. // The possible values of the 'border-collapse' attribute private static final int BORDER_COLLAPSE_COLLAPSE = 0; - private static final int BORDER_COLLAPSE_SEPARATE = 1; // The possible values of the 'empty-cells' attribute - private static final int EMPTY_CELLS_HIDE = 0; private static final int EMPTY_CELLS_SHOW = 1; // The possible values of the 'caption-side' attribute - private static final int CAPTION_SIDE_BOTTOM = 0; - private static final int CAPTION_SIDE_TOP = 1; // The possible values of the 'direction' attribute private static final int DIRECTION_RTL = 0; - private static final int DIRECTION_LTR = 1; private static final int DEFAULT_3D_BORDER_COLOR = 0x9a9a9a; // default color for outset/inset/ridge/groove private static final Hashtable specialKeys = new Hashtable(); // A hashtable containing all recognized special key strings and their keycodes private final Hashtable matchingFonts = new Hashtable(); // A hashtable used as a cache for quick find of matching fonts diff --git a/CodenameOne/src/com/codename1/ui/html/HTMLComponent.java b/CodenameOne/src/com/codename1/ui/html/HTMLComponent.java index 0b3ec20fff..f6c1a7a5b7 100644 --- a/CodenameOne/src/com/codename1/ui/html/HTMLComponent.java +++ b/CodenameOne/src/com/codename1/ui/html/HTMLComponent.java @@ -523,8 +523,7 @@ public static void setCSSSupportedMediaTypes(String[] supportedMediaTypes) { */ static int getInt(String intStr, int defaultValue) { try { - int num = Integer.parseInt(intStr); - return num; + return Integer.parseInt(intStr); } catch (NumberFormatException nfe) { return defaultValue; } @@ -4145,10 +4144,6 @@ static class HTMLListIndex extends HTMLListItem { * Roman numerals lowercase ordered list type (i, ii, iii, iv, v ...) */ private static final int LIST_ROMAN_LOWER = 4; - /** - * A list with no numbers at all - can be triggered with CSS - */ - private static final int LIST_NONE = 5; int index; int listType; diff --git a/CodenameOne/src/com/codename1/ui/html/HTMLElement.java b/CodenameOne/src/com/codename1/ui/html/HTMLElement.java index fda247d90a..5128cbeb49 100644 --- a/CodenameOne/src/com/codename1/ui/html/HTMLElement.java +++ b/CodenameOne/src/com/codename1/ui/html/HTMLElement.java @@ -979,8 +979,7 @@ static int getColor(String colorStr, int defaultColor) { } try { - int color = Integer.parseInt(colorStr, 16); - return color; + return Integer.parseInt(colorStr, 16); } catch (NumberFormatException nfe) { return defaultColor; } @@ -1577,4 +1576,3 @@ boolean isFirstChild() { } } - diff --git a/CodenameOne/src/com/codename1/ui/html/HTMLParser.java b/CodenameOne/src/com/codename1/ui/html/HTMLParser.java index b6102c9da2..9bae9bc210 100644 --- a/CodenameOne/src/com/codename1/ui/html/HTMLParser.java +++ b/CodenameOne/src/com/codename1/ui/html/HTMLParser.java @@ -96,8 +96,7 @@ protected void parseTagContent(Element element, Reader is) throws IOException { */ @Override protected Element createNewElement(String name) { - HTMLElement elem = new HTMLElement(name); - return elem; + return new HTMLElement(name); } /** @@ -108,8 +107,7 @@ protected Element createNewElement(String name) { */ @Override protected Element createNewTextElement(String text) { - HTMLElement elem = new HTMLElement(text, true); - return elem; + return new HTMLElement(text, true); } /** diff --git a/CodenameOne/src/com/codename1/ui/layouts/LayeredLayout.java b/CodenameOne/src/com/codename1/ui/layouts/LayeredLayout.java index db3f02d9ee..e977d72fba 100644 --- a/CodenameOne/src/com/codename1/ui/layouts/LayeredLayout.java +++ b/CodenameOne/src/com/codename1/ui/layouts/LayeredLayout.java @@ -3345,9 +3345,7 @@ public int getAbsolutePixels(Component cmp) { Rectangle baseRect = getReferenceBox(parent, cmp); //System.out.println("Baserect is "+baseRect+" baseValue="+baseValue+" for percent "+value); - int out = (int) (baseValue + (isHorizontalInset() ? baseRect.getWidth() : baseRect.getHeight()) * value / 100f); - //System.out.println("Result is "+out); - return out; + return (int) (baseValue + (isHorizontalInset() ? baseRect.getWidth() : baseRect.getHeight()) * value / 100f); } case UNIT_BASELINE: { Component ref = getReferenceComponent(); @@ -3382,9 +3380,7 @@ public int getAbsolutePixels(Component cmp) { return bottom - top - oppositeInset.getAbsolutePixels(cmp) - baseValue - getOuterPreferredH(cmp); } else { //System.out.println("Checking opposite inset for value"); - int out = right - left - oppositeInset.getAbsolutePixels(cmp) - baseValue - getOuterPreferredW(cmp); - //System.out.println("Auto value is "+out); - return out; + return right - left - oppositeInset.getAbsolutePixels(cmp) - baseValue - getOuterPreferredW(cmp); } } } diff --git a/CodenameOne/src/com/codename1/ui/layouts/mig/CodenameOneMiGComponentWrapper.java b/CodenameOne/src/com/codename1/ui/layouts/mig/CodenameOneMiGComponentWrapper.java index 92ed0ffe3d..0385ca6378 100644 --- a/CodenameOne/src/com/codename1/ui/layouts/mig/CodenameOneMiGComponentWrapper.java +++ b/CodenameOne/src/com/codename1/ui/layouts/mig/CodenameOneMiGComponentWrapper.java @@ -57,12 +57,6 @@ * */ class CodenameOneMiGComponentWrapper implements ComponentWrapper { - /** - * Property to use in LAF settings and as JComponent client property - * to specify the visual padding. - *

- */ - private static final String VISUAL_PADDING_PROPERTY = com.codename1.ui.layouts.mig.PlatformDefaults.VISUAL_PADDING_PROPERTY; /** * Cache. */ @@ -295,9 +289,8 @@ public boolean isVisible() { @Override public final int[] getVisualPadding() { // TOOD, optimize this - int[] padding = new int[]{c.getStyle().getMarginTop(), c.getStyle().getMarginLeftNoRTL(), + return new int[]{c.getStyle().getMarginTop(), c.getStyle().getMarginLeftNoRTL(), c.getStyle().getMarginBottom(), c.getStyle().getMarginRightNoRTL()}; - return padding; } @Override diff --git a/CodenameOne/src/com/codename1/ui/list/ContainerList.java b/CodenameOne/src/com/codename1/ui/list/ContainerList.java index 14a260dd0d..cfcc9e5c96 100644 --- a/CodenameOne/src/com/codename1/ui/list/ContainerList.java +++ b/CodenameOne/src/com/codename1/ui/list/ContainerList.java @@ -488,8 +488,7 @@ public Dimension calcPreferredSize() { if (c instanceof Container) { ((Container) c).revalidate(); } - Dimension d = c.getPreferredSize(); - return d; + return c.getPreferredSize(); } } diff --git a/CodenameOne/src/com/codename1/ui/plaf/CSSBorder.java b/CodenameOne/src/com/codename1/ui/plaf/CSSBorder.java index 99b6f6b1b2..c066ad63f8 100644 --- a/CodenameOne/src/com/codename1/ui/plaf/CSSBorder.java +++ b/CodenameOne/src/com/codename1/ui/plaf/CSSBorder.java @@ -1545,10 +1545,9 @@ private String padLeft(String str, int len) { } public String toCSSString() { - String sb = "#" + + return "#" + padLeft(Integer.toHexString(color), 6) + padLeft(Integer.toHexString(alpha), 2); - return sb; } @Override @@ -1981,7 +1980,7 @@ float bottomRightY() { } private String toCSSString() { - String sb = topLeftX.toCSSString() + " " + + return topLeftX.toCSSString() + " " + topRightX.toCSSString() + " " + bottomRightX.toCSSString() + " " + bottomLeftX.toCSSString() + " / " + @@ -1989,7 +1988,6 @@ private String toCSSString() { topRightY.toCSSString() + " " + bottomRightY.toCSSString() + " " + bottomLeftY.toCSSString(); - return sb; } diff --git a/CodenameOne/src/com/codename1/ui/plaf/Style.java b/CodenameOne/src/com/codename1/ui/plaf/Style.java index 71c92fbc0f..a1383c1d42 100644 --- a/CodenameOne/src/com/codename1/ui/plaf/Style.java +++ b/CodenameOne/src/com/codename1/ui/plaf/Style.java @@ -343,29 +343,9 @@ public class Style { */ public static final byte UNIT_TYPE_REM = 7; /** - * Indicates the background for the style would use an unscaled image with an alignment - */ - private static final byte BACKGROUND_IMAGE_ALIGNED = (byte) 5; - /** - * Indicates the background alignment for use in tiling or aligned images + * Indicates the background alignment for use in tiling or aligned images. */ private static final byte BACKGROUND_IMAGE_ALIGN_TOP = (byte) 0xa1; - /** - * Indicates the background alignment for use in tiling or aligned images - */ - private static final byte BACKGROUND_IMAGE_ALIGN_BOTTOM = (byte) 0xa2; - /** - * Indicates the background alignment for use in tiling or aligned images - */ - private static final byte BACKGROUND_IMAGE_ALIGN_LEFT = (byte) 0xa3; - /** - * Indicates the background alignment for use in tiling or aligned images - */ - private static final byte BACKGROUND_IMAGE_ALIGN_RIGHT = (byte) 0xa4; - /** - * Indicates the background alignment for use in tiling or aligned images - */ - private static final byte BACKGROUND_IMAGE_ALIGN_CENTER = (byte) 0xa5; /** * Used for modified flag */ diff --git a/CodenameOne/src/com/codename1/ui/plaf/StyleParser.java b/CodenameOne/src/com/codename1/ui/plaf/StyleParser.java index fe177b14f1..c1ba87e0a9 100644 --- a/CodenameOne/src/com/codename1/ui/plaf/StyleParser.java +++ b/CodenameOne/src/com/codename1/ui/plaf/StyleParser.java @@ -1464,9 +1464,7 @@ public String getBgTypeAsString() { */ public ImageInfo getBgImage() { if (values.containsKey("bgImage")) { - ImageInfo out = new ImageInfo(values.get("bgImage")); - - return out; + return new ImageInfo(values.get("bgImage")); } return null; diff --git a/CodenameOne/src/com/codename1/ui/spinner/DateSpinner3D.java b/CodenameOne/src/com/codename1/ui/spinner/DateSpinner3D.java index cd825435b8..b79a6090bb 100644 --- a/CodenameOne/src/com/codename1/ui/spinner/DateSpinner3D.java +++ b/CodenameOne/src/com/codename1/ui/spinner/DateSpinner3D.java @@ -45,7 +45,6 @@ * @author Steve Hannah */ class DateSpinner3D extends Container implements InternalPickerWidget { - private static final String monthRenderingPrototype = "WWW"; private final SimpleDateFormat monthFormat = new SimpleDateFormat("MMMM"); private final Container wrapper = new Container(BoxLayout.x()); private final Calendar tmpCal = Calendar.getInstance(); diff --git a/CodenameOne/src/com/codename1/ui/spinner/Picker.java b/CodenameOne/src/com/codename1/ui/spinner/Picker.java index 7d04cfd40a..382af7e677 100644 --- a/CodenameOne/src/com/codename1/ui/spinner/Picker.java +++ b/CodenameOne/src/com/codename1/ui/spinner/Picker.java @@ -917,9 +917,7 @@ public void stopEditing(Runnable onFinish) { @Override public boolean isEditing() { Form f = this.getComponentForm(); - boolean out = currentInput != null && f != null && f.getCurrentInputDevice() == currentInput; //NOPMD CompareObjectsWithEquals - - return out; + return currentInput != null && f != null && f.getCurrentInputDevice() == currentInput; //NOPMD CompareObjectsWithEquals } @Override diff --git a/CodenameOne/src/com/codename1/ui/spinner/Spinner.java b/CodenameOne/src/com/codename1/ui/spinner/Spinner.java index ad7faf73a8..7ec36e9b94 100644 --- a/CodenameOne/src/com/codename1/ui/spinner/Spinner.java +++ b/CodenameOne/src/com/codename1/ui/spinner/Spinner.java @@ -140,9 +140,8 @@ class Spinner extends List { * @deprecated use TimeSpinner */ public static Spinner createTime(int min, int max, int currentValue, int step, boolean twentyFourHours, boolean showSeconds) { - Spinner s = new Spinner(new SpinnerNumberModel(min, max, currentValue, step), + return new Spinner(new SpinnerNumberModel(min, max, currentValue, step), DateTimeRenderer.createTimeRenderer(twentyFourHours, showSeconds)); - return s; } /** diff --git a/CodenameOne/src/com/codename1/ui/spinner/Spinner3D.java b/CodenameOne/src/com/codename1/ui/spinner/Spinner3D.java index 6f291a75ba..9447d0f0aa 100644 --- a/CodenameOne/src/com/codename1/ui/spinner/Spinner3D.java +++ b/CodenameOne/src/com/codename1/ui/spinner/Spinner3D.java @@ -155,13 +155,11 @@ private static boolean usePerspective() { * @return new spinner instance */ public static Spinner3D create(double min, double max, double currentValue, double step) { - Spinner3D s = new Spinner3D(new SpinnerNumberModel(min, max, currentValue, step)); - return s; + return new Spinner3D(new SpinnerNumberModel(min, max, currentValue, step)); } public static Spinner3D create(int min, int max, int currentValue, int step) { - Spinner3D s = new Spinner3D(new SpinnerNumberModel(min, max, currentValue, step)); - return s; + return new Spinner3D(new SpinnerNumberModel(min, max, currentValue, step)); } /** @@ -173,8 +171,7 @@ public static Spinner3D create(int min, int max, int currentValue, int step) { * @return new spinner instance */ public static Spinner3D createDate(long min, long max, long currentValue) { - Spinner3D s = new Spinner3D(new SpinnerDateModel(min, max, currentValue)); - return s; + return new Spinner3D(new SpinnerDateModel(min, max, currentValue)); } public int getSelectedIndex() { @@ -201,9 +198,7 @@ public Object getValue() { if (lm instanceof NumberModelAdapter) { NumberModelAdapter adapter = (NumberModelAdapter) lm; int selectedIndex = adapter.getSelectedIndex(); - Object out = adapter.inner.getItemAt(selectedIndex); - - return out; + return adapter.inner.getItemAt(selectedIndex); } if (lm instanceof DateModelAdapter) { DateModelAdapter adapter = (DateModelAdapter) lm; @@ -407,4 +402,3 @@ public void removeItem(int index) { } } - diff --git a/CodenameOne/src/com/codename1/ui/spinner/SpinnerDateModel.java b/CodenameOne/src/com/codename1/ui/spinner/SpinnerDateModel.java index 49043d447b..c511c9e374 100644 --- a/CodenameOne/src/com/codename1/ui/spinner/SpinnerDateModel.java +++ b/CodenameOne/src/com/codename1/ui/spinner/SpinnerDateModel.java @@ -124,8 +124,7 @@ public int getSize() { */ @Override public int getSelectedIndex() { - int out = (int) ((currentValue - min) / DAY); - return out; + return (int) ((currentValue - min) / DAY); } diff --git a/CodenameOne/src/com/codename1/ui/spinner/SpinnerNode.java b/CodenameOne/src/com/codename1/ui/spinner/SpinnerNode.java index b8e2556c5a..33ab3d0ef8 100644 --- a/CodenameOne/src/com/codename1/ui/spinner/SpinnerNode.java +++ b/CodenameOne/src/com/codename1/ui/spinner/SpinnerNode.java @@ -165,8 +165,7 @@ public double calcFlatListHeight() { public double calcViewportHeight() { double circumference = renderer.getPreferredH() * numSides; - double diameter = circumference / Math.PI; - return diameter; + return circumference / Math.PI; } private double calculateRotationForChild(int index) { diff --git a/CodenameOne/src/com/codename1/ui/table/Table.java b/CodenameOne/src/com/codename1/ui/table/Table.java index 8a2dde8642..0f43513c3c 100644 --- a/CodenameOne/src/com/codename1/ui/table/Table.java +++ b/CodenameOne/src/com/codename1/ui/table/Table.java @@ -985,8 +985,7 @@ public int compare(Object o1, Object o2) { double d2 = Util.toDoubleValue(o2); return Double.compare(d1, d2); } catch (IllegalArgumentException err) { - long dd = Util.toDateValue(o1).getTime() - Util.toDateValue(o2).getTime(); - return (int) dd; + return (int) (Util.toDateValue(o1).getTime() - Util.toDateValue(o2).getTime()); } } } diff --git a/CodenameOne/src/com/codename1/ui/util/Resources.java b/CodenameOne/src/com/codename1/ui/util/Resources.java index 76c3939dfc..b856766aed 100644 --- a/CodenameOne/src/com/codename1/ui/util/Resources.java +++ b/CodenameOne/src/com/codename1/ui/util/Resources.java @@ -418,8 +418,7 @@ Timeline readTimeline(DataInputStream input) throws IOException { animations[iter].defineOrientation(input.readInt(), startTime, animDuration, input.readInt(), input.readInt()); } } - Timeline tl = Timeline.createTimeline(duration, animations, new Dimension(width, height)); - return tl; + return Timeline.createTimeline(duration, animations, new Dimension(width, height)); } /** @@ -939,8 +938,7 @@ private Border confirmBorder(Hashtable h, String key) { // the resource was not already loaded when we loaded the theme // it must be loaded now so we can resolve the temporary name - Border imageBorder = createImageBorder(value); - return imageBorder; + return createImageBorder(value); } return (Border) val; } @@ -1081,8 +1079,7 @@ Image createImage(DataInputStream input) throws IOException { return readMultiImage(input); case 0xEF: - Timeline tl = readTimeline(input); - return tl; + return readTimeline(input); // Fail this is the wrong data type default: @@ -1800,8 +1797,7 @@ private Object createBorder(DataInputStream input, int type) throws IOException // Image border case 0xff08: - Object[] imageBorder = readImageBorder(input); - return imageBorder; + return readImageBorder(input); // horizontal Image border case 0xff09: diff --git a/CodenameOne/src/com/codename1/util/BigDecimal.java b/CodenameOne/src/com/codename1/util/BigDecimal.java index c940d46b02..31076ca4e7 100644 --- a/CodenameOne/src/com/codename1/util/BigDecimal.java +++ b/CodenameOne/src/com/codename1/util/BigDecimal.java @@ -17,9 +17,6 @@ * BigDecimal with double scale. */ public class BigDecimal { - private static final BigInteger ZERO = BigInteger.valueOf(0); - private static final BigInteger ONE = BigInteger.valueOf(1); - //private final BigInteger bigInt; //private final int scale; diff --git a/CodenameOne/src/com/codename1/util/BigInteger.java b/CodenameOne/src/com/codename1/util/BigInteger.java index 3385ef1a91..adc40e32c6 100644 --- a/CodenameOne/src/com/codename1/util/BigInteger.java +++ b/CodenameOne/src/com/codename1/util/BigInteger.java @@ -13,19 +13,6 @@ public class BigInteger { public static final BigInteger ZERO = new BigInteger(0, new int[0]); public static final BigInteger ONE = valueOf(1); - private static final int BITS_PER_BYTE = 8; - private static final int BYTES_PER_INT = 4; - private static final byte[] rndMask = {(byte) 255, 127, 63, 31, 15, 7, 3, 1}; - private final static byte[] bitCounts = {0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, 1, - 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, - 4, 5, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, - 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 2, 3, 3, 4, 3, 4, 4, 5, - 3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 1, 2, 2, 3, 2, - 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 2, 3, - 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, - 7, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, - 5, 6, 6, 7, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 4, 5, 5, 6, 5, 6, 6, 7, 5, - 6, 6, 7, 6, 7, 7, 8}; TBigInteger peer; private BigInteger() { diff --git a/CodenameOne/src/com/codename1/util/TLogical.java b/CodenameOne/src/com/codename1/util/TLogical.java index 6c549ef635..a57d18bf3c 100644 --- a/CodenameOne/src/com/codename1/util/TLogical.java +++ b/CodenameOne/src/com/codename1/util/TLogical.java @@ -214,8 +214,7 @@ static TBigInteger andNegative(TBigInteger longer, TBigInteger shorter) { resDigits = new int[resLength]; resDigits[resLength - 1] = 1; - TBigInteger result = new TBigInteger(-1, resLength, resDigits); - return result; + return new TBigInteger(-1, resLength, resDigits); } } } @@ -231,8 +230,7 @@ static TBigInteger andNegative(TBigInteger longer, TBigInteger shorter) { resDigits[i] = longer.digits[i]; } - TBigInteger result = new TBigInteger(-1, resLength, resDigits); - return result; + return new TBigInteger(-1, resLength, resDigits); } /** @@ -378,8 +376,7 @@ static TBigInteger andNotNegativePositive(TBigInteger negative, TBigInteger posi resDigits = new int[resLength]; resDigits[resLength - 1] = 1; - TBigInteger result = new TBigInteger(-1, resLength, resDigits); - return result; + return new TBigInteger(-1, resLength, resDigits); } } } @@ -401,8 +398,7 @@ static TBigInteger andNotNegativePositive(TBigInteger negative, TBigInteger posi resDigits[i] = positive.digits[i]; } - TBigInteger result = new TBigInteger(-1, resLength, resDigits); - return result; + return new TBigInteger(-1, resLength, resDigits); } /** @@ -515,8 +511,7 @@ static TBigInteger orPositive(TBigInteger longer, TBigInteger shorter) { resDigits[i] = longer.digits[i]; } - TBigInteger result = new TBigInteger(1, resLength, resDigits); - return result; + return new TBigInteger(1, resLength, resDigits); } /** @@ -817,8 +812,7 @@ static TBigInteger xorDiffSigns(TBigInteger positive, TBigInteger negative) { resDigits = new int[resLength]; resDigits[resLength - 1] = 1; - TBigInteger result = new TBigInteger(-1, resLength, resDigits); - return result; + return new TBigInteger(-1, resLength, resDigits); } } } diff --git a/CodenameOne/src/com/codename1/util/TMathContext.java b/CodenameOne/src/com/codename1/util/TMathContext.java index 0eff5abed8..7e8e11b70c 100644 --- a/CodenameOne/src/com/codename1/util/TMathContext.java +++ b/CodenameOne/src/com/codename1/util/TMathContext.java @@ -263,11 +263,10 @@ public int hashCode() { @Override public String toString() { - String sb = String.valueOf(chPrecision) + + return String.valueOf(chPrecision) + precision + ' ' + String.valueOf(chRoundingMode) + roundingMode; - return sb; } } diff --git a/maven/core-unittests/pmd.xml b/maven/core-unittests/pmd.xml index 34861117de..e6823d3ee7 100644 --- a/maven/core-unittests/pmd.xml +++ b/maven/core-unittests/pmd.xml @@ -17,5 +17,6 @@ +