9
9
import com .intellij .psi .PsiDirectory ;
10
10
import com .intellij .psi .PsiFile ;
11
11
import com .magento .idea .magento2plugin .actions .generation .data .ModuleReadmeMdData ;
12
- import com .magento .idea .magento2plugin .actions .generation .generator .util .DirectoryGenerator ;
13
12
import com .magento .idea .magento2plugin .actions .generation .generator .util .FileFromTemplateGenerator ;
14
13
import com .magento .idea .magento2plugin .magento .files .ModuleReadmeMdFile ;
15
14
import java .util .Properties ;
@@ -20,7 +19,6 @@ public class ModuleReadmeMdGenerator extends FileGenerator {
20
19
21
20
private final ModuleReadmeMdData moduleReadmeMdData ;
22
21
private final FileFromTemplateGenerator fileFromTemplateGenerator ;
23
- private final DirectoryGenerator directoryGenerator ;
24
22
25
23
/**
26
24
* Construct generator.
@@ -35,7 +33,6 @@ public ModuleReadmeMdGenerator(
35
33
super (project );
36
34
this .moduleReadmeMdData = moduleReadmeMdData ;
37
35
this .fileFromTemplateGenerator = new FileFromTemplateGenerator (project );
38
- this .directoryGenerator = DirectoryGenerator .getInstance ();
39
36
}
40
37
41
38
/**
@@ -52,7 +49,7 @@ public PsiFile generate(final String actionName) {
52
49
return fileFromTemplateGenerator .generate (
53
50
new ModuleReadmeMdFile (),
54
51
getAttributes (),
55
- moduleDir != null ? moduleDir : moduleReadmeMdData .getBaseDir (),
52
+ moduleDir == null ? moduleReadmeMdData .getBaseDir () : moduleDir ,
56
53
actionName
57
54
);
58
55
}
@@ -71,6 +68,6 @@ protected void fillAttributes(final Properties attributes) {
71
68
private @ Nullable PsiDirectory resolveModuleRoot (final @ NotNull ModuleReadmeMdData data ) {
72
69
final PsiDirectory packageDir = data .getBaseDir ().findSubdirectory (data .getPackageName ());
73
70
74
- return packageDir != null ? packageDir .findSubdirectory (data .getModuleName ()) : null ;
71
+ return packageDir == null ? null : packageDir .findSubdirectory (data .getModuleName ());
75
72
}
76
73
}
0 commit comments