• R/O
  • HTTP
  • SSH
  • HTTPS

A01d: Commit

OPC(Olympus Air)用望遠鏡アプリ。


Commit MetaInfo

Révisionccffff3c634a86f058d2cfd60f92fa829b257e01 (tree)
l'heure2018-07-01 23:47:14
AuteurMRSa <mrsa@myad...>
CommiterMRSa

Message de Log

警告について修正。

Change Summary

Modification

--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyArrayAdapter.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyArrayAdapter.java
@@ -13,9 +13,9 @@ import java.util.List;
1313
1414 public class CameraPropertyArrayAdapter extends ArrayAdapter<CameraPropertyArrayItem>
1515 {
16- private LayoutInflater inflater = null;
16+ private LayoutInflater inflater;
1717 private final int textViewResourceId;
18- private List<CameraPropertyArrayItem> listItems = null;
18+ private List<CameraPropertyArrayItem> listItems;
1919
2020 CameraPropertyArrayAdapter(Context context, int textId, List<CameraPropertyArrayItem> items)
2121 {
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyArrayItem.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyArrayItem.java
@@ -3,16 +3,16 @@ package net.osdn.gokigen.a01d.camera.olympus.cameraproperty;
33
44 public class CameraPropertyArrayItem
55 {
6- private int iconResource = 0;
6+ private int iconResource;
77 private final String propertyName;
88 private final String propertyTitle;
99 private final String initialValue;
1010 private final String initialValueTitle;
1111 private final int initialIconResource;
12- private String propertyValue = "";
13- private String propertyValueTitle = "";
12+ private String propertyValue;
13+ private String propertyValueTitle;
1414
15- public CameraPropertyArrayItem(String name, String title, String valueTitle, String value, int iconId1)
15+ CameraPropertyArrayItem(String name, String title, String valueTitle, String value, int iconId1)
1616 {
1717 iconResource = iconId1;
1818 propertyName = name;
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyLoader.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyLoader.java
@@ -18,7 +18,7 @@ public class CameraPropertyLoader implements Runnable
1818 private final IPropertyLoaderCallback callback;
1919 private ArrayList<CameraPropertyArrayItem> propertyItems = null;
2020
21- public CameraPropertyLoader(IOlyCameraPropertyProvider propertyInterface, IPropertyLoaderCallback callback)
21+ CameraPropertyLoader(IOlyCameraPropertyProvider propertyInterface, IPropertyLoaderCallback callback)
2222 {
2323 this.propertyInterface = propertyInterface;
2424 this.callback = callback;
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyOperator.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyOperator.java
@@ -16,7 +16,7 @@ public class CameraPropertyOperator implements View.OnClickListener
1616 private final CameraPropertyLoader loader;
1717
1818
19- public CameraPropertyOperator(Context context, CameraPropertyLoader loader)
19+ CameraPropertyOperator(Context context, CameraPropertyLoader loader)
2020 {
2121 this.context = context;
2222 this.loader = loader;
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyValueSelector.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyValueSelector.java
@@ -30,7 +30,7 @@ public class CameraPropertyValueSelector implements ListView.OnItemClickListener
3030 *
3131 *
3232 */
33- public CameraPropertyValueSelector(Context context, IOlyCameraPropertyProvider propertyInterface, ICametaPropertyUpdateNotify updater)
33+ CameraPropertyValueSelector(Context context, IOlyCameraPropertyProvider propertyInterface, ICametaPropertyUpdateNotify updater)
3434 {
3535 this.context = context;
3636 this.propertyInterface = propertyInterface;
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/ILoadSaveCameraProperties.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/ILoadSaveCameraProperties.java
@@ -2,9 +2,9 @@ package net.osdn.gokigen.a01d.camera.olympus.myolycameraprops;
22
33 interface ILoadSaveCameraProperties
44 {
5- static final int MAX_STORE_PROPERTIES = 256; // お気に入り設定の最大記憶数...
6- static final String TITLE_KEY = "CameraPropTitleKey";
7- static final String DATE_KEY = "CameraPropDateTime";
5+ int MAX_STORE_PROPERTIES = 256; // お気に入り設定の最大記憶数...
6+ String TITLE_KEY = "CameraPropTitleKey";
7+ String DATE_KEY = "CameraPropDateTime";
88
99 void loadCameraSettings(final String id, final String dataName);
1010 void saveCameraSettings(final String id, final String dataName);
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/LoadSaveCameraProperties.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/LoadSaveCameraProperties.java
@@ -160,7 +160,7 @@ public class LoadSaveCameraProperties implements ILoadSaveCameraProperties
160160 private boolean saveCameraSettingsImpl(String idHeader, String dataName)
161161 {
162162 boolean ret = false;
163- Map<String, String> values = null;
163+ Map<String, String> values;
164164 try
165165 {
166166 values = propertyProvider.getCameraPropertyValues(propertyProvider.getCameraPropertyNames());
@@ -268,7 +268,7 @@ public class LoadSaveCameraProperties implements ILoadSaveCameraProperties
268268 {
269269
270270 // 現在の設定値を全部とってくる
271- Map<String, String> propertyValues = null;
271+ Map<String, String> propertyValues;
272272 try
273273 {
274274 propertyValues = propertyProvider.getCameraPropertyValues(propertyProvider.getCameraPropertyNames());
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/LoadSaveMyCameraPropertyDialog.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/LoadSaveMyCameraPropertyDialog.java
@@ -34,7 +34,7 @@ public class LoadSaveMyCameraPropertyDialog extends DialogFragment implements Ta
3434 try
3535 {
3636 View view = inflater.inflate(R.layout.dialog_my_camera_properties, container);
37- tabHost = (FragmentTabHost) view.findViewById(R.id.tabHost01);
37+ tabHost = view.findViewById(R.id.tabHost01);
3838 tabHost.setup(getActivity(), getChildFragmentManager());
3939 tabHost.addTab(tabHost.newTabSpec("Load").setIndicator(getString(R.string.title_tab_title_load)), Fragment.class, null);
4040 tabHost.addTab(tabHost.newTabSpec("Save").setIndicator(getString(R.string.title_tab_title_save)), Fragment.class, null);
@@ -44,7 +44,7 @@ public class LoadSaveMyCameraPropertyDialog extends DialogFragment implements Ta
4444 LoadSaveMyCameraPropertyPagerAdapter adapter = new LoadSaveMyCameraPropertyPagerAdapter(getChildFragmentManager(), this);
4545 adapter.setTitles(new String[]{getString(R.string.title_tab_title_load), getString(R.string.title_tab_title_save)});
4646
47- viewPager = (ViewPager) view.findViewById(R.id.pager);
47+ viewPager = view.findViewById(R.id.pager);
4848 viewPager.setAdapter(adapter);
4949 //viewPager.setOnPageChangeListener(this);
5050 viewPager.addOnPageChangeListener(this);
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/MyCameraPropertyLoadArrayAdapter.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/MyCameraPropertyLoadArrayAdapter.java
@@ -1,6 +1,7 @@
11 package net.osdn.gokigen.a01d.camera.olympus.myolycameraprops;
22
33 import android.content.Context;
4+import android.support.annotation.NonNull;
45 import android.view.LayoutInflater;
56 import android.view.View;
67 import android.view.ViewGroup;
@@ -11,9 +12,9 @@ import java.util.List;
1112
1213 class MyCameraPropertyLoadArrayAdapter extends ArrayAdapter<MyCameraPropertySetItems>
1314 {
14- private LayoutInflater inflater = null;
15+ private LayoutInflater inflater;
1516 private final int textViewResourceId;
16- private List<MyCameraPropertySetItems> listItems = null;
17+ private List<MyCameraPropertySetItems> listItems;
1718
1819 MyCameraPropertyLoadArrayAdapter(Context context, int resource, List<MyCameraPropertySetItems> objects)
1920 {
@@ -28,7 +29,7 @@ class MyCameraPropertyLoadArrayAdapter extends ArrayAdapter<MyCameraPropertySetI
2829 *
2930 */
3031 @Override
31- public View getView(int position, View convertView, ViewGroup parent)
32+ public @NonNull View getView(int position, View convertView, @NonNull ViewGroup parent)
3233 {
3334 View view;
3435 if(convertView != null)
@@ -42,13 +43,13 @@ class MyCameraPropertyLoadArrayAdapter extends ArrayAdapter<MyCameraPropertySetI
4243 MyCameraPropertySetItems item = listItems.get(position);
4344 try
4445 {
45- TextView idView = (TextView) view.findViewWithTag("id");
46+ TextView idView = view.findViewWithTag("id");
4647 idView.setText(item.getItemId());
4748
48- TextView titleView = (TextView)view.findViewWithTag("title");
49+ TextView titleView = view.findViewWithTag("title");
4950 titleView.setText(item.getItemName());
5051
51- TextView infoView = (TextView) view.findViewWithTag("info");
52+ TextView infoView = view.findViewWithTag("info");
5253 infoView.setText(item.getItemInfo());
5354
5455 }
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/MyCameraPropertySetArrayAdapter.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/MyCameraPropertySetArrayAdapter.java
@@ -1,6 +1,7 @@
11 package net.osdn.gokigen.a01d.camera.olympus.myolycameraprops;
22
33 import android.content.Context;
4+import android.support.annotation.NonNull;
45 import android.util.Log;
56 import android.view.LayoutInflater;
67 import android.view.View;
@@ -19,9 +20,9 @@ class MyCameraPropertySetArrayAdapter extends ArrayAdapter<MyCameraPropertySetI
1920 {
2021 private final String TAG = toString();
2122 private final Context context;
22- private LayoutInflater inflater = null;
23+ private LayoutInflater inflater;
2324 private final int textViewResourceId;
24- private List<MyCameraPropertySetItems> listItems = null;
25+ private List<MyCameraPropertySetItems> listItems;
2526 private final ILoadSaveMyCameraPropertyDialogDismiss dialogDismiss;
2627
2728
@@ -40,7 +41,7 @@ class MyCameraPropertySetArrayAdapter extends ArrayAdapter<MyCameraPropertySetI
4041 *
4142 */
4243 @Override
43- public View getView(int position, View convertView, ViewGroup parent)
44+ public @NonNull View getView(int position, View convertView, @NonNull ViewGroup parent)
4445 {
4546 View view;
4647 if(convertView != null)
@@ -55,16 +56,16 @@ class MyCameraPropertySetArrayAdapter extends ArrayAdapter<MyCameraPropertySetI
5556 {
5657 final MyCameraPropertySetItems item = listItems.get(position);
5758
58- TextView idView = (TextView) view.findViewWithTag("id");
59+ TextView idView =view.findViewWithTag("id");
5960 idView.setText(item.getItemId());
6061
61- final EditText titleView = (EditText)view.findViewWithTag("title");
62+ final EditText titleView = view.findViewWithTag("title");
6263 titleView.setText(item.getItemName());
6364
64- TextView infoView = (TextView) view.findViewWithTag("info");
65+ TextView infoView = view.findViewWithTag("info");
6566 infoView.setText(item.getItemInfo());
6667
67- Button button = (Button) view.findViewWithTag("button");
68+ Button button = view.findViewWithTag("button");
6869 button.setOnClickListener(new Button.OnClickListener()
6970 {
7071 @Override
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/MyCameraPropertySetItems.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/MyCameraPropertySetItems.java
@@ -3,9 +3,9 @@ package net.osdn.gokigen.a01d.camera.olympus.myolycameraprops;
33 class MyCameraPropertySetItems
44 {
55 private final String itemId;
6- private String itemName = "";
7- private String itemInfo = "";
8- private int iconResource = 0;
6+ private String itemName;
7+ private String itemInfo;
8+ private int iconResource;
99
1010 MyCameraPropertySetItems(int iconResource, String itemId, String itemName, String itemInfo)
1111 {
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/operation/takepicture/OlympusAutoFocusControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/operation/takepicture/OlympusAutoFocusControl.java
@@ -24,7 +24,7 @@ public class OlympusAutoFocusControl implements OLYCamera.TakePictureCallback
2424 private final OLYCamera camera;
2525 private final IIndicatorControl indicator;
2626
27- private IAutoFocusFrameDisplay frameDisplayer = null;
27+ private IAutoFocusFrameDisplay frameDisplayer;
2828 private RectF focusFrameRect = null;
2929
3030 /**
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/operation/takepicture/SequentialShotControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/operation/takepicture/SequentialShotControl.java
@@ -22,7 +22,7 @@ public class SequentialShotControl implements OLYCamera.TakePictureCallback
2222 private final Context context;
2323 private final OLYCamera camera;
2424 private final IIndicatorControl indicator;
25- private IAutoFocusFrameDisplay frameDisplayer = null;
25+ private IAutoFocusFrameDisplay frameDisplayer;
2626
2727 private IIndicatorControl.shootingStatus currentStatus = IIndicatorControl.shootingStatus.Unknown;
2828
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/operation/takepicture/SingleShotControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/operation/takepicture/SingleShotControl.java
@@ -22,7 +22,7 @@ public class SingleShotControl implements OLYCamera.TakePictureCallback
2222 private final OLYCamera camera;
2323 private final IIndicatorControl indicator;
2424
25- private IAutoFocusFrameDisplay frameDisplayer = null;
25+ private IAutoFocusFrameDisplay frameDisplayer;
2626
2727 /**
2828 * コンストラクタ
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/OlyCameraCaptureControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/OlyCameraCaptureControl.java
@@ -12,7 +12,7 @@ public class OlyCameraCaptureControl implements ICaptureControl
1212 private final String TAG = toString();
1313 private final SingleShotControl singleShotControl;
1414
15- public OlyCameraCaptureControl(OlyCameraWrapper wrapper, IAutoFocusFrameDisplay frameDisplayer, IIndicatorControl indicator)
15+ OlyCameraCaptureControl(OlyCameraWrapper wrapper, IAutoFocusFrameDisplay frameDisplayer, IIndicatorControl indicator)
1616 {
1717 singleShotControl = new SingleShotControl(wrapper.getOLYCamera(), frameDisplayer, indicator);
1818 }
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/OlyCameraFocusControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/OlyCameraFocusControl.java
@@ -14,11 +14,10 @@ import net.osdn.gokigen.a01d.liveview.IIndicatorControl;
1414 */
1515 public class OlyCameraFocusControl implements IFocusingControl
1616 {
17- private final String TAG = toString();
1817 private final OlympusAutoFocusControl afControl;
1918 private final IAutoFocusFrameDisplay frameDisplay;
2019
21- public OlyCameraFocusControl(OlyCameraWrapper wrapper, IAutoFocusFrameDisplay frameDisplayer, IIndicatorControl indicator)
20+ OlyCameraFocusControl(OlyCameraWrapper wrapper, IAutoFocusFrameDisplay frameDisplayer, IIndicatorControl indicator)
2221 {
2322 this.frameDisplay = frameDisplayer;
2423 afControl = new OlympusAutoFocusControl(wrapper.getOLYCamera(), frameDisplayer, indicator);
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/OlyCameraHardwareStatus.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/OlyCameraHardwareStatus.java
@@ -17,7 +17,7 @@ public class OlyCameraHardwareStatus implements ICameraHardwareStatus
1717 /**
1818 *
1919 */
20- public OlyCameraHardwareStatus(OLYCamera camera)
20+ OlyCameraHardwareStatus(OLYCamera camera)
2121 {
2222 this.camera = camera;
2323 }
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/OlyCameraConnection.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/OlyCameraConnection.java
@@ -101,31 +101,27 @@ public class OlyCameraConnection implements ICameraConnection, OLYCameraConnecti
101101 Log.v(TAG,context.getString(R.string.connect_check_wifi));
102102
103103 String action = intent.getAction();
104- try {
105- if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION))
104+ try
105+ {
106+ if ((action != null)&&(action.equals(ConnectivityManager.CONNECTIVITY_ACTION)))
106107 {
107108 Log.v(TAG, "onReceiveBroadcastOfConnection() : CONNECTIVITY_ACTION");
108109
109110 WifiManager wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
110- WifiInfo info = wifiManager.getConnectionInfo();
111- if (wifiManager.isWifiEnabled() && info != null )
112- {
113- if (info.getNetworkId() != -1)
114- {
115- Log.v(TAG, "Network ID is -1, there is no currently connected network.");
116- }
117- // 自動接続が指示されていた場合は、カメラとの接続処理を行う
118- connectToCamera();
119- }
120- else
121- {
122- if (info == null)
123- {
124- Log.v(TAG, "NETWORK INFO IS NULL.");
125- }
126- else
127- {
128- Log.v(TAG, "isWifiEnabled : " + wifiManager.isWifiEnabled() + " NetworkId : " + info.getNetworkId());
111+ if (wifiManager != null) {
112+ WifiInfo info = wifiManager.getConnectionInfo();
113+ if (wifiManager.isWifiEnabled() && info != null) {
114+ if (info.getNetworkId() != -1) {
115+ Log.v(TAG, "Network ID is -1, there is no currently connected network.");
116+ }
117+ // 自動接続が指示されていた場合は、カメラとの接続処理を行う
118+ connectToCamera();
119+ } else {
120+ if (info == null) {
121+ Log.v(TAG, "NETWORK INFO IS NULL.");
122+ } else {
123+ Log.v(TAG, "isWifiEnabled : " + wifiManager.isWifiEnabled() + " NetworkId : " + info.getNetworkId());
124+ }
129125 }
130126 }
131127 }
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/OlyCameraSetArrayAdapter.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/OlyCameraSetArrayAdapter.java
@@ -21,10 +21,10 @@ public class OlyCameraSetArrayAdapter extends ArrayAdapter<OlyCameraSetArrayItem
2121 {
2222 private final String TAG = toString();
2323 private final Context context;
24- private LayoutInflater inflater = null;
24+ private LayoutInflater inflater;
2525 private final int textViewResourceId;
2626 private final IOlyCameraSetDialogDismiss dialogDismiss;
27- private List<OlyCameraSetArrayItem> listItems = null;
27+ private List<OlyCameraSetArrayItem> listItems;
2828
2929 OlyCameraSetArrayAdapter(Context context, int textId, List<OlyCameraSetArrayItem> items, IOlyCameraSetDialogDismiss dialogDismiss)
3030 {
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/OlyCameraSetArrayItem.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/OlyCameraSetArrayItem.java
@@ -4,9 +4,9 @@ package net.osdn.gokigen.a01d.camera.olympus.wrapper.connection.ble;
44 class OlyCameraSetArrayItem
55 {
66 private final String dataId;
7- private String btName = "";
8- private String btPassCode = "";
9- private String information = "";
7+ private String btName;
8+ private String btPassCode;
9+ private String information;
1010 /*
1111 private final String initialBtName;
1212 private final String initialBtPassCode;
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/connection/RicohGr2CameraDisconnectSequence.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/connection/RicohGr2CameraDisconnectSequence.java
@@ -2,7 +2,6 @@ package net.osdn.gokigen.a01d.camera.ricohgr2.wrapper.connection;
22
33 import android.util.Log;
44
5-import net.osdn.gokigen.a01d.R;
65 import net.osdn.gokigen.a01d.camera.utils.SimpleHttpClient;
76
87 public class RicohGr2CameraDisconnectSequence implements Runnable
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/cameraproperty/SonyCameraApiListFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/cameraproperty/SonyCameraApiListFragment.java
@@ -1,7 +1,6 @@
11 package net.osdn.gokigen.a01d.camera.sony.cameraproperty;
22
33 import android.app.Activity;
4-import android.content.Context;
54 import android.content.Intent;
65 import android.os.Bundle;
76 import android.support.annotation.NonNull;
@@ -10,7 +9,6 @@ import android.support.v4.app.FragmentActivity;
109 import android.support.v4.app.FragmentManager;
1110 import android.support.v4.app.ListFragment;
1211 import android.support.v7.app.ActionBar;
13-import android.support.v7.app.AlertDialog;
1412 import android.support.v7.app.AppCompatActivity;
1513 import android.util.Log;
1614 import android.view.LayoutInflater;
@@ -32,7 +30,6 @@ import org.json.JSONArray;
3230 import org.json.JSONObject;
3331
3432 import java.util.ArrayList;
35-import java.util.Arrays;
3633 import java.util.List;
3734
3835
@@ -452,7 +449,7 @@ public class SonyCameraApiListFragment extends ListFragment implements SendReque
452449 try
453450 {
454451 ConfirmationDialog dialog = ConfirmationDialog.newInstance(getActivity());
455- String replyString = "";
452+ String replyString;
456453 try
457454 {
458455 replyString = reply.getString("result");
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/SonyCameraFocusControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/SonyCameraFocusControl.java
@@ -6,7 +6,6 @@ import android.util.Log;
66 import android.view.MotionEvent;
77
88 import net.osdn.gokigen.a01d.camera.IFocusingControl;
9-import net.osdn.gokigen.a01d.camera.olympus.operation.takepicture.OlympusAutoFocusControl;
109 import net.osdn.gokigen.a01d.camera.sony.operation.takepicture.SonyAutoFocusControl;
1110 import net.osdn.gokigen.a01d.camera.sony.wrapper.ISonyCameraApi;
1211 import net.osdn.gokigen.a01d.liveview.IAutoFocusFrameDisplay;
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/takepicture/SingleShotControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/takepicture/SingleShotControl.java
@@ -1,6 +1,5 @@
11 package net.osdn.gokigen.a01d.camera.sony.operation.takepicture;
22
3-import android.graphics.RectF;
43 import android.support.annotation.NonNull;
54 import android.util.Log;
65
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/connection/SonyCameraConnectSequence.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/connection/SonyCameraConnectSequence.java
@@ -1,7 +1,6 @@
11 package net.osdn.gokigen.a01d.camera.sony.wrapper.connection;
22
33 import android.app.Activity;
4-import android.content.Context;
54 import android.support.annotation.NonNull;
65 import android.util.Log;
76
--- a/app/src/main/java/net/osdn/gokigen/a01d/liveview/ILiveImageStatusNotify.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/liveview/ILiveImageStatusNotify.java
@@ -1,7 +1,5 @@
11 package net.osdn.gokigen.a01d.liveview;
22
3-import android.graphics.Bitmap;
4-
53 import net.osdn.gokigen.a01d.liveview.message.IMessageDrawer;
64
75 /**
--- a/app/src/main/java/net/osdn/gokigen/a01d/liveview/ScalableImageViewPanel.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/liveview/ScalableImageViewPanel.java
@@ -18,8 +18,8 @@ import android.view.View;
1818 */
1919 public class ScalableImageViewPanel extends AppCompatImageView
2020 {
21-
22- private static enum GestureMode {
21+ private enum GestureMode
22+ {
2323 None,
2424 Move,
2525 Zoom,
@@ -70,13 +70,13 @@ public class ScalableImageViewPanel extends AppCompatImageView
7070 public void setImageDrawable(Drawable drawable) {
7171 super.setImageDrawable(drawable);
7272 reset();
73- };
73+ }
7474
7575 @Override
7676 public void setImageBitmap(Bitmap bm) {
7777 super.setImageBitmap(bm);
7878 reset();
79- };
79+ }
8080
8181 @Override
8282 public void setImageURI(Uri uri) {
@@ -97,7 +97,7 @@ public class ScalableImageViewPanel extends AppCompatImageView
9797 /**
9898 * Constructs a new CapturedImageView.
9999 *
100- * @param context
100+ *
101101 */
102102 public ScalableImageViewPanel(Context context) {
103103 super(context);
@@ -108,8 +108,8 @@ public class ScalableImageViewPanel extends AppCompatImageView
108108 /**
109109 * Constructs a new CapturedImageView.
110110 *
111- * @param context
112- * @param attrs
111+ *
112+ *
113113 */
114114 public ScalableImageViewPanel(Context context, AttributeSet attrs) {
115115 super(context, attrs);
@@ -120,9 +120,9 @@ public class ScalableImageViewPanel extends AppCompatImageView
120120 /**
121121 * Constructs a new CapturedImageView.
122122 *
123- * @param context
124- * @param attrs
125- * @param defStyle
123+ *
124+ *
125+ *
126126 */
127127 public ScalableImageViewPanel(Context context, AttributeSet attrs, int defStyle) {
128128 super(context, attrs, defStyle);
@@ -342,8 +342,7 @@ public class ScalableImageViewPanel extends AppCompatImageView
342342 if (touchCount >= 2) {
343343 // Starts zooming and takes in the center point.
344344 mGestureMode = GestureMode.Zoom;
345- float distance = (float)Math.hypot(event.getX(0) - event.getX(1), event.getY(0) - event.getY(1));
346- mScalingBaseDistance = distance;
345+ mScalingBaseDistance = (float)Math.hypot(event.getX(0) - event.getX(1), event.getY(0) - event.getY(1));
347346 mScalingCenterX = (event.getX(0) + event.getX(1)) / 2;
348347 mScalingCenterY = (event.getY(0) + event.getY(1)) / 2;
349348 }
--- a/app/src/main/java/net/osdn/gokigen/a01d/liveview/bitmapconvert/ImageConvertFactory.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/liveview/bitmapconvert/ImageConvertFactory.java
@@ -16,7 +16,6 @@ public class ImageConvertFactory
1616
1717 public static IPreviewImageConverter getImageConverter(int id)
1818 {
19- IPreviewImageConverter drawer = new ConvertNothing();
20- return (drawer);
19+ return (new ConvertNothing());
2120 }
2221 }
--- a/app/src/main/java/net/osdn/gokigen/a01d/liveview/message/ShowMessageHolder.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/liveview/message/ShowMessageHolder.java
@@ -1,7 +1,6 @@
11 package net.osdn.gokigen.a01d.liveview.message;
22
33 import android.graphics.Color;
4-import android.view.ViewDebug;
54
65 /**
76 *
Afficher sur ancien navigateur de dépôt.