1: 2: package draw2; 3: 4: import java.awt.*; 5: import draw1.*; 6: 7: public class FilledRectangleShape extends RectangleShape { 8: 9: public void draw(Graphics g) { 10: int x = Math.min(x1, x2); 11: int y = Math.min(y1, y2); 12: int w = Math.abs(x1 - x2) + 1; 13: int h = Math.abs(y1 - y2) + 1; 14: if (color != null) { 15: g.setColor(color); 16: } 17: g.fillRect(x, y, w, h); 18: } 19: 20: }