パッケージの整理を開始。文字フォントを塗りつぶすように変更すうｒ。

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5ac969d..d712df3 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
         </activity>
         <activity android:name=".Preference" android:label="@string/preference_name">
         </activity>
-        <activity android:name=".ExtensionActivity"
+        <activity android:name=".extension.ExtensionActivity"
             android:label="@string/extent_name"
             android:screenOrientation="landscape">
             <intent-filter>

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/GokigenSurfaceView.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/GokigenSurfaceView.java
index c765eed..8dd8f06 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/GokigenSurfaceView.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/GokigenSurfaceView.java
@@ -8,6 +8,8 @@ import android.view.MotionEvent;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
+import jp.sourceforge.gokigen.memoma.drawers.ICanvasDrawer;
+
 /**
  *  描画するくらす
  * 

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/IObjectSelectionReceiver.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/IObjectSelectionReceiver.java
index 9ab1994..956536b 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/IObjectSelectionReceiver.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/IObjectSelectionReceiver.java
@@ -9,10 +9,9 @@ package jp.sourceforge.gokigen.memoma;
  */
 public interface IObjectSelectionReceiver
 {
-       public abstract int touchedVacantArea();
-       public abstract int touchUppedVacantArea();
-       public abstract void objectCreated();
-    public abstract boolean objectSelected(Integer key);
-    public abstract void objectSelectedContext(Integer key);
-       
+       int touchedVacantArea();
+       int touchUppedVacantArea();
+       void objectCreated();
+    boolean objectSelected(Integer key);
+    void objectSelectedContext(Integer key);
 }

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/ItemSelectionDialog.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/ItemSelectionDialog.java
index a6e1d1b..d2db952 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/ItemSelectionDialog.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/ItemSelectionDialog.java
@@ -26,8 +26,7 @@ public class ItemSelectionDialog
 
        /**
         *  クラスの準備
-        * @param receiver
-        * @param initialMessage
+     *
         */
        public void prepare(ISelectionItemReceiver receiver, ISelectionItemHolder holder,  String titleMessage)
        {

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/Main.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/Main.java
index 6ff63ab..47c5b3b 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/Main.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/Main.java
@@ -12,6 +12,8 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.Window;
 
+import jp.sourceforge.gokigen.memoma.fileio.MeMoMaDataInOutManager;
+
 /**
  *   メイン画面の処理
  * 

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaListener.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaListener.java
index 907db79..4626c8d 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaListener.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaListener.java
@@ -25,6 +25,17 @@ import android.view.View.OnTouchListener;
 import android.widget.ImageButton;
 import android.widget.SeekBar;
 
+import jp.sourceforge.gokigen.memoma.dialogs.ConfirmationDialog;
+import jp.sourceforge.gokigen.memoma.dialogs.CreditDialog;
+import jp.sourceforge.gokigen.memoma.dialogs.TextEditDialog;
+import jp.sourceforge.gokigen.memoma.drawers.MeMoMaCanvasDrawer;
+import jp.sourceforge.gokigen.memoma.extension.ExtensionActivity;
+import jp.sourceforge.gokigen.memoma.fileio.MeMoMaDataInOutManager;
+import jp.sourceforge.gokigen.memoma.holders.LineStyleHolder;
+import jp.sourceforge.gokigen.memoma.holders.MeMoMaConnectLineHolder;
+import jp.sourceforge.gokigen.memoma.holders.MeMoMaObjectHolder;
+import jp.sourceforge.gokigen.memoma.holders.OperationModeHolder;
+
 /**
  *   メモま！ のメイン画面処理
  *   

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/ObjectAligner.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/ObjectAligner.java
index 1e79817..fd33c8d 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/ObjectAligner.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/ObjectAligner.java
@@ -8,6 +8,8 @@ import android.content.Context;
 import android.os.AsyncTask;
 import android.util.Log;
 
+import jp.sourceforge.gokigen.memoma.holders.MeMoMaObjectHolder;
+
 /**
  *  オブジェクトの位置を整列するクラス (非同期処理を実行)
  *  

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/ObjectDataInputDialog.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/ObjectDataInputDialog.java
index d321bf9..f293a3b 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/ObjectDataInputDialog.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/ObjectDataInputDialog.java
@@ -22,6 +22,9 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.CompoundButton;
 
+import jp.sourceforge.gokigen.memoma.drawers.MeMoMaCanvasDrawer;
+import jp.sourceforge.gokigen.memoma.holders.MeMoMaObjectHolder;
+
 /**
  *   オブジェクトのデータを入力するダイアログを表示する
  * 
@@ -44,7 +47,7 @@ public class ObjectDataInputDialog implements SeekBar.OnSeekBarChangeListener, C
        private SeekBar borderColorView = null;
     private CheckBox  fillObjectView = null;
     private GradientDrawable backgroundShape = null;
-    private int backgroundColor = MeMoMaCanvasDrawer.BACKGROUND_COLOR_DEFAULT; 
+    private int backgroundColor = MeMoMaCanvasDrawer.BACKGROUND_COLOR_DEFAULT;
     private int currentObjectDrawStyle = MeMoMaObjectHolder.DRAWSTYLE_RECTANGLE;
     private float textFontSize = 6.0f;
        
@@ -265,11 +268,7 @@ public class ObjectDataInputDialog implements SeekBar.OnSeekBarChangeListener, C
     
     /**
      *    オブジェクトにデータを設定する
-     * @param label
-     * @param detail
-     * @param labelColor
-     * @param borderColor
-     * @param size
+     *
      */
     public void setObjectData(String label, String detail, int progress, boolean boldText, boolean fillObject, boolean userCheck, int drawStyle)
     {

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/SelectLineShapeDialog.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/SelectLineShapeDialog.java
index 14ae039..ba50b8c 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/SelectLineShapeDialog.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/SelectLineShapeDialog.java
@@ -12,6 +12,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageButton;
 
+import jp.sourceforge.gokigen.memoma.holders.LineStyleHolder;
+
 /**
  *   接続線の形状を選択するダイアログを表示する
  * 

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/ConfirmationDialog.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/dialogs/ConfirmationDialog.java
similarity index 74%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/ConfirmationDialog.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/dialogs/ConfirmationDialog.java
index 60dec13..660c1ae 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/ConfirmationDialog.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/dialogs/ConfirmationDialog.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.dialogs;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -8,6 +8,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
+import jp.sourceforge.gokigen.memoma.R;
+
 /**
  *   はい か いいえ を入力するダイアログを準備する
  * 
@@ -16,7 +18,7 @@ import android.widget.TextView;
  */
 public class ConfirmationDialog
 {
-       private Context context = null;
+       private Context context;
        private IResultReceiver resultReceiver = null;
     private String  message = "";
        private String  title = "";
@@ -29,8 +31,7 @@ public class ConfirmationDialog
 
        /**
         *  クラスの準備
-        * @param receiver
-        * @param initialMessage
+     *
         */
        public void prepare(IResultReceiver receiver, int titleIcon, String titleMessage, String confirmMessage)
        {
@@ -45,15 +46,19 @@ public class ConfirmationDialog
 
     /**
      *   確認ダイアログを応答する
-     * @return
+     *
      */
     public Dialog getDialog()
     {
        LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+       if (inflater == null)
+        {
+            return (null);
+        }
         final View layout = inflater.inflate(R.layout.confirmationdialog, null);
 
         AlertDialog.Builder builder = new AlertDialog.Builder(context);
-        final TextView  textView = (TextView)  layout.findViewById(R.id.confirm_message);
+        final TextView  textView = layout.findViewById(R.id.confirm_message);
 
         // 表示するデータ（アイコン、ダイアログタイトル、メッセージ）を準備する
         if (icon != 0)
@@ -74,19 +79,11 @@ public class ConfirmationDialog
               {
                    public void onClick(DialogInterface dialog, int id)
                    {
-                          boolean ret = false;
                           if (resultReceiver != null)
                           {
                               resultReceiver.acceptConfirmation();
                           }
-                       if (ret == true)
-                       {
-                          dialog.dismiss();
-                       }
-                       else
-                       {
-                           dialog.cancel();
-                       }
+                       dialog.cancel();
                        System.gc();
                    }
                });
@@ -94,19 +91,11 @@ public class ConfirmationDialog
                {
                    public void onClick(DialogInterface dialog, int id)
                    {
-                          boolean ret = false;
                           if (resultReceiver != null)
                           {
                               resultReceiver.rejectConfirmation();
                           }
-                       if (ret == true)
-                       {
-                          dialog.dismiss();
-                       }
-                       else
-                       {
-                           dialog.cancel();
-                       }
+                       dialog.cancel();
                        System.gc();
                    }
                });
@@ -115,7 +104,7 @@ public class ConfirmationDialog
 
     public interface IResultReceiver
     {
-        public abstract void acceptConfirmation();
-        public abstract void rejectConfirmation();
+        void acceptConfirmation();
+        void rejectConfirmation();
     }
 }

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/CreditDialog.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/dialogs/CreditDialog.java
similarity index 68%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/CreditDialog.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/dialogs/CreditDialog.java
index 9aef65e..2f98f33 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/CreditDialog.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/dialogs/CreditDialog.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.dialogs;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -6,9 +6,10 @@ import android.app.Dialog;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.TextView;
 
+import jp.sourceforge.gokigen.memoma.R;
+
 /**
  *  クレジットを表示する
  * 
@@ -17,11 +18,11 @@ import android.widget.TextView;
  */
 public class CreditDialog
 {
-       private Activity context = null;
+       private Activity context;
 
        /**
         *   コンストラクタ
-        * @param arg
+        *
         */
        public CreditDialog(Activity arg)
        {
@@ -30,15 +31,19 @@ public class CreditDialog
 
     /**
      *   ダイアログを応答する
-     * @return
+     *
      */
     public Dialog getDialog()
     {
        LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-       View layout = inflater.inflate(R.layout.creditdialog, (ViewGroup) null);  //  ?? http://www.mail-archive.com/android-developers@googlegroups.com/msg162003.html より
-       //View layout = inflater.inflate(R.layout.creditdialog, (ViewGroup) context.findViewById(R.id.layout_root));
+       if (inflater == null)
+               {
+                       return (null);
+               }
+       View layout = inflater.inflate(R.layout.creditdialog, null);  //  ?? http://www.mail-archive.com/android-developers@googlegroups.com/msg162003.html より
+       //View layout = inflater.inflate(R.layout.creditdialog,  context.findViewById(R.id.layout_root));
 
-       TextView text = (TextView) layout.findViewById(R.id.creditmessage);
+       TextView text = layout.findViewById(R.id.creditmessage);
        text.setText(context.getString(R.string.app_credit));
  //    ImageView image = (ImageView) layout.findViewById(R.id.crediticon);
  //    image.setImageResource(R.drawable.icon);

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/FileSelectionDialog.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/dialogs/FileSelectionDialog.java
similarity index 94%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/FileSelectionDialog.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/dialogs/FileSelectionDialog.java
index 1c10cb8..6e011c2 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/FileSelectionDialog.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/dialogs/FileSelectionDialog.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.dialogs;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -9,6 +9,10 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
+import jp.sourceforge.gokigen.memoma.fileio.ExternalStorageFileUtility;
+import jp.sourceforge.gokigen.memoma.holders.MeMoMaDataFileHolder;
+import jp.sourceforge.gokigen.memoma.R;
+
 /**
  *    ファイル選択ダイアログ
  * 

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/TextEditDialog.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/dialogs/TextEditDialog.java
similarity index 97%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/TextEditDialog.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/dialogs/TextEditDialog.java
index 7e8f497..1b8037f 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/TextEditDialog.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/dialogs/TextEditDialog.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.dialogs;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -9,6 +9,9 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
+import jp.sourceforge.gokigen.memoma.Main;
+import jp.sourceforge.gokigen.memoma.R;
+
 /**
  *  テキスト編集のダイアログ
  * 

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/TextEditReceiver.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/dialogs/TextEditReceiver.java
similarity index 87%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/TextEditReceiver.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/dialogs/TextEditReceiver.java
index 9cf6cfe..c18ba27 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/TextEditReceiver.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/dialogs/TextEditReceiver.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.dialogs;
 
 import android.app.Activity;
 import android.content.SharedPreferences;
@@ -13,9 +13,9 @@ import android.widget.TextView;
  */
 public class TextEditReceiver implements TextEditDialog.ITextEditResultReceiver
 {
-       Activity parent = null;
-       String textId = null;
-       int     textResId = -1;
+       private Activity parent;
+       private String  textId;
+       private int     textResId;
        
     /**
      *    コンストラクタ
@@ -44,12 +44,12 @@ public class TextEditReceiver implements TextEditDialog.ITextEditResultReceiver
        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(parent);
         SharedPreferences.Editor editor = preferences.edit();
         editor.putString(textId, message);
-        editor.commit();
+        editor.apply();
 
         if (textResId != 0)
         {
             // 画面表示の更新
-               final TextView infoText = (TextView) parent.findViewById(textResId);
+               final TextView infoText = parent.findViewById(textResId);
                infoText.setText(message);
         }
         else

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/ICanvasDrawer.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/drawers/ICanvasDrawer.java
similarity index 88%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/ICanvasDrawer.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/drawers/ICanvasDrawer.java
index 4397641..7b9737a 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/ICanvasDrawer.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/drawers/ICanvasDrawer.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.drawers;
 
 import android.graphics.Canvas;
 import android.view.MotionEvent;

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaCanvasDrawer.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/drawers/MeMoMaCanvasDrawer.java
similarity index 98%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaCanvasDrawer.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/drawers/MeMoMaCanvasDrawer.java
index 38ea001..57d57fc 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaCanvasDrawer.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/drawers/MeMoMaCanvasDrawer.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.drawers;
 
 import java.util.Enumeration;
 import android.app.Activity;
@@ -19,13 +19,23 @@ import android.view.ScaleGestureDetector;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
+import jp.sourceforge.gokigen.memoma.GokigenSurfaceView;
+import jp.sourceforge.gokigen.memoma.IObjectSelectionReceiver;
+import jp.sourceforge.gokigen.memoma.fileio.ImageLoader;
+import jp.sourceforge.gokigen.memoma.Main;
+import jp.sourceforge.gokigen.memoma.R;
+import jp.sourceforge.gokigen.memoma.holders.LineStyleHolder;
+import jp.sourceforge.gokigen.memoma.holders.MeMoMaConnectLineHolder;
+import jp.sourceforge.gokigen.memoma.holders.MeMoMaObjectHolder;
+import jp.sourceforge.gokigen.memoma.holders.OperationModeHolder;
+
 /**
  *    メモまの描画クラス
  *    
  * @author MRSa
  *
  */
-public class MeMoMaCanvasDrawer implements  ICanvasDrawer,  GestureDetector.OnGestureListener, ScaleGestureDetector.OnScaleGestureListener, SeekBar.OnSeekBarChangeListener
+public class MeMoMaCanvasDrawer implements ICanvasDrawer,  GestureDetector.OnGestureListener, ScaleGestureDetector.OnScaleGestureListener, SeekBar.OnSeekBarChangeListener
 {
        public static final float OBJECTLABEL_MARGIN = 8.0f;
        public static final float OBJECTLABEL_MARGIN_WIDTH = 24.0f;
@@ -553,7 +563,7 @@ public class MeMoMaCanvasDrawer implements  ICanvasDrawer,  GestureDetector.OnGe
         else   // オブジェクト非選択時の表示
         {
                int data = selectionReceiver.touchedVacantArea();
-               if (data ==OperationModeHolder.OPERATIONMODE_MOVE)
+               if (data == OperationModeHolder.OPERATIONMODE_MOVE)
                {
                 // 移動モードのとき... （表示領域を移動させる）
                        drawTransX = (tempPosX - downPosX);
@@ -577,10 +587,7 @@ public class MeMoMaCanvasDrawer implements  ICanvasDrawer,  GestureDetector.OnGe
 
     /**
      *    オブジェクト（１個）を表示する
-     * 
-     * @param canvas
-     * @param paint
-     * @param pos
+     *
      */
     private void drawObject(Canvas canvas, MeMoMaObjectHolder.PositionObject object, boolean isMoving, float offsetX, float offsetY)
     {

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/ObjectShapeDrawer.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/drawers/ObjectShapeDrawer.java
similarity index 98%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/ObjectShapeDrawer.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/drawers/ObjectShapeDrawer.java
index 30842e0..d0a289b 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/ObjectShapeDrawer.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/drawers/ObjectShapeDrawer.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.drawers;
 
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -7,6 +7,9 @@ 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;
+
 /**
  *   めもまのオブジェクト・ライン・ラベルを描画するメソッド群
  *   (現在のところ、MeMoMaCanvasDrawerクラスから追い出してきただけ...)
@@ -250,7 +253,7 @@ public class ObjectShapeDrawer
           * @param paint
           * @param x1
           * @param y1
-          * @param checkVaule
+          * @param checkValue
           * @param isXaxis
           */
        static public void drawArrowTree(Canvas canvas, Paint paint, float x1, float y1, float checkValue, boolean isXaxis)
@@ -341,6 +344,7 @@ public class ObjectShapeDrawer
                }
                
                // 文字をちょっと影付きにする
+            paint.setStyle(Paint.Style.FILL_AND_STROKE);
                paint.setShadowLayer(0.5f, 0.5f, 0.5f, Color.DKGRAY);
                
                // ユーザチェックの描画

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/ExtensionActivity.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionActivity.java
similarity index 97%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/ExtensionActivity.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionActivity.java
index f16fbe1..e0d4a5c 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/ExtensionActivity.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionActivity.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.extension;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -7,6 +7,8 @@ import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import jp.sourceforge.gokigen.memoma.R;
+
 /**
  * 
  * @author MRSa
@@ -170,7 +172,6 @@ public class ExtensionActivity extends  Activity
     protected void onPrepareDialog(int id, Dialog dialog)
     {
        listener.onPrepareDialog(id, dialog);
-       return;
     }
     
     /**

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/ExtensionActivityListener.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionActivityListener.java
similarity index 94%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/ExtensionActivityListener.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionActivityListener.java
index a8a3db9..bde0119 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/ExtensionActivityListener.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionActivityListener.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.extension;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -21,6 +21,19 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import jp.sourceforge.gokigen.memoma.fileio.ExternalStorageFileUtility;
+import jp.sourceforge.gokigen.memoma.dialogs.FileSelectionDialog;
+import jp.sourceforge.gokigen.memoma.Main;
+import jp.sourceforge.gokigen.memoma.holders.MeMoMaConnectLineHolder;
+import jp.sourceforge.gokigen.memoma.fileio.MeMoMaFileExportCsvProcess;
+import jp.sourceforge.gokigen.memoma.fileio.MeMoMaFileImportCsvProcess;
+import jp.sourceforge.gokigen.memoma.fileio.MeMoMaFileLoadingProcess;
+import jp.sourceforge.gokigen.memoma.holders.MeMoMaObjectHolder;
+import jp.sourceforge.gokigen.memoma.R;
+import jp.sourceforge.gokigen.memoma.SharedIntentInvoker;
+import jp.sourceforge.gokigen.memoma.SymbolListArrayAdapter;
+import jp.sourceforge.gokigen.memoma.SymbolListArrayItem;
+
 /**
  *    リスト形式で表示・エクスポート
  * 
@@ -112,9 +125,7 @@ public class ExtensionActivityListener  implements OnClickListener, MeMoMaFileLo
 
     /**
      *    詳細データを表示する。
-     * 
-     * @param title
-     * @param url
+     *
      */
     private void showDetailData(String first, String second, String third)
     {

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/ExternalStorageFileUtility.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/ExternalStorageFileUtility.java
similarity index 98%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/ExternalStorageFileUtility.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/ExternalStorageFileUtility.java
index 72a7c98..b02686c 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/ExternalStorageFileUtility.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/ExternalStorageFileUtility.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.fileio;
 
 import android.os.Environment;
 import android.util.Log;
@@ -10,6 +10,8 @@ import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
+import jp.sourceforge.gokigen.memoma.Main;
+
 /**
  *  外部ストレージにデータを記録するために使うユーティリティ
  *  

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/ImageLoader.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/ImageLoader.java
similarity index 98%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/ImageLoader.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/ImageLoader.java
index 8a71e95..2f43cb8 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/ImageLoader.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/ImageLoader.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.fileio;
 
 import java.io.File;
 import java.io.InputStream;
@@ -12,6 +12,9 @@ import android.os.Message;
 import android.util.Log;
 import android.widget.ImageView;
 
+import jp.sourceforge.gokigen.memoma.Main;
+import jp.sourceforge.gokigen.memoma.R;
+
 /**
  *  画像イメージを読み込む
  * 

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaDataInOutManager.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/MeMoMaDataInOutManager.java
similarity index 95%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaDataInOutManager.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/MeMoMaDataInOutManager.java
index 44f66db..f08c3f6 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaDataInOutManager.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/MeMoMaDataInOutManager.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.fileio;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -10,6 +10,15 @@ import android.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.Toast;
 
+import jp.sourceforge.gokigen.memoma.GokigenSurfaceView;
+import jp.sourceforge.gokigen.memoma.Main;
+import jp.sourceforge.gokigen.memoma.MeMoMaListener;
+import jp.sourceforge.gokigen.memoma.R;
+import jp.sourceforge.gokigen.memoma.SharedIntentInvoker;
+import jp.sourceforge.gokigen.memoma.drawers.MeMoMaCanvasDrawer;
+import jp.sourceforge.gokigen.memoma.holders.MeMoMaDataFileHolder;
+import jp.sourceforge.gokigen.memoma.holders.MeMoMaObjectHolder;
+
 public class MeMoMaDataInOutManager implements MeMoMaFileSavingProcess.ISavingStatusHolder, MeMoMaFileSavingProcess.IResultReceiver, MeMoMaFileLoadingProcess.IResultReceiver,  ActionBar.OnNavigationListener, ObjectLayoutCaptureExporter.ICaptureLayoutExporter
 {
        private Activity parent = null;

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaFileExportCsvProcess.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/MeMoMaFileExportCsvProcess.java
similarity index 96%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaFileExportCsvProcess.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/MeMoMaFileExportCsvProcess.java
index 3a059b2..572e38c 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaFileExportCsvProcess.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/MeMoMaFileExportCsvProcess.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.fileio;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -11,6 +11,10 @@ import android.content.Context;
 import android.os.AsyncTask;
 import android.util.Log;
 
+import jp.sourceforge.gokigen.memoma.Main;
+import jp.sourceforge.gokigen.memoma.R;
+import jp.sourceforge.gokigen.memoma.holders.MeMoMaObjectHolder;
+
 /**
  *  データをファイルに保存するとき用 アクセスラッパ (非同期処理を実行)
  *  
@@ -25,7 +29,7 @@ import android.util.Log;
 public class MeMoMaFileExportCsvProcess extends AsyncTask<MeMoMaObjectHolder, Integer, String>
 {      
        private IResultReceiver receiver = null;
-       private ExternalStorageFileUtility fileUtility = null;  
+       private ExternalStorageFileUtility fileUtility = null;
        private String exportedFileName = null;
 
        ProgressDialog savingDialog = null;

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaFileImportCsvProcess.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/MeMoMaFileImportCsvProcess.java
similarity index 97%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaFileImportCsvProcess.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/MeMoMaFileImportCsvProcess.java
index 565ba4a..122031b 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaFileImportCsvProcess.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/MeMoMaFileImportCsvProcess.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.fileio;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
@@ -10,6 +10,10 @@ import android.os.AsyncTask;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
+import jp.sourceforge.gokigen.memoma.Main;
+import jp.sourceforge.gokigen.memoma.R;
+import jp.sourceforge.gokigen.memoma.holders.MeMoMaObjectHolder;
+
 /**
  *  データをファイルに保存するとき用 アクセスラッパ (非同期処理を実行)
  *  
@@ -25,7 +29,7 @@ public class MeMoMaFileImportCsvProcess extends AsyncTask<MeMoMaObjectHolder, In
 {      
        private Context parent = null;
        private IResultReceiver receiver = null;
-       private ExternalStorageFileUtility fileUtility = null;  
+       private ExternalStorageFileUtility fileUtility = null;
        private String targetFileName = null;
     private String fileSavedResult = "";
        private ProgressDialog importingDialog = null;

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaFileLoadingProcess.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/MeMoMaFileLoadingProcess.java
similarity index 98%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaFileLoadingProcess.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/MeMoMaFileLoadingProcess.java
index 188c907..5ceed0a 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaFileLoadingProcess.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/MeMoMaFileLoadingProcess.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.fileio;
 
 import java.io.File;
 import java.io.FileReader;
@@ -12,6 +12,10 @@ import android.preference.PreferenceManager;
 import android.util.Log;
 import android.util.Xml;
 
+import jp.sourceforge.gokigen.memoma.Main;
+import jp.sourceforge.gokigen.memoma.holders.MeMoMaConnectLineHolder;
+import jp.sourceforge.gokigen.memoma.holders.MeMoMaObjectHolder;
+
 /**
  *  データをファイルに保存するとき用 アクセスラッパ (非同期処理を実行)
  *  

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaFileSavingEngine.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/MeMoMaFileSavingEngine.java
similarity index 98%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaFileSavingEngine.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/MeMoMaFileSavingEngine.java
index 284d3fa..df9b297 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaFileSavingEngine.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/MeMoMaFileSavingEngine.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.fileio;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -9,6 +9,10 @@ import org.xmlpull.v1.XmlSerializer;
 import android.util.Log;
 import android.util.Xml;
 
+import jp.sourceforge.gokigen.memoma.Main;
+import jp.sourceforge.gokigen.memoma.holders.MeMoMaConnectLineHolder;
+import jp.sourceforge.gokigen.memoma.holders.MeMoMaObjectHolder;
+
 /**
  *  データをファイルに保存するエンジン部分
  *  

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaFileSavingProcess.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/MeMoMaFileSavingProcess.java
similarity index 95%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaFileSavingProcess.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/MeMoMaFileSavingProcess.java
index e5caa9e..c8cc568 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaFileSavingProcess.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/MeMoMaFileSavingProcess.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.fileio;
 
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -7,6 +7,10 @@ import android.os.AsyncTask;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
+import jp.sourceforge.gokigen.memoma.Main;
+import jp.sourceforge.gokigen.memoma.R;
+import jp.sourceforge.gokigen.memoma.holders.MeMoMaObjectHolder;
+
 /**
  *  データをファイルに保存するとき用 アクセスラッパ (非同期処理を実行)
  *  

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/ObjectLayoutCaptureExporter.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/ObjectLayoutCaptureExporter.java
similarity index 96%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/ObjectLayoutCaptureExporter.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/ObjectLayoutCaptureExporter.java
index d251b99..f6e22c8 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/ObjectLayoutCaptureExporter.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/ObjectLayoutCaptureExporter.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.fileio;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -17,6 +17,11 @@ import android.os.AsyncTask;
 import android.util.Log;
 import android.view.Display;
 
+import jp.sourceforge.gokigen.memoma.Main;
+import jp.sourceforge.gokigen.memoma.R;
+import jp.sourceforge.gokigen.memoma.drawers.MeMoMaCanvasDrawer;
+import jp.sourceforge.gokigen.memoma.holders.MeMoMaObjectHolder;
+
 /**
  *  データをファイルに保存するとき用 アクセスラッパ (非同期処理を実行)
  *  Viewの情報を画像形式（png形式）で保存する。
@@ -40,7 +45,7 @@ public class ObjectLayoutCaptureExporter extends AsyncTask<String, Integer, Stri
        
        private Activity parent = null;
        private ICaptureLayoutExporter receiver = null;
-       private ExternalStorageFileUtility fileUtility = null;  
+       private ExternalStorageFileUtility fileUtility = null;
        private String exportedFileName = null; 
        private MeMoMaObjectHolder objectHolder = null;
        private MeMoMaCanvasDrawer canvasDrawer = null;

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/ViewCaptureExporter.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/ViewCaptureExporter.java
similarity index 96%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/ViewCaptureExporter.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/ViewCaptureExporter.java
index 0efcfa4..a754f9f 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/ViewCaptureExporter.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/fileio/ViewCaptureExporter.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.fileio;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -13,6 +13,9 @@ import android.os.AsyncTask;
 import android.util.Log;
 import android.view.View;
 
+import jp.sourceforge.gokigen.memoma.Main;
+import jp.sourceforge.gokigen.memoma.R;
+
 /**
  *  データをファイルに保存するとき用 アクセスラッパ (非同期処理を実行)
  *  Viewの情報を画像形式（png形式）で保存する。
@@ -29,7 +32,7 @@ import android.view.View;
 public class ViewCaptureExporter extends AsyncTask<String, Integer, String>
 {
        private ICaptureExporter receiver = null;
-       private ExternalStorageFileUtility fileUtility = null;  
+       private ExternalStorageFileUtility fileUtility = null;
        private String exportedFileName = null;
 
        private ProgressDialog savingDialog = null;
@@ -85,10 +88,8 @@ public class ViewCaptureExporter extends AsyncTask<String, Integer, String>
     
     /**
      *    ビットマップデータを(PNG形式で)保管する。
-     * 
-     * @param fileName
-     * @param objectHolder
-     * @return
+     *
+        *
      */
     private String exportToFile(String fileName)
     {

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/LineStyleHolder.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/LineStyleHolder.java
similarity index 99%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/LineStyleHolder.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/holders/LineStyleHolder.java
index 7edd7ec..d5a44af 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/LineStyleHolder.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/LineStyleHolder.java
@@ -1,9 +1,11 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.holders;
 
 import android.app.Activity;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
+import jp.sourceforge.gokigen.memoma.R;
+
 /**
  *    線の形状を保持するクラス
  * 
@@ -165,8 +167,7 @@ public class LineStyleHolder
 
          /**
           *    接続する線の太さ を設定する
-          * 
-          * @param shape
+          *
           */
          public void setLineThickness(int thickness)
          {

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaConnectLineHolder.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/MeMoMaConnectLineHolder.java
similarity index 96%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaConnectLineHolder.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/holders/MeMoMaConnectLineHolder.java
index 25aa3b9..1ec444f 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaConnectLineHolder.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/MeMoMaConnectLineHolder.java
@@ -1,9 +1,12 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.holders;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
 import android.util.Log;
 
+import jp.sourceforge.gokigen.memoma.Main;
+import jp.sourceforge.gokigen.memoma.holders.LineStyleHolder;
+
 
 /**
  *   表示オブジェクト間の接続情報を保持するクラス

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaDataFileHolder.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/MeMoMaDataFileHolder.java
similarity index 94%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaDataFileHolder.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/holders/MeMoMaDataFileHolder.java
index 15256c7..284a39d 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaDataFileHolder.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/MeMoMaDataFileHolder.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.holders;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -6,6 +6,8 @@ import java.io.FilenameFilter;
 import android.content.Context;
 import android.widget.ArrayAdapter;
 
+import jp.sourceforge.gokigen.memoma.fileio.ExternalStorageFileUtility;
+
 /**
  *    めもまのデータファイル名を保持するクラス　（ArrayAdapterを拡張）
  * 

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaObjectHolder.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/MeMoMaObjectHolder.java
similarity index 98%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaObjectHolder.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/holders/MeMoMaObjectHolder.java
index 6cf48e5..46c397c 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaObjectHolder.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/MeMoMaObjectHolder.java
@@ -1,4 +1,4 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.holders;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
@@ -9,6 +9,9 @@ import android.graphics.RectF;
 import android.util.Log;
 import android.widget.Toast;
 
+import jp.sourceforge.gokigen.memoma.Main;
+import jp.sourceforge.gokigen.memoma.R;
+
 /**
  *   表示オブジェクトの情報を保持するクラス
  * 
@@ -284,8 +287,7 @@ public class MeMoMaObjectHolder
 
     /**
      *   オブジェクトのサイズを拡大する
-     * 
-     * @param key
+     *
      */
     public void expandObjectSize(Integer key)
     {

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/OperationModeHolder.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/OperationModeHolder.java
similarity index 94%
rename from app/src/main/java/jp/sourceforge/gokigen/memoma/OperationModeHolder.java
rename to app/src/main/java/jp/sourceforge/gokigen/memoma/holders/OperationModeHolder.java
index 214975b..d9db504 100644 (file)
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/OperationModeHolder.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/OperationModeHolder.java
@@ -1,9 +1,11 @@
-package jp.sourceforge.gokigen.memoma;
+package jp.sourceforge.gokigen.memoma.holders;
 
 import android.app.Activity;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
+import jp.sourceforge.gokigen.memoma.R;
+
 /**
  * 
  * @author MRSa