wangtao
/
EasyCode
mirror of https://gitee.com/makejava/EasyCode.git
1
0
Fork 2
Code Issues Releases Wiki Activity

修复乱码问题，并修复针对部分版本无法获取module的虚拟文件问题。

This commit is contained in:
makejava 2018-07-19 15:57:52 +08:00
parent 5a19e37707
commit 8670fcb0fc
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/sjhy/plugin/tool/VelocityUtils.java
View File

@ -119,8 +119,9 @@ public class VelocityUtils {
map.put("packageName", cacheDataUtils.getPackageName()); map.put("packageName", cacheDataUtils.getPackageName());
if (selectModule != null) { if (selectModule != null) {
//module绝对路径 //module绝对路径
//noinspection ConstantConditions if (selectModule.getModuleFile()!=null) {
map.put("modulePath", selectModule.getModuleFile().getParent().getPath()); map.put("modulePath", selectModule.getModuleFile().getParent().getPath());
}
map.put("moduleName", selectModule.getName()); map.put("moduleName", selectModule.getName());
} }
return map; return map;

14
src/main/java/com/sjhy/plugin/ui/SelectSavePath.java
View File

@ -217,8 +217,12 @@ public class SelectSavePath extends JDialog {
//选择路径 //选择路径
pathChooseButton.addActionListener(e -> { pathChooseButton.addActionListener(e -> {
//将当前选中的model设置为基础路径 //将当前选中的model设置为基础路径
//noinspection ConstantConditions VirtualFile path = cacheDataUtils.getProject().getBaseDir();
VirtualFile virtualFile = FileChooser.chooseFile(FileChooserDescriptorFactory.createSingleFolderDescriptor(), cacheDataUtils.getProject(), getSelectModule().getModuleFile().getParent()); Module module = getSelectModule();
if (module!=null && module.getModuleFile()!=null) {
path = module.getModuleFile().getParent();
}
VirtualFile virtualFile = FileChooser.chooseFile(FileChooserDescriptorFactory.createSingleFolderDescriptor(), cacheDataUtils.getProject(), path);
if (virtualFile != null) { if (virtualFile != null) {
pathField.setText(virtualFile.getPath()); pathField.setText(virtualFile.getPath());
} }
@ -259,8 +263,10 @@ public class SelectSavePath extends JDialog {
*/ */
private String getBasePath() { private String getBasePath() {
Module module = getSelectModule(); Module module = getSelectModule();
//noinspection ConstantConditions String baseDir = cacheDataUtils.getProject().getBasePath();
String baseDir = module.getModuleFile().getParent().getPath(); if (module!=null && module.getModuleFile()!=null) {
baseDir = module.getModuleFile().getParent().getPath();
}
// 针对Maven项目 // 针对Maven项目
File file = new File(baseDir + "/src/main/java"); File file = new File(baseDir + "/src/main/java");
if (file.exists()) { if (file.exists()) {