Changeset 1143 for trunk/src/org/expeditee/items/widgets

Timestamp:

09/18/18 12:00:17 (6 years ago)

Author:

bln4

Message:

Used Eclipse refactoring to encapsulate Point.X and Point.Y

Location:

trunk/src/org/expeditee/items/widgets

Files:

• HeavyDutyInteractiveWidget.java (modified) (1 diff)
• SwingWidget.java (modified) (2 diffs)
• Widget.java (modified) (1 diff)
• charts/AbstractChart.java (modified) (1 diff)

trunk/src/org/expeditee/items/widgets/HeavyDutyInteractiveWidget.java

@@ -273 +273 @@
                 // Render shaded window over widget
                 g.setColor(SwingConversions.toSwingColor(backgroundColor));
-                g.fillRect(getX(), getY(), getWidth(), getHeight());
-                
+                final int x = getX();
+                final int y = getY();
+                final int width = getWidth();
+                final int height = getHeight();
+                g.fillRect(x, y, width, height);
+                                
                 // Center the bar
-                int barX = getX() + BAR_HOROZONTIAL_MARGIN;
-                int barY = getY() + (getHeight() >> 1) - (BAR_HEIGHT >> 1);
-                
-                int barWidth = getWidth() - (BAR_HOROZONTIAL_MARGIN * 2);
+                int barX = x + BAR_HOROZONTIAL_MARGIN;
+                int barY = y + (height >> 1) - (BAR_HEIGHT >> 1);
+                
+                int barWidth = width - (BAR_HOROZONTIAL_MARGIN * 2);
                 if (barWidth <= 0) barWidth = 10;
                 

trunk/src/org/expeditee/items/widgets/SwingWidget.java

@@ -4 +4 @@
 import java.awt.Container;
 import java.awt.Graphics2D;
+import java.awt.Point;
 
 import javax.swing.JComponent;
@@ -109 +110 @@
                 Graphics2D g = SwingMiscManager.getIfUsingSwingGraphicsManager().getCurrentSurface();
 
-                int x = getX();
-                int y = getY();
+                final Point location = _swingComponent.getLocation();
+                int x = location.x;
+                int y = location.y;
                 
                 g.translate(x, y);

trunk/src/org/expeditee/items/widgets/Widget.java

@@ -900 +900 @@
                 
                 _settingPositionFlag = true;
-
+                
                 invalidateLink();
 

trunk/src/org/expeditee/items/widgets/charts/AbstractChart.java

@@ -175 +175 @@
                                 Point origin = getOrigin();
                                 return new MouseEvent((Component) e.getSource(), e.getID(), e
-                                                .getWhen(), e.getModifiers(), origin.x + e.getX(),
-                                                origin.y + e.getY(), e.getXOnScreen(),
+                                                .getWhen(), e.getModifiers(), origin.getX() + e.getX(),
+                                                origin.getY() + e.getY(), e.getXOnScreen(),
                                                 e.getYOnScreen(), e.getClickCount(), false, e
                                                                 .getButton());