From 8b8068b441d472dd3af586232ad5296eb5eb37e9 Mon Sep 17 00:00:00 2001 From: Shai Almog <67850168+shai-almog@users.noreply.github.com> Date: Wed, 28 Jan 2026 04:24:25 +0200 Subject: [PATCH] Fixed PMD Warnings: EmptyCatchBlock, SimplifyBooleanReturns, UnusedLocalVariable, UnnecessaryConstructor & UnnecessaryImport --- .github/scripts/generate-quality-report.py | 6 ++- .../src/com/codename1/ads/InnerActive.java | 39 ++++--------------- .../com/codename1/components/RSSReader.java | 16 +++----- .../src/com/codename1/contacts/Address.java | 6 --- .../src/com/codename1/contacts/Contact.java | 6 --- .../facebook/FacebookRESTService.java | 31 ++++----------- .../src/com/codename1/io/JSONParser.java | 1 - .../com/codename1/io/MultipartRequest.java | 31 ++++++--------- CodenameOne/src/com/codename1/io/Oauth2.java | 1 - .../src/com/codename1/io/gzip/Deflate.java | 1 - .../io/gzip/GZConnectionRequest.java | 19 +-------- .../src/com/codename1/io/gzip/Inflate.java | 3 -- .../com/codename1/io/rest/RequestBuilder.java | 24 ++++-------- .../io/services/CachedDataService.java | 16 +++----- .../com/codename1/io/services/RSSService.java | 34 ++++------------ .../io/services/TwitterRESTService.java | 15 ++----- .../com/codename1/l10n/SimpleDateFormat.java | 22 +++-------- .../com/codename1/maps/layers/PointLayer.java | 24 +++--------- .../notifications/LocalNotification.java | 6 --- .../processing/AbstractEvaluator.java | 1 - .../com/codename1/processing/XMLContent.java | 1 - CodenameOne/src/com/codename1/push/Push.java | 15 ++----- .../com/codename1/share/FacebookShare.java | 19 ++------- .../codename1/ui/AutoCompleteTextField.java | 2 - .../com/codename1/ui/LinearGradientPaint.java | 16 -------- CodenameOne/src/com/codename1/ui/MenuBar.java | 6 --- .../com/codename1/ui/NavigationCommand.java | 19 ++------- .../src/com/codename1/ui/PeerComponent.java | 1 - .../src/com/codename1/ui/SideMenuBar.java | 27 ++----------- .../ui/animations/BubbleTransition.java | 2 - .../src/com/codename1/ui/html/HTMLForm.java | 33 ++++------------ .../src/com/codename1/ui/layouts/mig/CC.java | 6 --- .../ui/layouts/mig/DimConstraint.java | 6 --- .../src/com/codename1/ui/layouts/mig/LC.java | 6 --- .../com/codename1/ui/spinner/TimeSpinner.java | 9 ----- .../src/com/codename1/util/AsyncResource.java | 2 +- .../src/com/codename1/xml/XMLParser.java | 6 --- maven/core-unittests/pmd.xml | 9 +++++ 38 files changed, 103 insertions(+), 384 deletions(-) diff --git a/.github/scripts/generate-quality-report.py b/.github/scripts/generate-quality-report.py index e670dfd991..6e08d9e70b 100755 --- a/.github/scripts/generate-quality-report.py +++ b/.github/scripts/generate-quality-report.py @@ -927,7 +927,11 @@ def _is_exempt(f: Finding) -> bool: "DoNotCallGarbageCollectionExplicitly", "SuspiciousEqualsMethodName", "UseUtilityClass", - "EmptyCatchBlock" + "EmptyCatchBlock", + "SimplifyBooleanReturns", + "UnusedLocalVariable", + "UnnecessaryConstructor", + "UnnecessaryImport" } violations = [f for f in pmd.findings if f.rule in forbidden_pmd_rules] if violations: diff --git a/CodenameOne/src/com/codename1/ads/InnerActive.java b/CodenameOne/src/com/codename1/ads/InnerActive.java index 34adde66d1..695367fc07 100644 --- a/CodenameOne/src/com/codename1/ads/InnerActive.java +++ b/CodenameOne/src/com/codename1/ads/InnerActive.java @@ -48,12 +48,6 @@ public class InnerActive extends AdsService { // PMD Fix: UnusedPrivateField rem private String hid; private boolean banner = true; - /** - * Empty constructor of the inner active ads service. - */ - public InnerActive() { - } - private static void addParam(ConnectionRequest req, String key, String val) { if (val != null && val.length() > 0) { req.addArgument(key, val); @@ -157,37 +151,18 @@ public void initService(Ads ads) { setDuplicateSupported(true); } - /** - * {@inheritDoc} - */ @Override public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { + if (!(o instanceof InnerActive)) { return false; } - if (!super.equals(o)) { - return false; - } - InnerActive that = (InnerActive) o; - - if (po != that.po) { - return false; - } - if (banner != that.banner) { - return false; - } - if (os != null ? !os.equals(that.os) : that.os != null) { - return false; - } - if (hid != null ? !hid.equals(that.hid) : that.hid != null) { - return false; - } - - return true; + return super.equals(o) && + po == that.po && + banner == that.banner && + REQUEST_URL.equals(that.REQUEST_URL) && + (os == null ? that.os == null : os.equals(that.os)) && + (hid == null ? that.hid == null : hid.equals(that.hid)); } /** diff --git a/CodenameOne/src/com/codename1/components/RSSReader.java b/CodenameOne/src/com/codename1/components/RSSReader.java index 1e0b1c43e3..11706c5e37 100644 --- a/CodenameOne/src/com/codename1/components/RSSReader.java +++ b/CodenameOne/src/com/codename1/components/RSSReader.java @@ -485,21 +485,15 @@ public void actionPerformed(ActionEvent ev) { sourceForm.showBack(); } - /** - * {@inheritDoc} - */ @Override public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - if (!super.equals(o)) { + if (!(o instanceof BackCommand)) { return false; } - return true; + BackCommand that = (BackCommand) o; + return super.equals(o) && + (sourceForm == null ? that.sourceForm == null : + sourceForm.equals(that.sourceForm)); } @Override diff --git a/CodenameOne/src/com/codename1/contacts/Address.java b/CodenameOne/src/com/codename1/contacts/Address.java index 04705367f8..87343ff66b 100644 --- a/CodenameOne/src/com/codename1/contacts/Address.java +++ b/CodenameOne/src/com/codename1/contacts/Address.java @@ -35,12 +35,6 @@ public class Address { private String postalCode; private String country; - /** - * Empty Constructor - */ - public Address() { - } - /** * Gets Address Country * diff --git a/CodenameOne/src/com/codename1/contacts/Contact.java b/CodenameOne/src/com/codename1/contacts/Contact.java index ceeaf48cae..a09d761892 100644 --- a/CodenameOne/src/com/codename1/contacts/Contact.java +++ b/CodenameOne/src/com/codename1/contacts/Contact.java @@ -67,12 +67,6 @@ public class Contact { private String[] linkedIds; - /** - * Empty Constructor - */ - public Contact() { - } - /** * Gets the Contact Addresses, the Hashtable contains key/value pairs where * the key is a String which represents the type of the Address, types can diff --git a/CodenameOne/src/com/codename1/facebook/FacebookRESTService.java b/CodenameOne/src/com/codename1/facebook/FacebookRESTService.java index 8889878ab8..02046d5ed3 100644 --- a/CodenameOne/src/com/codename1/facebook/FacebookRESTService.java +++ b/CodenameOne/src/com/codename1/facebook/FacebookRESTService.java @@ -297,34 +297,19 @@ public void longToken(long tok) { public void booleanToken(boolean tok) { } - /** - * {@inheritDoc} - */ @Override public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { + if (!(o instanceof FacebookRESTService)) { return false; } - if (!super.equals(o)) { - return false; - } - FacebookRESTService that = (FacebookRESTService) o; - - if (responseOffset != that.responseOffset) { - return false; - } - if (connectionType != null ? !connectionType.equals(that.connectionType) : that.connectionType != null) { - return false; - } - if (root != null ? !root.equals(that.root) : that.root != null) { - return false; - } - - return true; + return super.equals(o) && responseOffset == that.responseOffset && + entry.equals(that.entry) && + stack.equals(that.stack) && + (currentData == null ? that.currentData == null : currentData.equals(that.currentData)) && + (connectionType == null ? that.connectionType == null : connectionType.equals(that.connectionType)) && + (responseDestination == null ? that.responseDestination == null : responseDestination.equals(that.responseDestination)) && + (root == null ? that.root == null : root.equals(that.root)); } /** diff --git a/CodenameOne/src/com/codename1/io/JSONParser.java b/CodenameOne/src/com/codename1/io/JSONParser.java index f65daf3e95..2934d2bc4b 100644 --- a/CodenameOne/src/com/codename1/io/JSONParser.java +++ b/CodenameOne/src/com/codename1/io/JSONParser.java @@ -791,7 +791,6 @@ public void setStrict(boolean strict) { @Override public void startArray(String arrayName) { java.util.List currentVector; - Map newOne; if (modern) { currentVector = new ArrayList(); } else { diff --git a/CodenameOne/src/com/codename1/io/MultipartRequest.java b/CodenameOne/src/com/codename1/io/MultipartRequest.java index 245c970080..57abeea127 100644 --- a/CodenameOne/src/com/codename1/io/MultipartRequest.java +++ b/CodenameOne/src/com/codename1/io/MultipartRequest.java @@ -513,31 +513,22 @@ public void setBase64Binaries(boolean base64Binaries) { this.base64Binaries = base64Binaries; } - /** - * {@inheritDoc} - */ @Override public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { + if (!(o instanceof MultipartRequest)) { return false; } - if (!super.equals(o)) { - return false; - } - MultipartRequest that = (MultipartRequest) o; - - if (boundary != null ? !boundary.equals(that.boundary) : that.boundary != null) { - return false; - } - if (args != null ? !args.equals(that.args) : that.args != null) { - return false; - } - - return true; + return super.equals(o) && + contentLength == that.contentLength && + manualRedirect == that.manualRedirect && + base64Binaries == that.base64Binaries && + (boundary == null ? that.boundary == null : boundary.equals(that.boundary)) && + (args == null ? that.args == null : args.equals(that.args)) && + (filenames == null ? that.filenames == null : filenames.equals(that.filenames)) && + (filesizes == null ? that.filesizes == null : filesizes.equals(that.filesizes)) && + (mimeTypes == null ? that.mimeTypes == null : mimeTypes.equals(that.mimeTypes)) && + (ignoreEncoding == null ? that.ignoreEncoding == null : ignoreEncoding.equals(that.ignoreEncoding)); } /** diff --git a/CodenameOne/src/com/codename1/io/Oauth2.java b/CodenameOne/src/com/codename1/io/Oauth2.java index 670171ffec..94de4cd209 100644 --- a/CodenameOne/src/com/codename1/io/Oauth2.java +++ b/CodenameOne/src/com/codename1/io/Oauth2.java @@ -522,7 +522,6 @@ class TokenRequest extends ConnectionRequest { protected void readResponse(InputStream input) throws IOException { byte[] tok = Util.readInputStream(input); String t = StringUtil.newString(tok); - boolean expiresRelative = true; if (t.startsWith("{")) { JSONParser p = new JSONParser(); Map map = p.parseJSON(new StringReader(t)); diff --git a/CodenameOne/src/com/codename1/io/gzip/Deflate.java b/CodenameOne/src/com/codename1/io/gzip/Deflate.java index 874ec7e152..0bcc7a59ab 100644 --- a/CodenameOne/src/com/codename1/io/gzip/Deflate.java +++ b/CodenameOne/src/com/codename1/io/gzip/Deflate.java @@ -750,7 +750,6 @@ void copyBlock(int buf, // the input data int len, // its length boolean header // true if block header must be written ) { - int index = 0; biWindup(); // align on byte boundary lastEobLen = 8; // enough lookahead for inflate diff --git a/CodenameOne/src/com/codename1/io/gzip/GZConnectionRequest.java b/CodenameOne/src/com/codename1/io/gzip/GZConnectionRequest.java index f1c5da65e4..8a24aeaff8 100644 --- a/CodenameOne/src/com/codename1/io/gzip/GZConnectionRequest.java +++ b/CodenameOne/src/com/codename1/io/gzip/GZConnectionRequest.java @@ -45,28 +45,13 @@ public class GZConnectionRequest extends ConnectionRequest { private boolean isGzipped; - /** - * {@inheritDoc} - */ @Override public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - if (!super.equals(o)) { + if (!(o instanceof GZConnectionRequest)) { return false; } - GZConnectionRequest that = (GZConnectionRequest) o; - - if (isGzipped != that.isGzipped) { - return false; - } - - return true; + return super.equals(o) && isGzipped == that.isGzipped; } /** diff --git a/CodenameOne/src/com/codename1/io/gzip/Inflate.java b/CodenameOne/src/com/codename1/io/gzip/Inflate.java index f34766fb88..d9d65fde80 100644 --- a/CodenameOne/src/com/codename1/io/gzip/Inflate.java +++ b/CodenameOne/src/com/codename1/io/gzip/Inflate.java @@ -165,8 +165,6 @@ int inflateInit(int w) { @SuppressWarnings("PMD.UnnecessaryLocalBeforeReturn") int inflate(int f) { - int hold = 0; - int r; int b; @@ -622,7 +620,6 @@ int inflateSetDictionary(byte[] dictionary, int dictLength) { int inflateSync() { int n; // number of bytes to look at int p; // pointer to bytes - int m; // number of marker bytes found in a row long r; // temporaries to save total_in and total_out long w; diff --git a/CodenameOne/src/com/codename1/io/rest/RequestBuilder.java b/CodenameOne/src/com/codename1/io/rest/RequestBuilder.java index ca1f1c641c..d417ed875d 100644 --- a/CodenameOne/src/com/codename1/io/rest/RequestBuilder.java +++ b/CodenameOne/src/com/codename1/io/rest/RequestBuilder.java @@ -1073,28 +1073,18 @@ public Connection(boolean parseJSON) { this.parseJSON = parseJSON; } - /** - * {@inheritDoc} - */ @Override public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - if (!super.equals(o)) { + if (!(o instanceof Connection)) { return false; } - Connection that = (Connection) o; - - if (parseJSON != that.parseJSON) { - return false; - } - - return true; + return super.equals(o) && + errorCode == that.errorCode && + parseJSON == that.parseJSON && + (json == null ? that.json == null : json.equals(that.json)) && + (errorHandler == null ? that.errorHandler == null : errorHandler.equals(that.errorHandler)) && + (errorObject == null ? that.errorObject == null : errorObject.equals(that.errorObject)); } /** diff --git a/CodenameOne/src/com/codename1/io/services/CachedDataService.java b/CodenameOne/src/com/codename1/io/services/CachedDataService.java index c2b2392138..a70ba0f492 100644 --- a/CodenameOne/src/com/codename1/io/services/CachedDataService.java +++ b/CodenameOne/src/com/codename1/io/services/CachedDataService.java @@ -80,21 +80,15 @@ public static void updateData(CachedData d, ActionListener callback) { NetworkManager.getInstance().addToQueue(c); } - /** - * {@inheritDoc} - */ @Override public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - if (!super.equals(o)) { + if (!(o instanceof CachedDataService)) { return false; } - return true; + CachedDataService that = (CachedDataService) o; + return super.equals(o) && + responseProcessed == that.responseProcessed && + data.equals(that.data); } @Override diff --git a/CodenameOne/src/com/codename1/io/services/RSSService.java b/CodenameOne/src/com/codename1/io/services/RSSService.java index 33c20a4e60..b2457b57e2 100644 --- a/CodenameOne/src/com/codename1/io/services/RSSService.java +++ b/CodenameOne/src/com/codename1/io/services/RSSService.java @@ -90,37 +90,19 @@ public RSSService(String url, int limit, int startOffset) { setDuplicateSupported(true); } - /** - * {@inheritDoc} - */ @Override public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { + if (!(o instanceof RSSService)) { return false; } - if (!super.equals(o)) { - return false; - } - RSSService that = (RSSService) o; - - if (limit != that.limit) { - return false; - } - if (startOffset != that.startOffset) { - return false; - } - if (createPlainTextDetails != that.createPlainTextDetails) { - return false; - } - if (iconPlaceholder != null ? !iconPlaceholder.equals(that.iconPlaceholder) : that.iconPlaceholder != null) { - return false; - } - - return true; + return super.equals(o) && + limit == that.limit && + startOffset == that.startOffset && + hasMore == that.hasMore && + createPlainTextDetails == that.createPlainTextDetails && + (results == null ? that.results == null : results.equals(that.results)) && + (iconPlaceholder == null ? that.iconPlaceholder == null : iconPlaceholder.equals(that.iconPlaceholder)); } /** diff --git a/CodenameOne/src/com/codename1/io/services/TwitterRESTService.java b/CodenameOne/src/com/codename1/io/services/TwitterRESTService.java index 5b55250d93..ac8646cf66 100644 --- a/CodenameOne/src/com/codename1/io/services/TwitterRESTService.java +++ b/CodenameOne/src/com/codename1/io/services/TwitterRESTService.java @@ -120,21 +120,14 @@ public static void setToken(String token) { authToken = token; } - /** - * {@inheritDoc} - */ @Override public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - if (!super.equals(o)) { + if (!(o instanceof TwitterRESTService)) { return false; } - return true; + TwitterRESTService that = (TwitterRESTService) o; + return super.equals(o) && + (parseTree == null ? that.parseTree == null : parseTree.equals(that.parseTree)); } @Override diff --git a/CodenameOne/src/com/codename1/l10n/SimpleDateFormat.java b/CodenameOne/src/com/codename1/l10n/SimpleDateFormat.java index a05eda9299..88fa98f7af 100644 --- a/CodenameOne/src/com/codename1/l10n/SimpleDateFormat.java +++ b/CodenameOne/src/com/codename1/l10n/SimpleDateFormat.java @@ -292,28 +292,16 @@ List getPatternTokens() { return patternTokens; } - /** - * {@inheritDoc} - */ @Override public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - if (!super.equals(o)) { + if (!(o instanceof SimpleDateFormat)) { return false; } - SimpleDateFormat that = (SimpleDateFormat) o; - - if (pattern != null ? !pattern.equals(that.pattern) : that.pattern != null) { - return false; - } - - return true; + return super.equals(o) && + (dateFormatSymbols == null ? that.dateFormatSymbols == null : dateFormatSymbols.equals(that.dateFormatSymbols)) && + (pattern == null ? that.pattern == null : pattern.equals(that.pattern)) && + (patternTokens == null ? that.patternTokens == null : patternTokens.equals(that.patternTokens)); } /** diff --git a/CodenameOne/src/com/codename1/maps/layers/PointLayer.java b/CodenameOne/src/com/codename1/maps/layers/PointLayer.java index f913bedeb6..0319cfbceb 100644 --- a/CodenameOne/src/com/codename1/maps/layers/PointLayer.java +++ b/CodenameOne/src/com/codename1/maps/layers/PointLayer.java @@ -88,31 +88,17 @@ public void setDisplayName(boolean displayName) { this.displayName = displayName; } - /** - * {@inheritDoc} - */ @Override public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - if (!super.equals(o)) { + if (!(o instanceof PointLayer)) { return false; } PointLayer that = (PointLayer) o; - - if (name != null ? !name.equals(that.name) : that.name != null) { - return false; - } - if (icon != null ? !icon.equals(that.icon) : that.icon != null) { - return false; - } - - return true; + return super.equals(o) && + displayName == that.displayName && + (name == null ? that.name == null : name.equals(that.name)) && + (icon == null ? that.icon == null : icon.equals(that.icon)); } /** diff --git a/CodenameOne/src/com/codename1/notifications/LocalNotification.java b/CodenameOne/src/com/codename1/notifications/LocalNotification.java index ad45843b3d..a92100f4ae 100644 --- a/CodenameOne/src/com/codename1/notifications/LocalNotification.java +++ b/CodenameOne/src/com/codename1/notifications/LocalNotification.java @@ -102,12 +102,6 @@ public class LocalNotification { private String alertImage = ""; private boolean foreground; - /** - * Creates a new local notification - */ - public LocalNotification() { - } - /** * Gets the badge number to set for this notification. * diff --git a/CodenameOne/src/com/codename1/processing/AbstractEvaluator.java b/CodenameOne/src/com/codename1/processing/AbstractEvaluator.java index 9adfefdfed..6730562ae8 100644 --- a/CodenameOne/src/com/codename1/processing/AbstractEvaluator.java +++ b/CodenameOne/src/com/codename1/processing/AbstractEvaluator.java @@ -25,7 +25,6 @@ import com.codename1.util.StringUtil; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; /** diff --git a/CodenameOne/src/com/codename1/processing/XMLContent.java b/CodenameOne/src/com/codename1/processing/XMLContent.java index a91b54ae2f..786cf29073 100644 --- a/CodenameOne/src/com/codename1/processing/XMLContent.java +++ b/CodenameOne/src/com/codename1/processing/XMLContent.java @@ -29,7 +29,6 @@ import java.io.InputStream; import java.io.Reader; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Vector; diff --git a/CodenameOne/src/com/codename1/push/Push.java b/CodenameOne/src/com/codename1/push/Push.java index 41d8ac46ad..8d6c1f5a72 100644 --- a/CodenameOne/src/com/codename1/push/Push.java +++ b/CodenameOne/src/com/codename1/push/Push.java @@ -452,21 +452,14 @@ protected void handleException(Exception err) { Log.e(err); } - /** - * {@inheritDoc} - */ @Override public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - if (!super.equals(o)) { + if (!(o instanceof PushConnection)) { return false; } - return true; + + PushConnection that = (PushConnection) o; + return super.equals(o) && successful == that.successful; } @Override diff --git a/CodenameOne/src/com/codename1/share/FacebookShare.java b/CodenameOne/src/com/codename1/share/FacebookShare.java index 11d8ff275d..0057cb2e6b 100644 --- a/CodenameOne/src/com/codename1/share/FacebookShare.java +++ b/CodenameOne/src/com/codename1/share/FacebookShare.java @@ -64,28 +64,15 @@ public Image getIcon() { return i; } - /** - * {@inheritDoc} - */ @Override public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - if (!super.equals(o)) { + if (!(o instanceof FacebookShare)) { return false; } FacebookShare that = (FacebookShare) o; - - if (token != null ? !token.equals(that.token) : that.token != null) { - return false; - } - - return true; + return super.equals(o) && + (token == null ? that.token == null : token.equals(that.token)); } /** diff --git a/CodenameOne/src/com/codename1/ui/AutoCompleteTextField.java b/CodenameOne/src/com/codename1/ui/AutoCompleteTextField.java index b3025222d6..3143e48a73 100644 --- a/CodenameOne/src/com/codename1/ui/AutoCompleteTextField.java +++ b/CodenameOne/src/com/codename1/ui/AutoCompleteTextField.java @@ -640,8 +640,6 @@ public void actionPerformed(ActionEvent evt) { final Form f = getComponentForm(); Container layered = f.getLayeredPane(AutoCompleteTextField.this.getClass(), true); - boolean canOpenPopup = true; - for (int i = 0; i < layered.getComponentCount(); i++) { Container wrap = (Container) layered.getComponentAt(i); Component pop = wrap.getComponentAt(0); diff --git a/CodenameOne/src/com/codename1/ui/LinearGradientPaint.java b/CodenameOne/src/com/codename1/ui/LinearGradientPaint.java index 39efdf531a..2577508ded 100644 --- a/CodenameOne/src/com/codename1/ui/LinearGradientPaint.java +++ b/CodenameOne/src/com/codename1/ui/LinearGradientPaint.java @@ -206,17 +206,9 @@ private void paint(Graphics g, double w, double h, boolean processCycles) { int iter = 0; while (currPos > endPos) { - float sx = (float) startX; - float sy = (float) startY; - float ex = (float) endX; - float ey = (float) endY; int[] cols = getColors(); float[] fracs = getFractions(); if (iter % 2 == 0 && getCycleMethod() == REFLECT) { - sx = (float) endX; - sy = (float) endY; - ex = (float) startX; - ey = (float) startY; cols = reverseColors(); fracs = reverseFractions(); } @@ -252,17 +244,9 @@ private void paint(Graphics g, double w, double h, boolean processCycles) { int iter = 0; while (currPos < endPos) { - float sx = (float) startX; - float sy = (float) startY; - float ex = (float) endX; - float ey = (float) endY; int[] cols = getColors(); float[] fracs = getFractions(); if (iter % 2 == 0 && getCycleMethod() == REFLECT) { - sx = (float) endX; - sy = (float) endY; - ex = (float) startX; - ey = (float) startY; cols = reverseColors(); fracs = reverseFractions(); } diff --git a/CodenameOne/src/com/codename1/ui/MenuBar.java b/CodenameOne/src/com/codename1/ui/MenuBar.java index da222b2f69..076fdde6c6 100644 --- a/CodenameOne/src/com/codename1/ui/MenuBar.java +++ b/CodenameOne/src/com/codename1/ui/MenuBar.java @@ -120,12 +120,6 @@ public class MenuBar extends Container implements ActionListener { private boolean hideEmptyCommands; private boolean menuDisplaying; - /** - * Empty Constructor - */ - public MenuBar() { - } - static boolean isLSK(int keyCode) { return keyCode != 0 && keyCode == leftSK; } diff --git a/CodenameOne/src/com/codename1/ui/NavigationCommand.java b/CodenameOne/src/com/codename1/ui/NavigationCommand.java index 4c88093bc0..143cdcb825 100644 --- a/CodenameOne/src/com/codename1/ui/NavigationCommand.java +++ b/CodenameOne/src/com/codename1/ui/NavigationCommand.java @@ -97,28 +97,15 @@ public void setNextForm(Form nextForm) { this.nextForm = nextForm; } - /** - * {@inheritDoc} - */ @Override public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - if (!super.equals(o)) { + if (!(o instanceof NavigationCommand)) { return false; } NavigationCommand that = (NavigationCommand) o; - - if (nextForm != null ? !nextForm.equals(that.nextForm) : that.nextForm != null) { - return false; - } - - return true; + return super.equals(o) && + (nextForm == null ? that.nextForm == null : nextForm.equals(that.nextForm)); } /** diff --git a/CodenameOne/src/com/codename1/ui/PeerComponent.java b/CodenameOne/src/com/codename1/ui/PeerComponent.java index 4cbf53af8b..e217f1eebc 100644 --- a/CodenameOne/src/com/codename1/ui/PeerComponent.java +++ b/CodenameOne/src/com/codename1/ui/PeerComponent.java @@ -23,7 +23,6 @@ */ package com.codename1.ui; -import com.codename1.ui.geom.Dimension; import com.codename1.ui.geom.Rectangle; /** diff --git a/CodenameOne/src/com/codename1/ui/SideMenuBar.java b/CodenameOne/src/com/codename1/ui/SideMenuBar.java index e09508404b..ee1e800d39 100644 --- a/CodenameOne/src/com/codename1/ui/SideMenuBar.java +++ b/CodenameOne/src/com/codename1/ui/SideMenuBar.java @@ -103,12 +103,6 @@ public class SideMenuBar extends MenuBar { private boolean rightSideSwipePotential; private boolean topSwipePotential; - /** - * Empty Constructor - */ - public SideMenuBar() { - } - /** * Returns true if a side menu is currently controlling the screen * @@ -1809,28 +1803,15 @@ public void setMaterialIcon(char materialIcon) { cmd.setMaterialIcon(materialIcon); } - /** - * {@inheritDoc} - */ @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - if (!super.equals(o)) { + public final boolean equals(Object o) { + if (!(o instanceof CommandWrapper)) { return false; } CommandWrapper that = (CommandWrapper) o; - - if (cmd != null ? !cmd.equals(that.cmd) : that.cmd != null) { - return false; - } - - return true; + return super.equals(o) && + (cmd == null ? that.cmd == null : cmd.equals(that.cmd)); } /** diff --git a/CodenameOne/src/com/codename1/ui/animations/BubbleTransition.java b/CodenameOne/src/com/codename1/ui/animations/BubbleTransition.java index 87a08fe76f..19281bf3c8 100644 --- a/CodenameOne/src/com/codename1/ui/animations/BubbleTransition.java +++ b/CodenameOne/src/com/codename1/ui/animations/BubbleTransition.java @@ -142,7 +142,6 @@ public void initTransition() { destBuffer = Image.createImage(Math.min(d.getDisplayWidth(), getDialogParent(dlg).getWidth()), Math.min(d.getDisplayHeight(), dlg.getContentPane().getParent().getHeight() ), 0); - Graphics g = destBuffer.getGraphics(); Style stl = dlg.getDialogComponent().getStyle(); byte bgt = stl.getBgTransparency(); stl.setBgTransparency(0xff); @@ -155,7 +154,6 @@ public void initTransition() { destBuffer = Image.createImage(Math.min(d.getDisplayWidth(), getDialogParent(dlg).getWidth()), Math.min(d.getDisplayHeight(), dlg.getContentPane().getParent().getHeight() ), 0); - Graphics g = destBuffer.getGraphics(); Style stl = dlg.getDialogComponent().getStyle(); byte bgt = stl.getBgTransparency(); stl.setBgTransparency(0xff); diff --git a/CodenameOne/src/com/codename1/ui/html/HTMLForm.java b/CodenameOne/src/com/codename1/ui/html/HTMLForm.java index 4387f5fab0..83172e2ed6 100644 --- a/CodenameOne/src/com/codename1/ui/html/HTMLForm.java +++ b/CodenameOne/src/com/codename1/ui/html/HTMLForm.java @@ -459,37 +459,18 @@ public void setCommandName(String name) { this.value = name; } - /** - * {@inheritDoc} - */ @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - if (!super.equals(o)) { + public final boolean equals(Object o) { + if (!(o instanceof NamedCommand)) { return false; } NamedCommand that = (NamedCommand) o; - - if (isSubmit != that.isSubmit) { - return false; - } - if (htmlForm != null ? !htmlForm.equals(that.htmlForm) : that.htmlForm != null) { - return false; - } - if (key != null ? !key.equals(that.key) : that.key != null) { - return false; - } - if (value != null ? !value.equals(that.value) : that.value != null) { - return false; - } - - return true; + return super.equals(o) && + isSubmit == that.isSubmit && + (htmlForm == null ? that.htmlForm == null : htmlForm.equals(that.htmlForm)) && + (key == null ? that.key == null : key.equals(that.key)) && + (value == null ? that.value == null : value.equals(that.value)); } /** diff --git a/CodenameOne/src/com/codename1/ui/layouts/mig/CC.java b/CodenameOne/src/com/codename1/ui/layouts/mig/CC.java index 880523e403..6fce6da107 100644 --- a/CodenameOne/src/com/codename1/ui/layouts/mig/CC.java +++ b/CodenameOne/src/com/codename1/ui/layouts/mig/CC.java @@ -115,12 +115,6 @@ public void gap(CC parent, String s) { private Float pushY = null; private transient String[] linkTargets = null; - /** - * Empty constructor. - */ - public CC() { - } - String[] getLinkTargets() { if (linkTargets == null) { final ArrayList targets = new ArrayList(2); diff --git a/CodenameOne/src/com/codename1/ui/layouts/mig/DimConstraint.java b/CodenameOne/src/com/codename1/ui/layouts/mig/DimConstraint.java index c3e54f6465..3181890371 100644 --- a/CodenameOne/src/com/codename1/ui/layouts/mig/DimConstraint.java +++ b/CodenameOne/src/com/codename1/ui/layouts/mig/DimConstraint.java @@ -66,12 +66,6 @@ public final class DimConstraint { private boolean noGrid = false; - /** - * Empty constructor. - */ - public DimConstraint() { - } - /** * Returns the grow priority. Relative priority is used for determining which entities gets the extra space first. *

diff --git a/CodenameOne/src/com/codename1/ui/layouts/mig/LC.java b/CodenameOne/src/com/codename1/ui/layouts/mig/LC.java index c2d912d45a..da2e97bec7 100644 --- a/CodenameOne/src/com/codename1/ui/layouts/mig/LC.java +++ b/CodenameOne/src/com/codename1/ui/layouts/mig/LC.java @@ -78,12 +78,6 @@ public final class LC { private boolean visualPadding = true; - /** - * Empty constructor. - */ - public LC() { - } - // ************************************************************************ // * JavaBean get/set methods. // ************************************************************************ diff --git a/CodenameOne/src/com/codename1/ui/spinner/TimeSpinner.java b/CodenameOne/src/com/codename1/ui/spinner/TimeSpinner.java index 36764e7a79..dff3ff8e35 100644 --- a/CodenameOne/src/com/codename1/ui/spinner/TimeSpinner.java +++ b/CodenameOne/src/com/codename1/ui/spinner/TimeSpinner.java @@ -76,15 +76,6 @@ public class TimeSpinner extends BaseSpinner { private int currentMinute = 0; private boolean currentMeridiem; - /** - * Default constructor - */ - public TimeSpinner() { - } - - /** - * Default constructor - */ @Override void initSpinner() { if (hour == null) { diff --git a/CodenameOne/src/com/codename1/util/AsyncResource.java b/CodenameOne/src/com/codename1/util/AsyncResource.java index fad15347e3..f0b8485ab0 100644 --- a/CodenameOne/src/com/codename1/util/AsyncResource.java +++ b/CodenameOne/src/com/codename1/util/AsyncResource.java @@ -58,8 +58,8 @@ public class AsyncResource extends Observable { @Async.Schedule + @SuppressWarnings("PMD.UnnecessaryConstructor") public AsyncResource() { - } /** diff --git a/CodenameOne/src/com/codename1/xml/XMLParser.java b/CodenameOne/src/com/codename1/xml/XMLParser.java index 8249b847a2..e2022530ad 100644 --- a/CodenameOne/src/com/codename1/xml/XMLParser.java +++ b/CodenameOne/src/com/codename1/xml/XMLParser.java @@ -91,12 +91,6 @@ public class XMLParser { */ private Hashtable userDefinedCharEntities; - /** - * Constructs the XMLParser - */ - public XMLParser() { - } - private static int read(Reader is) throws IOException { int c = -1; if (buffSize < 0 || buffOffset >= buffSize) { diff --git a/maven/core-unittests/pmd.xml b/maven/core-unittests/pmd.xml index b3b1efd44f..ee5d750b9a 100644 --- a/maven/core-unittests/pmd.xml +++ b/maven/core-unittests/pmd.xml @@ -27,6 +27,15 @@ + + + + + + + + +