重构弹窗部分

Author: easepan

src/main/java/org/code4everything/qiniu/QiniuApplication.java

@@ -15,7 +15,7 @@
 import org.code4everything.qiniu.model.ConfigBean;
 import org.code4everything.qiniu.model.FileInfo;
 import org.code4everything.qiniu.util.ConfigUtils;
-import org.code4everything.qiniu.view.Dialogs;
+import org.code4everything.qiniu.util.DialogUtils;
 
 import java.util.Optional;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -80,7 +80,7 @@ public void start(Stage stage) {
  stage.setScene(scene);
  } catch (Exception e) {
  LOGGER.error("init stage error: " + e.getMessage());
- Dialogs.showFatalError(QiniuValueConsts.INIT_APP_ERROR_HEADER, e);
+ DialogUtils.showFatalError(QiniuValueConsts.INIT_APP_ERROR_HEADER, e);
  }
  // 设置图标
  stage.getIcons().add(new Image(getClass().getResourceAsStream("/image/qiniu.png")));
@@ -90,7 +90,7 @@ public void start(Stage stage) {
  // 判断是否有文件在上传下载
  MainWindowController main = MainWindowController.getInstance();
  if (main.downloadProgress.isVisible() || main.uploadProgress.isVisible()) {
- Optional<ButtonType> result = Dialogs.showConfirmation(QiniuValueConsts.UPLOADING_OR_DOWNLOADING);
+ Optional<ButtonType> result = DialogUtils.showConfirmation(QiniuValueConsts.UPLOADING_OR_DOWNLOADING);
  if (result.isPresent() && result.get() != ButtonType.OK) {
  // 取消退出事件
  event.consume();

src/main/java/org/code4everything/qiniu/api/QiManager.java

@@ -22,7 +22,7 @@
 import org.code4everything.qiniu.controller.MainWindowController;
 import org.code4everything.qiniu.model.FileInfo;
 import org.code4everything.qiniu.util.QiniuUtils;
-import org.code4everything.qiniu.view.Dialogs;
+import org.code4everything.qiniu.util.DialogUtils;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -65,7 +65,7 @@ public Series<String, Long> getBucketBandwidth(String[] domains, String fromDate
  bandwidthResult = SdkConfigurer.getCdnManager().getBandwidthData(domains, fromDate, toDate, "day");
  } catch (QiniuException e) {
  logger.error("get bucket bandwidth error, message: " + e.getMessage());
- Platform.runLater(() -> Dialogs.showException(QiniuValueConsts.BUCKET_BAND_ERROR, e));
+ Platform.runLater(() -> DialogUtils.showException(QiniuValueConsts.BUCKET_BAND_ERROR, e));
  }
  Series<String, Long> bandSer = new Series<>();
  bandSer.setName(QiniuValueConsts.BUCKET_BANDWIDTH_COUNT.replaceAll("[A-Z]+", countUnit));
@@ -125,7 +125,7 @@ public Series<String, Long> getBucketFlux(String[] domains, String fromDate, Str
  fluxResult = SdkConfigurer.getCdnManager().getFluxData(domains, fromDate, toDate, "day");
  } catch (QiniuException e) {
  logger.error("get bucket flux error, message: " + e.getMessage());
- Platform.runLater(() -> Dialogs.showException(QiniuValueConsts.BUCKET_FLUX_ERROR, e));
+ Platform.runLater(() -> DialogUtils.showException(QiniuValueConsts.BUCKET_FLUX_ERROR, e));
  }
  Series<String, Long> fluxSer = new Series<>();
  fluxSer.setName(QiniuValueConsts.BUCKET_FLUX_COUNT.replaceAll("[A-Z]+", countUnit));
@@ -174,7 +174,7 @@ public void downloadCdnLog(String logDate) {
  }
  } catch (QiniuException e) {
  logger.error("get cdn log url error, message: " + e.getMessage());
- Dialogs.showException(e);
+ DialogUtils.showException(e);
  }
  }
  }
@@ -203,7 +203,7 @@ private void refreshFile(String[] files) {
  logger.info("refresh files success");
  } catch (QiniuException e) {
  logger.error("refresh files error, message: " + e.getMessage());
- Dialogs.showException(e);
+ DialogUtils.showException(e);
  }
  }
 
@@ -248,7 +248,7 @@ public void updateFile(String bucket, String key) {
  logger.info(log + "' success");
  } catch (QiniuException e) {
  logger.error(log + "' error, message: " + e.getMessage());
- Dialogs.showException(QiniuValueConsts.UPDATE_ERROR, e);
+ DialogUtils.showException(QiniuValueConsts.UPDATE_ERROR, e);
  }
  }
 
@@ -262,7 +262,7 @@ public void setFileLife(String bucket, String key, int days) {
  logger.info(log + "success");
  } catch (QiniuException e) {
  logger.error(log + "error, message: " + e.getMessage());
- Dialogs.showException(QiniuValueConsts.MOVE_OR_RENAME_ERROR, e);
+ DialogUtils.showException(QiniuValueConsts.MOVE_OR_RENAME_ERROR, e);
  }
  }
 
@@ -298,7 +298,7 @@ public boolean moveOrCopyFile(String fromBucket, String fromKey, String toBucket
  return true;
  } catch (QiniuException e) {
  logger.error(log + " failed, message: " + e.getMessage());
- Dialogs.showException(QiniuValueConsts.MOVE_OR_RENAME_ERROR, e);
+ DialogUtils.showException(QiniuValueConsts.MOVE_OR_RENAME_ERROR, e);
  return false;
  }
  }
@@ -317,7 +317,7 @@ public boolean changeType(String fileName, String newType, String bucket) {
  return true;
  } catch (QiniuException e) {
  logger.error(log + "' failed, message: " + e.getMessage());
- Dialogs.showException(QiniuValueConsts.CHANGE_FILE_TYPE_ERROR, e);
+ DialogUtils.showException(QiniuValueConsts.CHANGE_FILE_TYPE_ERROR, e);
  return false;
  }
  }
@@ -359,11 +359,11 @@ public void deleteFiles(ObservableList<FileInfo> fileInfos, String bucket) {
  }
  } else {
  logger.error("delete file '" + file + "' failed, message: " + status.data.error);
- Dialogs.showError("删除文件：" + file + " 失败");
+ DialogUtils.showError("删除文件：" + file + " 失败");
  }
  }
  } catch (QiniuException e) {
- Dialogs.showException(QiniuValueConsts.DELETE_ERROR, e);
+ DialogUtils.showException(QiniuValueConsts.DELETE_ERROR, e);
  }
  MainWindowController.getInstance().setBucketCount();
  }
@@ -402,7 +402,7 @@ public void listFileOfBucket() {
 
  private void urlError(Exception e) {
  logger.error("generate url error: " + e.getMessage());
- Dialogs.showException(QiniuValueConsts.GENERATE_URL_ERROR, e);
+ DialogUtils.showException(QiniuValueConsts.GENERATE_URL_ERROR, e);
  }
 
  public enum FileAction {

src/main/java/org/code4everything/qiniu/api/config/SdkConfigurer.java

@@ -12,7 +12,7 @@
 import org.apache.log4j.Logger;
 import org.code4everything.qiniu.constant.QiniuValueConsts;
 import org.code4everything.qiniu.util.QiniuUtils;
-import org.code4everything.qiniu.view.Dialogs;
+import org.code4everything.qiniu.util.DialogUtils;
 
 import java.io.IOException;
 import java.nio.file.Paths;
@@ -77,7 +77,7 @@ public static void createAuth(String accessKey, String secretKey) {
  public static boolean configUploadEnv(String zone, String bucket) {
  if (!QiniuUtils.checkNet()) {
  Platform.runLater(() -> {
- Dialogs.showError(QiniuValueConsts.NET_ERROR);
+ DialogUtils.showError(QiniuValueConsts.NET_ERROR);
  System.exit(0);
  });
  return false;

src/main/java/org/code4everything/qiniu/controller/MainWindowController.java

@@ -28,8 +28,9 @@
 import org.code4everything.qiniu.constant.QiniuValueConsts;
 import org.code4everything.qiniu.model.FileInfo;
 import org.code4everything.qiniu.util.ConfigUtils;
+import org.code4everything.qiniu.util.DialogUtils;
+import org.code4everything.qiniu.util.QiniuDialog;
 import org.code4everything.qiniu.util.QiniuUtils;
-import org.code4everything.qiniu.view.Dialogs;
 
 import java.awt.*;
 import java.io.File;
@@ -358,7 +359,7 @@ private void drawChart(boolean fluxUnitChange, boolean bandUnitChange) {
  * 日志下载，cdn相关
  */
  public void downloadCdnLog() {
- String date = Dialogs.showInputDialog(null, QiniuValueConsts.INPUT_LOG_DATE,
+ String date = DialogUtils.showInputDialog(null, QiniuValueConsts.INPUT_LOG_DATE,
  Formatter.dateToString(new Date()));
  new QiManager().downloadCdnLog(date);
  }
@@ -375,7 +376,7 @@ public void refreshFile() {
  * 通过链接下载其他的网络文件
  */
  public void downloadFromURL() {
- String url = Dialogs.showInputDialog(null, QiniuValueConsts.DOWNLOAD_URL, "http://example.com");
+ String url = DialogUtils.showInputDialog(null, QiniuValueConsts.DOWNLOAD_URL, "http://example.com");
  QiniuUtils.download(url);
  }
 
@@ -443,7 +444,7 @@ public void updateFile() {
  public void setLife() {
  ObservableList<FileInfo> selectedItems = resTable.getSelectionModel().getSelectedItems();
  if (Checker.isNotEmpty(selectedItems)) {
- String lifeStr = Dialogs.showInputDialog(null, QiniuValueConsts.FILE_LIFE,
+ String lifeStr = DialogUtils.showInputDialog(null, QiniuValueConsts.FILE_LIFE,
  QiniuValueConsts.DEFAULT_FILE_LIFE);
  if (Checker.isNumber(lifeStr)) {
  int life = Formatter.stringToInt(lifeStr);
@@ -466,9 +467,9 @@ public void showFileMovableDialog() {
  // 没有选择文件，结束方法
  return;
  } else if (selectedItems.size() > 1) {
- pair = new Dialogs().showFileMovableDialog(bucket, "", false);
+ pair = new QiniuDialog().showFileMovableDialog(bucket, "", false);
  } else {
- pair = new Dialogs().showFileMovableDialog(bucket, selectedItems.get(0).getName(), true);
+ pair = new QiniuDialog().showFileMovableDialog(bucket, selectedItems.get(0).getName(), true);
  }
  if (Checker.isNotNull(pair)) {
  boolean useNewKey = Checker.isNotEmpty(pair.getValue()[1]);
@@ -563,11 +564,11 @@ public void setBucketCount() {
  */
  public void refreshResTable() {
  if (!QiniuUtils.checkNet()) {
- Dialogs.showWarning(QiniuValueConsts.NET_ERROR);
+ DialogUtils.showWarning(QiniuValueConsts.NET_ERROR);
  return;
  }
  setResTableData();
- Dialogs.showInformation(QiniuValueConsts.REFRESH_SUCCESS);
+ DialogUtils.showInformation(QiniuValueConsts.REFRESH_SUCCESS);
  }
 
  /**
@@ -666,7 +667,7 @@ private void setFiles(File[] files, boolean checkRecursive) {
  public void uploadFile() {
  if (Checker.isEmpty(zoneText.getText()) || Checker.isEmpty(selectedFileTextArea.getText())) {
  // 没有选择存储空间或文件，不能上传文件
- Dialogs.showWarning(QiniuValueConsts.NEED_CHOOSE_BUCKET_OR_FILE);
+ DialogUtils.showWarning(QiniuValueConsts.NEED_CHOOSE_BUCKET_OR_FILE);
  return;
  }
  // 新建一个上传文件的线程
@@ -732,7 +733,7 @@ public void uploadFile() {
  } catch (QiniuException e) {
  status = Formatter.datetimeToString(new Date()) + "\terror\t" + path;
  logger.error("upload error, message: " + e.getMessage());
- Platform.runLater(() -> Dialogs.showException(QiniuValueConsts.UPLOAD_ERROR, e));
+ Platform.runLater(() -> DialogUtils.showException(QiniuValueConsts.UPLOAD_ERROR, e));
  }
  Platform.runLater(() -> {
  uploadStatusTextArea.deleteText(0, end);
@@ -777,7 +778,7 @@ private void savePrefix(String key) {
  public void openConfigFile() {
  try {
  Desktop.getDesktop().open(new File(QiniuValueConsts.CONFIG_PATH));
- Optional<ButtonType> result = Dialogs.showConfirmation(QiniuValueConsts.RELOAD_CONFIG);
+ Optional<ButtonType> result = DialogUtils.showConfirmation(QiniuValueConsts.RELOAD_CONFIG);
  if (result.isPresent() && result.get() == ButtonType.OK) {
  // 重新载入配置文件
  bucketChoiceCombo.getItems().clear();
@@ -786,18 +787,18 @@ public void openConfigFile() {
  }
  } catch (IOException e) {
  logger.error("open config file error, message -> " + e.getMessage());
- Dialogs.showException(QiniuValueConsts.OPEN_FILE_ERROR, e);
+ DialogUtils.showException(QiniuValueConsts.OPEN_FILE_ERROR, e);
  } catch (Exception e) {
  logger.error("can't open config file, message -> " + e.getMessage());
- Dialogs.showException(QiniuValueConsts.OPEN_FILE_ERROR, e);
+ DialogUtils.showException(QiniuValueConsts.OPEN_FILE_ERROR, e);
  }
  }
 
  /**
  * 重置Key
  */
  public void resetKey() {
- boolean ok = new Dialogs().showInputKeyDialog();
+ boolean ok = new QiniuDialog().showInputKeyDialog();
  if (ok && Checker.isNotEmpty(zoneText.getText())) {
  SdkConfigurer.configUploadEnv(zoneText.getText(), bucketChoiceCombo.getValue());
  }
@@ -808,7 +809,7 @@ public void resetKey() {
  */
  public void showBucketAddableDialog() {
  logger.info("show bucket addable dialog");
- new Dialogs().showBucketAddableDialog();
+ new QiniuDialog().showBucketAddableDialog();
  }
 
  public enum DownloadWay {

src/main/java/org/code4everything/qiniu/util/ConfigUtils.java

@@ -70,6 +70,9 @@ public static void loadConfig() {
  QiniuApplication.setConfigBean(configBean);
  }
 
+ /**
+ * 写配置文件
+ */
  public static void writeConfig() {
  FileUtil.writeUtf8String(JSONObject.toJSONString(QiniuApplication.getConfigBean(), true), CONFIG_PATH);
  }