Merge pull request #91 from waooog/master

fix bug: 使用 “==” 比较两个相同的表达式 (EqualToSameExpression) #90
alibaba · Nov 8, 2017 · 8621180 · 8621180
2 parents 3acf33c + 3bd2ea6
commit 8621180
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/trunk/adhoc-internal/src/main/java/org/jfree/ui/SerialDateChooserPanel.java b/trunk/adhoc-internal/src/main/java/org/jfree/ui/SerialDateChooserPanel.java
@@ -268,7 +268,7 @@ private JPanel getCalendarPanel() {
      */
     protected Color getButtonColor(final SerialDate targetDate) {
 
-        if (this.date.equals(this.date)) {
+        if (targetDate.equals(this.date)) {
             return this.dateButtonColor;
         }
         else if (targetDate.getMonth() == this.date.getMonth()) {

diff --git a/trunk/adhoc-internal/src/main/java/org/jfree/util/PaintUtilities.java b/trunk/adhoc-internal/src/main/java/org/jfree/util/PaintUtilities.java
@@ -93,7 +93,7 @@ public static boolean equal(final Paint p1, final Paint p2) {
                 && gp1.getPoint1().equals(gp2.getPoint1())    
                 && gp1.getPoint2().equals(gp2.getPoint2())
                 && gp1.isCyclic() == gp2.isCyclic()
-                && gp1.getTransparency() == gp1.getTransparency(); 
+                && gp1.getTransparency() == gp2.getTransparency(); 
         }
         else {
             result = p1.equals(p2);