Skip to content

Commit f37a574

Browse files
codeanticodecodeanticode
committed
update deps & headers
1 parent 9c23f46 commit f37a574

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+192
-114
lines changed

‎core/src/processing/a2d/PGraphicsAndroid2D.java

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Part of the Processing project - http://processing.org
55
6-
Copyright (c) 2012-16 The Processing Foundation
6+
Copyright (c) 2012-21 The Processing Foundation
77
Copyright (c) 2005-12 Ben Fry and Casey Reas
88
99
This library is free software; you can redistribute it and/or
@@ -23,6 +23,19 @@
2323

2424
package processing.a2d;
2525

26+
import android.annotation.SuppressLint;
27+
import android.app.Activity;
28+
import android.app.ActivityManager;
29+
import android.app.ActivityManager.MemoryInfo;
30+
import android.content.Context;
31+
import android.graphics.*;
32+
import android.graphics.Bitmap.Config;
33+
import android.graphics.Paint.Style;
34+
import android.os.Build;
35+
import android.os.Environment;
36+
import android.view.SurfaceHolder;
37+
import static android.os.Environment.isExternalStorageRemovable;
38+
2639
import java.io.File;
2740
import java.io.FileInputStream;
2841
import java.io.FileOutputStream;
@@ -45,21 +58,6 @@
4558
import processing.core.PSurface;
4659
import processing.data.XML;
4760

48-
import android.annotation.SuppressLint;
49-
import android.app.Activity;
50-
import android.app.ActivityManager;
51-
import android.app.ActivityManager.MemoryInfo;
52-
import android.content.Context;
53-
import android.graphics.*;
54-
import android.graphics.Bitmap.Config;
55-
import android.graphics.Paint.Style;
56-
import android.os.Build;
57-
import android.os.Environment;
58-
import android.view.SurfaceHolder;
59-
60-
import static android.os.Environment.isExternalStorageRemovable;
61-
62-
6361
/**
6462
* Subclass for PGraphics that implements the graphics API using
6563
* the Android 2D graphics model. Similar tradeoffs to JAVA2D mode

‎core/src/processing/a2d/PShapeAndroid2D.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,29 @@
1+
/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
2+
3+
/*
4+
Part of the Processing project - http://processing.org
5+
6+
Copyright (c) 2016-21 The Processing Foundation
7+
8+
This library is free software; you can redistribute it and/or
9+
modify it under the terms of the GNU Lesser General Public
10+
License version 2.1 as published by the Free Software Foundation.
11+
12+
This library is distributed in the hope that it will be useful,
13+
but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
Lesser General Public License for more details.
16+
17+
You should have received a copy of the GNU Lesser General
18+
Public License along with this library; if not, write to the
19+
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
20+
Boston, MA 02111-1307 USA
21+
*/
22+
123
package processing.a2d;
224

325
import android.graphics.Shader;
26+
427
import processing.core.PGraphics;
528
import processing.core.PShapeSVG;
629
import processing.data.XML;

‎core/src/processing/a2d/PSurfaceAndroid2D.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Part of the Processing project - http://processing.org
55
6-
Copyright (c) 2016 The Processing Foundation
6+
Copyright (c) 2016-21 The Processing Foundation
77
88
This library is free software; you can redistribute it and/or
99
modify it under the terms of the GNU Lesser General Public
@@ -23,14 +23,14 @@
2323
package processing.a2d;
2424

2525
import android.content.Context;
26-
2726
import android.graphics.Color;
2827
import android.graphics.PixelFormat;
2928
import android.service.wallpaper.WallpaperService;
3029
import android.support.wearable.watchface.CanvasWatchFaceService;
3130
import android.view.MotionEvent;
3231
import android.view.SurfaceHolder;
3332
import android.view.SurfaceView;
33+
3434
import processing.android.AppComponent;
3535
import processing.android.PFragment;
3636
import processing.core.PApplet;

‎core/src/processing/android/ActivityAPI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Part of the Processing project - http://processing.org
55
6-
Copyright (c) 2016-17 The Processing Foundation
6+
Copyright (c) 2016-21 The Processing Foundation
77
88
This library is free software; you can redistribute it and/or
99
modify it under the terms of the GNU Lesser General Public

‎core/src/processing/android/AppComponent.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Part of the Processing project - http://processing.org
55
6-
Copyright (c) 2016-17 The Processing Foundation
6+
Copyright (c) 2016-21 The Processing Foundation
77
88
This library is free software; you can redistribute it and/or
99
modify it under the terms of the GNU Lesser General Public
@@ -23,6 +23,7 @@
2323
package processing.android;
2424

2525
import android.content.Intent;
26+
2627
import processing.core.PApplet;
2728
import processing.core.PConstants;
2829

‎core/src/processing/android/CompatUtils.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Part of the Processing project - http://processing.org
55
6-
Copyright (c) 2017 The Processing Foundation
6+
Copyright (c) 2017-21 The Processing Foundation
77
88
This library is free software; you can redistribute it and/or
99
modify it under the terms of the GNU Lesser General Public
@@ -22,16 +22,17 @@
2222

2323
package processing.android;
2424

25-
import java.nio.charset.Charset;
26-
import java.nio.charset.StandardCharsets;
27-
import java.util.concurrent.atomic.AtomicInteger;
2825
import android.annotation.SuppressLint;
2926
import android.os.Build;
3027
import android.util.DisplayMetrics;
3128
import android.view.Display;
3229
import android.view.View;
3330
import android.graphics.Point;
3431

32+
import java.nio.charset.Charset;
33+
import java.nio.charset.StandardCharsets;
34+
import java.util.concurrent.atomic.AtomicInteger;
35+
3536
/**
3637
* Compatibility utilities that work across versions of Android. Even though
3738
* the mode sets API level 17 (Android 4.2) as the minimum target, because the

‎core/src/processing/android/PFragment.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Part of the Processing project - http://processing.org
55
6-
Copyright (c) 2016-17 The Processing Foundation
6+
Copyright (c) 2016-21 The Processing Foundation
77
88
This library is free software; you can redistribute it and/or
99
modify it under the terms of the GNU Lesser General Public
@@ -22,14 +22,6 @@
2222

2323
package processing.android;
2424

25-
26-
import androidx.annotation.IdRes;
27-
import androidx.annotation.LayoutRes;
28-
import androidx.fragment.app.Fragment;
29-
import androidx.fragment.app.FragmentActivity;
30-
import androidx.fragment.app.FragmentManager;
31-
import androidx.fragment.app.FragmentTransaction;
32-
3325
import android.util.DisplayMetrics;
3426
import android.content.Intent;
3527
import android.content.pm.ActivityInfo;
@@ -46,6 +38,14 @@
4638
import android.view.ViewGroup;
4739
import android.view.WindowManager;
4840
import android.view.ContextMenu.ContextMenuInfo;
41+
42+
import androidx.annotation.IdRes;
43+
import androidx.annotation.LayoutRes;
44+
import androidx.fragment.app.Fragment;
45+
import androidx.fragment.app.FragmentActivity;
46+
import androidx.fragment.app.FragmentManager;
47+
import androidx.fragment.app.FragmentTransaction;
48+
4949
import processing.core.PApplet;
5050

5151
public class PFragment extends Fragment implements AppComponent {

‎core/src/processing/android/PWallpaper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Part of the Processing project - http://processing.org
55
6-
Copyright (c) 2016-17 The Processing Foundation
6+
Copyright (c) 2016-21 The Processing Foundation
77
88
This library is free software; you can redistribute it and/or
99
modify it under the terms of the GNU Lesser General Public
@@ -26,12 +26,12 @@
2626
import android.view.MotionEvent;
2727
import android.view.SurfaceHolder;
2828
import android.view.WindowManager;
29-
import processing.core.PApplet;
3029
import android.util.DisplayMetrics;
3130
import android.view.Display;
3231
import android.graphics.Point;
3332
import android.graphics.Rect;
3433

34+
import processing.core.PApplet;
3535

3636
public class PWallpaper extends WallpaperService implements AppComponent {
3737
private Point size;

‎core/src/processing/android/PWatchFaceCanvas.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Part of the Processing project - http://processing.org
55
6-
Copyright (c) 2016-17 The Processing Foundation
6+
Copyright (c) 2016-21 The Processing Foundation
77
88
This library is free software; you can redistribute it and/or
99
modify it under the terms of the GNU Lesser General Public
@@ -38,6 +38,7 @@
3838
import android.view.SurfaceHolder;
3939
import android.view.WindowInsets;
4040
import android.view.WindowManager;
41+
4142
import processing.a2d.PGraphicsAndroid2D;
4243
import processing.core.PApplet;
4344

‎core/src/processing/android/PWatchFaceGLES.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Part of the Processing project - http://processing.org
55
6-
Copyright (c) 2016-17 The Processing Foundation
6+
Copyright (c) 2016-21 The Processing Foundation
77
88
This library is free software; you can redistribute it and/or
99
modify it under the terms of the GNU Lesser General Public
@@ -37,10 +37,11 @@
3737
import android.view.MotionEvent;
3838
import android.view.SurfaceHolder;
3939
import android.view.WindowManager;
40-
import processing.core.PApplet;
40+
import android.graphics.Rect;
41+
4142
import java.lang.reflect.Method;
4243

43-
import android.graphics.Rect;
44+
import processing.core.PApplet;
4445

4546
@TargetApi(21)
4647
public class PWatchFaceGLES extends Gles2WatchFaceService implements AppComponent {

0 commit comments

Comments
 (0)