From 225613ec2877ed86653038f2d69c485e27902a42 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Tue, 10 Jun 2014 19:44:42 +0200
Subject: [PATCH] cleanup: canvas Paint
---
.../oscim/android/canvas/AndroidPaint.java | 41 ------------------
.../oscim/android/canvas/AndroidPaint.java | 43 -------------------
vtm-desktop/src/org/oscim/awt/AwtPaint.java | 21 ---------
.../src/org/oscim/ios/backend/IosPaint.java | 19 --------
.../src/org/oscim/gdx/client/GwtPaint.java | 19 --------
vtm/src/org/oscim/backend/canvas/Paint.java | 8 ----
6 files changed, 151 deletions(-)
diff --git a/vtm-android-gdx/src/org/oscim/android/canvas/AndroidPaint.java b/vtm-android-gdx/src/org/oscim/android/canvas/AndroidPaint.java
index ad331be3..8f90a761 100644
--- a/vtm-android-gdx/src/org/oscim/android/canvas/AndroidPaint.java
+++ b/vtm-android-gdx/src/org/oscim/android/canvas/AndroidPaint.java
@@ -19,14 +19,7 @@ package org.oscim.android.canvas;
import org.oscim.backend.canvas.Paint;
-import android.graphics.Bitmap.Config;
-import android.graphics.BitmapShader;
-import android.graphics.DashPathEffect;
import android.graphics.Paint.FontMetrics;
-import android.graphics.PathEffect;
-import android.graphics.Rect;
-import android.graphics.Shader;
-import android.graphics.Shader.TileMode;
import android.graphics.Typeface;
class AndroidPaint implements Paint {
@@ -73,45 +66,11 @@ class AndroidPaint implements Paint {
return mPaint.getColor();
}
- @Override
- public int getTextHeight(String text) {
- Rect rect = new Rect();
- mPaint.getTextBounds(text, 0, text.length(), rect);
- return rect.height();
- }
-
- @Override
- public int getTextWidth(String text) {
- Rect rect = new Rect();
- mPaint.getTextBounds(text, 0, text.length(), rect);
- return rect.width();
- }
-
- @Override
- public void setBitmapShader(org.oscim.backend.canvas.Bitmap bitmap) {
- if (bitmap == null) {
- return;
- }
-
- android.graphics.Bitmap androidBitmap = android.graphics.Bitmap
- .createBitmap(bitmap.getPixels(), bitmap.getWidth(),
- bitmap.getHeight(), Config.ARGB_8888);
- Shader shader = new BitmapShader(androidBitmap, TileMode.REPEAT,
- TileMode.REPEAT);
- mPaint.setShader(shader);
- }
-
@Override
public void setColor(int color) {
mPaint.setColor(color);
}
- @Override
- public void setDashPathEffect(float[] strokeDasharray) {
- PathEffect pathEffect = new DashPathEffect(strokeDasharray, 0);
- mPaint.setPathEffect(pathEffect);
- }
-
@Override
public void setStrokeCap(Cap cap) {
android.graphics.Paint.Cap androidCap = android.graphics.Paint.Cap
diff --git a/vtm-android/src/org/oscim/android/canvas/AndroidPaint.java b/vtm-android/src/org/oscim/android/canvas/AndroidPaint.java
index ea0eda9c..e63e9aeb 100644
--- a/vtm-android/src/org/oscim/android/canvas/AndroidPaint.java
+++ b/vtm-android/src/org/oscim/android/canvas/AndroidPaint.java
@@ -18,14 +18,7 @@ package org.oscim.android.canvas;
import org.oscim.backend.canvas.Paint;
-import android.graphics.Bitmap.Config;
-import android.graphics.BitmapShader;
-import android.graphics.DashPathEffect;
import android.graphics.Paint.FontMetrics;
-import android.graphics.PathEffect;
-import android.graphics.Rect;
-import android.graphics.Shader;
-import android.graphics.Shader.TileMode;
import android.graphics.Typeface;
class AndroidPaint implements Paint {
@@ -73,47 +66,11 @@ class AndroidPaint implements Paint {
return mPaint.getColor();
}
- @Override
- public int getTextHeight(String text) {
- Rect rect = new Rect();
- mPaint.getTextBounds(text, 0, text.length(), rect);
- return rect.height();
- }
-
- @Override
- public int getTextWidth(String text) {
- Rect rect = new Rect();
- mPaint.getTextBounds(text, 0, text.length(), rect);
- return rect.width();
- }
-
- @Override
- public void setBitmapShader(org.oscim.backend.canvas.Bitmap bitmap) {
- if (bitmap == null) {
- return;
- }
-
- android.graphics.Bitmap androidBitmap = android.graphics.Bitmap
- .createBitmap(bitmap.getPixels(),
- bitmap.getWidth(),
- bitmap.getHeight(),
- Config.ARGB_8888);
- Shader shader = new BitmapShader(androidBitmap, TileMode.REPEAT,
- TileMode.REPEAT);
- mPaint.setShader(shader);
- }
-
@Override
public void setColor(int color) {
mPaint.setColor(color);
}
- @Override
- public void setDashPathEffect(float[] strokeDasharray) {
- PathEffect pathEffect = new DashPathEffect(strokeDasharray, 0);
- mPaint.setPathEffect(pathEffect);
- }
-
@Override
public void setStrokeCap(Cap cap) {
android.graphics.Paint.Cap androidCap = android.graphics.Paint.Cap
diff --git a/vtm-desktop/src/org/oscim/awt/AwtPaint.java b/vtm-desktop/src/org/oscim/awt/AwtPaint.java
index 3573663f..0fd2f429 100644
--- a/vtm-desktop/src/org/oscim/awt/AwtPaint.java
+++ b/vtm-desktop/src/org/oscim/awt/AwtPaint.java
@@ -27,7 +27,6 @@ import java.text.AttributedCharacterIterator.Attribute;
import java.util.HashMap;
import java.util.Map;
-import org.oscim.backend.canvas.Bitmap;
import org.oscim.backend.canvas.Paint;
public class AwtPaint implements Paint {
@@ -70,20 +69,6 @@ public class AwtPaint implements Paint {
return 0;
}
- @Override
- public int getTextHeight(String text) {
- return 0;
- }
-
- @Override
- public int getTextWidth(String text) {
- return 0;
- }
-
- @Override
- public void setBitmapShader(Bitmap bitmap) {
- }
-
@Override
public void setColor(int c) {
color = new Color(((c >> 16) & 0xff) / 255f,
@@ -92,12 +77,6 @@ public class AwtPaint implements Paint {
((c >> 24) & 0xff) / 255f);
}
- @Override
- public void setDashPathEffect(float[] strokeDasharray) {
- // TODO Auto-generated method stub
-
- }
-
@Override
public void setStrokeCap(Cap cap) {
this.cap = getCap(cap);
diff --git a/vtm-ios/src/org/oscim/ios/backend/IosPaint.java b/vtm-ios/src/org/oscim/ios/backend/IosPaint.java
index af7f7674..53f7e701 100644
--- a/vtm-ios/src/org/oscim/ios/backend/IosPaint.java
+++ b/vtm-ios/src/org/oscim/ios/backend/IosPaint.java
@@ -1,6 +1,5 @@
package org.oscim.ios.backend;
-import org.oscim.backend.canvas.Bitmap;
import org.oscim.backend.canvas.Paint;
public class IosPaint implements Paint {
@@ -10,28 +9,10 @@ public class IosPaint implements Paint {
return 0;
}
- @Override
- public int getTextHeight(String text) {
- return 0;
- }
-
- @Override
- public int getTextWidth(String text) {
- return 0;
- }
-
- @Override
- public void setBitmapShader(Bitmap bitmap) {
- }
-
@Override
public void setColor(int color) {
}
- @Override
- public void setDashPathEffect(float[] strokeDasharray) {
- }
-
@Override
public void setStrokeCap(Cap cap) {
}
diff --git a/vtm-web/src/org/oscim/gdx/client/GwtPaint.java b/vtm-web/src/org/oscim/gdx/client/GwtPaint.java
index 20bf2d6c..60f8f775 100644
--- a/vtm-web/src/org/oscim/gdx/client/GwtPaint.java
+++ b/vtm-web/src/org/oscim/gdx/client/GwtPaint.java
@@ -16,7 +16,6 @@
*/
package org.oscim.gdx.client;
-import org.oscim.backend.canvas.Bitmap;
import org.oscim.backend.canvas.Paint;
import com.badlogic.gdx.graphics.Pixmap;
@@ -44,20 +43,6 @@ public class GwtPaint implements Paint {
return 0;
}
- @Override
- public int getTextHeight(String text) {
- return 0;
- }
-
- @Override
- public int getTextWidth(String text) {
- return 0;
- }
-
- @Override
- public void setBitmapShader(Bitmap bitmap) {
- }
-
@Override
public void setColor(int color) {
float a = ((color >>> 24) & 0xff) / 255f;
@@ -68,10 +53,6 @@ public class GwtPaint implements Paint {
this.color = Pixmap.make(r, g, b, a);
}
- @Override
- public void setDashPathEffect(float[] strokeDasharray) {
- }
-
@Override
public void setStrokeCap(Cap cap) {
stroke = true;
diff --git a/vtm/src/org/oscim/backend/canvas/Paint.java b/vtm/src/org/oscim/backend/canvas/Paint.java
index 0b99943f..ba1872e2 100644
--- a/vtm/src/org/oscim/backend/canvas/Paint.java
+++ b/vtm/src/org/oscim/backend/canvas/Paint.java
@@ -44,16 +44,8 @@ public interface Paint {
int getColor();
- int getTextHeight(String text);
-
- int getTextWidth(String text);
-
- void setBitmapShader(Bitmap bitmap);
-
void setColor(int color);
- void setDashPathEffect(float[] strokeDasharray);
-
void setStrokeCap(Cap cap);
void setStrokeWidth(float width);