Skip to content
This repository was archived by the owner on Mar 6, 2024. It is now read-only.

Commit d047b05

Browse files
easepaneasepan
committed
重构常量类
1 parent bf80142 commit d047b05

File tree

11 files changed

+91
-95
lines changed

11 files changed

+91
-95
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.zhazhapan</groupId>
77
<artifactId>qiniu</artifactId>
8-
<version>1.0.7</version>
8+
<version>1.0.8</version>
99
<packaging>jar</packaging>
1010

1111
<name>qiniu</name>

‎src/main/java/org/code4everything/qiniu/Downloader.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.zhazhapan.modules.constant.ValueConsts;
77
import org.code4everything.qiniu.config.ConfigLoader;
88
import org.code4everything.qiniu.controller.MainWindowController;
9-
import org.code4everything.qiniu.modules.constant.Values;
9+
import org.code4everything.qiniu.constant.QiniuValueConsts;
1010
import org.code4everything.qiniu.view.Dialogs;
1111
import com.zhazhapan.util.Checker;
1212
import com.zhazhapan.util.ThreadPool;
@@ -40,8 +40,8 @@ public void downloadFromNet(String downloadURL) {
4040
return;
4141
}
4242
if (!checkDownloadPath()) {
43-
QiniuApplication.downloadPath = Dialogs.showInputDialog(null, Values.CONFIG_DOWNLOAD_PATH,
44-
Values.USER_HOME);
43+
QiniuApplication.downloadPath = Dialogs.showInputDialog(null, QiniuValueConsts.CONFIG_DOWNLOAD_PATH,
44+
QiniuValueConsts.USER_HOME);
4545
if (!checkDownloadPath()) {
4646
return;
4747
}
@@ -89,7 +89,7 @@ public void downloadFromNet(String downloadURL) {
8989
} catch (IOException e) {
9090
log = log.replace("success", "error") + ", message: " + e.getMessage();
9191
logger.error(log);
92-
Platform.runLater(() -> Dialogs.showException(Values.DOWNLOAD_FILE_ERROR, e));
92+
Platform.runLater(() -> Dialogs.showException(QiniuValueConsts.DOWNLOAD_FILE_ERROR, e));
9393
}
9494
Platform.runLater(() -> main.downloadProgress.setVisible(false));
9595
});

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.code4everything.qiniu.config.QiConfiger;
1212
import org.code4everything.qiniu.controller.MainWindowController;
1313
import org.code4everything.qiniu.model.FileInfo;
14-
import org.code4everything.qiniu.modules.constant.Values;
14+
import org.code4everything.qiniu.constant.QiniuValueConsts;
1515
import org.code4everything.qiniu.view.Dialogs;
1616
import com.zhazhapan.util.Checker;
1717
import com.zhazhapan.util.Formatter;
@@ -64,10 +64,10 @@ public Series<String, Long> getBucketBandwidth(String[] domains, String fromDate
6464
bandwidthResult = QiniuApplication.cdnManager.getBandwidthData(domains, fromDate, toDate, "day");
6565
} catch (QiniuException e) {
6666
logger.error("get bucket bandwidth error, message: " + e.getMessage());
67-
Platform.runLater(() -> Dialogs.showException(Values.BUCKET_BAND_ERROR, e));
67+
Platform.runLater(() -> Dialogs.showException(QiniuValueConsts.BUCKET_BAND_ERROR, e));
6868
}
6969
Series<String, Long> bandSer = new Series<>();
70-
bandSer.setName(Values.BUCKET_BANDWIDTH_COUNT.replaceAll("[A-Z]+", countUnit));
70+
bandSer.setName(QiniuValueConsts.BUCKET_BANDWIDTH_COUNT.replaceAll("[A-Z]+", countUnit));
7171
// 获取带宽统计
7272
if (Checker.isNotNull(bandwidthResult) && Checker.isNotEmpty(bandwidthResult.data)) {
7373
for (Map.Entry<String, BandwidthData> bandwidth : bandwidthResult.data.entrySet()) {
@@ -124,10 +124,10 @@ public Series<String, Long> getBucketFlux(String[] domains, String fromDate, Str
124124
fluxResult = QiniuApplication.cdnManager.getFluxData(domains, fromDate, toDate, "day");
125125
} catch (QiniuException e) {
126126
logger.error("get bucket flux error, message: " + e.getMessage());
127-
Platform.runLater(() -> Dialogs.showException(Values.BUCKET_FLUX_ERROR, e));
127+
Platform.runLater(() -> Dialogs.showException(QiniuValueConsts.BUCKET_FLUX_ERROR, e));
128128
}
129129
Series<String, Long> fluxSer = new Series<>();
130-
fluxSer.setName(Values.BUCKET_FLUX_COUNT.replaceAll("[A-Z]+", countUnit));
130+
fluxSer.setName(QiniuValueConsts.BUCKET_FLUX_COUNT.replaceAll("[A-Z]+", countUnit));
131131
// 获取流量统计
132132
if (Checker.isNotNull(fluxResult) && Checker.isNotEmpty(fluxResult.data)) {
133133
for (Map.Entry<String, FluxData> flux : fluxResult.data.entrySet()) {
@@ -258,7 +258,7 @@ public void updateFile(String bucket, String key) {
258258
logger.info(log + "' success");
259259
} catch (QiniuException e) {
260260
logger.error(log + "' error, message: " + e.getMessage());
261-
Dialogs.showException(Values.UPDATE_ERROR, e);
261+
Dialogs.showException(QiniuValueConsts.UPDATE_ERROR, e);
262262
}
263263
}
264264

@@ -272,7 +272,7 @@ public void setFileLife(String bucket, String key, int days) {
272272
logger.info(log + "success");
273273
} catch (QiniuException e) {
274274
logger.error(log + "error, message: " + e.getMessage());
275-
Dialogs.showException(Values.MOVE_OR_RENAME_ERROR, e);
275+
Dialogs.showException(QiniuValueConsts.MOVE_OR_RENAME_ERROR, e);
276276
}
277277
}
278278

@@ -309,7 +309,7 @@ public boolean moveOrCopyFile(String fromBucket, String fromKey, String toBucket
309309
return true;
310310
} catch (QiniuException e) {
311311
logger.error(log + " failed, message: " + e.getMessage());
312-
Dialogs.showException(Values.MOVE_OR_RENAME_ERROR, e);
312+
Dialogs.showException(QiniuValueConsts.MOVE_OR_RENAME_ERROR, e);
313313
return false;
314314
}
315315
}
@@ -328,7 +328,7 @@ public boolean changeType(String fileName, String newType, String bucket) {
328328
return true;
329329
} catch (QiniuException e) {
330330
logger.error(log + "' failed, message: " + e.getMessage());
331-
Dialogs.showException(Values.CHANGE_FILE_TYPE_ERROR, e);
331+
Dialogs.showException(QiniuValueConsts.CHANGE_FILE_TYPE_ERROR, e);
332332
return false;
333333
}
334334
}
@@ -379,7 +379,7 @@ public void deleteFiles(ObservableList<FileInfo> fileInfos, String bucket) {
379379
("\r\n");
380380
}
381381
} catch (QiniuException e) {
382-
Dialogs.showException(Values.DELETE_ERROR, e);
382+
Dialogs.showException(QiniuValueConsts.DELETE_ERROR, e);
383383
}
384384
MainWindowController.getInstance().setBucketCount();
385385
}
@@ -393,7 +393,7 @@ public void listFileOfBucket() {
393393
// 列举空间文件列表
394394
String bucket = main.bucketChoiceCombo.getValue();
395395
BucketManager.FileListIterator iterator = QiniuApplication.bucketManager.createFileListIterator(bucket, "",
396-
Values.BUCKET_LIST_LIMIT_SIZE, "");
396+
QiniuValueConsts.BUCKET_LIST_LIMIT_SIZE, "");
397397
ArrayList<FileInfo> files = new ArrayList<>();
398398
logger.info("get file list of bucket: " + bucket);
399399
QiniuApplication.totalLength = 0;
@@ -418,7 +418,7 @@ public void listFileOfBucket() {
418418

419419
private void urlError(Exception e) {
420420
logger.error("generate url error: " + e.getMessage());
421-
Dialogs.showException(Values.GENERATE_URL_ERROR, e);
421+
Dialogs.showException(QiniuValueConsts.GENERATE_URL_ERROR, e);
422422
}
423423

424424
public enum FileAction {

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.code4everything.qiniu.config.ConfigLoader;
1111
import org.code4everything.qiniu.model.FileInfo;
1212
import org.code4everything.qiniu.model.Key;
13-
import org.code4everything.qiniu.modules.constant.Values;
13+
import org.code4everything.qiniu.constant.QiniuValueConsts;
1414
import org.code4everything.qiniu.view.MainWindow;
1515
import com.zhazhapan.util.Checker;
1616
import com.zhazhapan.util.ThreadPool;
@@ -97,11 +97,11 @@ public static void main(String[] args) {
9797
public static void initLoad(boolean isExternalCall) {
9898
logger.info("current operation system: " + Utils.getCurrentOS());
9999
if (Checker.isWindows()) {
100-
workDir = Values.APP_PATH_OF_WINDOWS;
100+
workDir = QiniuValueConsts.APP_PATH_OF_WINDOWS;
101101
} else {
102-
workDir = Values.APP_PATH_OF_UNIX;
102+
workDir = QiniuValueConsts.APP_PATH_OF_UNIX;
103103
}
104-
ConfigLoader.configPath = workDir + Values.SEPARATOR + Values.CONFIG_PATH;
104+
ConfigLoader.configPath = workDir + QiniuValueConsts.SEPARATOR + QiniuValueConsts.CONFIG_PATH;
105105
logger.info("current work director: " + workDir + ", config file: " + ConfigLoader.configPath);
106106
mainWindow = new MainWindow();
107107
initZone();
@@ -111,10 +111,10 @@ public static void initLoad(boolean isExternalCall) {
111111
}
112112

113113
private static void initZone() {
114-
zone.put(Values.BUCKET_NAME_ARRAY[0], Zone.zone0());
115-
zone.put(Values.BUCKET_NAME_ARRAY[1], Zone.zone1());
116-
zone.put(Values.BUCKET_NAME_ARRAY[2], Zone.zone2());
117-
zone.put(Values.BUCKET_NAME_ARRAY[3], Zone.zoneNa0());
114+
zone.put(QiniuValueConsts.BUCKET_NAME_ARRAY[0], Zone.zone0());
115+
zone.put(QiniuValueConsts.BUCKET_NAME_ARRAY[1], Zone.zone1());
116+
zone.put(QiniuValueConsts.BUCKET_NAME_ARRAY[2], Zone.zone2());
117+
zone.put(QiniuValueConsts.BUCKET_NAME_ARRAY[3], Zone.zoneNa0());
118118
}
119119

120120
@Override

‎src/main/java/org/code4everything/qiniu/QiniuUtils.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.code4everything.qiniu;
22

3-
import org.code4everything.qiniu.modules.constant.Values;
3+
import org.code4everything.qiniu.constant.QiniuValueConsts;
44
import com.zhazhapan.util.FileExecutor;
55
import com.zhazhapan.util.Formatter;
66
import com.zhazhapan.util.Utils;
@@ -22,23 +22,23 @@ public static void saveLogFile(String file, String content) {
2222
try {
2323
FileExecutor.saveLogFile(file, content);
2424
} catch (IOException e) {
25-
Alerts.showError(Values.MAIN_TITLE, e.getMessage());
25+
Alerts.showError(QiniuValueConsts.MAIN_TITLE, e.getMessage());
2626
}
2727
}
2828

2929
public static void saveFile(File file, String content) {
3030
try {
3131
FileExecutor.saveFile(file, content);
3232
} catch (IOException e) {
33-
Alerts.showError(Values.MAIN_TITLE, e.getMessage());
33+
Alerts.showError(QiniuValueConsts.MAIN_TITLE, e.getMessage());
3434
}
3535
}
3636

3737
public static void openLink(String url) {
3838
try {
3939
Utils.openLink(url);
4040
} catch (Exception e) {
41-
Alerts.showError(Values.MAIN_TITLE, e.getMessage());
41+
Alerts.showError(QiniuValueConsts.MAIN_TITLE, e.getMessage());
4242
}
4343
}
4444

‎src/main/java/org/code4everything/qiniu/config/ConfigLoader.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.code4everything.qiniu.QiniuApplication;
55
import org.code4everything.qiniu.controller.MainWindowController;
66
import org.code4everything.qiniu.model.Key;
7-
import org.code4everything.qiniu.modules.constant.Values;
7+
import org.code4everything.qiniu.constant.QiniuValueConsts;
88
import org.code4everything.qiniu.view.Dialogs;
99
import com.zhazhapan.util.Checker;
1010
import com.zhazhapan.util.FileExecutor;
@@ -49,7 +49,7 @@ public static void loadConfig(boolean isExternalCall) {
4949
new QiConfiger().createAuth(ak, sk);
5050
} catch (Exception e) {
5151
logger.error("read key from configuration failed, message: " + e.getMessage());
52-
Dialogs.showException(Values.LOAD_CONFIG_ERROR, e);
52+
Dialogs.showException(QiniuValueConsts.LOAD_CONFIG_ERROR, e);
5353
showInputKeyDialog();
5454
}
5555
// 读取Bucket
@@ -104,7 +104,7 @@ public static void loadConfig(boolean isExternalCall) {
104104
logger.info("create file 'qiniu.conf' success");
105105
} catch (IOException e) {
106106
logger.error("create configuration file failed, messages: " + e.getMessage());
107-
Dialogs.showFatalError(Values.LOAD_CONFIG_ERROR, e);
107+
Dialogs.showFatalError(QiniuValueConsts.LOAD_CONFIG_ERROR, e);
108108
}
109109
showInputKeyDialog();
110110
}
@@ -146,13 +146,13 @@ private static JsonObject readConfig() {
146146
logger.info("load configuration into memory");
147147
String content = FileExecutor.readFile(configPath);
148148
if (Checker.isEmpty(content)) {
149-
Dialogs.showException(Values.LOAD_CONFIG_ERROR, new IOException("load configuration file error"));
149+
Dialogs.showException(QiniuValueConsts.LOAD_CONFIG_ERROR, new IOException("load configuration file error"));
150150
} else {
151151
jsonObject = new JsonParser().parse(content).getAsJsonObject();
152152
}
153153
} catch (Exception e) {
154154
logger.error("convert json string to json object failed, app'll reset");
155-
Dialogs.showException(Values.JSON_TO_OBJECT_ERROR, e);
155+
Dialogs.showException(QiniuValueConsts.JSON_TO_OBJECT_ERROR, e);
156156
}
157157
return jsonObject;
158158
}
@@ -193,7 +193,7 @@ private static void writeConfig(String configJson) {
193193
logger.info("rewrite configuration success");
194194
} catch (IOException e) {
195195
logger.error("rewrite configuration file failed, messages: " + e.getMessage());
196-
Dialogs.showFatalError(Values.LOAD_CONFIG_ERROR, e);
196+
Dialogs.showFatalError(QiniuValueConsts.LOAD_CONFIG_ERROR, e);
197197
}
198198
});
199199
}

‎src/main/java/org/code4everything/qiniu/config/QiConfiger.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.qiniu.storage.persistent.FileRecorder;
88
import com.qiniu.util.Auth;
99
import org.code4everything.qiniu.QiniuApplication;
10-
import org.code4everything.qiniu.modules.constant.Values;
10+
import org.code4everything.qiniu.constant.QiniuValueConsts;
1111
import org.code4everything.qiniu.view.Dialogs;
1212
import javafx.application.Platform;
1313
import org.apache.log4j.Logger;
@@ -39,7 +39,7 @@ void createAuth(String ak, String sk) {
3939
public boolean configUploadEnv(String zone, String bucket) {
4040
if (!checkNet()) {
4141
Platform.runLater(() -> {
42-
Dialogs.showError(Values.NET_ERROR);
42+
Dialogs.showError(QiniuValueConsts.NET_ERROR);
4343
System.exit(0);
4444
});
4545
return false;

‎src/main/java/org/code4everything/qiniu/modules/constant/Values.java‎ renamed to ‎src/main/java/org/code4everything/qiniu/constant/QiniuValueConsts.java‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
package org.code4everything.qiniu.modules.constant;
1+
package org.code4everything.qiniu.constant;
22

33
import java.io.File;
44

55
/**
6+
* 常量类
7+
*
68
* @author pantao
79
*/
8-
public class Values {
10+
public class QiniuValueConsts {
911

1012
public static final String QINIU_KEY_URL = "https://portal.qiniu.com/user/key";
1113

@@ -65,14 +67,6 @@ public class Values {
6567

6668
public static final int BUCKET_LIST_LIMIT_SIZE = 1000;
6769

68-
public static final long KB = 1024;
69-
70-
public static final long MB = KB * 1024;
71-
72-
public static final long GB = MB * 1024;
73-
74-
public static final long TB = GB * 1024;
75-
7670
public static final String REFRESH_SUCCESS = "刷新资源列表成功";
7771

7872
public static final String LIST_FILE_ERROR = "获取资源列表失败";
@@ -121,7 +115,9 @@ public class Values {
121115

122116
public static final String BUCKET_BANDWIDTH_COUNT = "空间带宽（KB）";
123117

124-
public static final long DATE_SPAN_OF_THIRTY_ONE = (long) 31 * 24 * 60 * 60 * 1000;
118+
public static final long DATE_SPAN_OF_THIRTY_ONE = 31 * 24 * 60 * 60 * 1000L;
125119

126120
public static final String UPLOADING_OR_DOWNLOADING = "有文件正在上传或下载中，是否确认退出？";
121+
122+
private QiniuValueConsts() {}
127123
}

0 commit comments

Comments
 (0)