Browse Source

去除this.

liuyuqi-dellpc 5 years ago
parent
commit
fe5af4fbf4
100 changed files with 2018 additions and 2018 deletions
  1. 5 5
      app/src/main/java/com/epson/cameracopy/p006ui/CameraPreviewFragment.java
  2. 10 10
      app/src/main/java/com/epson/cameracopy/p006ui/CameraPrintProgress.java
  3. 220 220
      app/src/main/java/com/epson/cameracopy/p006ui/CameraPrintSettingActivity.java
  4. 1 1
      app/src/main/java/com/epson/cameracopy/p006ui/CropImageActivity.java
  5. 4 4
      app/src/main/java/com/epson/cameracopy/p006ui/DocumentSizeSettingActivity.java
  6. 15 15
      app/src/main/java/com/epson/cameracopy/p006ui/ImageCollectView.java
  7. 40 40
      app/src/main/java/com/epson/cameracopy/p006ui/PrintPreviewActivity.java
  8. 5 5
      app/src/main/java/com/epson/cameracopy/printlayout/PreviewView.java
  9. 4 4
      app/src/main/java/com/epson/iprint/prtlogger/Analytics.java
  10. 2 2
      app/src/main/java/com/epson/iprint/prtlogger/CommonLog.java
  11. 5 5
      app/src/main/java/com/epson/lib/escani2/I2LibScannerInfoAndCapability.java
  12. 5 5
      app/src/main/java/com/epson/lib/escani2/ScannerI2Info.java
  13. 3 3
      app/src/main/java/com/epson/memcardacc/AltViewImageAdapter.java
  14. 9 9
      app/src/main/java/com/epson/memcardacc/ConfirmReadMemcard.java
  15. 8 8
      app/src/main/java/com/epson/memcardacc/ConfirmWriteMemcard.java
  16. 2 2
      app/src/main/java/com/epson/memcardacc/MemCardWriteConvertViewModel.java
  17. 9 9
      app/src/main/java/com/epson/memcardacc/MemcardImageGrid.java
  18. 7 7
      app/src/main/java/com/epson/memcardacc/MemcardReadProgress.java
  19. 3 3
      app/src/main/java/com/epson/memcardacc/MemcardTopSuper.java
  20. 2 2
      app/src/main/java/com/epson/memcardacc/MemcardWriteProgress.java
  21. 4 4
      app/src/main/java/com/epson/mobilephone/common/PrintingLib/define/Constants.java
  22. 1 1
      app/src/main/java/com/epson/mobilephone/common/ble/BleException.java
  23. 7 7
      app/src/main/java/com/epson/mobilephone/common/ble/BleWork.java
  24. 20 20
      app/src/main/java/com/epson/mobilephone/common/ble/BleWorkActivity.java
  25. 9 9
      app/src/main/java/com/epson/mobilephone/common/ble/ProbePrinter.java
  26. 14 14
      app/src/main/java/com/epson/mobilephone/common/escpr/EscprLib.java
  27. 54 54
      app/src/main/java/com/epson/mobilephone/common/escpr/Info_paper.java
  28. 321 321
      app/src/main/java/com/epson/mobilephone/common/escpr/MediaInfo.java
  29. 15 15
      app/src/main/java/com/epson/mobilephone/common/guide/NoticeGuideActivity.java
  30. 3 3
      app/src/main/java/com/epson/mobilephone/common/keyenc/SecureKeyFactory.java
  31. 3 3
      app/src/main/java/com/epson/mobilephone/common/maintain2/BatteryInfo.java
  32. 5 5
      app/src/main/java/com/epson/mobilephone/common/maintain2/BatteryInfoEx.java
  33. 8 8
      app/src/main/java/com/epson/mobilephone/common/usb/UsbPrintDriver.java
  34. 21 21
      app/src/main/java/com/epson/mobilephone/common/usb/UsbPrinter.java
  35. 11 11
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectBase.java
  36. 26 26
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectP2P.java
  37. 20 20
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectSimpleAP.java
  38. 8 8
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityControlWiFi.java
  39. 2 2
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityRequestLocationPermission.java
  40. 3 3
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectBase.java
  41. 6 6
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectManual.java
  42. 2 2
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectStart.java
  43. 53 53
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityiPrintConnect.java
  44. 8 8
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityiPrintConnectStart.java
  45. 2 2
      app/src/main/java/com/epson/mobilephone/common/wifidirect/EventWrapperWiFiDirect.java
  46. 8 8
      app/src/main/java/com/epson/mobilephone/common/wifidirect/FindPrinterTask.java
  47. 4 4
      app/src/main/java/com/epson/mobilephone/common/wifidirect/MacAddrFilter.java
  48. 14 14
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ManageDefaultNetwork.java
  49. 6 6
      app/src/main/java/com/epson/mobilephone/common/wifidirect/NfcTagParser.java
  50. 9 9
      app/src/main/java/com/epson/mobilephone/common/wifidirect/NfcTagUtils.java
  51. 33 33
      app/src/main/java/com/epson/mobilephone/common/wifidirect/SearchWiFiDirectPrinterTask.java
  52. 30 30
      app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiDirectPrinterListUtils.java
  53. 4 4
      app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiNetworkManager.java
  54. 1 1
      app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiScanner.java
  55. 22 22
      app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiUtils.java
  56. 9 9
      app/src/main/java/com/epson/mobilephone/common/wifidirect/WifiP2pUtils.java
  57. 6 6
      app/src/main/java/com/epson/mobilephone/common/wifidirect/escprLib.java
  58. 35 35
      app/src/main/java/epson/common/BMPFile.java
  59. 9 9
      app/src/main/java/epson/common/CustomListRowAdapter.java
  60. 11 11
      app/src/main/java/epson/common/CustomListRowImpl.java
  61. 2 2
      app/src/main/java/epson/common/EventWrapper.java
  62. 2 2
      app/src/main/java/epson/common/ExtType.java
  63. 2 2
      app/src/main/java/epson/common/ExternalFileUtils.java
  64. 39 39
      app/src/main/java/epson/common/Info_paper.java
  65. 2 2
      app/src/main/java/epson/common/MimeType.java
  66. 4 4
      app/src/main/java/epson/common/PrintingLib/define/Constants.java
  67. 21 21
      app/src/main/java/epson/common/ScalableImageView.java
  68. 1 1
      app/src/main/java/epson/common/ble/BleException.java
  69. 7 7
      app/src/main/java/epson/common/ble/BleWork.java
  70. 20 20
      app/src/main/java/epson/common/ble/BleWorkActivity.java
  71. 9 9
      app/src/main/java/epson/common/ble/ProbePrinter.java
  72. 14 14
      app/src/main/java/epson/common/escpr/EscprLib.java
  73. 54 54
      app/src/main/java/epson/common/escpr/Info_paper.java
  74. 321 321
      app/src/main/java/epson/common/escpr/MediaInfo.java
  75. 15 15
      app/src/main/java/epson/common/guide/NoticeGuideActivity.java
  76. 2 2
      app/src/main/java/epson/common/httpclient/BasicNameValuePair.java
  77. 32 32
      app/src/main/java/epson/common/httpclient/IAHttpClient.java
  78. 3 3
      app/src/main/java/epson/common/keyenc/SecureKeyFactory.java
  79. 3 3
      app/src/main/java/epson/common/maintain2/BatteryInfo.java
  80. 5 5
      app/src/main/java/epson/common/maintain2/BatteryInfoEx.java
  81. 8 8
      app/src/main/java/epson/common/usb/UsbPrintDriver.java
  82. 21 21
      app/src/main/java/epson/common/usb/UsbPrinter.java
  83. 11 11
      app/src/main/java/epson/common/wifidirect/ActivityConnectBase.java
  84. 26 26
      app/src/main/java/epson/common/wifidirect/ActivityConnectP2P.java
  85. 20 20
      app/src/main/java/epson/common/wifidirect/ActivityConnectSimpleAP.java
  86. 8 8
      app/src/main/java/epson/common/wifidirect/ActivityControlWiFi.java
  87. 2 2
      app/src/main/java/epson/common/wifidirect/ActivityRequestLocationPermission.java
  88. 3 3
      app/src/main/java/epson/common/wifidirect/ActivityWiFiDirectBase.java
  89. 6 6
      app/src/main/java/epson/common/wifidirect/ActivityWiFiDirectManual.java
  90. 2 2
      app/src/main/java/epson/common/wifidirect/ActivityWiFiDirectStart.java
  91. 53 53
      app/src/main/java/epson/common/wifidirect/ActivityiPrintConnect.java
  92. 8 8
      app/src/main/java/epson/common/wifidirect/ActivityiPrintConnectStart.java
  93. 2 2
      app/src/main/java/epson/common/wifidirect/EventWrapperWiFiDirect.java
  94. 8 8
      app/src/main/java/epson/common/wifidirect/FindPrinterTask.java
  95. 4 4
      app/src/main/java/epson/common/wifidirect/MacAddrFilter.java
  96. 14 14
      app/src/main/java/epson/common/wifidirect/ManageDefaultNetwork.java
  97. 6 6
      app/src/main/java/epson/common/wifidirect/NfcTagParser.java
  98. 9 9
      app/src/main/java/epson/common/wifidirect/NfcTagUtils.java
  99. 33 33
      app/src/main/java/epson/common/wifidirect/SearchWiFiDirectPrinterTask.java
  100. 30 30
      app/src/main/java/epson/common/wifidirect/WiFiDirectPrinterListUtils.java

+ 5 - 5
app/src/main/java/com/epson/cameracopy/p006ui/CameraPreviewFragment.java

@@ -82,7 +82,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
 
 
     public void setAppInitFlag(boolean z) {
     public void setAppInitFlag(boolean z) {
         if (z) {
         if (z) {
-            this.noCameraDialog = true;
+            noCameraDialog = true;
         }
         }
     }
     }
 
 
@@ -101,8 +101,8 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
         } else {
         } else {
             mHasCamera = false;
             mHasCamera = false;
             UiCommon.setButtonEnabled(mPhtographButton, false);
             UiCommon.setButtonEnabled(mPhtographButton, false);
-            if (bundle == null && this.noCameraDialog) {
-                this.noCameraDialog = false;
+            if (bundle == null && noCameraDialog) {
+                noCameraDialog = false;
                 SimpleMessageDialogFragment.newInstance(R.string.back_camera_not_exists_message).show(getFragmentManager(), "error-dialog");
                 SimpleMessageDialogFragment.newInstance(R.string.back_camera_not_exists_message).show(getFragmentManager(), "error-dialog");
             }
             }
         }
         }
@@ -400,11 +400,11 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
             enableAllButton();
             enableAllButton();
         }
         }
         mAutoPhotoMode = mCameraPreviewControl.getAutoPictureMode();
         mAutoPhotoMode = mCameraPreviewControl.getAutoPictureMode();
-        this.isFragmentVisible = true;
+        isFragmentVisible = true;
     }
     }
 
 
     public void onPause() {
     public void onPause() {
-        this.isFragmentVisible = false;
+        isFragmentVisible = false;
         mSensorEventListener.stop();
         mSensorEventListener.stop();
         TakePictureTask takePictureTask = mTakePictureTask;
         TakePictureTask takePictureTask = mTakePictureTask;
         if (takePictureTask != null) {
         if (takePictureTask != null) {

+ 10 - 10
app/src/main/java/com/epson/cameracopy/p006ui/CameraPrintProgress.java

@@ -817,10 +817,10 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
             finish();
             finish();
             return;
             return;
         }
         }
-        this.sheets = arrayList.size();
-        this.isRemotePrinter = MyPrinter.isRemotePrinter(this);
+        sheets = arrayList.size();
+        isRemotePrinter = MyPrinter.isRemotePrinter(this);
         setContentView(R.layout.progress_layout);
         setContentView(R.layout.progress_layout);
-        this.context = this;
+        context = this;
         mProgressPercent = (ProgressBar) findViewById(R.id.progress_percent);
         mProgressPercent = (ProgressBar) findViewById(R.id.progress_percent);
         mPercent = (TextView) findViewById(R.id.percent);
         mPercent = (TextView) findViewById(R.id.percent);
         mProgressCopies = (ProgressBar) findViewById(R.id.progress_copies);
         mProgressCopies = (ProgressBar) findViewById(R.id.progress_copies);
@@ -829,19 +829,19 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         mProgressPage = (ProgressBar) findViewById(R.id.progress_page);
         mProgressPage = (ProgressBar) findViewById(R.id.progress_page);
         if (this.sheets > 1) {
         if (this.sheets > 1) {
             TextView textView = mPage;
             TextView textView = mPage;
-            textView.setText(getString(R.string.page) + ": " + this.curSheet + CommonDefine.SLASH + this.sheets);
-            mProgressPage.setProgress((this.curSheet * 100) / this.sheets);
+            textView.setText(getString(R.string.page) + ": " + curSheet + CommonDefine.SLASH + sheets);
+            mProgressPage.setProgress((this.curSheet * 100) / sheets);
         } else {
         } else {
             mProgressPage.setVisibility(4);
             mProgressPage.setVisibility(4);
             mPage.setVisibility(4);
             mPage.setVisibility(4);
         }
         }
-        if (copies <= 1 || this.isRemotePrinter) {
+        if (copies <= 1 || isRemotePrinter) {
             mProgressCopies.setVisibility(4);
             mProgressCopies.setVisibility(4);
             mCopies.setVisibility(4);
             mCopies.setVisibility(4);
             copies = 1;
             copies = 1;
         } else {
         } else {
             TextView textView2 = mCopies;
             TextView textView2 = mCopies;
-            textView2.setText(getString(R.string.copies) + ": " + this.curCopy + CommonDefine.SLASH + copies);
+            textView2.setText(getString(R.string.copies) + ": " + curCopy + CommonDefine.SLASH + copies);
             mProgressCopies.setProgress((this.curCopy * 100) / copies);
             mProgressCopies.setProgress((this.curCopy * 100) / copies);
         }
         }
         mCancelButton = (Button) findViewById(R.id.cancel_button);
         mCancelButton = (Button) findViewById(R.id.cancel_button);
@@ -850,11 +850,11 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 CameraPrintProgress.this.CancelPrint();
                 CameraPrintProgress.this.CancelPrint();
             }
             }
         });
         });
-        this.bSearching = false;
+        bSearching = false;
         if (this.isRemotePrinter) {
         if (this.isRemotePrinter) {
-            this.percentString = getString(R.string.epsonconnect_str_remote_print_file_uploading);
+            percentString = getString(R.string.epsonconnect_str_remote_print_file_uploading);
         } else {
         } else {
-            this.percentString = getString(R.string.printing);
+            percentString = getString(R.string.printing);
         }
         }
         TextView textView3 = mPercent;
         TextView textView3 = mPercent;
         textView3.setText(this.percentString + "         0%");
         textView3.setText(this.percentString + "         0%");

+ 220 - 220
app/src/main/java/com/epson/cameracopy/p006ui/CameraPrintSettingActivity.java

@@ -1683,45 +1683,45 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         bindEpsonService();
         bindEpsonService();
         mContext = this;
         mContext = this;
         mRemoteSrcType = 2;
         mRemoteSrcType = 2;
-        this.isDocumentSetting = getIntent().getBooleanExtra(PrintProgress.PARAM_DOCUMENT_MODE, false);
+        isDocumentSetting = getIntent().getBooleanExtra(PrintProgress.PARAM_DOCUMENT_MODE, false);
         if (this.isDocumentSetting) {
         if (this.isDocumentSetting) {
-            this.sheets = getIntent().getIntExtra("SHEETS", 1);
-            this.disablePrintArea = getIntent().getBooleanExtra("PRINTAREA", false);
+            sheets = getIntent().getIntExtra("SHEETS", 1);
+            disablePrintArea = getIntent().getBooleanExtra("PRINTAREA", false);
             mRemoteSrcType = 1;
             mRemoteSrcType = 1;
         }
         }
-        this.sheets = 1;
+        sheets = 1;
         mRemoteSrcType = 2;
         mRemoteSrcType = 2;
-        this.printerName = (TextView) findViewById(R.id.printer_name);
-        this.paperSizeInfo = (TextView) findViewById(R.id.paper_size_info);
-        this.paperTypeInfo = (TextView) findViewById(R.id.paper_type_info);
-        this.layoutInfo = (TextView) findViewById(R.id.layout_info);
-        this.qualityInfo = (TextView) findViewById(R.id.quality_info);
-        this.paperSourceInfo = (TextView) findViewById(R.id.paper_source_info);
-        this.copies = (TextView) findViewById(R.id.copies);
-        this.copiesMinus = (Button) findViewById(R.id.copies_minus_button);
-        this.copiesPlus = (Button) findViewById(R.id.copies_plus_button);
+        printerName = (TextView) findViewById(R.id.printer_name);
+        paperSizeInfo = (TextView) findViewById(R.id.paper_size_info);
+        paperTypeInfo = (TextView) findViewById(R.id.paper_type_info);
+        layoutInfo = (TextView) findViewById(R.id.layout_info);
+        qualityInfo = (TextView) findViewById(R.id.quality_info);
+        paperSourceInfo = (TextView) findViewById(R.id.paper_source_info);
+        copies = (TextView) findViewById(R.id.copies);
+        copiesMinus = (Button) findViewById(R.id.copies_minus_button);
+        copiesPlus = (Button) findViewById(R.id.copies_plus_button);
         LongTapRepeatAdapter.bless(this.copiesMinus);
         LongTapRepeatAdapter.bless(this.copiesMinus);
         LongTapRepeatAdapter.bless(this.copiesPlus);
         LongTapRepeatAdapter.bless(this.copiesPlus);
-        this.colorInfo = (TextView) findViewById(R.id.color_info);
-        this.duplexInfo = (TextView) findViewById(R.id.duplex_info);
-        this.feedDirectionInfo = (TextView) findViewById(R.id.feed_direction_info);
-        this.printDateInfo = (TextView) findViewById(R.id.printdate_info);
-        this.brightness = (TextView) findViewById(R.id.brightness);
-        this.brightnessMinus = (Button) findViewById(R.id.brightness_minus_button);
-        this.brightnessPlus = (Button) findViewById(R.id.brightness_plus_button);
-        this.contrast = (TextView) findViewById(R.id.contrast);
-        this.contrastMinus = (Button) findViewById(R.id.contrast_minus_button);
-        this.contrastPlus = (Button) findViewById(R.id.contrast_plus_button);
-        this.saturation = (TextView) findViewById(R.id.saturation);
-        this.saturationMinus = (Button) findViewById(R.id.saturation_minus_button);
-        this.saturationPlus = (Button) findViewById(R.id.saturation_plus_button);
-        this.progressGetOption = findViewById(R.id.progressGetOption);
-        this.enableShowPreview = getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0).getBoolean(Constants.ENABLE_SHOW_PREVIEW, true);
+        colorInfo = (TextView) findViewById(R.id.color_info);
+        duplexInfo = (TextView) findViewById(R.id.duplex_info);
+        feedDirectionInfo = (TextView) findViewById(R.id.feed_direction_info);
+        printDateInfo = (TextView) findViewById(R.id.printdate_info);
+        brightness = (TextView) findViewById(R.id.brightness);
+        brightnessMinus = (Button) findViewById(R.id.brightness_minus_button);
+        brightnessPlus = (Button) findViewById(R.id.brightness_plus_button);
+        contrast = (TextView) findViewById(R.id.contrast);
+        contrastMinus = (Button) findViewById(R.id.contrast_minus_button);
+        contrastPlus = (Button) findViewById(R.id.contrast_plus_button);
+        saturation = (TextView) findViewById(R.id.saturation);
+        saturationMinus = (Button) findViewById(R.id.saturation_minus_button);
+        saturationPlus = (Button) findViewById(R.id.saturation_plus_button);
+        progressGetOption = findViewById(R.id.progressGetOption);
+        enableShowPreview = getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0).getBoolean(Constants.ENABLE_SHOW_PREVIEW, true);
         loadConfig();
         loadConfig();
         setClickListener();
         setClickListener();
         updatePrinterIcon();
         updatePrinterIcon();
         if (this.printerId != null) {
         if (this.printerId != null) {
-            this.undoFlag = false;
+            undoFlag = false;
             if (loadSupportedMediaFile()) {
             if (loadSupportedMediaFile()) {
                 mHandler.sendEmptyMessage(1);
                 mHandler.sendEmptyMessage(1);
             } else {
             } else {
@@ -1754,14 +1754,14 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     }
     }
 
 
     private void setClickListener() {
     private void setClickListener() {
-        this.copiesMinus.setOnClickListener(this);
-        this.copiesPlus.setOnClickListener(this);
-        this.brightnessMinus.setOnClickListener(this);
-        this.brightnessPlus.setOnClickListener(this);
-        this.contrastMinus.setOnClickListener(this);
-        this.contrastPlus.setOnClickListener(this);
-        this.saturationMinus.setOnClickListener(this);
-        this.saturationPlus.setOnClickListener(this);
+        copiesMinus.setOnClickListener(this);
+        copiesPlus.setOnClickListener(this);
+        brightnessMinus.setOnClickListener(this);
+        brightnessPlus.setOnClickListener(this);
+        contrastMinus.setOnClickListener(this);
+        contrastPlus.setOnClickListener(this);
+        saturationMinus.setOnClickListener(this);
+        saturationPlus.setOnClickListener(this);
         if (this.isDocumentSetting) {
         if (this.isDocumentSetting) {
             findViewById(R.id.page_range_setting).setOnClickListener(this);
             findViewById(R.id.page_range_setting).setOnClickListener(this);
         }
         }
@@ -1780,79 +1780,79 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     private void loadConfig() {
     private void loadConfig() {
         MyPrinter curPrinter = MyPrinter.getCurPrinter(this);
         MyPrinter curPrinter = MyPrinter.getCurPrinter(this);
         if (curPrinter == null || curPrinter.getName() == null) {
         if (curPrinter == null || curPrinter.getName() == null) {
-            this.printerName.setText(getString(R.string.str_lbl_title_scan));
+            printerName.setText(getString(R.string.str_lbl_title_scan));
         } else {
         } else {
-            this.printerName.setText(curPrinter.getUserDefName(this));
+            printerName.setText(curPrinter.getUserDefName(this));
         }
         }
-        this.printerDeviceId = curPrinter.getName();
-        this.printerId = curPrinter.getPrinterId();
-        this.printerIp = curPrinter.getIp();
-        this.printerSerialNo = curPrinter.getSerialNo();
-        this.printerEmailAddress = curPrinter.getEmailAddress();
-        this.printerLocation = curPrinter.getLocation();
+        printerDeviceId = curPrinter.getName();
+        printerId = curPrinter.getPrinterId();
+        printerIp = curPrinter.getIp();
+        printerSerialNo = curPrinter.getSerialNo();
+        printerEmailAddress = curPrinter.getEmailAddress();
+        printerLocation = curPrinter.getLocation();
         boolean z = true;
         boolean z = true;
         if (this.printerLocation == 0) {
         if (this.printerLocation == 0) {
-            this.printerLocation = 1;
+            printerLocation = 1;
         }
         }
-        this.autoConnectSsid = WiFiDirectManager.getConnectInfo(this, WiFiDirectManager.DEVICE_TYPE_PRINTER);
+        autoConnectSsid = WiFiDirectManager.getConnectInfo(this, WiFiDirectManager.DEVICE_TYPE_PRINTER);
         PrintSetting printSetting = new PrintSetting(this, PrintSetting.Kind.cameracopy);
         PrintSetting printSetting = new PrintSetting(this, PrintSetting.Kind.cameracopy);
         printSetting.loadSettings();
         printSetting.loadSettings();
         mLookupTable = new MediaInfo.PaperSize();
         mLookupTable = new MediaInfo.PaperSize();
-        this.paperSize = printSetting.paperSizeValue;
-        this.paperSizeInfo.setText(getString(mLookupTable.getStringId(this.paperSize)));
+        paperSize = printSetting.paperSizeValue;
+        paperSizeInfo.setText(getString(mLookupTable.getStringId(this.paperSize)));
         mLookupTable.destructor();
         mLookupTable.destructor();
         mLookupTable = new MediaInfo.PaperType();
         mLookupTable = new MediaInfo.PaperType();
-        this.paperType = printSetting.paperTypeValue;
-        this.paperTypeInfo.setText(getString(mLookupTable.getStringId(this.paperType)));
+        paperType = printSetting.paperTypeValue;
+        paperTypeInfo.setText(getString(mLookupTable.getStringId(this.paperType)));
         mLookupTable.destructor();
         mLookupTable.destructor();
         mPaperSizeType = printSetting.loadPaperSizeTypePear();
         mPaperSizeType = printSetting.loadPaperSizeTypePear();
-        mPaperSizeType.putID(this.paperSize, this.paperType);
+        mPaperSizeType.putID(this.paperSize, paperType);
         mLookupTable = new MediaInfo.Layout();
         mLookupTable = new MediaInfo.Layout();
-        this.layout = printSetting.layoutValue;
-        this.layoutInfo.setText(getString(mLookupTable.getStringId(this.layout)));
+        layout = printSetting.layoutValue;
+        layoutInfo.setText(getString(mLookupTable.getStringId(this.layout)));
         mLookupTable.destructor();
         mLookupTable.destructor();
         mLookupTable = new MediaInfo.Quality();
         mLookupTable = new MediaInfo.Quality();
-        this.quality = printSetting.qualityValue;
-        this.qualityInfo.setText(getString(mLookupTable.getStringId(this.quality)));
+        quality = printSetting.qualityValue;
+        qualityInfo.setText(getString(mLookupTable.getStringId(this.quality)));
         mLookupTable.destructor();
         mLookupTable.destructor();
         mLookupTable = new MediaInfo.PaperSource();
         mLookupTable = new MediaInfo.PaperSource();
-        this.paperSource = printSetting.paperSourceValue;
-        this.paperSourceInfo.setText(getString(mLookupTable.getStringId(this.paperSource)));
+        paperSource = printSetting.paperSourceValue;
+        paperSourceInfo.setText(getString(mLookupTable.getStringId(this.paperSource)));
         mLookupTable.destructor();
         mLookupTable.destructor();
         mLookupTable = new MediaInfo.Color();
         mLookupTable = new MediaInfo.Color();
-        this.color = printSetting.colorValue;
-        this.colorInfo.setText(getString(mLookupTable.getStringId(this.color)));
+        color = printSetting.colorValue;
+        colorInfo.setText(getString(mLookupTable.getStringId(this.color)));
         mLookupTable.destructor();
         mLookupTable.destructor();
-        this.copiesValue = printSetting.copiesValue;
-        this.copies.setText(String.valueOf(this.copiesValue));
-        this.copiesMinus.setEnabled(this.copiesValue != 1);
-        Button button = this.copiesPlus;
+        copiesValue = printSetting.copiesValue;
+        copies.setText(String.valueOf(this.copiesValue));
+        copiesMinus.setEnabled(this.copiesValue != 1);
+        Button button = copiesPlus;
         if (this.copiesValue == 30) {
         if (this.copiesValue == 30) {
             z = false;
             z = false;
         }
         }
         button.setEnabled(z);
         button.setEnabled(z);
-        this.brightnessValue = printSetting.brightnessValue;
-        this.contrastValue = printSetting.contrastValue;
-        this.saturationValue = printSetting.saturationValue;
+        brightnessValue = printSetting.brightnessValue;
+        contrastValue = printSetting.contrastValue;
+        saturationValue = printSetting.saturationValue;
         mLookupTable = new MediaInfo.Duplex();
         mLookupTable = new MediaInfo.Duplex();
-        this.duplex = printSetting.duplexValue;
-        this.duplexInfo.setText(getString(mLookupTable.getStringId(this.duplex)));
+        duplex = printSetting.duplexValue;
+        duplexInfo.setText(getString(mLookupTable.getStringId(this.duplex)));
         mLookupTable.destructor();
         mLookupTable.destructor();
         mLookupTable = new MediaInfo.FeedDirection();
         mLookupTable = new MediaInfo.FeedDirection();
-        this.feedDirection = printSetting.feedDirectionValue;
-        this.feedDirectionInfo.setText(getString(mLookupTable.getStringId(this.feedDirection)));
+        feedDirection = printSetting.feedDirectionValue;
+        feedDirectionInfo.setText(getString(mLookupTable.getStringId(this.feedDirection)));
         mLookupTable.destructor();
         mLookupTable.destructor();
-        this.lang = curPrinter.getLang();
+        lang = curPrinter.getLang();
         if (this.isDocumentSetting) {
         if (this.isDocumentSetting) {
-            this.printAll = printSetting.printAll;
-            this.startValue = printSetting.startValue;
-            this.endValue = printSetting.endValue;
-            ((TextView) findViewById(R.id.page_range_value)).setText(this.startValue + ".." + this.endValue);
+            printAll = printSetting.printAll;
+            startValue = printSetting.startValue;
+            endValue = printSetting.endValue;
+            ((TextView) findViewById(R.id.page_range_value)).setText(this.startValue + ".." + endValue);
             return;
             return;
         }
         }
         mLookupTable = new MediaInfo.PrintDate();
         mLookupTable = new MediaInfo.PrintDate();
-        this.printdate = printSetting.printdate;
-        this.printDateInfo.setText(getString(mLookupTable.getStringId(this.printdate)));
+        printdate = printSetting.printdate;
+        printDateInfo.setText(getString(mLookupTable.getStringId(this.printdate)));
         mLookupTable.destructor();
         mLookupTable.destructor();
     }
     }
 
 
@@ -1949,7 +1949,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
             Utils.copyFile(supportedMedia, savedSupportedMedia);
             Utils.copyFile(supportedMedia, savedSupportedMedia);
             File areaInfo = instance.getAreaInfo();
             File areaInfo = instance.getAreaInfo();
             File savedAreaInfo = instance.getSavedAreaInfo();
             File savedAreaInfo = instance.getSavedAreaInfo();
-            int i = this.printerLocation;
+            int i = printerLocation;
             if (i == 1 || i == 3) {
             if (i == 1 || i == 3) {
                 try {
                 try {
                     if (!areaInfo.exists()) {
                     if (!areaInfo.exists()) {
@@ -1976,37 +1976,37 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         SharedPreferences.Editor edit = getSharedPreferences("PrintSetting", 0).edit();
         SharedPreferences.Editor edit = getSharedPreferences("PrintSetting", 0).edit();
         edit.putInt(Constants.PREFS_INFO_PRINT_SAVE, 1);
         edit.putInt(Constants.PREFS_INFO_PRINT_SAVE, 1);
         edit.commit();
         edit.commit();
-        MyPrinter myPrinter = new MyPrinter(this.printerDeviceId, this.printerIp, this.printerId, this.printerSerialNo, this.printerEmailAddress, this.printerLocation);
+        MyPrinter myPrinter = new MyPrinter(this.printerDeviceId, printerIp, printerId, printerSerialNo, printerEmailAddress, printerLocation);
         myPrinter.setLang(this.lang);
         myPrinter.setLang(this.lang);
         myPrinter.setCurPrinter(this);
         myPrinter.setCurPrinter(this);
         PrintSetting printSetting = new PrintSetting(this, PrintSetting.Kind.cameracopy);
         PrintSetting printSetting = new PrintSetting(this, PrintSetting.Kind.cameracopy);
-        printSetting.paperSizeValue = this.paperSize;
-        printSetting.paperTypeValue = this.paperType;
-        printSetting.layoutValue = this.layout;
-        printSetting.qualityValue = this.quality;
-        printSetting.paperSourceValue = this.paperSource;
-        printSetting.colorValue = this.color;
-        printSetting.duplexValue = this.duplex;
-        printSetting.feedDirectionValue = this.feedDirection;
-        printSetting.copiesValue = this.copiesValue;
-        printSetting.brightnessValue = this.brightnessValue;
-        printSetting.contrastValue = this.contrastValue;
-        printSetting.saturationValue = this.saturationValue;
+        printSetting.paperSizeValue = paperSize;
+        printSetting.paperTypeValue = paperType;
+        printSetting.layoutValue = layout;
+        printSetting.qualityValue = quality;
+        printSetting.paperSourceValue = paperSource;
+        printSetting.colorValue = color;
+        printSetting.duplexValue = duplex;
+        printSetting.feedDirectionValue = feedDirection;
+        printSetting.copiesValue = copiesValue;
+        printSetting.brightnessValue = brightnessValue;
+        printSetting.contrastValue = contrastValue;
+        printSetting.saturationValue = saturationValue;
         if (this.isDocumentSetting) {
         if (this.isDocumentSetting) {
-            printSetting.printAll = this.printAll;
-            printSetting.startValue = this.startValue;
-            printSetting.endValue = this.endValue;
+            printSetting.printAll = printAll;
+            printSetting.startValue = startValue;
+            printSetting.endValue = endValue;
         } else {
         } else {
-            printSetting.printdate = this.printdate;
+            printSetting.printdate = printdate;
         }
         }
         printSetting.saveSettings();
         printSetting.saveSettings();
         printSetting.savePaperSizeTypePear((MediaInfo.PaperSizeType) mPaperSizeType);
         printSetting.savePaperSizeTypePear((MediaInfo.PaperSizeType) mPaperSizeType);
         saveSupportedMediaFile();
         saveSupportedMediaFile();
-        String str = this.autoConnectSsid;
+        String str = autoConnectSsid;
         if (str == null || str.length() <= 0) {
         if (str == null || str.length() <= 0) {
             WiFiDirectManager.resetConnectInfo(this, WiFiDirectManager.DEVICE_TYPE_PRINTER);
             WiFiDirectManager.resetConnectInfo(this, WiFiDirectManager.DEVICE_TYPE_PRINTER);
         } else {
         } else {
-            WiFiDirectManager.setConnectInfo(this, this.autoConnectSsid, WiFiDirectManager.DEVICE_TYPE_PRINTER, myPrinter.getName());
+            WiFiDirectManager.setConnectInfo(this, autoConnectSsid, WiFiDirectManager.DEVICE_TYPE_PRINTER, myPrinter.getName());
         }
         }
         EPPrinterManager ePPrinterManager = new EPPrinterManager(mContext);
         EPPrinterManager ePPrinterManager = new EPPrinterManager(mContext);
         ePPrinterManager.commitIPPrinterInfo();
         ePPrinterManager.commitIPPrinterInfo();
@@ -2056,73 +2056,73 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
             }
             }
             switch (view.getId()) {
             switch (view.getId()) {
                 case R.id.brightness_minus_button /*2131230848*/:
                 case R.id.brightness_minus_button /*2131230848*/:
-                    this.brightnessValue--;
+                    brightnessValue--;
                     if (this.brightnessValue <= -50) {
                     if (this.brightnessValue <= -50) {
-                        this.brightnessValue = -50;
-                        this.brightnessMinus.setEnabled(false);
+                        brightnessValue = -50;
+                        brightnessMinus.setEnabled(false);
                     } else {
                     } else {
-                        this.brightnessMinus.setEnabled(true);
+                        brightnessMinus.setEnabled(true);
                     }
                     }
-                    this.brightnessPlus.setEnabled(true);
-                    this.brightness.setText(String.valueOf(this.brightnessValue));
+                    brightnessPlus.setEnabled(true);
+                    brightness.setText(String.valueOf(this.brightnessValue));
                     return;
                     return;
                 case R.id.brightness_plus_button /*2131230850*/:
                 case R.id.brightness_plus_button /*2131230850*/:
-                    this.brightnessValue++;
+                    brightnessValue++;
                     if (this.brightnessValue >= 50) {
                     if (this.brightnessValue >= 50) {
-                        this.brightnessValue = 50;
-                        this.brightnessPlus.setEnabled(false);
+                        brightnessValue = 50;
+                        brightnessPlus.setEnabled(false);
                     } else {
                     } else {
-                        this.brightnessPlus.setEnabled(true);
+                        brightnessPlus.setEnabled(true);
                     }
                     }
-                    this.brightnessMinus.setEnabled(true);
-                    this.brightness.setText(String.valueOf(this.brightnessValue));
+                    brightnessMinus.setEnabled(true);
+                    brightness.setText(String.valueOf(this.brightnessValue));
                     return;
                     return;
                 case R.id.color /*2131230930*/:
                 case R.id.color /*2131230930*/:
                     launchDetailScreen(this.color, R.id.color);
                     launchDetailScreen(this.color, R.id.color);
                     return;
                     return;
                 case R.id.contrast_minus_button /*2131230942*/:
                 case R.id.contrast_minus_button /*2131230942*/:
-                    this.contrastValue--;
+                    contrastValue--;
                     if (this.contrastValue <= -50) {
                     if (this.contrastValue <= -50) {
-                        this.contrastValue = -50;
-                        this.contrastMinus.setEnabled(false);
+                        contrastValue = -50;
+                        contrastMinus.setEnabled(false);
                     } else {
                     } else {
-                        this.contrastMinus.setEnabled(true);
+                        contrastMinus.setEnabled(true);
                     }
                     }
-                    this.contrastPlus.setEnabled(true);
-                    this.contrast.setText(String.valueOf(this.contrastValue));
+                    contrastPlus.setEnabled(true);
+                    contrast.setText(String.valueOf(this.contrastValue));
                     return;
                     return;
                 case R.id.contrast_plus_button /*2131230943*/:
                 case R.id.contrast_plus_button /*2131230943*/:
-                    this.contrastValue++;
+                    contrastValue++;
                     if (this.contrastValue >= 50) {
                     if (this.contrastValue >= 50) {
-                        this.contrastValue = 50;
-                        this.contrastPlus.setEnabled(false);
+                        contrastValue = 50;
+                        contrastPlus.setEnabled(false);
                     } else {
                     } else {
-                        this.contrastPlus.setEnabled(true);
+                        contrastPlus.setEnabled(true);
                     }
                     }
-                    this.contrastMinus.setEnabled(true);
-                    this.contrast.setText(String.valueOf(this.contrastValue));
+                    contrastMinus.setEnabled(true);
+                    contrast.setText(String.valueOf(this.contrastValue));
                     return;
                     return;
                 case R.id.copies_minus_button /*2131230945*/:
                 case R.id.copies_minus_button /*2131230945*/:
-                    this.copiesValue--;
+                    copiesValue--;
                     if (this.copiesValue <= 1) {
                     if (this.copiesValue <= 1) {
-                        this.copiesValue = 1;
-                        this.copiesMinus.setEnabled(false);
+                        copiesValue = 1;
+                        copiesMinus.setEnabled(false);
                     } else {
                     } else {
-                        this.copiesMinus.setEnabled(true);
+                        copiesMinus.setEnabled(true);
                     }
                     }
-                    this.copiesPlus.setEnabled(true);
-                    this.copies.setText(String.valueOf(this.copiesValue));
+                    copiesPlus.setEnabled(true);
+                    copies.setText(String.valueOf(this.copiesValue));
                     return;
                     return;
                 case R.id.copies_plus_button /*2131230946*/:
                 case R.id.copies_plus_button /*2131230946*/:
-                    this.copiesValue++;
+                    copiesValue++;
                     if (this.copiesValue >= 30) {
                     if (this.copiesValue >= 30) {
-                        this.copiesValue = 30;
-                        this.copiesPlus.setEnabled(false);
+                        copiesValue = 30;
+                        copiesPlus.setEnabled(false);
                     } else {
                     } else {
-                        this.copiesPlus.setEnabled(true);
+                        copiesPlus.setEnabled(true);
                     }
                     }
-                    this.copiesMinus.setEnabled(true);
-                    this.copies.setText(String.valueOf(this.copiesValue));
+                    copiesMinus.setEnabled(true);
+                    copies.setText(String.valueOf(this.copiesValue));
                     return;
                     return;
                 case R.id.duplex /*2131231005*/:
                 case R.id.duplex /*2131231005*/:
                     launchDetailScreen(this.duplex, R.id.duplex);
                     launchDetailScreen(this.duplex, R.id.duplex);
@@ -2135,18 +2135,18 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     return;
                     return;
                 case R.id.page_range_setting /*2131231300*/:
                 case R.id.page_range_setting /*2131231300*/:
                     Intent intent = new Intent(this, PageRangeSetting.class);
                     Intent intent = new Intent(this, PageRangeSetting.class);
-                    intent.putExtra("SHEETS", this.sheets);
-                    intent.putExtra("printAll", this.printAll);
-                    intent.putExtra("startValue", this.startValue);
-                    intent.putExtra("endValue", this.endValue);
+                    intent.putExtra("SHEETS", sheets);
+                    intent.putExtra("printAll", printAll);
+                    intent.putExtra("startValue", startValue);
+                    intent.putExtra("endValue", endValue);
                     startActivityForResult(intent, 2);
                     startActivityForResult(intent, 2);
                     return;
                     return;
                 case R.id.paper_size /*2131231306*/:
                 case R.id.paper_size /*2131231306*/:
                     launchDetailScreen(this.paperSize, R.id.paper_size);
                     launchDetailScreen(this.paperSize, R.id.paper_size);
                     return;
                     return;
                 case R.id.paper_source /*2131231311*/:
                 case R.id.paper_source /*2131231311*/:
-                    int i = this.paperSource;
-                    int[] iArr = this.paper_source_info;
+                    int i = paperSource;
+                    int[] iArr = paper_source_info;
                     if (iArr != null && iArr.length <= 1) {
                     if (iArr != null && iArr.length <= 1) {
                         i = 128;
                         i = 128;
                     }
                     }
@@ -2191,26 +2191,26 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     launchDetailScreen(this.quality, R.id.quality);
                     launchDetailScreen(this.quality, R.id.quality);
                     return;
                     return;
                 case R.id.saturation_minus_button /*2131231425*/:
                 case R.id.saturation_minus_button /*2131231425*/:
-                    this.saturationValue--;
+                    saturationValue--;
                     if (this.saturationValue <= -50) {
                     if (this.saturationValue <= -50) {
-                        this.saturationValue = -50;
-                        this.saturationMinus.setEnabled(false);
+                        saturationValue = -50;
+                        saturationMinus.setEnabled(false);
                     } else {
                     } else {
-                        this.saturationMinus.setEnabled(true);
+                        saturationMinus.setEnabled(true);
                     }
                     }
-                    this.saturationPlus.setEnabled(true);
-                    this.saturation.setText(String.valueOf(this.saturationValue));
+                    saturationPlus.setEnabled(true);
+                    saturation.setText(String.valueOf(this.saturationValue));
                     return;
                     return;
                 case R.id.saturation_plus_button /*2131231426*/:
                 case R.id.saturation_plus_button /*2131231426*/:
-                    this.saturationValue++;
+                    saturationValue++;
                     if (this.saturationValue >= 50) {
                     if (this.saturationValue >= 50) {
-                        this.saturationValue = 50;
-                        this.saturationPlus.setEnabled(false);
+                        saturationValue = 50;
+                        saturationPlus.setEnabled(false);
                     } else {
                     } else {
-                        this.saturationPlus.setEnabled(true);
+                        saturationPlus.setEnabled(true);
                     }
                     }
-                    this.saturationMinus.setEnabled(true);
-                    this.saturation.setText(String.valueOf(this.saturationValue));
+                    saturationMinus.setEnabled(true);
+                    saturation.setText(String.valueOf(this.saturationValue));
                     return;
                     return;
                 default:
                 default:
                     return;
                     return;
@@ -2222,32 +2222,32 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         Intent intent = new Intent(this, PrinterInfoDetail.class);
         Intent intent = new Intent(this, PrinterInfoDetail.class);
         Bundle bundle = new Bundle();
         Bundle bundle = new Bundle();
         bundle.putInt("ID", i2);
         bundle.putInt("ID", i2);
-        bundle.putInt("sizeIndex", this.sizeIndex);
-        bundle.putInt("typeIndex", this.typeIndex);
+        bundle.putInt("sizeIndex", sizeIndex);
+        bundle.putInt("typeIndex", typeIndex);
         bundle.putInt("curValue", i);
         bundle.putInt("curValue", i);
-        bundle.putBoolean("isDocumentSetting", this.isDocumentSetting);
+        bundle.putBoolean("isDocumentSetting", isDocumentSetting);
         switch (i2) {
         switch (i2) {
             case R.id.color /*2131230930*/:
             case R.id.color /*2131230930*/:
-                bundle.putIntArray(Constants.COLOR_INFO, this.color_info);
+                bundle.putIntArray(Constants.COLOR_INFO, color_info);
                 break;
                 break;
             case R.id.duplex /*2131231005*/:
             case R.id.duplex /*2131231005*/:
-                bundle.putIntArray(Constants.DUPLEX_INFO, this.duplex_info);
+                bundle.putIntArray(Constants.DUPLEX_INFO, duplex_info);
                 break;
                 break;
             case R.id.layout /*2131231158*/:
             case R.id.layout /*2131231158*/:
-                bundle.putIntArray(Constants.LAYOUT_INFO, this.layout_info);
+                bundle.putIntArray(Constants.LAYOUT_INFO, layout_info);
                 break;
                 break;
             case R.id.paper_size /*2131231306*/:
             case R.id.paper_size /*2131231306*/:
-                bundle.putIntArray(Constants.PAPER_SIZE_INFO, this.paper_size_info);
+                bundle.putIntArray(Constants.PAPER_SIZE_INFO, paper_size_info);
                 break;
                 break;
             case R.id.paper_source /*2131231311*/:
             case R.id.paper_source /*2131231311*/:
-                int[] iArr = this.paper_source_info;
-                bundle.putIntArray(Constants.PAPER_SOURCE_INFO, (iArr == null || iArr.length > 1) ? this.paper_source_info : new int[]{128});
+                int[] iArr = paper_source_info;
+                bundle.putIntArray(Constants.PAPER_SOURCE_INFO, (iArr == null || iArr.length > 1) ? paper_source_info : new int[]{128});
                 break;
                 break;
             case R.id.paper_type /*2131231314*/:
             case R.id.paper_type /*2131231314*/:
-                bundle.putIntArray(Constants.PAPER_TYPE_INFO, this.paper_type_info);
+                bundle.putIntArray(Constants.PAPER_TYPE_INFO, paper_type_info);
                 break;
                 break;
             case R.id.quality /*2131231392*/:
             case R.id.quality /*2131231392*/:
-                bundle.putIntArray(Constants.PRINT_QUALITY_INFO, this.quality_info);
+                bundle.putIntArray(Constants.PRINT_QUALITY_INFO, quality_info);
                 break;
                 break;
         }
         }
         intent.putExtras(bundle);
         intent.putExtras(bundle);
@@ -2266,79 +2266,79 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                         switch (intent.getExtras().getInt("ID")) {
                         switch (intent.getExtras().getInt("ID")) {
                             case R.id.color /*2131230930*/:
                             case R.id.color /*2131230930*/:
                                 mLookupTable = new MediaInfo.Color();
                                 mLookupTable = new MediaInfo.Color();
-                                this.colorInfo.setText(getString(mLookupTable.getStringId(i3)));
+                                colorInfo.setText(getString(mLookupTable.getStringId(i3)));
                                 mLookupTable.destructor();
                                 mLookupTable.destructor();
-                                this.color = i3;
+                                color = i3;
                                 break;
                                 break;
                             case R.id.duplex /*2131231005*/:
                             case R.id.duplex /*2131231005*/:
                                 mLookupTable = new MediaInfo.Duplex();
                                 mLookupTable = new MediaInfo.Duplex();
-                                this.duplexInfo.setText(getString(mLookupTable.getStringId(i3)));
+                                duplexInfo.setText(getString(mLookupTable.getStringId(i3)));
                                 mLookupTable.destructor();
                                 mLookupTable.destructor();
-                                this.duplex = i3;
+                                duplex = i3;
                                 break;
                                 break;
                             case R.id.feed_direction /*2131231037*/:
                             case R.id.feed_direction /*2131231037*/:
                                 mLookupTable = new MediaInfo.FeedDirection();
                                 mLookupTable = new MediaInfo.FeedDirection();
-                                this.feedDirectionInfo.setText(getString(mLookupTable.getStringId(i3)));
+                                feedDirectionInfo.setText(getString(mLookupTable.getStringId(i3)));
                                 mLookupTable.destructor();
                                 mLookupTable.destructor();
-                                this.feedDirection = i3;
+                                feedDirection = i3;
                                 break;
                                 break;
                             case R.id.layout /*2131231158*/:
                             case R.id.layout /*2131231158*/:
                                 mLookupTable = new MediaInfo.Layout();
                                 mLookupTable = new MediaInfo.Layout();
-                                this.layoutInfo.setText(getString(mLookupTable.getStringId(i3)));
+                                layoutInfo.setText(getString(mLookupTable.getStringId(i3)));
                                 mLookupTable.destructor();
                                 mLookupTable.destructor();
-                                this.layout = i3;
-                                this.undoFlag = false;
+                                layout = i3;
+                                undoFlag = false;
                                 mHandler.sendEmptyMessage(32);
                                 mHandler.sendEmptyMessage(32);
                                 break;
                                 break;
                             case R.id.paper_size /*2131231306*/:
                             case R.id.paper_size /*2131231306*/:
-                                this.sizeIndex = intent.getExtras().getInt("INDEX");
+                                sizeIndex = intent.getExtras().getInt("INDEX");
                                 mLookupTable = new MediaInfo.PaperSize();
                                 mLookupTable = new MediaInfo.PaperSize();
-                                this.paperSizeInfo.setText(getString(mLookupTable.getStringId(i3)));
+                                paperSizeInfo.setText(getString(mLookupTable.getStringId(i3)));
                                 mLookupTable.destructor();
                                 mLookupTable.destructor();
-                                this.paperSize = i3;
-                                this.paperType = mPaperSizeType.getID(this.paperSize);
-                                this.undoFlag = false;
+                                paperSize = i3;
+                                paperType = mPaperSizeType.getID(this.paperSize);
+                                undoFlag = false;
                                 mHandler.sendEmptyMessage(2);
                                 mHandler.sendEmptyMessage(2);
                                 break;
                                 break;
                             case R.id.paper_source /*2131231311*/:
                             case R.id.paper_source /*2131231311*/:
                                 mLookupTable = new MediaInfo.PaperSource();
                                 mLookupTable = new MediaInfo.PaperSource();
-                                this.paperSourceInfo.setText(getString(mLookupTable.getStringId(i3)));
+                                paperSourceInfo.setText(getString(mLookupTable.getStringId(i3)));
                                 mLookupTable.destructor();
                                 mLookupTable.destructor();
-                                int[] iArr = this.paper_source_info;
+                                int[] iArr = paper_source_info;
                                 if (iArr != null && iArr.length > 1) {
                                 if (iArr != null && iArr.length > 1) {
-                                    this.paperSource = i3;
+                                    paperSource = i3;
                                 }
                                 }
-                                this.undoFlag = false;
+                                undoFlag = false;
                                 mHandler.sendEmptyMessage(32);
                                 mHandler.sendEmptyMessage(32);
                                 break;
                                 break;
                             case R.id.paper_type /*2131231314*/:
                             case R.id.paper_type /*2131231314*/:
-                                this.typeIndex = intent.getExtras().getInt("INDEX");
+                                typeIndex = intent.getExtras().getInt("INDEX");
                                 mLookupTable = new MediaInfo.PaperType();
                                 mLookupTable = new MediaInfo.PaperType();
-                                this.paperTypeInfo.setText(getString(mLookupTable.getStringId(i3)));
+                                paperTypeInfo.setText(getString(mLookupTable.getStringId(i3)));
                                 mLookupTable.destructor();
                                 mLookupTable.destructor();
-                                this.paperType = i3;
-                                mPaperSizeType.putID(this.paperSize, this.paperType);
-                                this.undoFlag = false;
+                                paperType = i3;
+                                mPaperSizeType.putID(this.paperSize, paperType);
+                                undoFlag = false;
                                 mHandler.sendEmptyMessage(3);
                                 mHandler.sendEmptyMessage(3);
                                 break;
                                 break;
                             case R.id.printdate /*2131231355*/:
                             case R.id.printdate /*2131231355*/:
                                 mLookupTable = new MediaInfo.PrintDate();
                                 mLookupTable = new MediaInfo.PrintDate();
-                                this.printDateInfo.setText(getString(mLookupTable.getStringId(i3)));
+                                printDateInfo.setText(getString(mLookupTable.getStringId(i3)));
                                 mLookupTable.destructor();
                                 mLookupTable.destructor();
-                                this.printdate = i3;
+                                printdate = i3;
                                 break;
                                 break;
                             case R.id.quality /*2131231392*/:
                             case R.id.quality /*2131231392*/:
                                 mLookupTable = new MediaInfo.Quality();
                                 mLookupTable = new MediaInfo.Quality();
-                                this.qualityInfo.setText(getString(mLookupTable.getStringId(i3)));
+                                qualityInfo.setText(getString(mLookupTable.getStringId(i3)));
                                 mLookupTable.destructor();
                                 mLookupTable.destructor();
-                                this.quality = i3;
+                                quality = i3;
                                 break;
                                 break;
                         }
                         }
                     }
                     }
                 } else if (i2 == -1) {
                 } else if (i2 == -1) {
-                    this.printAll = intent.getExtras().getBoolean("printAll");
-                    this.startValue = intent.getExtras().getInt("startValue");
-                    this.endValue = intent.getExtras().getInt("endValue");
+                    printAll = intent.getExtras().getBoolean("printAll");
+                    startValue = intent.getExtras().getInt("startValue");
+                    endValue = intent.getExtras().getInt("endValue");
                     mHandler.sendEmptyMessage(64);
                     mHandler.sendEmptyMessage(64);
                 }
                 }
             } else {
             } else {
@@ -2498,9 +2498,9 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     }
     }
 
 
     private void updateSettingView() {
     private void updateSettingView() {
-        boolean z = this.isDocumentSetting;
+        boolean z = isDocumentSetting;
         setVisibilityPageRange(false);
         setVisibilityPageRange(false);
-        int[] iArr = this.color_info;
+        int[] iArr = color_info;
         if (iArr == null) {
         if (iArr == null) {
             ((ImageView) findViewById(R.id.color_next_screen_imv)).setVisibility(8);
             ((ImageView) findViewById(R.id.color_next_screen_imv)).setVisibility(8);
         } else if (iArr.length <= 1) {
         } else if (iArr.length <= 1) {
@@ -2508,7 +2508,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         } else {
         } else {
             ((ImageView) findViewById(R.id.color_next_screen_imv)).setVisibility(0);
             ((ImageView) findViewById(R.id.color_next_screen_imv)).setVisibility(0);
         }
         }
-        int[] iArr2 = this.duplex_info;
+        int[] iArr2 = duplex_info;
         findViewById(R.id.duplex_view).setVisibility(8);
         findViewById(R.id.duplex_view).setVisibility(8);
         ((LinearLayout) findViewById(R.id.duplex)).setVisibility(8);
         ((LinearLayout) findViewById(R.id.duplex)).setVisibility(8);
         switch (this.lang) {
         switch (this.lang) {
@@ -2523,7 +2523,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                 break;
                 break;
         }
         }
         if (!this.isDocumentSetting) {
         if (!this.isDocumentSetting) {
-            int i = this.printerLocation;
+            int i = printerLocation;
         }
         }
         findViewById(R.id.printdate).setVisibility(8);
         findViewById(R.id.printdate).setVisibility(8);
     }
     }
@@ -2567,21 +2567,21 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     }
     }
 
 
     private void resetSettings() {
     private void resetSettings() {
-        this.printerDeviceId = null;
-        this.printerId = null;
-        this.printerEmailAddress = null;
-        this.printerIp = null;
-        this.printerLocation = 0;
-        this.info = null;
-        this.paper_source_info = null;
-        this.color_info = null;
-        this.paper_size_info = null;
-        this.paper_type_info = null;
-        this.layout_info = null;
-        this.quality_info = null;
-        this.duplex_info = null;
-        this.autoConnectSsid = "";
-        this.printerName.setText(getString(R.string.str_lbl_title_scan));
+        printerDeviceId = null;
+        printerId = null;
+        printerEmailAddress = null;
+        printerIp = null;
+        printerLocation = 0;
+        info = null;
+        paper_source_info = null;
+        color_info = null;
+        paper_size_info = null;
+        paper_type_info = null;
+        layout_info = null;
+        quality_info = null;
+        duplex_info = null;
+        autoConnectSsid = "";
+        printerName.setText(getString(R.string.str_lbl_title_scan));
         ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setVisibility(8);
         ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setVisibility(8);
         updateSettingView();
         updateSettingView();
         setScreenState(true);
         setScreenState(true);
@@ -2606,9 +2606,9 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
 
 
     private void setScreenState(Boolean bool) {
     private void setScreenState(Boolean bool) {
         if (bool.booleanValue()) {
         if (bool.booleanValue()) {
-            this.progressGetOption.setVisibility(8);
+            progressGetOption.setVisibility(8);
         } else {
         } else {
-            this.progressGetOption.setVisibility(0);
+            progressGetOption.setVisibility(0);
         }
         }
         findViewById(R.id.printer).setClickable(bool.booleanValue());
         findViewById(R.id.printer).setClickable(bool.booleanValue());
         findViewById(R.id.paper_size).setClickable(bool.booleanValue());
         findViewById(R.id.paper_size).setClickable(bool.booleanValue());
@@ -2635,8 +2635,8 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     protected void onResume() {
     protected void onResume() {
         super.onResume();
         super.onResume();
         EPLog.m307e("SettingScr", "onResume()");
         EPLog.m307e("SettingScr", "onResume()");
-        if (this.printerId != null && this.printerLocation == 1 && this.isRetryAfterConnectSimpleAp) {
-            this.undoFlag = false;
+        if (this.printerId != null && printerLocation == 1 && isRetryAfterConnectSimpleAp) {
+            undoFlag = false;
             if (loadSupportedMediaFile()) {
             if (loadSupportedMediaFile()) {
                 mHandler.sendEmptyMessage(1);
                 mHandler.sendEmptyMessage(1);
             } else {
             } else {
@@ -2651,8 +2651,8 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         if (isFinishing()) {
         if (isFinishing()) {
             deleteLongTapMessage();
             deleteLongTapMessage();
         }
         }
-        WiFiDirectManager.disconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, this.printerIp);
-        WiFiDirectManager.disconnectSimpleAP(this, this.autoConnectSsid, this.printerIp);
+        WiFiDirectManager.disconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, printerIp);
+        WiFiDirectManager.disconnectSimpleAP(this, autoConnectSsid, printerIp);
     }
     }
 
 
     public boolean onCreateOptionsMenu(Menu menu) {
     public boolean onCreateOptionsMenu(Menu menu) {
@@ -2672,8 +2672,8 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
 
 
     protected void deleteLongTapMessage() {
     protected void deleteLongTapMessage() {
         MotionEvent obtain = MotionEvent.obtain(SystemClock.uptimeMillis(), SystemClock.uptimeMillis() + 10, 1, 0.0f, 0.0f, 0);
         MotionEvent obtain = MotionEvent.obtain(SystemClock.uptimeMillis(), SystemClock.uptimeMillis() + 10, 1, 0.0f, 0.0f, 0);
-        this.copiesMinus.dispatchTouchEvent(obtain);
-        this.copiesPlus.dispatchTouchEvent(obtain);
+        copiesMinus.dispatchTouchEvent(obtain);
+        copiesPlus.dispatchTouchEvent(obtain);
     }
     }
 
 
     public void onConfigurationChanged(Configuration configuration) {
     public void onConfigurationChanged(Configuration configuration) {

+ 1 - 1
app/src/main/java/com/epson/cameracopy/p006ui/CropImageActivity.java

@@ -311,7 +311,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
         mImageCollect.SetPath(mCacheFolder, mUserFolder, instance.getSaveDirecotry());
         mImageCollect.SetPath(mCacheFolder, mUserFolder, instance.getSaveDirecotry());
         mPreviewType = -1;
         mPreviewType = -1;
         mHandler.sendEmptyMessage(MSG_PREVIEW_LOAD_PHOTO);
         mHandler.sendEmptyMessage(MSG_PREVIEW_LOAD_PHOTO);
-        mGestureDetector = new GestureDetector(this, this.onGestureDetectorListener);
+        mGestureDetector = new GestureDetector(this, onGestureDetectorListener);
     }
     }
 
 
     public static /* synthetic */ void lambda$onCreate$0(CropImageActivity cropImageActivity, Deque deque) {
     public static /* synthetic */ void lambda$onCreate$0(CropImageActivity cropImageActivity, Deque deque) {

+ 4 - 4
app/src/main/java/com/epson/cameracopy/p006ui/DocumentSizeSettingActivity.java

@@ -143,7 +143,7 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
     private void deleteDocumentSize() {
     private void deleteDocumentSize() {
         Bundle bundle = new Bundle();
         Bundle bundle = new Bundle();
         bundle.putString("message", getString(R.string.delete_documentsize_message));
         bundle.putString("message", getString(R.string.delete_documentsize_message));
-        bundle.putInt("id", this.ID_DIALOG_DELETE);
+        bundle.putInt("id", ID_DIALOG_DELETE);
         NotifyDialogFragment notifyDialogFragment = new NotifyDialogFragment();
         NotifyDialogFragment notifyDialogFragment = new NotifyDialogFragment();
         notifyDialogFragment.setArguments(bundle);
         notifyDialogFragment.setArguments(bundle);
         notifyDialogFragment.show(getSupportFragmentManager(), "notify-dialog");
         notifyDialogFragment.show(getSupportFragmentManager(), "notify-dialog");
@@ -152,7 +152,7 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
     private void resetDocumentSizeList() {
     private void resetDocumentSizeList() {
         Bundle bundle = new Bundle();
         Bundle bundle = new Bundle();
         bundle.putString("message", getString(R.string.reset_documentsize_message));
         bundle.putString("message", getString(R.string.reset_documentsize_message));
-        bundle.putInt("id", this.ID_DIALOG_RESET);
+        bundle.putInt("id", ID_DIALOG_RESET);
         NotifyDialogFragment notifyDialogFragment = new NotifyDialogFragment();
         NotifyDialogFragment notifyDialogFragment = new NotifyDialogFragment();
         notifyDialogFragment.setArguments(bundle);
         notifyDialogFragment.setArguments(bundle);
         notifyDialogFragment.show(getSupportFragmentManager(), "notify-dialog");
         notifyDialogFragment.show(getSupportFragmentManager(), "notify-dialog");
@@ -251,9 +251,9 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
     }
     }
 
 
     public void doPositiveClick(int i) {
     public void doPositiveClick(int i) {
-        if (i == this.ID_DIALOG_RESET) {
+        if (i == ID_DIALOG_RESET) {
             mSelectListAdapter.reset();
             mSelectListAdapter.reset();
-        } else if (i == this.ID_DIALOG_DELETE) {
+        } else if (i == ID_DIALOG_DELETE) {
             mSelectListAdapter.delete((DocumentSizeInfo) mSelectListAdapter.getItem(mSelectPos), mSelectPos);
             mSelectListAdapter.delete((DocumentSizeInfo) mSelectListAdapter.getItem(mSelectPos), mSelectPos);
             mSelectPos--;
             mSelectPos--;
         }
         }

+ 15 - 15
app/src/main/java/com/epson/cameracopy/p006ui/ImageCollectView.java

@@ -252,14 +252,14 @@ public class ImageCollectView extends View {
             public RectF mRectView = null;
             public RectF mRectView = null;
 
 
             public C0884D() {
             public C0884D() {
-                this.dcm = new DataCropImage();
-                this.det = new DataEnhanceText();
-                this.dca = new DataColorAdjust();
-                this.ddp = new DataDrawPreview[4];
-                this.ddp[0] = new DataDrawPreview();
-                this.ddp[1] = new DataDrawPreview();
-                this.ddp[2] = new DataDrawPreview();
-                this.ddp[3] = new DataDrawPreview();
+                dcm = new DataCropImage();
+                det = new DataEnhanceText();
+                dca = new DataColorAdjust();
+                ddp = new DataDrawPreview[4];
+                ddp[0] = new DataDrawPreview();
+                ddp[1] = new DataDrawPreview();
+                ddp[2] = new DataDrawPreview();
+                ddp[3] = new DataDrawPreview();
                 mRectView = new RectF();
                 mRectView = new RectF();
                 mRectImageArea = new RectF();
                 mRectImageArea = new RectF();
                 mRectPreviewImage = new RectF();
                 mRectPreviewImage = new RectF();
@@ -273,7 +273,7 @@ public class ImageCollectView extends View {
         }
         }
 
 
         public Data() {
         public Data() {
-            this.f133d = null;
+            f133d = null;
             mPointCrop = null;
             mPointCrop = null;
             mPaintView = null;
             mPaintView = null;
             mPaintPreviewImage = null;
             mPaintPreviewImage = null;
@@ -293,9 +293,9 @@ public class ImageCollectView extends View {
             mPaintTextMessage = null;
             mPaintTextMessage = null;
             mPaintMessageArea = null;
             mPaintMessageArea = null;
             mFlagScale = false;
             mFlagScale = false;
-            this.f133d = new C0884D[2];
-            this.f133d[0] = new C0884D();
-            this.f133d[1] = new C0884D();
+            f133d = new C0884D[2];
+            f133d[0] = new C0884D();
+            f133d[1] = new C0884D();
             mPointCrop = new PointF[4];
             mPointCrop = new PointF[4];
             mPointCrop[0] = new PointF();
             mPointCrop[0] = new PointF();
             mPointCrop[1] = new PointF();
             mPointCrop[1] = new PointF();
@@ -400,8 +400,8 @@ public class ImageCollectView extends View {
         mData.mPaintMessageArea.setStyle(Paint.Style.FILL_AND_STROKE);
         mData.mPaintMessageArea.setStyle(Paint.Style.FILL_AND_STROKE);
         mData.mPaintMessageArea.setColor(-855638017);
         mData.mPaintMessageArea.setColor(-855638017);
         mData.mTimerCropImageCropCircle = new TimerCropImageCropCircle();
         mData.mTimerCropImageCropCircle = new TimerCropImageCropCircle();
-        mGestureDetector = new GestureDetector(context, this.onGestureDetectorListener);
-        mScaleGestureDetector = new ScaleGestureDetector(context, this.onScaleGestureDetector);
+        mGestureDetector = new GestureDetector(context, onGestureDetectorListener);
+        mScaleGestureDetector = new ScaleGestureDetector(context, onScaleGestureDetector);
         mPathEffectData = new PathEffectData(this);
         mPathEffectData = new PathEffectData(this);
     }
     }
 
 
@@ -586,7 +586,7 @@ public class ImageCollectView extends View {
             float f = mData.mPointViewMargine[mViewMode].x;
             float f = mData.mPointViewMargine[mViewMode].x;
             float f2 = mData.mPointViewMargine[mViewMode].y;
             float f2 = mData.mPointViewMargine[mViewMode].y;
             mData.f133d[mOrient].mRectImageArea.set(mData.f133d[mOrient].mRectView.left + f, mData.f133d[mOrient].mRectView.top + f2, mData.f133d[mOrient].mRectView.right - f, mData.f133d[mOrient].mRectView.bottom - f2);
             mData.f133d[mOrient].mRectImageArea.set(mData.f133d[mOrient].mRectView.left + f, mData.f133d[mOrient].mRectView.top + f2, mData.f133d[mOrient].mRectView.right - f, mData.f133d[mOrient].mRectView.bottom - f2);
-            float f3 = mData.f133d[z ? this.INVERT[mOrient] : mOrient].mBaseScale[1];
+            float f3 = mData.f133d[z ? INVERT[mOrient] : mOrient].mBaseScale[1];
             GetPreviewImage();
             GetPreviewImage();
             float f4 = mData.f133d[mOrient].mBaseScale[1] / f3;
             float f4 = mData.f133d[mOrient].mBaseScale[1] / f3;
             if (z) {
             if (z) {

+ 40 - 40
app/src/main/java/com/epson/cameracopy/p006ui/PrintPreviewActivity.java

@@ -219,30 +219,30 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
             return;
             return;
         }
         }
         mPreviewView = (PreviewView) findViewById(R.id.previewImageView);
         mPreviewView = (PreviewView) findViewById(R.id.previewImageView);
-        this.papersizeTextView = (TextView) findViewById(R.id.paper_size_text);
-        this.papersizeTextView.setOnClickListener(this);
+        papersizeTextView = (TextView) findViewById(R.id.paper_size_text);
+        papersizeTextView.setOnClickListener(this);
         mPrintTargetSizeText = (TextView) findViewById(R.id.printtarget_size_text);
         mPrintTargetSizeText = (TextView) findViewById(R.id.printtarget_size_text);
         mPrintTargetSizeText.setOnClickListener(this);
         mPrintTargetSizeText.setOnClickListener(this);
         mScaleText = (TextView) findViewById(R.id.scale_text);
         mScaleText = (TextView) findViewById(R.id.scale_text);
         mScaleText.setOnClickListener(this);
         mScaleText.setOnClickListener(this);
-        this.paperMissmath = (ImageView) findViewById(R.id.icon_papermissmatch);
-        this.paperMissmath.setOnClickListener(this);
+        paperMissmath = (ImageView) findViewById(R.id.icon_papermissmatch);
+        paperMissmath.setOnClickListener(this);
         mOriginalImageSizeButton = (Button) findViewById(R.id.paper_size_button);
         mOriginalImageSizeButton = (Button) findViewById(R.id.paper_size_button);
         mOriginalImageSizeButton.setOnClickListener(new View.OnClickListener() {
         mOriginalImageSizeButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
             public void onClick(View view) {
                 PrintPreviewActivity.this.startOrgImageSizeActivity();
                 PrintPreviewActivity.this.startOrgImageSizeActivity();
             }
             }
         });
         });
-        this.rotateButton = (Button) findViewById(R.id.rotate_button);
-        this.rotateButton.setOnClickListener(this);
-        this.printButton = (Button) findViewById(R.id.print_button);
-        this.printButton.setOnClickListener(this);
+        rotateButton = (Button) findViewById(R.id.rotate_button);
+        rotateButton.setOnClickListener(this);
+        printButton = (Button) findViewById(R.id.print_button);
+        printButton.setOnClickListener(this);
         mPreviewView.setImage(mImageList.get(0).loadImageFileName);
         mPreviewView.setImage(mImageList.get(0).loadImageFileName);
         loadPrinterSettingAndChangeView(true);
         loadPrinterSettingAndChangeView(true);
         updateManuscriptScaleText(1.0d);
         updateManuscriptScaleText(1.0d);
         mPreviewView.setPrttargetScaleChangeListener(this);
         mPreviewView.setPrttargetScaleChangeListener(this);
-        this.enableShowWarning = getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0).getBoolean(Constants.ENABLE_SHOW_WARNING, true);
-        this.paperSourceInfo = PaperSourceInfo.getInstance(this);
+        enableShowWarning = getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0).getBoolean(Constants.ENABLE_SHOW_WARNING, true);
+        paperSourceInfo = PaperSourceInfo.getInstance(this);
         if (mEpsonService == null) {
         if (mEpsonService == null) {
             bindService(new Intent(this, EpsonService.class), mEpsonConnection, 1);
             bindService(new Intent(this, EpsonService.class), mEpsonConnection, 1);
         }
         }
@@ -313,7 +313,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
 
 
     private void updateParaSizeText() {
     private void updateParaSizeText() {
         String string = getString(new MediaInfo.PaperSize().getStringId(this.currentPaperSize));
         String string = getString(new MediaInfo.PaperSize().getStringId(this.currentPaperSize));
-        TextView textView = this.papersizeTextView;
+        TextView textView = papersizeTextView;
         textView.setText(getString(R.string.paper_size) + ": " + string);
         textView.setText(getString(R.string.paper_size) + ": " + string);
     }
     }
 
 
@@ -346,7 +346,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
             String string = sharedPreferences.getString(Constants.PRINTER_NAME, getString(R.string.str_lbl_title_scan));
             String string = sharedPreferences.getString(Constants.PRINTER_NAME, getString(R.string.str_lbl_title_scan));
             PrintSetting printSetting = new PrintSetting(this, PrintSetting.Kind.cameracopy);
             PrintSetting printSetting = new PrintSetting(this, PrintSetting.Kind.cameracopy);
             printSetting.loadSettings();
             printSetting.loadSettings();
-            this.printerId = sharedPreferences.getString(Constants.PRINTER_ID, (String) null);
+            printerId = sharedPreferences.getString(Constants.PRINTER_ID, (String) null);
             boolean z5 = true;
             boolean z5 = true;
             if (z || mIsRemotePrinter != isRemotePrinter) {
             if (z || mIsRemotePrinter != isRemotePrinter) {
                 mIsRemotePrinter = isRemotePrinter;
                 mIsRemotePrinter = isRemotePrinter;
@@ -357,12 +357,12 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                 z2 = false;
                 z2 = false;
             }
             }
             if (z || !this.currentPrinterName.equalsIgnoreCase(string)) {
             if (z || !this.currentPrinterName.equalsIgnoreCase(string)) {
-                this.currentPrinterName = string;
+                currentPrinterName = string;
                 z3 = true;
                 z3 = true;
                 z2 = true;
                 z2 = true;
             }
             }
-            if (z || this.currentPaperSize != printSetting.paperSizeValue) {
-                this.currentPaperSize = printSetting.paperSizeValue;
+            if (z || currentPaperSize != printSetting.paperSizeValue) {
+                currentPaperSize = printSetting.paperSizeValue;
                 PreviewView previewView2 = mPreviewView;
                 PreviewView previewView2 = mPreviewView;
                 if (previewView2 != null) {
                 if (previewView2 != null) {
                     previewView2.setPaperSize(this.currentPaperSize);
                     previewView2.setPaperSize(this.currentPaperSize);
@@ -370,8 +370,8 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                 z3 = true;
                 z3 = true;
                 z2 = true;
                 z2 = true;
             }
             }
-            if (z || this.currentLayout != printSetting.layoutValue) {
-                this.currentLayout = printSetting.layoutValue;
+            if (z || currentLayout != printSetting.layoutValue) {
+                currentLayout = printSetting.layoutValue;
                 if (mPreviewView != null) {
                 if (mPreviewView != null) {
                     if (this.currentLayout == 1) {
                     if (this.currentLayout == 1) {
                         z4 = true;
                         z4 = true;
@@ -381,8 +381,8 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                 z3 = true;
                 z3 = true;
                 z2 = true;
                 z2 = true;
             }
             }
-            if (z || this.currentColor != printSetting.colorValue) {
-                this.currentColor = printSetting.colorValue;
+            if (z || currentColor != printSetting.colorValue) {
+                currentColor = printSetting.colorValue;
                 PreviewView previewView3 = mPreviewView;
                 PreviewView previewView3 = mPreviewView;
                 if (previewView3 != null) {
                 if (previewView3 != null) {
                     previewView3.setColor(this.currentColor);
                     previewView3.setColor(this.currentColor);
@@ -408,11 +408,11 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     }
     }
 
 
     private void enablePrintButton() {
     private void enablePrintButton() {
-        this.printButton.setEnabled(true);
+        printButton.setEnabled(true);
     }
     }
 
 
     private void disablePrintButton() {
     private void disablePrintButton() {
-        this.printButton.setEnabled(false);
+        printButton.setEnabled(false);
     }
     }
 
 
     /* JADX WARNING: Code restructure failed: missing block: B:6:0x0014, code lost:
     /* JADX WARNING: Code restructure failed: missing block: B:6:0x0014, code lost:
@@ -463,7 +463,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                 if (i2 == 3) {
                 if (i2 == 3) {
                     enablePrintButton();
                     enablePrintButton();
                     if (isPrinterChanged()) {
                     if (isPrinterChanged()) {
-                        this.aPaperSourceSetting = null;
+                        aPaperSourceSetting = null;
                         setPaperSizeDisplayForNoPapaerInfoPrinter();
                         setPaperSizeDisplayForNoPapaerInfoPrinter();
                         startLoadtask();
                         startLoadtask();
                         return;
                         return;
@@ -481,9 +481,9 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                 return;
                 return;
             case 4:
             case 4:
                 if (i2 == -1) {
                 if (i2 == -1) {
-                    this.aPaperSourceSetting = null;
+                    aPaperSourceSetting = null;
                     setPaperSizeDisplayForNoPapaerInfoPrinter();
                     setPaperSizeDisplayForNoPapaerInfoPrinter();
-                    this.bAutoStartPrint = true;
+                    bAutoStartPrint = true;
                     startLoadtask();
                     startLoadtask();
                     return;
                     return;
                 }
                 }
@@ -504,15 +504,15 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     protected void onResume() {
     protected void onResume() {
         super.onResume();
         super.onResume();
         NfcTagUtils.enableForegroundDispatch(this, (IntentFilter[]) null, (String[][]) null);
         NfcTagUtils.enableForegroundDispatch(this, (IntentFilter[]) null, (String[][]) null);
-        this.paperMissmath.setVisibility(4);
-        this.paperSourceInfo.start(this, mHandler);
+        paperMissmath.setVisibility(4);
+        paperSourceInfo.start(this, mHandler);
     }
     }
 
 
     protected void onNewIntent(Intent intent) {
     protected void onNewIntent(Intent intent) {
         NfcTagUtils.EpsonNfcConnectInfo parseNECTag;
         NfcTagUtils.EpsonNfcConnectInfo parseNECTag;
         super.onNewIntent(intent);
         super.onNewIntent(intent);
         String action = intent.getAction();
         String action = intent.getAction();
-        AllReloadTask allReloadTask = this.reloadTask;
+        AllReloadTask allReloadTask = reloadTask;
         if (allReloadTask != null && allReloadTask.getStatus() == AsyncTask.Status.FINISHED && "android.nfc.action.NDEF_DISCOVERED".equals(action) && (parseNECTag = NfcTagUtils.parseNECTag(this, intent)) != null) {
         if (allReloadTask != null && allReloadTask.getStatus() == AsyncTask.Status.FINISHED && "android.nfc.action.NDEF_DISCOVERED".equals(action) && (parseNECTag = NfcTagUtils.parseNECTag(this, intent)) != null) {
             Intent intent2 = new Intent();
             Intent intent2 = new Intent();
             intent2.setClass(this, ActivityNfcPrinter.class);
             intent2.setClass(this, ActivityNfcPrinter.class);
@@ -541,7 +541,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         EPLog.m305d("ActivityImageViewSelect", "onPause");
         EPLog.m305d("ActivityImageViewSelect", "onPause");
         super.onPause();
         super.onPause();
         if (isFinishing()) {
         if (isFinishing()) {
-            AllReloadTask allReloadTask = this.reloadTask;
+            AllReloadTask allReloadTask = reloadTask;
             if (allReloadTask != null) {
             if (allReloadTask != null) {
                 allReloadTask.cancel(false);
                 allReloadTask.cancel(false);
             }
             }
@@ -556,7 +556,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
             mPreviewView = null;
             mPreviewView = null;
         }
         }
         NfcTagUtils.disableForegroundDispatch(this);
         NfcTagUtils.disableForegroundDispatch(this);
-        this.paperSourceInfo.stop();
+        paperSourceInfo.stop();
     }
     }
 
 
     protected void onStop() {
     protected void onStop() {
@@ -571,8 +571,8 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     }
     }
 
 
     private void startLoadtask() {
     private void startLoadtask() {
-        this.reloadTask = new AllReloadTask();
-        this.reloadTask.executeOnExecutor(new Void[0]);
+        reloadTask = new AllReloadTask();
+        reloadTask.executeOnExecutor(new Void[0]);
     }
     }
 
 
     private void showProgressDialog() {
     private void showProgressDialog() {
@@ -595,17 +595,17 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     }
     }
 
 
     private void updatePaperDisplay(Message message) {
     private void updatePaperDisplay(Message message) {
-        this.aPaperSourceSetting = message.getData().getParcelableArrayList(PaperSourceInfo.KEY_PAPERSOURCEINFO);
+        aPaperSourceSetting = message.getData().getParcelableArrayList(PaperSourceInfo.KEY_PAPERSOURCEINFO);
         if (this.aPaperSourceSetting != null) {
         if (this.aPaperSourceSetting != null) {
-            this.papersizeTextView.setTextColor(getResources().getColor(R.color.epson_blue));
+            papersizeTextView.setTextColor(getResources().getColor(R.color.epson_blue));
             mPrintTargetSizeText.setTextColor(getResources().getColor(R.color.epson_blue));
             mPrintTargetSizeText.setTextColor(getResources().getColor(R.color.epson_blue));
             mScaleText.setTextColor(getResources().getColor(R.color.epson_blue));
             mScaleText.setTextColor(getResources().getColor(R.color.epson_blue));
             PrintSetting printSetting = new PrintSetting(this, PrintSetting.Kind.cameracopy);
             PrintSetting printSetting = new PrintSetting(this, PrintSetting.Kind.cameracopy);
             printSetting.loadSettings();
             printSetting.loadSettings();
-            if (this.paperSourceInfo.checkPaperMissmatch(printSetting, this.aPaperSourceSetting)) {
-                this.paperMissmath.setVisibility(0);
+            if (this.paperSourceInfo.checkPaperMissmatch(printSetting, aPaperSourceSetting)) {
+                paperMissmath.setVisibility(0);
             } else {
             } else {
-                this.paperMissmath.setVisibility(4);
+                paperMissmath.setVisibility(4);
             }
             }
         } else {
         } else {
             setPaperSizeDisplayForNoPapaerInfoPrinter();
             setPaperSizeDisplayForNoPapaerInfoPrinter();
@@ -613,10 +613,10 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     }
     }
 
 
     private void setPaperSizeDisplayForNoPapaerInfoPrinter() {
     private void setPaperSizeDisplayForNoPapaerInfoPrinter() {
-        this.papersizeTextView.setTextColor(getResources().getColor(R.color.all_black));
+        papersizeTextView.setTextColor(getResources().getColor(R.color.all_black));
         mPrintTargetSizeText.setTextColor(getResources().getColor(R.color.all_black));
         mPrintTargetSizeText.setTextColor(getResources().getColor(R.color.all_black));
         mScaleText.setTextColor(getResources().getColor(R.color.all_black));
         mScaleText.setTextColor(getResources().getColor(R.color.all_black));
-        this.paperMissmath.setVisibility(4);
+        paperMissmath.setVisibility(4);
     }
     }
 
 
     private boolean isRemotePrinter() {
     private boolean isRemotePrinter() {
@@ -644,7 +644,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                 if (this.aPaperSourceSetting != null) {
                 if (this.aPaperSourceSetting != null) {
                     Intent intent = new Intent();
                     Intent intent = new Intent();
                     intent.setClass(this, PaperSourceSettingScr.class);
                     intent.setClass(this, PaperSourceSettingScr.class);
-                    intent.putParcelableArrayListExtra(PaperSourceInfo.KEY_PAPERSOURCEINFO, this.aPaperSourceSetting);
+                    intent.putParcelableArrayListExtra(PaperSourceInfo.KEY_PAPERSOURCEINFO, aPaperSourceSetting);
                     intent.putExtra(PaperSourceSettingScr.PRINT_SETTING_TYPE, PrintSetting.Kind.cameracopy.name());
                     intent.putExtra(PaperSourceSettingScr.PRINT_SETTING_TYPE, PrintSetting.Kind.cameracopy.name());
                     startActivityForResult(intent, 2);
                     startActivityForResult(intent, 2);
                     return;
                     return;
@@ -653,7 +653,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                 return;
                 return;
             case R.id.print_button /*2131231336*/:
             case R.id.print_button /*2131231336*/:
                 mIsRemotePrinter = isRemotePrinter();
                 mIsRemotePrinter = isRemotePrinter();
-                if (mIsRemotePrinter && this.enableShowWarning) {
+                if (mIsRemotePrinter && enableShowWarning) {
                     AlertDialog.Builder cancelable = new AlertDialog.Builder(this).setCancelable(false);
                     AlertDialog.Builder cancelable = new AlertDialog.Builder(this).setCancelable(false);
                     cancelable.setMessage(getString(R.string.epsonconnect_str_remote_print_warning) + "\n\n" + getString(R.string.epsonconnect_str_remote_print_warning2)).setPositiveButton(getString(R.string.str_yes), new DialogInterface.OnClickListener() {
                     cancelable.setMessage(getString(R.string.epsonconnect_str_remote_print_warning) + "\n\n" + getString(R.string.epsonconnect_str_remote_print_warning2)).setPositiveButton(getString(R.string.str_yes), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
                         public void onClick(DialogInterface dialogInterface, int i) {

+ 5 - 5
app/src/main/java/com/epson/cameracopy/printlayout/PreviewView.java

@@ -57,11 +57,11 @@ public class PreviewView extends View {
         public int width;
         public int width;
 
 
         public SizeAndPosition(int i, int i2, int i3, int i4, int i5) {
         public SizeAndPosition(int i, int i2, int i3, int i4, int i5) {
-            this.width = i;
-            this.height = i2;
-            this.offsetX = i3;
-            this.offsetY = i4;
-            this.rotation = i5;
+            width = i;
+            height = i2;
+            offsetX = i3;
+            offsetY = i4;
+            rotation = i5;
         }
         }
 
 
         public SizeAndPosition() {
         public SizeAndPosition() {

+ 4 - 4
app/src/main/java/com/epson/iprint/prtlogger/Analytics.java

@@ -178,11 +178,11 @@ public class Analytics {
         private final String name;
         private final String name;
 
 
         private SetUpResult(String str) {
         private SetUpResult(String str) {
-            this.name = str;
+            name = str;
         }
         }
 
 
         public String toString() {
         public String toString() {
-            return this.name;
+            return name;
         }
         }
     }
     }
 
 
@@ -193,11 +193,11 @@ public class Analytics {
         private final String name;
         private final String name;
 
 
         private SetUpPath(String str) {
         private SetUpPath(String str) {
-            this.name = str;
+            name = str;
         }
         }
 
 
         public String toString() {
         public String toString() {
-            return this.name;
+            return name;
         }
         }
     }
     }
 
 

+ 2 - 2
app/src/main/java/com/epson/iprint/prtlogger/CommonLog.java

@@ -15,10 +15,10 @@ public class CommonLog implements Serializable {
     public String printerName;
     public String printerName;
 
 
     public void setPrinterName(@NonNull Context context) {
     public void setPrinterName(@NonNull Context context) {
-        this.printerName = MyPrinter.getCurPrinter(context).getName();
+        printerName = MyPrinter.getCurPrinter(context).getName();
     }
     }
 
 
     public void setConnectionType(@NonNull Context context) {
     public void setConnectionType(@NonNull Context context) {
-        this.connectionType = Analytics.getConnectionType(context);
+        connectionType = Analytics.getConnectionType(context);
     }
     }
 }
 }

+ 5 - 5
app/src/main/java/com/epson/lib/escani2/I2LibScannerInfoAndCapability.java

@@ -8,25 +8,25 @@ public class I2LibScannerInfoAndCapability implements Serializable {
     public ScannerI2Info scannerI2Info = new ScannerI2Info();
     public ScannerI2Info scannerI2Info = new ScannerI2Info();
 
 
     public boolean isAdfAvailable() {
     public boolean isAdfAvailable() {
-        return this.scannerI2Info.adfInstalled;
+        return scannerI2Info.adfInstalled;
     }
     }
 
 
     public boolean isFlatbedAvailable() {
     public boolean isFlatbedAvailable() {
-        return this.scannerI2Info.flatbedInstalled;
+        return scannerI2Info.flatbedInstalled;
     }
     }
 
 
     public int getAlignment(EscanI2Lib.InputUnit inputUnit) {
     public int getAlignment(EscanI2Lib.InputUnit inputUnit) {
-        return this.scannerI2Info.getAlignment(inputUnit);
+        return scannerI2Info.getAlignment(inputUnit);
     }
     }
 
 
     public int[] getSensorSize(EscanI2Lib.InputUnit inputUnit) {
     public int[] getSensorSize(EscanI2Lib.InputUnit inputUnit) {
-        return this.scannerI2Info.getSensorSize(inputUnit);
+        return scannerI2Info.getSensorSize(inputUnit);
     }
     }
 
 
     public boolean canDoubleSideScan() {
     public boolean canDoubleSideScan() {
         if (!isAdfAvailable()) {
         if (!isAdfAvailable()) {
             return false;
             return false;
         }
         }
-        return this.scannerI2Capability.adfCapability.duplex;
+        return scannerI2Capability.adfCapability.duplex;
     }
     }
 }
 }

+ 5 - 5
app/src/main/java/com/epson/lib/escani2/ScannerI2Info.java

@@ -29,12 +29,12 @@ public class ScannerI2Info implements Serializable {
                 if (!this.adfInstalled) {
                 if (!this.adfInstalled) {
                     return 255;
                     return 255;
                 }
                 }
-                return this.adfAlignment;
+                return adfAlignment;
             case FLATBED:
             case FLATBED:
                 if (!this.flatbedInstalled) {
                 if (!this.flatbedInstalled) {
                     return 255;
                     return 255;
                 }
                 }
-                return this.flatbedAlignment;
+                return flatbedAlignment;
             default:
             default:
                 return 255;
                 return 255;
         }
         }
@@ -57,15 +57,15 @@ public class ScannerI2Info implements Serializable {
             if (!this.flatbedInstalled) {
             if (!this.flatbedInstalled) {
                 return null;
                 return null;
             }
             }
-            return new int[]{this.flatbedSensorWidth, this.flatbedSensorHeight};
+            return new int[]{this.flatbedSensorWidth, flatbedSensorHeight};
         } else if (!this.adfInstalled) {
         } else if (!this.adfInstalled) {
             return null;
             return null;
         } else {
         } else {
-            return new int[]{this.adfSensorWidth, this.adfSensorHeight};
+            return new int[]{this.adfSensorWidth, adfSensorHeight};
         }
         }
     }
     }
 
 
     public boolean isAdfAlignmentInvalid() {
     public boolean isAdfAlignmentInvalid() {
-        return this.adfAlignment == 255;
+        return adfAlignment == 255;
     }
     }
 }
 }

+ 3 - 3
app/src/main/java/com/epson/memcardacc/AltViewImageAdapter.java

@@ -42,8 +42,8 @@ public class AltViewImageAdapter extends BaseAdapter implements CommonDefine {
     }
     }
 
 
     public void setImageSize(int i, int i2) {
     public void setImageSize(int i, int i2) {
-        this.itmW = i;
-        this.itmH = i2;
+        itmW = i;
+        itmH = i2;
     }
     }
 
 
     public View getView(int i, View view, ViewGroup viewGroup) {
     public View getView(int i, View view, ViewGroup viewGroup) {
@@ -51,7 +51,7 @@ public class AltViewImageAdapter extends BaseAdapter implements CommonDefine {
         ImageItem imageItem;
         ImageItem imageItem;
         if (view == null) {
         if (view == null) {
             relativeLayout = new RelativeLayout(mContext);
             relativeLayout = new RelativeLayout(mContext);
-            relativeLayout.setLayoutParams(new AbsListView.LayoutParams(this.itmW, this.itmH));
+            relativeLayout.setLayoutParams(new AbsListView.LayoutParams(this.itmW, itmH));
             relativeLayout.setGravity(17);
             relativeLayout.setGravity(17);
         } else {
         } else {
             relativeLayout = (RelativeLayout) view;
             relativeLayout = (RelativeLayout) view;

+ 9 - 9
app/src/main/java/com/epson/memcardacc/ConfirmReadMemcard.java

@@ -88,7 +88,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
         int size = mImageList.size();
         int size = mImageList.size();
         mFileNumText.setText(String.format(getResources().getString(R.string.memcard_file_num_format), new Object[]{Integer.valueOf(size)}));
         mFileNumText.setText(String.format(getResources().getString(R.string.memcard_file_num_format), new Object[]{Integer.valueOf(size)}));
         setTargetDirectory(MemcardConfig.DEFAULT_READER_LOCAL_DIRECTORY);
         setTargetDirectory(MemcardConfig.DEFAULT_READER_LOCAL_DIRECTORY);
-        this.doTotalFileSizeCalc = true;
+        doTotalFileSizeCalc = true;
     }
     }
 
 
     public static /* synthetic */ void lambda$onCreate$0(ConfirmReadMemcard confirmReadMemcard, Deque deque) {
     public static /* synthetic */ void lambda$onCreate$0(ConfirmReadMemcard confirmReadMemcard, Deque deque) {
@@ -108,19 +108,19 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
     protected void onResume() {
     protected void onResume() {
         super.onResume();
         super.onResume();
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
-            this.isTryConnectSimpleAp = false;
+            isTryConnectSimpleAp = false;
         } else if (!this.isTryConnectSimpleAp) {
         } else if (!this.isTryConnectSimpleAp) {
-            this.isTryConnectSimpleAp = true;
+            isTryConnectSimpleAp = true;
             if (WiFiDirectManager.reconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
             if (WiFiDirectManager.reconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
-                this.doTotalFileSizeCalc = true;
+                doTotalFileSizeCalc = true;
                 return;
                 return;
             }
             }
         }
         }
-        this.isKeepSimleApConnect = false;
+        isKeepSimleApConnect = false;
         if (this.doTotalFileSizeCalc) {
         if (this.doTotalFileSizeCalc) {
             mTotalFileSizeCalcTask = new TotalFileSizeCalcTask();
             mTotalFileSizeCalcTask = new TotalFileSizeCalcTask();
             mTotalFileSizeCalcTask.execute(new Void[0]);
             mTotalFileSizeCalcTask.execute(new Void[0]);
-            this.doTotalFileSizeCalc = false;
+            doTotalFileSizeCalc = false;
         }
         }
     }
     }
 
 
@@ -144,7 +144,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
 
 
     public void onBackPressed() {
     public void onBackPressed() {
         super.onBackPressed();
         super.onBackPressed();
-        this.isKeepSimleApConnect = true;
+        isKeepSimleApConnect = true;
     }
     }
 
 
     private void localShowDialog(String str) {
     private void localShowDialog(String str) {
@@ -207,7 +207,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
         intent.putExtra("target_folder_name", mCopyTargetFolderName);
         intent.putExtra("target_folder_name", mCopyTargetFolderName);
         intent.putExtra("memcard_storage_type", mMemcardStorageType);
         intent.putExtra("memcard_storage_type", mMemcardStorageType);
         startActivityForResult(intent, 1);
         startActivityForResult(intent, 1);
-        this.isKeepSimleApConnect = true;
+        isKeepSimleApConnect = true;
     }
     }
 
 
     public void copy_dest_button_clicked(View view) {
     public void copy_dest_button_clicked(View view) {
@@ -417,7 +417,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
     protected void onActivityResult(int i, int i2, Intent intent) {
     protected void onActivityResult(int i, int i2, Intent intent) {
         switch (i) {
         switch (i) {
             case 1:
             case 1:
-                this.isKeepSimleApConnect = false;
+                isKeepSimleApConnect = false;
                 if (i2 == -2) {
                 if (i2 == -2) {
                     setResult(1);
                     setResult(1);
                     finish();
                     finish();

+ 8 - 8
app/src/main/java/com/epson/memcardacc/ConfirmWriteMemcard.java

@@ -92,7 +92,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
         mCopyTargetPathText.setText("");
         mCopyTargetPathText.setText("");
         mImageList = null;
         mImageList = null;
         mCopyTargetPrinter.setText(String.format(getResources().getString(R.string.memcard_printer_save_to_format), new Object[]{MyPrinter.getCurPrinter(this).getName()}));
         mCopyTargetPrinter.setText(String.format(getResources().getString(R.string.memcard_printer_save_to_format), new Object[]{MyPrinter.getCurPrinter(this).getName()}));
-        this.doDirectoryNameTask = true;
+        doDirectoryNameTask = true;
         observeImageConvertFromIntent(getIntent());
         observeImageConvertFromIntent(getIntent());
     }
     }
 
 
@@ -162,19 +162,19 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
         EPLog.m305d(LOG_TAG, "onResume()");
         EPLog.m305d(LOG_TAG, "onResume()");
         super.onResume();
         super.onResume();
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
-            this.isTryConnectSimpleAp = false;
+            isTryConnectSimpleAp = false;
         } else if (!this.isTryConnectSimpleAp) {
         } else if (!this.isTryConnectSimpleAp) {
-            this.isTryConnectSimpleAp = true;
+            isTryConnectSimpleAp = true;
             if (WiFiDirectManager.reconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
             if (WiFiDirectManager.reconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
-                this.doDirectoryNameTask = true;
+                doDirectoryNameTask = true;
                 return;
                 return;
             }
             }
         }
         }
-        this.isKeepSimleApConnect = false;
+        isKeepSimleApConnect = false;
         if (this.doDirectoryNameTask) {
         if (this.doDirectoryNameTask) {
             mDirectoryNameTask = new DirectoryNameTask();
             mDirectoryNameTask = new DirectoryNameTask();
             mDirectoryNameTask.execute(new Void[0]);
             mDirectoryNameTask.execute(new Void[0]);
-            this.doDirectoryNameTask = false;
+            doDirectoryNameTask = false;
         }
         }
     }
     }
 
 
@@ -301,12 +301,12 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
         intent.putExtra("target_folder_name", mCopyTargetFolderName);
         intent.putExtra("target_folder_name", mCopyTargetFolderName);
         intent.putExtra("memcard_storage_type", mMemcardStorageType);
         intent.putExtra("memcard_storage_type", mMemcardStorageType);
         startActivityForResult(intent, 1);
         startActivityForResult(intent, 1);
-        this.isKeepSimleApConnect = true;
+        isKeepSimleApConnect = true;
     }
     }
 
 
     protected void onActivityResult(int i, int i2, Intent intent) {
     protected void onActivityResult(int i, int i2, Intent intent) {
         if (i == 1) {
         if (i == 1) {
-            this.isKeepSimleApConnect = false;
+            isKeepSimleApConnect = false;
             if (i2 == -2) {
             if (i2 == -2) {
                 loggerCountUp();
                 loggerCountUp();
                 setResult(1);
                 setResult(1);

+ 2 - 2
app/src/main/java/com/epson/memcardacc/MemCardWriteConvertViewModel.java

@@ -20,8 +20,8 @@ public class MemCardWriteConvertViewModel extends AndroidViewModel {
         public long totalFileSize = 0;
         public long totalFileSize = 0;
 
 
         public void addFile(String str) {
         public void addFile(String str) {
-            this.totalFileSize += new File(str).length();
-            this.filenameList.add(str);
+            totalFileSize += new File(str).length();
+            filenameList.add(str);
         }
         }
     }
     }
 
 

+ 9 - 9
app/src/main/java/com/epson/memcardacc/MemcardImageGrid.java

@@ -148,7 +148,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
             mMemcardStorageType = 1;
             mMemcardStorageType = 1;
         }
         }
         mStartDirectory = true;
         mStartDirectory = true;
-        this.targetDir = MemcardConfig.INIT_CIFS_DIRECTORY;
+        targetDir = MemcardConfig.INIT_CIFS_DIRECTORY;
         mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
         mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
         mModelDialog.getDialogJob().observe(this, new Observer() {
         mModelDialog.getDialogJob().observe(this, new Observer() {
             public final void onChanged(Object obj) {
             public final void onChanged(Object obj) {
@@ -180,7 +180,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         if (!this.isKeepSimleApConnect) {
         if (!this.isKeepSimleApConnect) {
             CifsFileListLoader cifsFileListLoader = mCifsFileListLoader;
             CifsFileListLoader cifsFileListLoader = mCifsFileListLoader;
             if (cifsFileListLoader != null && cifsFileListLoader.getStatus() == AsyncTask.Status.RUNNING) {
             if (cifsFileListLoader != null && cifsFileListLoader.getStatus() == AsyncTask.Status.RUNNING) {
-                this.discconectOnThreadFinish = true;
+                discconectOnThreadFinish = true;
             }
             }
             if (!this.discconectOnThreadFinish) {
             if (!this.discconectOnThreadFinish) {
                 EPLog.m305d(LOG_TAG, "discconect at onStop()");
                 EPLog.m305d(LOG_TAG, "discconect at onStop()");
@@ -193,21 +193,21 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
 
 
     protected void onRestart() {
     protected void onRestart() {
         super.onRestart();
         super.onRestart();
-        this.targetDir = mImageFileListAdapter.getTargetDirectoryName();
+        targetDir = mImageFileListAdapter.getTargetDirectoryName();
     }
     }
 
 
     protected void onResume() {
     protected void onResume() {
         super.onResume();
         super.onResume();
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
-            this.isTryConnectSimpleAp = false;
+            isTryConnectSimpleAp = false;
         } else if (!this.isTryConnectSimpleAp) {
         } else if (!this.isTryConnectSimpleAp) {
-            this.isTryConnectSimpleAp = true;
+            isTryConnectSimpleAp = true;
             if (WiFiDirectManager.reconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
             if (WiFiDirectManager.reconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
                 return;
                 return;
             }
             }
         }
         }
-        this.isKeepSimleApConnect = false;
-        this.discconectOnThreadFinish = false;
+        isKeepSimleApConnect = false;
+        discconectOnThreadFinish = false;
         if (!this.isFinishRequested) {
         if (!this.isFinishRequested) {
             chengeTargetDirectory(this.targetDir);
             chengeTargetDirectory(this.targetDir);
         }
         }
@@ -274,7 +274,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         intent.putExtra("memcard_storage_type", mMemcardStorageType);
         intent.putExtra("memcard_storage_type", mMemcardStorageType);
         startActivityForResult(intent, 1);
         startActivityForResult(intent, 1);
         dismissProgressDialog();
         dismissProgressDialog();
-        this.isKeepSimleApConnect = true;
+        isKeepSimleApConnect = true;
     }
     }
 
 
     public void onBackPressed() {
     public void onBackPressed() {
@@ -285,7 +285,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         mHandler.removeMessages(1);
         mHandler.removeMessages(1);
         cancelFileListLoadTask();
         cancelFileListLoadTask();
         finish();
         finish();
-        this.isFinishRequested = true;
+        isFinishRequested = true;
     }
     }
 
 
     private void localShowDialog(String str) {
     private void localShowDialog(String str) {

+ 7 - 7
app/src/main/java/com/epson/memcardacc/MemcardReadProgress.java

@@ -69,7 +69,7 @@ public class MemcardReadProgress extends Activity {
     protected void onStop() {
     protected void onStop() {
         EPLog.m305d(LOG_TAG, "onStop()");
         EPLog.m305d(LOG_TAG, "onStop()");
         actionCancel();
         actionCancel();
-        this.discconectOnThreadFinish = true;
+        discconectOnThreadFinish = true;
         super.onStop();
         super.onStop();
     }
     }
 
 
@@ -139,17 +139,17 @@ public class MemcardReadProgress extends Activity {
                     return 3;
                     return 3;
                 }
                 }
                 if (this.cifsAccess.connectDefaultStorageWidthDefaultAthInfo(MemcardReadProgress.mMemcardStorageType) == 0) {
                 if (this.cifsAccess.connectDefaultStorageWidthDefaultAthInfo(MemcardReadProgress.mMemcardStorageType) == 0) {
-                    this.cifsAccess.free();
+                    cifsAccess.free();
                     return 3;
                     return 3;
                 }
                 }
                 int copyFile = copyFile();
                 int copyFile = copyFile();
-                this.cifsAccess.disconnectStorage();
+                cifsAccess.disconnectStorage();
                 mCommonLog.setConnectionType(MemcardReadProgress.this.getApplicationContext());
                 mCommonLog.setConnectionType(MemcardReadProgress.this.getApplicationContext());
                 Integer valueOf = Integer.valueOf(copyFile);
                 Integer valueOf = Integer.valueOf(copyFile);
-                this.cifsAccess.free();
+                cifsAccess.free();
                 return valueOf;
                 return valueOf;
             } finally {
             } finally {
-                this.cifsAccess.free();
+                cifsAccess.free();
             }
             }
         }
         }
 
 
@@ -168,7 +168,7 @@ public class MemcardReadProgress extends Activity {
                     EPLog.m313i(MemcardReadProgress.LOG_TAG, "local file exists. skip");
                     EPLog.m313i(MemcardReadProgress.LOG_TAG, "local file exists. skip");
                 } else {
                 } else {
                     EPLog.m313i(MemcardReadProgress.LOG_TAG, "copy " + str + " => " + format);
                     EPLog.m313i(MemcardReadProgress.LOG_TAG, "copy " + str + " => " + format);
-                    int readFromPrinterMemcard = this.cifsAccess.readFromPrinterMemcard(str, format);
+                    int readFromPrinterMemcard = cifsAccess.readFromPrinterMemcard(str, format);
                     if (readFromPrinterMemcard != 0) {
                     if (readFromPrinterMemcard != 0) {
                         EPLog.m318w(MemcardReadProgress.LOG_TAG, "cifsAccess.writeFromPrinterMemcard() return <" + readFromPrinterMemcard + ">");
                         EPLog.m318w(MemcardReadProgress.LOG_TAG, "cifsAccess.writeFromPrinterMemcard() return <" + readFromPrinterMemcard + ">");
                         new File(format).delete();
                         new File(format).delete();
@@ -193,7 +193,7 @@ public class MemcardReadProgress extends Activity {
         public void taskCancel() {
         public void taskCancel() {
             if (!mCanceling) {
             if (!mCanceling) {
                 mCanceling = true;
                 mCanceling = true;
-                this.cifsAccess.cancel();
+                cifsAccess.cancel();
                 cancel(false);
                 cancel(false);
             }
             }
         }
         }

+ 3 - 3
app/src/main/java/com/epson/memcardacc/MemcardTopSuper.java

@@ -78,7 +78,7 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
         mIsActivityForeground = true;
         mIsActivityForeground = true;
         if (!showDialogOnResume() && mLaunchType != 0) {
         if (!showDialogOnResume() && mLaunchType != 0) {
             execMemcardCheck();
             execMemcardCheck();
-            this.isTryConnectSimpleAp = false;
+            isTryConnectSimpleAp = false;
         }
         }
     }
     }
 
 
@@ -126,9 +126,9 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
 
 
     protected boolean chechAndConnectWiFiDirect() {
     protected boolean chechAndConnectWiFiDirect() {
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
-            this.isTryConnectSimpleAp = false;
+            isTryConnectSimpleAp = false;
         } else if (!this.isTryConnectSimpleAp) {
         } else if (!this.isTryConnectSimpleAp) {
-            this.isTryConnectSimpleAp = true;
+            isTryConnectSimpleAp = true;
             if (WiFiDirectManager.reconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
             if (WiFiDirectManager.reconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
                 return true;
                 return true;
             }
             }

+ 2 - 2
app/src/main/java/com/epson/memcardacc/MemcardWriteProgress.java

@@ -213,9 +213,9 @@ public class MemcardWriteProgress extends Activity {
                 return;
                 return;
             }
             }
             if (!WiFiDirectManager.isNeedConnect(mActivity, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
             if (!WiFiDirectManager.isNeedConnect(mActivity, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
-                this.isTryConnectSimpleAp = false;
+                isTryConnectSimpleAp = false;
             } else if (!this.isTryConnectSimpleAp) {
             } else if (!this.isTryConnectSimpleAp) {
-                this.isTryConnectSimpleAp = true;
+                isTryConnectSimpleAp = true;
                 if (WiFiDirectManager.reconnect(mActivity, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
                 if (WiFiDirectManager.reconnect(mActivity, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
                     return;
                     return;
                 }
                 }

+ 4 - 4
app/src/main/java/com/epson/mobilephone/common/PrintingLib/define/Constants.java

@@ -165,11 +165,11 @@ public class Constants {
         int code;
         int code;
 
 
         private PaperName(int i) {
         private PaperName(int i) {
-            this.code = i;
+            code = i;
         }
         }
 
 
         public int getCode() {
         public int getCode() {
-            return this.code;
+            return code;
         }
         }
     }
     }
 
 
@@ -261,11 +261,11 @@ public class Constants {
         int code;
         int code;
 
 
         private MediaName(int i) {
         private MediaName(int i) {
-            this.code = i;
+            code = i;
         }
         }
 
 
         public int getCode() {
         public int getCode() {
-            return this.code;
+            return code;
         }
         }
     }
     }
 }
 }

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/ble/BleException.java

@@ -6,6 +6,6 @@ public class BleException extends Exception {
 
 
     public BleException(int i, String str) {
     public BleException(int i, String str) {
         super(str);
         super(str);
-        this.code = i;
+        code = i;
     }
     }
 }
 }

+ 7 - 7
app/src/main/java/com/epson/mobilephone/common/ble/BleWork.java

@@ -814,8 +814,8 @@ public class BleWork {
                 }
                 }
             }
             }
         };
         };
-        this.handlerRead = new Handler();
-        this.handlerWrite = new Handler();
+        handlerRead = new Handler();
+        handlerWrite = new Handler();
     }
     }
 
 
     @NonNull
     @NonNull
@@ -944,8 +944,8 @@ public class BleWork {
         boolean success;
         boolean success;
 
 
         private NotifySetThread() {
         private NotifySetThread() {
-            this.stop = false;
-            this.success = false;
+            stop = false;
+            success = false;
         }
         }
 
 
         protected void onPreExecute() {
         protected void onPreExecute() {
@@ -1019,7 +1019,7 @@ public class BleWork {
         EpLog.m77i("read " + mSequence);
         EpLog.m77i("read " + mSequence);
         if (mSequence != jobSequence.MIB_REBOOT_NW) {
         if (mSequence != jobSequence.MIB_REBOOT_NW) {
             final int[] iArr = {0};
             final int[] iArr = {0};
-            this.handlerRead.postDelayed(new Runnable() {
+            handlerRead.postDelayed(new Runnable() {
                 public void run() {
                 public void run() {
                     switch (C10195.$SwitchMap$com$epson$mobilephone$common$ble$BleWork$jobSequence[BleWork.mSequence.ordinal()]) {
                     switch (C10195.$SwitchMap$com$epson$mobilephone$common$ble$BleWork$jobSequence[BleWork.mSequence.ordinal()]) {
                         case 1:
                         case 1:
@@ -1152,8 +1152,8 @@ public class BleWork {
 
 
     private void gattWriteCharacter(final BluetoothGattCharacteristic bluetoothGattCharacteristic) {
     private void gattWriteCharacter(final BluetoothGattCharacteristic bluetoothGattCharacteristic) {
         final int[] iArr = {0};
         final int[] iArr = {0};
-        this.handlerWrite.removeCallbacks((Runnable) null);
-        this.handlerWrite.postDelayed(new Runnable() {
+        handlerWrite.removeCallbacks((Runnable) null);
+        handlerWrite.postDelayed(new Runnable() {
             public void run() {
             public void run() {
                 if (BleWork.mConnGatt == null) {
                 if (BleWork.mConnGatt == null) {
                     EpLog.m71e("mConnGatt  NULL !");
                     EpLog.m71e("mConnGatt  NULL !");

+ 20 - 20
app/src/main/java/com/epson/mobilephone/common/ble/BleWorkActivity.java

@@ -108,13 +108,13 @@ public class BleWorkActivity extends ActivityIACommon {
 
 
     protected void onStart() {
     protected void onStart() {
         super.onStart();
         super.onStart();
-        this.isAlive = true;
+        isAlive = true;
     }
     }
 
 
     protected void onStop() {
     protected void onStop() {
         super.onStop();
         super.onStop();
         EpLog.m76i();
         EpLog.m76i();
-        this.isAlive = false;
+        isAlive = false;
         getWindow().clearFlags(128);
         getWindow().clearFlags(128);
     }
     }
 
 
@@ -165,7 +165,7 @@ public class BleWorkActivity extends ActivityIACommon {
                                     int postCount = 0;
                                     int postCount = 0;
 
 
                                     public void run() {
                                     public void run() {
-                                        int i = this.postCount;
+                                        int i = postCount;
                                         if (i >= 2) {
                                         if (i >= 2) {
                                             EpLog.m77i("postCount >= 2 ");
                                             EpLog.m77i("postCount >= 2 ");
                                             BleWorkActivity.mProbePrinter.interruptSearch();
                                             BleWorkActivity.mProbePrinter.interruptSearch();
@@ -196,7 +196,7 @@ public class BleWorkActivity extends ActivityIACommon {
                                                 }
                                                 }
                                             }
                                             }
                                         }
                                         }
-                                        this.postCount++;
+                                        postCount++;
                                         if (BleWorkActivity.mCompletion != null) {
                                         if (BleWorkActivity.mCompletion != null) {
                                             StringBuilder sb = new StringBuilder();
                                             StringBuilder sb = new StringBuilder();
                                             sb.append("postDelayed  postCount = ");
                                             sb.append("postDelayed  postCount = ");
@@ -204,7 +204,7 @@ public class BleWorkActivity extends ActivityIACommon {
                                             sb.append(" delay ");
                                             sb.append(" delay ");
                                             sb.append(this.postCount == 1 ? 10000 : BleWorkActivity.SECOND_DELAY);
                                             sb.append(this.postCount == 1 ? 10000 : BleWorkActivity.SECOND_DELAY);
                                             EpLog.m77i(sb.toString());
                                             EpLog.m77i(sb.toString());
-                                            BleWorkActivity.mWifiSearchHandler.postDelayed(this, this.postCount == 1 ? 10000 : 200000);
+                                            BleWorkActivity.mWifiSearchHandler.postDelayed(this, postCount == 1 ? 10000 : 200000);
                                         }
                                         }
                                     }
                                     }
                                 };
                                 };
@@ -251,16 +251,16 @@ public class BleWorkActivity extends ActivityIACommon {
     private void stopCallbacks() {
     private void stopCallbacks() {
         stopConnectTimeOut();
         stopConnectTimeOut();
         stopWifiSearch();
         stopWifiSearch();
-        this.isStopSetUpProgress = true;
+        isStopSetUpProgress = true;
         stopSetUpProgress();
         stopSetUpProgress();
     }
     }
 
 
     private void stopSetUpProgress() {
     private void stopSetUpProgress() {
-        Handler handler = this.setUpProgressHandler;
+        Handler handler = setUpProgressHandler;
         if (handler != null) {
         if (handler != null) {
             handler.removeCallbacks(this.runnableSetUpProgress);
             handler.removeCallbacks(this.runnableSetUpProgress);
-            this.setUpProgressHandler = null;
-            this.runnableSetUpProgress = null;
+            setUpProgressHandler = null;
+            runnableSetUpProgress = null;
         }
         }
     }
     }
 
 
@@ -269,7 +269,7 @@ public class BleWorkActivity extends ActivityIACommon {
         if (handler != null) {
         if (handler != null) {
             handler.removeCallbacks(this.runnableWifiSearch);
             handler.removeCallbacks(this.runnableWifiSearch);
             mWifiSearchHandler = null;
             mWifiSearchHandler = null;
-            this.runnableWifiSearch = null;
+            runnableWifiSearch = null;
         }
         }
     }
     }
 
 
@@ -329,7 +329,7 @@ public class BleWorkActivity extends ActivityIACommon {
             mAlertDialog.dismiss();
             mAlertDialog.dismiss();
             mAlertDialog = null;
             mAlertDialog = null;
         }
         }
-        this.isStopSetUpProgress = false;
+        isStopSetUpProgress = false;
         mAlertDialog = new AlertDialog.Builder(mContext).setCancelable(false).create();
         mAlertDialog = new AlertDialog.Builder(mContext).setCancelable(false).create();
         View inflate = LayoutInflater.from(mContext).inflate(R.layout.ble_progress_layout, (ViewGroup) null);
         View inflate = LayoutInflater.from(mContext).inflate(R.layout.ble_progress_layout, (ViewGroup) null);
         mAlertDialog.setView(inflate);
         mAlertDialog.setView(inflate);
@@ -343,10 +343,10 @@ public class BleWorkActivity extends ActivityIACommon {
         mPercentView.setText("0%");
         mPercentView.setText("0%");
         mAlertDialog.setMessage(getResources().getString(R.string.BLE_wait_setup_complete_msg));
         mAlertDialog.setMessage(getResources().getString(R.string.BLE_wait_setup_complete_msg));
         mAlertDialog.show();
         mAlertDialog.show();
-        this.count = 0;
+        count = 0;
         stopSetUpProgress();
         stopSetUpProgress();
-        this.setUpProgressHandler = new Handler();
-        this.runnableSetUpProgress = new Runnable() {
+        setUpProgressHandler = new Handler();
+        runnableSetUpProgress = new Runnable() {
             public void run() {
             public void run() {
                 int i;
                 int i;
                 if (BleWorkActivity.this.isStopSetUpProgress) {
                 if (BleWorkActivity.this.isStopSetUpProgress) {
@@ -383,7 +383,7 @@ public class BleWorkActivity extends ActivityIACommon {
                 }
                 }
             }
             }
         };
         };
-        this.setUpProgressHandler.post(this.runnableSetUpProgress);
+        setUpProgressHandler.post(this.runnableSetUpProgress);
     }
     }
 
 
     private void updateProgress(int i) {
     private void updateProgress(int i) {
@@ -499,11 +499,11 @@ public class BleWorkActivity extends ActivityIACommon {
             private final /* synthetic */ BleWork.jobSequence f$1;
             private final /* synthetic */ BleWork.jobSequence f$1;
 
 
             {
             {
-                this.f$1 = r2;
+                f$1 = r2;
             }
             }
 
 
             public final void run() {
             public final void run() {
-                BleWorkActivity.lambda$SSIDfailedDialog$1(BleWorkActivity.this, this.f$1);
+                BleWorkActivity.lambda$SSIDfailedDialog$1(BleWorkActivity.this, f$1);
             }
             }
         });
         });
     }
     }
@@ -523,11 +523,11 @@ public class BleWorkActivity extends ActivityIACommon {
             private final /* synthetic */ boolean f$1;
             private final /* synthetic */ boolean f$1;
 
 
             {
             {
-                this.f$1 = r2;
+                f$1 = r2;
             }
             }
 
 
             public final void onClick(DialogInterface dialogInterface, int i) {
             public final void onClick(DialogInterface dialogInterface, int i) {
-                BleWorkActivity.lambda$null$0(BleWorkActivity.this, this.f$1, dialogInterface, i);
+                BleWorkActivity.lambda$null$0(BleWorkActivity.this, f$1, dialogInterface, i);
             }
             }
         });
         });
         if (bleWorkActivity.isAlive && !bleWorkActivity.isFinishing()) {
         if (bleWorkActivity.isAlive && !bleWorkActivity.isFinishing()) {
@@ -807,7 +807,7 @@ public class BleWorkActivity extends ActivityIACommon {
         int filterType;
         int filterType;
 
 
         PasswordFilter(int i) {
         PasswordFilter(int i) {
-            this.filterType = i;
+            filterType = i;
         }
         }
 
 
         public CharSequence filter(CharSequence charSequence, int i, int i2, Spanned spanned, int i3, int i4) {
         public CharSequence filter(CharSequence charSequence, int i, int i2, Spanned spanned, int i3, int i4) {

+ 9 - 9
app/src/main/java/com/epson/mobilephone/common/ble/ProbePrinter.java

@@ -142,7 +142,7 @@ public class ProbePrinter {
     }
     }
 
 
     public ProbePrinter setContext(Context context2) {
     public ProbePrinter setContext(Context context2) {
-        this.context = context2;
+        context = context2;
         return this;
         return this;
     }
     }
 
 
@@ -153,21 +153,21 @@ public class ProbePrinter {
     }
     }
 
 
     public ProbePrinter setBleCallback(BleWorkActivity.CallbackWork callbackWork) {
     public ProbePrinter setBleCallback(BleWorkActivity.CallbackWork callbackWork) {
-        this.completion = callbackWork;
+        completion = callbackWork;
         return this;
         return this;
     }
     }
 
 
     public void search() throws IllegalStateException {
     public void search() throws IllegalStateException {
         String str;
         String str;
-        if (mEpsonService == null || this.completion == null || (str = macAddress) == null || str.length() != 12 || this.completion == null) {
+        if (mEpsonService == null || completion == null || (str = macAddress) == null || str.length() != 12 || completion == null) {
             EpLog.m71e("Required field is not set.");
             EpLog.m71e("Required field is not set.");
             throw new IllegalStateException("Required field is not set.");
             throw new IllegalStateException("Required field is not set.");
         }
         }
-        Context context2 = this.context;
+        Context context2 = context;
         context2.bindService(new Intent(context2, EpsonService.class), mEpsonConnection, 1);
         context2.bindService(new Intent(context2, EpsonService.class), mEpsonConnection, 1);
         try {
         try {
             synchronized (lock) {
             synchronized (lock) {
-                this.isPrinterFound = false;
+                isPrinterFound = false;
             }
             }
             EpLog.m69d("mEpsonService.searchPrinters");
             EpLog.m69d("mEpsonService.searchPrinters");
             mEpsonService.setTimeOut(180);
             mEpsonService.setTimeOut(180);
@@ -193,7 +193,7 @@ public class ProbePrinter {
 
 
     public void bindEpsonService() {
     public void bindEpsonService() {
         if (mEpsonService == null) {
         if (mEpsonService == null) {
-            Context context2 = this.context;
+            Context context2 = context;
             context2.bindService(new Intent(context2, EpsonService.class), mEpsonConnection, 1);
             context2.bindService(new Intent(context2, EpsonService.class), mEpsonConnection, 1);
         }
         }
         if (mEpsonService == null) {
         if (mEpsonService == null) {
@@ -215,7 +215,7 @@ public class ProbePrinter {
                 EpLog.m77i(ExifInterface.GPS_MEASUREMENT_2D);
                 EpLog.m77i(ExifInterface.GPS_MEASUREMENT_2D);
                 EpLog.m77i("unregisterCallback");
                 EpLog.m77i("unregisterCallback");
                 mEpsonService.unregisterCallback(mCallback);
                 mEpsonService.unregisterCallback(mCallback);
-                this.context.unbindService(mEpsonConnection);
+                context.unbindService(mEpsonConnection);
                 mEpsonService = null;
                 mEpsonService = null;
             } catch (RemoteException unused) {
             } catch (RemoteException unused) {
                 EpLog.m71e("unregisterCallback   mEpsonService");
                 EpLog.m71e("unregisterCallback   mEpsonService");
@@ -225,10 +225,10 @@ public class ProbePrinter {
     }
     }
 
 
     private void callbackCompletion(boolean z) {
     private void callbackCompletion(boolean z) {
-        BleWorkActivity.CallbackWork callbackWork = this.completion;
+        BleWorkActivity.CallbackWork callbackWork = completion;
         if (callbackWork != null) {
         if (callbackWork != null) {
             callbackWork.call(Boolean.valueOf(z));
             callbackWork.call(Boolean.valueOf(z));
-            this.completion = null;
+            completion = null;
         }
         }
     }
     }
 
 

+ 14 - 14
app/src/main/java/com/epson/mobilephone/common/escpr/EscprLib.java

@@ -243,7 +243,7 @@ public class EscprLib {
     public int init_driver(Context context, String str) {
     public int init_driver(Context context, String str) {
         EpLog.m77i("init_driver :" + str);
         EpLog.m77i("init_driver :" + str);
         EpLog.m77i(is64bit() ? "Native is operating at 64 bit !!" : "Native is operating at 32 bit");
         EpLog.m77i(is64bit() ? "Native is operating at 64 bit !!" : "Native is operating at 32 bit");
-        return init_driver(context, str, this.iPrintPackageName.equals(context.getPackageName()) ? (byte) 8 : 10);
+        return init_driver(context, str, iPrintPackageName.equals(context.getPackageName()) ? (byte) 8 : 10);
     }
     }
 
 
     public int start_job(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13, int i14, int i15, int i16, int i17, int i18, boolean z) {
     public int start_job(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13, int i14, int i15, int i16, int i17, int i18, boolean z) {
@@ -328,15 +328,15 @@ public class EscprLib {
     }
     }
 
 
     public int epsWrapperInitDriver(Context context, int i) {
     public int epsWrapperInitDriver(Context context, int i) {
-        return epsWrapperInitDriver(context, i, this.iPrintPackageName.equals(context.getPackageName()) ? (byte) 8 : 10);
+        return epsWrapperInitDriver(context, i, iPrintPackageName.equals(context.getPackageName()) ? (byte) 8 : 10);
     }
     }
 
 
     public int epsWrapperProbePrinter2(int i, String str, String str2, int i2) {
     public int epsWrapperProbePrinter2(int i, String str, String str2, int i2) {
         EpLog.m76i();
         EpLog.m76i();
         if (i2 != 1) {
         if (i2 != 1) {
             if (i2 == 3 && str2 != null && str2.length() > 0) {
             if (i2 == 3 && str2 != null && str2.length() > 0) {
-                this.printerIp = str2;
-                this.printerId = str;
+                printerIp = str2;
+                printerId = str;
                 int epsWrapperProbePrinter2 = epsWrapperProbePrinter2(i, 2, str2.toCharArray());
                 int epsWrapperProbePrinter2 = epsWrapperProbePrinter2(i, 2, str2.toCharArray());
                 if (epsWrapperProbePrinter2 != 0 || !this.bInvalidId) {
                 if (epsWrapperProbePrinter2 != 0 || !this.bInvalidId) {
                     return epsWrapperProbePrinter2;
                     return epsWrapperProbePrinter2;
@@ -350,9 +350,9 @@ public class EscprLib {
     }
     }
 
 
     public void resetIPAdressCheck() {
     public void resetIPAdressCheck() {
-        this.printerId = null;
-        this.printerIp = null;
-        this.bInvalidId = false;
+        printerId = null;
+        printerIp = null;
+        bInvalidId = false;
     }
     }
 
 
     public void setSearchStt(boolean z) {
     public void setSearchStt(boolean z) {
@@ -361,12 +361,12 @@ public class EscprLib {
 
 
     private void findPrinterCB() {
     private void findPrinterCB() {
         EpLog.m77i("JAVA findPrinterCB");
         EpLog.m77i("JAVA findPrinterCB");
-        String str = this.printerList;
+        String str = printerList;
         if (str != null && str.length() > 0) {
         if (str != null && str.length() > 0) {
             String name = getClass().getName();
             String name = getClass().getName();
-            EpLog.m78i(name, "EXTRACT Printer information: " + this.printerList);
-            String[] split = this.printerList.split("\\|\\|");
-            if (this.printerIp == null || this.printerId == null || !this.printerIp.equals(split[2]) || this.printerId.equals(split[4])) {
+            EpLog.m78i(name, "EXTRACT Printer information: " + printerList);
+            String[] split = printerList.split("\\|\\|");
+            if (this.printerIp == null || printerId == null || !this.printerIp.equals(split[2]) || printerId.equals(split[4])) {
                 EpLog.m77i("JAVA mIsSearch == " + mIsSearch);
                 EpLog.m77i("JAVA mIsSearch == " + mIsSearch);
                 if (mIsSearch) {
                 if (mIsSearch) {
                     EpLog.m77i("JAVA mHandler == " + mHandler);
                     EpLog.m77i("JAVA mHandler == " + mHandler);
@@ -393,12 +393,12 @@ public class EscprLib {
                     }
                     }
                 }
                 }
             } else {
             } else {
-                this.bInvalidId = true;
+                bInvalidId = true;
                 String name2 = getClass().getName();
                 String name2 = getClass().getName();
-                EpLog.m72e(name2, "Invalid IP Printer: Expected = " + this.printerId);
+                EpLog.m72e(name2, "Invalid IP Printer: Expected = " + printerId);
             }
             }
         }
         }
-        this.printerList = "";
+        printerList = "";
     }
     }
 
 
     public int epsWrapperPrintErrorNotifyCB(int[] iArr) {
     public int epsWrapperPrintErrorNotifyCB(int[] iArr) {

+ 54 - 54
app/src/main/java/com/epson/mobilephone/common/escpr/Info_paper.java

@@ -18,128 +18,128 @@ public class Info_paper {
     private int paper_width_boderless;
     private int paper_width_boderless;
 
 
     public int getPaper_height() {
     public int getPaper_height() {
-        return this.paper_height;
+        return paper_height;
     }
     }
 
 
     public void setPaper_height(int i) {
     public void setPaper_height(int i) {
-        this.paper_height = i;
+        paper_height = i;
     }
     }
 
 
     public int getPaper_width_boder() {
     public int getPaper_width_boder() {
-        return this.paper_width_boder;
+        return paper_width_boder;
     }
     }
 
 
     public void setPaper_width_boder(int i) {
     public void setPaper_width_boder(int i) {
-        this.paper_width_boder = i;
+        paper_width_boder = i;
     }
     }
 
 
     public int getPaper_height_boder() {
     public int getPaper_height_boder() {
-        return this.paper_height_boder;
+        return paper_height_boder;
     }
     }
 
 
     public void setPaper_height_boder(int i) {
     public void setPaper_height_boder(int i) {
-        this.paper_height_boder = i;
+        paper_height_boder = i;
     }
     }
 
 
     public int getPaper_width_boderless() {
     public int getPaper_width_boderless() {
-        return this.paper_width_boderless;
+        return paper_width_boderless;
     }
     }
 
 
     public void setPaper_width_boderless(int i) {
     public void setPaper_width_boderless(int i) {
-        this.paper_width_boderless = i;
+        paper_width_boderless = i;
     }
     }
 
 
     public int getPaper_height_boderless() {
     public int getPaper_height_boderless() {
-        return this.paper_height_boderless;
+        return paper_height_boderless;
     }
     }
 
 
     public void setPaper_height_boderless(int i) {
     public void setPaper_height_boderless(int i) {
-        this.paper_height_boderless = i;
+        paper_height_boderless = i;
     }
     }
 
 
     public int getLeftMargin() {
     public int getLeftMargin() {
-        return this.borderless_left_margin;
+        return borderless_left_margin;
     }
     }
 
 
     public void setLeftMargin(int i) {
     public void setLeftMargin(int i) {
-        this.borderless_left_margin = i;
+        borderless_left_margin = i;
     }
     }
 
 
     public int getTopMargin() {
     public int getTopMargin() {
-        return this.borderless_top_margin;
+        return borderless_top_margin;
     }
     }
 
 
     public void setTopMargin(int i) {
     public void setTopMargin(int i) {
-        this.borderless_top_margin = i;
+        borderless_top_margin = i;
     }
     }
 
 
     public int getRightMargin() {
     public int getRightMargin() {
-        return this.borderless_right_margin;
+        return borderless_right_margin;
     }
     }
 
 
     public int getBottomMargin() {
     public int getBottomMargin() {
-        return this.borderless_bottom_margin;
+        return borderless_bottom_margin;
     }
     }
 
 
     public int getBorderLeftMargin() {
     public int getBorderLeftMargin() {
-        return this.border_left_margin;
+        return border_left_margin;
     }
     }
 
 
     public int getBorderTopMargin() {
     public int getBorderTopMargin() {
-        return this.border_top_margin;
+        return border_top_margin;
     }
     }
 
 
     public int getBorderRightMargin() {
     public int getBorderRightMargin() {
-        return this.border_right_margin;
+        return border_right_margin;
     }
     }
 
 
     public int getBorderBottomMargin() {
     public int getBorderBottomMargin() {
-        return this.border_bottom_margin;
+        return border_bottom_margin;
     }
     }
 
 
     public int getPaper_width() {
     public int getPaper_width() {
-        return this.paper_width;
+        return paper_width;
     }
     }
 
 
     public void setPaper_width(int i) {
     public void setPaper_width(int i) {
-        this.paper_width = i;
+        paper_width = i;
     }
     }
 
 
     public Info_paper(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8) {
     public Info_paper(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8) {
-        this.paper_height = i2;
-        this.paper_width = i;
-        this.paper_height_boder = i4;
-        this.paper_height_boderless = i8;
-        this.paper_width_boder = i3;
-        this.paper_width_boderless = i7;
-        int i9 = this.paper_width;
-        int i10 = this.paper_width_boder;
-        this.border_left_margin = (i9 - i10) / 2;
-        int i11 = this.paper_height;
-        int i12 = this.paper_height_boder;
-        this.border_top_margin = (i11 - i12) / 2;
-        this.border_right_margin = (i9 - i10) / 2;
-        this.border_bottom_margin = (i11 - i12) / 2;
-        this.borderless_left_margin = i5;
-        this.borderless_top_margin = i6;
-        this.borderless_right_margin = (this.paper_width_boderless - i9) - i5;
-        this.borderless_bottom_margin = (this.paper_height_boderless - i11) - i6;
+        paper_height = i2;
+        paper_width = i;
+        paper_height_boder = i4;
+        paper_height_boderless = i8;
+        paper_width_boder = i3;
+        paper_width_boderless = i7;
+        int i9 = paper_width;
+        int i10 = paper_width_boder;
+        border_left_margin = (i9 - i10) / 2;
+        int i11 = paper_height;
+        int i12 = paper_height_boder;
+        border_top_margin = (i11 - i12) / 2;
+        border_right_margin = (i9 - i10) / 2;
+        border_bottom_margin = (i11 - i12) / 2;
+        borderless_left_margin = i5;
+        borderless_top_margin = i6;
+        borderless_right_margin = (this.paper_width_boderless - i9) - i5;
+        borderless_bottom_margin = (this.paper_height_boderless - i11) - i6;
     }
     }
 
 
     public Info_paper(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13, int i14) {
     public Info_paper(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13, int i14) {
-        this.paper_height = i2;
-        this.paper_width = i;
-        this.paper_height_boder = i4;
-        this.paper_height_boderless = i8;
-        this.paper_width_boder = i3;
-        this.paper_width_boderless = i7;
-        this.border_left_margin = i9;
-        this.border_top_margin = i10;
-        this.border_right_margin = i11;
-        this.border_bottom_margin = i12;
-        this.borderless_left_margin = i5;
-        this.borderless_top_margin = i6;
-        this.borderless_right_margin = i13;
-        this.borderless_bottom_margin = i14;
+        paper_height = i2;
+        paper_width = i;
+        paper_height_boder = i4;
+        paper_height_boderless = i8;
+        paper_width_boder = i3;
+        paper_width_boderless = i7;
+        border_left_margin = i9;
+        border_top_margin = i10;
+        border_right_margin = i11;
+        border_bottom_margin = i12;
+        borderless_left_margin = i5;
+        borderless_top_margin = i6;
+        borderless_right_margin = i13;
+        borderless_bottom_margin = i14;
     }
     }
 }
 }

+ 321 - 321
app/src/main/java/com/epson/mobilephone/common/escpr/MediaInfo.java

@@ -194,122 +194,122 @@ public interface MediaInfo {
 
 
         public int getStringId(int i) {
         public int getStringId(int i) {
             if (this.sCodeTable.containsKey(Integer.valueOf(i))) {
             if (this.sCodeTable.containsKey(Integer.valueOf(i))) {
-                return this.sCodeTable.get(Integer.valueOf(i)).intValue();
+                return sCodeTable.get(Integer.valueOf(i)).intValue();
             }
             }
-            return this.sCodeTable.get(0).intValue();
+            return sCodeTable.get(0).intValue();
         }
         }
 
 
         public boolean putID(int i, int i2) {
         public boolean putID(int i, int i2) {
             if (!this.sCodeTable.containsKey(Integer.valueOf(i))) {
             if (!this.sCodeTable.containsKey(Integer.valueOf(i))) {
                 return false;
                 return false;
             }
             }
-            this.sCodeTable.put(Integer.valueOf(i), Integer.valueOf(i2));
+            sCodeTable.put(Integer.valueOf(i), Integer.valueOf(i2));
             return true;
             return true;
         }
         }
 
 
         public int getID(int i) {
         public int getID(int i) {
             if (this.sCodeTable.containsKey(Integer.valueOf(i))) {
             if (this.sCodeTable.containsKey(Integer.valueOf(i))) {
-                return this.sCodeTable.get(Integer.valueOf(i)).intValue();
+                return sCodeTable.get(Integer.valueOf(i)).intValue();
             }
             }
             return -1;
             return -1;
         }
         }
 
 
         public Enumeration getKeys() {
         public Enumeration getKeys() {
-            return this.sCodeTable.keys();
+            return sCodeTable.keys();
         }
         }
 
 
         public void destructor() {
         public void destructor() {
-            this.sCodeTable.clear();
+            sCodeTable.clear();
         }
         }
     }
     }
 
 
     public static class PaperSize extends AbstractInfo {
     public static class PaperSize extends AbstractInfo {
         public PaperSize() {
         public PaperSize() {
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A4));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_LETTER.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_LETTER));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_LEGAL.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_LEGAL));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A5));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A6.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A6));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_B5));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_EXECUTIVE.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_EXECUTIVE));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HALFLETTER.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_HALFLETTER));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PANORAMIC.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_PANORAMIC));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_TRIM_4X6.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_TRIM_4X6));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_4X6.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_4X6));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_5X8.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_5X8));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8X10.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_8X10));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_10X15.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_10X15));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_200X300.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_200X300));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_L));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_POSTCARD.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_POSTCARD));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_DBLPOSTCARD.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_DBLPOSTCARD));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_10_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_10_L));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C6_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_C6_L));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_DL_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_DL_L));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_NEWEVN_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_NEWEVN_L));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CHOKEI_3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_CHOKEI_3));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CHOKEI_4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_CHOKEI_4));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_1.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_1));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_2.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_2));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_3));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_4));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_2L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_2L));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_10_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_10_P));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C6_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_C6_P));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_DL_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_DL_P));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_NEWENV_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_NEWENV_P));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_MEISHI.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_MEISHI));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_BUZCARD_89X50.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_BUZCARD_89X50));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CARD_54X86.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_CARD_54X86));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_BUZCARD_55X91.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_BUZCARD_55X91));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ALBUM_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ALBUM_L));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ALBUM_A5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ALBUM_A5));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_L_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_PALBUM_L_L));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_2L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_PALBUM_2L));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_A5_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_PALBUM_A5_L));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_A4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_PALBUM_A4));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HIVISION.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_HIVISION));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_KAKU_2.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_KAKU_2));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C4_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_C4_P));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B6.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_B6));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_KAKU_20.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_KAKU_20));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A5_24HOLE.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A5_24HOLE));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CHOKEI_40.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_CHOKEI_40));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_QUADRAPLEPOSTCARD.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_QUADRAPLEPOSTCARD));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_0.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_0));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C5_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_C5_P));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_6.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_6));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_MEXICO_OFICIO.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_MEXICO_OFICIO));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_OFICIO9.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_OFICIO9));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_INDIAN_LEGAL.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_INDIAN_LEGAL));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A3NOBI.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A3NOBI));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A3));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_B4));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USB.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_USB));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_11X14.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_11X14));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_B3));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A2.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A2));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USC.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_USC));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_10X12.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_10X12));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_12X12.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_12X12));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SP1.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SP1));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SP2.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SP2));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SP3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SP3));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SP4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SP4));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SP5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SP5));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_16K.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_16K));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8K.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_8K));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SRA3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SRA3));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_12X18.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_12X18));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8_5X13.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_8_5X13));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SQUARE_8_27.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SQUARE_8_27));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SQUARE_5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SQUARE_5));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USER.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_USER));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8X10_5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_8X10_5));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8_27X13.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_8_27X13));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_B5_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_B5_P));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HALFCUT.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_HALFCUT));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_16X20.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_16X20));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A4));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_LETTER.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_LETTER));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_LEGAL.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_LEGAL));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A5));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A6.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A6));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_B5));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_EXECUTIVE.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_EXECUTIVE));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HALFLETTER.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_HALFLETTER));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PANORAMIC.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_PANORAMIC));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_TRIM_4X6.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_TRIM_4X6));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_4X6.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_4X6));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_5X8.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_5X8));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8X10.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_8X10));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_10X15.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_10X15));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_200X300.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_200X300));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_L));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_POSTCARD.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_POSTCARD));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_DBLPOSTCARD.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_DBLPOSTCARD));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_10_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_10_L));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C6_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_C6_L));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_DL_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_DL_L));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_NEWEVN_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_NEWEVN_L));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CHOKEI_3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_CHOKEI_3));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CHOKEI_4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_CHOKEI_4));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_1.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_1));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_2.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_2));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_3));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_4));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_2L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_2L));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_10_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_10_P));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C6_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_C6_P));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_DL_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_DL_P));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_NEWENV_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_NEWENV_P));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_MEISHI.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_MEISHI));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_BUZCARD_89X50.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_BUZCARD_89X50));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CARD_54X86.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_CARD_54X86));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_BUZCARD_55X91.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_BUZCARD_55X91));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ALBUM_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ALBUM_L));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ALBUM_A5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ALBUM_A5));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_L_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_PALBUM_L_L));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_2L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_PALBUM_2L));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_A5_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_PALBUM_A5_L));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_A4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_PALBUM_A4));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HIVISION.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_HIVISION));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_KAKU_2.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_KAKU_2));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C4_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_C4_P));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B6.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_B6));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_KAKU_20.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_KAKU_20));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A5_24HOLE.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A5_24HOLE));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CHOKEI_40.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_CHOKEI_40));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_QUADRAPLEPOSTCARD.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_QUADRAPLEPOSTCARD));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_0.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_0));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C5_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_C5_P));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_6.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_6));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_MEXICO_OFICIO.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_MEXICO_OFICIO));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_OFICIO9.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_OFICIO9));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_INDIAN_LEGAL.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_INDIAN_LEGAL));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A3NOBI.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A3NOBI));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A3));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_B4));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USB.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_USB));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_11X14.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_11X14));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_B3));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A2.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A2));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USC.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_USC));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_10X12.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_10X12));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_12X12.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_12X12));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SP1.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SP1));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SP2.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SP2));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SP3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SP3));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SP4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SP4));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SP5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SP5));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_16K.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_16K));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8K.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_8K));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SRA3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SRA3));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_12X18.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_12X18));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8_5X13.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_8_5X13));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SQUARE_8_27.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SQUARE_8_27));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SQUARE_5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SQUARE_5));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USER.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_USER));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8X10_5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_8X10_5));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8_27X13.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_8_27X13));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_B5_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_B5_P));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HALFCUT.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_HALFCUT));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_16X20.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_16X20));
         }
         }
     }
     }
 
 
@@ -318,7 +318,7 @@ public interface MediaInfo {
 
 
         public Info_paper getStringId(int i) {
         public Info_paper getStringId(int i) {
             if (this.sCodeTable.containsKey(Integer.valueOf(i))) {
             if (this.sCodeTable.containsKey(Integer.valueOf(i))) {
-                return this.sCodeTable.get(Integer.valueOf(i));
+                return sCodeTable.get(Integer.valueOf(i));
             }
             }
             return null;
             return null;
         }
         }
@@ -328,13 +328,13 @@ public interface MediaInfo {
                 return new Info_paper(2098, 2976, 1816, 2694, 0, 0, 2098, 2976, 141, 141, 141, 141, 0, 0);
                 return new Info_paper(2098, 2976, 1816, 2694, 0, 0, 2098, 2976, 141, 141, 141, 141, 0, 0);
             }
             }
             if (this.sCodeTable.containsKey(Integer.valueOf(i))) {
             if (this.sCodeTable.containsKey(Integer.valueOf(i))) {
-                return this.sCodeTable.get(Integer.valueOf(i));
+                return sCodeTable.get(Integer.valueOf(i));
             }
             }
             return null;
             return null;
         }
         }
 
 
         public void destructor() {
         public void destructor() {
-            this.sCodeTable.clear();
+            sCodeTable.clear();
         }
         }
     }
     }
 
 
@@ -380,7 +380,7 @@ public interface MediaInfo {
                             i9 = i22;
                             i9 = i22;
                         }
                         }
                     }
                     }
-                    this.sCodeTable.put(Integer.valueOf(eps_print_area_info.sizeList[i].mediaSizeID), new Info_paper(i2, i3, i4, i5, i6, i7, i8, i9, i10, i11, i12, i13, i14, i15));
+                    sCodeTable.put(Integer.valueOf(eps_print_area_info.sizeList[i].mediaSizeID), new Info_paper(i2, i3, i4, i5, i6, i7, i8, i9, i10, i11, i12, i13, i14, i15));
                 }
                 }
                 return;
                 return;
             }
             }
@@ -392,292 +392,292 @@ public interface MediaInfo {
         }
         }
 
 
         private void presetPaperSize() {
         private void presetPaperSize() {
-            this.sCodeTable.put(0, new Info_paper(2976, 4209, 2892, 4125, -36, -42, 3048, 4321));
-            this.sCodeTable.put(1, new Info_paper(3060, 3960, 2976, 3876, -36, -42, 3132, 4072));
-            this.sCodeTable.put(2, new Info_paper(3060, 5040, 2976, 4956, -36, -42, 3132, 5152));
-            this.sCodeTable.put(3, new Info_paper(2098, 2976, 2014, 2892, -36, -42, 2170, 3088));
-            this.sCodeTable.put(4, new Info_paper(1488, 2098, 1404, 2014, -36, -42, 1560, 2210));
-            this.sCodeTable.put(5, new Info_paper(2580, 3643, 2496, 3559, -36, -42, 2652, 3755));
-            this.sCodeTable.put(6, new Info_paper(2611, 3780, 2527, 3696, -36, -42, 2683, 3892));
-            this.sCodeTable.put(7, new Info_paper(1980, 3060, 1896, 2976, -36, -42, 2052, 3172));
-            this.sCodeTable.put(8, new Info_paper(2976, 8419, 2892, 8335, -36, -42, 3048, 8531));
-            this.sCodeTable.put(9, new Info_paper(Videoio.CAP_OPENNI2_ASUS, 2330, 1526, 2246, -36, -42, 1682, 2442));
-            this.sCodeTable.put(10, new Info_paper(1440, 2160, 1356, 2076, -36, -42, 1512, 2272));
-            this.sCodeTable.put(11, new Info_paper(1800, 2880, 1716, 2796, -36, -42, 1872, 2992));
-            this.sCodeTable.put(12, new Info_paper(2880, 3600, 2796, 3516, -36, -42, 2952, 3712));
-            this.sCodeTable.put(13, new Info_paper(1417, 2125, 1333, 2041, -36, -42, 1489, 2237));
-            this.sCodeTable.put(14, new Info_paper(3061, 4790, 2977, 4706, -36, -42, 3133, 4902));
-            this.sCodeTable.put(15, new Info_paper(1261, 1800, 1177, 1716, -36, -42, 1333, 1912));
-            this.sCodeTable.put(16, new Info_paper(1417, 2098, 1333, 2014, -36, -42, 1489, 2210));
-            this.sCodeTable.put(17, new Info_paper(2835, 2098, 2751, 2014, -36, -42, 2907, 2210));
-            this.sCodeTable.put(18, new Info_paper(3420, 1485, 3336, 1401, -36, -42, 3492, 1597));
-            this.sCodeTable.put(19, new Info_paper(2296, 1616, 2212, 1532, -36, -42, 2368, 1728));
-            this.sCodeTable.put(20, new Info_paper(3118, 1559, 3034, 1475, -36, -42, 3190, 1671));
-            this.sCodeTable.put(21, new Info_paper(3118, 1871, 3034, 1787, -36, -42, 3190, 1983));
-            this.sCodeTable.put(22, new Info_paper(1701, 3331, 1561, 3006, -36, -42, 1773, 3443));
-            this.sCodeTable.put(23, new Info_paper(1276, 2906, 1136, 2581, -36, -42, 1348, 3018));
-            this.sCodeTable.put(24, new Info_paper(1701, 2494, 1561, 2169, -36, -42, 1773, 2606));
-            this.sCodeTable.put(25, new Info_paper(1616, 2296, 1476, 1971, -36, -42, 1688, 2408));
-            this.sCodeTable.put(26, new Info_paper(1389, 2098, 1249, 1773, -36, -42, 1461, 2210));
-            this.sCodeTable.put(27, new Info_paper(1488, 3331, 1348, 3006, -36, -42, 1560, 3443));
-            this.sCodeTable.put(28, new Info_paper(1800, 2522, 1716, 2438, -36, -42, 1872, 2634));
-            this.sCodeTable.put(29, new Info_paper(1485, 3420, 1345, 3095, -36, -42, 1557, 3532));
-            this.sCodeTable.put(30, new Info_paper(1616, 2296, 1476, 1971, -36, -42, 1688, 2408));
-            this.sCodeTable.put(31, new Info_paper(1559, 3118, 1419, 2793, -36, -42, 1631, 3230));
-            this.sCodeTable.put(32, new Info_paper(1871, 3118, 1731, 2793, -36, -42, 1943, 3230));
-            this.sCodeTable.put(33, new Info_paper(1261, 779, 1177, 695, -36, -42, 1333, 891));
-            this.sCodeTable.put(34, new Info_paper(1261, 709, 1177, 625, -36, -42, 1333, 821));
-            this.sCodeTable.put(35, new Info_paper(765, 1219, 681, 1135, -36, -42, 837, 1331));
-            this.sCodeTable.put(36, new Info_paper(780, 1290, 696, 1206, -36, -42, 852, 1402));
-            this.sCodeTable.put(37, new Info_paper(1800, 2607, 1716, 2523, -36, -42, 1872, 2719));
-            this.sCodeTable.put(38, new Info_paper(2976, 4294, 2892, 4210, -36, -42, 3048, 4406));
-            this.sCodeTable.put(39, new Info_paper(1800, 1260, 1716, 1176, -36, -42, 1872, 1372));
-            this.sCodeTable.put(40, new Info_paper(1800, 2521, 1716, 2437, -36, -42, 1872, 2633));
-            this.sCodeTable.put(41, new Info_paper(2976, 2101, 2892, 2017, -36, -42, 3048, 2213));
-            this.sCodeTable.put(42, new Info_paper(2976, 4203, 2892, 4119, -36, -42, 3048, 4315));
-            this.sCodeTable.put(43, new Info_paper(1440, 2560, 1356, 2476, -36, -42, 1512, 2672));
-            this.sCodeTable.put(44, new Info_paper(3401, 4705, 2977, 4380, -36, -42, 3473, 4817));
-            this.sCodeTable.put(45, new Info_paper(3245, 4592, 2977, 4267, -36, -42, 3317, 4704));
-            this.sCodeTable.put(46, new Info_paper(1814, 2580, 1730, 2496, -48, -42, 1910, 2692));
-            this.sCodeTable.put(47, new Info_paper(3245, 4592, 2977, 4267, -36, -42, 3317, 4704));
-            this.sCodeTable.put(48, new Info_paper(2098, 2976, 1816, 2694, -36, -42, 2170, 3088));
-            this.sCodeTable.put(52, new Info_paper(1276, 3189, 1136, 2736, -36, -42, 1348, 3301));
-            this.sCodeTable.put(61, new Info_paper(4663, 6846, 4579, 6762, -48, -42, 4759, 6958));
-            this.sCodeTable.put(62, new Info_paper(4209, 5953, 4125, 5869, -48, -42, 4305, 6065));
-            this.sCodeTable.put(63, new Info_paper(3643, 5159, 3559, 5075, -48, -42, 3739, 5271));
-            this.sCodeTable.put(64, new Info_paper(3960, 6120, 3876, 6036, -48, -42, 4056, 6232));
-            this.sCodeTable.put(65, new Info_paper(3960, 5040, 3876, 4956, -48, -42, 4056, 5152));
-            this.sCodeTable.put(66, new Info_paper(5159, 7299, 5075, 7215, -48, -42, 5255, 7411));
-            this.sCodeTable.put(67, new Info_paper(5953, 8419, 5869, 8335, -48, -42, 6049, 8531));
-            this.sCodeTable.put(68, new Info_paper(6120, 7920, 6036, 7836, -48, -42, 6216, 8032));
-            this.sCodeTable.put(69, new Info_paper(3600, 4320, 3516, 4236, -48, -42, 3696, 4432));
-            this.sCodeTable.put(70, new Info_paper(4320, 4320, 4236, 4236, -48, -42, 4416, 4432));
-            this.sCodeTable.put(71, new Info_paper(2976, 3827, 2892, 3743, -36, -42, 3048, 3939));
-            this.sCodeTable.put(72, new Info_paper(2976, 2112, 2892, 2028, -36, -42, 3048, 2224));
-            this.sCodeTable.put(73, new Info_paper(1417, 2409, 1333, 2325, -36, -42, 1489, 2521));
-            this.sCodeTable.put(74, new Info_paper(1843, 2580, 1759, 2496, -36, -42, 1915, 2692));
-            this.sCodeTable.put(75, new Info_paper(2721, 1871, 2637, 1787, -36, -42, 2793, 1983));
-            this.sCodeTable.put(76, new Info_paper(2764, 3827, 2680, 3743, -36, -42, 2836, 3939));
-            this.sCodeTable.put(77, new Info_paper(3827, 5528, 3743, 5444, -36, -42, 3899, 5640));
-            this.sCodeTable.put(87, new Info_paper(2976, 2976, 2892, 2892, -36, -42, 3048, 3088));
-            this.sCodeTable.put(88, new Info_paper(1800, 1800, 1716, 1716, -36, -42, 1872, 1912));
-            this.sCodeTable.put(99, new Info_paper(0, 0, 0, 0, -36, -42, 0, 0));
-            this.sCodeTable.put(104, new Info_paper(2880, 3780, 2796, 3696, -36, -42, 2952, 3892));
-            this.sCodeTable.put(106, new Info_paper(2976, 4678, 2892, 4594, -36, -42, 3048, 4790));
-            this.sCodeTable.put(111, new Info_paper(2494, 3543, 2354, 3218, -36, -42, 2566, 3655));
-            this.sCodeTable.put(128, new Info_paper(5040, 6120, 4956, 6036, -36, -42, 5112, 6232));
-            this.sCodeTable.put(129, new Info_paper(5760, 7200, 5676, 7116, -36, -42, 5832, 7312));
-            this.sCodeTable.put(255, new Info_paper(0, 0, 0, 0, 0, 0, 0, 0));
+            sCodeTable.put(0, new Info_paper(2976, 4209, 2892, 4125, -36, -42, 3048, 4321));
+            sCodeTable.put(1, new Info_paper(3060, 3960, 2976, 3876, -36, -42, 3132, 4072));
+            sCodeTable.put(2, new Info_paper(3060, 5040, 2976, 4956, -36, -42, 3132, 5152));
+            sCodeTable.put(3, new Info_paper(2098, 2976, 2014, 2892, -36, -42, 2170, 3088));
+            sCodeTable.put(4, new Info_paper(1488, 2098, 1404, 2014, -36, -42, 1560, 2210));
+            sCodeTable.put(5, new Info_paper(2580, 3643, 2496, 3559, -36, -42, 2652, 3755));
+            sCodeTable.put(6, new Info_paper(2611, 3780, 2527, 3696, -36, -42, 2683, 3892));
+            sCodeTable.put(7, new Info_paper(1980, 3060, 1896, 2976, -36, -42, 2052, 3172));
+            sCodeTable.put(8, new Info_paper(2976, 8419, 2892, 8335, -36, -42, 3048, 8531));
+            sCodeTable.put(9, new Info_paper(Videoio.CAP_OPENNI2_ASUS, 2330, 1526, 2246, -36, -42, 1682, 2442));
+            sCodeTable.put(10, new Info_paper(1440, 2160, 1356, 2076, -36, -42, 1512, 2272));
+            sCodeTable.put(11, new Info_paper(1800, 2880, 1716, 2796, -36, -42, 1872, 2992));
+            sCodeTable.put(12, new Info_paper(2880, 3600, 2796, 3516, -36, -42, 2952, 3712));
+            sCodeTable.put(13, new Info_paper(1417, 2125, 1333, 2041, -36, -42, 1489, 2237));
+            sCodeTable.put(14, new Info_paper(3061, 4790, 2977, 4706, -36, -42, 3133, 4902));
+            sCodeTable.put(15, new Info_paper(1261, 1800, 1177, 1716, -36, -42, 1333, 1912));
+            sCodeTable.put(16, new Info_paper(1417, 2098, 1333, 2014, -36, -42, 1489, 2210));
+            sCodeTable.put(17, new Info_paper(2835, 2098, 2751, 2014, -36, -42, 2907, 2210));
+            sCodeTable.put(18, new Info_paper(3420, 1485, 3336, 1401, -36, -42, 3492, 1597));
+            sCodeTable.put(19, new Info_paper(2296, 1616, 2212, 1532, -36, -42, 2368, 1728));
+            sCodeTable.put(20, new Info_paper(3118, 1559, 3034, 1475, -36, -42, 3190, 1671));
+            sCodeTable.put(21, new Info_paper(3118, 1871, 3034, 1787, -36, -42, 3190, 1983));
+            sCodeTable.put(22, new Info_paper(1701, 3331, 1561, 3006, -36, -42, 1773, 3443));
+            sCodeTable.put(23, new Info_paper(1276, 2906, 1136, 2581, -36, -42, 1348, 3018));
+            sCodeTable.put(24, new Info_paper(1701, 2494, 1561, 2169, -36, -42, 1773, 2606));
+            sCodeTable.put(25, new Info_paper(1616, 2296, 1476, 1971, -36, -42, 1688, 2408));
+            sCodeTable.put(26, new Info_paper(1389, 2098, 1249, 1773, -36, -42, 1461, 2210));
+            sCodeTable.put(27, new Info_paper(1488, 3331, 1348, 3006, -36, -42, 1560, 3443));
+            sCodeTable.put(28, new Info_paper(1800, 2522, 1716, 2438, -36, -42, 1872, 2634));
+            sCodeTable.put(29, new Info_paper(1485, 3420, 1345, 3095, -36, -42, 1557, 3532));
+            sCodeTable.put(30, new Info_paper(1616, 2296, 1476, 1971, -36, -42, 1688, 2408));
+            sCodeTable.put(31, new Info_paper(1559, 3118, 1419, 2793, -36, -42, 1631, 3230));
+            sCodeTable.put(32, new Info_paper(1871, 3118, 1731, 2793, -36, -42, 1943, 3230));
+            sCodeTable.put(33, new Info_paper(1261, 779, 1177, 695, -36, -42, 1333, 891));
+            sCodeTable.put(34, new Info_paper(1261, 709, 1177, 625, -36, -42, 1333, 821));
+            sCodeTable.put(35, new Info_paper(765, 1219, 681, 1135, -36, -42, 837, 1331));
+            sCodeTable.put(36, new Info_paper(780, 1290, 696, 1206, -36, -42, 852, 1402));
+            sCodeTable.put(37, new Info_paper(1800, 2607, 1716, 2523, -36, -42, 1872, 2719));
+            sCodeTable.put(38, new Info_paper(2976, 4294, 2892, 4210, -36, -42, 3048, 4406));
+            sCodeTable.put(39, new Info_paper(1800, 1260, 1716, 1176, -36, -42, 1872, 1372));
+            sCodeTable.put(40, new Info_paper(1800, 2521, 1716, 2437, -36, -42, 1872, 2633));
+            sCodeTable.put(41, new Info_paper(2976, 2101, 2892, 2017, -36, -42, 3048, 2213));
+            sCodeTable.put(42, new Info_paper(2976, 4203, 2892, 4119, -36, -42, 3048, 4315));
+            sCodeTable.put(43, new Info_paper(1440, 2560, 1356, 2476, -36, -42, 1512, 2672));
+            sCodeTable.put(44, new Info_paper(3401, 4705, 2977, 4380, -36, -42, 3473, 4817));
+            sCodeTable.put(45, new Info_paper(3245, 4592, 2977, 4267, -36, -42, 3317, 4704));
+            sCodeTable.put(46, new Info_paper(1814, 2580, 1730, 2496, -48, -42, 1910, 2692));
+            sCodeTable.put(47, new Info_paper(3245, 4592, 2977, 4267, -36, -42, 3317, 4704));
+            sCodeTable.put(48, new Info_paper(2098, 2976, 1816, 2694, -36, -42, 2170, 3088));
+            sCodeTable.put(52, new Info_paper(1276, 3189, 1136, 2736, -36, -42, 1348, 3301));
+            sCodeTable.put(61, new Info_paper(4663, 6846, 4579, 6762, -48, -42, 4759, 6958));
+            sCodeTable.put(62, new Info_paper(4209, 5953, 4125, 5869, -48, -42, 4305, 6065));
+            sCodeTable.put(63, new Info_paper(3643, 5159, 3559, 5075, -48, -42, 3739, 5271));
+            sCodeTable.put(64, new Info_paper(3960, 6120, 3876, 6036, -48, -42, 4056, 6232));
+            sCodeTable.put(65, new Info_paper(3960, 5040, 3876, 4956, -48, -42, 4056, 5152));
+            sCodeTable.put(66, new Info_paper(5159, 7299, 5075, 7215, -48, -42, 5255, 7411));
+            sCodeTable.put(67, new Info_paper(5953, 8419, 5869, 8335, -48, -42, 6049, 8531));
+            sCodeTable.put(68, new Info_paper(6120, 7920, 6036, 7836, -48, -42, 6216, 8032));
+            sCodeTable.put(69, new Info_paper(3600, 4320, 3516, 4236, -48, -42, 3696, 4432));
+            sCodeTable.put(70, new Info_paper(4320, 4320, 4236, 4236, -48, -42, 4416, 4432));
+            sCodeTable.put(71, new Info_paper(2976, 3827, 2892, 3743, -36, -42, 3048, 3939));
+            sCodeTable.put(72, new Info_paper(2976, 2112, 2892, 2028, -36, -42, 3048, 2224));
+            sCodeTable.put(73, new Info_paper(1417, 2409, 1333, 2325, -36, -42, 1489, 2521));
+            sCodeTable.put(74, new Info_paper(1843, 2580, 1759, 2496, -36, -42, 1915, 2692));
+            sCodeTable.put(75, new Info_paper(2721, 1871, 2637, 1787, -36, -42, 2793, 1983));
+            sCodeTable.put(76, new Info_paper(2764, 3827, 2680, 3743, -36, -42, 2836, 3939));
+            sCodeTable.put(77, new Info_paper(3827, 5528, 3743, 5444, -36, -42, 3899, 5640));
+            sCodeTable.put(87, new Info_paper(2976, 2976, 2892, 2892, -36, -42, 3048, 3088));
+            sCodeTable.put(88, new Info_paper(1800, 1800, 1716, 1716, -36, -42, 1872, 1912));
+            sCodeTable.put(99, new Info_paper(0, 0, 0, 0, -36, -42, 0, 0));
+            sCodeTable.put(104, new Info_paper(2880, 3780, 2796, 3696, -36, -42, 2952, 3892));
+            sCodeTable.put(106, new Info_paper(2976, 4678, 2892, 4594, -36, -42, 3048, 4790));
+            sCodeTable.put(111, new Info_paper(2494, 3543, 2354, 3218, -36, -42, 2566, 3655));
+            sCodeTable.put(128, new Info_paper(5040, 6120, 4956, 6036, -36, -42, 5112, 6232));
+            sCodeTable.put(129, new Info_paper(5760, 7200, 5676, 7116, -36, -42, 5832, 7312));
+            sCodeTable.put(255, new Info_paper(0, 0, 0, 0, 0, 0, 0, 0));
         }
         }
     }
     }
 
 
     public static class PaperType extends AbstractInfo {
     public static class PaperType extends AbstractInfo {
         public PaperType() {
         public PaperType() {
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLAIN));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_IRON.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_IRON));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PHOTOINKJET.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PHOTOINKJET));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_MATTE.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_MATTE));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PHOTO));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_MINIPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_MINIPHOTO));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PGPHOTO));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PSPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PSPHOTO));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLPHOTO));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_ARCHMATTE.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_ARCHMATTE));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_WATERCOLOR.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_WATERCOLOR));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_ECOPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_ECOPHOTO));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_VELVETFINEART.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_VELVETFINEART));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_HAGAKIRECL.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_HAGAKIRECL));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_HAGAKIINKJET.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_HAGAKIINKJET));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PHOTOINKJET2.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PHOTOINKJET2));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_MATTEMEISHI.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_MATTEMEISHI));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_HAGAKIATENA.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_HAGAKIATENA));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_ENVELOPE.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_ENVELOPE));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLATINA.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLATINA));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_ULTRASMOOTH.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_ULTRASMOOTH));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_SFHAGAKI.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_SFHAGAKI));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PHOTOSTD.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PHOTOSTD));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_GLOSSYHAGAKI.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_GLOSSYHAGAKI));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_GLOSSYPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_GLOSSYPHOTO));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_GLOSSYCAST.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_GLOSSYCAST));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_BSMATTE_DS.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_BSMATTE_DS));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_3D.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_3D));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_LCPP.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_LCPP));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PREPRINTED.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PREPRINTED));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_LETTERHEAD.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_LETTERHEAD));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_RECYCLED.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_RECYCLED));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_COLOR.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_COLOR));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_BUSINESS_PLAIN.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_BUSINESS_PLAIN));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN_ROLL_STICKER.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLAIN_ROLL_STICKER));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_GROSSY_ROLL_STICKER.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_GROSSY_ROLL_STICKER));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN1.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLAIN1));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN2.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLAIN2));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER1.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER1));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER2.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER2));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER3.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER3));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER4.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER4));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER5.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER5));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_HIGH_QUALITY_PLAIN.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_HIGH_QUALITY_PLAIN));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_BS_HALFGLOSSY_DS.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_BS_HALFGLOSSY_DS));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_CDDVD.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_CDDVD));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_CDDVDHIGH.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_CDDVDHIGH));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLOOFING_WHITE_MAT.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLOOFING_WHITE_MAT));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_BARYTA.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_BARYTA));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_AUTO_PLAIN.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_AUTO_PLAIN));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLAIN));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_IRON.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_IRON));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PHOTOINKJET.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PHOTOINKJET));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_MATTE.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_MATTE));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PHOTO));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_MINIPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_MINIPHOTO));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PGPHOTO));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PSPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PSPHOTO));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLPHOTO));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_ARCHMATTE.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_ARCHMATTE));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_WATERCOLOR.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_WATERCOLOR));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_ECOPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_ECOPHOTO));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_VELVETFINEART.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_VELVETFINEART));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_HAGAKIRECL.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_HAGAKIRECL));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_HAGAKIINKJET.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_HAGAKIINKJET));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PHOTOINKJET2.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PHOTOINKJET2));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_MATTEMEISHI.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_MATTEMEISHI));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_HAGAKIATENA.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_HAGAKIATENA));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_ENVELOPE.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_ENVELOPE));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLATINA.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLATINA));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_ULTRASMOOTH.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_ULTRASMOOTH));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_SFHAGAKI.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_SFHAGAKI));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PHOTOSTD.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PHOTOSTD));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_GLOSSYHAGAKI.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_GLOSSYHAGAKI));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_GLOSSYPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_GLOSSYPHOTO));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_GLOSSYCAST.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_GLOSSYCAST));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_BSMATTE_DS.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_BSMATTE_DS));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_3D.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_3D));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_LCPP.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_LCPP));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PREPRINTED.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PREPRINTED));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_LETTERHEAD.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_LETTERHEAD));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_RECYCLED.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_RECYCLED));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_COLOR.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_COLOR));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_BUSINESS_PLAIN.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_BUSINESS_PLAIN));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN_ROLL_STICKER.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLAIN_ROLL_STICKER));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_GROSSY_ROLL_STICKER.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_GROSSY_ROLL_STICKER));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN1.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLAIN1));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN2.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLAIN2));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER1.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER1));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER2.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER2));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER3.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER3));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER4.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER4));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER5.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER5));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_HIGH_QUALITY_PLAIN.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_HIGH_QUALITY_PLAIN));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_BS_HALFGLOSSY_DS.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_BS_HALFGLOSSY_DS));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_CDDVD.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_CDDVD));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_CDDVDHIGH.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_CDDVDHIGH));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLOOFING_WHITE_MAT.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLOOFING_WHITE_MAT));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_BARYTA.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_BARYTA));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_AUTO_PLAIN.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_AUTO_PLAIN));
         }
         }
     }
     }
 
 
     public static class Layout extends AbstractInfo {
     public static class Layout extends AbstractInfo {
         public Layout() {
         public Layout() {
-            this.sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_MLID_CUSTOM));
-            this.sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_MLID_BORDERLESS));
-            this.sCodeTable.put(2, Integer.valueOf(C1055R.string.EPS_MLID_BORDERS));
-            this.sCodeTable.put(4, Integer.valueOf(C1055R.string.EPS_MLID_CDLABEL));
+            sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_MLID_CUSTOM));
+            sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_MLID_BORDERLESS));
+            sCodeTable.put(2, Integer.valueOf(C1055R.string.EPS_MLID_BORDERS));
+            sCodeTable.put(4, Integer.valueOf(C1055R.string.EPS_MLID_CDLABEL));
         }
         }
     }
     }
 
 
     public static class Quality extends AbstractInfo {
     public static class Quality extends AbstractInfo {
         public Quality() {
         public Quality() {
-            this.sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_MQID_DRAFT));
-            this.sCodeTable.put(2, Integer.valueOf(C1055R.string.EPS_MQID_NORMAL));
-            this.sCodeTable.put(4, Integer.valueOf(C1055R.string.EPS_MQID_HIGH));
-            this.sCodeTable.put(128, Integer.valueOf(C1055R.string.EPS_MQID_BEST_PLAIN));
+            sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_MQID_DRAFT));
+            sCodeTable.put(2, Integer.valueOf(C1055R.string.EPS_MQID_NORMAL));
+            sCodeTable.put(4, Integer.valueOf(C1055R.string.EPS_MQID_HIGH));
+            sCodeTable.put(128, Integer.valueOf(C1055R.string.EPS_MQID_BEST_PLAIN));
         }
         }
     }
     }
 
 
     public static class PaperSource extends AbstractInfo {
     public static class PaperSource extends AbstractInfo {
         public PaperSource() {
         public PaperSource() {
-            this.sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_MPID_REAR));
-            this.sCodeTable.put(2, Integer.valueOf(C1055R.string.EPS_MPID_FRONT1));
-            this.sCodeTable.put(4, Integer.valueOf(C1055R.string.EPS_MPID_FRONT2));
-            this.sCodeTable.put(32, Integer.valueOf(C1055R.string.EPS_MPID_FRONT3));
-            this.sCodeTable.put(64, Integer.valueOf(C1055R.string.EPS_MPID_FRONT4));
-            this.sCodeTable.put(8, Integer.valueOf(C1055R.string.EPS_MPID_CDTRAY));
-            this.sCodeTable.put(32768, Integer.valueOf(C1055R.string.EPS_MPID_MPTRAY));
-            this.sCodeTable.put(16, Integer.valueOf(C1055R.string.EPS_MPID_REARMANUAL));
-            this.sCodeTable.put(512, Integer.valueOf(C1055R.string.EPS_MPID_MANUAL2));
-            this.sCodeTable.put(256, Integer.valueOf(C1055R.string.EPS_MPID_ROLL));
-            this.sCodeTable.put(1024, Integer.valueOf(C1055R.string.EPS_MPID_MPTRAY_IJ));
-            this.sCodeTable.put(2048, Integer.valueOf(C1055R.string.EPS_MPID_HIGHCAP));
-            this.sCodeTable.put(128, Integer.valueOf(C1055R.string.EPS_MPID_AUTO));
+            sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_MPID_REAR));
+            sCodeTable.put(2, Integer.valueOf(C1055R.string.EPS_MPID_FRONT1));
+            sCodeTable.put(4, Integer.valueOf(C1055R.string.EPS_MPID_FRONT2));
+            sCodeTable.put(32, Integer.valueOf(C1055R.string.EPS_MPID_FRONT3));
+            sCodeTable.put(64, Integer.valueOf(C1055R.string.EPS_MPID_FRONT4));
+            sCodeTable.put(8, Integer.valueOf(C1055R.string.EPS_MPID_CDTRAY));
+            sCodeTable.put(32768, Integer.valueOf(C1055R.string.EPS_MPID_MPTRAY));
+            sCodeTable.put(16, Integer.valueOf(C1055R.string.EPS_MPID_REARMANUAL));
+            sCodeTable.put(512, Integer.valueOf(C1055R.string.EPS_MPID_MANUAL2));
+            sCodeTable.put(256, Integer.valueOf(C1055R.string.EPS_MPID_ROLL));
+            sCodeTable.put(1024, Integer.valueOf(C1055R.string.EPS_MPID_MPTRAY_IJ));
+            sCodeTable.put(2048, Integer.valueOf(C1055R.string.EPS_MPID_HIGHCAP));
+            sCodeTable.put(128, Integer.valueOf(C1055R.string.EPS_MPID_AUTO));
         }
         }
     }
     }
 
 
     public static class PrintDate extends AbstractInfo {
     public static class PrintDate extends AbstractInfo {
         public PrintDate() {
         public PrintDate() {
-            this.sCodeTable.put(0, Integer.valueOf(C1055R.string.Off));
-            this.sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_PD_DATETYPE1));
-            this.sCodeTable.put(2, Integer.valueOf(C1055R.string.EPS_PD_DATETYPE2));
-            this.sCodeTable.put(3, Integer.valueOf(C1055R.string.EPS_PD_DATETYPE3));
+            sCodeTable.put(0, Integer.valueOf(C1055R.string.Off));
+            sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_PD_DATETYPE1));
+            sCodeTable.put(2, Integer.valueOf(C1055R.string.EPS_PD_DATETYPE2));
+            sCodeTable.put(3, Integer.valueOf(C1055R.string.EPS_PD_DATETYPE3));
         }
         }
     }
     }
 
 
     public static class PhotoeEhance extends AbstractInfo {
     public static class PhotoeEhance extends AbstractInfo {
         public PhotoeEhance() {
         public PhotoeEhance() {
-            this.sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_APF_ON));
-            this.sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_APF_OFF));
+            sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_APF_ON));
+            sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_APF_OFF));
         }
         }
     }
     }
 
 
     public static class Color extends AbstractInfo {
     public static class Color extends AbstractInfo {
         public Color() {
         public Color() {
-            this.sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_CM_COLOR));
-            this.sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_CM_MONOCHROME));
+            sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_CM_COLOR));
+            sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_CM_MONOCHROME));
         }
         }
     }
     }
 
 
     public static class Duplex extends AbstractInfo {
     public static class Duplex extends AbstractInfo {
         public Duplex() {
         public Duplex() {
-            this.sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_DUPLEX_NONE));
-            this.sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_DUPLEX_LONG));
-            this.sCodeTable.put(2, Integer.valueOf(C1055R.string.EPS_DUPLEX_SHORT));
+            sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_DUPLEX_NONE));
+            sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_DUPLEX_LONG));
+            sCodeTable.put(2, Integer.valueOf(C1055R.string.EPS_DUPLEX_SHORT));
         }
         }
     }
     }
 
 
     public static class FeedDirection extends AbstractInfo {
     public static class FeedDirection extends AbstractInfo {
         public FeedDirection() {
         public FeedDirection() {
-            this.sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_FEEDDIR_PORTRAIT));
-            this.sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_FEEDDIR_LANDSCAPE));
+            sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_FEEDDIR_PORTRAIT));
+            sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_FEEDDIR_LANDSCAPE));
         }
         }
     }
     }
 
 
     public static class PaperSizeType extends AbstractInfo {
     public static class PaperSizeType extends AbstractInfo {
         public PaperSizeType() {
         public PaperSizeType() {
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A4.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_LETTER.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_LEGAL.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A5.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A6.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B5.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_EXECUTIVE.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HALFLETTER.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PANORAMIC.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_TRIM_4X6.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_4X6.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_5X8.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8X10.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_10X15.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_200X300.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_POSTCARD.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_DBLPOSTCARD.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_10_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C6_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_DL_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_NEWEVN_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CHOKEI_3.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CHOKEI_4.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_1.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_2.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_3.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_4.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_2L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_10_P.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C6_P.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_DL_P.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_NEWENV_P.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_MEISHI.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_BUZCARD_89X50.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CARD_54X86.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_BUZCARD_55X91.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ALBUM_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ALBUM_A5.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_L_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_2L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_A5_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_A4.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HIVISION.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_KAKU_2.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C4_P.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B6.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_KAKU_20.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A3NOBI.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A3.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B4.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USB.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_11X14.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B3.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A2.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USC.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_10X12.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_12X12.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USER.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HALFCUT.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_16X20.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A4.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_LETTER.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_LEGAL.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A5.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A6.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B5.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_EXECUTIVE.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HALFLETTER.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PANORAMIC.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_TRIM_4X6.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_4X6.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_5X8.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8X10.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_10X15.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_200X300.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_POSTCARD.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_DBLPOSTCARD.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_10_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C6_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_DL_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_NEWEVN_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CHOKEI_3.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CHOKEI_4.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_1.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_2.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_3.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_4.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_2L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_10_P.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C6_P.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_DL_P.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_NEWENV_P.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_MEISHI.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_BUZCARD_89X50.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CARD_54X86.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_BUZCARD_55X91.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ALBUM_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ALBUM_A5.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_L_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_2L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_A5_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_A4.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HIVISION.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_KAKU_2.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C4_P.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B6.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_KAKU_20.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A3NOBI.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A3.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B4.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USB.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_11X14.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B3.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A2.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USC.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_10X12.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_12X12.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USER.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HALFCUT.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_16X20.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
         }
         }
     }
     }
 
 
     public static class ApfState extends AbstractInfo {
     public static class ApfState extends AbstractInfo {
         public ApfState() {
         public ApfState() {
-            this.sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_APF_OFF));
-            this.sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_APF_ON));
+            sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_APF_OFF));
+            sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_APF_ON));
         }
         }
     }
     }
 
 
     public static class SharpnessState extends AbstractInfo {
     public static class SharpnessState extends AbstractInfo {
         public SharpnessState() {
         public SharpnessState() {
-            this.sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_SHARPNESS_OFF));
-            this.sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_SHARPNESS_ON));
+            sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_SHARPNESS_OFF));
+            sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_SHARPNESS_ON));
         }
         }
     }
     }
 }
 }

+ 15 - 15
app/src/main/java/com/epson/mobilephone/common/guide/NoticeGuideActivity.java

@@ -59,19 +59,19 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
         setContentView(C0907R.layout.activity_notice_guide);
         setContentView(C0907R.layout.activity_notice_guide);
         Intent intent = getIntent();
         Intent intent = getIntent();
         if (intent != null) {
         if (intent != null) {
-            this.htmlpath = intent.getStringArrayListExtra(KEY_HTML_PATH);
+            htmlpath = intent.getStringArrayListExtra(KEY_HTML_PATH);
             if (this.htmlpath.size() == 0) {
             if (this.htmlpath.size() == 0) {
                 finish();
                 finish();
             }
             }
-            this.boot_mode = intent.getIntExtra(KEY_BOOT_MODE, 0);
-            this.boot_group = intent.getStringExtra(KEY_BOOT_GROUP);
-            this.dialog_mode = intent.getIntExtra(KEY_DIALOG_MODE, 0);
-            this.version = intent.getIntExtra(KEY_GUIDE_VER, 0);
+            boot_mode = intent.getIntExtra(KEY_BOOT_MODE, 0);
+            boot_group = intent.getStringExtra(KEY_BOOT_GROUP);
+            dialog_mode = intent.getIntExtra(KEY_DIALOG_MODE, 0);
+            version = intent.getIntExtra(KEY_GUIDE_VER, 0);
             mDialogTextMessage = intent.getStringExtra(KEY_DIALOG_TITLE);
             mDialogTextMessage = intent.getStringExtra(KEY_DIALOG_TITLE);
             mDialogButtonYes = intent.getStringExtra(KEY_DIALOG_BUTTON_YES);
             mDialogButtonYes = intent.getStringExtra(KEY_DIALOG_BUTTON_YES);
             mDialogButtonNo = intent.getStringExtra(KEY_DIALOG_BUTTON_NO);
             mDialogButtonNo = intent.getStringExtra(KEY_DIALOG_BUTTON_NO);
             if (this.boot_group != null) {
             if (this.boot_group != null) {
-                this.SP_KEY_GUIDE_VER += "-" + this.boot_group;
+                SP_KEY_GUIDE_VER += "-" + boot_group;
             }
             }
         }
         }
         if (this.boot_mode == MODE_AUTO) {
         if (this.boot_mode == MODE_AUTO) {
@@ -80,7 +80,7 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
             }
             }
         }
         }
         final MyPageAdapter myPageAdapter = new MyPageAdapter();
         final MyPageAdapter myPageAdapter = new MyPageAdapter();
-        mAdapter = new MyFragmentStatePagerAdapter(getSupportFragmentManager(), this.htmlpath);
+        mAdapter = new MyFragmentStatePagerAdapter(getSupportFragmentManager(), htmlpath);
         mViewPager = (MyViewPager) findViewById(C0907R.C0909id.guideViewPager);
         mViewPager = (MyViewPager) findViewById(C0907R.C0909id.guideViewPager);
         mViewPager.setAdapter(mAdapter);
         mViewPager.setAdapter(mAdapter);
         mViewPager.setOffscreenPageLimit(2);
         mViewPager.setOffscreenPageLimit(2);
@@ -101,7 +101,7 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
         mGuideDialogView = (LinearLayout) findViewById(C0907R.C0909id.guide_dialog_layout);
         mGuideDialogView = (LinearLayout) findViewById(C0907R.C0909id.guide_dialog_layout);
         mGrayLine_Hor = findViewById(C0907R.C0909id.guide_dialog_horizon_gray_line);
         mGrayLine_Hor = findViewById(C0907R.C0909id.guide_dialog_horizon_gray_line);
         mDialogText = (TextView) findViewById(C0907R.C0909id.guide_dialog_message);
         mDialogText = (TextView) findViewById(C0907R.C0909id.guide_dialog_message);
-        int i = this.dialog_mode;
+        int i = dialog_mode;
         if (i == DIALOG_MODE_ON || i == DIALOG_MODE_ONLY_BUTTON) {
         if (i == DIALOG_MODE_ON || i == DIALOG_MODE_ONLY_BUTTON) {
             mGuideDialogView.setVisibility(0);
             mGuideDialogView.setVisibility(0);
             ViewGroup.MarginLayoutParams marginLayoutParams = (ViewGroup.MarginLayoutParams) mGuideDialogView.getLayoutParams();
             ViewGroup.MarginLayoutParams marginLayoutParams = (ViewGroup.MarginLayoutParams) mGuideDialogView.getLayoutParams();
@@ -147,7 +147,7 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
 
 
     public void onClickClose() {
     public void onClickClose() {
         if (this.boot_mode == MODE_AUTO) {
         if (this.boot_mode == MODE_AUTO) {
-            PreferenceManager.getDefaultSharedPreferences(this).edit().putInt(this.SP_KEY_GUIDE_VER, this.version).apply();
+            PreferenceManager.getDefaultSharedPreferences(this).edit().putInt(this.SP_KEY_GUIDE_VER, version).apply();
         }
         }
         finish();
         finish();
     }
     }
@@ -176,18 +176,18 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
 
 
         private MyFragmentStatePagerAdapter(FragmentManager fragmentManager, ArrayList<String> arrayList) {
         private MyFragmentStatePagerAdapter(FragmentManager fragmentManager, ArrayList<String> arrayList) {
             super(fragmentManager);
             super(fragmentManager);
-            this.HTML_PAGE = new ArrayList<>();
-            this.PAGE_LENGTH = 0;
-            this.HTML_PAGE = arrayList;
-            this.PAGE_LENGTH = arrayList.size();
+            HTML_PAGE = new ArrayList<>();
+            PAGE_LENGTH = 0;
+            HTML_PAGE = arrayList;
+            PAGE_LENGTH = arrayList.size();
         }
         }
 
 
         public Fragment getItem(int i) {
         public Fragment getItem(int i) {
-            return GuideWebviewFragment.newInstance(String.format(Locale.US, this.HTML_PAGE.get(i), new Object[]{Integer.valueOf(i + 1)}));
+            return GuideWebviewFragment.newInstance(String.format(Locale.US, HTML_PAGE.get(i), new Object[]{Integer.valueOf(i + 1)}));
         }
         }
 
 
         public int getCount() {
         public int getCount() {
-            return this.PAGE_LENGTH;
+            return PAGE_LENGTH;
         }
         }
     }
     }
 
 

+ 3 - 3
app/src/main/java/com/epson/mobilephone/common/keyenc/SecureKeyFactory.java

@@ -32,7 +32,7 @@ public class SecureKeyFactory {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
         mAppContext = context.getApplicationContext();
         mAppContext = context.getApplicationContext();
-        this.key = navite_getKey(mAppContext);
+        key = navite_getKey(mAppContext);
     }
     }
 
 
     public static SecureKeyFactory getInstance(Context context) {
     public static SecureKeyFactory getInstance(Context context) {
@@ -96,10 +96,10 @@ public class SecureKeyFactory {
     public String Decode(String str) {
     public String Decode(String str) {
         byte[] decode;
         byte[] decode;
         byte[] decodeAes;
         byte[] decodeAes;
-        if (this.key == null || (decode = Base64.decode(str, 10)) == null || (decodeAes = decodeAes(decode, this.key)) == null) {
+        if (this.key == null || (decode = Base64.decode(str, 10)) == null || (decodeAes = decodeAes(decode, key)) == null) {
             return "";
             return "";
         }
         }
-        return new String(decodeAes, this.charset);
+        return new String(decodeAes, charset);
     }
     }
 
 
     private byte[] encodeAes(byte[] bArr, byte[] bArr2) {
     private byte[] encodeAes(byte[] bArr, byte[] bArr2) {

+ 3 - 3
app/src/main/java/com/epson/mobilephone/common/maintain2/BatteryInfo.java

@@ -31,9 +31,9 @@ public class BatteryInfo implements Parcelable {
     }
     }
 
 
     private BatteryInfo(Parcel parcel) {
     private BatteryInfo(Parcel parcel) {
-        this.powerSourceType = parcel.readInt();
-        this.batteryChargeState = parcel.readInt();
-        this.batteryRemain = parcel.readInt();
+        powerSourceType = parcel.readInt();
+        batteryChargeState = parcel.readInt();
+        batteryRemain = parcel.readInt();
     }
     }
 
 
     public void writeToParcel(Parcel parcel, int i) {
     public void writeToParcel(Parcel parcel, int i) {

+ 5 - 5
app/src/main/java/com/epson/mobilephone/common/maintain2/BatteryInfoEx.java

@@ -39,13 +39,13 @@ public class BatteryInfoEx implements Parcelable {
     }
     }
 
 
     private BatteryInfoEx(Parcel parcel) {
     private BatteryInfoEx(Parcel parcel) {
-        this.powerSourceType = parcel.readInt();
-        this.number = parcel.readInt();
-        this.batteryType = new int[parcel.readInt()];
+        powerSourceType = parcel.readInt();
+        number = parcel.readInt();
+        batteryType = new int[parcel.readInt()];
         parcel.readIntArray(this.batteryType);
         parcel.readIntArray(this.batteryType);
-        this.batteryState = new int[parcel.readInt()];
+        batteryState = new int[parcel.readInt()];
         parcel.readIntArray(this.batteryState);
         parcel.readIntArray(this.batteryState);
-        this.batteryRemain = new int[parcel.readInt()];
+        batteryRemain = new int[parcel.readInt()];
         parcel.readIntArray(this.batteryRemain);
         parcel.readIntArray(this.batteryRemain);
     }
     }
 
 

+ 8 - 8
app/src/main/java/com/epson/mobilephone/common/usb/UsbPrintDriver.java

@@ -18,8 +18,8 @@ public class UsbPrintDriver {
     private ArrayList<UsbPrinter> usbPrintersPemmited = null;
     private ArrayList<UsbPrinter> usbPrintersPemmited = null;
 
 
     private UsbPrintDriver(Context context2) {
     private UsbPrintDriver(Context context2) {
-        this.usbManager = (UsbManager) context2.getSystemService("usb");
-        this.context = context2;
+        usbManager = (UsbManager) context2.getSystemService("usb");
+        context = context2;
     }
     }
 
 
     public static synchronized UsbPrintDriver getInstance(Context context2) {
     public static synchronized UsbPrintDriver getInstance(Context context2) {
@@ -34,7 +34,7 @@ public class UsbPrintDriver {
     }
     }
 
 
     public UsbManager getUsbManager() {
     public UsbManager getUsbManager() {
-        return this.usbManager;
+        return usbManager;
     }
     }
 
 
     public boolean isExistPermitedDevice() {
     public boolean isExistPermitedDevice() {
@@ -102,7 +102,7 @@ public class UsbPrintDriver {
         ArrayList<UsbPrinter> arrayList;
         ArrayList<UsbPrinter> arrayList;
         synchronized (this) {
         synchronized (this) {
             arrayList = new ArrayList<>();
             arrayList = new ArrayList<>();
-            HashMap<String, UsbDevice> deviceList = this.usbManager.getDeviceList();
+            HashMap<String, UsbDevice> deviceList = usbManager.getDeviceList();
             for (String str : deviceList.keySet()) {
             for (String str : deviceList.keySet()) {
                 UsbDevice usbDevice = deviceList.get(str);
                 UsbDevice usbDevice = deviceList.get(str);
                 if (z) {
                 if (z) {
@@ -202,8 +202,8 @@ public class UsbPrintDriver {
     public int openPort(int[] iArr) {
     public int openPort(int[] iArr) {
         EpLog.m78i(TAG, "Call openPort");
         EpLog.m78i(TAG, "Call openPort");
         synchronized (this) {
         synchronized (this) {
-            for (int i = 0; i < this.usbPrintersPemmited.size(); i++) {
-                UsbPrinter usbPrinter = this.usbPrintersPemmited.get(i);
+            for (int i = 0; i < usbPrintersPemmited.size(); i++) {
+                UsbPrinter usbPrinter = usbPrintersPemmited.get(i);
                 if (iArr[0] == usbPrinter.getUsbDevice().getVendorId() && iArr[1] == usbPrinter.getUsbDevice().getProductId() && iArr[2] == usbPrinter.getDeviceNumbers()) {
                 if (iArr[0] == usbPrinter.getUsbDevice().getVendorId() && iArr[1] == usbPrinter.getUsbDevice().getProductId() && iArr[2] == usbPrinter.getDeviceNumbers()) {
                     int openPort = usbPrinter.openPort();
                     int openPort = usbPrinter.openPort();
                     return openPort;
                     return openPort;
@@ -215,8 +215,8 @@ public class UsbPrintDriver {
 
 
     public UsbPrinter findPrinterOpened(int i) {
     public UsbPrinter findPrinterOpened(int i) {
         synchronized (this) {
         synchronized (this) {
-            for (int i2 = 0; i2 < this.usbPrintersPemmited.size(); i2++) {
-                UsbPrinter usbPrinter = this.usbPrintersPemmited.get(i2);
+            for (int i2 = 0; i2 < usbPrintersPemmited.size(); i2++) {
+                UsbPrinter usbPrinter = usbPrintersPemmited.get(i2);
                 UsbDeviceConnection usbPrinter2 = usbPrinter.getUsbPrinter();
                 UsbDeviceConnection usbPrinter2 = usbPrinter.getUsbPrinter();
                 if (usbPrinter2 != null) {
                 if (usbPrinter2 != null) {
                     if (i == usbPrinter2.getFileDescriptor()) {
                     if (i == usbPrinter2.getFileDescriptor()) {

+ 21 - 21
app/src/main/java/com/epson/mobilephone/common/usb/UsbPrinter.java

@@ -43,19 +43,19 @@ public class UsbPrinter {
     }
     }
 
 
     public UsbPrinter(UsbManager usbManager2, UsbDevice usbDevice2, UsbInterface usbInterface2, UsbEndpoint usbEndpoint, UsbEndpoint usbEndpoint2) {
     public UsbPrinter(UsbManager usbManager2, UsbDevice usbDevice2, UsbInterface usbInterface2, UsbEndpoint usbEndpoint, UsbEndpoint usbEndpoint2) {
-        this.usbManager = usbManager2;
-        this.usbDevice = usbDevice2;
-        this.usbInterface = usbInterface2;
-        this.endPointOut = usbEndpoint;
-        this.endPointIn = usbEndpoint2;
+        usbManager = usbManager2;
+        usbDevice = usbDevice2;
+        usbInterface = usbInterface2;
+        endPointOut = usbEndpoint;
+        endPointIn = usbEndpoint2;
     }
     }
 
 
     public UsbDevice getUsbDevice() {
     public UsbDevice getUsbDevice() {
-        return this.usbDevice;
+        return usbDevice;
     }
     }
 
 
     public UsbDeviceConnection getUsbPrinter() {
     public UsbDeviceConnection getUsbPrinter() {
-        return this.usbPrinter;
+        return usbPrinter;
     }
     }
 
 
     public int getDeviceNumbers() {
     public int getDeviceNumbers() {
@@ -66,11 +66,11 @@ public class UsbPrinter {
 
 
     public synchronized int openPort() {
     public synchronized int openPort() {
         try {
         try {
-            this.usbPrinter = this.usbManager.openDevice(this.usbDevice);
+            usbPrinter = usbManager.openDevice(this.usbDevice);
             if (this.usbPrinter == null) {
             if (this.usbPrinter == null) {
                 return -1;
                 return -1;
             }
             }
-            return this.usbPrinter.getFileDescriptor();
+            return usbPrinter.getFileDescriptor();
         } catch (Exception unused) {
         } catch (Exception unused) {
             return -1;
             return -1;
         }
         }
@@ -85,13 +85,13 @@ public class UsbPrinter {
         }
         }
         setStartTime();
         setStartTime();
         EpLog.m78i(TAG, "bulkTransfer length=" + i);
         EpLog.m78i(TAG, "bulkTransfer length=" + i);
-        int bulkTransfer = this.usbPrinter.bulkTransfer(this.endPointIn, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
+        int bulkTransfer = usbPrinter.bulkTransfer(this.endPointIn, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
         EpLog.m78i(TAG, "bulkTransfer readByte=" + bulkTransfer);
         EpLog.m78i(TAG, "bulkTransfer readByte=" + bulkTransfer);
         if (bulkTransfer < 0 && ((double) getElapsedTime()) >= 4500.0d) {
         if (bulkTransfer < 0 && ((double) getElapsedTime()) >= 4500.0d) {
             bulkTransfer = 0;
             bulkTransfer = 0;
             EpLog.m78i(TAG, "bulkTransfer timeout occurred");
             EpLog.m78i(TAG, "bulkTransfer timeout occurred");
         }
         }
-        this.usbPrinter.releaseInterface(this.usbInterface);
+        usbPrinter.releaseInterface(this.usbInterface);
         return (long) bulkTransfer;
         return (long) bulkTransfer;
     }
     }
 
 
@@ -104,22 +104,22 @@ public class UsbPrinter {
         }
         }
         setStartTime();
         setStartTime();
         EpLog.m78i(TAG, "bulkTransfer length=" + i);
         EpLog.m78i(TAG, "bulkTransfer length=" + i);
-        int bulkTransfer = this.usbPrinter.bulkTransfer(this.endPointOut, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
+        int bulkTransfer = usbPrinter.bulkTransfer(this.endPointOut, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
         EpLog.m78i(TAG, "bulkTransfer writtenByte=" + bulkTransfer);
         EpLog.m78i(TAG, "bulkTransfer writtenByte=" + bulkTransfer);
         if (bulkTransfer < 0 && ((double) getElapsedTime()) >= 4500.0d) {
         if (bulkTransfer < 0 && ((double) getElapsedTime()) >= 4500.0d) {
             bulkTransfer = 0;
             bulkTransfer = 0;
             EpLog.m78i(TAG, "bulkTransfer timeout occurred");
             EpLog.m78i(TAG, "bulkTransfer timeout occurred");
         }
         }
-        this.usbPrinter.releaseInterface(this.usbInterface);
+        usbPrinter.releaseInterface(this.usbInterface);
         return (long) bulkTransfer;
         return (long) bulkTransfer;
     }
     }
 
 
     private void setStartTime() {
     private void setStartTime() {
-        this.startTime = System.currentTimeMillis();
+        startTime = System.currentTimeMillis();
     }
     }
 
 
     private long getElapsedTime() {
     private long getElapsedTime() {
-        return System.currentTimeMillis() - this.startTime;
+        return System.currentTimeMillis() - startTime;
     }
     }
 
 
     public synchronized long getDeviceIdString(byte[] bArr, int i) {
     public synchronized long getDeviceIdString(byte[] bArr, int i) {
@@ -129,11 +129,11 @@ public class UsbPrinter {
         if (!this.usbPrinter.claimInterface(this.usbInterface, true)) {
         if (!this.usbPrinter.claimInterface(this.usbInterface, true)) {
             return -1;
             return -1;
         }
         }
-        int controlTransfer = this.usbPrinter.controlTransfer(161, 0, 0, this.usbInterface.getId() << 8, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
+        int controlTransfer = usbPrinter.controlTransfer(161, 0, 0, usbInterface.getId() << 8, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
         if (controlTransfer > 0) {
         if (controlTransfer > 0) {
             EpLog.m78i("EPSON", "DeviceIdString = " + new String(bArr, 2, controlTransfer - 2));
             EpLog.m78i("EPSON", "DeviceIdString = " + new String(bArr, 2, controlTransfer - 2));
         }
         }
-        this.usbPrinter.releaseInterface(this.usbInterface);
+        usbPrinter.releaseInterface(this.usbInterface);
         return (long) controlTransfer;
         return (long) controlTransfer;
     }
     }
 
 
@@ -186,17 +186,17 @@ public class UsbPrinter {
 
 
     public synchronized void closePort() {
     public synchronized void closePort() {
         if (this.usbPrinter != null) {
         if (this.usbPrinter != null) {
-            this.usbPrinter.close();
-            this.usbPrinter = null;
+            usbPrinter.close();
+            usbPrinter = null;
         }
         }
     }
     }
 
 
     public String toString() {
     public String toString() {
-        String str = "deviceName = " + this.usbDevice.getDeviceName() + " : endPointOut = " + Integer.toHexString(this.endPointOut.getAddress()) + " : endPointIn = " + Integer.toHexString(this.endPointIn.getAddress());
+        String str = "deviceName = " + usbDevice.getDeviceName() + " : endPointOut = " + Integer.toHexString(this.endPointOut.getAddress()) + " : endPointIn = " + Integer.toHexString(this.endPointIn.getAddress());
         if (Build.VERSION.SDK_INT < 21) {
         if (Build.VERSION.SDK_INT < 21) {
             return str;
             return str;
         }
         }
-        return (str + " : productName = " + this.usbDevice.getProductName()) + " : SerialNo = " + this.usbDevice.getSerialNumber();
+        return (str + " : productName = " + usbDevice.getProductName()) + " : SerialNo = " + usbDevice.getSerialNumber();
     }
     }
 
 
     public boolean equals(Object obj) {
     public boolean equals(Object obj) {

+ 11 - 11
app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectBase.java

@@ -62,7 +62,7 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
         super.onCreate(bundle);
         super.onCreate(bundle);
         mWifiManager = (WifiManager) getApplicationContext().getApplicationContext().getSystemService("wifi");
         mWifiManager = (WifiManager) getApplicationContext().getApplicationContext().getSystemService("wifi");
         requestWindowFeature(1);
         requestWindowFeature(1);
-        this.searchWiFiDirectPrinter = SearchWiFiDirectPrinterTask.getInstance(this);
+        searchWiFiDirectPrinter = SearchWiFiDirectPrinterTask.getInstance(this);
     }
     }
 
 
     protected void onActivityResult(int i, int i2, Intent intent) {
     protected void onActivityResult(int i, int i2, Intent intent) {
@@ -113,26 +113,26 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
     }
     }
 
 
     private void interrupt() {
     private void interrupt() {
-        this.status = Status.IDLE;
-        SearchWiFiDirectPrinterTask searchWiFiDirectPrinterTask = this.searchWiFiDirectPrinter;
+        status = Status.IDLE;
+        SearchWiFiDirectPrinterTask searchWiFiDirectPrinterTask = searchWiFiDirectPrinter;
         if (searchWiFiDirectPrinterTask != null) {
         if (searchWiFiDirectPrinterTask != null) {
             searchWiFiDirectPrinterTask.interrupt();
             searchWiFiDirectPrinterTask.interrupt();
-            this.searchWiFiDirectPrinter = null;
+            searchWiFiDirectPrinter = null;
         }
         }
         interruptConnecting();
         interruptConnecting();
         interruptFindingPrinter();
         interruptFindingPrinter();
     }
     }
 
 
     private void interruptFindingPrinter() {
     private void interruptFindingPrinter() {
-        FindPrinterTask findPrinterTask = this.taskFindPrinter;
+        FindPrinterTask findPrinterTask = taskFindPrinter;
         if (findPrinterTask != null) {
         if (findPrinterTask != null) {
             findPrinterTask.cancel();
             findPrinterTask.cancel();
-            this.taskFindPrinter = null;
+            taskFindPrinter = null;
         }
         }
     }
     }
 
 
     protected void interruptConnecting() {
     protected void interruptConnecting() {
-        this.connectingObserver.interrupt();
+        connectingObserver.interrupt();
     }
     }
 
 
     private void onConnectedPrinter(Intent intent) {
     private void onConnectedPrinter(Intent intent) {
@@ -144,7 +144,7 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
     }
     }
 
 
     private void setupObserver() {
     private void setupObserver() {
-        this.connectingObserver.start(this.timeout * 1000);
+        connectingObserver.start(this.timeout * 1000);
     }
     }
 
 
     class ConnectingObserver {
     class ConnectingObserver {
@@ -156,7 +156,7 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
         private void start(final int i) {
         private void start(final int i) {
             interrupt();
             interrupt();
             EPLog.m86d(ActivityConnectBase.TAG, "Start ConnectingObserver");
             EPLog.m86d(ActivityConnectBase.TAG, "Start ConnectingObserver");
-            this.observerTask = new AsyncTask<Void, Void, Void>() {
+            observerTask = new AsyncTask<Void, Void, Void>() {
                 protected Void doInBackground(Void... voidArr) {
                 protected Void doInBackground(Void... voidArr) {
                     int i = 0;
                     int i = 0;
                     do {
                     do {
@@ -182,10 +182,10 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
         }
         }
 
 
         private void interrupt() {
         private void interrupt() {
-            AsyncTask<Void, Void, Void> asyncTask = this.observerTask;
+            AsyncTask<Void, Void, Void> asyncTask = observerTask;
             if (asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING && !this.observerTask.isCancelled()) {
             if (asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING && !this.observerTask.isCancelled()) {
                 EPLog.m86d(ActivityConnectBase.TAG, "Stop ConnectingObserver");
                 EPLog.m86d(ActivityConnectBase.TAG, "Stop ConnectingObserver");
-                this.observerTask.cancel(false);
+                observerTask.cancel(false);
             }
             }
         }
         }
     }
     }

+ 26 - 26
app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectP2P.java

@@ -188,21 +188,21 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
         mWiFiP2PManager = (WifiP2pManager) getSystemService("wifip2p");
         mWiFiP2PManager = (WifiP2pManager) getSystemService("wifip2p");
         WifiP2pManager wifiP2pManager = mWiFiP2PManager;
         WifiP2pManager wifiP2pManager = mWiFiP2PManager;
         if (wifiP2pManager != null) {
         if (wifiP2pManager != null) {
-            this.p2pChannnel = wifiP2pManager.initialize(this, getMainLooper(), (WifiP2pManager.ChannelListener) null);
+            p2pChannnel = wifiP2pManager.initialize(this, getMainLooper(), (WifiP2pManager.ChannelListener) null);
         }
         }
-        if (mWiFiP2PManager == null || this.p2pChannnel == null) {
+        if (mWiFiP2PManager == null || p2pChannnel == null) {
             onError();
             onError();
             return;
             return;
         }
         }
         Bundle extras = getIntent().getExtras();
         Bundle extras = getIntent().getExtras();
         if (extras != null) {
         if (extras != null) {
-            this.targetSsid = extras.getString(ActivityConnectBase.APNAME);
-            this.showErrorDlg = extras.getBoolean(ActivityConnectBase.SHOWERROR, false);
-            this.showConnectedTip = extras.getBoolean(ActivityConnectBase.SHOWTIP, true);
-            this.needInfo = extras.getBoolean(ActivityConnectBase.NEEDINFO, false);
-            this.timeout = extras.getInt(ActivityConnectBase.TIMEOUT, 30);
+            targetSsid = extras.getString(ActivityConnectBase.APNAME);
+            showErrorDlg = extras.getBoolean(ActivityConnectBase.SHOWERROR, false);
+            showConnectedTip = extras.getBoolean(ActivityConnectBase.SHOWTIP, true);
+            needInfo = extras.getBoolean(ActivityConnectBase.NEEDINFO, false);
+            timeout = extras.getInt(ActivityConnectBase.TIMEOUT, 30);
         }
         }
-        EPLog.m88i(TAG, "Starting connect :" + this.targetSsid + " timeout = " + this.timeout);
+        EPLog.m88i(TAG, "Starting connect :" + targetSsid + " timeout = " + timeout);
         if (Build.VERSION.SDK_INT >= 29) {
         if (Build.VERSION.SDK_INT >= 29) {
             ActivityRequestLocationPermission.requestLocationPermissionForce(this, 2);
             ActivityRequestLocationPermission.requestLocationPermissionForce(this, 2);
         } else {
         } else {
@@ -234,16 +234,16 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
             if (connectionInfo != null) {
             if (connectionInfo != null) {
                 if (this.targetSsid.equals(connectionInfo.printerName)) {
                 if (this.targetSsid.equals(connectionInfo.printerName)) {
                     EPLog.m86d(TAG, "Already Connected!!");
                     EPLog.m86d(TAG, "Already Connected!!");
-                    this.status = ActivityConnectBase.Status.WIFI_CONNECTING;
+                    status = ActivityConnectBase.Status.WIFI_CONNECTING;
                     mHandler.sendEmptyMessage(10);
                     mHandler.sendEmptyMessage(10);
                     return;
                     return;
                 }
                 }
                 WifiP2pUtils.getInstance(this).disconnect();
                 WifiP2pUtils.getInstance(this).disconnect();
             }
             }
-            if (!this.searchWiFiDirectPrinter.start(2, mHandler, 0, this.timeout)) {
+            if (!this.searchWiFiDirectPrinter.start(2, mHandler, 0, timeout)) {
                 onError();
                 onError();
             } else {
             } else {
-                this.status = ActivityConnectBase.Status.WIFI_SCANNING;
+                status = ActivityConnectBase.Status.WIFI_SCANNING;
             }
             }
         } else {
         } else {
             AlertDialog.Builder negativeButton = new AlertDialog.Builder(this).setTitle(C1113R.string.str_error_wifi_connecting_failed).setPositiveButton(getString(C1113R.string.str_goto_wifi_setting), new DialogInterface.OnClickListener() {
             AlertDialog.Builder negativeButton = new AlertDialog.Builder(this).setTitle(C1113R.string.str_error_wifi_connecting_failed).setPositiveButton(getString(C1113R.string.str_goto_wifi_setting), new DialogInterface.OnClickListener() {
@@ -345,14 +345,14 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
 
 
     protected void interruptConnecting() {
     protected void interruptConnecting() {
         super.interruptConnecting();
         super.interruptConnecting();
-        WiFiDirectBroadcastReceiver wiFiDirectBroadcastReceiver = this.p2pStateChangeReciever;
+        WiFiDirectBroadcastReceiver wiFiDirectBroadcastReceiver = p2pStateChangeReciever;
         if (wiFiDirectBroadcastReceiver != null) {
         if (wiFiDirectBroadcastReceiver != null) {
             try {
             try {
                 unregisterReceiver(wiFiDirectBroadcastReceiver);
                 unregisterReceiver(wiFiDirectBroadcastReceiver);
             } catch (IllegalArgumentException e) {
             } catch (IllegalArgumentException e) {
                 e.printStackTrace();
                 e.printStackTrace();
             }
             }
-            this.p2pStateChangeReciever = null;
+            p2pStateChangeReciever = null;
         }
         }
     }
     }
 
 
@@ -365,7 +365,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
         }
         }
         if (!this.needInfo) {
         if (!this.needInfo) {
             closeWaitingDialog();
             closeWaitingDialog();
-            this.status = ActivityConnectBase.Status.IDLE;
+            status = ActivityConnectBase.Status.IDLE;
             setResult(-1);
             setResult(-1);
             setLastDetailResult(-1);
             setLastDetailResult(-1);
             finish();
             finish();
@@ -376,38 +376,38 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
         }
         }
         WifiP2pUtils.ConnectionInfo connectionInfo = WifiP2pUtils.getInstance(this).getConnectionInfo();
         WifiP2pUtils.ConnectionInfo connectionInfo = WifiP2pUtils.getInstance(this).getConnectionInfo();
         if (connectionInfo.isGroupOwnerThisDevice) {
         if (connectionInfo.isGroupOwnerThisDevice) {
-            this.expectedPrtMacAddr = WiFiControl.p2pAddr2PtrAddr(connectionInfo.p2PMacAdder, this.targetSsid);
+            expectedPrtMacAddr = WiFiControl.p2pAddr2PtrAddr(connectionInfo.p2PMacAdder, targetSsid);
         } else {
         } else {
-            this.expectedPrtMacAddr = WiFiControl.p2pAddr2PtrAddrP2P(connectionInfo.p2PMacAdder, this.targetSsid);
+            expectedPrtMacAddr = WiFiControl.p2pAddr2PtrAddrP2P(connectionInfo.p2PMacAdder, targetSsid);
         }
         }
-        this.status = ActivityConnectBase.Status.PRINTER_FINDING;
-        this.taskFindPrinter = new FindPrinterTask(mHandler, this.timeout, 1, 2);
-        this.taskFindPrinter.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
+        status = ActivityConnectBase.Status.PRINTER_FINDING;
+        taskFindPrinter = new FindPrinterTask(mHandler, timeout, 1, 2);
+        taskFindPrinter.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
     }
     }
 
 
     private void onError() {
     private void onError() {
         closeWaitingDialog();
         closeWaitingDialog();
         Toast.makeText(this, getString(C1113R.string.str_error_connecting_printer_short), 1).show();
         Toast.makeText(this, getString(C1113R.string.str_error_connecting_printer_short), 1).show();
         if (this.searchWiFiDirectPrinter != null) {
         if (this.searchWiFiDirectPrinter != null) {
-            this.searchWiFiDirectPrinter.interrupt();
-            this.searchWiFiDirectPrinter = null;
+            searchWiFiDirectPrinter.interrupt();
+            searchWiFiDirectPrinter = null;
         }
         }
         switch (this.status) {
         switch (this.status) {
             case WIFI_CONNECTING:
             case WIFI_CONNECTING:
                 if (this.p2pConnectConfig != null) {
                 if (this.p2pConnectConfig != null) {
                     interruptConnecting();
                     interruptConnecting();
                     if (mWiFiP2PManager != null) {
                     if (mWiFiP2PManager != null) {
-                        EPLog.m86d(TAG, "cancelConnect() " + this.targetSsid);
+                        EPLog.m86d(TAG, "cancelConnect() " + targetSsid);
                         mWiFiP2PManager.cancelConnect(this.p2pChannnel, (WifiP2pManager.ActionListener) null);
                         mWiFiP2PManager.cancelConnect(this.p2pChannnel, (WifiP2pManager.ActionListener) null);
-                        this.p2pConnectConfig = null;
+                        p2pConnectConfig = null;
                         break;
                         break;
                     }
                     }
                 }
                 }
                 break;
                 break;
             case PRINTER_FINDING:
             case PRINTER_FINDING:
                 if (this.taskFindPrinter != null) {
                 if (this.taskFindPrinter != null) {
-                    this.taskFindPrinter.cancel();
-                    this.taskFindPrinter = null;
+                    taskFindPrinter.cancel();
+                    taskFindPrinter = null;
                     break;
                     break;
                 }
                 }
                 break;
                 break;
@@ -433,7 +433,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
 
 
     private void setupObserver() {
     private void setupObserver() {
         super.setupObserver();
         super.setupObserver();
-        this.p2pStateChangeReciever = new WiFiDirectBroadcastReceiver();
+        p2pStateChangeReciever = new WiFiDirectBroadcastReceiver();
         registerReceiver(this.p2pStateChangeReciever, new IntentFilter("android.net.wifi.p2p.CONNECTION_STATE_CHANGE"));
         registerReceiver(this.p2pStateChangeReciever, new IntentFilter("android.net.wifi.p2p.CONNECTION_STATE_CHANGE"));
     }
     }
 
 

+ 20 - 20
app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectSimpleAP.java

@@ -161,15 +161,15 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
         mModelDialog.doShow(IDD_WIFI_WAITING);
         mModelDialog.doShow(IDD_WIFI_WAITING);
         Bundle extras = getIntent().getExtras();
         Bundle extras = getIntent().getExtras();
         if (extras != null) {
         if (extras != null) {
-            this.targetSsid = extras.getString(ActivityConnectBase.APNAME);
-            this.targetPass = extras.getString(ActivityConnectBase.APPASS);
-            this.showErrorDlg = extras.getBoolean(ActivityConnectBase.SHOWERROR, false);
-            this.showConnectedTip = extras.getBoolean(ActivityConnectBase.SHOWTIP, true);
-            this.createSimpleAP = extras.getBoolean(ActivityConnectBase.CREATE, false);
-            this.needInfo = extras.getBoolean(ActivityConnectBase.NEEDINFO, false);
-            this.timeout = extras.getInt(ActivityConnectBase.TIMEOUT, 30);
+            targetSsid = extras.getString(ActivityConnectBase.APNAME);
+            targetPass = extras.getString(ActivityConnectBase.APPASS);
+            showErrorDlg = extras.getBoolean(ActivityConnectBase.SHOWERROR, false);
+            showConnectedTip = extras.getBoolean(ActivityConnectBase.SHOWTIP, true);
+            createSimpleAP = extras.getBoolean(ActivityConnectBase.CREATE, false);
+            needInfo = extras.getBoolean(ActivityConnectBase.NEEDINFO, false);
+            timeout = extras.getInt(ActivityConnectBase.TIMEOUT, 30);
         }
         }
-        EPLog.m88i(TAG, "Starting connect :" + this.targetSsid + " timeout = " + this.timeout);
+        EPLog.m88i(TAG, "Starting connect :" + targetSsid + " timeout = " + timeout);
         mHandler.sendEmptyMessage(11);
         mHandler.sendEmptyMessage(11);
     }
     }
 
 
@@ -197,17 +197,17 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
             setResult(0);
             setResult(0);
             setLastDetailResult(1);
             setLastDetailResult(1);
             finish();
             finish();
-        } else if (!this.searchWiFiDirectPrinter.start(1, mHandler, 0, this.timeout)) {
+        } else if (!this.searchWiFiDirectPrinter.start(1, mHandler, 0, timeout)) {
             onError();
             onError();
         } else {
         } else {
-            this.status = ActivityConnectBase.Status.WIFI_SCANNING;
+            status = ActivityConnectBase.Status.WIFI_SCANNING;
         }
         }
     }
     }
 
 
     protected void onEnabledWifi() {
     protected void onEnabledWifi() {
         if (this.targetSsid.equals(WiFiUtils.getInstance(this).getCurSSID())) {
         if (this.targetSsid.equals(WiFiUtils.getInstance(this).getCurSSID())) {
             EPLog.m86d(TAG, "Already Connected!!");
             EPLog.m86d(TAG, "Already Connected!!");
-            this.status = ActivityConnectBase.Status.WIFI_CONNECTING;
+            status = ActivityConnectBase.Status.WIFI_CONNECTING;
             mHandler.sendEmptyMessage(10);
             mHandler.sendEmptyMessage(10);
             return;
             return;
         }
         }
@@ -215,12 +215,12 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
             WifiP2pUtils.getInstance(this).disconnect();
             WifiP2pUtils.getInstance(this).disconnect();
         }
         }
         if (this.createSimpleAP) {
         if (this.createSimpleAP) {
-            this.connectingNetworkId = WiFiUtils.getInstance(this).createSimpleAP(this.targetSsid, this.targetPass);
+            connectingNetworkId = WiFiUtils.getInstance(this).createSimpleAP(this.targetSsid, targetPass);
             if (this.connectingNetworkId == -1) {
             if (this.connectingNetworkId == -1) {
                 mModelDialog.doShow(IDD_WIFI_PROFILE_FAILED);
                 mModelDialog.doShow(IDD_WIFI_PROFILE_FAILED);
                 return;
                 return;
             }
             }
-            this.status = ActivityConnectBase.Status.WIFI_CONNECTING;
+            status = ActivityConnectBase.Status.WIFI_CONNECTING;
             setupObserver();
             setupObserver();
             return;
             return;
         }
         }
@@ -367,14 +367,14 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
 
 
     protected void interruptConnecting() {
     protected void interruptConnecting() {
         super.interruptConnecting();
         super.interruptConnecting();
-        NetworkStateChangeReciever networkStateChangeReciever2 = this.networkStateChangeReciever;
+        NetworkStateChangeReciever networkStateChangeReciever2 = networkStateChangeReciever;
         if (networkStateChangeReciever2 != null) {
         if (networkStateChangeReciever2 != null) {
             try {
             try {
                 unregisterReceiver(networkStateChangeReciever2);
                 unregisterReceiver(networkStateChangeReciever2);
             } catch (IllegalArgumentException e) {
             } catch (IllegalArgumentException e) {
                 e.printStackTrace();
                 e.printStackTrace();
             }
             }
-            this.networkStateChangeReciever = null;
+            networkStateChangeReciever = null;
         }
         }
     }
     }
 
 
@@ -418,13 +418,13 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
         closeWaitingDialog();
         closeWaitingDialog();
         Toast.makeText(this, getString(C1113R.string.str_error_connecting_printer_short), 1).show();
         Toast.makeText(this, getString(C1113R.string.str_error_connecting_printer_short), 1).show();
         if (this.searchWiFiDirectPrinter != null) {
         if (this.searchWiFiDirectPrinter != null) {
-            this.searchWiFiDirectPrinter.interrupt();
-            this.searchWiFiDirectPrinter = null;
+            searchWiFiDirectPrinter.interrupt();
+            searchWiFiDirectPrinter = null;
         }
         }
-        if (this.status == ActivityConnectBase.Status.WIFI_CONNECTING && this.connectingNetworkId != -1) {
+        if (this.status == ActivityConnectBase.Status.WIFI_CONNECTING && connectingNetworkId != -1) {
             interruptConnecting();
             interruptConnecting();
             WiFiUtils.getInstance(this).removeNetwork(this.connectingNetworkId);
             WiFiUtils.getInstance(this).removeNetwork(this.connectingNetworkId);
-            this.connectingNetworkId = -1;
+            connectingNetworkId = -1;
             WiFiUtils.getInstance(this).reConnectNetwork();
             WiFiUtils.getInstance(this).reConnectNetwork();
             if (this.showErrorDlg) {
             if (this.showErrorDlg) {
                 mModelDialog.doShow(IDD_WIFI_ERROR);
                 mModelDialog.doShow(IDD_WIFI_ERROR);
@@ -496,7 +496,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
 
 
     private void setupObserver() {
     private void setupObserver() {
         super.setupObserver();
         super.setupObserver();
-        this.networkStateChangeReciever = new NetworkStateChangeReciever();
+        networkStateChangeReciever = new NetworkStateChangeReciever();
         registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.STATE_CHANGE"));
         registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.STATE_CHANGE"));
         registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.WIFI_STATE_CHANGED"));
         registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.WIFI_STATE_CHANGED"));
         registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.supplicant.STATE_CHANGE"));
         registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.supplicant.STATE_CHANGE"));

+ 8 - 8
app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityControlWiFi.java

@@ -36,8 +36,8 @@ public class ActivityControlWiFi extends Activity {
         requestWindowFeature(1);
         requestWindowFeature(1);
         Bundle extras = getIntent().getExtras();
         Bundle extras = getIntent().getExtras();
         if (extras != null) {
         if (extras != null) {
-            this.showProgress = extras.getBoolean(SHOWPROGRESS, false);
-            this.showWifiSettings = extras.getBoolean(SHOWWIFISETTINGS, false);
+            showProgress = extras.getBoolean(SHOWPROGRESS, false);
+            showWifiSettings = extras.getBoolean(SHOWWIFISETTINGS, false);
         }
         }
         if (this.showProgress) {
         if (this.showProgress) {
             setContentView(C1113R.layout.progress);
             setContentView(C1113R.layout.progress);
@@ -86,9 +86,9 @@ public class ActivityControlWiFi extends Activity {
         if (this.networkStateChangeReciever != null) {
         if (this.networkStateChangeReciever != null) {
             EPLog.m86d(TAG, "unregisterReceiver()");
             EPLog.m86d(TAG, "unregisterReceiver()");
             unregisterReceiver(this.networkStateChangeReciever);
             unregisterReceiver(this.networkStateChangeReciever);
-            this.networkStateChangeReciever = null;
+            networkStateChangeReciever = null;
         }
         }
-        this.scannigObserver.interrunpt();
+        scannigObserver.interrunpt();
     }
     }
 
 
     protected Dialog onCreateDialog(int i) {
     protected Dialog onCreateDialog(int i) {
@@ -123,7 +123,7 @@ public class ActivityControlWiFi extends Activity {
     private void registerReciever() {
     private void registerReciever() {
         if (this.networkStateChangeReciever == null) {
         if (this.networkStateChangeReciever == null) {
             EPLog.m86d(TAG, "registerReceiver()");
             EPLog.m86d(TAG, "registerReceiver()");
-            this.networkStateChangeReciever = new NetworkStateChangeReciever();
+            networkStateChangeReciever = new NetworkStateChangeReciever();
             registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.STATE_CHANGE"));
             registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.STATE_CHANGE"));
             registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.WIFI_STATE_CHANGED"));
             registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.WIFI_STATE_CHANGED"));
             registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.supplicant.STATE_CHANGE"));
             registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.supplicant.STATE_CHANGE"));
@@ -264,7 +264,7 @@ public class ActivityControlWiFi extends Activity {
         private void start() {
         private void start() {
             interrunpt();
             interrunpt();
             EPLog.m86d(ActivityControlWiFi.TAG, "Start ScanningObserver");
             EPLog.m86d(ActivityControlWiFi.TAG, "Start ScanningObserver");
-            this.observerTask = new AsyncTask<Void, Void, Void>() {
+            observerTask = new AsyncTask<Void, Void, Void>() {
                 protected Void doInBackground(Void... voidArr) {
                 protected Void doInBackground(Void... voidArr) {
                     int i = 0;
                     int i = 0;
                     while (i < 10000) {
                     while (i < 10000) {
@@ -290,10 +290,10 @@ public class ActivityControlWiFi extends Activity {
         }
         }
 
 
         private void interrunpt() {
         private void interrunpt() {
-            AsyncTask<Void, Void, Void> asyncTask = this.observerTask;
+            AsyncTask<Void, Void, Void> asyncTask = observerTask;
             if (asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING && !this.observerTask.isCancelled()) {
             if (asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING && !this.observerTask.isCancelled()) {
                 EPLog.m86d(ActivityControlWiFi.TAG, "Stop ScanningObserver");
                 EPLog.m86d(ActivityControlWiFi.TAG, "Stop ScanningObserver");
-                this.observerTask.cancel(false);
+                observerTask.cancel(false);
             }
             }
         }
         }
     }
     }

+ 2 - 2
app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityRequestLocationPermission.java

@@ -65,7 +65,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
             requestWindowFeature(1);
             requestWindowFeature(1);
             if (isNeedLocationPermission(this)) {
             if (isNeedLocationPermission(this)) {
                 if (!hasLocationPermission(this)) {
                 if (!hasLocationPermission(this)) {
-                    this.requestPermission = getNeededPermissionString(this);
+                    requestPermission = getNeededPermissionString(this);
                     final boolean z = getPreferences(0).getBoolean(DONOTASKAGAIN, false);
                     final boolean z = getPreferences(0).getBoolean(DONOTASKAGAIN, false);
                     new AlertDialog.Builder(this).setCustomTitle(getTitleLayout(this, C1113R.string.str_need_location_setting_title)).setMessage(C1113R.string.str_need_location_permission).setPositiveButton(C1113R.string.str_next, new DialogInterface.OnClickListener() {
                     new AlertDialog.Builder(this).setCustomTitle(getTitleLayout(this, C1113R.string.str_need_location_setting_title)).setMessage(C1113R.string.str_need_location_permission).setPositiveButton(C1113R.string.str_next, new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
                         public void onClick(DialogInterface dialogInterface, int i) {
@@ -141,7 +141,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
                 if (!this.requestPermission.equals(strArr[i2]) || iArr[i2] != 0) {
                 if (!this.requestPermission.equals(strArr[i2]) || iArr[i2] != 0) {
                     i2++;
                     i2++;
                 } else {
                 } else {
-                    EPLog.m86d(TAG, "PERMISSION_GRANTED " + this.requestPermission);
+                    EPLog.m86d(TAG, "PERMISSION_GRANTED " + requestPermission);
                     mHandler.sendEmptyMessage(1);
                     mHandler.sendEmptyMessage(1);
                     return;
                     return;
                 }
                 }

+ 3 - 3
app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectBase.java

@@ -19,8 +19,8 @@ public abstract class ActivityWiFiDirectBase extends ActivityIACommon {
 
 
     private void setupCommonHeaderControl(boolean z, boolean z2) {
     private void setupCommonHeaderControl(boolean z, boolean z2) {
         setActionBar((int) R.string.str_wifidirect_settings, z);
         setActionBar((int) R.string.str_wifidirect_settings, z);
-        this.bDisplayHomeAsUpEnabled = z;
-        this.bSupportCancel = z2;
+        bDisplayHomeAsUpEnabled = z;
+        bSupportCancel = z2;
     }
     }
 
 
     protected void onActivityResult(int i, int i2, Intent intent) {
     protected void onActivityResult(int i, int i2, Intent intent) {
@@ -73,7 +73,7 @@ public abstract class ActivityWiFiDirectBase extends ActivityIACommon {
     }
     }
 
 
     protected void setDisplayMenu(boolean z) {
     protected void setDisplayMenu(boolean z) {
-        this.bSupportCancel = z;
+        bSupportCancel = z;
         invalidateOptionsMenu();
         invalidateOptionsMenu();
     }
     }
 }
 }

+ 6 - 6
app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectManual.java

@@ -79,8 +79,8 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.wifidirect_manual, (ViewGroup) null);
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.wifidirect_manual, (ViewGroup) null);
         setContentView((View) viewGroup);
         setContentView((View) viewGroup);
         setupCommonHeaderControl(true, true);
         setupCommonHeaderControl(true, true);
-        this.viewWiFiSettings = viewGroup.findViewById(R.id.rlWifiSettings);
-        this.viewWiFiSettings.setOnClickListener(new View.OnClickListener() {
+        viewWiFiSettings = viewGroup.findViewById(R.id.rlWifiSettings);
+        viewWiFiSettings.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
             public void onClick(View view) {
                 Intent intent = new Intent(ActivityWiFiDirectManual.this, ActivityControlWiFi.class);
                 Intent intent = new Intent(ActivityWiFiDirectManual.this, ActivityControlWiFi.class);
                 intent.putExtra(ActivityControlWiFi.SHOWPROGRESS, true);
                 intent.putExtra(ActivityControlWiFi.SHOWPROGRESS, true);
@@ -138,8 +138,8 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
                 if (WiFiDirectManager.isSimpleAP(this)) {
                 if (WiFiDirectManager.isSimpleAP(this)) {
                     ManageDefaultNetwork.getInstance(this).setDefaultNetworkSimpleAp();
                     ManageDefaultNetwork.getInstance(this).setDefaultNetworkSimpleAp();
                     mModelDialog.doShow(IDD_WIFI_WAITING);
                     mModelDialog.doShow(IDD_WIFI_WAITING);
-                    this.taskFindPrinter = new FindPrinterTask(mHandler, 30, 1, 2);
-                    this.taskFindPrinter.execute(new Void[0]);
+                    taskFindPrinter = new FindPrinterTask(mHandler, 30, 1, 2);
+                    taskFindPrinter.execute(new Void[0]);
                     return;
                     return;
                 }
                 }
                 return;
                 return;
@@ -155,10 +155,10 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
     }
     }
 
 
     private void interruptFindingPrinter() {
     private void interruptFindingPrinter() {
-        FindPrinterTask findPrinterTask = this.taskFindPrinter;
+        FindPrinterTask findPrinterTask = taskFindPrinter;
         if (findPrinterTask != null) {
         if (findPrinterTask != null) {
             findPrinterTask.cancel();
             findPrinterTask.cancel();
-            this.taskFindPrinter = null;
+            taskFindPrinter = null;
         }
         }
     }
     }
 
 

+ 2 - 2
app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectStart.java

@@ -14,8 +14,8 @@ public class ActivityWiFiDirectStart extends ActivityWiFiDirectBase {
         super.onCreate(bundle);
         super.onCreate(bundle);
         setContentView((int) R.layout.wifidirect_start);
         setContentView((int) R.layout.wifidirect_start);
         setupCommonHeaderControl(false, true);
         setupCommonHeaderControl(false, true);
-        this.viewiPrintConnect = ((ViewGroup) findViewById(R.id.wifi_start_top)).findViewById(R.id.iprint_connect);
-        this.viewiPrintConnect.setOnClickListener(new View.OnClickListener() {
+        viewiPrintConnect = ((ViewGroup) findViewById(R.id.wifi_start_top)).findViewById(R.id.iprint_connect);
+        viewiPrintConnect.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
             public void onClick(View view) {
                 Intent intent = new Intent(ActivityWiFiDirectStart.this, ActivityControlWiFi.class);
                 Intent intent = new Intent(ActivityWiFiDirectStart.this, ActivityControlWiFi.class);
                 intent.putExtra(ActivityControlWiFi.SHOWPROGRESS, true);
                 intent.putExtra(ActivityControlWiFi.SHOWPROGRESS, true);

+ 53 - 53
app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityiPrintConnect.java

@@ -66,20 +66,20 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
     protected void onCreate(Bundle bundle) {
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         super.onCreate(bundle);
         mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
         mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
-        this.wiFiUtils = WiFiUtils.getInstance(this);
+        wiFiUtils = WiFiUtils.getInstance(this);
         if (engineId == null) {
         if (engineId == null) {
             engineId = getEngineId();
             engineId = getEngineId();
         }
         }
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.iprintconnect, (ViewGroup) null);
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.iprintconnect, (ViewGroup) null);
         setContentView((View) viewGroup);
         setContentView((View) viewGroup);
         setupCommonHeaderControl(false, false);
         setupCommonHeaderControl(false, false);
-        this.toolbar = (ViewGroup) viewGroup.findViewById(R.id.toolbar);
-        this.btnFinish = (Button) viewGroup.findViewById(R.id.btn_finish);
-        this.textView1 = (TextView) viewGroup.findViewById(R.id.textView1);
-        this.textView2 = (TextView) viewGroup.findViewById(R.id.textView2);
-        this.textView3 = (TextView) viewGroup.findViewById(R.id.textView3);
-        this.progress = (ProgressBar) viewGroup.findViewById(R.id.progressBarGetConnectStrings);
-        this.btnFinish.setOnClickListener(new View.OnClickListener() {
+        toolbar = (ViewGroup) viewGroup.findViewById(R.id.toolbar);
+        btnFinish = (Button) viewGroup.findViewById(R.id.btn_finish);
+        textView1 = (TextView) viewGroup.findViewById(R.id.textView1);
+        textView2 = (TextView) viewGroup.findViewById(R.id.textView2);
+        textView3 = (TextView) viewGroup.findViewById(R.id.textView3);
+        progress = (ProgressBar) viewGroup.findViewById(R.id.progressBarGetConnectStrings);
+        btnFinish.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
             public void onClick(View view) {
                 ActivityiPrintConnect.this.onFinishPressed();
                 ActivityiPrintConnect.this.onFinishPressed();
             }
             }
@@ -88,10 +88,10 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
     }
     }
 
 
     public void onFinishPressed() {
     public void onFinishPressed() {
-        Intent intent = this.intentResult;
+        Intent intent = intentResult;
         if (intent != null) {
         if (intent != null) {
             setResult(-1, intent);
             setResult(-1, intent);
-            this.isKeepSimpleAPConnection = true;
+            isKeepSimpleAPConnection = true;
         } else {
         } else {
             setResult(0);
             setResult(0);
         }
         }
@@ -104,19 +104,19 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
     }
     }
 
 
     private void disconnectRealAp() {
     private void disconnectRealAp() {
-        this.status = Status.CONNECT_ERROR;
-        WiFiUtils wiFiUtils2 = this.wiFiUtils;
+        status = Status.CONNECT_ERROR;
+        WiFiUtils wiFiUtils2 = wiFiUtils;
         wiFiUtils2.removeSimpleAP(wiFiUtils2.getNetworkId(this.settingsRealAp.ssid));
         wiFiUtils2.removeSimpleAP(wiFiUtils2.getNetworkId(this.settingsRealAp.ssid));
     }
     }
 
 
     protected void onResume() {
     protected void onResume() {
         super.onResume();
         super.onResume();
-        this.isKeepSimpleAPConnection = false;
+        isKeepSimpleAPConnection = false;
         switch (this.status) {
         switch (this.status) {
             case IDLE:
             case IDLE:
                 setDisplayMenu(false);
                 setDisplayMenu(false);
-                this.toolbar.setVisibility(8);
-                this.status = Status.CONNECTING_TEMPAP;
+                toolbar.setVisibility(8);
+                status = Status.CONNECTING_TEMPAP;
                 startConnectTempAp();
                 startConnectTempAp();
                 return;
                 return;
             case CONNECTED:
             case CONNECTED:
@@ -138,67 +138,67 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
         super.onPause();
         super.onPause();
         if (this.status == Status.GETTING_GONNECTSTRINGS) {
         if (this.status == Status.GETTING_GONNECTSTRINGS) {
             EPLog.m86d(TAG, "interruputGetConnectSttings()");
             EPLog.m86d(TAG, "interruputGetConnectSttings()");
-            this.status = Status.CONNECT_ERROR;
-            AsyncTask<Void, Void, Boolean> asyncTask = this.taskGetConnectStrings;
+            status = Status.CONNECT_ERROR;
+            AsyncTask<Void, Void, Boolean> asyncTask = taskGetConnectStrings;
             if (asyncTask != null) {
             if (asyncTask != null) {
                 asyncTask.cancel(true);
                 asyncTask.cancel(true);
-                this.taskGetConnectStrings = null;
+                taskGetConnectStrings = null;
             }
             }
         }
         }
-        WiFiUtils wiFiUtils2 = this.wiFiUtils;
+        WiFiUtils wiFiUtils2 = wiFiUtils;
         wiFiUtils2.removeSimpleAP(wiFiUtils2.getNetworkId(this.settingsTempAp.ssid));
         wiFiUtils2.removeSimpleAP(wiFiUtils2.getNetworkId(this.settingsTempAp.ssid));
-        if (!this.isKeepSimpleAPConnection && this.settingsRealAp.ssid != null) {
+        if (!this.isKeepSimpleAPConnection && settingsRealAp.ssid != null) {
             disconnectRealAp();
             disconnectRealAp();
         }
         }
     }
     }
 
 
     private void registBroadcastReciever() {
     private void registBroadcastReciever() {
         if (this.networkStateChangeReciever == null) {
         if (this.networkStateChangeReciever == null) {
-            this.networkStateChangeReciever = new NetworkStateChangeReciever();
+            networkStateChangeReciever = new NetworkStateChangeReciever();
             registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.SCAN_RESULTS"));
             registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.SCAN_RESULTS"));
         }
         }
     }
     }
 
 
     private void unRegistBroadcastReciever() {
     private void unRegistBroadcastReciever() {
-        NetworkStateChangeReciever networkStateChangeReciever2 = this.networkStateChangeReciever;
+        NetworkStateChangeReciever networkStateChangeReciever2 = networkStateChangeReciever;
         if (networkStateChangeReciever2 != null) {
         if (networkStateChangeReciever2 != null) {
             unregisterReceiver(networkStateChangeReciever2);
             unregisterReceiver(networkStateChangeReciever2);
-            this.networkStateChangeReciever = null;
+            networkStateChangeReciever = null;
         }
         }
     }
     }
 
 
     protected void onActivityResult(int i, int i2, Intent intent) {
     protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         super.onActivityResult(i, i2, intent);
-        String ssid = this.wiFiUtils.getSSID(this.wiFiUtils.getCurNetworkId());
+        String ssid = wiFiUtils.getSSID(this.wiFiUtils.getCurNetworkId());
         switch (i) {
         switch (i) {
             case 1:
             case 1:
                 if (i2 != -1) {
                 if (i2 != -1) {
-                    this.status = Status.CONNECT_ERROR;
+                    status = Status.CONNECT_ERROR;
                     return;
                     return;
                 } else if (this.settingsTempAp.ssid.equals(ssid)) {
                 } else if (this.settingsTempAp.ssid.equals(ssid)) {
                     startConnectRealAp();
                     startConnectRealAp();
                     return;
                     return;
                 } else if (ssid != null) {
                 } else if (ssid != null) {
-                    this.status = Status.CONNECTED_OTHERAP;
+                    status = Status.CONNECTED_OTHERAP;
                     return;
                     return;
                 } else {
                 } else {
-                    this.status = Status.CONNECT_ERROR;
+                    status = Status.CONNECT_ERROR;
                     return;
                     return;
                 }
                 }
             case 2:
             case 2:
                 if (i2 != -1) {
                 if (i2 != -1) {
-                    this.status = Status.CONNECT_ERROR;
+                    status = Status.CONNECT_ERROR;
                     return;
                     return;
                 } else if (this.settingsRealAp.ssid.equals(ssid)) {
                 } else if (this.settingsRealAp.ssid.equals(ssid)) {
-                    this.intentResult = intent;
-                    this.intentResult.putExtra(FINISH_EAYSETUP, true);
-                    this.status = Status.CONNECTED;
+                    intentResult = intent;
+                    intentResult.putExtra(FINISH_EAYSETUP, true);
+                    status = Status.CONNECTED;
                     return;
                     return;
                 } else if (ssid != null) {
                 } else if (ssid != null) {
-                    this.status = Status.CONNECTED_OTHERAP;
+                    status = Status.CONNECTED_OTHERAP;
                     return;
                     return;
                 } else {
                 } else {
-                    this.status = Status.CONNECT_ERROR;
+                    status = Status.CONNECT_ERROR;
                     return;
                     return;
                 }
                 }
             default:
             default:
@@ -208,42 +208,42 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
 
 
     private void onConnectSimpleAP() {
     private void onConnectSimpleAP() {
         EPLog.m86d(TAG, "onConnectSimpleAP()");
         EPLog.m86d(TAG, "onConnectSimpleAP()");
-        this.toolbar.setVisibility(0);
-        this.progress.setVisibility(8);
+        toolbar.setVisibility(0);
+        progress.setVisibility(8);
         setDisplayMenu(true);
         setDisplayMenu(true);
-        this.textView1.setText(getResources().getString(R.string.str_connected_printer1));
-        TextView textView = this.textView2;
+        textView1.setText(getResources().getString(R.string.str_connected_printer1));
+        TextView textView = textView2;
         Resources resources = getResources();
         Resources resources = getResources();
-        WiFiUtils wiFiUtils2 = this.wiFiUtils;
+        WiFiUtils wiFiUtils2 = wiFiUtils;
         textView.setText(resources.getString(R.string.str_connected_printer2, new Object[]{this.intentResult.getStringExtra("name"), wiFiUtils2.getSSID(wiFiUtils2.getCurNetworkId())}));
         textView.setText(resources.getString(R.string.str_connected_printer2, new Object[]{this.intentResult.getStringExtra("name"), wiFiUtils2.getSSID(wiFiUtils2.getCurNetworkId())}));
-        this.textView3.setText(getResources().getString(R.string.str_connected_printer3));
+        textView3.setText(getResources().getString(R.string.str_connected_printer3));
     }
     }
 
 
     private void onConnectOtherAP() {
     private void onConnectOtherAP() {
         EPLog.m86d(TAG, "onConnectOtherAP()");
         EPLog.m86d(TAG, "onConnectOtherAP()");
-        this.toolbar.setVisibility(8);
-        this.progress.setVisibility(8);
+        toolbar.setVisibility(8);
+        progress.setVisibility(8);
         setDisplayMenu(true);
         setDisplayMenu(true);
-        this.textView1.setText(getResources().getString(R.string.str_connected_otherAP1));
-        this.textView2.setText(getResources().getString(R.string.str_connected_otherAP2));
-        this.textView3.setText(getResources().getString(R.string.str_connected_otherAP3));
+        textView1.setText(getResources().getString(R.string.str_connected_otherAP1));
+        textView2.setText(getResources().getString(R.string.str_connected_otherAP2));
+        textView3.setText(getResources().getString(R.string.str_connected_otherAP3));
     }
     }
 
 
     private void onConnectError() {
     private void onConnectError() {
         EPLog.m86d(TAG, "onConnectError()");
         EPLog.m86d(TAG, "onConnectError()");
-        this.toolbar.setVisibility(8);
-        this.progress.setVisibility(8);
+        toolbar.setVisibility(8);
+        progress.setVisibility(8);
         setDisplayMenu(true);
         setDisplayMenu(true);
-        this.textView1.setText(getResources().getString(R.string.str_connect_error1));
-        this.textView2.setText(getResources().getString(R.string.str_connect_error2));
-        this.textView3.setText(getResources().getString(R.string.str_connect_error3));
+        textView1.setText(getResources().getString(R.string.str_connect_error1));
+        textView2.setText(getResources().getString(R.string.str_connect_error2));
+        textView3.setText(getResources().getString(R.string.str_connect_error3));
     }
     }
 
 
     private void startConnectTempAp() {
     private void startConnectTempAp() {
         EPLog.m86d(TAG, "startConnectTempAp()");
         EPLog.m86d(TAG, "startConnectTempAp()");
         Intent intent = new Intent(this, ActivityConnectSimpleAP.class);
         Intent intent = new Intent(this, ActivityConnectSimpleAP.class);
-        intent.putExtra(ActivityConnectBase.APNAME, this.settingsTempAp.ssid);
-        intent.putExtra(ActivityConnectBase.APPASS, this.settingsTempAp.password);
+        intent.putExtra(ActivityConnectBase.APNAME, settingsTempAp.ssid);
+        intent.putExtra(ActivityConnectBase.APPASS, settingsTempAp.password);
         intent.putExtra(ActivityConnectBase.CREATE, true);
         intent.putExtra(ActivityConnectBase.CREATE, true);
         intent.putExtra(ActivityConnectBase.SHOWERROR, false);
         intent.putExtra(ActivityConnectBase.SHOWERROR, false);
         intent.putExtra(ActivityConnectBase.SHOWTIP, false);
         intent.putExtra(ActivityConnectBase.SHOWTIP, false);
@@ -254,7 +254,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
 
 
     private void startConnectRealAp() {
     private void startConnectRealAp() {
         EPLog.m86d(TAG, "startConnectRealAp()");
         EPLog.m86d(TAG, "startConnectRealAp()");
-        this.taskGetConnectStrings = new AsyncTask<Void, Void, Boolean>() {
+        taskGetConnectStrings = new AsyncTask<Void, Void, Boolean>() {
             protected void onPreExecute() {
             protected void onPreExecute() {
                 ActivityiPrintConnect.this.getWindow().addFlags(128);
                 ActivityiPrintConnect.this.getWindow().addFlags(128);
                 Status unused = ActivityiPrintConnect.this.status = Status.GETTING_GONNECTSTRINGS;
                 Status unused = ActivityiPrintConnect.this.status = Status.GETTING_GONNECTSTRINGS;
@@ -378,7 +378,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
                 if (this.settingsRealAp.ssid.equals(WiFiUtils.removeQuotationsInSSID(scanResult.SSID))) {
                 if (this.settingsRealAp.ssid.equals(WiFiUtils.removeQuotationsInSSID(scanResult.SSID))) {
                     EPLog.m86d(TAG, "Found AP");
                     EPLog.m86d(TAG, "Found AP");
                     synchronized (this.waitRealAp) {
                     synchronized (this.waitRealAp) {
-                        this.waitRealAp.notify();
+                        waitRealAp.notify();
                     }
                     }
                     return;
                     return;
                 }
                 }

+ 8 - 8
app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityiPrintConnectStart.java

@@ -31,8 +31,8 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.iprintconnect_start, (ViewGroup) null);
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.iprintconnect_start, (ViewGroup) null);
         setContentView((View) viewGroup);
         setContentView((View) viewGroup);
         setupCommonHeaderControl(true, true);
         setupCommonHeaderControl(true, true);
-        this.btnNext = (Button) viewGroup.findViewById(R.id.btn_next);
-        this.btnNext.setOnClickListener(new View.OnClickListener() {
+        btnNext = (Button) viewGroup.findViewById(R.id.btn_next);
+        btnNext.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
             public void onClick(View view) {
                 ActivityiPrintConnectStart.this.startActivityForResult(new Intent(ActivityiPrintConnectStart.this, ActivityiPrintConnect.class), 10);
                 ActivityiPrintConnectStart.this.startActivityForResult(new Intent(ActivityiPrintConnectStart.this, ActivityiPrintConnect.class), 10);
             }
             }
@@ -51,23 +51,23 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
             finish();
             finish();
             return;
             return;
         }
         }
-        this.bFirstScanResultAvailable = true;
+        bFirstScanResultAvailable = true;
         mWifiManager.startScan();
         mWifiManager.startScan();
     }
     }
 
 
     protected void onResume() {
     protected void onResume() {
         super.onResume();
         super.onResume();
-        this.networkStateChangeReciever = new NetworkStateChangeReciever();
+        networkStateChangeReciever = new NetworkStateChangeReciever();
         registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.SCAN_RESULTS"));
         registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.SCAN_RESULTS"));
         getWindow().addFlags(128);
         getWindow().addFlags(128);
     }
     }
 
 
     protected void onPause() {
     protected void onPause() {
         super.onPause();
         super.onPause();
-        NetworkStateChangeReciever networkStateChangeReciever2 = this.networkStateChangeReciever;
+        NetworkStateChangeReciever networkStateChangeReciever2 = networkStateChangeReciever;
         if (networkStateChangeReciever2 != null) {
         if (networkStateChangeReciever2 != null) {
             unregisterReceiver(networkStateChangeReciever2);
             unregisterReceiver(networkStateChangeReciever2);
-            this.networkStateChangeReciever = null;
+            networkStateChangeReciever = null;
         }
         }
         getWindow().clearFlags(128);
         getWindow().clearFlags(128);
     }
     }
@@ -86,7 +86,7 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
     private void onScanResultAvailable() {
     private void onScanResultAvailable() {
         if (this.bFirstScanResultAvailable) {
         if (this.bFirstScanResultAvailable) {
             EPLog.m90w(TAG, "First onScanResultAvailable, ignore this");
             EPLog.m90w(TAG, "First onScanResultAvailable, ignore this");
-            this.bFirstScanResultAvailable = false;
+            bFirstScanResultAvailable = false;
         } else {
         } else {
             List<ScanResult> arrayList = new ArrayList<>();
             List<ScanResult> arrayList = new ArrayList<>();
             try {
             try {
@@ -98,7 +98,7 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
                 for (ScanResult scanResult : arrayList) {
                 for (ScanResult scanResult : arrayList) {
                     if (this.settingsTempAp.ssid.equals(WiFiUtils.removeQuotationsInSSID(scanResult.SSID))) {
                     if (this.settingsTempAp.ssid.equals(WiFiUtils.removeQuotationsInSSID(scanResult.SSID))) {
                         EPLog.m86d(TAG, "Found TempAP");
                         EPLog.m86d(TAG, "Found TempAP");
-                        this.btnNext.performClick();
+                        btnNext.performClick();
                         return;
                         return;
                     }
                     }
                 }
                 }

+ 2 - 2
app/src/main/java/com/epson/mobilephone/common/wifidirect/EventWrapperWiFiDirect.java

@@ -19,11 +19,11 @@ public class EventWrapperWiFiDirect<T> {
         if (this.handled) {
         if (this.handled) {
             return null;
             return null;
         }
         }
-        this.handled = true;
+        handled = true;
         return mContent;
         return mContent;
     }
     }
 
 
     public boolean hasBeenHandled() {
     public boolean hasBeenHandled() {
-        return this.handled;
+        return handled;
     }
     }
 }
 }

+ 8 - 8
app/src/main/java/com/epson/mobilephone/common/wifidirect/FindPrinterTask.java

@@ -13,15 +13,15 @@ class FindPrinterTask extends AsyncTask<Void, Void, Boolean> {
     int timeout;
     int timeout;
 
 
     FindPrinterTask(Handler handler2, int i, int i2, int i3) {
     FindPrinterTask(Handler handler2, int i, int i2, int i3) {
-        this.handler = handler2;
-        this.timeout = i;
-        this.idFound = i2;
-        this.idNotFound = i3;
+        handler = handler2;
+        timeout = i;
+        idFound = i2;
+        idNotFound = i3;
     }
     }
 
 
     protected void onPreExecute() {
     protected void onPreExecute() {
         super.onPreExecute();
         super.onPreExecute();
-        mEscprLib.setHanlder(this.handler, this.idFound);
+        mEscprLib.setHanlder(this.handler, idFound);
         mEscprLib.setSearchStt(true);
         mEscprLib.setSearchStt(true);
     }
     }
 
 
@@ -32,7 +32,7 @@ class FindPrinterTask extends AsyncTask<Void, Void, Boolean> {
             return true;
             return true;
         }
         }
         EPLog.m86d(TAG, "epsWrapperFindPrinter start");
         EPLog.m86d(TAG, "epsWrapperFindPrinter start");
-        int epsWrapperFindPrinter = mEscprLib.epsWrapperFindPrinter(192, this.timeout);
+        int epsWrapperFindPrinter = mEscprLib.epsWrapperFindPrinter(192, timeout);
         if (epsWrapperFindPrinter == 0 || epsWrapperFindPrinter == 42) {
         if (epsWrapperFindPrinter == 0 || epsWrapperFindPrinter == 42) {
             z = false;
             z = false;
         }
         }
@@ -43,13 +43,13 @@ class FindPrinterTask extends AsyncTask<Void, Void, Boolean> {
     protected void onPostExecute(Boolean bool) {
     protected void onPostExecute(Boolean bool) {
         if (bool.booleanValue() || !this.canceled) {
         if (bool.booleanValue() || !this.canceled) {
             EPLog.m86d(TAG, "epsWrapperFindPrinter = EPS_ERR_PRINTER_NOT_FOUND");
             EPLog.m86d(TAG, "epsWrapperFindPrinter = EPS_ERR_PRINTER_NOT_FOUND");
-            this.handler.sendEmptyMessage(this.idNotFound);
+            handler.sendEmptyMessage(this.idNotFound);
         }
         }
     }
     }
 
 
     public void cancel() {
     public void cancel() {
         mEscprLib.setSearchStt(false);
         mEscprLib.setSearchStt(false);
         mEscprLib.epsWrapperCancelFindPrinter();
         mEscprLib.epsWrapperCancelFindPrinter();
-        this.canceled = true;
+        canceled = true;
     }
     }
 }
 }

+ 4 - 4
app/src/main/java/com/epson/mobilephone/common/wifidirect/MacAddrFilter.java

@@ -17,8 +17,8 @@ public class MacAddrFilter {
         String start;
         String start;
 
 
         public MacAddressEntry(String str, String str2) {
         public MacAddressEntry(String str, String str2) {
-            this.start = str;
-            this.end = str2;
+            start = str;
+            end = str2;
         }
         }
 
 
         public boolean equals(Object obj) {
         public boolean equals(Object obj) {
@@ -50,9 +50,9 @@ public class MacAddrFilter {
         try {
         try {
             String p2pAddr2MacAddrStr = MacAddrUtils.p2pAddr2MacAddrStr(str);
             String p2pAddr2MacAddrStr = MacAddrUtils.p2pAddr2MacAddrStr(str);
             if (this.excludeMacAddressList == null) {
             if (this.excludeMacAddressList == null) {
-                this.excludeMacAddressList = readMacAddressTable(EXCLUDE_MACADDRESS_FILE);
+                excludeMacAddressList = readMacAddressTable(EXCLUDE_MACADDRESS_FILE);
             }
             }
-            Iterator<MacAddressEntry> it = this.excludeMacAddressList.iterator();
+            Iterator<MacAddressEntry> it = excludeMacAddressList.iterator();
             while (it.hasNext()) {
             while (it.hasNext()) {
                 MacAddressEntry next = it.next();
                 MacAddressEntry next = it.next();
                 if (next.start.compareTo(p2pAddr2MacAddrStr) <= 0 && next.end.compareTo(p2pAddr2MacAddrStr) >= 0) {
                 if (next.start.compareTo(p2pAddr2MacAddrStr) <= 0 && next.end.compareTo(p2pAddr2MacAddrStr) >= 0) {

+ 14 - 14
app/src/main/java/com/epson/mobilephone/common/wifidirect/ManageDefaultNetwork.java

@@ -35,8 +35,8 @@ public class ManageDefaultNetwork {
 
 
     private ManageDefaultNetwork(Context context) {
     private ManageDefaultNetwork(Context context) {
         mContext = context.getApplicationContext();
         mContext = context.getApplicationContext();
-        this.connectivityManager = (ConnectivityManager) mContext.getSystemService("connectivity");
-        this.wifiManager = (WifiManager) mContext.getSystemService("wifi");
+        connectivityManager = (ConnectivityManager) mContext.getSystemService("connectivity");
+        wifiManager = (WifiManager) mContext.getSystemService("wifi");
     }
     }
 
 
     public static ManageDefaultNetwork getInstance(Context context) {
     public static ManageDefaultNetwork getInstance(Context context) {
@@ -52,11 +52,11 @@ public class ManageDefaultNetwork {
         boolean z;
         boolean z;
         Network activeNetwork;
         Network activeNetwork;
         NetworkCapabilities networkCapabilities;
         NetworkCapabilities networkCapabilities;
-        this.canConnected = false;
+        canConnected = false;
         if (WiFiControl.isSimpleAP(str)) {
         if (WiFiControl.isSimpleAP(str)) {
             return false;
             return false;
         }
         }
-        if (Build.VERSION.SDK_INT < 23 || (activeNetwork = this.connectivityManager.getActiveNetwork()) == null || (networkCapabilities = this.connectivityManager.getNetworkCapabilities(activeNetwork)) == null || !networkCapabilities.hasTransport(0)) {
+        if (Build.VERSION.SDK_INT < 23 || (activeNetwork = connectivityManager.getActiveNetwork()) == null || (networkCapabilities = connectivityManager.getNetworkCapabilities(activeNetwork)) == null || !networkCapabilities.hasTransport(0)) {
             synchronized (this.lock) {
             synchronized (this.lock) {
                 EPLog.m86d(TAG, "Checking whether isOnline : " + str);
                 EPLog.m86d(TAG, "Checking whether isOnline : " + str);
                 new Thread(new Runnable() {
                 new Thread(new Runnable() {
@@ -88,11 +88,11 @@ public class ManageDefaultNetwork {
                     }
                     }
                 }).start();
                 }).start();
                 try {
                 try {
-                    this.lock.wait(10000);
+                    lock.wait(10000);
                 } catch (InterruptedException e) {
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                     e.printStackTrace();
                 }
                 }
-                z = this.canConnected;
+                z = canConnected;
             }
             }
             return z;
             return z;
         }
         }
@@ -108,8 +108,8 @@ public class ManageDefaultNetwork {
                 return;
                 return;
             }
             }
             if (!curSSID.equals(this.checkedSSID)) {
             if (!curSSID.equals(this.checkedSSID)) {
-                this.checkedSSID = curSSID;
-                this.isOnline = checkCurSSIDisOnline(curSSID);
+                checkedSSID = curSSID;
+                isOnline = checkCurSSIDisOnline(curSSID);
                 if (this.isOnline) {
                 if (this.isOnline) {
                     EPLog.m86d(TAG, curSSID + "is online.");
                     EPLog.m86d(TAG, curSSID + "is online.");
                     return;
                     return;
@@ -124,7 +124,7 @@ public class ManageDefaultNetwork {
                     return;
                     return;
                 }
                 }
             } else if (Build.VERSION.SDK_INT >= 21) {
             } else if (Build.VERSION.SDK_INT >= 21) {
-                ConnectivityManager connectivityManager2 = this.connectivityManager;
+                ConnectivityManager connectivityManager2 = connectivityManager;
                 if (ConnectivityManager.getProcessDefaultNetwork() != null) {
                 if (ConnectivityManager.getProcessDefaultNetwork() != null) {
                     EPLog.m86d(TAG, "Already setProcessDefaultNetwork called");
                     EPLog.m86d(TAG, "Already setProcessDefaultNetwork called");
                     return;
                     return;
@@ -139,7 +139,7 @@ public class ManageDefaultNetwork {
                 if (manageDefaultNetworkCallback == null) {
                 if (manageDefaultNetworkCallback == null) {
                     manageDefaultNetworkCallback = new ManageDefaultNetworkCallback();
                     manageDefaultNetworkCallback = new ManageDefaultNetworkCallback();
                 }
                 }
-                this.connectivityManager.requestNetwork(builder.build(), manageDefaultNetworkCallback);
+                connectivityManager.requestNetwork(builder.build(), manageDefaultNetworkCallback);
             } catch (SecurityException e) {
             } catch (SecurityException e) {
                 e.printStackTrace();
                 e.printStackTrace();
                 if (Build.VERSION.SDK_INT >= 23) {
                 if (Build.VERSION.SDK_INT >= 23) {
@@ -168,13 +168,13 @@ public class ManageDefaultNetwork {
         if (Build.VERSION.SDK_INT >= 23) {
         if (Build.VERSION.SDK_INT >= 23) {
             if (this.connectivityManager.getBoundNetworkForProcess() != null) {
             if (this.connectivityManager.getBoundNetworkForProcess() != null) {
                 EPLog.m86d(TAG, "resetProcessDefaultNetwork");
                 EPLog.m86d(TAG, "resetProcessDefaultNetwork");
-                this.connectivityManager.bindProcessToNetwork((Network) null);
+                connectivityManager.bindProcessToNetwork((Network) null);
             }
             }
         } else if (Build.VERSION.SDK_INT >= 21) {
         } else if (Build.VERSION.SDK_INT >= 21) {
-            ConnectivityManager connectivityManager2 = this.connectivityManager;
+            ConnectivityManager connectivityManager2 = connectivityManager;
             if (ConnectivityManager.getProcessDefaultNetwork() != null) {
             if (ConnectivityManager.getProcessDefaultNetwork() != null) {
                 EPLog.m86d(TAG, "resetProcessDefaultNetwork");
                 EPLog.m86d(TAG, "resetProcessDefaultNetwork");
-                ConnectivityManager connectivityManager3 = this.connectivityManager;
+                ConnectivityManager connectivityManager3 = connectivityManager;
                 ConnectivityManager.setProcessDefaultNetwork((Network) null);
                 ConnectivityManager.setProcessDefaultNetwork((Network) null);
             }
             }
         } else {
         } else {
@@ -182,7 +182,7 @@ public class ManageDefaultNetwork {
         }
         }
         try {
         try {
             if (manageDefaultNetworkCallback != null) {
             if (manageDefaultNetworkCallback != null) {
-                this.connectivityManager.unregisterNetworkCallback(manageDefaultNetworkCallback);
+                connectivityManager.unregisterNetworkCallback(manageDefaultNetworkCallback);
                 manageDefaultNetworkCallback = null;
                 manageDefaultNetworkCallback = null;
             }
             }
         } catch (IllegalArgumentException e) {
         } catch (IllegalArgumentException e) {

+ 6 - 6
app/src/main/java/com/epson/mobilephone/common/wifidirect/NfcTagParser.java

@@ -36,7 +36,7 @@ public class NfcTagParser {
         if (bArr.length != LENGTH_TAGDATA) {
         if (bArr.length != LENGTH_TAGDATA) {
             return false;
             return false;
         }
         }
-        this.tagData = bArr;
+        tagData = bArr;
         return true;
         return true;
     }
     }
 
 
@@ -45,12 +45,12 @@ public class NfcTagParser {
     }
     }
 
 
     public String getSSID() {
     public String getSSID() {
-        byte[] bArr = this.tagData;
+        byte[] bArr = tagData;
         return new String(ArrayUtils.subarray(bArr, 69, (bArr[66] - 1) + 69));
         return new String(ArrayUtils.subarray(bArr, 69, (bArr[66] - 1) + 69));
     }
     }
 
 
     public String getPassWord() {
     public String getPassWord() {
-        byte[] bArr = this.tagData;
+        byte[] bArr = tagData;
         byte[] subarray = ArrayUtils.subarray(bArr, 2, bArr[0] + 2);
         byte[] subarray = ArrayUtils.subarray(bArr, 2, bArr[0] + 2);
         for (int i = 0; i < subarray.length; i++) {
         for (int i = 0; i < subarray.length; i++) {
             subarray[i] = (byte) ((~subarray[i]) & 255);
             subarray[i] = (byte) ((~subarray[i]) & 255);
@@ -82,11 +82,11 @@ public class NfcTagParser {
     }
     }
 
 
     private int getPrinterStatus() {
     private int getPrinterStatus() {
-        int i = this.tagData[114] != 0 ? 1 : 0;
+        int i = tagData[114] != 0 ? 1 : 0;
         if (this.tagData[130] != 0) {
         if (this.tagData[130] != 0) {
             i |= 2;
             i |= 2;
         }
         }
-        if ((1 & this.tagData[131]) != 0) {
+        if ((1 & tagData[131]) != 0) {
             i |= 4;
             i |= 4;
         }
         }
         if ((this.tagData[131] & 2) != 0) {
         if ((this.tagData[131] & 2) != 0) {
@@ -98,6 +98,6 @@ public class NfcTagParser {
         if (this.tagData[132] != 0) {
         if (this.tagData[132] != 0) {
             i |= 65536;
             i |= 65536;
         }
         }
-        return this.tagData[133] != 0 ? i | 16777216 : i;
+        return tagData[133] != 0 ? i | 16777216 : i;
     }
     }
 }
 }

+ 9 - 9
app/src/main/java/com/epson/mobilephone/common/wifidirect/NfcTagUtils.java

@@ -60,14 +60,14 @@ public class NfcTagUtils {
         private EpsonNfcConnectInfo(Parcel parcel) {
         private EpsonNfcConnectInfo(Parcel parcel) {
             macAdress = parcel.readString();
             macAdress = parcel.readString();
             macAdressP2P = parcel.readString();
             macAdressP2P = parcel.readString();
-            this.ssid = parcel.readString();
-            this.password = parcel.readString();
-            this.initialpassword = parcel.readString();
-            this.aarPackageName = parcel.readString();
-            this.tagVersion = parcel.readString();
-            this.ipAddressV4 = parcel.readString();
-            this.ipAddressV4SimpleAP = parcel.readString();
-            this.printerStatus = parcel.readInt();
+            ssid = parcel.readString();
+            password = parcel.readString();
+            initialpassword = parcel.readString();
+            aarPackageName = parcel.readString();
+            tagVersion = parcel.readString();
+            ipAddressV4 = parcel.readString();
+            ipAddressV4SimpleAP = parcel.readString();
+            printerStatus = parcel.readInt();
         }
         }
 
 
         public void writeToParcel(Parcel parcel, int i) {
         public void writeToParcel(Parcel parcel, int i) {
@@ -84,7 +84,7 @@ public class NfcTagUtils {
         }
         }
 
 
         public boolean isTagWithInterface() {
         public boolean isTagWithInterface() {
-            String str = this.tagVersion;
+            String str = tagVersion;
             return str != null && str.startsWith(NfcTagUtils.PREFIX_TAGWITHNTERFACE);
             return str != null && str.startsWith(NfcTagUtils.PREFIX_TAGWITHNTERFACE);
         }
         }
 
 

+ 33 - 33
app/src/main/java/com/epson/mobilephone/common/wifidirect/SearchWiFiDirectPrinterTask.java

@@ -112,12 +112,12 @@ public class SearchWiFiDirectPrinterTask {
     }
     }
 
 
     private SearchWiFiDirectPrinterTask(Context context2) {
     private SearchWiFiDirectPrinterTask(Context context2) {
-        this.context = context2.getApplicationContext();
+        context = context2.getApplicationContext();
         mWifiManager = (WifiManager) context2.getSystemService("wifi");
         mWifiManager = (WifiManager) context2.getSystemService("wifi");
         mWiFiP2PManager = (WifiP2pManager) context2.getSystemService("wifip2p");
         mWiFiP2PManager = (WifiP2pManager) context2.getSystemService("wifip2p");
         WifiP2pManager wifiP2pManager = mWiFiP2PManager;
         WifiP2pManager wifiP2pManager = mWiFiP2PManager;
         if (wifiP2pManager != null) {
         if (wifiP2pManager != null) {
-            this.p2pChannnel = wifiP2pManager.initialize(context2, context2.getMainLooper(), (WifiP2pManager.ChannelListener) null);
+            p2pChannnel = wifiP2pManager.initialize(context2, context2.getMainLooper(), (WifiP2pManager.ChannelListener) null);
         }
         }
     }
     }
 
 
@@ -128,67 +128,67 @@ public class SearchWiFiDirectPrinterTask {
         }
         }
         EPLog.m86d(TAG, "start()");
         EPLog.m86d(TAG, "start()");
         mHandler = handler;
         mHandler = handler;
-        this.idResult = i2;
-        this.timeout = i3;
+        idResult = i2;
+        timeout = i3;
         if (!mWifiManager.isWifiEnabled()) {
         if (!mWifiManager.isWifiEnabled()) {
             return false;
             return false;
         }
         }
-        this.listFoundSSID.clear();
-        this.retryScaning = 0;
-        this.retryScaningP2P = 0;
-        this.scannigObserver.start(i3 * 1000);
+        listFoundSSID.clear();
+        retryScaning = 0;
+        retryScaningP2P = 0;
+        scannigObserver.start(i3 * 1000);
         if ((i & 1) != 0) {
         if ((i & 1) != 0) {
-            this.networkStateChangeReciever = new NetworkStateChangeReciever();
-            this.context.registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.SCAN_RESULTS"));
-            this.serarchingStatus |= 1;
+            networkStateChangeReciever = new NetworkStateChangeReciever();
+            context.registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.SCAN_RESULTS"));
+            serarchingStatus |= 1;
             onScanResultAvailable();
             onScanResultAvailable();
         }
         }
-        if (!((i & 2) == 0 || mWiFiP2PManager == null || this.p2pChannnel == null)) {
-            this.p2pStateChangeReciever = new WiFiDirectBroadcastReceiver();
-            this.context.registerReceiver(this.p2pStateChangeReciever, new IntentFilter("android.net.wifi.p2p.PEERS_CHANGED"));
-            this.bDisConnectP2P = false;
-            this.searchHandler.sendEmptyMessage(0);
+        if (!((i & 2) == 0 || mWiFiP2PManager == null || p2pChannnel == null)) {
+            p2pStateChangeReciever = new WiFiDirectBroadcastReceiver();
+            context.registerReceiver(this.p2pStateChangeReciever, new IntentFilter("android.net.wifi.p2p.PEERS_CHANGED"));
+            bDisConnectP2P = false;
+            searchHandler.sendEmptyMessage(0);
         }
         }
         return true;
         return true;
     }
     }
 
 
     public void interrupt() {
     public void interrupt() {
         EPLog.m86d(TAG, "interrupt()");
         EPLog.m86d(TAG, "interrupt()");
-        Handler handler = this.searchHandler;
+        Handler handler = searchHandler;
         if (handler != null) {
         if (handler != null) {
             handler.removeMessages(0);
             handler.removeMessages(0);
         }
         }
-        this.scannigObserver.interrunpt();
-        if (!(mWiFiP2PManager == null || this.p2pChannnel == null)) {
+        scannigObserver.interrunpt();
+        if (!(mWiFiP2PManager == null || p2pChannnel == null)) {
             EPLog.m86d(TAG, "stopPeerDiscovery");
             EPLog.m86d(TAG, "stopPeerDiscovery");
             mWiFiP2PManager.stopPeerDiscovery(this.p2pChannnel, (WifiP2pManager.ActionListener) null);
             mWiFiP2PManager.stopPeerDiscovery(this.p2pChannnel, (WifiP2pManager.ActionListener) null);
         }
         }
         unRegisterReceiverSimpleAp();
         unRegisterReceiverSimpleAp();
         unRegisterReceiverP2P();
         unRegisterReceiverP2P();
-        this.serarchingStatus = 0;
+        serarchingStatus = 0;
     }
     }
 
 
     private void unRegisterReceiverSimpleAp() {
     private void unRegisterReceiverSimpleAp() {
-        NetworkStateChangeReciever networkStateChangeReciever2 = this.networkStateChangeReciever;
+        NetworkStateChangeReciever networkStateChangeReciever2 = networkStateChangeReciever;
         if (networkStateChangeReciever2 != null) {
         if (networkStateChangeReciever2 != null) {
             try {
             try {
-                this.context.unregisterReceiver(networkStateChangeReciever2);
+                context.unregisterReceiver(networkStateChangeReciever2);
             } catch (IllegalArgumentException e) {
             } catch (IllegalArgumentException e) {
                 e.printStackTrace();
                 e.printStackTrace();
             }
             }
-            this.networkStateChangeReciever = null;
+            networkStateChangeReciever = null;
         }
         }
     }
     }
 
 
     private void unRegisterReceiverP2P() {
     private void unRegisterReceiverP2P() {
-        WiFiDirectBroadcastReceiver wiFiDirectBroadcastReceiver = this.p2pStateChangeReciever;
+        WiFiDirectBroadcastReceiver wiFiDirectBroadcastReceiver = p2pStateChangeReciever;
         if (wiFiDirectBroadcastReceiver != null) {
         if (wiFiDirectBroadcastReceiver != null) {
             try {
             try {
-                this.context.unregisterReceiver(wiFiDirectBroadcastReceiver);
+                context.unregisterReceiver(wiFiDirectBroadcastReceiver);
             } catch (IllegalArgumentException e) {
             } catch (IllegalArgumentException e) {
                 e.printStackTrace();
                 e.printStackTrace();
             }
             }
-            this.p2pStateChangeReciever = null;
+            p2pStateChangeReciever = null;
         }
         }
     }
     }
 
 
@@ -239,7 +239,7 @@ public class SearchWiFiDirectPrinterTask {
             }
             }
         }
         }
         lastScan = elapsedRealtime;
         lastScan = elapsedRealtime;
-        this.retryScaning++;
+        retryScaning++;
         if (this.retryScaning < 5) {
         if (this.retryScaning < 5) {
             EPLog.m88i(TAG, "Retry startScan()");
             EPLog.m88i(TAG, "Retry startScan()");
             mWifiManager.startScan();
             mWifiManager.startScan();
@@ -247,7 +247,7 @@ public class SearchWiFiDirectPrinterTask {
         }
         }
         EPLog.m88i(TAG, "MAX_RETRY_SCANING");
         EPLog.m88i(TAG, "MAX_RETRY_SCANING");
         unRegisterReceiverSimpleAp();
         unRegisterReceiverSimpleAp();
-        this.serarchingStatus &= -2;
+        serarchingStatus &= -2;
         if (this.serarchingStatus == 0) {
         if (this.serarchingStatus == 0) {
             mHandler.sendEmptyMessage(this.idResult);
             mHandler.sendEmptyMessage(this.idResult);
             interrupt();
             interrupt();
@@ -256,7 +256,7 @@ public class SearchWiFiDirectPrinterTask {
 
 
     private void onFindPrinterResult(String str, int i, String str2) {
     private void onFindPrinterResult(String str, int i, String str2) {
         if (!this.listFoundSSID.contains(str)) {
         if (!this.listFoundSSID.contains(str)) {
-            this.listFoundSSID.add(str);
+            listFoundSSID.add(str);
             SimpleAPInfoDB.SimpleAPInfo simpleAPInfoDB = SimpleAPInfoDB.getSimpleAPInfoDB(this.context, str);
             SimpleAPInfoDB.SimpleAPInfo simpleAPInfoDB = SimpleAPInfoDB.getSimpleAPInfoDB(this.context, str);
             if (simpleAPInfoDB == null) {
             if (simpleAPInfoDB == null) {
                 simpleAPInfoDB = new SimpleAPInfoDB.SimpleAPInfo();
                 simpleAPInfoDB = new SimpleAPInfoDB.SimpleAPInfo();
@@ -265,7 +265,7 @@ public class SearchWiFiDirectPrinterTask {
                 simpleAPInfoDB.printerName = WiFiControl.getPrinterNetworkName(str);
                 simpleAPInfoDB.printerName = WiFiControl.getPrinterNetworkName(str);
             }
             }
             Message obtain = Message.obtain();
             Message obtain = Message.obtain();
-            obtain.what = this.idResult;
+            obtain.what = idResult;
             Bundle bundle = new Bundle();
             Bundle bundle = new Bundle();
             bundle.putString("ssid", simpleAPInfoDB.ssid);
             bundle.putString("ssid", simpleAPInfoDB.ssid);
             bundle.putString("name", simpleAPInfoDB.printerName);
             bundle.putString("name", simpleAPInfoDB.printerName);
@@ -331,7 +331,7 @@ public class SearchWiFiDirectPrinterTask {
         private void start(final int i) {
         private void start(final int i) {
             interrunpt();
             interrunpt();
             EPLog.m86d(SearchWiFiDirectPrinterTask.TAG, "Start ScanningObserver");
             EPLog.m86d(SearchWiFiDirectPrinterTask.TAG, "Start ScanningObserver");
-            this.observerTask = new AsyncTask<Void, Void, Void>() {
+            observerTask = new AsyncTask<Void, Void, Void>() {
                 protected Void doInBackground(Void... voidArr) {
                 protected Void doInBackground(Void... voidArr) {
                     int i = 0;
                     int i = 0;
                     do {
                     do {
@@ -358,10 +358,10 @@ public class SearchWiFiDirectPrinterTask {
         }
         }
 
 
         private void interrunpt() {
         private void interrunpt() {
-            AsyncTask<Void, Void, Void> asyncTask = this.observerTask;
+            AsyncTask<Void, Void, Void> asyncTask = observerTask;
             if (asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING && !this.observerTask.isCancelled()) {
             if (asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING && !this.observerTask.isCancelled()) {
                 EPLog.m86d(SearchWiFiDirectPrinterTask.TAG, "Stop ScanningObserver");
                 EPLog.m86d(SearchWiFiDirectPrinterTask.TAG, "Stop ScanningObserver");
-                this.observerTask.cancel(false);
+                observerTask.cancel(false);
             }
             }
         }
         }
     }
     }

+ 30 - 30
app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiDirectPrinterListUtils.java

@@ -42,27 +42,27 @@ public class WiFiDirectPrinterListUtils {
         PRINTER_TYPE type;
         PRINTER_TYPE type;
 
 
         public PrinterInfo(PRINTER_TYPE printer_type, String str, String str2, String str3, Object obj) {
         public PrinterInfo(PRINTER_TYPE printer_type, String str, String str2, String str3, Object obj) {
-            this.type = printer_type;
+            type = printer_type;
             macAddr = str;
             macAddr = str;
-            this.f157ip = str2;
-            this.ssid = str3;
-            this.printer = obj;
+            f157ip = str2;
+            ssid = str3;
+            printer = obj;
         }
         }
     }
     }
 
 
     public WiFiDirectPrinterListUtils(Context context, AbstractList<Object> abstractList, ListController listController2, String str) {
     public WiFiDirectPrinterListUtils(Context context, AbstractList<Object> abstractList, ListController listController2, String str) {
         mAppContext = context.getApplicationContext();
         mAppContext = context.getApplicationContext();
-        this.wiFiControl = WiFiControl.getInstance(mAppContext);
-        this.innerPrinterList = new ArrayList<>();
-        this.uiPrinterList = abstractList;
-        this.listController = listController2;
-        this.curConnectInfo = str;
+        wiFiControl = WiFiControl.getInstance(mAppContext);
+        innerPrinterList = new ArrayList<>();
+        uiPrinterList = abstractList;
+        listController = listController2;
+        curConnectInfo = str;
         clearPrinterInfoList();
         clearPrinterInfoList();
     }
     }
 
 
     public void clearPrinterInfoList() {
     public void clearPrinterInfoList() {
         EPLog.m86d(TAG, "clearPrinterInfoList()");
         EPLog.m86d(TAG, "clearPrinterInfoList()");
-        this.innerPrinterList.clear();
+        innerPrinterList.clear();
         updateP2pPrinterMacAddr();
         updateP2pPrinterMacAddr();
     }
     }
 
 
@@ -70,16 +70,16 @@ public class WiFiDirectPrinterListUtils {
         EPLog.m86d(TAG, "updateP2pPrinterMacAddr()");
         EPLog.m86d(TAG, "updateP2pPrinterMacAddr()");
         WifiP2pUtils.ConnectionInfo connectionInfo = WifiP2pUtils.getInstance(mAppContext).getConnectionInfo();
         WifiP2pUtils.ConnectionInfo connectionInfo = WifiP2pUtils.getInstance(mAppContext).getConnectionInfo();
         if (connectionInfo == null) {
         if (connectionInfo == null) {
-            this.p2pPrinterMacAddr = null;
+            p2pPrinterMacAddr = null;
             return;
             return;
         }
         }
         if (connectionInfo.isGroupOwnerThisDevice) {
         if (connectionInfo.isGroupOwnerThisDevice) {
-            this.p2pPrinterMacAddr = WiFiControl.p2pAddr2PtrAddr(connectionInfo.p2PMacAdder, connectionInfo.printerName);
+            p2pPrinterMacAddr = WiFiControl.p2pAddr2PtrAddr(connectionInfo.p2PMacAdder, connectionInfo.printerName);
         } else {
         } else {
-            this.p2pPrinterMacAddr = WiFiControl.p2pAddr2PtrAddrP2P(connectionInfo.p2PMacAdder, connectionInfo.printerName);
+            p2pPrinterMacAddr = WiFiControl.p2pAddr2PtrAddrP2P(connectionInfo.p2PMacAdder, connectionInfo.printerName);
         }
         }
         if (MacAddrFilter.getInstance(mAppContext).isExcludedMacAddress(WiFiControl.p2pAddr2PtrAddr(connectionInfo.p2PMacAdder, connectionInfo.printerName))) {
         if (MacAddrFilter.getInstance(mAppContext).isExcludedMacAddress(WiFiControl.p2pAddr2PtrAddr(connectionInfo.p2PMacAdder, connectionInfo.printerName))) {
-            this.p2pPrinterMacAddr = null;
+            p2pPrinterMacAddr = null;
         }
         }
     }
     }
 
 
@@ -102,7 +102,7 @@ public class WiFiDirectPrinterListUtils {
                     EPLog.m86d(TAG, "Ignore Printer. This printer communicates via P2P:" + str);
                     EPLog.m86d(TAG, "Ignore Printer. This printer communicates via P2P:" + str);
                     return;
                     return;
                 } else {
                 } else {
-                    Iterator<PrinterInfo> it = this.innerPrinterList.iterator();
+                    Iterator<PrinterInfo> it = innerPrinterList.iterator();
                     while (true) {
                     while (true) {
                         if (it.hasNext()) {
                         if (it.hasNext()) {
                             PrinterInfo next = it.next();
                             PrinterInfo next = it.next();
@@ -110,9 +110,9 @@ public class WiFiDirectPrinterListUtils {
                                 String str3 = next.macAddr;
                                 String str3 = next.macAddr;
                                 if (str2 != null && str2.equals(str3)) {
                                 if (str2 != null && str2.equals(str3)) {
                                     EPLog.m86d(TAG, "Replace Duplicate Printer:" + next.ssid + "->" + str);
                                     EPLog.m86d(TAG, "Replace Duplicate Printer:" + next.ssid + "->" + str);
-                                    int indexOf = this.uiPrinterList.indexOf(next.printer);
+                                    int indexOf = uiPrinterList.indexOf(next.printer);
                                     if (-1 != indexOf) {
                                     if (-1 != indexOf) {
-                                        this.listController.replacePrinter(indexOf, obj, i);
+                                        listController.replacePrinter(indexOf, obj, i);
                                         z = false;
                                         z = false;
                                     } else {
                                     } else {
                                         EPLog.m87e(TAG, "Illegal curPrinterList1 (Maybe replaced):" + str);
                                         EPLog.m87e(TAG, "Illegal curPrinterList1 (Maybe replaced):" + str);
@@ -122,13 +122,13 @@ public class WiFiDirectPrinterListUtils {
                         }
                         }
                     }
                     }
                     if (z) {
                     if (z) {
-                        this.listController.addPrinter(obj, i);
+                        listController.addPrinter(obj, i);
                     }
                     }
-                    this.innerPrinterList.add(new PrinterInfo(PRINTER_TYPE.LOCAL, str2, str, (String) null, obj));
+                    innerPrinterList.add(new PrinterInfo(PRINTER_TYPE.LOCAL, str2, str, (String) null, obj));
                     return;
                     return;
                 }
                 }
             case WIFIDIRECT:
             case WIFIDIRECT:
-                Iterator<PrinterInfo> it2 = this.innerPrinterList.iterator();
+                Iterator<PrinterInfo> it2 = innerPrinterList.iterator();
                 while (true) {
                 while (true) {
                     if (it2.hasNext()) {
                     if (it2.hasNext()) {
                         PrinterInfo next2 = it2.next();
                         PrinterInfo next2 = it2.next();
@@ -143,12 +143,12 @@ public class WiFiDirectPrinterListUtils {
                                             break;
                                             break;
                                         } else {
                                         } else {
                                             EPLog.m86d(TAG, "Replace Duplicate Printer:" + next2.ssid + "->" + str);
                                             EPLog.m86d(TAG, "Replace Duplicate Printer:" + next2.ssid + "->" + str);
-                                            int indexOf2 = this.uiPrinterList.indexOf(next2.printer);
+                                            int indexOf2 = uiPrinterList.indexOf(next2.printer);
                                             if (-1 == indexOf2) {
                                             if (-1 == indexOf2) {
                                                 EPLog.m87e(TAG, "Illegal curPrinterList2 (Maybe replaced):" + str);
                                                 EPLog.m87e(TAG, "Illegal curPrinterList2 (Maybe replaced):" + str);
                                                 break;
                                                 break;
                                             } else {
                                             } else {
-                                                this.listController.replacePrinter(indexOf2, obj, i);
+                                                listController.replacePrinter(indexOf2, obj, i);
                                                 z = false;
                                                 z = false;
                                                 break;
                                                 break;
                                             }
                                             }
@@ -169,17 +169,17 @@ public class WiFiDirectPrinterListUtils {
                         } else {
                         } else {
                             String p2pPtrAddr2PtrAddr = WiFiControl.p2pPtrAddr2PtrAddr(str4);
                             String p2pPtrAddr2PtrAddr = WiFiControl.p2pPtrAddr2PtrAddr(str4);
                             if ((str4 != null && str4.equals(str2)) || (p2pPtrAddr2PtrAddr != null && p2pPtrAddr2PtrAddr.equals(str2))) {
                             if ((str4 != null && str4.equals(str2)) || (p2pPtrAddr2PtrAddr != null && p2pPtrAddr2PtrAddr.equals(str2))) {
-                                String curConnectInfo2 = this.wiFiControl.getCurConnectInfo(str4);
+                                String curConnectInfo2 = wiFiControl.getCurConnectInfo(str4);
                                 if (curConnectInfo2 != null) {
                                 if (curConnectInfo2 != null) {
                                     int[] iArr = C11211.f155x793e0ec3;
                                     int[] iArr = C11211.f155x793e0ec3;
-                                    WiFiControl wiFiControl2 = this.wiFiControl;
+                                    WiFiControl wiFiControl2 = wiFiControl;
                                     if (iArr[WiFiControl.getSSIDType(str).ordinal()] != 2) {
                                     if (iArr[WiFiControl.getSSIDType(str).ordinal()] != 2) {
                                         z2 = z;
                                         z2 = z;
                                     } else if (curConnectInfo2.equals(this.curConnectInfo)) {
                                     } else if (curConnectInfo2.equals(this.curConnectInfo)) {
                                         EPLog.m86d(TAG, "Replace Duplicate Printer:" + next2.f157ip + "->" + str);
                                         EPLog.m86d(TAG, "Replace Duplicate Printer:" + next2.f157ip + "->" + str);
-                                        int indexOf3 = this.uiPrinterList.indexOf(next2.printer);
+                                        int indexOf3 = uiPrinterList.indexOf(next2.printer);
                                         if (-1 != indexOf3) {
                                         if (-1 != indexOf3) {
-                                            this.listController.replacePrinter(indexOf3, obj, i);
+                                            listController.replacePrinter(indexOf3, obj, i);
                                         } else {
                                         } else {
                                             EPLog.m87e(TAG, "Illegal curPrinterList3 (Maybe replaced):" + str);
                                             EPLog.m87e(TAG, "Illegal curPrinterList3 (Maybe replaced):" + str);
                                         }
                                         }
@@ -196,12 +196,12 @@ public class WiFiDirectPrinterListUtils {
                     }
                     }
                 }
                 }
                 if (z2) {
                 if (z2) {
-                    this.listController.addPrinter(obj, i);
+                    listController.addPrinter(obj, i);
                 }
                 }
-                this.innerPrinterList.add(new PrinterInfo(PRINTER_TYPE.WIFIDIRECT, str2, (String) null, str, obj));
+                innerPrinterList.add(new PrinterInfo(PRINTER_TYPE.WIFIDIRECT, str2, (String) null, str, obj));
                 return;
                 return;
             case USB:
             case USB:
-                this.listController.addPrinter(obj, i);
+                listController.addPrinter(obj, i);
                 return;
                 return;
             default:
             default:
                 EPLog.m90w(TAG, "Un known Type");
                 EPLog.m90w(TAG, "Un known Type");
@@ -211,7 +211,7 @@ public class WiFiDirectPrinterListUtils {
 
 
     private PRINTER_TYPE getType(String str) {
     private PRINTER_TYPE getType(String str) {
         WiFiControl.ConnectType connectType = WiFiControl.ConnectType.NONE;
         WiFiControl.ConnectType connectType = WiFiControl.ConnectType.NONE;
-        WiFiControl wiFiControl2 = this.wiFiControl;
+        WiFiControl wiFiControl2 = wiFiControl;
         if (!connectType.equals(WiFiControl.getSSIDType(str))) {
         if (!connectType.equals(WiFiControl.getSSIDType(str))) {
             return PRINTER_TYPE.WIFIDIRECT;
             return PRINTER_TYPE.WIFIDIRECT;
         }
         }

+ 4 - 4
app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiNetworkManager.java

@@ -15,8 +15,8 @@ public class WiFiNetworkManager {
     Context context;
     Context context;
 
 
     private WiFiNetworkManager(@NonNull Context context2) {
     private WiFiNetworkManager(@NonNull Context context2) {
-        this.context = context2;
-        this.connectivityManager = (ConnectivityManager) context2.getSystemService("connectivity");
+        context = context2;
+        connectivityManager = (ConnectivityManager) context2.getSystemService("connectivity");
     }
     }
 
 
     public static WiFiNetworkManager getInsetance(@NonNull Context context2) {
     public static WiFiNetworkManager getInsetance(@NonNull Context context2) {
@@ -27,7 +27,7 @@ public class WiFiNetworkManager {
     }
     }
 
 
     protected Network getWifiNetwork() {
     protected Network getWifiNetwork() {
-        for (Network network : this.connectivityManager.getAllNetworks()) {
+        for (Network network : connectivityManager.getAllNetworks()) {
             if (this.connectivityManager.getNetworkCapabilities(network).hasTransport(1)) {
             if (this.connectivityManager.getNetworkCapabilities(network).hasTransport(1)) {
                 return network;
                 return network;
             }
             }
@@ -39,7 +39,7 @@ public class WiFiNetworkManager {
     public boolean isWiFiValidated() {
     public boolean isWiFiValidated() {
         Network wifiNetwork = getWifiNetwork();
         Network wifiNetwork = getWifiNetwork();
         if (wifiNetwork != null) {
         if (wifiNetwork != null) {
-            NetworkCapabilities networkCapabilities = this.connectivityManager.getNetworkCapabilities(wifiNetwork);
+            NetworkCapabilities networkCapabilities = connectivityManager.getNetworkCapabilities(wifiNetwork);
             if (networkCapabilities.hasCapability(16)) {
             if (networkCapabilities.hasCapability(16)) {
                 EPLog.m86d(TAG, "capabilities :" + networkCapabilities.toString());
                 EPLog.m86d(TAG, "capabilities :" + networkCapabilities.toString());
                 EPLog.m86d(TAG, "isWiFiValidated = OK : " + WiFiUtils.getInstance(this.context).getCurSSID());
                 EPLog.m86d(TAG, "isWiFiValidated = OK : " + WiFiUtils.getInstance(this.context).getCurSSID());

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiScanner.java

@@ -19,7 +19,7 @@ public class WiFiScanner {
                 wifiScannerToken = new Object();
                 wifiScannerToken = new Object();
             }
             }
             wifiScannerHandler.removeCallbacksAndMessages(wifiScannerToken);
             wifiScannerHandler.removeCallbacksAndMessages(wifiScannerToken);
-            this.refWiFiManager = new WeakReference<>(wifiManager);
+            refWiFiManager = new WeakReference<>(wifiManager);
             wifiScannerHandler.postDelayed(new Runnable() {
             wifiScannerHandler.postDelayed(new Runnable() {
                 public void run() {
                 public void run() {
                     WifiManager wifiManager = (WifiManager) WiFiScanner.this.refWiFiManager.get();
                     WifiManager wifiManager = (WifiManager) WiFiScanner.this.refWiFiManager.get();

+ 22 - 22
app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiUtils.java

@@ -41,8 +41,8 @@ public class WiFiUtils {
     private WifiManager f159wm = null;
     private WifiManager f159wm = null;
 
 
     private WiFiUtils(Context context) {
     private WiFiUtils(Context context) {
-        this.f159wm = (WifiManager) context.getApplicationContext().getApplicationContext().getSystemService("wifi");
-        this.f158cm = (ConnectivityManager) context.getApplicationContext().getApplicationContext().getSystemService("connectivity");
+        f159wm = (WifiManager) context.getApplicationContext().getApplicationContext().getSystemService("wifi");
+        f158cm = (ConnectivityManager) context.getApplicationContext().getApplicationContext().getSystemService("connectivity");
     }
     }
 
 
     public static WiFiUtils getInstance(Context context) {
     public static WiFiUtils getInstance(Context context) {
@@ -79,7 +79,7 @@ public class WiFiUtils {
 
 
     @Deprecated
     @Deprecated
     public int getCurNetworkId() {
     public int getCurNetworkId() {
-        WifiInfo connectionInfo = this.f159wm.getConnectionInfo();
+        WifiInfo connectionInfo = f159wm.getConnectionInfo();
         if (connectionInfo == null || connectionInfo.getNetworkId() == -1 || !SupplicantState.COMPLETED.equals(connectionInfo.getSupplicantState())) {
         if (connectionInfo == null || connectionInfo.getNetworkId() == -1 || !SupplicantState.COMPLETED.equals(connectionInfo.getSupplicantState())) {
             return -1;
             return -1;
         }
         }
@@ -88,7 +88,7 @@ public class WiFiUtils {
 
 
     public String getCurSSID() {
     public String getCurSSID() {
         String removeQuotationsInSSID;
         String removeQuotationsInSSID;
-        WifiInfo connectionInfo = this.f159wm.getConnectionInfo();
+        WifiInfo connectionInfo = f159wm.getConnectionInfo();
         if (connectionInfo == null || !SupplicantState.COMPLETED.equals(connectionInfo.getSupplicantState())) {
         if (connectionInfo == null || !SupplicantState.COMPLETED.equals(connectionInfo.getSupplicantState())) {
             return null;
             return null;
         }
         }
@@ -104,7 +104,7 @@ public class WiFiUtils {
     }
     }
 
 
     public String getCurP2PMacAdder() {
     public String getCurP2PMacAdder() {
-        WifiInfo connectionInfo = this.f159wm.getConnectionInfo();
+        WifiInfo connectionInfo = f159wm.getConnectionInfo();
         if (connectionInfo != null) {
         if (connectionInfo != null) {
             return connectionInfo.getBSSID();
             return connectionInfo.getBSSID();
         }
         }
@@ -114,7 +114,7 @@ public class WiFiUtils {
     @Deprecated
     @Deprecated
     public int getNetworkId(String str) {
     public int getNetworkId(String str) {
         List<WifiConfiguration> configuredNetworks;
         List<WifiConfiguration> configuredNetworks;
-        if (!(str == null || (configuredNetworks = this.f159wm.getConfiguredNetworks()) == null)) {
+        if (!(str == null || (configuredNetworks = f159wm.getConfiguredNetworks()) == null)) {
             for (WifiConfiguration next : configuredNetworks) {
             for (WifiConfiguration next : configuredNetworks) {
                 if (removeQuotationsInSSID(str).equals(removeQuotationsInSSID(next.SSID))) {
                 if (removeQuotationsInSSID(str).equals(removeQuotationsInSSID(next.SSID))) {
                     return next.networkId;
                     return next.networkId;
@@ -126,7 +126,7 @@ public class WiFiUtils {
 
 
     @Deprecated
     @Deprecated
     public WifiConfiguration getWifiConfig(int i) {
     public WifiConfiguration getWifiConfig(int i) {
-        List<WifiConfiguration> configuredNetworks = this.f159wm.getConfiguredNetworks();
+        List<WifiConfiguration> configuredNetworks = f159wm.getConfiguredNetworks();
         if (configuredNetworks == null) {
         if (configuredNetworks == null) {
             return null;
             return null;
         }
         }
@@ -169,20 +169,20 @@ public class WiFiUtils {
         wifiConfiguration.networkId = networkId;
         wifiConfiguration.networkId = networkId;
         if (networkId == -1) {
         if (networkId == -1) {
             EPLog.m88i(TAG, "call addNetwork!!");
             EPLog.m88i(TAG, "call addNetwork!!");
-            i = this.f159wm.addNetwork(wifiConfiguration);
+            i = f159wm.addNetwork(wifiConfiguration);
             if (i == -1) {
             if (i == -1) {
                 EPLog.m90w(TAG, "Failed addNetwork. Try ramdam ssid!");
                 EPLog.m90w(TAG, "Failed addNetwork. Try ramdam ssid!");
                 wifiConfiguration.SSID = "\"" + UUID.randomUUID().toString().replace("-", "") + "\"";
                 wifiConfiguration.SSID = "\"" + UUID.randomUUID().toString().replace("-", "") + "\"";
-                i = this.f159wm.addNetwork(wifiConfiguration);
+                i = f159wm.addNetwork(wifiConfiguration);
                 if (i != -1) {
                 if (i != -1) {
                     wifiConfiguration.SSID = "\"" + str + "\"";
                     wifiConfiguration.SSID = "\"" + str + "\"";
                     wifiConfiguration.networkId = i;
                     wifiConfiguration.networkId = i;
-                    i = this.f159wm.updateNetwork(wifiConfiguration);
+                    i = f159wm.updateNetwork(wifiConfiguration);
                 }
                 }
             }
             }
         } else {
         } else {
             EPLog.m88i(TAG, "call updateNetwork!!");
             EPLog.m88i(TAG, "call updateNetwork!!");
-            i = this.f159wm.updateNetwork(wifiConfiguration);
+            i = f159wm.updateNetwork(wifiConfiguration);
         }
         }
         if (i == -1) {
         if (i == -1) {
             EPLog.m87e(TAG, "Failed addNetwork or updateNetwork");
             EPLog.m87e(TAG, "Failed addNetwork or updateNetwork");
@@ -190,7 +190,7 @@ public class WiFiUtils {
         }
         }
         int curNetworkId = getCurNetworkId();
         int curNetworkId = getCurNetworkId();
         if (curNetworkId != -1) {
         if (curNetworkId != -1) {
-            this.f159wm.disableNetwork(curNetworkId);
+            f159wm.disableNetwork(curNetworkId);
         }
         }
         if (wifiManager_connect(i)) {
         if (wifiManager_connect(i)) {
             return i;
             return i;
@@ -214,7 +214,7 @@ public class WiFiUtils {
         }
         }
         int curNetworkId = getCurNetworkId();
         int curNetworkId = getCurNetworkId();
         if (curNetworkId != -1) {
         if (curNetworkId != -1) {
-            this.f159wm.disableNetwork(curNetworkId);
+            f159wm.disableNetwork(curNetworkId);
         }
         }
         if (wifiManager_connect(i)) {
         if (wifiManager_connect(i)) {
             return true;
             return true;
@@ -311,10 +311,10 @@ public class WiFiUtils {
             } else {
             } else {
                 wifiConfig.SSID = "\"" + removeQuotationsInSSID(wifiConfig.SSID) + SUFIX_SIMPLEAP_DISALBED + "\"";
                 wifiConfig.SSID = "\"" + removeQuotationsInSSID(wifiConfig.SSID) + SUFIX_SIMPLEAP_DISALBED + "\"";
             }
             }
-            for (WifiConfiguration next : this.f159wm.getConfiguredNetworks()) {
+            for (WifiConfiguration next : f159wm.getConfiguredNetworks()) {
                 if (next.networkId != i && wifiConfig.SSID.equals(next.SSID)) {
                 if (next.networkId != i && wifiConfig.SSID.equals(next.SSID)) {
                     EPLog.m88i(TAG, "Delete network for Backup : " + next.SSID);
                     EPLog.m88i(TAG, "Delete network for Backup : " + next.SSID);
-                    this.f159wm.removeNetwork(next.networkId);
+                    f159wm.removeNetwork(next.networkId);
                 }
                 }
             }
             }
             if (this.f159wm.updateNetwork(wifiConfig) == -1) {
             if (this.f159wm.updateNetwork(wifiConfig) == -1) {
@@ -333,11 +333,11 @@ public class WiFiUtils {
 
 
     public void reConnectNetwork() {
     public void reConnectNetwork() {
         EPLog.m88i(TAG, "called reConnectNetwork");
         EPLog.m88i(TAG, "called reConnectNetwork");
-        for (WifiConfiguration next : this.f159wm.getConfiguredNetworks()) {
+        for (WifiConfiguration next : f159wm.getConfiguredNetworks()) {
             if (WiFiControl.isSimpleAP(removeQuotationsInSSID(next.SSID))) {
             if (WiFiControl.isSimpleAP(removeQuotationsInSSID(next.SSID))) {
-                this.f159wm.disableNetwork(next.networkId);
+                f159wm.disableNetwork(next.networkId);
             } else if (!(next == null || next.status == 2)) {
             } else if (!(next == null || next.status == 2)) {
-                this.f159wm.enableNetwork(next.networkId, false);
+                f159wm.enableNetwork(next.networkId, false);
             }
             }
         }
         }
         if (!saveWifiConfiguration(this.f159wm)) {
         if (!saveWifiConfiguration(this.f159wm)) {
@@ -421,10 +421,10 @@ public class WiFiUtils {
     public boolean isConnectedWifi() {
     public boolean isConnectedWifi() {
         int type;
         int type;
         if (Build.VERSION.SDK_INT >= 21) {
         if (Build.VERSION.SDK_INT >= 21) {
-            Network[] allNetworks = this.f158cm.getAllNetworks();
+            Network[] allNetworks = f158cm.getAllNetworks();
             int i = 0;
             int i = 0;
             while (i < allNetworks.length) {
             while (i < allNetworks.length) {
-                NetworkInfo networkInfo = this.f158cm.getNetworkInfo(allNetworks[i]);
+                NetworkInfo networkInfo = f158cm.getNetworkInfo(allNetworks[i]);
                 if (networkInfo == null || (!((type = networkInfo.getType()) == 1 || type == 9) || !networkInfo.getState().equals(NetworkInfo.State.CONNECTED))) {
                 if (networkInfo == null || (!((type = networkInfo.getType()) == 1 || type == 9) || !networkInfo.getState().equals(NetworkInfo.State.CONNECTED))) {
                     i++;
                     i++;
                 } else {
                 } else {
@@ -433,7 +433,7 @@ public class WiFiUtils {
                 }
                 }
             }
             }
         } else {
         } else {
-            for (NetworkInfo networkInfo2 : this.f158cm.getAllNetworkInfo()) {
+            for (NetworkInfo networkInfo2 : f158cm.getAllNetworkInfo()) {
                 int type2 = networkInfo2.getType();
                 int type2 = networkInfo2.getType();
                 if ((type2 == 1 || type2 == 9) && networkInfo2.isConnected()) {
                 if ((type2 == 1 || type2 == 9) && networkInfo2.isConnected()) {
                     EPLog.m88i(TAG, String.format("isConnectedWifi = true : TypeName = %s", new Object[]{networkInfo2.getTypeName()}));
                     EPLog.m88i(TAG, String.format("isConnectedWifi = true : TypeName = %s", new Object[]{networkInfo2.getTypeName()}));
@@ -464,7 +464,7 @@ public class WiFiUtils {
     }
     }
 
 
     public void pingWiFiDirectPrinter() {
     public void pingWiFiDirectPrinter() {
-        DhcpInfo dhcpInfo = this.f159wm.getDhcpInfo();
+        DhcpInfo dhcpInfo = f159wm.getDhcpInfo();
         if (dhcpInfo != null) {
         if (dhcpInfo != null) {
             StringBuffer stringBuffer = new StringBuffer();
             StringBuffer stringBuffer = new StringBuffer();
             putAddress(stringBuffer, dhcpInfo.serverAddress);
             putAddress(stringBuffer, dhcpInfo.serverAddress);

+ 9 - 9
app/src/main/java/com/epson/mobilephone/common/wifidirect/WifiP2pUtils.java

@@ -48,12 +48,12 @@ public class WifiP2pUtils {
     private WifiP2pUtils(Context context) {
     private WifiP2pUtils(Context context) {
         if (Build.VERSION.SDK_INT >= 14) {
         if (Build.VERSION.SDK_INT >= 14) {
             mAppContext = context.getApplicationContext();
             mAppContext = context.getApplicationContext();
-            this.handlerThread = new HandlerThread("Thread for WiFip2p");
-            this.handlerThread.start();
+            handlerThread = new HandlerThread("Thread for WiFip2p");
+            handlerThread.start();
             mWiFiP2PManager = (WifiP2pManager) mAppContext.getSystemService("wifip2p");
             mWiFiP2PManager = (WifiP2pManager) mAppContext.getSystemService("wifip2p");
             WifiP2pManager wifiP2pManager = mWiFiP2PManager;
             WifiP2pManager wifiP2pManager = mWiFiP2PManager;
             if (wifiP2pManager != null) {
             if (wifiP2pManager != null) {
-                this.p2pChannnel = wifiP2pManager.initialize(mAppContext, this.handlerThread.getLooper(), (WifiP2pManager.ChannelListener) null);
+                p2pChannnel = wifiP2pManager.initialize(mAppContext, handlerThread.getLooper(), (WifiP2pManager.ChannelListener) null);
                 if (this.p2pChannnel == null) {
                 if (this.p2pChannnel == null) {
                     mWiFiP2PManager = null;
                     mWiFiP2PManager = null;
                 }
                 }
@@ -110,9 +110,9 @@ public class WifiP2pUtils {
         if (mWiFiP2PManager == null) {
         if (mWiFiP2PManager == null) {
             return null;
             return null;
         }
         }
-        this.groupInfo = null;
+        groupInfo = null;
         synchronized (this.lock) {
         synchronized (this.lock) {
-            this.status = STATUS.REQUEST_GROUPINFO;
+            status = STATUS.REQUEST_GROUPINFO;
             mWiFiP2PManager.requestGroupInfo(this.p2pChannnel, new WifiP2pManager.GroupInfoListener() {
             mWiFiP2PManager.requestGroupInfo(this.p2pChannnel, new WifiP2pManager.GroupInfoListener() {
                 public void onGroupInfoAvailable(WifiP2pGroup wifiP2pGroup) {
                 public void onGroupInfoAvailable(WifiP2pGroup wifiP2pGroup) {
                     WifiP2pGroup unused = WifiP2pUtils.this.groupInfo = wifiP2pGroup;
                     WifiP2pGroup unused = WifiP2pUtils.this.groupInfo = wifiP2pGroup;
@@ -125,19 +125,19 @@ public class WifiP2pUtils {
                 }
                 }
             });
             });
             try {
             try {
-                this.lock.wait(5000);
+                lock.wait(5000);
             } catch (InterruptedException e) {
             } catch (InterruptedException e) {
                 e.printStackTrace();
                 e.printStackTrace();
             }
             }
-            this.status = STATUS.IDLE;
+            status = STATUS.IDLE;
         }
         }
-        return this.groupInfo;
+        return groupInfo;
     }
     }
 
 
     private void resumeThread() {
     private void resumeThread() {
         synchronized (this.lock) {
         synchronized (this.lock) {
             try {
             try {
-                this.lock.notifyAll();
+                lock.notifyAll();
             } catch (IllegalMonitorStateException e) {
             } catch (IllegalMonitorStateException e) {
                 e.printStackTrace();
                 e.printStackTrace();
             }
             }

+ 6 - 6
app/src/main/java/com/epson/mobilephone/common/wifidirect/escprLib.java

@@ -71,11 +71,11 @@ public class escprLib {
     }
     }
 
 
     private void findPrinterCB() {
     private void findPrinterCB() {
-        String str = this.printerList;
+        String str = printerList;
         if (str != null && str.length() > 0) {
         if (str != null && str.length() > 0) {
             String name = getClass().getName();
             String name = getClass().getName();
-            EPLog.m87e(name, "EXTRACT Printer information: " + this.printerList);
-            String[] split = this.printerList.split("\\|\\|");
+            EPLog.m87e(name, "EXTRACT Printer information: " + printerList);
+            String[] split = printerList.split("\\|\\|");
             if (mIsSearch && mHandler != null) {
             if (mIsSearch && mHandler != null) {
                 Message obtain = Message.obtain();
                 Message obtain = Message.obtain();
                 obtain.what = mIdFound;
                 obtain.what = mIdFound;
@@ -97,12 +97,12 @@ public class escprLib {
                 mHandler.sendMessage(obtain);
                 mHandler.sendMessage(obtain);
             }
             }
         }
         }
-        this.printerList = "";
+        printerList = "";
     }
     }
 
 
     private void javaDebugCB() {
     private void javaDebugCB() {
-        EPLog.m88i(getClass().getName(), this.debugString);
-        this.debugString = "";
+        EPLog.m88i(getClass().getName(), debugString);
+        debugString = "";
     }
     }
 
 
     public void setHanlder(Handler handler, int i) {
     public void setHanlder(Handler handler, int i) {

+ 35 - 35
app/src/main/java/epson/common/BMPFile.java

@@ -30,9 +30,9 @@ public class BMPFile {
 
 
     public void saveBitmap(String str, Bitmap bitmap2, int i, int i2) {
     public void saveBitmap(String str, Bitmap bitmap2, int i, int i2) {
         try {
         try {
-            this.f331fo = new FileOutputStream(str);
+            f331fo = new FileOutputStream(str);
             save(bitmap2, i, i2);
             save(bitmap2, i, i2);
-            this.f331fo.close();
+            f331fo.close();
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
@@ -50,48 +50,48 @@ public class BMPFile {
     }
     }
 
 
     private boolean convertImage(Bitmap bitmap2, int i, int i2) {
     private boolean convertImage(Bitmap bitmap2, int i, int i2) {
-        this.bitmap = null;
+        bitmap = null;
         int i3 = i * i2;
         int i3 = i * i2;
-        this.bitmap = new int[i3];
+        bitmap = new int[i3];
         bitmap2.getPixels(this.bitmap, 0, i, 0, 0, i, i2);
         bitmap2.getPixels(this.bitmap, 0, i, 0, 0, i, i2);
-        this.biSizeImage = (i3 * 3) + ((4 - ((i * 3) % 4)) * i2);
-        this.bfSize = this.biSizeImage + 14 + 40;
-        this.biWidth = i;
-        this.biHeight = i2;
+        biSizeImage = (i3 * 3) + ((4 - ((i * 3) % 4)) * i2);
+        bfSize = biSizeImage + 14 + 40;
+        biWidth = i;
+        biHeight = i2;
         return true;
         return true;
     }
     }
 
 
     private void writeBitmap() {
     private void writeBitmap() {
         int i;
         int i;
         byte[] bArr = new byte[3];
         byte[] bArr = new byte[3];
-        int i2 = this.biWidth;
+        int i2 = biWidth;
         int i3 = (this.biHeight * i2) - 1;
         int i3 = (this.biHeight * i2) - 1;
         int i4 = 4 - ((i2 * 3) % 4);
         int i4 = 4 - ((i2 * 3) % 4);
         if (i4 == 4) {
         if (i4 == 4) {
             i4 = 0;
             i4 = 0;
         }
         }
-        int i5 = i3 - this.biWidth;
+        int i5 = i3 - biWidth;
         int i6 = i5;
         int i6 = i5;
         int i7 = 0;
         int i7 = 0;
         int i8 = 0;
         int i8 = 0;
         int i9 = 1;
         int i9 = 1;
         while (i7 < i3 + 1) {
         while (i7 < i3 + 1) {
             try {
             try {
-                if (i7 < this.biWidth) {
-                    i = this.bitmap[i5 + 1];
+                if (i7 < biWidth) {
+                    i = bitmap[i5 + 1];
                 } else {
                 } else {
-                    i = this.bitmap[i5];
+                    i = bitmap[i5];
                 }
                 }
                 bArr[0] = (byte) (i & 255);
                 bArr[0] = (byte) (i & 255);
                 bArr[1] = (byte) ((i >> 8) & 255);
                 bArr[1] = (byte) ((i >> 8) & 255);
                 bArr[2] = (byte) ((i >> 16) & 255);
                 bArr[2] = (byte) ((i >> 16) & 255);
-                this.f331fo.write(bArr);
-                if (i9 == this.biWidth) {
+                f331fo.write(bArr);
+                if (i9 == biWidth) {
                     i8 += i4;
                     i8 += i4;
                     for (int i10 = 1; i10 <= i4; i10++) {
                     for (int i10 = 1; i10 <= i4; i10++) {
-                        this.f331fo.write(0);
+                        f331fo.write(0);
                     }
                     }
-                    i5 = i6 - this.biWidth;
+                    i5 = i6 - biWidth;
                     i6 = i5;
                     i6 = i5;
                     i9 = 1;
                     i9 = 1;
                 } else {
                 } else {
@@ -105,17 +105,17 @@ public class BMPFile {
             }
             }
         }
         }
         int i11 = i8 - i4;
         int i11 = i8 - i4;
-        this.bfSize += i11;
-        this.biSizeImage += i11;
+        bfSize += i11;
+        biSizeImage += i11;
     }
     }
 
 
     private void writeBitmapFileHeader() {
     private void writeBitmapFileHeader() {
         try {
         try {
-            this.f331fo.write(this.bfType);
-            this.f331fo.write(intToDWord(this.bfSize));
-            this.f331fo.write(intToWord(this.bfReserved1));
-            this.f331fo.write(intToWord(this.bfReserved2));
-            this.f331fo.write(intToDWord(this.bfOffBits));
+            f331fo.write(this.bfType);
+            f331fo.write(intToDWord(this.bfSize));
+            f331fo.write(intToWord(this.bfReserved1));
+            f331fo.write(intToWord(this.bfReserved2));
+            f331fo.write(intToDWord(this.bfOffBits));
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
@@ -123,17 +123,17 @@ public class BMPFile {
 
 
     private void writeBitmapInfoHeader() {
     private void writeBitmapInfoHeader() {
         try {
         try {
-            this.f331fo.write(intToDWord(this.biSize));
-            this.f331fo.write(intToDWord(this.biWidth));
-            this.f331fo.write(intToDWord(this.biHeight));
-            this.f331fo.write(intToWord(this.biPlanes));
-            this.f331fo.write(intToWord(this.biBitCount));
-            this.f331fo.write(intToDWord(this.biCompression));
-            this.f331fo.write(intToDWord(this.biSizeImage));
-            this.f331fo.write(intToDWord(this.biXPelsPerMeter));
-            this.f331fo.write(intToDWord(this.biYPelsPerMeter));
-            this.f331fo.write(intToDWord(this.biClrUsed));
-            this.f331fo.write(intToDWord(this.biClrImportant));
+            f331fo.write(intToDWord(this.biSize));
+            f331fo.write(intToDWord(this.biWidth));
+            f331fo.write(intToDWord(this.biHeight));
+            f331fo.write(intToWord(this.biPlanes));
+            f331fo.write(intToWord(this.biBitCount));
+            f331fo.write(intToDWord(this.biCompression));
+            f331fo.write(intToDWord(this.biSizeImage));
+            f331fo.write(intToDWord(this.biXPelsPerMeter));
+            f331fo.write(intToDWord(this.biYPelsPerMeter));
+            f331fo.write(intToDWord(this.biClrUsed));
+            f331fo.write(intToDWord(this.biClrImportant));
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }

+ 9 - 9
app/src/main/java/epson/common/CustomListRowAdapter.java

@@ -25,22 +25,22 @@ public class CustomListRowAdapter extends ArrayAdapter<CustomListRow> {
 
 
     public CustomListRowAdapter(Context context, int i, List<CustomListRow> list, View.OnClickListener onClickListener) {
     public CustomListRowAdapter(Context context, int i, List<CustomListRow> list, View.OnClickListener onClickListener) {
         super(context, i, list);
         super(context, i, list);
-        this.resourceId = i;
-        this.items = list;
-        this.inflater = (LayoutInflater) context.getSystemService("layout_inflater");
-        this.listener = onClickListener;
+        resourceId = i;
+        items = list;
+        inflater = (LayoutInflater) context.getSystemService("layout_inflater");
+        listener = onClickListener;
     }
     }
 
 
     public View getView(int i, View view, ViewGroup viewGroup) {
     public View getView(int i, View view, ViewGroup viewGroup) {
         if (view == null) {
         if (view == null) {
-            view = this.inflater.inflate(this.resourceId, (ViewGroup) null);
+            view = inflater.inflate(this.resourceId, (ViewGroup) null);
         }
         }
         return populateView(i, view, viewGroup);
         return populateView(i, view, viewGroup);
     }
     }
 
 
     protected View populateView(int i, View view, ViewGroup viewGroup) {
     protected View populateView(int i, View view, ViewGroup viewGroup) {
         EPLog.m305d(TAG, "View position [" + i + "]");
         EPLog.m305d(TAG, "View position [" + i + "]");
-        CustomListRow customListRow = this.items.get(i);
+        CustomListRow customListRow = items.get(i);
         if (customListRow.getPrefixImageId() != null) {
         if (customListRow.getPrefixImageId() != null) {
             ((ImageView) view.findViewById(R.id.row_prefix_image)).setImageResource(customListRow.getPrefixImageId().intValue());
             ((ImageView) view.findViewById(R.id.row_prefix_image)).setImageResource(customListRow.getPrefixImageId().intValue());
         }
         }
@@ -58,7 +58,7 @@ public class CustomListRowAdapter extends ArrayAdapter<CustomListRow> {
             }
             }
             linearLayout.addView(textView, i2);
             linearLayout.addView(textView, i2);
         }
         }
-        View.OnClickListener onClickListener = this.listener;
+        View.OnClickListener onClickListener = listener;
         if (onClickListener != null) {
         if (onClickListener != null) {
             view.setOnClickListener(onClickListener);
             view.setOnClickListener(onClickListener);
         }
         }
@@ -66,10 +66,10 @@ public class CustomListRowAdapter extends ArrayAdapter<CustomListRow> {
     }
     }
 
 
     public void addList(CustomListRow customListRow) {
     public void addList(CustomListRow customListRow) {
-        this.items.add(customListRow);
+        items.add(customListRow);
     }
     }
 
 
     public void setList(int i, CustomListRow customListRow) {
     public void setList(int i, CustomListRow customListRow) {
-        this.items.set(i, customListRow);
+        items.set(i, customListRow);
     }
     }
 }
 }

+ 11 - 11
app/src/main/java/epson/common/CustomListRowImpl.java

@@ -17,44 +17,44 @@ public class CustomListRowImpl implements CustomListRow {
     }
     }
 
 
     public CustomListRowImpl prefixImage(Integer num) {
     public CustomListRowImpl prefixImage(Integer num) {
-        this.prefixImage = num;
+        prefixImage = num;
         return this;
         return this;
     }
     }
 
 
     public CustomListRowImpl suffixImage(Integer num) {
     public CustomListRowImpl suffixImage(Integer num) {
-        this.suffixImage = num;
+        suffixImage = num;
         return this;
         return this;
     }
     }
 
 
     public CustomListRowImpl addText(String str, float f) {
     public CustomListRowImpl addText(String str, float f) {
-        this.texts.add(str);
-        this.size.add(Float.valueOf(f));
+        texts.add(str);
+        size.add(Float.valueOf(f));
         return this;
         return this;
     }
     }
 
 
     public CustomListRowImpl addText(String str) {
     public CustomListRowImpl addText(String str) {
-        this.texts.add(str);
-        this.size.add(Float.valueOf(0.0f));
+        texts.add(str);
+        size.add(Float.valueOf(0.0f));
         return this;
         return this;
     }
     }
 
 
     public Integer getPrefixImageId() {
     public Integer getPrefixImageId() {
-        return this.prefixImage;
+        return prefixImage;
     }
     }
 
 
     public Integer getSuffixImageId() {
     public Integer getSuffixImageId() {
-        return this.suffixImage;
+        return suffixImage;
     }
     }
 
 
     public String getText(int i) {
     public String getText(int i) {
-        return this.texts.get(i);
+        return texts.get(i);
     }
     }
 
 
     public float getTextSize(int i) {
     public float getTextSize(int i) {
-        return this.size.get(i).floatValue();
+        return size.get(i).floatValue();
     }
     }
 
 
     public int sieze() {
     public int sieze() {
-        return this.texts.size();
+        return texts.size();
     }
     }
 }
 }

+ 2 - 2
app/src/main/java/epson/common/EventWrapper.java

@@ -19,11 +19,11 @@ public class EventWrapper<T> {
         if (this.handled) {
         if (this.handled) {
             return null;
             return null;
         }
         }
-        this.handled = true;
+        handled = true;
         return mContent;
         return mContent;
     }
     }
 
 
     public boolean hasBeenHandled() {
     public boolean hasBeenHandled() {
-        return this.handled;
+        return handled;
     }
     }
 }
 }

+ 2 - 2
app/src/main/java/epson/common/ExtType.java

@@ -25,11 +25,11 @@ public enum ExtType {
     private final String name;
     private final String name;
 
 
     private ExtType(String str) {
     private ExtType(String str) {
-        this.name = str;
+        name = str;
     }
     }
 
 
     public String toString() {
     public String toString() {
-        return this.name;
+        return name;
     }
     }
 
 
     public static ExtType toExtType(String str) {
     public static ExtType toExtType(String str) {

+ 2 - 2
app/src/main/java/epson/common/ExternalFileUtils.java

@@ -37,11 +37,11 @@ public class ExternalFileUtils {
         String relativeDirectory;
         String relativeDirectory;
 
 
         private TempCacheDirectory(String str) {
         private TempCacheDirectory(String str) {
-            this.relativeDirectory = str;
+            relativeDirectory = str;
         }
         }
 
 
         public String getRelativeDirectory() {
         public String getRelativeDirectory() {
-            return this.relativeDirectory;
+            return relativeDirectory;
         }
         }
     }
     }
 
 

+ 39 - 39
app/src/main/java/epson/common/Info_paper.java

@@ -23,116 +23,116 @@ public class Info_paper {
     private int topMargin_border;
     private int topMargin_border;
 
 
     public int getPaper_width() {
     public int getPaper_width() {
-        return this.paper_width;
+        return paper_width;
     }
     }
 
 
     public void setPaper_width(int i) {
     public void setPaper_width(int i) {
-        this.paper_width = i;
+        paper_width = i;
     }
     }
 
 
     public int getPaper_height() {
     public int getPaper_height() {
-        return this.paper_height;
+        return paper_height;
     }
     }
 
 
     public void setPaper_height(int i) {
     public void setPaper_height(int i) {
-        this.paper_height = i;
+        paper_height = i;
     }
     }
 
 
     public int getPaper_width_boder() {
     public int getPaper_width_boder() {
-        return this.paper_width_boder;
+        return paper_width_boder;
     }
     }
 
 
     public void setPaper_width_boder(int i) {
     public void setPaper_width_boder(int i) {
-        this.paper_width_boder = i;
+        paper_width_boder = i;
     }
     }
 
 
     public int getPaper_height_boder() {
     public int getPaper_height_boder() {
-        return this.paper_height_boder;
+        return paper_height_boder;
     }
     }
 
 
     public void setPaper_height_boder(int i) {
     public void setPaper_height_boder(int i) {
-        this.paper_height_boder = i;
+        paper_height_boder = i;
     }
     }
 
 
     public int getLeftMargin_border() {
     public int getLeftMargin_border() {
-        return this.leftMargin_border;
+        return leftMargin_border;
     }
     }
 
 
     public void setLeftMargin_border(int i) {
     public void setLeftMargin_border(int i) {
-        this.leftMargin_border = i;
+        leftMargin_border = i;
     }
     }
 
 
     public int getTopMargin_border() {
     public int getTopMargin_border() {
-        return this.topMargin_border;
+        return topMargin_border;
     }
     }
 
 
     public void setTopMargin_border(int i) {
     public void setTopMargin_border(int i) {
-        this.topMargin_border = i;
+        topMargin_border = i;
     }
     }
 
 
     public int getBottomMargin_border() {
     public int getBottomMargin_border() {
-        return (getPaper_height() - getPaper_height_boder()) - this.topMargin_border;
+        return (getPaper_height() - getPaper_height_boder()) - topMargin_border;
     }
     }
 
 
     public int getRightMargin_border() {
     public int getRightMargin_border() {
-        return (getPaper_width() - getPaper_width_boder()) - this.leftMargin_border;
+        return (getPaper_width() - getPaper_width_boder()) - leftMargin_border;
     }
     }
 
 
     public int getPaper_width_boderless() {
     public int getPaper_width_boderless() {
-        return this.paper_width_boderless;
+        return paper_width_boderless;
     }
     }
 
 
     public void setPaper_width_boderless(int i) {
     public void setPaper_width_boderless(int i) {
-        this.paper_width_boderless = i;
+        paper_width_boderless = i;
     }
     }
 
 
     public int getPaper_height_boderless() {
     public int getPaper_height_boderless() {
-        return this.paper_height_boderless;
+        return paper_height_boderless;
     }
     }
 
 
     public void setPaper_height_boderless(int i) {
     public void setPaper_height_boderless(int i) {
-        this.paper_height_boderless = i;
+        paper_height_boderless = i;
     }
     }
 
 
     public int getLeftMargin() {
     public int getLeftMargin() {
-        return this.leftMargin;
+        return leftMargin;
     }
     }
 
 
     public void setLeftMargin(int i) {
     public void setLeftMargin(int i) {
-        this.leftMargin = i;
+        leftMargin = i;
     }
     }
 
 
     public int getTopMargin() {
     public int getTopMargin() {
-        return this.topMargin;
+        return topMargin;
     }
     }
 
 
     public void setTopMargin(int i) {
     public void setTopMargin(int i) {
-        this.topMargin = i;
+        topMargin = i;
     }
     }
 
 
     public void setResolution(int i) {
     public void setResolution(int i) {
-        this.resolution = i;
+        resolution = i;
     }
     }
 
 
     public int getBottomMargin() {
     public int getBottomMargin() {
-        return (getPaper_height() - getPaper_height_boderless()) - this.topMargin;
+        return (getPaper_height() - getPaper_height_boderless()) - topMargin;
     }
     }
 
 
     public int getRightMargin() {
     public int getRightMargin() {
-        return (getPaper_width() - getPaper_width_boderless()) - this.leftMargin;
+        return (getPaper_width() - getPaper_width_boderless()) - leftMargin;
     }
     }
 
 
     private Info_paper(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9) {
     private Info_paper(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9) {
-        this.paper_height = i2;
-        this.paper_width = i;
-        this.paper_height_boder = i4;
-        this.paper_height_boderless = i8;
-        this.leftMargin_border = (i - i3) / 2;
-        this.topMargin_border = getBorder_pixel(i9);
-        this.paper_width_boder = i3;
-        this.paper_width_boderless = i7;
-        this.topMargin = i6;
-        this.leftMargin = i5;
+        paper_height = i2;
+        paper_width = i;
+        paper_height_boder = i4;
+        paper_height_boderless = i8;
+        leftMargin_border = (i - i3) / 2;
+        topMargin_border = getBorder_pixel(i9);
+        paper_width_boder = i3;
+        paper_width_boderless = i7;
+        topMargin = i6;
+        leftMargin = i5;
     }
     }
 
 
     public Info_paper() {
     public Info_paper() {
@@ -419,19 +419,19 @@ public class Info_paper {
     }
     }
 
 
     public Rect getPaperSize_2in1() {
     public Rect getPaperSize_2in1() {
-        return getRect_2in1(getPaper_width(), getPaper_height(), this.resolution, false);
+        return getRect_2in1(getPaper_width(), getPaper_height(), resolution, false);
     }
     }
 
 
     public Rect getPaperSize_4in1() {
     public Rect getPaperSize_4in1() {
-        return getRect_4in1(getPaper_width(), getPaper_height(), this.resolution, false);
+        return getRect_4in1(getPaper_width(), getPaper_height(), resolution, false);
     }
     }
 
 
     public Rect getPrintingArea_2in1() {
     public Rect getPrintingArea_2in1() {
-        return getRect_2in1(getPaper_width_boder(), getPaper_height_boder(), this.resolution, true);
+        return getRect_2in1(getPaper_width_boder(), getPaper_height_boder(), resolution, true);
     }
     }
 
 
     public Rect getPrintingArea_4in1() {
     public Rect getPrintingArea_4in1() {
-        return getRect_4in1(getPaper_width_boder(), getPaper_height_boder(), this.resolution, true);
+        return getRect_4in1(getPaper_width_boder(), getPaper_height_boder(), resolution, true);
     }
     }
 
 
     public static Rect getRect_2in1(int i, int i2, int i3, boolean z) {
     public static Rect getRect_2in1(int i, int i2, int i3, boolean z) {

+ 2 - 2
app/src/main/java/epson/common/MimeType.java

@@ -23,11 +23,11 @@ public enum MimeType {
     private final String name;
     private final String name;
 
 
     private MimeType(String str) {
     private MimeType(String str) {
-        this.name = str;
+        name = str;
     }
     }
 
 
     public String toString() {
     public String toString() {
-        return this.name;
+        return name;
     }
     }
 
 
     public static MimeType toMimeType(String str) {
     public static MimeType toMimeType(String str) {

+ 4 - 4
app/src/main/java/epson/common/PrintingLib/define/Constants.java

@@ -165,11 +165,11 @@ public class Constants {
         int code;
         int code;
 
 
         private PaperName(int i) {
         private PaperName(int i) {
-            this.code = i;
+            code = i;
         }
         }
 
 
         public int getCode() {
         public int getCode() {
-            return this.code;
+            return code;
         }
         }
     }
     }
 
 
@@ -261,11 +261,11 @@ public class Constants {
         int code;
         int code;
 
 
         private MediaName(int i) {
         private MediaName(int i) {
-            this.code = i;
+            code = i;
         }
         }
 
 
         public int getCode() {
         public int getCode() {
-            return this.code;
+            return code;
         }
         }
     }
     }
 }
 }

+ 21 - 21
app/src/main/java/epson/common/ScalableImageView.java

@@ -76,10 +76,10 @@ public class ScalableImageView extends View {
         float perFocusY = 0.0f;
         float perFocusY = 0.0f;
 
 
         public boolean onScaleBegin(ScaleGestureDetector scaleGestureDetector) {
         public boolean onScaleBegin(ScaleGestureDetector scaleGestureDetector) {
-            this.focusX = scaleGestureDetector.getFocusX();
-            this.focusY = scaleGestureDetector.getFocusY();
-            this.perFocusX = (((-ScalableImageView.mOffsetX) + this.focusX) / ScalableImageView.mScaleFactor) / ((float) ScalableImageView.this.canvasRect.width());
-            this.perFocusY = (((-ScalableImageView.mOffsetY) + this.focusY) / ScalableImageView.mScaleFactor) / ((float) ScalableImageView.this.canvasRect.height());
+            focusX = scaleGestureDetector.getFocusX();
+            focusY = scaleGestureDetector.getFocusY();
+            perFocusX = (((-ScalableImageView.mOffsetX) + focusX) / ScalableImageView.mScaleFactor) / ((float) ScalableImageView.this.canvasRect.width());
+            perFocusY = (((-ScalableImageView.mOffsetY) + focusY) / ScalableImageView.mScaleFactor) / ((float) ScalableImageView.this.canvasRect.height());
             return super.onScaleBegin(scaleGestureDetector);
             return super.onScaleBegin(scaleGestureDetector);
         }
         }
 
 
@@ -94,8 +94,8 @@ public class ScalableImageView extends View {
             } else {
             } else {
                 float width = ((float) ScalableImageView.this.canvasRect.width()) * ScalableImageView.mScaleFactor;
                 float width = ((float) ScalableImageView.this.canvasRect.width()) * ScalableImageView.mScaleFactor;
                 float height = ((float) ScalableImageView.this.canvasRect.height()) * ScalableImageView.mScaleFactor;
                 float height = ((float) ScalableImageView.this.canvasRect.height()) * ScalableImageView.mScaleFactor;
-                float unused5 = ScalableImageView.mOffsetX = this.focusX - (width * this.perFocusX);
-                float unused6 = ScalableImageView.mOffsetY = this.focusY - (height * this.perFocusY);
+                float unused5 = ScalableImageView.mOffsetX = focusX - (width * perFocusX);
+                float unused6 = ScalableImageView.mOffsetY = focusY - (height * perFocusY);
                 ScalableImageView scalableImageView3 = ScalableImageView.this;
                 ScalableImageView scalableImageView3 = ScalableImageView.this;
                 float unused7 = scalableImageView3.mOffsetX = Math.min(0.0f, scalableImageView3.mOffsetX);
                 float unused7 = scalableImageView3.mOffsetX = Math.min(0.0f, scalableImageView3.mOffsetX);
                 ScalableImageView scalableImageView4 = ScalableImageView.this;
                 ScalableImageView scalableImageView4 = ScalableImageView.this;
@@ -114,21 +114,21 @@ public class ScalableImageView extends View {
 
 
     public ScalableImageView(Context context, AttributeSet attributeSet) {
     public ScalableImageView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         super(context, attributeSet);
-        this.scaleGesDetect = new ScaleGestureDetector(context, this.onScaleGestureListener);
-        this.gesDetect = new GestureDetector(context, this.onGestureListener);
+        scaleGesDetect = new ScaleGestureDetector(context, onScaleGestureListener);
+        gesDetect = new GestureDetector(context, onGestureListener);
     }
     }
 
 
     public Bitmap getBitmap() {
     public Bitmap getBitmap() {
-        return this.f332bm;
+        return f332bm;
     }
     }
 
 
     public void setImageBitmap(Bitmap bitmap) {
     public void setImageBitmap(Bitmap bitmap) {
-        this.f332bm = bitmap;
+        f332bm = bitmap;
     }
     }
 
 
     public void SetImageBitmap(Bitmap bitmap, Resources resources) {
     public void SetImageBitmap(Bitmap bitmap, Resources resources) {
         if (this.f332bm != bitmap) {
         if (this.f332bm != bitmap) {
-            this.f332bm = bitmap;
+            f332bm = bitmap;
         }
         }
     }
     }
 
 
@@ -165,16 +165,16 @@ public class ScalableImageView extends View {
     protected void onDraw(Canvas canvas) {
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
         super.onDraw(canvas);
         if (this.f332bm != null) {
         if (this.f332bm != null) {
-            this.canvasRect.right = canvas.getWidth();
-            this.canvasRect.bottom = canvas.getHeight();
-            float min = Math.min(((float) this.canvasRect.width()) / ((float) this.f332bm.getWidth()), ((float) this.canvasRect.height()) / ((float) this.f332bm.getHeight()));
-            Rect rect = new Rect((int) ((((float) this.canvasRect.width()) / 2.0f) - ((((float) this.f332bm.getWidth()) * min) / 2.0f)), (int) ((((float) this.canvasRect.height()) / 2.0f) - ((((float) this.f332bm.getHeight()) * min) / 2.0f)), (int) ((((float) this.canvasRect.width()) / 2.0f) + ((((float) this.f332bm.getWidth()) * min) / 2.0f)), (int) ((((float) this.canvasRect.height()) / 2.0f) + ((((float) this.f332bm.getHeight()) * min) / 2.0f)));
+            canvasRect.right = canvas.getWidth();
+            canvasRect.bottom = canvas.getHeight();
+            float min = Math.min(((float) canvasRect.width()) / ((float) f332bm.getWidth()), ((float) canvasRect.height()) / ((float) f332bm.getHeight()));
+            Rect rect = new Rect((int) ((((float) canvasRect.width()) / 2.0f) - ((((float) f332bm.getWidth()) * min) / 2.0f)), (int) ((((float) canvasRect.height()) / 2.0f) - ((((float) f332bm.getHeight()) * min) / 2.0f)), (int) ((((float) canvasRect.width()) / 2.0f) + ((((float) f332bm.getWidth()) * min) / 2.0f)), (int) ((((float) canvasRect.height()) / 2.0f) + ((((float) f332bm.getHeight()) * min) / 2.0f)));
             canvas.save();
             canvas.save();
             canvas.translate(mOffsetX, mOffsetY);
             canvas.translate(mOffsetX, mOffsetY);
             float f = mScaleFactor;
             float f = mScaleFactor;
             canvas.scale(f, f);
             canvas.scale(f, f);
-            Bitmap bitmap = this.f332bm;
-            canvas.drawBitmap(bitmap, new Rect(0, 0, bitmap.getWidth(), this.f332bm.getHeight()), rect, (Paint) null);
+            Bitmap bitmap = f332bm;
+            canvas.drawBitmap(bitmap, new Rect(0, 0, bitmap.getWidth(), f332bm.getHeight()), rect, (Paint) null);
             canvas.restore();
             canvas.restore();
         }
         }
     }
     }
@@ -183,19 +183,19 @@ public class ScalableImageView extends View {
         if (motionEvent == null) {
         if (motionEvent == null) {
             return false;
             return false;
         }
         }
-        this.scaleGesDetect.onTouchEvent(motionEvent);
+        scaleGesDetect.onTouchEvent(motionEvent);
         if (this.scaleGesDetect.isInProgress()) {
         if (this.scaleGesDetect.isInProgress()) {
             return true;
             return true;
         }
         }
-        this.gesDetect.onTouchEvent(motionEvent);
+        gesDetect.onTouchEvent(motionEvent);
         return true;
         return true;
     }
     }
 
 
     public void SetRotate(float f) {
     public void SetRotate(float f) {
         Matrix matrix = new Matrix();
         Matrix matrix = new Matrix();
         matrix.postRotate(f);
         matrix.postRotate(f);
-        Bitmap bitmap = this.f332bm;
-        this.f332bm = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), this.f332bm.getHeight(), matrix, true);
+        Bitmap bitmap = f332bm;
+        f332bm = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), f332bm.getHeight(), matrix, true);
         invalidate();
         invalidate();
     }
     }
 }
 }

+ 1 - 1
app/src/main/java/epson/common/ble/BleException.java

@@ -6,6 +6,6 @@ public class BleException extends Exception {
 
 
     public BleException(int i, String str) {
     public BleException(int i, String str) {
         super(str);
         super(str);
-        this.code = i;
+        code = i;
     }
     }
 }
 }

+ 7 - 7
app/src/main/java/epson/common/ble/BleWork.java

@@ -814,8 +814,8 @@ public class BleWork {
                 }
                 }
             }
             }
         };
         };
-        this.handlerRead = new Handler();
-        this.handlerWrite = new Handler();
+        handlerRead = new Handler();
+        handlerWrite = new Handler();
     }
     }
 
 
     @NonNull
     @NonNull
@@ -944,8 +944,8 @@ public class BleWork {
         boolean success;
         boolean success;
 
 
         private NotifySetThread() {
         private NotifySetThread() {
-            this.stop = false;
-            this.success = false;
+            stop = false;
+            success = false;
         }
         }
 
 
         protected void onPreExecute() {
         protected void onPreExecute() {
@@ -1019,7 +1019,7 @@ public class BleWork {
         EpLog.m77i("read " + mSequence);
         EpLog.m77i("read " + mSequence);
         if (mSequence != jobSequence.MIB_REBOOT_NW) {
         if (mSequence != jobSequence.MIB_REBOOT_NW) {
             final int[] iArr = {0};
             final int[] iArr = {0};
-            this.handlerRead.postDelayed(new Runnable() {
+            handlerRead.postDelayed(new Runnable() {
                 public void run() {
                 public void run() {
                     switch (C10195.$SwitchMap$com$epson$mobilephone$common$ble$BleWork$jobSequence[BleWork.mSequence.ordinal()]) {
                     switch (C10195.$SwitchMap$com$epson$mobilephone$common$ble$BleWork$jobSequence[BleWork.mSequence.ordinal()]) {
                         case 1:
                         case 1:
@@ -1152,8 +1152,8 @@ public class BleWork {
 
 
     private void gattWriteCharacter(final BluetoothGattCharacteristic bluetoothGattCharacteristic) {
     private void gattWriteCharacter(final BluetoothGattCharacteristic bluetoothGattCharacteristic) {
         final int[] iArr = {0};
         final int[] iArr = {0};
-        this.handlerWrite.removeCallbacks((Runnable) null);
-        this.handlerWrite.postDelayed(new Runnable() {
+        handlerWrite.removeCallbacks((Runnable) null);
+        handlerWrite.postDelayed(new Runnable() {
             public void run() {
             public void run() {
                 if (BleWork.mConnGatt == null) {
                 if (BleWork.mConnGatt == null) {
                     EpLog.m71e("mConnGatt  NULL !");
                     EpLog.m71e("mConnGatt  NULL !");

+ 20 - 20
app/src/main/java/epson/common/ble/BleWorkActivity.java

@@ -108,13 +108,13 @@ public class BleWorkActivity extends ActivityIACommon {
 
 
     protected void onStart() {
     protected void onStart() {
         super.onStart();
         super.onStart();
-        this.isAlive = true;
+        isAlive = true;
     }
     }
 
 
     protected void onStop() {
     protected void onStop() {
         super.onStop();
         super.onStop();
         EpLog.m76i();
         EpLog.m76i();
-        this.isAlive = false;
+        isAlive = false;
         getWindow().clearFlags(128);
         getWindow().clearFlags(128);
     }
     }
 
 
@@ -165,7 +165,7 @@ public class BleWorkActivity extends ActivityIACommon {
                                     int postCount = 0;
                                     int postCount = 0;
 
 
                                     public void run() {
                                     public void run() {
-                                        int i = this.postCount;
+                                        int i = postCount;
                                         if (i >= 2) {
                                         if (i >= 2) {
                                             EpLog.m77i("postCount >= 2 ");
                                             EpLog.m77i("postCount >= 2 ");
                                             BleWorkActivity.mProbePrinter.interruptSearch();
                                             BleWorkActivity.mProbePrinter.interruptSearch();
@@ -196,7 +196,7 @@ public class BleWorkActivity extends ActivityIACommon {
                                                 }
                                                 }
                                             }
                                             }
                                         }
                                         }
-                                        this.postCount++;
+                                        postCount++;
                                         if (BleWorkActivity.mCompletion != null) {
                                         if (BleWorkActivity.mCompletion != null) {
                                             StringBuilder sb = new StringBuilder();
                                             StringBuilder sb = new StringBuilder();
                                             sb.append("postDelayed  postCount = ");
                                             sb.append("postDelayed  postCount = ");
@@ -204,7 +204,7 @@ public class BleWorkActivity extends ActivityIACommon {
                                             sb.append(" delay ");
                                             sb.append(" delay ");
                                             sb.append(this.postCount == 1 ? 10000 : BleWorkActivity.SECOND_DELAY);
                                             sb.append(this.postCount == 1 ? 10000 : BleWorkActivity.SECOND_DELAY);
                                             EpLog.m77i(sb.toString());
                                             EpLog.m77i(sb.toString());
-                                            BleWorkActivity.mWifiSearchHandler.postDelayed(this, this.postCount == 1 ? 10000 : 200000);
+                                            BleWorkActivity.mWifiSearchHandler.postDelayed(this, postCount == 1 ? 10000 : 200000);
                                         }
                                         }
                                     }
                                     }
                                 };
                                 };
@@ -251,16 +251,16 @@ public class BleWorkActivity extends ActivityIACommon {
     private void stopCallbacks() {
     private void stopCallbacks() {
         stopConnectTimeOut();
         stopConnectTimeOut();
         stopWifiSearch();
         stopWifiSearch();
-        this.isStopSetUpProgress = true;
+        isStopSetUpProgress = true;
         stopSetUpProgress();
         stopSetUpProgress();
     }
     }
 
 
     private void stopSetUpProgress() {
     private void stopSetUpProgress() {
-        Handler handler = this.setUpProgressHandler;
+        Handler handler = setUpProgressHandler;
         if (handler != null) {
         if (handler != null) {
             handler.removeCallbacks(this.runnableSetUpProgress);
             handler.removeCallbacks(this.runnableSetUpProgress);
-            this.setUpProgressHandler = null;
-            this.runnableSetUpProgress = null;
+            setUpProgressHandler = null;
+            runnableSetUpProgress = null;
         }
         }
     }
     }
 
 
@@ -269,7 +269,7 @@ public class BleWorkActivity extends ActivityIACommon {
         if (handler != null) {
         if (handler != null) {
             handler.removeCallbacks(this.runnableWifiSearch);
             handler.removeCallbacks(this.runnableWifiSearch);
             mWifiSearchHandler = null;
             mWifiSearchHandler = null;
-            this.runnableWifiSearch = null;
+            runnableWifiSearch = null;
         }
         }
     }
     }
 
 
@@ -329,7 +329,7 @@ public class BleWorkActivity extends ActivityIACommon {
             mAlertDialog.dismiss();
             mAlertDialog.dismiss();
             mAlertDialog = null;
             mAlertDialog = null;
         }
         }
-        this.isStopSetUpProgress = false;
+        isStopSetUpProgress = false;
         mAlertDialog = new AlertDialog.Builder(mContext).setCancelable(false).create();
         mAlertDialog = new AlertDialog.Builder(mContext).setCancelable(false).create();
         View inflate = LayoutInflater.from(mContext).inflate(R.layout.ble_progress_layout, (ViewGroup) null);
         View inflate = LayoutInflater.from(mContext).inflate(R.layout.ble_progress_layout, (ViewGroup) null);
         mAlertDialog.setView(inflate);
         mAlertDialog.setView(inflate);
@@ -343,10 +343,10 @@ public class BleWorkActivity extends ActivityIACommon {
         mPercentView.setText("0%");
         mPercentView.setText("0%");
         mAlertDialog.setMessage(getResources().getString(R.string.BLE_wait_setup_complete_msg));
         mAlertDialog.setMessage(getResources().getString(R.string.BLE_wait_setup_complete_msg));
         mAlertDialog.show();
         mAlertDialog.show();
-        this.count = 0;
+        count = 0;
         stopSetUpProgress();
         stopSetUpProgress();
-        this.setUpProgressHandler = new Handler();
-        this.runnableSetUpProgress = new Runnable() {
+        setUpProgressHandler = new Handler();
+        runnableSetUpProgress = new Runnable() {
             public void run() {
             public void run() {
                 int i;
                 int i;
                 if (BleWorkActivity.this.isStopSetUpProgress) {
                 if (BleWorkActivity.this.isStopSetUpProgress) {
@@ -383,7 +383,7 @@ public class BleWorkActivity extends ActivityIACommon {
                 }
                 }
             }
             }
         };
         };
-        this.setUpProgressHandler.post(this.runnableSetUpProgress);
+        setUpProgressHandler.post(this.runnableSetUpProgress);
     }
     }
 
 
     private void updateProgress(int i) {
     private void updateProgress(int i) {
@@ -499,11 +499,11 @@ public class BleWorkActivity extends ActivityIACommon {
             private final /* synthetic */ BleWork.jobSequence f$1;
             private final /* synthetic */ BleWork.jobSequence f$1;
 
 
             {
             {
-                this.f$1 = r2;
+                f$1 = r2;
             }
             }
 
 
             public final void run() {
             public final void run() {
-                BleWorkActivity.lambda$SSIDfailedDialog$1(BleWorkActivity.this, this.f$1);
+                BleWorkActivity.lambda$SSIDfailedDialog$1(BleWorkActivity.this, f$1);
             }
             }
         });
         });
     }
     }
@@ -523,11 +523,11 @@ public class BleWorkActivity extends ActivityIACommon {
             private final /* synthetic */ boolean f$1;
             private final /* synthetic */ boolean f$1;
 
 
             {
             {
-                this.f$1 = r2;
+                f$1 = r2;
             }
             }
 
 
             public final void onClick(DialogInterface dialogInterface, int i) {
             public final void onClick(DialogInterface dialogInterface, int i) {
-                BleWorkActivity.lambda$null$0(BleWorkActivity.this, this.f$1, dialogInterface, i);
+                BleWorkActivity.lambda$null$0(BleWorkActivity.this, f$1, dialogInterface, i);
             }
             }
         });
         });
         if (bleWorkActivity.isAlive && !bleWorkActivity.isFinishing()) {
         if (bleWorkActivity.isAlive && !bleWorkActivity.isFinishing()) {
@@ -807,7 +807,7 @@ public class BleWorkActivity extends ActivityIACommon {
         int filterType;
         int filterType;
 
 
         PasswordFilter(int i) {
         PasswordFilter(int i) {
-            this.filterType = i;
+            filterType = i;
         }
         }
 
 
         public CharSequence filter(CharSequence charSequence, int i, int i2, Spanned spanned, int i3, int i4) {
         public CharSequence filter(CharSequence charSequence, int i, int i2, Spanned spanned, int i3, int i4) {

+ 9 - 9
app/src/main/java/epson/common/ble/ProbePrinter.java

@@ -142,7 +142,7 @@ public class ProbePrinter {
     }
     }
 
 
     public ProbePrinter setContext(Context context2) {
     public ProbePrinter setContext(Context context2) {
-        this.context = context2;
+        context = context2;
         return this;
         return this;
     }
     }
 
 
@@ -153,21 +153,21 @@ public class ProbePrinter {
     }
     }
 
 
     public ProbePrinter setBleCallback(BleWorkActivity.CallbackWork callbackWork) {
     public ProbePrinter setBleCallback(BleWorkActivity.CallbackWork callbackWork) {
-        this.completion = callbackWork;
+        completion = callbackWork;
         return this;
         return this;
     }
     }
 
 
     public void search() throws IllegalStateException {
     public void search() throws IllegalStateException {
         String str;
         String str;
-        if (mEpsonService == null || this.completion == null || (str = macAddress) == null || str.length() != 12 || this.completion == null) {
+        if (mEpsonService == null || completion == null || (str = macAddress) == null || str.length() != 12 || completion == null) {
             EpLog.m71e("Required field is not set.");
             EpLog.m71e("Required field is not set.");
             throw new IllegalStateException("Required field is not set.");
             throw new IllegalStateException("Required field is not set.");
         }
         }
-        Context context2 = this.context;
+        Context context2 = context;
         context2.bindService(new Intent(context2, EpsonService.class), mEpsonConnection, 1);
         context2.bindService(new Intent(context2, EpsonService.class), mEpsonConnection, 1);
         try {
         try {
             synchronized (lock) {
             synchronized (lock) {
-                this.isPrinterFound = false;
+                isPrinterFound = false;
             }
             }
             EpLog.m69d("mEpsonService.searchPrinters");
             EpLog.m69d("mEpsonService.searchPrinters");
             mEpsonService.setTimeOut(180);
             mEpsonService.setTimeOut(180);
@@ -193,7 +193,7 @@ public class ProbePrinter {
 
 
     public void bindEpsonService() {
     public void bindEpsonService() {
         if (mEpsonService == null) {
         if (mEpsonService == null) {
-            Context context2 = this.context;
+            Context context2 = context;
             context2.bindService(new Intent(context2, EpsonService.class), mEpsonConnection, 1);
             context2.bindService(new Intent(context2, EpsonService.class), mEpsonConnection, 1);
         }
         }
         if (mEpsonService == null) {
         if (mEpsonService == null) {
@@ -215,7 +215,7 @@ public class ProbePrinter {
                 EpLog.m77i(ExifInterface.GPS_MEASUREMENT_2D);
                 EpLog.m77i(ExifInterface.GPS_MEASUREMENT_2D);
                 EpLog.m77i("unregisterCallback");
                 EpLog.m77i("unregisterCallback");
                 mEpsonService.unregisterCallback(mCallback);
                 mEpsonService.unregisterCallback(mCallback);
-                this.context.unbindService(mEpsonConnection);
+                context.unbindService(mEpsonConnection);
                 mEpsonService = null;
                 mEpsonService = null;
             } catch (RemoteException unused) {
             } catch (RemoteException unused) {
                 EpLog.m71e("unregisterCallback   mEpsonService");
                 EpLog.m71e("unregisterCallback   mEpsonService");
@@ -225,10 +225,10 @@ public class ProbePrinter {
     }
     }
 
 
     private void callbackCompletion(boolean z) {
     private void callbackCompletion(boolean z) {
-        BleWorkActivity.CallbackWork callbackWork = this.completion;
+        BleWorkActivity.CallbackWork callbackWork = completion;
         if (callbackWork != null) {
         if (callbackWork != null) {
             callbackWork.call(Boolean.valueOf(z));
             callbackWork.call(Boolean.valueOf(z));
-            this.completion = null;
+            completion = null;
         }
         }
     }
     }
 
 

+ 14 - 14
app/src/main/java/epson/common/escpr/EscprLib.java

@@ -243,7 +243,7 @@ public class EscprLib {
     public int init_driver(Context context, String str) {
     public int init_driver(Context context, String str) {
         EpLog.m77i("init_driver :" + str);
         EpLog.m77i("init_driver :" + str);
         EpLog.m77i(is64bit() ? "Native is operating at 64 bit !!" : "Native is operating at 32 bit");
         EpLog.m77i(is64bit() ? "Native is operating at 64 bit !!" : "Native is operating at 32 bit");
-        return init_driver(context, str, this.iPrintPackageName.equals(context.getPackageName()) ? (byte) 8 : 10);
+        return init_driver(context, str, iPrintPackageName.equals(context.getPackageName()) ? (byte) 8 : 10);
     }
     }
 
 
     public int start_job(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13, int i14, int i15, int i16, int i17, int i18, boolean z) {
     public int start_job(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13, int i14, int i15, int i16, int i17, int i18, boolean z) {
@@ -328,15 +328,15 @@ public class EscprLib {
     }
     }
 
 
     public int epsWrapperInitDriver(Context context, int i) {
     public int epsWrapperInitDriver(Context context, int i) {
-        return epsWrapperInitDriver(context, i, this.iPrintPackageName.equals(context.getPackageName()) ? (byte) 8 : 10);
+        return epsWrapperInitDriver(context, i, iPrintPackageName.equals(context.getPackageName()) ? (byte) 8 : 10);
     }
     }
 
 
     public int epsWrapperProbePrinter2(int i, String str, String str2, int i2) {
     public int epsWrapperProbePrinter2(int i, String str, String str2, int i2) {
         EpLog.m76i();
         EpLog.m76i();
         if (i2 != 1) {
         if (i2 != 1) {
             if (i2 == 3 && str2 != null && str2.length() > 0) {
             if (i2 == 3 && str2 != null && str2.length() > 0) {
-                this.printerIp = str2;
-                this.printerId = str;
+                printerIp = str2;
+                printerId = str;
                 int epsWrapperProbePrinter2 = epsWrapperProbePrinter2(i, 2, str2.toCharArray());
                 int epsWrapperProbePrinter2 = epsWrapperProbePrinter2(i, 2, str2.toCharArray());
                 if (epsWrapperProbePrinter2 != 0 || !this.bInvalidId) {
                 if (epsWrapperProbePrinter2 != 0 || !this.bInvalidId) {
                     return epsWrapperProbePrinter2;
                     return epsWrapperProbePrinter2;
@@ -350,9 +350,9 @@ public class EscprLib {
     }
     }
 
 
     public void resetIPAdressCheck() {
     public void resetIPAdressCheck() {
-        this.printerId = null;
-        this.printerIp = null;
-        this.bInvalidId = false;
+        printerId = null;
+        printerIp = null;
+        bInvalidId = false;
     }
     }
 
 
     public void setSearchStt(boolean z) {
     public void setSearchStt(boolean z) {
@@ -361,12 +361,12 @@ public class EscprLib {
 
 
     private void findPrinterCB() {
     private void findPrinterCB() {
         EpLog.m77i("JAVA findPrinterCB");
         EpLog.m77i("JAVA findPrinterCB");
-        String str = this.printerList;
+        String str = printerList;
         if (str != null && str.length() > 0) {
         if (str != null && str.length() > 0) {
             String name = getClass().getName();
             String name = getClass().getName();
-            EpLog.m78i(name, "EXTRACT Printer information: " + this.printerList);
-            String[] split = this.printerList.split("\\|\\|");
-            if (this.printerIp == null || this.printerId == null || !this.printerIp.equals(split[2]) || this.printerId.equals(split[4])) {
+            EpLog.m78i(name, "EXTRACT Printer information: " + printerList);
+            String[] split = printerList.split("\\|\\|");
+            if (this.printerIp == null || printerId == null || !this.printerIp.equals(split[2]) || printerId.equals(split[4])) {
                 EpLog.m77i("JAVA mIsSearch == " + mIsSearch);
                 EpLog.m77i("JAVA mIsSearch == " + mIsSearch);
                 if (mIsSearch) {
                 if (mIsSearch) {
                     EpLog.m77i("JAVA mHandler == " + mHandler);
                     EpLog.m77i("JAVA mHandler == " + mHandler);
@@ -393,12 +393,12 @@ public class EscprLib {
                     }
                     }
                 }
                 }
             } else {
             } else {
-                this.bInvalidId = true;
+                bInvalidId = true;
                 String name2 = getClass().getName();
                 String name2 = getClass().getName();
-                EpLog.m72e(name2, "Invalid IP Printer: Expected = " + this.printerId);
+                EpLog.m72e(name2, "Invalid IP Printer: Expected = " + printerId);
             }
             }
         }
         }
-        this.printerList = "";
+        printerList = "";
     }
     }
 
 
     public int epsWrapperPrintErrorNotifyCB(int[] iArr) {
     public int epsWrapperPrintErrorNotifyCB(int[] iArr) {

+ 54 - 54
app/src/main/java/epson/common/escpr/Info_paper.java

@@ -18,128 +18,128 @@ public class Info_paper {
     private int paper_width_boderless;
     private int paper_width_boderless;
 
 
     public int getPaper_height() {
     public int getPaper_height() {
-        return this.paper_height;
+        return paper_height;
     }
     }
 
 
     public void setPaper_height(int i) {
     public void setPaper_height(int i) {
-        this.paper_height = i;
+        paper_height = i;
     }
     }
 
 
     public int getPaper_width_boder() {
     public int getPaper_width_boder() {
-        return this.paper_width_boder;
+        return paper_width_boder;
     }
     }
 
 
     public void setPaper_width_boder(int i) {
     public void setPaper_width_boder(int i) {
-        this.paper_width_boder = i;
+        paper_width_boder = i;
     }
     }
 
 
     public int getPaper_height_boder() {
     public int getPaper_height_boder() {
-        return this.paper_height_boder;
+        return paper_height_boder;
     }
     }
 
 
     public void setPaper_height_boder(int i) {
     public void setPaper_height_boder(int i) {
-        this.paper_height_boder = i;
+        paper_height_boder = i;
     }
     }
 
 
     public int getPaper_width_boderless() {
     public int getPaper_width_boderless() {
-        return this.paper_width_boderless;
+        return paper_width_boderless;
     }
     }
 
 
     public void setPaper_width_boderless(int i) {
     public void setPaper_width_boderless(int i) {
-        this.paper_width_boderless = i;
+        paper_width_boderless = i;
     }
     }
 
 
     public int getPaper_height_boderless() {
     public int getPaper_height_boderless() {
-        return this.paper_height_boderless;
+        return paper_height_boderless;
     }
     }
 
 
     public void setPaper_height_boderless(int i) {
     public void setPaper_height_boderless(int i) {
-        this.paper_height_boderless = i;
+        paper_height_boderless = i;
     }
     }
 
 
     public int getLeftMargin() {
     public int getLeftMargin() {
-        return this.borderless_left_margin;
+        return borderless_left_margin;
     }
     }
 
 
     public void setLeftMargin(int i) {
     public void setLeftMargin(int i) {
-        this.borderless_left_margin = i;
+        borderless_left_margin = i;
     }
     }
 
 
     public int getTopMargin() {
     public int getTopMargin() {
-        return this.borderless_top_margin;
+        return borderless_top_margin;
     }
     }
 
 
     public void setTopMargin(int i) {
     public void setTopMargin(int i) {
-        this.borderless_top_margin = i;
+        borderless_top_margin = i;
     }
     }
 
 
     public int getRightMargin() {
     public int getRightMargin() {
-        return this.borderless_right_margin;
+        return borderless_right_margin;
     }
     }
 
 
     public int getBottomMargin() {
     public int getBottomMargin() {
-        return this.borderless_bottom_margin;
+        return borderless_bottom_margin;
     }
     }
 
 
     public int getBorderLeftMargin() {
     public int getBorderLeftMargin() {
-        return this.border_left_margin;
+        return border_left_margin;
     }
     }
 
 
     public int getBorderTopMargin() {
     public int getBorderTopMargin() {
-        return this.border_top_margin;
+        return border_top_margin;
     }
     }
 
 
     public int getBorderRightMargin() {
     public int getBorderRightMargin() {
-        return this.border_right_margin;
+        return border_right_margin;
     }
     }
 
 
     public int getBorderBottomMargin() {
     public int getBorderBottomMargin() {
-        return this.border_bottom_margin;
+        return border_bottom_margin;
     }
     }
 
 
     public int getPaper_width() {
     public int getPaper_width() {
-        return this.paper_width;
+        return paper_width;
     }
     }
 
 
     public void setPaper_width(int i) {
     public void setPaper_width(int i) {
-        this.paper_width = i;
+        paper_width = i;
     }
     }
 
 
     public Info_paper(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8) {
     public Info_paper(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8) {
-        this.paper_height = i2;
-        this.paper_width = i;
-        this.paper_height_boder = i4;
-        this.paper_height_boderless = i8;
-        this.paper_width_boder = i3;
-        this.paper_width_boderless = i7;
-        int i9 = this.paper_width;
-        int i10 = this.paper_width_boder;
-        this.border_left_margin = (i9 - i10) / 2;
-        int i11 = this.paper_height;
-        int i12 = this.paper_height_boder;
-        this.border_top_margin = (i11 - i12) / 2;
-        this.border_right_margin = (i9 - i10) / 2;
-        this.border_bottom_margin = (i11 - i12) / 2;
-        this.borderless_left_margin = i5;
-        this.borderless_top_margin = i6;
-        this.borderless_right_margin = (this.paper_width_boderless - i9) - i5;
-        this.borderless_bottom_margin = (this.paper_height_boderless - i11) - i6;
+        paper_height = i2;
+        paper_width = i;
+        paper_height_boder = i4;
+        paper_height_boderless = i8;
+        paper_width_boder = i3;
+        paper_width_boderless = i7;
+        int i9 = paper_width;
+        int i10 = paper_width_boder;
+        border_left_margin = (i9 - i10) / 2;
+        int i11 = paper_height;
+        int i12 = paper_height_boder;
+        border_top_margin = (i11 - i12) / 2;
+        border_right_margin = (i9 - i10) / 2;
+        border_bottom_margin = (i11 - i12) / 2;
+        borderless_left_margin = i5;
+        borderless_top_margin = i6;
+        borderless_right_margin = (this.paper_width_boderless - i9) - i5;
+        borderless_bottom_margin = (this.paper_height_boderless - i11) - i6;
     }
     }
 
 
     public Info_paper(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13, int i14) {
     public Info_paper(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13, int i14) {
-        this.paper_height = i2;
-        this.paper_width = i;
-        this.paper_height_boder = i4;
-        this.paper_height_boderless = i8;
-        this.paper_width_boder = i3;
-        this.paper_width_boderless = i7;
-        this.border_left_margin = i9;
-        this.border_top_margin = i10;
-        this.border_right_margin = i11;
-        this.border_bottom_margin = i12;
-        this.borderless_left_margin = i5;
-        this.borderless_top_margin = i6;
-        this.borderless_right_margin = i13;
-        this.borderless_bottom_margin = i14;
+        paper_height = i2;
+        paper_width = i;
+        paper_height_boder = i4;
+        paper_height_boderless = i8;
+        paper_width_boder = i3;
+        paper_width_boderless = i7;
+        border_left_margin = i9;
+        border_top_margin = i10;
+        border_right_margin = i11;
+        border_bottom_margin = i12;
+        borderless_left_margin = i5;
+        borderless_top_margin = i6;
+        borderless_right_margin = i13;
+        borderless_bottom_margin = i14;
     }
     }
 }
 }

+ 321 - 321
app/src/main/java/epson/common/escpr/MediaInfo.java

@@ -194,122 +194,122 @@ public interface MediaInfo {
 
 
         public int getStringId(int i) {
         public int getStringId(int i) {
             if (this.sCodeTable.containsKey(Integer.valueOf(i))) {
             if (this.sCodeTable.containsKey(Integer.valueOf(i))) {
-                return this.sCodeTable.get(Integer.valueOf(i)).intValue();
+                return sCodeTable.get(Integer.valueOf(i)).intValue();
             }
             }
-            return this.sCodeTable.get(0).intValue();
+            return sCodeTable.get(0).intValue();
         }
         }
 
 
         public boolean putID(int i, int i2) {
         public boolean putID(int i, int i2) {
             if (!this.sCodeTable.containsKey(Integer.valueOf(i))) {
             if (!this.sCodeTable.containsKey(Integer.valueOf(i))) {
                 return false;
                 return false;
             }
             }
-            this.sCodeTable.put(Integer.valueOf(i), Integer.valueOf(i2));
+            sCodeTable.put(Integer.valueOf(i), Integer.valueOf(i2));
             return true;
             return true;
         }
         }
 
 
         public int getID(int i) {
         public int getID(int i) {
             if (this.sCodeTable.containsKey(Integer.valueOf(i))) {
             if (this.sCodeTable.containsKey(Integer.valueOf(i))) {
-                return this.sCodeTable.get(Integer.valueOf(i)).intValue();
+                return sCodeTable.get(Integer.valueOf(i)).intValue();
             }
             }
             return -1;
             return -1;
         }
         }
 
 
         public Enumeration getKeys() {
         public Enumeration getKeys() {
-            return this.sCodeTable.keys();
+            return sCodeTable.keys();
         }
         }
 
 
         public void destructor() {
         public void destructor() {
-            this.sCodeTable.clear();
+            sCodeTable.clear();
         }
         }
     }
     }
 
 
     public static class PaperSize extends AbstractInfo {
     public static class PaperSize extends AbstractInfo {
         public PaperSize() {
         public PaperSize() {
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A4));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_LETTER.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_LETTER));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_LEGAL.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_LEGAL));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A5));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A6.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A6));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_B5));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_EXECUTIVE.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_EXECUTIVE));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HALFLETTER.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_HALFLETTER));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PANORAMIC.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_PANORAMIC));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_TRIM_4X6.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_TRIM_4X6));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_4X6.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_4X6));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_5X8.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_5X8));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8X10.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_8X10));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_10X15.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_10X15));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_200X300.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_200X300));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_L));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_POSTCARD.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_POSTCARD));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_DBLPOSTCARD.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_DBLPOSTCARD));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_10_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_10_L));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C6_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_C6_L));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_DL_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_DL_L));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_NEWEVN_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_NEWEVN_L));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CHOKEI_3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_CHOKEI_3));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CHOKEI_4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_CHOKEI_4));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_1.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_1));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_2.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_2));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_3));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_4));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_2L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_2L));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_10_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_10_P));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C6_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_C6_P));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_DL_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_DL_P));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_NEWENV_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_NEWENV_P));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_MEISHI.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_MEISHI));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_BUZCARD_89X50.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_BUZCARD_89X50));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CARD_54X86.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_CARD_54X86));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_BUZCARD_55X91.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_BUZCARD_55X91));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ALBUM_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ALBUM_L));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ALBUM_A5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ALBUM_A5));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_L_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_PALBUM_L_L));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_2L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_PALBUM_2L));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_A5_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_PALBUM_A5_L));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_A4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_PALBUM_A4));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HIVISION.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_HIVISION));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_KAKU_2.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_KAKU_2));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C4_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_C4_P));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B6.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_B6));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_KAKU_20.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_KAKU_20));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A5_24HOLE.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A5_24HOLE));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CHOKEI_40.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_CHOKEI_40));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_QUADRAPLEPOSTCARD.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_QUADRAPLEPOSTCARD));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_0.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_0));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C5_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_C5_P));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_6.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_6));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_MEXICO_OFICIO.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_MEXICO_OFICIO));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_OFICIO9.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_OFICIO9));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_INDIAN_LEGAL.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_INDIAN_LEGAL));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A3NOBI.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A3NOBI));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A3));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_B4));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USB.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_USB));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_11X14.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_11X14));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_B3));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A2.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A2));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USC.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_USC));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_10X12.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_10X12));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_12X12.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_12X12));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SP1.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SP1));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SP2.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SP2));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SP3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SP3));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SP4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SP4));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SP5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SP5));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_16K.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_16K));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8K.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_8K));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SRA3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SRA3));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_12X18.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_12X18));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8_5X13.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_8_5X13));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SQUARE_8_27.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SQUARE_8_27));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SQUARE_5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SQUARE_5));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USER.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_USER));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8X10_5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_8X10_5));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8_27X13.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_8_27X13));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_B5_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_B5_P));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HALFCUT.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_HALFCUT));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_16X20.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_16X20));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A4));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_LETTER.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_LETTER));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_LEGAL.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_LEGAL));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A5));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A6.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A6));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_B5));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_EXECUTIVE.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_EXECUTIVE));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HALFLETTER.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_HALFLETTER));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PANORAMIC.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_PANORAMIC));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_TRIM_4X6.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_TRIM_4X6));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_4X6.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_4X6));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_5X8.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_5X8));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8X10.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_8X10));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_10X15.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_10X15));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_200X300.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_200X300));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_L));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_POSTCARD.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_POSTCARD));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_DBLPOSTCARD.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_DBLPOSTCARD));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_10_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_10_L));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C6_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_C6_L));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_DL_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_DL_L));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_NEWEVN_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_NEWEVN_L));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CHOKEI_3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_CHOKEI_3));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CHOKEI_4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_CHOKEI_4));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_1.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_1));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_2.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_2));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_3));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_4));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_2L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_2L));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_10_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_10_P));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C6_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_C6_P));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_DL_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_DL_P));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_NEWENV_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_NEWENV_P));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_MEISHI.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_MEISHI));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_BUZCARD_89X50.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_BUZCARD_89X50));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CARD_54X86.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_CARD_54X86));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_BUZCARD_55X91.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_BUZCARD_55X91));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ALBUM_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ALBUM_L));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ALBUM_A5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ALBUM_A5));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_L_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_PALBUM_L_L));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_2L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_PALBUM_2L));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_A5_L.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_PALBUM_A5_L));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_A4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_PALBUM_A4));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HIVISION.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_HIVISION));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_KAKU_2.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_KAKU_2));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C4_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_C4_P));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B6.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_B6));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_KAKU_20.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_KAKU_20));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A5_24HOLE.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A5_24HOLE));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CHOKEI_40.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_CHOKEI_40));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_QUADRAPLEPOSTCARD.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_QUADRAPLEPOSTCARD));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_0.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_0));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C5_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_C5_P));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_6.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_YOKEI_6));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_MEXICO_OFICIO.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_MEXICO_OFICIO));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_OFICIO9.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_OFICIO9));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_INDIAN_LEGAL.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_INDIAN_LEGAL));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A3NOBI.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A3NOBI));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A3));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_B4));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USB.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_USB));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_11X14.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_11X14));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_B3));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A2.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_A2));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USC.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_USC));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_10X12.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_10X12));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_12X12.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_12X12));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SP1.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SP1));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SP2.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SP2));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SP3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SP3));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SP4.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SP4));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SP5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SP5));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_16K.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_16K));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8K.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_8K));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SRA3.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SRA3));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_12X18.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_12X18));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8_5X13.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_8_5X13));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SQUARE_8_27.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SQUARE_8_27));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_SQUARE_5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_SQUARE_5));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USER.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_USER));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8X10_5.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_8X10_5));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8_27X13.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_8_27X13));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_B5_P.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_ENV_B5_P));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HALFCUT.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_HALFCUT));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_16X20.getCode()), Integer.valueOf(C1055R.string.EPS_MSID_16X20));
         }
         }
     }
     }
 
 
@@ -318,7 +318,7 @@ public interface MediaInfo {
 
 
         public Info_paper getStringId(int i) {
         public Info_paper getStringId(int i) {
             if (this.sCodeTable.containsKey(Integer.valueOf(i))) {
             if (this.sCodeTable.containsKey(Integer.valueOf(i))) {
-                return this.sCodeTable.get(Integer.valueOf(i));
+                return sCodeTable.get(Integer.valueOf(i));
             }
             }
             return null;
             return null;
         }
         }
@@ -328,13 +328,13 @@ public interface MediaInfo {
                 return new Info_paper(2098, 2976, 1816, 2694, 0, 0, 2098, 2976, 141, 141, 141, 141, 0, 0);
                 return new Info_paper(2098, 2976, 1816, 2694, 0, 0, 2098, 2976, 141, 141, 141, 141, 0, 0);
             }
             }
             if (this.sCodeTable.containsKey(Integer.valueOf(i))) {
             if (this.sCodeTable.containsKey(Integer.valueOf(i))) {
-                return this.sCodeTable.get(Integer.valueOf(i));
+                return sCodeTable.get(Integer.valueOf(i));
             }
             }
             return null;
             return null;
         }
         }
 
 
         public void destructor() {
         public void destructor() {
-            this.sCodeTable.clear();
+            sCodeTable.clear();
         }
         }
     }
     }
 
 
@@ -380,7 +380,7 @@ public interface MediaInfo {
                             i9 = i22;
                             i9 = i22;
                         }
                         }
                     }
                     }
-                    this.sCodeTable.put(Integer.valueOf(eps_print_area_info.sizeList[i].mediaSizeID), new Info_paper(i2, i3, i4, i5, i6, i7, i8, i9, i10, i11, i12, i13, i14, i15));
+                    sCodeTable.put(Integer.valueOf(eps_print_area_info.sizeList[i].mediaSizeID), new Info_paper(i2, i3, i4, i5, i6, i7, i8, i9, i10, i11, i12, i13, i14, i15));
                 }
                 }
                 return;
                 return;
             }
             }
@@ -392,292 +392,292 @@ public interface MediaInfo {
         }
         }
 
 
         private void presetPaperSize() {
         private void presetPaperSize() {
-            this.sCodeTable.put(0, new Info_paper(2976, 4209, 2892, 4125, -36, -42, 3048, 4321));
-            this.sCodeTable.put(1, new Info_paper(3060, 3960, 2976, 3876, -36, -42, 3132, 4072));
-            this.sCodeTable.put(2, new Info_paper(3060, 5040, 2976, 4956, -36, -42, 3132, 5152));
-            this.sCodeTable.put(3, new Info_paper(2098, 2976, 2014, 2892, -36, -42, 2170, 3088));
-            this.sCodeTable.put(4, new Info_paper(1488, 2098, 1404, 2014, -36, -42, 1560, 2210));
-            this.sCodeTable.put(5, new Info_paper(2580, 3643, 2496, 3559, -36, -42, 2652, 3755));
-            this.sCodeTable.put(6, new Info_paper(2611, 3780, 2527, 3696, -36, -42, 2683, 3892));
-            this.sCodeTable.put(7, new Info_paper(1980, 3060, 1896, 2976, -36, -42, 2052, 3172));
-            this.sCodeTable.put(8, new Info_paper(2976, 8419, 2892, 8335, -36, -42, 3048, 8531));
-            this.sCodeTable.put(9, new Info_paper(Videoio.CAP_OPENNI2_ASUS, 2330, 1526, 2246, -36, -42, 1682, 2442));
-            this.sCodeTable.put(10, new Info_paper(1440, 2160, 1356, 2076, -36, -42, 1512, 2272));
-            this.sCodeTable.put(11, new Info_paper(1800, 2880, 1716, 2796, -36, -42, 1872, 2992));
-            this.sCodeTable.put(12, new Info_paper(2880, 3600, 2796, 3516, -36, -42, 2952, 3712));
-            this.sCodeTable.put(13, new Info_paper(1417, 2125, 1333, 2041, -36, -42, 1489, 2237));
-            this.sCodeTable.put(14, new Info_paper(3061, 4790, 2977, 4706, -36, -42, 3133, 4902));
-            this.sCodeTable.put(15, new Info_paper(1261, 1800, 1177, 1716, -36, -42, 1333, 1912));
-            this.sCodeTable.put(16, new Info_paper(1417, 2098, 1333, 2014, -36, -42, 1489, 2210));
-            this.sCodeTable.put(17, new Info_paper(2835, 2098, 2751, 2014, -36, -42, 2907, 2210));
-            this.sCodeTable.put(18, new Info_paper(3420, 1485, 3336, 1401, -36, -42, 3492, 1597));
-            this.sCodeTable.put(19, new Info_paper(2296, 1616, 2212, 1532, -36, -42, 2368, 1728));
-            this.sCodeTable.put(20, new Info_paper(3118, 1559, 3034, 1475, -36, -42, 3190, 1671));
-            this.sCodeTable.put(21, new Info_paper(3118, 1871, 3034, 1787, -36, -42, 3190, 1983));
-            this.sCodeTable.put(22, new Info_paper(1701, 3331, 1561, 3006, -36, -42, 1773, 3443));
-            this.sCodeTable.put(23, new Info_paper(1276, 2906, 1136, 2581, -36, -42, 1348, 3018));
-            this.sCodeTable.put(24, new Info_paper(1701, 2494, 1561, 2169, -36, -42, 1773, 2606));
-            this.sCodeTable.put(25, new Info_paper(1616, 2296, 1476, 1971, -36, -42, 1688, 2408));
-            this.sCodeTable.put(26, new Info_paper(1389, 2098, 1249, 1773, -36, -42, 1461, 2210));
-            this.sCodeTable.put(27, new Info_paper(1488, 3331, 1348, 3006, -36, -42, 1560, 3443));
-            this.sCodeTable.put(28, new Info_paper(1800, 2522, 1716, 2438, -36, -42, 1872, 2634));
-            this.sCodeTable.put(29, new Info_paper(1485, 3420, 1345, 3095, -36, -42, 1557, 3532));
-            this.sCodeTable.put(30, new Info_paper(1616, 2296, 1476, 1971, -36, -42, 1688, 2408));
-            this.sCodeTable.put(31, new Info_paper(1559, 3118, 1419, 2793, -36, -42, 1631, 3230));
-            this.sCodeTable.put(32, new Info_paper(1871, 3118, 1731, 2793, -36, -42, 1943, 3230));
-            this.sCodeTable.put(33, new Info_paper(1261, 779, 1177, 695, -36, -42, 1333, 891));
-            this.sCodeTable.put(34, new Info_paper(1261, 709, 1177, 625, -36, -42, 1333, 821));
-            this.sCodeTable.put(35, new Info_paper(765, 1219, 681, 1135, -36, -42, 837, 1331));
-            this.sCodeTable.put(36, new Info_paper(780, 1290, 696, 1206, -36, -42, 852, 1402));
-            this.sCodeTable.put(37, new Info_paper(1800, 2607, 1716, 2523, -36, -42, 1872, 2719));
-            this.sCodeTable.put(38, new Info_paper(2976, 4294, 2892, 4210, -36, -42, 3048, 4406));
-            this.sCodeTable.put(39, new Info_paper(1800, 1260, 1716, 1176, -36, -42, 1872, 1372));
-            this.sCodeTable.put(40, new Info_paper(1800, 2521, 1716, 2437, -36, -42, 1872, 2633));
-            this.sCodeTable.put(41, new Info_paper(2976, 2101, 2892, 2017, -36, -42, 3048, 2213));
-            this.sCodeTable.put(42, new Info_paper(2976, 4203, 2892, 4119, -36, -42, 3048, 4315));
-            this.sCodeTable.put(43, new Info_paper(1440, 2560, 1356, 2476, -36, -42, 1512, 2672));
-            this.sCodeTable.put(44, new Info_paper(3401, 4705, 2977, 4380, -36, -42, 3473, 4817));
-            this.sCodeTable.put(45, new Info_paper(3245, 4592, 2977, 4267, -36, -42, 3317, 4704));
-            this.sCodeTable.put(46, new Info_paper(1814, 2580, 1730, 2496, -48, -42, 1910, 2692));
-            this.sCodeTable.put(47, new Info_paper(3245, 4592, 2977, 4267, -36, -42, 3317, 4704));
-            this.sCodeTable.put(48, new Info_paper(2098, 2976, 1816, 2694, -36, -42, 2170, 3088));
-            this.sCodeTable.put(52, new Info_paper(1276, 3189, 1136, 2736, -36, -42, 1348, 3301));
-            this.sCodeTable.put(61, new Info_paper(4663, 6846, 4579, 6762, -48, -42, 4759, 6958));
-            this.sCodeTable.put(62, new Info_paper(4209, 5953, 4125, 5869, -48, -42, 4305, 6065));
-            this.sCodeTable.put(63, new Info_paper(3643, 5159, 3559, 5075, -48, -42, 3739, 5271));
-            this.sCodeTable.put(64, new Info_paper(3960, 6120, 3876, 6036, -48, -42, 4056, 6232));
-            this.sCodeTable.put(65, new Info_paper(3960, 5040, 3876, 4956, -48, -42, 4056, 5152));
-            this.sCodeTable.put(66, new Info_paper(5159, 7299, 5075, 7215, -48, -42, 5255, 7411));
-            this.sCodeTable.put(67, new Info_paper(5953, 8419, 5869, 8335, -48, -42, 6049, 8531));
-            this.sCodeTable.put(68, new Info_paper(6120, 7920, 6036, 7836, -48, -42, 6216, 8032));
-            this.sCodeTable.put(69, new Info_paper(3600, 4320, 3516, 4236, -48, -42, 3696, 4432));
-            this.sCodeTable.put(70, new Info_paper(4320, 4320, 4236, 4236, -48, -42, 4416, 4432));
-            this.sCodeTable.put(71, new Info_paper(2976, 3827, 2892, 3743, -36, -42, 3048, 3939));
-            this.sCodeTable.put(72, new Info_paper(2976, 2112, 2892, 2028, -36, -42, 3048, 2224));
-            this.sCodeTable.put(73, new Info_paper(1417, 2409, 1333, 2325, -36, -42, 1489, 2521));
-            this.sCodeTable.put(74, new Info_paper(1843, 2580, 1759, 2496, -36, -42, 1915, 2692));
-            this.sCodeTable.put(75, new Info_paper(2721, 1871, 2637, 1787, -36, -42, 2793, 1983));
-            this.sCodeTable.put(76, new Info_paper(2764, 3827, 2680, 3743, -36, -42, 2836, 3939));
-            this.sCodeTable.put(77, new Info_paper(3827, 5528, 3743, 5444, -36, -42, 3899, 5640));
-            this.sCodeTable.put(87, new Info_paper(2976, 2976, 2892, 2892, -36, -42, 3048, 3088));
-            this.sCodeTable.put(88, new Info_paper(1800, 1800, 1716, 1716, -36, -42, 1872, 1912));
-            this.sCodeTable.put(99, new Info_paper(0, 0, 0, 0, -36, -42, 0, 0));
-            this.sCodeTable.put(104, new Info_paper(2880, 3780, 2796, 3696, -36, -42, 2952, 3892));
-            this.sCodeTable.put(106, new Info_paper(2976, 4678, 2892, 4594, -36, -42, 3048, 4790));
-            this.sCodeTable.put(111, new Info_paper(2494, 3543, 2354, 3218, -36, -42, 2566, 3655));
-            this.sCodeTable.put(128, new Info_paper(5040, 6120, 4956, 6036, -36, -42, 5112, 6232));
-            this.sCodeTable.put(129, new Info_paper(5760, 7200, 5676, 7116, -36, -42, 5832, 7312));
-            this.sCodeTable.put(255, new Info_paper(0, 0, 0, 0, 0, 0, 0, 0));
+            sCodeTable.put(0, new Info_paper(2976, 4209, 2892, 4125, -36, -42, 3048, 4321));
+            sCodeTable.put(1, new Info_paper(3060, 3960, 2976, 3876, -36, -42, 3132, 4072));
+            sCodeTable.put(2, new Info_paper(3060, 5040, 2976, 4956, -36, -42, 3132, 5152));
+            sCodeTable.put(3, new Info_paper(2098, 2976, 2014, 2892, -36, -42, 2170, 3088));
+            sCodeTable.put(4, new Info_paper(1488, 2098, 1404, 2014, -36, -42, 1560, 2210));
+            sCodeTable.put(5, new Info_paper(2580, 3643, 2496, 3559, -36, -42, 2652, 3755));
+            sCodeTable.put(6, new Info_paper(2611, 3780, 2527, 3696, -36, -42, 2683, 3892));
+            sCodeTable.put(7, new Info_paper(1980, 3060, 1896, 2976, -36, -42, 2052, 3172));
+            sCodeTable.put(8, new Info_paper(2976, 8419, 2892, 8335, -36, -42, 3048, 8531));
+            sCodeTable.put(9, new Info_paper(Videoio.CAP_OPENNI2_ASUS, 2330, 1526, 2246, -36, -42, 1682, 2442));
+            sCodeTable.put(10, new Info_paper(1440, 2160, 1356, 2076, -36, -42, 1512, 2272));
+            sCodeTable.put(11, new Info_paper(1800, 2880, 1716, 2796, -36, -42, 1872, 2992));
+            sCodeTable.put(12, new Info_paper(2880, 3600, 2796, 3516, -36, -42, 2952, 3712));
+            sCodeTable.put(13, new Info_paper(1417, 2125, 1333, 2041, -36, -42, 1489, 2237));
+            sCodeTable.put(14, new Info_paper(3061, 4790, 2977, 4706, -36, -42, 3133, 4902));
+            sCodeTable.put(15, new Info_paper(1261, 1800, 1177, 1716, -36, -42, 1333, 1912));
+            sCodeTable.put(16, new Info_paper(1417, 2098, 1333, 2014, -36, -42, 1489, 2210));
+            sCodeTable.put(17, new Info_paper(2835, 2098, 2751, 2014, -36, -42, 2907, 2210));
+            sCodeTable.put(18, new Info_paper(3420, 1485, 3336, 1401, -36, -42, 3492, 1597));
+            sCodeTable.put(19, new Info_paper(2296, 1616, 2212, 1532, -36, -42, 2368, 1728));
+            sCodeTable.put(20, new Info_paper(3118, 1559, 3034, 1475, -36, -42, 3190, 1671));
+            sCodeTable.put(21, new Info_paper(3118, 1871, 3034, 1787, -36, -42, 3190, 1983));
+            sCodeTable.put(22, new Info_paper(1701, 3331, 1561, 3006, -36, -42, 1773, 3443));
+            sCodeTable.put(23, new Info_paper(1276, 2906, 1136, 2581, -36, -42, 1348, 3018));
+            sCodeTable.put(24, new Info_paper(1701, 2494, 1561, 2169, -36, -42, 1773, 2606));
+            sCodeTable.put(25, new Info_paper(1616, 2296, 1476, 1971, -36, -42, 1688, 2408));
+            sCodeTable.put(26, new Info_paper(1389, 2098, 1249, 1773, -36, -42, 1461, 2210));
+            sCodeTable.put(27, new Info_paper(1488, 3331, 1348, 3006, -36, -42, 1560, 3443));
+            sCodeTable.put(28, new Info_paper(1800, 2522, 1716, 2438, -36, -42, 1872, 2634));
+            sCodeTable.put(29, new Info_paper(1485, 3420, 1345, 3095, -36, -42, 1557, 3532));
+            sCodeTable.put(30, new Info_paper(1616, 2296, 1476, 1971, -36, -42, 1688, 2408));
+            sCodeTable.put(31, new Info_paper(1559, 3118, 1419, 2793, -36, -42, 1631, 3230));
+            sCodeTable.put(32, new Info_paper(1871, 3118, 1731, 2793, -36, -42, 1943, 3230));
+            sCodeTable.put(33, new Info_paper(1261, 779, 1177, 695, -36, -42, 1333, 891));
+            sCodeTable.put(34, new Info_paper(1261, 709, 1177, 625, -36, -42, 1333, 821));
+            sCodeTable.put(35, new Info_paper(765, 1219, 681, 1135, -36, -42, 837, 1331));
+            sCodeTable.put(36, new Info_paper(780, 1290, 696, 1206, -36, -42, 852, 1402));
+            sCodeTable.put(37, new Info_paper(1800, 2607, 1716, 2523, -36, -42, 1872, 2719));
+            sCodeTable.put(38, new Info_paper(2976, 4294, 2892, 4210, -36, -42, 3048, 4406));
+            sCodeTable.put(39, new Info_paper(1800, 1260, 1716, 1176, -36, -42, 1872, 1372));
+            sCodeTable.put(40, new Info_paper(1800, 2521, 1716, 2437, -36, -42, 1872, 2633));
+            sCodeTable.put(41, new Info_paper(2976, 2101, 2892, 2017, -36, -42, 3048, 2213));
+            sCodeTable.put(42, new Info_paper(2976, 4203, 2892, 4119, -36, -42, 3048, 4315));
+            sCodeTable.put(43, new Info_paper(1440, 2560, 1356, 2476, -36, -42, 1512, 2672));
+            sCodeTable.put(44, new Info_paper(3401, 4705, 2977, 4380, -36, -42, 3473, 4817));
+            sCodeTable.put(45, new Info_paper(3245, 4592, 2977, 4267, -36, -42, 3317, 4704));
+            sCodeTable.put(46, new Info_paper(1814, 2580, 1730, 2496, -48, -42, 1910, 2692));
+            sCodeTable.put(47, new Info_paper(3245, 4592, 2977, 4267, -36, -42, 3317, 4704));
+            sCodeTable.put(48, new Info_paper(2098, 2976, 1816, 2694, -36, -42, 2170, 3088));
+            sCodeTable.put(52, new Info_paper(1276, 3189, 1136, 2736, -36, -42, 1348, 3301));
+            sCodeTable.put(61, new Info_paper(4663, 6846, 4579, 6762, -48, -42, 4759, 6958));
+            sCodeTable.put(62, new Info_paper(4209, 5953, 4125, 5869, -48, -42, 4305, 6065));
+            sCodeTable.put(63, new Info_paper(3643, 5159, 3559, 5075, -48, -42, 3739, 5271));
+            sCodeTable.put(64, new Info_paper(3960, 6120, 3876, 6036, -48, -42, 4056, 6232));
+            sCodeTable.put(65, new Info_paper(3960, 5040, 3876, 4956, -48, -42, 4056, 5152));
+            sCodeTable.put(66, new Info_paper(5159, 7299, 5075, 7215, -48, -42, 5255, 7411));
+            sCodeTable.put(67, new Info_paper(5953, 8419, 5869, 8335, -48, -42, 6049, 8531));
+            sCodeTable.put(68, new Info_paper(6120, 7920, 6036, 7836, -48, -42, 6216, 8032));
+            sCodeTable.put(69, new Info_paper(3600, 4320, 3516, 4236, -48, -42, 3696, 4432));
+            sCodeTable.put(70, new Info_paper(4320, 4320, 4236, 4236, -48, -42, 4416, 4432));
+            sCodeTable.put(71, new Info_paper(2976, 3827, 2892, 3743, -36, -42, 3048, 3939));
+            sCodeTable.put(72, new Info_paper(2976, 2112, 2892, 2028, -36, -42, 3048, 2224));
+            sCodeTable.put(73, new Info_paper(1417, 2409, 1333, 2325, -36, -42, 1489, 2521));
+            sCodeTable.put(74, new Info_paper(1843, 2580, 1759, 2496, -36, -42, 1915, 2692));
+            sCodeTable.put(75, new Info_paper(2721, 1871, 2637, 1787, -36, -42, 2793, 1983));
+            sCodeTable.put(76, new Info_paper(2764, 3827, 2680, 3743, -36, -42, 2836, 3939));
+            sCodeTable.put(77, new Info_paper(3827, 5528, 3743, 5444, -36, -42, 3899, 5640));
+            sCodeTable.put(87, new Info_paper(2976, 2976, 2892, 2892, -36, -42, 3048, 3088));
+            sCodeTable.put(88, new Info_paper(1800, 1800, 1716, 1716, -36, -42, 1872, 1912));
+            sCodeTable.put(99, new Info_paper(0, 0, 0, 0, -36, -42, 0, 0));
+            sCodeTable.put(104, new Info_paper(2880, 3780, 2796, 3696, -36, -42, 2952, 3892));
+            sCodeTable.put(106, new Info_paper(2976, 4678, 2892, 4594, -36, -42, 3048, 4790));
+            sCodeTable.put(111, new Info_paper(2494, 3543, 2354, 3218, -36, -42, 2566, 3655));
+            sCodeTable.put(128, new Info_paper(5040, 6120, 4956, 6036, -36, -42, 5112, 6232));
+            sCodeTable.put(129, new Info_paper(5760, 7200, 5676, 7116, -36, -42, 5832, 7312));
+            sCodeTable.put(255, new Info_paper(0, 0, 0, 0, 0, 0, 0, 0));
         }
         }
     }
     }
 
 
     public static class PaperType extends AbstractInfo {
     public static class PaperType extends AbstractInfo {
         public PaperType() {
         public PaperType() {
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLAIN));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_IRON.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_IRON));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PHOTOINKJET.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PHOTOINKJET));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_MATTE.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_MATTE));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PHOTO));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_MINIPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_MINIPHOTO));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PGPHOTO));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PSPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PSPHOTO));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLPHOTO));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_ARCHMATTE.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_ARCHMATTE));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_WATERCOLOR.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_WATERCOLOR));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_ECOPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_ECOPHOTO));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_VELVETFINEART.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_VELVETFINEART));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_HAGAKIRECL.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_HAGAKIRECL));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_HAGAKIINKJET.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_HAGAKIINKJET));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PHOTOINKJET2.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PHOTOINKJET2));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_MATTEMEISHI.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_MATTEMEISHI));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_HAGAKIATENA.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_HAGAKIATENA));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_ENVELOPE.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_ENVELOPE));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLATINA.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLATINA));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_ULTRASMOOTH.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_ULTRASMOOTH));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_SFHAGAKI.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_SFHAGAKI));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PHOTOSTD.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PHOTOSTD));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_GLOSSYHAGAKI.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_GLOSSYHAGAKI));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_GLOSSYPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_GLOSSYPHOTO));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_GLOSSYCAST.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_GLOSSYCAST));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_BSMATTE_DS.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_BSMATTE_DS));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_3D.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_3D));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_LCPP.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_LCPP));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PREPRINTED.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PREPRINTED));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_LETTERHEAD.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_LETTERHEAD));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_RECYCLED.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_RECYCLED));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_COLOR.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_COLOR));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_BUSINESS_PLAIN.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_BUSINESS_PLAIN));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN_ROLL_STICKER.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLAIN_ROLL_STICKER));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_GROSSY_ROLL_STICKER.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_GROSSY_ROLL_STICKER));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN1.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLAIN1));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN2.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLAIN2));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER1.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER1));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER2.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER2));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER3.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER3));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER4.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER4));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER5.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER5));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_HIGH_QUALITY_PLAIN.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_HIGH_QUALITY_PLAIN));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_BS_HALFGLOSSY_DS.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_BS_HALFGLOSSY_DS));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_CDDVD.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_CDDVD));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_CDDVDHIGH.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_CDDVDHIGH));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLOOFING_WHITE_MAT.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLOOFING_WHITE_MAT));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_BARYTA.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_BARYTA));
-            this.sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_AUTO_PLAIN.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_AUTO_PLAIN));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLAIN));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_IRON.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_IRON));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PHOTOINKJET.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PHOTOINKJET));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_MATTE.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_MATTE));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PHOTO));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_MINIPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_MINIPHOTO));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PGPHOTO));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PSPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PSPHOTO));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLPHOTO));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_ARCHMATTE.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_ARCHMATTE));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_WATERCOLOR.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_WATERCOLOR));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_ECOPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_ECOPHOTO));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_VELVETFINEART.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_VELVETFINEART));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_HAGAKIRECL.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_HAGAKIRECL));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_HAGAKIINKJET.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_HAGAKIINKJET));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PHOTOINKJET2.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PHOTOINKJET2));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_MATTEMEISHI.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_MATTEMEISHI));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_HAGAKIATENA.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_HAGAKIATENA));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_ENVELOPE.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_ENVELOPE));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLATINA.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLATINA));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_ULTRASMOOTH.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_ULTRASMOOTH));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_SFHAGAKI.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_SFHAGAKI));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PHOTOSTD.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PHOTOSTD));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_GLOSSYHAGAKI.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_GLOSSYHAGAKI));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_GLOSSYPHOTO.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_GLOSSYPHOTO));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_GLOSSYCAST.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_GLOSSYCAST));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_BSMATTE_DS.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_BSMATTE_DS));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_3D.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_3D));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_LCPP.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_LCPP));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PREPRINTED.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PREPRINTED));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_LETTERHEAD.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_LETTERHEAD));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_RECYCLED.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_RECYCLED));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_COLOR.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_COLOR));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_BUSINESS_PLAIN.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_BUSINESS_PLAIN));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN_ROLL_STICKER.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLAIN_ROLL_STICKER));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_GROSSY_ROLL_STICKER.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_GROSSY_ROLL_STICKER));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN1.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLAIN1));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN2.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLAIN2));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER1.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER1));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER2.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER2));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER3.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER3));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER4.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER4));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_THICKPAPER5.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_THICKPAPER5));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_HIGH_QUALITY_PLAIN.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_HIGH_QUALITY_PLAIN));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_BS_HALFGLOSSY_DS.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_BS_HALFGLOSSY_DS));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_CDDVD.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_CDDVD));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_CDDVDHIGH.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_CDDVDHIGH));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_PLOOFING_WHITE_MAT.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_PLOOFING_WHITE_MAT));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_BARYTA.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_BARYTA));
+            sCodeTable.put(Integer.valueOf(Constants.MediaName.EPS_MTID_AUTO_PLAIN.getCode()), Integer.valueOf(C1055R.string.EPS_MTID_AUTO_PLAIN));
         }
         }
     }
     }
 
 
     public static class Layout extends AbstractInfo {
     public static class Layout extends AbstractInfo {
         public Layout() {
         public Layout() {
-            this.sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_MLID_CUSTOM));
-            this.sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_MLID_BORDERLESS));
-            this.sCodeTable.put(2, Integer.valueOf(C1055R.string.EPS_MLID_BORDERS));
-            this.sCodeTable.put(4, Integer.valueOf(C1055R.string.EPS_MLID_CDLABEL));
+            sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_MLID_CUSTOM));
+            sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_MLID_BORDERLESS));
+            sCodeTable.put(2, Integer.valueOf(C1055R.string.EPS_MLID_BORDERS));
+            sCodeTable.put(4, Integer.valueOf(C1055R.string.EPS_MLID_CDLABEL));
         }
         }
     }
     }
 
 
     public static class Quality extends AbstractInfo {
     public static class Quality extends AbstractInfo {
         public Quality() {
         public Quality() {
-            this.sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_MQID_DRAFT));
-            this.sCodeTable.put(2, Integer.valueOf(C1055R.string.EPS_MQID_NORMAL));
-            this.sCodeTable.put(4, Integer.valueOf(C1055R.string.EPS_MQID_HIGH));
-            this.sCodeTable.put(128, Integer.valueOf(C1055R.string.EPS_MQID_BEST_PLAIN));
+            sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_MQID_DRAFT));
+            sCodeTable.put(2, Integer.valueOf(C1055R.string.EPS_MQID_NORMAL));
+            sCodeTable.put(4, Integer.valueOf(C1055R.string.EPS_MQID_HIGH));
+            sCodeTable.put(128, Integer.valueOf(C1055R.string.EPS_MQID_BEST_PLAIN));
         }
         }
     }
     }
 
 
     public static class PaperSource extends AbstractInfo {
     public static class PaperSource extends AbstractInfo {
         public PaperSource() {
         public PaperSource() {
-            this.sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_MPID_REAR));
-            this.sCodeTable.put(2, Integer.valueOf(C1055R.string.EPS_MPID_FRONT1));
-            this.sCodeTable.put(4, Integer.valueOf(C1055R.string.EPS_MPID_FRONT2));
-            this.sCodeTable.put(32, Integer.valueOf(C1055R.string.EPS_MPID_FRONT3));
-            this.sCodeTable.put(64, Integer.valueOf(C1055R.string.EPS_MPID_FRONT4));
-            this.sCodeTable.put(8, Integer.valueOf(C1055R.string.EPS_MPID_CDTRAY));
-            this.sCodeTable.put(32768, Integer.valueOf(C1055R.string.EPS_MPID_MPTRAY));
-            this.sCodeTable.put(16, Integer.valueOf(C1055R.string.EPS_MPID_REARMANUAL));
-            this.sCodeTable.put(512, Integer.valueOf(C1055R.string.EPS_MPID_MANUAL2));
-            this.sCodeTable.put(256, Integer.valueOf(C1055R.string.EPS_MPID_ROLL));
-            this.sCodeTable.put(1024, Integer.valueOf(C1055R.string.EPS_MPID_MPTRAY_IJ));
-            this.sCodeTable.put(2048, Integer.valueOf(C1055R.string.EPS_MPID_HIGHCAP));
-            this.sCodeTable.put(128, Integer.valueOf(C1055R.string.EPS_MPID_AUTO));
+            sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_MPID_REAR));
+            sCodeTable.put(2, Integer.valueOf(C1055R.string.EPS_MPID_FRONT1));
+            sCodeTable.put(4, Integer.valueOf(C1055R.string.EPS_MPID_FRONT2));
+            sCodeTable.put(32, Integer.valueOf(C1055R.string.EPS_MPID_FRONT3));
+            sCodeTable.put(64, Integer.valueOf(C1055R.string.EPS_MPID_FRONT4));
+            sCodeTable.put(8, Integer.valueOf(C1055R.string.EPS_MPID_CDTRAY));
+            sCodeTable.put(32768, Integer.valueOf(C1055R.string.EPS_MPID_MPTRAY));
+            sCodeTable.put(16, Integer.valueOf(C1055R.string.EPS_MPID_REARMANUAL));
+            sCodeTable.put(512, Integer.valueOf(C1055R.string.EPS_MPID_MANUAL2));
+            sCodeTable.put(256, Integer.valueOf(C1055R.string.EPS_MPID_ROLL));
+            sCodeTable.put(1024, Integer.valueOf(C1055R.string.EPS_MPID_MPTRAY_IJ));
+            sCodeTable.put(2048, Integer.valueOf(C1055R.string.EPS_MPID_HIGHCAP));
+            sCodeTable.put(128, Integer.valueOf(C1055R.string.EPS_MPID_AUTO));
         }
         }
     }
     }
 
 
     public static class PrintDate extends AbstractInfo {
     public static class PrintDate extends AbstractInfo {
         public PrintDate() {
         public PrintDate() {
-            this.sCodeTable.put(0, Integer.valueOf(C1055R.string.Off));
-            this.sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_PD_DATETYPE1));
-            this.sCodeTable.put(2, Integer.valueOf(C1055R.string.EPS_PD_DATETYPE2));
-            this.sCodeTable.put(3, Integer.valueOf(C1055R.string.EPS_PD_DATETYPE3));
+            sCodeTable.put(0, Integer.valueOf(C1055R.string.Off));
+            sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_PD_DATETYPE1));
+            sCodeTable.put(2, Integer.valueOf(C1055R.string.EPS_PD_DATETYPE2));
+            sCodeTable.put(3, Integer.valueOf(C1055R.string.EPS_PD_DATETYPE3));
         }
         }
     }
     }
 
 
     public static class PhotoeEhance extends AbstractInfo {
     public static class PhotoeEhance extends AbstractInfo {
         public PhotoeEhance() {
         public PhotoeEhance() {
-            this.sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_APF_ON));
-            this.sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_APF_OFF));
+            sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_APF_ON));
+            sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_APF_OFF));
         }
         }
     }
     }
 
 
     public static class Color extends AbstractInfo {
     public static class Color extends AbstractInfo {
         public Color() {
         public Color() {
-            this.sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_CM_COLOR));
-            this.sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_CM_MONOCHROME));
+            sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_CM_COLOR));
+            sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_CM_MONOCHROME));
         }
         }
     }
     }
 
 
     public static class Duplex extends AbstractInfo {
     public static class Duplex extends AbstractInfo {
         public Duplex() {
         public Duplex() {
-            this.sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_DUPLEX_NONE));
-            this.sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_DUPLEX_LONG));
-            this.sCodeTable.put(2, Integer.valueOf(C1055R.string.EPS_DUPLEX_SHORT));
+            sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_DUPLEX_NONE));
+            sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_DUPLEX_LONG));
+            sCodeTable.put(2, Integer.valueOf(C1055R.string.EPS_DUPLEX_SHORT));
         }
         }
     }
     }
 
 
     public static class FeedDirection extends AbstractInfo {
     public static class FeedDirection extends AbstractInfo {
         public FeedDirection() {
         public FeedDirection() {
-            this.sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_FEEDDIR_PORTRAIT));
-            this.sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_FEEDDIR_LANDSCAPE));
+            sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_FEEDDIR_PORTRAIT));
+            sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_FEEDDIR_LANDSCAPE));
         }
         }
     }
     }
 
 
     public static class PaperSizeType extends AbstractInfo {
     public static class PaperSizeType extends AbstractInfo {
         public PaperSizeType() {
         public PaperSizeType() {
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A4.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_LETTER.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_LEGAL.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A5.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A6.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B5.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_EXECUTIVE.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HALFLETTER.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PANORAMIC.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_TRIM_4X6.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_4X6.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_5X8.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8X10.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_10X15.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_200X300.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_POSTCARD.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_DBLPOSTCARD.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_10_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C6_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_DL_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_NEWEVN_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CHOKEI_3.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CHOKEI_4.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_1.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_2.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_3.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_4.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_2L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_10_P.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C6_P.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_DL_P.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_NEWENV_P.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_MEISHI.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_BUZCARD_89X50.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CARD_54X86.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_BUZCARD_55X91.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ALBUM_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ALBUM_A5.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_L_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_2L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_A5_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_A4.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HIVISION.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_KAKU_2.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C4_P.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B6.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_KAKU_20.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A3NOBI.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A3.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B4.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USB.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_11X14.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B3.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A2.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USC.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_10X12.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_12X12.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USER.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HALFCUT.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
-            this.sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_16X20.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A4.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_LETTER.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_LEGAL.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A5.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A6.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B5.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_EXECUTIVE.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HALFLETTER.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PANORAMIC.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_TRIM_4X6.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_4X6.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_5X8.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_8X10.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_10X15.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_200X300.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_POSTCARD.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_DBLPOSTCARD.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_10_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C6_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_DL_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_NEWEVN_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CHOKEI_3.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CHOKEI_4.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_1.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_2.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_3.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_YOKEI_4.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_2L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_10_P.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C6_P.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_DL_P.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_NEWENV_P.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_MEISHI.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_BUZCARD_89X50.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_CARD_54X86.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_BUZCARD_55X91.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ALBUM_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ALBUM_A5.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_L_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_2L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_A5_L.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_PALBUM_A4.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HIVISION.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_KAKU_2.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_ENV_C4_P.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B6.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_KAKU_20.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A3NOBI.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A3.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B4.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USB.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PLAIN.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_11X14.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_B3.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_A2.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USC.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_10X12.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_12X12.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_USER.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_HALFCUT.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
+            sCodeTable.put(Integer.valueOf(Constants.PaperName.EPS_MSID_16X20.getCode()), Integer.valueOf(Constants.MediaName.EPS_MTID_PGPHOTO.getCode()));
         }
         }
     }
     }
 
 
     public static class ApfState extends AbstractInfo {
     public static class ApfState extends AbstractInfo {
         public ApfState() {
         public ApfState() {
-            this.sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_APF_OFF));
-            this.sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_APF_ON));
+            sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_APF_OFF));
+            sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_APF_ON));
         }
         }
     }
     }
 
 
     public static class SharpnessState extends AbstractInfo {
     public static class SharpnessState extends AbstractInfo {
         public SharpnessState() {
         public SharpnessState() {
-            this.sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_SHARPNESS_OFF));
-            this.sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_SHARPNESS_ON));
+            sCodeTable.put(0, Integer.valueOf(C1055R.string.EPS_SHARPNESS_OFF));
+            sCodeTable.put(1, Integer.valueOf(C1055R.string.EPS_SHARPNESS_ON));
         }
         }
     }
     }
 }
 }

+ 15 - 15
app/src/main/java/epson/common/guide/NoticeGuideActivity.java

@@ -59,19 +59,19 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
         setContentView(C0907R.layout.activity_notice_guide);
         setContentView(C0907R.layout.activity_notice_guide);
         Intent intent = getIntent();
         Intent intent = getIntent();
         if (intent != null) {
         if (intent != null) {
-            this.htmlpath = intent.getStringArrayListExtra(KEY_HTML_PATH);
+            htmlpath = intent.getStringArrayListExtra(KEY_HTML_PATH);
             if (this.htmlpath.size() == 0) {
             if (this.htmlpath.size() == 0) {
                 finish();
                 finish();
             }
             }
-            this.boot_mode = intent.getIntExtra(KEY_BOOT_MODE, 0);
-            this.boot_group = intent.getStringExtra(KEY_BOOT_GROUP);
-            this.dialog_mode = intent.getIntExtra(KEY_DIALOG_MODE, 0);
-            this.version = intent.getIntExtra(KEY_GUIDE_VER, 0);
+            boot_mode = intent.getIntExtra(KEY_BOOT_MODE, 0);
+            boot_group = intent.getStringExtra(KEY_BOOT_GROUP);
+            dialog_mode = intent.getIntExtra(KEY_DIALOG_MODE, 0);
+            version = intent.getIntExtra(KEY_GUIDE_VER, 0);
             mDialogTextMessage = intent.getStringExtra(KEY_DIALOG_TITLE);
             mDialogTextMessage = intent.getStringExtra(KEY_DIALOG_TITLE);
             mDialogButtonYes = intent.getStringExtra(KEY_DIALOG_BUTTON_YES);
             mDialogButtonYes = intent.getStringExtra(KEY_DIALOG_BUTTON_YES);
             mDialogButtonNo = intent.getStringExtra(KEY_DIALOG_BUTTON_NO);
             mDialogButtonNo = intent.getStringExtra(KEY_DIALOG_BUTTON_NO);
             if (this.boot_group != null) {
             if (this.boot_group != null) {
-                this.SP_KEY_GUIDE_VER += "-" + this.boot_group;
+                SP_KEY_GUIDE_VER += "-" + boot_group;
             }
             }
         }
         }
         if (this.boot_mode == MODE_AUTO) {
         if (this.boot_mode == MODE_AUTO) {
@@ -80,7 +80,7 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
             }
             }
         }
         }
         final MyPageAdapter myPageAdapter = new MyPageAdapter();
         final MyPageAdapter myPageAdapter = new MyPageAdapter();
-        mAdapter = new MyFragmentStatePagerAdapter(getSupportFragmentManager(), this.htmlpath);
+        mAdapter = new MyFragmentStatePagerAdapter(getSupportFragmentManager(), htmlpath);
         mViewPager = (MyViewPager) findViewById(C0907R.C0909id.guideViewPager);
         mViewPager = (MyViewPager) findViewById(C0907R.C0909id.guideViewPager);
         mViewPager.setAdapter(mAdapter);
         mViewPager.setAdapter(mAdapter);
         mViewPager.setOffscreenPageLimit(2);
         mViewPager.setOffscreenPageLimit(2);
@@ -101,7 +101,7 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
         mGuideDialogView = (LinearLayout) findViewById(C0907R.C0909id.guide_dialog_layout);
         mGuideDialogView = (LinearLayout) findViewById(C0907R.C0909id.guide_dialog_layout);
         mGrayLine_Hor = findViewById(C0907R.C0909id.guide_dialog_horizon_gray_line);
         mGrayLine_Hor = findViewById(C0907R.C0909id.guide_dialog_horizon_gray_line);
         mDialogText = (TextView) findViewById(C0907R.C0909id.guide_dialog_message);
         mDialogText = (TextView) findViewById(C0907R.C0909id.guide_dialog_message);
-        int i = this.dialog_mode;
+        int i = dialog_mode;
         if (i == DIALOG_MODE_ON || i == DIALOG_MODE_ONLY_BUTTON) {
         if (i == DIALOG_MODE_ON || i == DIALOG_MODE_ONLY_BUTTON) {
             mGuideDialogView.setVisibility(0);
             mGuideDialogView.setVisibility(0);
             ViewGroup.MarginLayoutParams marginLayoutParams = (ViewGroup.MarginLayoutParams) mGuideDialogView.getLayoutParams();
             ViewGroup.MarginLayoutParams marginLayoutParams = (ViewGroup.MarginLayoutParams) mGuideDialogView.getLayoutParams();
@@ -147,7 +147,7 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
 
 
     public void onClickClose() {
     public void onClickClose() {
         if (this.boot_mode == MODE_AUTO) {
         if (this.boot_mode == MODE_AUTO) {
-            PreferenceManager.getDefaultSharedPreferences(this).edit().putInt(this.SP_KEY_GUIDE_VER, this.version).apply();
+            PreferenceManager.getDefaultSharedPreferences(this).edit().putInt(this.SP_KEY_GUIDE_VER, version).apply();
         }
         }
         finish();
         finish();
     }
     }
@@ -176,18 +176,18 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
 
 
         private MyFragmentStatePagerAdapter(FragmentManager fragmentManager, ArrayList<String> arrayList) {
         private MyFragmentStatePagerAdapter(FragmentManager fragmentManager, ArrayList<String> arrayList) {
             super(fragmentManager);
             super(fragmentManager);
-            this.HTML_PAGE = new ArrayList<>();
-            this.PAGE_LENGTH = 0;
-            this.HTML_PAGE = arrayList;
-            this.PAGE_LENGTH = arrayList.size();
+            HTML_PAGE = new ArrayList<>();
+            PAGE_LENGTH = 0;
+            HTML_PAGE = arrayList;
+            PAGE_LENGTH = arrayList.size();
         }
         }
 
 
         public Fragment getItem(int i) {
         public Fragment getItem(int i) {
-            return GuideWebviewFragment.newInstance(String.format(Locale.US, this.HTML_PAGE.get(i), new Object[]{Integer.valueOf(i + 1)}));
+            return GuideWebviewFragment.newInstance(String.format(Locale.US, HTML_PAGE.get(i), new Object[]{Integer.valueOf(i + 1)}));
         }
         }
 
 
         public int getCount() {
         public int getCount() {
-            return this.PAGE_LENGTH;
+            return PAGE_LENGTH;
         }
         }
     }
     }
 
 

+ 2 - 2
app/src/main/java/epson/common/httpclient/BasicNameValuePair.java

@@ -8,10 +8,10 @@ public class BasicNameValuePair extends Pair<String, String> {
     }
     }
 
 
     public String getName() {
     public String getName() {
-        return (String) this.first;
+        return (String) first;
     }
     }
 
 
     public String getValue() {
     public String getValue() {
-        return (String) this.second;
+        return (String) second;
     }
     }
 }
 }

+ 32 - 32
app/src/main/java/epson/common/httpclient/IAHttpClient.java

@@ -80,25 +80,25 @@ public class IAHttpClient {
     }
     }
 
 
     public void setConnectionTimeout(int i) {
     public void setConnectionTimeout(int i) {
-        this.connectionTimeout = i;
+        connectionTimeout = i;
     }
     }
 
 
     public void setSoTimeout(int i) {
     public void setSoTimeout(int i) {
-        this.readTimeout = i;
+        readTimeout = i;
     }
     }
 
 
     public void setFollowRedirects(boolean z) {
     public void setFollowRedirects(boolean z) {
-        this.followRedirects = z;
+        followRedirects = z;
     }
     }
 
 
     private HttpURLConnection connect(HttpBase httpBase) throws IOException {
     private HttpURLConnection connect(HttpBase httpBase) throws IOException {
         HttpURLConnection httpURLConnection;
         HttpURLConnection httpURLConnection;
         synchronized (this.connLockObj) {
         synchronized (this.connLockObj) {
-            this.conn = (HttpURLConnection) httpBase.getURI().openConnection();
-            this.conn.setConnectTimeout(this.connectionTimeout);
-            this.conn.setReadTimeout(this.readTimeout);
-            this.conn.setInstanceFollowRedirects(this.followRedirects);
-            httpURLConnection = this.conn;
+            conn = (HttpURLConnection) httpBase.getURI().openConnection();
+            conn.setConnectTimeout(this.connectionTimeout);
+            conn.setReadTimeout(this.readTimeout);
+            conn.setInstanceFollowRedirects(this.followRedirects);
+            httpURLConnection = conn;
         }
         }
         return httpURLConnection;
         return httpURLConnection;
     }
     }
@@ -106,7 +106,7 @@ public class IAHttpClient {
     public void disconnect() {
     public void disconnect() {
         synchronized (this.connLockObj) {
         synchronized (this.connLockObj) {
             if (this.conn != null) {
             if (this.conn != null) {
-                this.conn.disconnect();
+                conn.disconnect();
             }
             }
         }
         }
     }
     }
@@ -115,11 +115,11 @@ public class IAHttpClient {
         HttpResponse parseResponse;
         HttpResponse parseResponse;
         new HttpResponse();
         new HttpResponse();
         try {
         try {
-            this.conn = connect(httpGet);
-            this.conn.setRequestMethod("GET");
-            this.conn.setDoInput(true);
+            conn = connect(httpGet);
+            conn.setRequestMethod("GET");
+            conn.setDoInput(true);
             makeHeader(this.conn, httpGet);
             makeHeader(this.conn, httpGet);
-            this.conn.connect();
+            conn.connect();
             parseResponse = parseResponse(this.conn, true);
             parseResponse = parseResponse(this.conn, true);
             disconnect();
             disconnect();
         } catch (IOException e) {
         } catch (IOException e) {
@@ -676,11 +676,11 @@ public class IAHttpClient {
         }
         }
 
 
         public int getResponseCode() {
         public int getResponseCode() {
-            return this.responseCode;
+            return responseCode;
         }
         }
 
 
         public void setResponseCode(int i) {
         public void setResponseCode(int i) {
-            this.responseCode = i;
+            responseCode = i;
         }
         }
     }
     }
 
 
@@ -700,50 +700,50 @@ public class IAHttpClient {
 
 
         public HttpBase(String str) {
         public HttpBase(String str) {
             try {
             try {
-                this.url = new URL(str);
+                url = new URL(str);
             } catch (MalformedURLException e) {
             } catch (MalformedURLException e) {
                 e.printStackTrace();
                 e.printStackTrace();
             }
             }
         }
         }
 
 
         public URL getURI() {
         public URL getURI() {
-            return this.url;
+            return url;
         }
         }
 
 
         public String getContentType() {
         public String getContentType() {
-            return this.contentType;
+            return contentType;
         }
         }
 
 
         public void setContentType(String str) {
         public void setContentType(String str) {
-            this.contentType = str;
+            contentType = str;
         }
         }
 
 
         public String getContentEncoding() {
         public String getContentEncoding() {
-            return this.contentEncoding;
+            return contentEncoding;
         }
         }
 
 
         public void setContentEncoding(String str) {
         public void setContentEncoding(String str) {
-            this.contentEncoding = str;
+            contentEncoding = str;
         }
         }
 
 
         public Boolean getChunked() {
         public Boolean getChunked() {
-            return this.chunked;
+            return chunked;
         }
         }
 
 
         public void setChunked(Boolean bool) {
         public void setChunked(Boolean bool) {
-            this.chunked = bool;
+            chunked = bool;
         }
         }
 
 
         public Integer getContentLength() {
         public Integer getContentLength() {
-            return this.contentLength;
+            return contentLength;
         }
         }
 
 
         public void setContentLength(Integer num) {
         public void setContentLength(Integer num) {
-            this.contentLength = num;
+            contentLength = num;
         }
         }
 
 
         public void setEntity(byte[] bArr) {
         public void setEntity(byte[] bArr) {
-            this.entityBuffer = bArr;
+            entityBuffer = bArr;
         }
         }
 
 
         public ByteArrayOutputStream getEntity() throws IOException {
         public ByteArrayOutputStream getEntity() throws IOException {
@@ -753,21 +753,21 @@ public class IAHttpClient {
         }
         }
 
 
         public String getEntityFileName() {
         public String getEntityFileName() {
-            return this.entityFileName;
+            return entityFileName;
         }
         }
 
 
         public int getEntityFileDataOffset() {
         public int getEntityFileDataOffset() {
-            return this.entityFileDataOffset;
+            return entityFileDataOffset;
         }
         }
 
 
         public int getEntityFileDataSize() {
         public int getEntityFileDataSize() {
-            return this.entityFileDataSize;
+            return entityFileDataSize;
         }
         }
 
 
         public void setEntityFile(String str, int i, int i2) {
         public void setEntityFile(String str, int i, int i2) {
-            this.entityFileName = str;
-            this.entityFileDataOffset = i;
-            this.entityFileDataSize = i2;
+            entityFileName = str;
+            entityFileDataOffset = i;
+            entityFileDataSize = i2;
         }
         }
     }
     }
 }
 }

+ 3 - 3
app/src/main/java/epson/common/keyenc/SecureKeyFactory.java

@@ -32,7 +32,7 @@ public class SecureKeyFactory {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
         mAppContext = context.getApplicationContext();
         mAppContext = context.getApplicationContext();
-        this.key = navite_getKey(mAppContext);
+        key = navite_getKey(mAppContext);
     }
     }
 
 
     public static SecureKeyFactory getInstance(Context context) {
     public static SecureKeyFactory getInstance(Context context) {
@@ -96,10 +96,10 @@ public class SecureKeyFactory {
     public String Decode(String str) {
     public String Decode(String str) {
         byte[] decode;
         byte[] decode;
         byte[] decodeAes;
         byte[] decodeAes;
-        if (this.key == null || (decode = Base64.decode(str, 10)) == null || (decodeAes = decodeAes(decode, this.key)) == null) {
+        if (this.key == null || (decode = Base64.decode(str, 10)) == null || (decodeAes = decodeAes(decode, key)) == null) {
             return "";
             return "";
         }
         }
-        return new String(decodeAes, this.charset);
+        return new String(decodeAes, charset);
     }
     }
 
 
     private byte[] encodeAes(byte[] bArr, byte[] bArr2) {
     private byte[] encodeAes(byte[] bArr, byte[] bArr2) {

+ 3 - 3
app/src/main/java/epson/common/maintain2/BatteryInfo.java

@@ -31,9 +31,9 @@ public class BatteryInfo implements Parcelable {
     }
     }
 
 
     private BatteryInfo(Parcel parcel) {
     private BatteryInfo(Parcel parcel) {
-        this.powerSourceType = parcel.readInt();
-        this.batteryChargeState = parcel.readInt();
-        this.batteryRemain = parcel.readInt();
+        powerSourceType = parcel.readInt();
+        batteryChargeState = parcel.readInt();
+        batteryRemain = parcel.readInt();
     }
     }
 
 
     public void writeToParcel(Parcel parcel, int i) {
     public void writeToParcel(Parcel parcel, int i) {

+ 5 - 5
app/src/main/java/epson/common/maintain2/BatteryInfoEx.java

@@ -39,13 +39,13 @@ public class BatteryInfoEx implements Parcelable {
     }
     }
 
 
     private BatteryInfoEx(Parcel parcel) {
     private BatteryInfoEx(Parcel parcel) {
-        this.powerSourceType = parcel.readInt();
-        this.number = parcel.readInt();
-        this.batteryType = new int[parcel.readInt()];
+        powerSourceType = parcel.readInt();
+        number = parcel.readInt();
+        batteryType = new int[parcel.readInt()];
         parcel.readIntArray(this.batteryType);
         parcel.readIntArray(this.batteryType);
-        this.batteryState = new int[parcel.readInt()];
+        batteryState = new int[parcel.readInt()];
         parcel.readIntArray(this.batteryState);
         parcel.readIntArray(this.batteryState);
-        this.batteryRemain = new int[parcel.readInt()];
+        batteryRemain = new int[parcel.readInt()];
         parcel.readIntArray(this.batteryRemain);
         parcel.readIntArray(this.batteryRemain);
     }
     }
 
 

+ 8 - 8
app/src/main/java/epson/common/usb/UsbPrintDriver.java

@@ -18,8 +18,8 @@ public class UsbPrintDriver {
     private ArrayList<UsbPrinter> usbPrintersPemmited = null;
     private ArrayList<UsbPrinter> usbPrintersPemmited = null;
 
 
     private UsbPrintDriver(Context context2) {
     private UsbPrintDriver(Context context2) {
-        this.usbManager = (UsbManager) context2.getSystemService("usb");
-        this.context = context2;
+        usbManager = (UsbManager) context2.getSystemService("usb");
+        context = context2;
     }
     }
 
 
     public static synchronized UsbPrintDriver getInstance(Context context2) {
     public static synchronized UsbPrintDriver getInstance(Context context2) {
@@ -34,7 +34,7 @@ public class UsbPrintDriver {
     }
     }
 
 
     public UsbManager getUsbManager() {
     public UsbManager getUsbManager() {
-        return this.usbManager;
+        return usbManager;
     }
     }
 
 
     public boolean isExistPermitedDevice() {
     public boolean isExistPermitedDevice() {
@@ -102,7 +102,7 @@ public class UsbPrintDriver {
         ArrayList<UsbPrinter> arrayList;
         ArrayList<UsbPrinter> arrayList;
         synchronized (this) {
         synchronized (this) {
             arrayList = new ArrayList<>();
             arrayList = new ArrayList<>();
-            HashMap<String, UsbDevice> deviceList = this.usbManager.getDeviceList();
+            HashMap<String, UsbDevice> deviceList = usbManager.getDeviceList();
             for (String str : deviceList.keySet()) {
             for (String str : deviceList.keySet()) {
                 UsbDevice usbDevice = deviceList.get(str);
                 UsbDevice usbDevice = deviceList.get(str);
                 if (z) {
                 if (z) {
@@ -202,8 +202,8 @@ public class UsbPrintDriver {
     public int openPort(int[] iArr) {
     public int openPort(int[] iArr) {
         EpLog.m78i(TAG, "Call openPort");
         EpLog.m78i(TAG, "Call openPort");
         synchronized (this) {
         synchronized (this) {
-            for (int i = 0; i < this.usbPrintersPemmited.size(); i++) {
-                UsbPrinter usbPrinter = this.usbPrintersPemmited.get(i);
+            for (int i = 0; i < usbPrintersPemmited.size(); i++) {
+                UsbPrinter usbPrinter = usbPrintersPemmited.get(i);
                 if (iArr[0] == usbPrinter.getUsbDevice().getVendorId() && iArr[1] == usbPrinter.getUsbDevice().getProductId() && iArr[2] == usbPrinter.getDeviceNumbers()) {
                 if (iArr[0] == usbPrinter.getUsbDevice().getVendorId() && iArr[1] == usbPrinter.getUsbDevice().getProductId() && iArr[2] == usbPrinter.getDeviceNumbers()) {
                     int openPort = usbPrinter.openPort();
                     int openPort = usbPrinter.openPort();
                     return openPort;
                     return openPort;
@@ -215,8 +215,8 @@ public class UsbPrintDriver {
 
 
     public UsbPrinter findPrinterOpened(int i) {
     public UsbPrinter findPrinterOpened(int i) {
         synchronized (this) {
         synchronized (this) {
-            for (int i2 = 0; i2 < this.usbPrintersPemmited.size(); i2++) {
-                UsbPrinter usbPrinter = this.usbPrintersPemmited.get(i2);
+            for (int i2 = 0; i2 < usbPrintersPemmited.size(); i2++) {
+                UsbPrinter usbPrinter = usbPrintersPemmited.get(i2);
                 UsbDeviceConnection usbPrinter2 = usbPrinter.getUsbPrinter();
                 UsbDeviceConnection usbPrinter2 = usbPrinter.getUsbPrinter();
                 if (usbPrinter2 != null) {
                 if (usbPrinter2 != null) {
                     if (i == usbPrinter2.getFileDescriptor()) {
                     if (i == usbPrinter2.getFileDescriptor()) {

+ 21 - 21
app/src/main/java/epson/common/usb/UsbPrinter.java

@@ -43,19 +43,19 @@ public class UsbPrinter {
     }
     }
 
 
     public UsbPrinter(UsbManager usbManager2, UsbDevice usbDevice2, UsbInterface usbInterface2, UsbEndpoint usbEndpoint, UsbEndpoint usbEndpoint2) {
     public UsbPrinter(UsbManager usbManager2, UsbDevice usbDevice2, UsbInterface usbInterface2, UsbEndpoint usbEndpoint, UsbEndpoint usbEndpoint2) {
-        this.usbManager = usbManager2;
-        this.usbDevice = usbDevice2;
-        this.usbInterface = usbInterface2;
-        this.endPointOut = usbEndpoint;
-        this.endPointIn = usbEndpoint2;
+        usbManager = usbManager2;
+        usbDevice = usbDevice2;
+        usbInterface = usbInterface2;
+        endPointOut = usbEndpoint;
+        endPointIn = usbEndpoint2;
     }
     }
 
 
     public UsbDevice getUsbDevice() {
     public UsbDevice getUsbDevice() {
-        return this.usbDevice;
+        return usbDevice;
     }
     }
 
 
     public UsbDeviceConnection getUsbPrinter() {
     public UsbDeviceConnection getUsbPrinter() {
-        return this.usbPrinter;
+        return usbPrinter;
     }
     }
 
 
     public int getDeviceNumbers() {
     public int getDeviceNumbers() {
@@ -66,11 +66,11 @@ public class UsbPrinter {
 
 
     public synchronized int openPort() {
     public synchronized int openPort() {
         try {
         try {
-            this.usbPrinter = this.usbManager.openDevice(this.usbDevice);
+            usbPrinter = usbManager.openDevice(this.usbDevice);
             if (this.usbPrinter == null) {
             if (this.usbPrinter == null) {
                 return -1;
                 return -1;
             }
             }
-            return this.usbPrinter.getFileDescriptor();
+            return usbPrinter.getFileDescriptor();
         } catch (Exception unused) {
         } catch (Exception unused) {
             return -1;
             return -1;
         }
         }
@@ -85,13 +85,13 @@ public class UsbPrinter {
         }
         }
         setStartTime();
         setStartTime();
         EpLog.m78i(TAG, "bulkTransfer length=" + i);
         EpLog.m78i(TAG, "bulkTransfer length=" + i);
-        int bulkTransfer = this.usbPrinter.bulkTransfer(this.endPointIn, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
+        int bulkTransfer = usbPrinter.bulkTransfer(this.endPointIn, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
         EpLog.m78i(TAG, "bulkTransfer readByte=" + bulkTransfer);
         EpLog.m78i(TAG, "bulkTransfer readByte=" + bulkTransfer);
         if (bulkTransfer < 0 && ((double) getElapsedTime()) >= 4500.0d) {
         if (bulkTransfer < 0 && ((double) getElapsedTime()) >= 4500.0d) {
             bulkTransfer = 0;
             bulkTransfer = 0;
             EpLog.m78i(TAG, "bulkTransfer timeout occurred");
             EpLog.m78i(TAG, "bulkTransfer timeout occurred");
         }
         }
-        this.usbPrinter.releaseInterface(this.usbInterface);
+        usbPrinter.releaseInterface(this.usbInterface);
         return (long) bulkTransfer;
         return (long) bulkTransfer;
     }
     }
 
 
@@ -104,22 +104,22 @@ public class UsbPrinter {
         }
         }
         setStartTime();
         setStartTime();
         EpLog.m78i(TAG, "bulkTransfer length=" + i);
         EpLog.m78i(TAG, "bulkTransfer length=" + i);
-        int bulkTransfer = this.usbPrinter.bulkTransfer(this.endPointOut, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
+        int bulkTransfer = usbPrinter.bulkTransfer(this.endPointOut, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
         EpLog.m78i(TAG, "bulkTransfer writtenByte=" + bulkTransfer);
         EpLog.m78i(TAG, "bulkTransfer writtenByte=" + bulkTransfer);
         if (bulkTransfer < 0 && ((double) getElapsedTime()) >= 4500.0d) {
         if (bulkTransfer < 0 && ((double) getElapsedTime()) >= 4500.0d) {
             bulkTransfer = 0;
             bulkTransfer = 0;
             EpLog.m78i(TAG, "bulkTransfer timeout occurred");
             EpLog.m78i(TAG, "bulkTransfer timeout occurred");
         }
         }
-        this.usbPrinter.releaseInterface(this.usbInterface);
+        usbPrinter.releaseInterface(this.usbInterface);
         return (long) bulkTransfer;
         return (long) bulkTransfer;
     }
     }
 
 
     private void setStartTime() {
     private void setStartTime() {
-        this.startTime = System.currentTimeMillis();
+        startTime = System.currentTimeMillis();
     }
     }
 
 
     private long getElapsedTime() {
     private long getElapsedTime() {
-        return System.currentTimeMillis() - this.startTime;
+        return System.currentTimeMillis() - startTime;
     }
     }
 
 
     public synchronized long getDeviceIdString(byte[] bArr, int i) {
     public synchronized long getDeviceIdString(byte[] bArr, int i) {
@@ -129,11 +129,11 @@ public class UsbPrinter {
         if (!this.usbPrinter.claimInterface(this.usbInterface, true)) {
         if (!this.usbPrinter.claimInterface(this.usbInterface, true)) {
             return -1;
             return -1;
         }
         }
-        int controlTransfer = this.usbPrinter.controlTransfer(161, 0, 0, this.usbInterface.getId() << 8, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
+        int controlTransfer = usbPrinter.controlTransfer(161, 0, 0, usbInterface.getId() << 8, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
         if (controlTransfer > 0) {
         if (controlTransfer > 0) {
             EpLog.m78i("EPSON", "DeviceIdString = " + new String(bArr, 2, controlTransfer - 2));
             EpLog.m78i("EPSON", "DeviceIdString = " + new String(bArr, 2, controlTransfer - 2));
         }
         }
-        this.usbPrinter.releaseInterface(this.usbInterface);
+        usbPrinter.releaseInterface(this.usbInterface);
         return (long) controlTransfer;
         return (long) controlTransfer;
     }
     }
 
 
@@ -186,17 +186,17 @@ public class UsbPrinter {
 
 
     public synchronized void closePort() {
     public synchronized void closePort() {
         if (this.usbPrinter != null) {
         if (this.usbPrinter != null) {
-            this.usbPrinter.close();
-            this.usbPrinter = null;
+            usbPrinter.close();
+            usbPrinter = null;
         }
         }
     }
     }
 
 
     public String toString() {
     public String toString() {
-        String str = "deviceName = " + this.usbDevice.getDeviceName() + " : endPointOut = " + Integer.toHexString(this.endPointOut.getAddress()) + " : endPointIn = " + Integer.toHexString(this.endPointIn.getAddress());
+        String str = "deviceName = " + usbDevice.getDeviceName() + " : endPointOut = " + Integer.toHexString(this.endPointOut.getAddress()) + " : endPointIn = " + Integer.toHexString(this.endPointIn.getAddress());
         if (Build.VERSION.SDK_INT < 21) {
         if (Build.VERSION.SDK_INT < 21) {
             return str;
             return str;
         }
         }
-        return (str + " : productName = " + this.usbDevice.getProductName()) + " : SerialNo = " + this.usbDevice.getSerialNumber();
+        return (str + " : productName = " + usbDevice.getProductName()) + " : SerialNo = " + usbDevice.getSerialNumber();
     }
     }
 
 
     public boolean equals(Object obj) {
     public boolean equals(Object obj) {

+ 11 - 11
app/src/main/java/epson/common/wifidirect/ActivityConnectBase.java

@@ -62,7 +62,7 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
         super.onCreate(bundle);
         super.onCreate(bundle);
         mWifiManager = (WifiManager) getApplicationContext().getApplicationContext().getSystemService("wifi");
         mWifiManager = (WifiManager) getApplicationContext().getApplicationContext().getSystemService("wifi");
         requestWindowFeature(1);
         requestWindowFeature(1);
-        this.searchWiFiDirectPrinter = SearchWiFiDirectPrinterTask.getInstance(this);
+        searchWiFiDirectPrinter = SearchWiFiDirectPrinterTask.getInstance(this);
     }
     }
 
 
     protected void onActivityResult(int i, int i2, Intent intent) {
     protected void onActivityResult(int i, int i2, Intent intent) {
@@ -113,26 +113,26 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
     }
     }
 
 
     private void interrupt() {
     private void interrupt() {
-        this.status = Status.IDLE;
-        SearchWiFiDirectPrinterTask searchWiFiDirectPrinterTask = this.searchWiFiDirectPrinter;
+        status = Status.IDLE;
+        SearchWiFiDirectPrinterTask searchWiFiDirectPrinterTask = searchWiFiDirectPrinter;
         if (searchWiFiDirectPrinterTask != null) {
         if (searchWiFiDirectPrinterTask != null) {
             searchWiFiDirectPrinterTask.interrupt();
             searchWiFiDirectPrinterTask.interrupt();
-            this.searchWiFiDirectPrinter = null;
+            searchWiFiDirectPrinter = null;
         }
         }
         interruptConnecting();
         interruptConnecting();
         interruptFindingPrinter();
         interruptFindingPrinter();
     }
     }
 
 
     private void interruptFindingPrinter() {
     private void interruptFindingPrinter() {
-        FindPrinterTask findPrinterTask = this.taskFindPrinter;
+        FindPrinterTask findPrinterTask = taskFindPrinter;
         if (findPrinterTask != null) {
         if (findPrinterTask != null) {
             findPrinterTask.cancel();
             findPrinterTask.cancel();
-            this.taskFindPrinter = null;
+            taskFindPrinter = null;
         }
         }
     }
     }
 
 
     protected void interruptConnecting() {
     protected void interruptConnecting() {
-        this.connectingObserver.interrupt();
+        connectingObserver.interrupt();
     }
     }
 
 
     private void onConnectedPrinter(Intent intent) {
     private void onConnectedPrinter(Intent intent) {
@@ -144,7 +144,7 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
     }
     }
 
 
     private void setupObserver() {
     private void setupObserver() {
-        this.connectingObserver.start(this.timeout * 1000);
+        connectingObserver.start(this.timeout * 1000);
     }
     }
 
 
     class ConnectingObserver {
     class ConnectingObserver {
@@ -156,7 +156,7 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
         private void start(final int i) {
         private void start(final int i) {
             interrupt();
             interrupt();
             EPLog.m86d(ActivityConnectBase.TAG, "Start ConnectingObserver");
             EPLog.m86d(ActivityConnectBase.TAG, "Start ConnectingObserver");
-            this.observerTask = new AsyncTask<Void, Void, Void>() {
+            observerTask = new AsyncTask<Void, Void, Void>() {
                 protected Void doInBackground(Void... voidArr) {
                 protected Void doInBackground(Void... voidArr) {
                     int i = 0;
                     int i = 0;
                     do {
                     do {
@@ -182,10 +182,10 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
         }
         }
 
 
         private void interrupt() {
         private void interrupt() {
-            AsyncTask<Void, Void, Void> asyncTask = this.observerTask;
+            AsyncTask<Void, Void, Void> asyncTask = observerTask;
             if (asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING && !this.observerTask.isCancelled()) {
             if (asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING && !this.observerTask.isCancelled()) {
                 EPLog.m86d(ActivityConnectBase.TAG, "Stop ConnectingObserver");
                 EPLog.m86d(ActivityConnectBase.TAG, "Stop ConnectingObserver");
-                this.observerTask.cancel(false);
+                observerTask.cancel(false);
             }
             }
         }
         }
     }
     }

+ 26 - 26
app/src/main/java/epson/common/wifidirect/ActivityConnectP2P.java

@@ -188,21 +188,21 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
         mWiFiP2PManager = (WifiP2pManager) getSystemService("wifip2p");
         mWiFiP2PManager = (WifiP2pManager) getSystemService("wifip2p");
         WifiP2pManager wifiP2pManager = mWiFiP2PManager;
         WifiP2pManager wifiP2pManager = mWiFiP2PManager;
         if (wifiP2pManager != null) {
         if (wifiP2pManager != null) {
-            this.p2pChannnel = wifiP2pManager.initialize(this, getMainLooper(), (WifiP2pManager.ChannelListener) null);
+            p2pChannnel = wifiP2pManager.initialize(this, getMainLooper(), (WifiP2pManager.ChannelListener) null);
         }
         }
-        if (mWiFiP2PManager == null || this.p2pChannnel == null) {
+        if (mWiFiP2PManager == null || p2pChannnel == null) {
             onError();
             onError();
             return;
             return;
         }
         }
         Bundle extras = getIntent().getExtras();
         Bundle extras = getIntent().getExtras();
         if (extras != null) {
         if (extras != null) {
-            this.targetSsid = extras.getString(ActivityConnectBase.APNAME);
-            this.showErrorDlg = extras.getBoolean(ActivityConnectBase.SHOWERROR, false);
-            this.showConnectedTip = extras.getBoolean(ActivityConnectBase.SHOWTIP, true);
-            this.needInfo = extras.getBoolean(ActivityConnectBase.NEEDINFO, false);
-            this.timeout = extras.getInt(ActivityConnectBase.TIMEOUT, 30);
+            targetSsid = extras.getString(ActivityConnectBase.APNAME);
+            showErrorDlg = extras.getBoolean(ActivityConnectBase.SHOWERROR, false);
+            showConnectedTip = extras.getBoolean(ActivityConnectBase.SHOWTIP, true);
+            needInfo = extras.getBoolean(ActivityConnectBase.NEEDINFO, false);
+            timeout = extras.getInt(ActivityConnectBase.TIMEOUT, 30);
         }
         }
-        EPLog.m88i(TAG, "Starting connect :" + this.targetSsid + " timeout = " + this.timeout);
+        EPLog.m88i(TAG, "Starting connect :" + targetSsid + " timeout = " + timeout);
         if (Build.VERSION.SDK_INT >= 29) {
         if (Build.VERSION.SDK_INT >= 29) {
             ActivityRequestLocationPermission.requestLocationPermissionForce(this, 2);
             ActivityRequestLocationPermission.requestLocationPermissionForce(this, 2);
         } else {
         } else {
@@ -234,16 +234,16 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
             if (connectionInfo != null) {
             if (connectionInfo != null) {
                 if (this.targetSsid.equals(connectionInfo.printerName)) {
                 if (this.targetSsid.equals(connectionInfo.printerName)) {
                     EPLog.m86d(TAG, "Already Connected!!");
                     EPLog.m86d(TAG, "Already Connected!!");
-                    this.status = ActivityConnectBase.Status.WIFI_CONNECTING;
+                    status = ActivityConnectBase.Status.WIFI_CONNECTING;
                     mHandler.sendEmptyMessage(10);
                     mHandler.sendEmptyMessage(10);
                     return;
                     return;
                 }
                 }
                 WifiP2pUtils.getInstance(this).disconnect();
                 WifiP2pUtils.getInstance(this).disconnect();
             }
             }
-            if (!this.searchWiFiDirectPrinter.start(2, mHandler, 0, this.timeout)) {
+            if (!this.searchWiFiDirectPrinter.start(2, mHandler, 0, timeout)) {
                 onError();
                 onError();
             } else {
             } else {
-                this.status = ActivityConnectBase.Status.WIFI_SCANNING;
+                status = ActivityConnectBase.Status.WIFI_SCANNING;
             }
             }
         } else {
         } else {
             AlertDialog.Builder negativeButton = new AlertDialog.Builder(this).setTitle(C1113R.string.str_error_wifi_connecting_failed).setPositiveButton(getString(C1113R.string.str_goto_wifi_setting), new DialogInterface.OnClickListener() {
             AlertDialog.Builder negativeButton = new AlertDialog.Builder(this).setTitle(C1113R.string.str_error_wifi_connecting_failed).setPositiveButton(getString(C1113R.string.str_goto_wifi_setting), new DialogInterface.OnClickListener() {
@@ -345,14 +345,14 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
 
 
     protected void interruptConnecting() {
     protected void interruptConnecting() {
         super.interruptConnecting();
         super.interruptConnecting();
-        WiFiDirectBroadcastReceiver wiFiDirectBroadcastReceiver = this.p2pStateChangeReciever;
+        WiFiDirectBroadcastReceiver wiFiDirectBroadcastReceiver = p2pStateChangeReciever;
         if (wiFiDirectBroadcastReceiver != null) {
         if (wiFiDirectBroadcastReceiver != null) {
             try {
             try {
                 unregisterReceiver(wiFiDirectBroadcastReceiver);
                 unregisterReceiver(wiFiDirectBroadcastReceiver);
             } catch (IllegalArgumentException e) {
             } catch (IllegalArgumentException e) {
                 e.printStackTrace();
                 e.printStackTrace();
             }
             }
-            this.p2pStateChangeReciever = null;
+            p2pStateChangeReciever = null;
         }
         }
     }
     }
 
 
@@ -365,7 +365,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
         }
         }
         if (!this.needInfo) {
         if (!this.needInfo) {
             closeWaitingDialog();
             closeWaitingDialog();
-            this.status = ActivityConnectBase.Status.IDLE;
+            status = ActivityConnectBase.Status.IDLE;
             setResult(-1);
             setResult(-1);
             setLastDetailResult(-1);
             setLastDetailResult(-1);
             finish();
             finish();
@@ -376,38 +376,38 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
         }
         }
         WifiP2pUtils.ConnectionInfo connectionInfo = WifiP2pUtils.getInstance(this).getConnectionInfo();
         WifiP2pUtils.ConnectionInfo connectionInfo = WifiP2pUtils.getInstance(this).getConnectionInfo();
         if (connectionInfo.isGroupOwnerThisDevice) {
         if (connectionInfo.isGroupOwnerThisDevice) {
-            this.expectedPrtMacAddr = WiFiControl.p2pAddr2PtrAddr(connectionInfo.p2PMacAdder, this.targetSsid);
+            expectedPrtMacAddr = WiFiControl.p2pAddr2PtrAddr(connectionInfo.p2PMacAdder, targetSsid);
         } else {
         } else {
-            this.expectedPrtMacAddr = WiFiControl.p2pAddr2PtrAddrP2P(connectionInfo.p2PMacAdder, this.targetSsid);
+            expectedPrtMacAddr = WiFiControl.p2pAddr2PtrAddrP2P(connectionInfo.p2PMacAdder, targetSsid);
         }
         }
-        this.status = ActivityConnectBase.Status.PRINTER_FINDING;
-        this.taskFindPrinter = new FindPrinterTask(mHandler, this.timeout, 1, 2);
-        this.taskFindPrinter.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
+        status = ActivityConnectBase.Status.PRINTER_FINDING;
+        taskFindPrinter = new FindPrinterTask(mHandler, timeout, 1, 2);
+        taskFindPrinter.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
     }
     }
 
 
     private void onError() {
     private void onError() {
         closeWaitingDialog();
         closeWaitingDialog();
         Toast.makeText(this, getString(C1113R.string.str_error_connecting_printer_short), 1).show();
         Toast.makeText(this, getString(C1113R.string.str_error_connecting_printer_short), 1).show();
         if (this.searchWiFiDirectPrinter != null) {
         if (this.searchWiFiDirectPrinter != null) {
-            this.searchWiFiDirectPrinter.interrupt();
-            this.searchWiFiDirectPrinter = null;
+            searchWiFiDirectPrinter.interrupt();
+            searchWiFiDirectPrinter = null;
         }
         }
         switch (this.status) {
         switch (this.status) {
             case WIFI_CONNECTING:
             case WIFI_CONNECTING:
                 if (this.p2pConnectConfig != null) {
                 if (this.p2pConnectConfig != null) {
                     interruptConnecting();
                     interruptConnecting();
                     if (mWiFiP2PManager != null) {
                     if (mWiFiP2PManager != null) {
-                        EPLog.m86d(TAG, "cancelConnect() " + this.targetSsid);
+                        EPLog.m86d(TAG, "cancelConnect() " + targetSsid);
                         mWiFiP2PManager.cancelConnect(this.p2pChannnel, (WifiP2pManager.ActionListener) null);
                         mWiFiP2PManager.cancelConnect(this.p2pChannnel, (WifiP2pManager.ActionListener) null);
-                        this.p2pConnectConfig = null;
+                        p2pConnectConfig = null;
                         break;
                         break;
                     }
                     }
                 }
                 }
                 break;
                 break;
             case PRINTER_FINDING:
             case PRINTER_FINDING:
                 if (this.taskFindPrinter != null) {
                 if (this.taskFindPrinter != null) {
-                    this.taskFindPrinter.cancel();
-                    this.taskFindPrinter = null;
+                    taskFindPrinter.cancel();
+                    taskFindPrinter = null;
                     break;
                     break;
                 }
                 }
                 break;
                 break;
@@ -433,7 +433,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
 
 
     private void setupObserver() {
     private void setupObserver() {
         super.setupObserver();
         super.setupObserver();
-        this.p2pStateChangeReciever = new WiFiDirectBroadcastReceiver();
+        p2pStateChangeReciever = new WiFiDirectBroadcastReceiver();
         registerReceiver(this.p2pStateChangeReciever, new IntentFilter("android.net.wifi.p2p.CONNECTION_STATE_CHANGE"));
         registerReceiver(this.p2pStateChangeReciever, new IntentFilter("android.net.wifi.p2p.CONNECTION_STATE_CHANGE"));
     }
     }
 
 

+ 20 - 20
app/src/main/java/epson/common/wifidirect/ActivityConnectSimpleAP.java

@@ -161,15 +161,15 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
         mModelDialog.doShow(IDD_WIFI_WAITING);
         mModelDialog.doShow(IDD_WIFI_WAITING);
         Bundle extras = getIntent().getExtras();
         Bundle extras = getIntent().getExtras();
         if (extras != null) {
         if (extras != null) {
-            this.targetSsid = extras.getString(ActivityConnectBase.APNAME);
-            this.targetPass = extras.getString(ActivityConnectBase.APPASS);
-            this.showErrorDlg = extras.getBoolean(ActivityConnectBase.SHOWERROR, false);
-            this.showConnectedTip = extras.getBoolean(ActivityConnectBase.SHOWTIP, true);
-            this.createSimpleAP = extras.getBoolean(ActivityConnectBase.CREATE, false);
-            this.needInfo = extras.getBoolean(ActivityConnectBase.NEEDINFO, false);
-            this.timeout = extras.getInt(ActivityConnectBase.TIMEOUT, 30);
+            targetSsid = extras.getString(ActivityConnectBase.APNAME);
+            targetPass = extras.getString(ActivityConnectBase.APPASS);
+            showErrorDlg = extras.getBoolean(ActivityConnectBase.SHOWERROR, false);
+            showConnectedTip = extras.getBoolean(ActivityConnectBase.SHOWTIP, true);
+            createSimpleAP = extras.getBoolean(ActivityConnectBase.CREATE, false);
+            needInfo = extras.getBoolean(ActivityConnectBase.NEEDINFO, false);
+            timeout = extras.getInt(ActivityConnectBase.TIMEOUT, 30);
         }
         }
-        EPLog.m88i(TAG, "Starting connect :" + this.targetSsid + " timeout = " + this.timeout);
+        EPLog.m88i(TAG, "Starting connect :" + targetSsid + " timeout = " + timeout);
         mHandler.sendEmptyMessage(11);
         mHandler.sendEmptyMessage(11);
     }
     }
 
 
@@ -197,17 +197,17 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
             setResult(0);
             setResult(0);
             setLastDetailResult(1);
             setLastDetailResult(1);
             finish();
             finish();
-        } else if (!this.searchWiFiDirectPrinter.start(1, mHandler, 0, this.timeout)) {
+        } else if (!this.searchWiFiDirectPrinter.start(1, mHandler, 0, timeout)) {
             onError();
             onError();
         } else {
         } else {
-            this.status = ActivityConnectBase.Status.WIFI_SCANNING;
+            status = ActivityConnectBase.Status.WIFI_SCANNING;
         }
         }
     }
     }
 
 
     protected void onEnabledWifi() {
     protected void onEnabledWifi() {
         if (this.targetSsid.equals(WiFiUtils.getInstance(this).getCurSSID())) {
         if (this.targetSsid.equals(WiFiUtils.getInstance(this).getCurSSID())) {
             EPLog.m86d(TAG, "Already Connected!!");
             EPLog.m86d(TAG, "Already Connected!!");
-            this.status = ActivityConnectBase.Status.WIFI_CONNECTING;
+            status = ActivityConnectBase.Status.WIFI_CONNECTING;
             mHandler.sendEmptyMessage(10);
             mHandler.sendEmptyMessage(10);
             return;
             return;
         }
         }
@@ -215,12 +215,12 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
             WifiP2pUtils.getInstance(this).disconnect();
             WifiP2pUtils.getInstance(this).disconnect();
         }
         }
         if (this.createSimpleAP) {
         if (this.createSimpleAP) {
-            this.connectingNetworkId = WiFiUtils.getInstance(this).createSimpleAP(this.targetSsid, this.targetPass);
+            connectingNetworkId = WiFiUtils.getInstance(this).createSimpleAP(this.targetSsid, targetPass);
             if (this.connectingNetworkId == -1) {
             if (this.connectingNetworkId == -1) {
                 mModelDialog.doShow(IDD_WIFI_PROFILE_FAILED);
                 mModelDialog.doShow(IDD_WIFI_PROFILE_FAILED);
                 return;
                 return;
             }
             }
-            this.status = ActivityConnectBase.Status.WIFI_CONNECTING;
+            status = ActivityConnectBase.Status.WIFI_CONNECTING;
             setupObserver();
             setupObserver();
             return;
             return;
         }
         }
@@ -367,14 +367,14 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
 
 
     protected void interruptConnecting() {
     protected void interruptConnecting() {
         super.interruptConnecting();
         super.interruptConnecting();
-        NetworkStateChangeReciever networkStateChangeReciever2 = this.networkStateChangeReciever;
+        NetworkStateChangeReciever networkStateChangeReciever2 = networkStateChangeReciever;
         if (networkStateChangeReciever2 != null) {
         if (networkStateChangeReciever2 != null) {
             try {
             try {
                 unregisterReceiver(networkStateChangeReciever2);
                 unregisterReceiver(networkStateChangeReciever2);
             } catch (IllegalArgumentException e) {
             } catch (IllegalArgumentException e) {
                 e.printStackTrace();
                 e.printStackTrace();
             }
             }
-            this.networkStateChangeReciever = null;
+            networkStateChangeReciever = null;
         }
         }
     }
     }
 
 
@@ -418,13 +418,13 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
         closeWaitingDialog();
         closeWaitingDialog();
         Toast.makeText(this, getString(C1113R.string.str_error_connecting_printer_short), 1).show();
         Toast.makeText(this, getString(C1113R.string.str_error_connecting_printer_short), 1).show();
         if (this.searchWiFiDirectPrinter != null) {
         if (this.searchWiFiDirectPrinter != null) {
-            this.searchWiFiDirectPrinter.interrupt();
-            this.searchWiFiDirectPrinter = null;
+            searchWiFiDirectPrinter.interrupt();
+            searchWiFiDirectPrinter = null;
         }
         }
-        if (this.status == ActivityConnectBase.Status.WIFI_CONNECTING && this.connectingNetworkId != -1) {
+        if (this.status == ActivityConnectBase.Status.WIFI_CONNECTING && connectingNetworkId != -1) {
             interruptConnecting();
             interruptConnecting();
             WiFiUtils.getInstance(this).removeNetwork(this.connectingNetworkId);
             WiFiUtils.getInstance(this).removeNetwork(this.connectingNetworkId);
-            this.connectingNetworkId = -1;
+            connectingNetworkId = -1;
             WiFiUtils.getInstance(this).reConnectNetwork();
             WiFiUtils.getInstance(this).reConnectNetwork();
             if (this.showErrorDlg) {
             if (this.showErrorDlg) {
                 mModelDialog.doShow(IDD_WIFI_ERROR);
                 mModelDialog.doShow(IDD_WIFI_ERROR);
@@ -496,7 +496,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
 
 
     private void setupObserver() {
     private void setupObserver() {
         super.setupObserver();
         super.setupObserver();
-        this.networkStateChangeReciever = new NetworkStateChangeReciever();
+        networkStateChangeReciever = new NetworkStateChangeReciever();
         registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.STATE_CHANGE"));
         registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.STATE_CHANGE"));
         registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.WIFI_STATE_CHANGED"));
         registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.WIFI_STATE_CHANGED"));
         registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.supplicant.STATE_CHANGE"));
         registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.supplicant.STATE_CHANGE"));

+ 8 - 8
app/src/main/java/epson/common/wifidirect/ActivityControlWiFi.java

@@ -36,8 +36,8 @@ public class ActivityControlWiFi extends Activity {
         requestWindowFeature(1);
         requestWindowFeature(1);
         Bundle extras = getIntent().getExtras();
         Bundle extras = getIntent().getExtras();
         if (extras != null) {
         if (extras != null) {
-            this.showProgress = extras.getBoolean(SHOWPROGRESS, false);
-            this.showWifiSettings = extras.getBoolean(SHOWWIFISETTINGS, false);
+            showProgress = extras.getBoolean(SHOWPROGRESS, false);
+            showWifiSettings = extras.getBoolean(SHOWWIFISETTINGS, false);
         }
         }
         if (this.showProgress) {
         if (this.showProgress) {
             setContentView(C1113R.layout.progress);
             setContentView(C1113R.layout.progress);
@@ -86,9 +86,9 @@ public class ActivityControlWiFi extends Activity {
         if (this.networkStateChangeReciever != null) {
         if (this.networkStateChangeReciever != null) {
             EPLog.m86d(TAG, "unregisterReceiver()");
             EPLog.m86d(TAG, "unregisterReceiver()");
             unregisterReceiver(this.networkStateChangeReciever);
             unregisterReceiver(this.networkStateChangeReciever);
-            this.networkStateChangeReciever = null;
+            networkStateChangeReciever = null;
         }
         }
-        this.scannigObserver.interrunpt();
+        scannigObserver.interrunpt();
     }
     }
 
 
     protected Dialog onCreateDialog(int i) {
     protected Dialog onCreateDialog(int i) {
@@ -123,7 +123,7 @@ public class ActivityControlWiFi extends Activity {
     private void registerReciever() {
     private void registerReciever() {
         if (this.networkStateChangeReciever == null) {
         if (this.networkStateChangeReciever == null) {
             EPLog.m86d(TAG, "registerReceiver()");
             EPLog.m86d(TAG, "registerReceiver()");
-            this.networkStateChangeReciever = new NetworkStateChangeReciever();
+            networkStateChangeReciever = new NetworkStateChangeReciever();
             registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.STATE_CHANGE"));
             registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.STATE_CHANGE"));
             registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.WIFI_STATE_CHANGED"));
             registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.WIFI_STATE_CHANGED"));
             registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.supplicant.STATE_CHANGE"));
             registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.supplicant.STATE_CHANGE"));
@@ -264,7 +264,7 @@ public class ActivityControlWiFi extends Activity {
         private void start() {
         private void start() {
             interrunpt();
             interrunpt();
             EPLog.m86d(ActivityControlWiFi.TAG, "Start ScanningObserver");
             EPLog.m86d(ActivityControlWiFi.TAG, "Start ScanningObserver");
-            this.observerTask = new AsyncTask<Void, Void, Void>() {
+            observerTask = new AsyncTask<Void, Void, Void>() {
                 protected Void doInBackground(Void... voidArr) {
                 protected Void doInBackground(Void... voidArr) {
                     int i = 0;
                     int i = 0;
                     while (i < 10000) {
                     while (i < 10000) {
@@ -290,10 +290,10 @@ public class ActivityControlWiFi extends Activity {
         }
         }
 
 
         private void interrunpt() {
         private void interrunpt() {
-            AsyncTask<Void, Void, Void> asyncTask = this.observerTask;
+            AsyncTask<Void, Void, Void> asyncTask = observerTask;
             if (asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING && !this.observerTask.isCancelled()) {
             if (asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING && !this.observerTask.isCancelled()) {
                 EPLog.m86d(ActivityControlWiFi.TAG, "Stop ScanningObserver");
                 EPLog.m86d(ActivityControlWiFi.TAG, "Stop ScanningObserver");
-                this.observerTask.cancel(false);
+                observerTask.cancel(false);
             }
             }
         }
         }
     }
     }

+ 2 - 2
app/src/main/java/epson/common/wifidirect/ActivityRequestLocationPermission.java

@@ -65,7 +65,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
             requestWindowFeature(1);
             requestWindowFeature(1);
             if (isNeedLocationPermission(this)) {
             if (isNeedLocationPermission(this)) {
                 if (!hasLocationPermission(this)) {
                 if (!hasLocationPermission(this)) {
-                    this.requestPermission = getNeededPermissionString(this);
+                    requestPermission = getNeededPermissionString(this);
                     final boolean z = getPreferences(0).getBoolean(DONOTASKAGAIN, false);
                     final boolean z = getPreferences(0).getBoolean(DONOTASKAGAIN, false);
                     new AlertDialog.Builder(this).setCustomTitle(getTitleLayout(this, C1113R.string.str_need_location_setting_title)).setMessage(C1113R.string.str_need_location_permission).setPositiveButton(C1113R.string.str_next, new DialogInterface.OnClickListener() {
                     new AlertDialog.Builder(this).setCustomTitle(getTitleLayout(this, C1113R.string.str_need_location_setting_title)).setMessage(C1113R.string.str_need_location_permission).setPositiveButton(C1113R.string.str_next, new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
                         public void onClick(DialogInterface dialogInterface, int i) {
@@ -141,7 +141,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
                 if (!this.requestPermission.equals(strArr[i2]) || iArr[i2] != 0) {
                 if (!this.requestPermission.equals(strArr[i2]) || iArr[i2] != 0) {
                     i2++;
                     i2++;
                 } else {
                 } else {
-                    EPLog.m86d(TAG, "PERMISSION_GRANTED " + this.requestPermission);
+                    EPLog.m86d(TAG, "PERMISSION_GRANTED " + requestPermission);
                     mHandler.sendEmptyMessage(1);
                     mHandler.sendEmptyMessage(1);
                     return;
                     return;
                 }
                 }

+ 3 - 3
app/src/main/java/epson/common/wifidirect/ActivityWiFiDirectBase.java

@@ -19,8 +19,8 @@ public abstract class ActivityWiFiDirectBase extends ActivityIACommon {
 
 
     private void setupCommonHeaderControl(boolean z, boolean z2) {
     private void setupCommonHeaderControl(boolean z, boolean z2) {
         setActionBar((int) R.string.str_wifidirect_settings, z);
         setActionBar((int) R.string.str_wifidirect_settings, z);
-        this.bDisplayHomeAsUpEnabled = z;
-        this.bSupportCancel = z2;
+        bDisplayHomeAsUpEnabled = z;
+        bSupportCancel = z2;
     }
     }
 
 
     protected void onActivityResult(int i, int i2, Intent intent) {
     protected void onActivityResult(int i, int i2, Intent intent) {
@@ -73,7 +73,7 @@ public abstract class ActivityWiFiDirectBase extends ActivityIACommon {
     }
     }
 
 
     protected void setDisplayMenu(boolean z) {
     protected void setDisplayMenu(boolean z) {
-        this.bSupportCancel = z;
+        bSupportCancel = z;
         invalidateOptionsMenu();
         invalidateOptionsMenu();
     }
     }
 }
 }

+ 6 - 6
app/src/main/java/epson/common/wifidirect/ActivityWiFiDirectManual.java

@@ -79,8 +79,8 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.wifidirect_manual, (ViewGroup) null);
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.wifidirect_manual, (ViewGroup) null);
         setContentView((View) viewGroup);
         setContentView((View) viewGroup);
         setupCommonHeaderControl(true, true);
         setupCommonHeaderControl(true, true);
-        this.viewWiFiSettings = viewGroup.findViewById(R.id.rlWifiSettings);
-        this.viewWiFiSettings.setOnClickListener(new View.OnClickListener() {
+        viewWiFiSettings = viewGroup.findViewById(R.id.rlWifiSettings);
+        viewWiFiSettings.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
             public void onClick(View view) {
                 Intent intent = new Intent(ActivityWiFiDirectManual.this, ActivityControlWiFi.class);
                 Intent intent = new Intent(ActivityWiFiDirectManual.this, ActivityControlWiFi.class);
                 intent.putExtra(ActivityControlWiFi.SHOWPROGRESS, true);
                 intent.putExtra(ActivityControlWiFi.SHOWPROGRESS, true);
@@ -138,8 +138,8 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
                 if (WiFiDirectManager.isSimpleAP(this)) {
                 if (WiFiDirectManager.isSimpleAP(this)) {
                     ManageDefaultNetwork.getInstance(this).setDefaultNetworkSimpleAp();
                     ManageDefaultNetwork.getInstance(this).setDefaultNetworkSimpleAp();
                     mModelDialog.doShow(IDD_WIFI_WAITING);
                     mModelDialog.doShow(IDD_WIFI_WAITING);
-                    this.taskFindPrinter = new FindPrinterTask(mHandler, 30, 1, 2);
-                    this.taskFindPrinter.execute(new Void[0]);
+                    taskFindPrinter = new FindPrinterTask(mHandler, 30, 1, 2);
+                    taskFindPrinter.execute(new Void[0]);
                     return;
                     return;
                 }
                 }
                 return;
                 return;
@@ -155,10 +155,10 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
     }
     }
 
 
     private void interruptFindingPrinter() {
     private void interruptFindingPrinter() {
-        FindPrinterTask findPrinterTask = this.taskFindPrinter;
+        FindPrinterTask findPrinterTask = taskFindPrinter;
         if (findPrinterTask != null) {
         if (findPrinterTask != null) {
             findPrinterTask.cancel();
             findPrinterTask.cancel();
-            this.taskFindPrinter = null;
+            taskFindPrinter = null;
         }
         }
     }
     }
 
 

+ 2 - 2
app/src/main/java/epson/common/wifidirect/ActivityWiFiDirectStart.java

@@ -14,8 +14,8 @@ public class ActivityWiFiDirectStart extends ActivityWiFiDirectBase {
         super.onCreate(bundle);
         super.onCreate(bundle);
         setContentView((int) R.layout.wifidirect_start);
         setContentView((int) R.layout.wifidirect_start);
         setupCommonHeaderControl(false, true);
         setupCommonHeaderControl(false, true);
-        this.viewiPrintConnect = ((ViewGroup) findViewById(R.id.wifi_start_top)).findViewById(R.id.iprint_connect);
-        this.viewiPrintConnect.setOnClickListener(new View.OnClickListener() {
+        viewiPrintConnect = ((ViewGroup) findViewById(R.id.wifi_start_top)).findViewById(R.id.iprint_connect);
+        viewiPrintConnect.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
             public void onClick(View view) {
                 Intent intent = new Intent(ActivityWiFiDirectStart.this, ActivityControlWiFi.class);
                 Intent intent = new Intent(ActivityWiFiDirectStart.this, ActivityControlWiFi.class);
                 intent.putExtra(ActivityControlWiFi.SHOWPROGRESS, true);
                 intent.putExtra(ActivityControlWiFi.SHOWPROGRESS, true);

+ 53 - 53
app/src/main/java/epson/common/wifidirect/ActivityiPrintConnect.java

@@ -66,20 +66,20 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
     protected void onCreate(Bundle bundle) {
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         super.onCreate(bundle);
         mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
         mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
-        this.wiFiUtils = WiFiUtils.getInstance(this);
+        wiFiUtils = WiFiUtils.getInstance(this);
         if (engineId == null) {
         if (engineId == null) {
             engineId = getEngineId();
             engineId = getEngineId();
         }
         }
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.iprintconnect, (ViewGroup) null);
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.iprintconnect, (ViewGroup) null);
         setContentView((View) viewGroup);
         setContentView((View) viewGroup);
         setupCommonHeaderControl(false, false);
         setupCommonHeaderControl(false, false);
-        this.toolbar = (ViewGroup) viewGroup.findViewById(R.id.toolbar);
-        this.btnFinish = (Button) viewGroup.findViewById(R.id.btn_finish);
-        this.textView1 = (TextView) viewGroup.findViewById(R.id.textView1);
-        this.textView2 = (TextView) viewGroup.findViewById(R.id.textView2);
-        this.textView3 = (TextView) viewGroup.findViewById(R.id.textView3);
-        this.progress = (ProgressBar) viewGroup.findViewById(R.id.progressBarGetConnectStrings);
-        this.btnFinish.setOnClickListener(new View.OnClickListener() {
+        toolbar = (ViewGroup) viewGroup.findViewById(R.id.toolbar);
+        btnFinish = (Button) viewGroup.findViewById(R.id.btn_finish);
+        textView1 = (TextView) viewGroup.findViewById(R.id.textView1);
+        textView2 = (TextView) viewGroup.findViewById(R.id.textView2);
+        textView3 = (TextView) viewGroup.findViewById(R.id.textView3);
+        progress = (ProgressBar) viewGroup.findViewById(R.id.progressBarGetConnectStrings);
+        btnFinish.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
             public void onClick(View view) {
                 ActivityiPrintConnect.this.onFinishPressed();
                 ActivityiPrintConnect.this.onFinishPressed();
             }
             }
@@ -88,10 +88,10 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
     }
     }
 
 
     public void onFinishPressed() {
     public void onFinishPressed() {
-        Intent intent = this.intentResult;
+        Intent intent = intentResult;
         if (intent != null) {
         if (intent != null) {
             setResult(-1, intent);
             setResult(-1, intent);
-            this.isKeepSimpleAPConnection = true;
+            isKeepSimpleAPConnection = true;
         } else {
         } else {
             setResult(0);
             setResult(0);
         }
         }
@@ -104,19 +104,19 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
     }
     }
 
 
     private void disconnectRealAp() {
     private void disconnectRealAp() {
-        this.status = Status.CONNECT_ERROR;
-        WiFiUtils wiFiUtils2 = this.wiFiUtils;
+        status = Status.CONNECT_ERROR;
+        WiFiUtils wiFiUtils2 = wiFiUtils;
         wiFiUtils2.removeSimpleAP(wiFiUtils2.getNetworkId(this.settingsRealAp.ssid));
         wiFiUtils2.removeSimpleAP(wiFiUtils2.getNetworkId(this.settingsRealAp.ssid));
     }
     }
 
 
     protected void onResume() {
     protected void onResume() {
         super.onResume();
         super.onResume();
-        this.isKeepSimpleAPConnection = false;
+        isKeepSimpleAPConnection = false;
         switch (this.status) {
         switch (this.status) {
             case IDLE:
             case IDLE:
                 setDisplayMenu(false);
                 setDisplayMenu(false);
-                this.toolbar.setVisibility(8);
-                this.status = Status.CONNECTING_TEMPAP;
+                toolbar.setVisibility(8);
+                status = Status.CONNECTING_TEMPAP;
                 startConnectTempAp();
                 startConnectTempAp();
                 return;
                 return;
             case CONNECTED:
             case CONNECTED:
@@ -138,67 +138,67 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
         super.onPause();
         super.onPause();
         if (this.status == Status.GETTING_GONNECTSTRINGS) {
         if (this.status == Status.GETTING_GONNECTSTRINGS) {
             EPLog.m86d(TAG, "interruputGetConnectSttings()");
             EPLog.m86d(TAG, "interruputGetConnectSttings()");
-            this.status = Status.CONNECT_ERROR;
-            AsyncTask<Void, Void, Boolean> asyncTask = this.taskGetConnectStrings;
+            status = Status.CONNECT_ERROR;
+            AsyncTask<Void, Void, Boolean> asyncTask = taskGetConnectStrings;
             if (asyncTask != null) {
             if (asyncTask != null) {
                 asyncTask.cancel(true);
                 asyncTask.cancel(true);
-                this.taskGetConnectStrings = null;
+                taskGetConnectStrings = null;
             }
             }
         }
         }
-        WiFiUtils wiFiUtils2 = this.wiFiUtils;
+        WiFiUtils wiFiUtils2 = wiFiUtils;
         wiFiUtils2.removeSimpleAP(wiFiUtils2.getNetworkId(this.settingsTempAp.ssid));
         wiFiUtils2.removeSimpleAP(wiFiUtils2.getNetworkId(this.settingsTempAp.ssid));
-        if (!this.isKeepSimpleAPConnection && this.settingsRealAp.ssid != null) {
+        if (!this.isKeepSimpleAPConnection && settingsRealAp.ssid != null) {
             disconnectRealAp();
             disconnectRealAp();
         }
         }
     }
     }
 
 
     private void registBroadcastReciever() {
     private void registBroadcastReciever() {
         if (this.networkStateChangeReciever == null) {
         if (this.networkStateChangeReciever == null) {
-            this.networkStateChangeReciever = new NetworkStateChangeReciever();
+            networkStateChangeReciever = new NetworkStateChangeReciever();
             registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.SCAN_RESULTS"));
             registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.SCAN_RESULTS"));
         }
         }
     }
     }
 
 
     private void unRegistBroadcastReciever() {
     private void unRegistBroadcastReciever() {
-        NetworkStateChangeReciever networkStateChangeReciever2 = this.networkStateChangeReciever;
+        NetworkStateChangeReciever networkStateChangeReciever2 = networkStateChangeReciever;
         if (networkStateChangeReciever2 != null) {
         if (networkStateChangeReciever2 != null) {
             unregisterReceiver(networkStateChangeReciever2);
             unregisterReceiver(networkStateChangeReciever2);
-            this.networkStateChangeReciever = null;
+            networkStateChangeReciever = null;
         }
         }
     }
     }
 
 
     protected void onActivityResult(int i, int i2, Intent intent) {
     protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         super.onActivityResult(i, i2, intent);
-        String ssid = this.wiFiUtils.getSSID(this.wiFiUtils.getCurNetworkId());
+        String ssid = wiFiUtils.getSSID(this.wiFiUtils.getCurNetworkId());
         switch (i) {
         switch (i) {
             case 1:
             case 1:
                 if (i2 != -1) {
                 if (i2 != -1) {
-                    this.status = Status.CONNECT_ERROR;
+                    status = Status.CONNECT_ERROR;
                     return;
                     return;
                 } else if (this.settingsTempAp.ssid.equals(ssid)) {
                 } else if (this.settingsTempAp.ssid.equals(ssid)) {
                     startConnectRealAp();
                     startConnectRealAp();
                     return;
                     return;
                 } else if (ssid != null) {
                 } else if (ssid != null) {
-                    this.status = Status.CONNECTED_OTHERAP;
+                    status = Status.CONNECTED_OTHERAP;
                     return;
                     return;
                 } else {
                 } else {
-                    this.status = Status.CONNECT_ERROR;
+                    status = Status.CONNECT_ERROR;
                     return;
                     return;
                 }
                 }
             case 2:
             case 2:
                 if (i2 != -1) {
                 if (i2 != -1) {
-                    this.status = Status.CONNECT_ERROR;
+                    status = Status.CONNECT_ERROR;
                     return;
                     return;
                 } else if (this.settingsRealAp.ssid.equals(ssid)) {
                 } else if (this.settingsRealAp.ssid.equals(ssid)) {
-                    this.intentResult = intent;
-                    this.intentResult.putExtra(FINISH_EAYSETUP, true);
-                    this.status = Status.CONNECTED;
+                    intentResult = intent;
+                    intentResult.putExtra(FINISH_EAYSETUP, true);
+                    status = Status.CONNECTED;
                     return;
                     return;
                 } else if (ssid != null) {
                 } else if (ssid != null) {
-                    this.status = Status.CONNECTED_OTHERAP;
+                    status = Status.CONNECTED_OTHERAP;
                     return;
                     return;
                 } else {
                 } else {
-                    this.status = Status.CONNECT_ERROR;
+                    status = Status.CONNECT_ERROR;
                     return;
                     return;
                 }
                 }
             default:
             default:
@@ -208,42 +208,42 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
 
 
     private void onConnectSimpleAP() {
     private void onConnectSimpleAP() {
         EPLog.m86d(TAG, "onConnectSimpleAP()");
         EPLog.m86d(TAG, "onConnectSimpleAP()");
-        this.toolbar.setVisibility(0);
-        this.progress.setVisibility(8);
+        toolbar.setVisibility(0);
+        progress.setVisibility(8);
         setDisplayMenu(true);
         setDisplayMenu(true);
-        this.textView1.setText(getResources().getString(R.string.str_connected_printer1));
-        TextView textView = this.textView2;
+        textView1.setText(getResources().getString(R.string.str_connected_printer1));
+        TextView textView = textView2;
         Resources resources = getResources();
         Resources resources = getResources();
-        WiFiUtils wiFiUtils2 = this.wiFiUtils;
+        WiFiUtils wiFiUtils2 = wiFiUtils;
         textView.setText(resources.getString(R.string.str_connected_printer2, new Object[]{this.intentResult.getStringExtra("name"), wiFiUtils2.getSSID(wiFiUtils2.getCurNetworkId())}));
         textView.setText(resources.getString(R.string.str_connected_printer2, new Object[]{this.intentResult.getStringExtra("name"), wiFiUtils2.getSSID(wiFiUtils2.getCurNetworkId())}));
-        this.textView3.setText(getResources().getString(R.string.str_connected_printer3));
+        textView3.setText(getResources().getString(R.string.str_connected_printer3));
     }
     }
 
 
     private void onConnectOtherAP() {
     private void onConnectOtherAP() {
         EPLog.m86d(TAG, "onConnectOtherAP()");
         EPLog.m86d(TAG, "onConnectOtherAP()");
-        this.toolbar.setVisibility(8);
-        this.progress.setVisibility(8);
+        toolbar.setVisibility(8);
+        progress.setVisibility(8);
         setDisplayMenu(true);
         setDisplayMenu(true);
-        this.textView1.setText(getResources().getString(R.string.str_connected_otherAP1));
-        this.textView2.setText(getResources().getString(R.string.str_connected_otherAP2));
-        this.textView3.setText(getResources().getString(R.string.str_connected_otherAP3));
+        textView1.setText(getResources().getString(R.string.str_connected_otherAP1));
+        textView2.setText(getResources().getString(R.string.str_connected_otherAP2));
+        textView3.setText(getResources().getString(R.string.str_connected_otherAP3));
     }
     }
 
 
     private void onConnectError() {
     private void onConnectError() {
         EPLog.m86d(TAG, "onConnectError()");
         EPLog.m86d(TAG, "onConnectError()");
-        this.toolbar.setVisibility(8);
-        this.progress.setVisibility(8);
+        toolbar.setVisibility(8);
+        progress.setVisibility(8);
         setDisplayMenu(true);
         setDisplayMenu(true);
-        this.textView1.setText(getResources().getString(R.string.str_connect_error1));
-        this.textView2.setText(getResources().getString(R.string.str_connect_error2));
-        this.textView3.setText(getResources().getString(R.string.str_connect_error3));
+        textView1.setText(getResources().getString(R.string.str_connect_error1));
+        textView2.setText(getResources().getString(R.string.str_connect_error2));
+        textView3.setText(getResources().getString(R.string.str_connect_error3));
     }
     }
 
 
     private void startConnectTempAp() {
     private void startConnectTempAp() {
         EPLog.m86d(TAG, "startConnectTempAp()");
         EPLog.m86d(TAG, "startConnectTempAp()");
         Intent intent = new Intent(this, ActivityConnectSimpleAP.class);
         Intent intent = new Intent(this, ActivityConnectSimpleAP.class);
-        intent.putExtra(ActivityConnectBase.APNAME, this.settingsTempAp.ssid);
-        intent.putExtra(ActivityConnectBase.APPASS, this.settingsTempAp.password);
+        intent.putExtra(ActivityConnectBase.APNAME, settingsTempAp.ssid);
+        intent.putExtra(ActivityConnectBase.APPASS, settingsTempAp.password);
         intent.putExtra(ActivityConnectBase.CREATE, true);
         intent.putExtra(ActivityConnectBase.CREATE, true);
         intent.putExtra(ActivityConnectBase.SHOWERROR, false);
         intent.putExtra(ActivityConnectBase.SHOWERROR, false);
         intent.putExtra(ActivityConnectBase.SHOWTIP, false);
         intent.putExtra(ActivityConnectBase.SHOWTIP, false);
@@ -254,7 +254,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
 
 
     private void startConnectRealAp() {
     private void startConnectRealAp() {
         EPLog.m86d(TAG, "startConnectRealAp()");
         EPLog.m86d(TAG, "startConnectRealAp()");
-        this.taskGetConnectStrings = new AsyncTask<Void, Void, Boolean>() {
+        taskGetConnectStrings = new AsyncTask<Void, Void, Boolean>() {
             protected void onPreExecute() {
             protected void onPreExecute() {
                 ActivityiPrintConnect.this.getWindow().addFlags(128);
                 ActivityiPrintConnect.this.getWindow().addFlags(128);
                 Status unused = ActivityiPrintConnect.this.status = Status.GETTING_GONNECTSTRINGS;
                 Status unused = ActivityiPrintConnect.this.status = Status.GETTING_GONNECTSTRINGS;
@@ -378,7 +378,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
                 if (this.settingsRealAp.ssid.equals(WiFiUtils.removeQuotationsInSSID(scanResult.SSID))) {
                 if (this.settingsRealAp.ssid.equals(WiFiUtils.removeQuotationsInSSID(scanResult.SSID))) {
                     EPLog.m86d(TAG, "Found AP");
                     EPLog.m86d(TAG, "Found AP");
                     synchronized (this.waitRealAp) {
                     synchronized (this.waitRealAp) {
-                        this.waitRealAp.notify();
+                        waitRealAp.notify();
                     }
                     }
                     return;
                     return;
                 }
                 }

+ 8 - 8
app/src/main/java/epson/common/wifidirect/ActivityiPrintConnectStart.java

@@ -31,8 +31,8 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.iprintconnect_start, (ViewGroup) null);
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.iprintconnect_start, (ViewGroup) null);
         setContentView((View) viewGroup);
         setContentView((View) viewGroup);
         setupCommonHeaderControl(true, true);
         setupCommonHeaderControl(true, true);
-        this.btnNext = (Button) viewGroup.findViewById(R.id.btn_next);
-        this.btnNext.setOnClickListener(new View.OnClickListener() {
+        btnNext = (Button) viewGroup.findViewById(R.id.btn_next);
+        btnNext.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
             public void onClick(View view) {
                 ActivityiPrintConnectStart.this.startActivityForResult(new Intent(ActivityiPrintConnectStart.this, ActivityiPrintConnect.class), 10);
                 ActivityiPrintConnectStart.this.startActivityForResult(new Intent(ActivityiPrintConnectStart.this, ActivityiPrintConnect.class), 10);
             }
             }
@@ -51,23 +51,23 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
             finish();
             finish();
             return;
             return;
         }
         }
-        this.bFirstScanResultAvailable = true;
+        bFirstScanResultAvailable = true;
         mWifiManager.startScan();
         mWifiManager.startScan();
     }
     }
 
 
     protected void onResume() {
     protected void onResume() {
         super.onResume();
         super.onResume();
-        this.networkStateChangeReciever = new NetworkStateChangeReciever();
+        networkStateChangeReciever = new NetworkStateChangeReciever();
         registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.SCAN_RESULTS"));
         registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.SCAN_RESULTS"));
         getWindow().addFlags(128);
         getWindow().addFlags(128);
     }
     }
 
 
     protected void onPause() {
     protected void onPause() {
         super.onPause();
         super.onPause();
-        NetworkStateChangeReciever networkStateChangeReciever2 = this.networkStateChangeReciever;
+        NetworkStateChangeReciever networkStateChangeReciever2 = networkStateChangeReciever;
         if (networkStateChangeReciever2 != null) {
         if (networkStateChangeReciever2 != null) {
             unregisterReceiver(networkStateChangeReciever2);
             unregisterReceiver(networkStateChangeReciever2);
-            this.networkStateChangeReciever = null;
+            networkStateChangeReciever = null;
         }
         }
         getWindow().clearFlags(128);
         getWindow().clearFlags(128);
     }
     }
@@ -86,7 +86,7 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
     private void onScanResultAvailable() {
     private void onScanResultAvailable() {
         if (this.bFirstScanResultAvailable) {
         if (this.bFirstScanResultAvailable) {
             EPLog.m90w(TAG, "First onScanResultAvailable, ignore this");
             EPLog.m90w(TAG, "First onScanResultAvailable, ignore this");
-            this.bFirstScanResultAvailable = false;
+            bFirstScanResultAvailable = false;
         } else {
         } else {
             List<ScanResult> arrayList = new ArrayList<>();
             List<ScanResult> arrayList = new ArrayList<>();
             try {
             try {
@@ -98,7 +98,7 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
                 for (ScanResult scanResult : arrayList) {
                 for (ScanResult scanResult : arrayList) {
                     if (this.settingsTempAp.ssid.equals(WiFiUtils.removeQuotationsInSSID(scanResult.SSID))) {
                     if (this.settingsTempAp.ssid.equals(WiFiUtils.removeQuotationsInSSID(scanResult.SSID))) {
                         EPLog.m86d(TAG, "Found TempAP");
                         EPLog.m86d(TAG, "Found TempAP");
-                        this.btnNext.performClick();
+                        btnNext.performClick();
                         return;
                         return;
                     }
                     }
                 }
                 }

+ 2 - 2
app/src/main/java/epson/common/wifidirect/EventWrapperWiFiDirect.java

@@ -19,11 +19,11 @@ public class EventWrapperWiFiDirect<T> {
         if (this.handled) {
         if (this.handled) {
             return null;
             return null;
         }
         }
-        this.handled = true;
+        handled = true;
         return mContent;
         return mContent;
     }
     }
 
 
     public boolean hasBeenHandled() {
     public boolean hasBeenHandled() {
-        return this.handled;
+        return handled;
     }
     }
 }
 }

+ 8 - 8
app/src/main/java/epson/common/wifidirect/FindPrinterTask.java

@@ -13,15 +13,15 @@ class FindPrinterTask extends AsyncTask<Void, Void, Boolean> {
     int timeout;
     int timeout;
 
 
     FindPrinterTask(Handler handler2, int i, int i2, int i3) {
     FindPrinterTask(Handler handler2, int i, int i2, int i3) {
-        this.handler = handler2;
-        this.timeout = i;
-        this.idFound = i2;
-        this.idNotFound = i3;
+        handler = handler2;
+        timeout = i;
+        idFound = i2;
+        idNotFound = i3;
     }
     }
 
 
     protected void onPreExecute() {
     protected void onPreExecute() {
         super.onPreExecute();
         super.onPreExecute();
-        mEscprLib.setHanlder(this.handler, this.idFound);
+        mEscprLib.setHanlder(this.handler, idFound);
         mEscprLib.setSearchStt(true);
         mEscprLib.setSearchStt(true);
     }
     }
 
 
@@ -32,7 +32,7 @@ class FindPrinterTask extends AsyncTask<Void, Void, Boolean> {
             return true;
             return true;
         }
         }
         EPLog.m86d(TAG, "epsWrapperFindPrinter start");
         EPLog.m86d(TAG, "epsWrapperFindPrinter start");
-        int epsWrapperFindPrinter = mEscprLib.epsWrapperFindPrinter(192, this.timeout);
+        int epsWrapperFindPrinter = mEscprLib.epsWrapperFindPrinter(192, timeout);
         if (epsWrapperFindPrinter == 0 || epsWrapperFindPrinter == 42) {
         if (epsWrapperFindPrinter == 0 || epsWrapperFindPrinter == 42) {
             z = false;
             z = false;
         }
         }
@@ -43,13 +43,13 @@ class FindPrinterTask extends AsyncTask<Void, Void, Boolean> {
     protected void onPostExecute(Boolean bool) {
     protected void onPostExecute(Boolean bool) {
         if (bool.booleanValue() || !this.canceled) {
         if (bool.booleanValue() || !this.canceled) {
             EPLog.m86d(TAG, "epsWrapperFindPrinter = EPS_ERR_PRINTER_NOT_FOUND");
             EPLog.m86d(TAG, "epsWrapperFindPrinter = EPS_ERR_PRINTER_NOT_FOUND");
-            this.handler.sendEmptyMessage(this.idNotFound);
+            handler.sendEmptyMessage(this.idNotFound);
         }
         }
     }
     }
 
 
     public void cancel() {
     public void cancel() {
         mEscprLib.setSearchStt(false);
         mEscprLib.setSearchStt(false);
         mEscprLib.epsWrapperCancelFindPrinter();
         mEscprLib.epsWrapperCancelFindPrinter();
-        this.canceled = true;
+        canceled = true;
     }
     }
 }
 }

+ 4 - 4
app/src/main/java/epson/common/wifidirect/MacAddrFilter.java

@@ -17,8 +17,8 @@ public class MacAddrFilter {
         String start;
         String start;
 
 
         public MacAddressEntry(String str, String str2) {
         public MacAddressEntry(String str, String str2) {
-            this.start = str;
-            this.end = str2;
+            start = str;
+            end = str2;
         }
         }
 
 
         public boolean equals(Object obj) {
         public boolean equals(Object obj) {
@@ -50,9 +50,9 @@ public class MacAddrFilter {
         try {
         try {
             String p2pAddr2MacAddrStr = MacAddrUtils.p2pAddr2MacAddrStr(str);
             String p2pAddr2MacAddrStr = MacAddrUtils.p2pAddr2MacAddrStr(str);
             if (this.excludeMacAddressList == null) {
             if (this.excludeMacAddressList == null) {
-                this.excludeMacAddressList = readMacAddressTable(EXCLUDE_MACADDRESS_FILE);
+                excludeMacAddressList = readMacAddressTable(EXCLUDE_MACADDRESS_FILE);
             }
             }
-            Iterator<MacAddressEntry> it = this.excludeMacAddressList.iterator();
+            Iterator<MacAddressEntry> it = excludeMacAddressList.iterator();
             while (it.hasNext()) {
             while (it.hasNext()) {
                 MacAddressEntry next = it.next();
                 MacAddressEntry next = it.next();
                 if (next.start.compareTo(p2pAddr2MacAddrStr) <= 0 && next.end.compareTo(p2pAddr2MacAddrStr) >= 0) {
                 if (next.start.compareTo(p2pAddr2MacAddrStr) <= 0 && next.end.compareTo(p2pAddr2MacAddrStr) >= 0) {

+ 14 - 14
app/src/main/java/epson/common/wifidirect/ManageDefaultNetwork.java

@@ -35,8 +35,8 @@ public class ManageDefaultNetwork {
 
 
     private ManageDefaultNetwork(Context context) {
     private ManageDefaultNetwork(Context context) {
         mContext = context.getApplicationContext();
         mContext = context.getApplicationContext();
-        this.connectivityManager = (ConnectivityManager) mContext.getSystemService("connectivity");
-        this.wifiManager = (WifiManager) mContext.getSystemService("wifi");
+        connectivityManager = (ConnectivityManager) mContext.getSystemService("connectivity");
+        wifiManager = (WifiManager) mContext.getSystemService("wifi");
     }
     }
 
 
     public static ManageDefaultNetwork getInstance(Context context) {
     public static ManageDefaultNetwork getInstance(Context context) {
@@ -52,11 +52,11 @@ public class ManageDefaultNetwork {
         boolean z;
         boolean z;
         Network activeNetwork;
         Network activeNetwork;
         NetworkCapabilities networkCapabilities;
         NetworkCapabilities networkCapabilities;
-        this.canConnected = false;
+        canConnected = false;
         if (WiFiControl.isSimpleAP(str)) {
         if (WiFiControl.isSimpleAP(str)) {
             return false;
             return false;
         }
         }
-        if (Build.VERSION.SDK_INT < 23 || (activeNetwork = this.connectivityManager.getActiveNetwork()) == null || (networkCapabilities = this.connectivityManager.getNetworkCapabilities(activeNetwork)) == null || !networkCapabilities.hasTransport(0)) {
+        if (Build.VERSION.SDK_INT < 23 || (activeNetwork = connectivityManager.getActiveNetwork()) == null || (networkCapabilities = connectivityManager.getNetworkCapabilities(activeNetwork)) == null || !networkCapabilities.hasTransport(0)) {
             synchronized (this.lock) {
             synchronized (this.lock) {
                 EPLog.m86d(TAG, "Checking whether isOnline : " + str);
                 EPLog.m86d(TAG, "Checking whether isOnline : " + str);
                 new Thread(new Runnable() {
                 new Thread(new Runnable() {
@@ -88,11 +88,11 @@ public class ManageDefaultNetwork {
                     }
                     }
                 }).start();
                 }).start();
                 try {
                 try {
-                    this.lock.wait(10000);
+                    lock.wait(10000);
                 } catch (InterruptedException e) {
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                     e.printStackTrace();
                 }
                 }
-                z = this.canConnected;
+                z = canConnected;
             }
             }
             return z;
             return z;
         }
         }
@@ -108,8 +108,8 @@ public class ManageDefaultNetwork {
                 return;
                 return;
             }
             }
             if (!curSSID.equals(this.checkedSSID)) {
             if (!curSSID.equals(this.checkedSSID)) {
-                this.checkedSSID = curSSID;
-                this.isOnline = checkCurSSIDisOnline(curSSID);
+                checkedSSID = curSSID;
+                isOnline = checkCurSSIDisOnline(curSSID);
                 if (this.isOnline) {
                 if (this.isOnline) {
                     EPLog.m86d(TAG, curSSID + "is online.");
                     EPLog.m86d(TAG, curSSID + "is online.");
                     return;
                     return;
@@ -124,7 +124,7 @@ public class ManageDefaultNetwork {
                     return;
                     return;
                 }
                 }
             } else if (Build.VERSION.SDK_INT >= 21) {
             } else if (Build.VERSION.SDK_INT >= 21) {
-                ConnectivityManager connectivityManager2 = this.connectivityManager;
+                ConnectivityManager connectivityManager2 = connectivityManager;
                 if (ConnectivityManager.getProcessDefaultNetwork() != null) {
                 if (ConnectivityManager.getProcessDefaultNetwork() != null) {
                     EPLog.m86d(TAG, "Already setProcessDefaultNetwork called");
                     EPLog.m86d(TAG, "Already setProcessDefaultNetwork called");
                     return;
                     return;
@@ -139,7 +139,7 @@ public class ManageDefaultNetwork {
                 if (manageDefaultNetworkCallback == null) {
                 if (manageDefaultNetworkCallback == null) {
                     manageDefaultNetworkCallback = new ManageDefaultNetworkCallback();
                     manageDefaultNetworkCallback = new ManageDefaultNetworkCallback();
                 }
                 }
-                this.connectivityManager.requestNetwork(builder.build(), manageDefaultNetworkCallback);
+                connectivityManager.requestNetwork(builder.build(), manageDefaultNetworkCallback);
             } catch (SecurityException e) {
             } catch (SecurityException e) {
                 e.printStackTrace();
                 e.printStackTrace();
                 if (Build.VERSION.SDK_INT >= 23) {
                 if (Build.VERSION.SDK_INT >= 23) {
@@ -168,13 +168,13 @@ public class ManageDefaultNetwork {
         if (Build.VERSION.SDK_INT >= 23) {
         if (Build.VERSION.SDK_INT >= 23) {
             if (this.connectivityManager.getBoundNetworkForProcess() != null) {
             if (this.connectivityManager.getBoundNetworkForProcess() != null) {
                 EPLog.m86d(TAG, "resetProcessDefaultNetwork");
                 EPLog.m86d(TAG, "resetProcessDefaultNetwork");
-                this.connectivityManager.bindProcessToNetwork((Network) null);
+                connectivityManager.bindProcessToNetwork((Network) null);
             }
             }
         } else if (Build.VERSION.SDK_INT >= 21) {
         } else if (Build.VERSION.SDK_INT >= 21) {
-            ConnectivityManager connectivityManager2 = this.connectivityManager;
+            ConnectivityManager connectivityManager2 = connectivityManager;
             if (ConnectivityManager.getProcessDefaultNetwork() != null) {
             if (ConnectivityManager.getProcessDefaultNetwork() != null) {
                 EPLog.m86d(TAG, "resetProcessDefaultNetwork");
                 EPLog.m86d(TAG, "resetProcessDefaultNetwork");
-                ConnectivityManager connectivityManager3 = this.connectivityManager;
+                ConnectivityManager connectivityManager3 = connectivityManager;
                 ConnectivityManager.setProcessDefaultNetwork((Network) null);
                 ConnectivityManager.setProcessDefaultNetwork((Network) null);
             }
             }
         } else {
         } else {
@@ -182,7 +182,7 @@ public class ManageDefaultNetwork {
         }
         }
         try {
         try {
             if (manageDefaultNetworkCallback != null) {
             if (manageDefaultNetworkCallback != null) {
-                this.connectivityManager.unregisterNetworkCallback(manageDefaultNetworkCallback);
+                connectivityManager.unregisterNetworkCallback(manageDefaultNetworkCallback);
                 manageDefaultNetworkCallback = null;
                 manageDefaultNetworkCallback = null;
             }
             }
         } catch (IllegalArgumentException e) {
         } catch (IllegalArgumentException e) {

+ 6 - 6
app/src/main/java/epson/common/wifidirect/NfcTagParser.java

@@ -36,7 +36,7 @@ public class NfcTagParser {
         if (bArr.length != LENGTH_TAGDATA) {
         if (bArr.length != LENGTH_TAGDATA) {
             return false;
             return false;
         }
         }
-        this.tagData = bArr;
+        tagData = bArr;
         return true;
         return true;
     }
     }
 
 
@@ -45,12 +45,12 @@ public class NfcTagParser {
     }
     }
 
 
     public String getSSID() {
     public String getSSID() {
-        byte[] bArr = this.tagData;
+        byte[] bArr = tagData;
         return new String(ArrayUtils.subarray(bArr, 69, (bArr[66] - 1) + 69));
         return new String(ArrayUtils.subarray(bArr, 69, (bArr[66] - 1) + 69));
     }
     }
 
 
     public String getPassWord() {
     public String getPassWord() {
-        byte[] bArr = this.tagData;
+        byte[] bArr = tagData;
         byte[] subarray = ArrayUtils.subarray(bArr, 2, bArr[0] + 2);
         byte[] subarray = ArrayUtils.subarray(bArr, 2, bArr[0] + 2);
         for (int i = 0; i < subarray.length; i++) {
         for (int i = 0; i < subarray.length; i++) {
             subarray[i] = (byte) ((~subarray[i]) & 255);
             subarray[i] = (byte) ((~subarray[i]) & 255);
@@ -82,11 +82,11 @@ public class NfcTagParser {
     }
     }
 
 
     private int getPrinterStatus() {
     private int getPrinterStatus() {
-        int i = this.tagData[114] != 0 ? 1 : 0;
+        int i = tagData[114] != 0 ? 1 : 0;
         if (this.tagData[130] != 0) {
         if (this.tagData[130] != 0) {
             i |= 2;
             i |= 2;
         }
         }
-        if ((1 & this.tagData[131]) != 0) {
+        if ((1 & tagData[131]) != 0) {
             i |= 4;
             i |= 4;
         }
         }
         if ((this.tagData[131] & 2) != 0) {
         if ((this.tagData[131] & 2) != 0) {
@@ -98,6 +98,6 @@ public class NfcTagParser {
         if (this.tagData[132] != 0) {
         if (this.tagData[132] != 0) {
             i |= 65536;
             i |= 65536;
         }
         }
-        return this.tagData[133] != 0 ? i | 16777216 : i;
+        return tagData[133] != 0 ? i | 16777216 : i;
     }
     }
 }
 }

+ 9 - 9
app/src/main/java/epson/common/wifidirect/NfcTagUtils.java

@@ -60,14 +60,14 @@ public class NfcTagUtils {
         private EpsonNfcConnectInfo(Parcel parcel) {
         private EpsonNfcConnectInfo(Parcel parcel) {
             macAdress = parcel.readString();
             macAdress = parcel.readString();
             macAdressP2P = parcel.readString();
             macAdressP2P = parcel.readString();
-            this.ssid = parcel.readString();
-            this.password = parcel.readString();
-            this.initialpassword = parcel.readString();
-            this.aarPackageName = parcel.readString();
-            this.tagVersion = parcel.readString();
-            this.ipAddressV4 = parcel.readString();
-            this.ipAddressV4SimpleAP = parcel.readString();
-            this.printerStatus = parcel.readInt();
+            ssid = parcel.readString();
+            password = parcel.readString();
+            initialpassword = parcel.readString();
+            aarPackageName = parcel.readString();
+            tagVersion = parcel.readString();
+            ipAddressV4 = parcel.readString();
+            ipAddressV4SimpleAP = parcel.readString();
+            printerStatus = parcel.readInt();
         }
         }
 
 
         public void writeToParcel(Parcel parcel, int i) {
         public void writeToParcel(Parcel parcel, int i) {
@@ -84,7 +84,7 @@ public class NfcTagUtils {
         }
         }
 
 
         public boolean isTagWithInterface() {
         public boolean isTagWithInterface() {
-            String str = this.tagVersion;
+            String str = tagVersion;
             return str != null && str.startsWith(NfcTagUtils.PREFIX_TAGWITHNTERFACE);
             return str != null && str.startsWith(NfcTagUtils.PREFIX_TAGWITHNTERFACE);
         }
         }
 
 

+ 33 - 33
app/src/main/java/epson/common/wifidirect/SearchWiFiDirectPrinterTask.java

@@ -112,12 +112,12 @@ public class SearchWiFiDirectPrinterTask {
     }
     }
 
 
     private SearchWiFiDirectPrinterTask(Context context2) {
     private SearchWiFiDirectPrinterTask(Context context2) {
-        this.context = context2.getApplicationContext();
+        context = context2.getApplicationContext();
         mWifiManager = (WifiManager) context2.getSystemService("wifi");
         mWifiManager = (WifiManager) context2.getSystemService("wifi");
         mWiFiP2PManager = (WifiP2pManager) context2.getSystemService("wifip2p");
         mWiFiP2PManager = (WifiP2pManager) context2.getSystemService("wifip2p");
         WifiP2pManager wifiP2pManager = mWiFiP2PManager;
         WifiP2pManager wifiP2pManager = mWiFiP2PManager;
         if (wifiP2pManager != null) {
         if (wifiP2pManager != null) {
-            this.p2pChannnel = wifiP2pManager.initialize(context2, context2.getMainLooper(), (WifiP2pManager.ChannelListener) null);
+            p2pChannnel = wifiP2pManager.initialize(context2, context2.getMainLooper(), (WifiP2pManager.ChannelListener) null);
         }
         }
     }
     }
 
 
@@ -128,67 +128,67 @@ public class SearchWiFiDirectPrinterTask {
         }
         }
         EPLog.m86d(TAG, "start()");
         EPLog.m86d(TAG, "start()");
         mHandler = handler;
         mHandler = handler;
-        this.idResult = i2;
-        this.timeout = i3;
+        idResult = i2;
+        timeout = i3;
         if (!mWifiManager.isWifiEnabled()) {
         if (!mWifiManager.isWifiEnabled()) {
             return false;
             return false;
         }
         }
-        this.listFoundSSID.clear();
-        this.retryScaning = 0;
-        this.retryScaningP2P = 0;
-        this.scannigObserver.start(i3 * 1000);
+        listFoundSSID.clear();
+        retryScaning = 0;
+        retryScaningP2P = 0;
+        scannigObserver.start(i3 * 1000);
         if ((i & 1) != 0) {
         if ((i & 1) != 0) {
-            this.networkStateChangeReciever = new NetworkStateChangeReciever();
-            this.context.registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.SCAN_RESULTS"));
-            this.serarchingStatus |= 1;
+            networkStateChangeReciever = new NetworkStateChangeReciever();
+            context.registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.SCAN_RESULTS"));
+            serarchingStatus |= 1;
             onScanResultAvailable();
             onScanResultAvailable();
         }
         }
-        if (!((i & 2) == 0 || mWiFiP2PManager == null || this.p2pChannnel == null)) {
-            this.p2pStateChangeReciever = new WiFiDirectBroadcastReceiver();
-            this.context.registerReceiver(this.p2pStateChangeReciever, new IntentFilter("android.net.wifi.p2p.PEERS_CHANGED"));
-            this.bDisConnectP2P = false;
-            this.searchHandler.sendEmptyMessage(0);
+        if (!((i & 2) == 0 || mWiFiP2PManager == null || p2pChannnel == null)) {
+            p2pStateChangeReciever = new WiFiDirectBroadcastReceiver();
+            context.registerReceiver(this.p2pStateChangeReciever, new IntentFilter("android.net.wifi.p2p.PEERS_CHANGED"));
+            bDisConnectP2P = false;
+            searchHandler.sendEmptyMessage(0);
         }
         }
         return true;
         return true;
     }
     }
 
 
     public void interrupt() {
     public void interrupt() {
         EPLog.m86d(TAG, "interrupt()");
         EPLog.m86d(TAG, "interrupt()");
-        Handler handler = this.searchHandler;
+        Handler handler = searchHandler;
         if (handler != null) {
         if (handler != null) {
             handler.removeMessages(0);
             handler.removeMessages(0);
         }
         }
-        this.scannigObserver.interrunpt();
-        if (!(mWiFiP2PManager == null || this.p2pChannnel == null)) {
+        scannigObserver.interrunpt();
+        if (!(mWiFiP2PManager == null || p2pChannnel == null)) {
             EPLog.m86d(TAG, "stopPeerDiscovery");
             EPLog.m86d(TAG, "stopPeerDiscovery");
             mWiFiP2PManager.stopPeerDiscovery(this.p2pChannnel, (WifiP2pManager.ActionListener) null);
             mWiFiP2PManager.stopPeerDiscovery(this.p2pChannnel, (WifiP2pManager.ActionListener) null);
         }
         }
         unRegisterReceiverSimpleAp();
         unRegisterReceiverSimpleAp();
         unRegisterReceiverP2P();
         unRegisterReceiverP2P();
-        this.serarchingStatus = 0;
+        serarchingStatus = 0;
     }
     }
 
 
     private void unRegisterReceiverSimpleAp() {
     private void unRegisterReceiverSimpleAp() {
-        NetworkStateChangeReciever networkStateChangeReciever2 = this.networkStateChangeReciever;
+        NetworkStateChangeReciever networkStateChangeReciever2 = networkStateChangeReciever;
         if (networkStateChangeReciever2 != null) {
         if (networkStateChangeReciever2 != null) {
             try {
             try {
-                this.context.unregisterReceiver(networkStateChangeReciever2);
+                context.unregisterReceiver(networkStateChangeReciever2);
             } catch (IllegalArgumentException e) {
             } catch (IllegalArgumentException e) {
                 e.printStackTrace();
                 e.printStackTrace();
             }
             }
-            this.networkStateChangeReciever = null;
+            networkStateChangeReciever = null;
         }
         }
     }
     }
 
 
     private void unRegisterReceiverP2P() {
     private void unRegisterReceiverP2P() {
-        WiFiDirectBroadcastReceiver wiFiDirectBroadcastReceiver = this.p2pStateChangeReciever;
+        WiFiDirectBroadcastReceiver wiFiDirectBroadcastReceiver = p2pStateChangeReciever;
         if (wiFiDirectBroadcastReceiver != null) {
         if (wiFiDirectBroadcastReceiver != null) {
             try {
             try {
-                this.context.unregisterReceiver(wiFiDirectBroadcastReceiver);
+                context.unregisterReceiver(wiFiDirectBroadcastReceiver);
             } catch (IllegalArgumentException e) {
             } catch (IllegalArgumentException e) {
                 e.printStackTrace();
                 e.printStackTrace();
             }
             }
-            this.p2pStateChangeReciever = null;
+            p2pStateChangeReciever = null;
         }
         }
     }
     }
 
 
@@ -239,7 +239,7 @@ public class SearchWiFiDirectPrinterTask {
             }
             }
         }
         }
         lastScan = elapsedRealtime;
         lastScan = elapsedRealtime;
-        this.retryScaning++;
+        retryScaning++;
         if (this.retryScaning < 5) {
         if (this.retryScaning < 5) {
             EPLog.m88i(TAG, "Retry startScan()");
             EPLog.m88i(TAG, "Retry startScan()");
             mWifiManager.startScan();
             mWifiManager.startScan();
@@ -247,7 +247,7 @@ public class SearchWiFiDirectPrinterTask {
         }
         }
         EPLog.m88i(TAG, "MAX_RETRY_SCANING");
         EPLog.m88i(TAG, "MAX_RETRY_SCANING");
         unRegisterReceiverSimpleAp();
         unRegisterReceiverSimpleAp();
-        this.serarchingStatus &= -2;
+        serarchingStatus &= -2;
         if (this.serarchingStatus == 0) {
         if (this.serarchingStatus == 0) {
             mHandler.sendEmptyMessage(this.idResult);
             mHandler.sendEmptyMessage(this.idResult);
             interrupt();
             interrupt();
@@ -256,7 +256,7 @@ public class SearchWiFiDirectPrinterTask {
 
 
     private void onFindPrinterResult(String str, int i, String str2) {
     private void onFindPrinterResult(String str, int i, String str2) {
         if (!this.listFoundSSID.contains(str)) {
         if (!this.listFoundSSID.contains(str)) {
-            this.listFoundSSID.add(str);
+            listFoundSSID.add(str);
             SimpleAPInfoDB.SimpleAPInfo simpleAPInfoDB = SimpleAPInfoDB.getSimpleAPInfoDB(this.context, str);
             SimpleAPInfoDB.SimpleAPInfo simpleAPInfoDB = SimpleAPInfoDB.getSimpleAPInfoDB(this.context, str);
             if (simpleAPInfoDB == null) {
             if (simpleAPInfoDB == null) {
                 simpleAPInfoDB = new SimpleAPInfoDB.SimpleAPInfo();
                 simpleAPInfoDB = new SimpleAPInfoDB.SimpleAPInfo();
@@ -265,7 +265,7 @@ public class SearchWiFiDirectPrinterTask {
                 simpleAPInfoDB.printerName = WiFiControl.getPrinterNetworkName(str);
                 simpleAPInfoDB.printerName = WiFiControl.getPrinterNetworkName(str);
             }
             }
             Message obtain = Message.obtain();
             Message obtain = Message.obtain();
-            obtain.what = this.idResult;
+            obtain.what = idResult;
             Bundle bundle = new Bundle();
             Bundle bundle = new Bundle();
             bundle.putString("ssid", simpleAPInfoDB.ssid);
             bundle.putString("ssid", simpleAPInfoDB.ssid);
             bundle.putString("name", simpleAPInfoDB.printerName);
             bundle.putString("name", simpleAPInfoDB.printerName);
@@ -331,7 +331,7 @@ public class SearchWiFiDirectPrinterTask {
         private void start(final int i) {
         private void start(final int i) {
             interrunpt();
             interrunpt();
             EPLog.m86d(SearchWiFiDirectPrinterTask.TAG, "Start ScanningObserver");
             EPLog.m86d(SearchWiFiDirectPrinterTask.TAG, "Start ScanningObserver");
-            this.observerTask = new AsyncTask<Void, Void, Void>() {
+            observerTask = new AsyncTask<Void, Void, Void>() {
                 protected Void doInBackground(Void... voidArr) {
                 protected Void doInBackground(Void... voidArr) {
                     int i = 0;
                     int i = 0;
                     do {
                     do {
@@ -358,10 +358,10 @@ public class SearchWiFiDirectPrinterTask {
         }
         }
 
 
         private void interrunpt() {
         private void interrunpt() {
-            AsyncTask<Void, Void, Void> asyncTask = this.observerTask;
+            AsyncTask<Void, Void, Void> asyncTask = observerTask;
             if (asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING && !this.observerTask.isCancelled()) {
             if (asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING && !this.observerTask.isCancelled()) {
                 EPLog.m86d(SearchWiFiDirectPrinterTask.TAG, "Stop ScanningObserver");
                 EPLog.m86d(SearchWiFiDirectPrinterTask.TAG, "Stop ScanningObserver");
-                this.observerTask.cancel(false);
+                observerTask.cancel(false);
             }
             }
         }
         }
     }
     }

+ 30 - 30
app/src/main/java/epson/common/wifidirect/WiFiDirectPrinterListUtils.java

@@ -42,27 +42,27 @@ public class WiFiDirectPrinterListUtils {
         PRINTER_TYPE type;
         PRINTER_TYPE type;
 
 
         public PrinterInfo(PRINTER_TYPE printer_type, String str, String str2, String str3, Object obj) {
         public PrinterInfo(PRINTER_TYPE printer_type, String str, String str2, String str3, Object obj) {
-            this.type = printer_type;
+            type = printer_type;
             macAddr = str;
             macAddr = str;
-            this.f157ip = str2;
-            this.ssid = str3;
-            this.printer = obj;
+            f157ip = str2;
+            ssid = str3;
+            printer = obj;
         }
         }
     }
     }
 
 
     public WiFiDirectPrinterListUtils(Context context, AbstractList<Object> abstractList, ListController listController2, String str) {
     public WiFiDirectPrinterListUtils(Context context, AbstractList<Object> abstractList, ListController listController2, String str) {
         mAppContext = context.getApplicationContext();
         mAppContext = context.getApplicationContext();
-        this.wiFiControl = WiFiControl.getInstance(mAppContext);
-        this.innerPrinterList = new ArrayList<>();
-        this.uiPrinterList = abstractList;
-        this.listController = listController2;
-        this.curConnectInfo = str;
+        wiFiControl = WiFiControl.getInstance(mAppContext);
+        innerPrinterList = new ArrayList<>();
+        uiPrinterList = abstractList;
+        listController = listController2;
+        curConnectInfo = str;
         clearPrinterInfoList();
         clearPrinterInfoList();
     }
     }
 
 
     public void clearPrinterInfoList() {
     public void clearPrinterInfoList() {
         EPLog.m86d(TAG, "clearPrinterInfoList()");
         EPLog.m86d(TAG, "clearPrinterInfoList()");
-        this.innerPrinterList.clear();
+        innerPrinterList.clear();
         updateP2pPrinterMacAddr();
         updateP2pPrinterMacAddr();
     }
     }
 
 
@@ -70,16 +70,16 @@ public class WiFiDirectPrinterListUtils {
         EPLog.m86d(TAG, "updateP2pPrinterMacAddr()");
         EPLog.m86d(TAG, "updateP2pPrinterMacAddr()");
         WifiP2pUtils.ConnectionInfo connectionInfo = WifiP2pUtils.getInstance(mAppContext).getConnectionInfo();
         WifiP2pUtils.ConnectionInfo connectionInfo = WifiP2pUtils.getInstance(mAppContext).getConnectionInfo();
         if (connectionInfo == null) {
         if (connectionInfo == null) {
-            this.p2pPrinterMacAddr = null;
+            p2pPrinterMacAddr = null;
             return;
             return;
         }
         }
         if (connectionInfo.isGroupOwnerThisDevice) {
         if (connectionInfo.isGroupOwnerThisDevice) {
-            this.p2pPrinterMacAddr = WiFiControl.p2pAddr2PtrAddr(connectionInfo.p2PMacAdder, connectionInfo.printerName);
+            p2pPrinterMacAddr = WiFiControl.p2pAddr2PtrAddr(connectionInfo.p2PMacAdder, connectionInfo.printerName);
         } else {
         } else {
-            this.p2pPrinterMacAddr = WiFiControl.p2pAddr2PtrAddrP2P(connectionInfo.p2PMacAdder, connectionInfo.printerName);
+            p2pPrinterMacAddr = WiFiControl.p2pAddr2PtrAddrP2P(connectionInfo.p2PMacAdder, connectionInfo.printerName);
         }
         }
         if (MacAddrFilter.getInstance(mAppContext).isExcludedMacAddress(WiFiControl.p2pAddr2PtrAddr(connectionInfo.p2PMacAdder, connectionInfo.printerName))) {
         if (MacAddrFilter.getInstance(mAppContext).isExcludedMacAddress(WiFiControl.p2pAddr2PtrAddr(connectionInfo.p2PMacAdder, connectionInfo.printerName))) {
-            this.p2pPrinterMacAddr = null;
+            p2pPrinterMacAddr = null;
         }
         }
     }
     }
 
 
@@ -102,7 +102,7 @@ public class WiFiDirectPrinterListUtils {
                     EPLog.m86d(TAG, "Ignore Printer. This printer communicates via P2P:" + str);
                     EPLog.m86d(TAG, "Ignore Printer. This printer communicates via P2P:" + str);
                     return;
                     return;
                 } else {
                 } else {
-                    Iterator<PrinterInfo> it = this.innerPrinterList.iterator();
+                    Iterator<PrinterInfo> it = innerPrinterList.iterator();
                     while (true) {
                     while (true) {
                         if (it.hasNext()) {
                         if (it.hasNext()) {
                             PrinterInfo next = it.next();
                             PrinterInfo next = it.next();
@@ -110,9 +110,9 @@ public class WiFiDirectPrinterListUtils {
                                 String str3 = next.macAddr;
                                 String str3 = next.macAddr;
                                 if (str2 != null && str2.equals(str3)) {
                                 if (str2 != null && str2.equals(str3)) {
                                     EPLog.m86d(TAG, "Replace Duplicate Printer:" + next.ssid + "->" + str);
                                     EPLog.m86d(TAG, "Replace Duplicate Printer:" + next.ssid + "->" + str);
-                                    int indexOf = this.uiPrinterList.indexOf(next.printer);
+                                    int indexOf = uiPrinterList.indexOf(next.printer);
                                     if (-1 != indexOf) {
                                     if (-1 != indexOf) {
-                                        this.listController.replacePrinter(indexOf, obj, i);
+                                        listController.replacePrinter(indexOf, obj, i);
                                         z = false;
                                         z = false;
                                     } else {
                                     } else {
                                         EPLog.m87e(TAG, "Illegal curPrinterList1 (Maybe replaced):" + str);
                                         EPLog.m87e(TAG, "Illegal curPrinterList1 (Maybe replaced):" + str);
@@ -122,13 +122,13 @@ public class WiFiDirectPrinterListUtils {
                         }
                         }
                     }
                     }
                     if (z) {
                     if (z) {
-                        this.listController.addPrinter(obj, i);
+                        listController.addPrinter(obj, i);
                     }
                     }
-                    this.innerPrinterList.add(new PrinterInfo(PRINTER_TYPE.LOCAL, str2, str, (String) null, obj));
+                    innerPrinterList.add(new PrinterInfo(PRINTER_TYPE.LOCAL, str2, str, (String) null, obj));
                     return;
                     return;
                 }
                 }
             case WIFIDIRECT:
             case WIFIDIRECT:
-                Iterator<PrinterInfo> it2 = this.innerPrinterList.iterator();
+                Iterator<PrinterInfo> it2 = innerPrinterList.iterator();
                 while (true) {
                 while (true) {
                     if (it2.hasNext()) {
                     if (it2.hasNext()) {
                         PrinterInfo next2 = it2.next();
                         PrinterInfo next2 = it2.next();
@@ -143,12 +143,12 @@ public class WiFiDirectPrinterListUtils {
                                             break;
                                             break;
                                         } else {
                                         } else {
                                             EPLog.m86d(TAG, "Replace Duplicate Printer:" + next2.ssid + "->" + str);
                                             EPLog.m86d(TAG, "Replace Duplicate Printer:" + next2.ssid + "->" + str);
-                                            int indexOf2 = this.uiPrinterList.indexOf(next2.printer);
+                                            int indexOf2 = uiPrinterList.indexOf(next2.printer);
                                             if (-1 == indexOf2) {
                                             if (-1 == indexOf2) {
                                                 EPLog.m87e(TAG, "Illegal curPrinterList2 (Maybe replaced):" + str);
                                                 EPLog.m87e(TAG, "Illegal curPrinterList2 (Maybe replaced):" + str);
                                                 break;
                                                 break;
                                             } else {
                                             } else {
-                                                this.listController.replacePrinter(indexOf2, obj, i);
+                                                listController.replacePrinter(indexOf2, obj, i);
                                                 z = false;
                                                 z = false;
                                                 break;
                                                 break;
                                             }
                                             }
@@ -169,17 +169,17 @@ public class WiFiDirectPrinterListUtils {
                         } else {
                         } else {
                             String p2pPtrAddr2PtrAddr = WiFiControl.p2pPtrAddr2PtrAddr(str4);
                             String p2pPtrAddr2PtrAddr = WiFiControl.p2pPtrAddr2PtrAddr(str4);
                             if ((str4 != null && str4.equals(str2)) || (p2pPtrAddr2PtrAddr != null && p2pPtrAddr2PtrAddr.equals(str2))) {
                             if ((str4 != null && str4.equals(str2)) || (p2pPtrAddr2PtrAddr != null && p2pPtrAddr2PtrAddr.equals(str2))) {
-                                String curConnectInfo2 = this.wiFiControl.getCurConnectInfo(str4);
+                                String curConnectInfo2 = wiFiControl.getCurConnectInfo(str4);
                                 if (curConnectInfo2 != null) {
                                 if (curConnectInfo2 != null) {
                                     int[] iArr = C11211.f155x793e0ec3;
                                     int[] iArr = C11211.f155x793e0ec3;
-                                    WiFiControl wiFiControl2 = this.wiFiControl;
+                                    WiFiControl wiFiControl2 = wiFiControl;
                                     if (iArr[WiFiControl.getSSIDType(str).ordinal()] != 2) {
                                     if (iArr[WiFiControl.getSSIDType(str).ordinal()] != 2) {
                                         z2 = z;
                                         z2 = z;
                                     } else if (curConnectInfo2.equals(this.curConnectInfo)) {
                                     } else if (curConnectInfo2.equals(this.curConnectInfo)) {
                                         EPLog.m86d(TAG, "Replace Duplicate Printer:" + next2.f157ip + "->" + str);
                                         EPLog.m86d(TAG, "Replace Duplicate Printer:" + next2.f157ip + "->" + str);
-                                        int indexOf3 = this.uiPrinterList.indexOf(next2.printer);
+                                        int indexOf3 = uiPrinterList.indexOf(next2.printer);
                                         if (-1 != indexOf3) {
                                         if (-1 != indexOf3) {
-                                            this.listController.replacePrinter(indexOf3, obj, i);
+                                            listController.replacePrinter(indexOf3, obj, i);
                                         } else {
                                         } else {
                                             EPLog.m87e(TAG, "Illegal curPrinterList3 (Maybe replaced):" + str);
                                             EPLog.m87e(TAG, "Illegal curPrinterList3 (Maybe replaced):" + str);
                                         }
                                         }
@@ -196,12 +196,12 @@ public class WiFiDirectPrinterListUtils {
                     }
                     }
                 }
                 }
                 if (z2) {
                 if (z2) {
-                    this.listController.addPrinter(obj, i);
+                    listController.addPrinter(obj, i);
                 }
                 }
-                this.innerPrinterList.add(new PrinterInfo(PRINTER_TYPE.WIFIDIRECT, str2, (String) null, str, obj));
+                innerPrinterList.add(new PrinterInfo(PRINTER_TYPE.WIFIDIRECT, str2, (String) null, str, obj));
                 return;
                 return;
             case USB:
             case USB:
-                this.listController.addPrinter(obj, i);
+                listController.addPrinter(obj, i);
                 return;
                 return;
             default:
             default:
                 EPLog.m90w(TAG, "Un known Type");
                 EPLog.m90w(TAG, "Un known Type");
@@ -211,7 +211,7 @@ public class WiFiDirectPrinterListUtils {
 
 
     private PRINTER_TYPE getType(String str) {
     private PRINTER_TYPE getType(String str) {
         WiFiControl.ConnectType connectType = WiFiControl.ConnectType.NONE;
         WiFiControl.ConnectType connectType = WiFiControl.ConnectType.NONE;
-        WiFiControl wiFiControl2 = this.wiFiControl;
+        WiFiControl wiFiControl2 = wiFiControl;
         if (!connectType.equals(WiFiControl.getSSIDType(str))) {
         if (!connectType.equals(WiFiControl.getSSIDType(str))) {
             return PRINTER_TYPE.WIFIDIRECT;
             return PRINTER_TYPE.WIFIDIRECT;
         }
         }

Some files were not shown because too many files changed in this diff