一部のワーニングを修正。

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/drawers/ICanvasDrawer.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/drawers/ICanvasDrawer.java
index 7b9737a..17a4e2c 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/drawers/ICanvasDrawer.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/drawers/ICanvasDrawer.java
@@ -5,11 +5,8 @@ import android.view.MotionEvent;
 
 public interface ICanvasDrawer
 {      
-    public abstract void prepareToStart(int width, int height);
-    public abstract void changedScreenProperty(int format, int width, int height);
-
-    public abstract void drawOnCanvas(Canvas canvas);
-    
-    public abstract boolean onTouchEvent(MotionEvent event);
-
+    void prepareToStart(int width, int height);
+    void changedScreenProperty(int format, int width, int height);
+    void drawOnCanvas(Canvas canvas);
+    boolean onTouchEvent(MotionEvent event);
 }

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/drawers/ObjectShapeDrawer.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/drawers/ObjectShapeDrawer.java
index d0a289b..a0dbaac 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/drawers/ObjectShapeDrawer.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/drawers/ObjectShapeDrawer.java
@@ -6,8 +6,6 @@ import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.RectF;
-
-import jp.sourceforge.gokigen.memoma.drawers.MeMoMaCanvasDrawer;
 import jp.sourceforge.gokigen.memoma.holders.MeMoMaObjectHolder;
 
 /**
@@ -248,19 +246,13 @@ public class ObjectShapeDrawer
     }
          /**
           *    矢印を描画する処理 (ツリー表示時)
-          * 
-          * @param canvas
-          * @param paint
-          * @param x1
-          * @param y1
-          * @param checkValue
-          * @param isXaxis
+          *
           */
        static public void drawArrowTree(Canvas canvas, Paint paint, float x1, float y1, float checkValue, boolean isXaxis)
     {
                float margin = 8.0f;
-               float direction = 1.0f;
-               if (isXaxis == true)
+               float direction;
+               if (isXaxis)
         {
                    direction = (checkValue < x1) ? -1.0f : 1.0f;
             canvas.drawLine(x1, y1, (x1 + direction * margin), (y1 - margin), paint);
@@ -275,13 +267,7 @@ public class ObjectShapeDrawer
     }
          /**
           *    矢印を描画する処理
-          * 
-          * @param canvas
-          * @param paint
-          * @param x1
-          * @param y1
-          * @param x2
-          * @param y2
+          *
           */
          static public void drawArrow(Canvas canvas, Paint paint, float x1, float y1, float x2, float y2)
          {
@@ -316,10 +302,7 @@ public class ObjectShapeDrawer
 
          /**
             *    オブジェクトのラベルを表示する
-            * 
-            * @param canvas
-            * @param paint
-            * @param pos
+            *
             */
            public static void drawTextLabel(Canvas canvas, Paint paint, MeMoMaObjectHolder.PositionObject pos, RectF region, int displayObjectInformation, float offsetX, float offsetY)
            {
@@ -330,7 +313,7 @@ public class ObjectShapeDrawer
                float width = region.width() - MeMoMaCanvasDrawer.OBJECTLABEL_MARGIN_WIDTH;
                 int textLen = paint.breakText(pos.label, true, width, null);  // 省略文字を追加するから、そのぶん減らす
                labelToShow = labelToShow.substring(0, textLen);
-               if (labelToShow != pos.label)
+               if (!labelToShow.equals(pos.label))
                {
                        // truncate した場合には、省略文字を出す。
                        labelToShow = labelToShow + "...";
@@ -345,10 +328,10 @@ public class ObjectShapeDrawer
                
                // 文字をちょっと影付きにする
             paint.setStyle(Paint.Style.FILL_AND_STROKE);
-               paint.setShadowLayer(0.5f, 0.5f, 0.5f, Color.DKGRAY);
+               paint.setShadowLayer(0.7f, 0.7f, 0.7f, Color.DKGRAY);
                
                // ユーザチェックの描画
-               if (pos.userChecked == true)
+               if (pos.userChecked)
                {
                        canvas.drawText("*", region.centerX(), region.top + (MeMoMaCanvasDrawer.OBJECTLABEL_MARGIN * 2.0f), paint);
               }

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionActivity.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionActivity.java
index dc29ab5..01704a6 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionActivity.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionActivity.java
@@ -1,6 +1,5 @@
 package jp.sourceforge.gokigen.memoma.extension;
 
-import android.app.ActionBar;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Intent;

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/listitem/SymbolListArrayItem.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/listitem/SymbolListArrayItem.java
index 8849a26..50d9e69 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/listitem/SymbolListArrayItem.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/listitem/SymbolListArrayItem.java
@@ -2,11 +2,11 @@ package jp.sourceforge.gokigen.memoma.listitem;
 
 public class SymbolListArrayItem
 {
-    private int iconResource = 0;
-    private int subIconResource = 0;
-    private String textResource1st = "";
-    private String textResource2nd = "";
-    private String textResource3rd = "";
+    private int iconResource;
+    private int subIconResource;
+    private String textResource1st;
+    private String textResource2nd;
+    private String textResource3rd;
 
     /**
      *  コンストラクタ