Remove deprecated methods

Author: codeanticode

core/src/processing/core/PApplet.java

@@ -2596,8 +2596,6 @@ public void focusLost() { }
   // getting the time
 
 
-  static protected Time time = new Time();
-
   /**
    * Get the number of milliseconds since the applet started.
    * <P>
@@ -2610,16 +2608,12 @@ public int millis() {
 
   /** Seconds position of the current time. */
   static public int second() {
-    //return Calendar.getInstance().get(Calendar.SECOND);
-    time.setToNow();
-    return time.second;
+    return Calendar.getInstance().get(Calendar.SECOND);
   }
 
   /** Minutes position of the current time. */
   static public int minute() {
-    //return Calendar.getInstance().get(Calendar.MINUTE);
-    time.setToNow();
-    return time.minute;
+    return Calendar.getInstance().get(Calendar.MINUTE);
   }
 
   /**
@@ -2630,9 +2624,7 @@ static public int minute() {
    * if (yankeeHour == 0) yankeeHour = 12;</PRE>
    */
   static public int hour() {
-    //return Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
-    time.setToNow();
-    return time.hour;
+    return Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
   }
 
   /**
@@ -2642,28 +2634,22 @@ static public int hour() {
    * or day of the year (1..365) then use java's Calendar.get()
    */
   static public int day() {
-    //return Calendar.getInstance().get(Calendar.DAY_OF_MONTH);
-    time.setToNow();
-    return time.monthDay;
+    return Calendar.getInstance().get(Calendar.DAY_OF_MONTH);
   }
 
   /**
    * Get the current month in range 1 through 12.
    */
   static public int month() {
     // months are number 0..11 so change to colloquial 1..12
-    //return Calendar.getInstance().get(Calendar.MONTH) + 1;
-    time.setToNow();
-    return time.month + 1;
+    return Calendar.getInstance().get(Calendar.MONTH) + 1;
   }
 
   /**
    * Get the current year.
    */
   static public int year() {
-    //return Calendar.getInstance().get(Calendar.YEAR);
-    time.setToNow();
-    return time.year;
+    return Calendar.getInstance().get(Calendar.YEAR);
   }
 
 

core/src/processing/core/PGraphicsAndroid2D.java

@@ -147,8 +147,6 @@ protected void allocate() {
       bitmap = Bitmap.createBitmap(width, height, Config.ARGB_8888);
       canvas = new Canvas(bitmap);
     }
-//    image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
-//    canvas = (Graphics2D) image.getGraphics();
   }
 
 
@@ -458,7 +456,8 @@ public void breakShape() {
   @Override
   public void endShape(int mode) {
     if (shape == POINTS && stroke && vertexCount > 0) {
-      Matrix m = canvas.getMatrix();
+//      Matrix m = canvas.getMatrix();
+      Matrix m = getMatrixImp();
       if (strokeWeight == 1 && m.isIdentity()) {
         if (screenPoint == null) {
           screenPoint = new float[2];
@@ -1527,8 +1526,9 @@ public PMatrix2D getMatrix(PMatrix2D target) {
       target = new PMatrix2D();
     }
 //    canvas.getTransform().getMatrix(transform);
-    Matrix m = new Matrix();
-    canvas.getMatrix(m);
+//    Matrix m = new Matrix();
+//    canvas.getMatrix(m);
+    Matrix m = getMatrixImp();
     m.getValues(transform);
 //    target.set((float) transform[0], (float) transform[2], (float) transform[4],
 //               (float) transform[1], (float) transform[3], (float) transform[5]);
@@ -1575,6 +1575,12 @@ public void printMatrix() {
   }
 
 
+  protected Matrix getMatrixImp() {
+    return parent.getSurfaceView().getMatrix();
+//    return canvas.getMatrix();
+  }
+
+
 
   //////////////////////////////////////////////////////////////
 
@@ -1619,7 +1625,8 @@ public float screenX(float x, float y) {
     }
     screenPoint[0] = x;
     screenPoint[1] = y;
-    canvas.getMatrix().mapPoints(screenPoint);
+//    canvas.getMatrix().mapPoints(screenPoint);
+    getMatrixImp().mapPoints(screenPoint);
     return screenPoint[0];
   }
 
@@ -1633,7 +1640,8 @@ public float screenY(float x, float y) {
     }
     screenPoint[0] = x;
     screenPoint[1] = y;
-    canvas.getMatrix().mapPoints(screenPoint);
+//    canvas.getMatrix().mapPoints(screenPoint);
+    getMatrixImp().mapPoints(screenPoint);
     return screenPoint[1];
   }
 
@@ -2060,35 +2068,28 @@ public void set(int x, int y, PImage src) {
     }
 
     if (src.bitmap == null) {
-      // hopefully this will do the work to figure out what's on/offscreen
-      // in spite of the offset and stride that's been provided
-      canvas.drawBitmap(src.pixels, 0, src.width,
-                        x, y, src.width, src.height, false, null);
-      // hasAlpha is set to false since we don't want blending.
-      // however that may be incorrect if it winds up copying only the RGB
-      // (without the A) portion of the pixels.
-
-    } else {  // src.bitmap != null
-      if (src.width != src.bitmap.getWidth() ||
-          src.height != src.bitmap.getHeight()) {
+      src.bitmap = Bitmap.createBitmap(src.width, src.height, Config.ARGB_8888);
+      src.modified = true;
+    }
+    if (src.width != src.bitmap.getWidth() ||
+      src.height != src.bitmap.getHeight()) {
+      src.bitmap.recycle();
+      src.bitmap = Bitmap.createBitmap(src.width, src.height, Config.ARGB_8888);
+      src.modified = true;
+    }
+    if (src.modified) {
+      if (!src.bitmap.isMutable()) {
         src.bitmap.recycle();
         src.bitmap = Bitmap.createBitmap(src.width, src.height, Config.ARGB_8888);
-        src.modified = true;
       }
-      if (src.modified) {
-        if (!src.bitmap.isMutable()) {
-          src.bitmap.recycle();
-          src.bitmap = Bitmap.createBitmap(src.width, src.height, Config.ARGB_8888);
-        }
-        src.bitmap.setPixels(src.pixels, 0, src.width, 0, 0, src.width, src.height);
-        src.modified = false;
-      }
-      // set() happens in screen coordinates, so need to clear the ctm
-      canvas.save(Canvas.MATRIX_SAVE_FLAG);
-      canvas.setMatrix(null);  // set to identity
-      canvas.drawBitmap(src.bitmap, x, y, null);
-      canvas.restore();
+      src.bitmap.setPixels(src.pixels, 0, src.width, 0, 0, src.width, src.height);
+      src.modified = false;
     }
+    // set() happens in screen coordinates, so need to clear the ctm
+    canvas.save(Canvas.MATRIX_SAVE_FLAG);
+    canvas.setMatrix(null);  // set to identity
+    canvas.drawBitmap(src.bitmap, x, y, null);
+    canvas.restore();
   }