From 72dc17da83676f882530cb6969a88cd99de1ec99 Mon Sep 17 00:00:00 2001
From: francisli <mail@francisli.com>
Date: Fri, 11 Feb 2005 08:02:52 +0000
Subject: [PATCH] Fixed rect/ellipseMode, random

---
 mobile/core/processing/core/PCanvas.java | 6 +++---
 mobile/core/processing/core/PMIDlet.java | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mobile/core/processing/core/PCanvas.java b/mobile/core/processing/core/PCanvas.java
index 1b33e6b50..a243151f7 100755
--- a/mobile/core/processing/core/PCanvas.java
+++ b/mobile/core/processing/core/PCanvas.java
@@ -169,7 +169,7 @@ public class PCanvas extends Canvas {
                 y = Math.min(y, height);
                 height = Math.abs(y - temp);
                 break;
-            case PMIDlet.CENTER_DIAMETER:
+            case PMIDlet.CENTER:
                 x -= width / 2;
                 y -= height / 2;
                 break;
@@ -185,7 +185,7 @@ public class PCanvas extends Canvas {
     }
     
     public void rectMode(int MODE) {
-        if ((MODE >= PMIDlet.CORNER) && (MODE <= PMIDlet.CENTER_DIAMETER)) {
+        if ((MODE >= PMIDlet.CORNER) && (MODE <= PMIDlet.CENTER)) {
             rectMode = MODE;
         }
     }
@@ -201,7 +201,7 @@ public class PCanvas extends Canvas {
                 y = Math.min(y, height);
                 height = Math.abs(y - temp);
                 break;
-            case PMIDlet.CENTER_DIAMETER:
+            case PMIDlet.CENTER:
                 x -= width / 2;
                 y -= height / 2;
                 break;
diff --git a/mobile/core/processing/core/PMIDlet.java b/mobile/core/processing/core/PMIDlet.java
index 67687528a..20ac661f8 100755
--- a/mobile/core/processing/core/PMIDlet.java
+++ b/mobile/core/processing/core/PMIDlet.java
@@ -58,7 +58,7 @@ public abstract class PMIDlet extends MIDlet implements Runnable {
     
     public static final int CORNER          = 0;
     public static final int CORNERS         = 1;
-    public static final int CENTER_DIAMETER = 2;
+    public static final int CENTER          = 2;
     public static final int CENTER_RADIUS   = 3;
     
     public static final int POINTS          = 0;
@@ -308,7 +308,7 @@ public abstract class PMIDlet extends MIDlet implements Runnable {
             random = new Random();
         }
         int min = Math.min(value1, value2);
-        int range = Math.abs(value2 - value1);
+        int range = Math.abs(value2 - value1) + 1;
         
         return min + Math.abs((random.nextInt() % range));
     }