Skip to content

Commit 3d8e446

Browse files
author
Vitaliy Boyko
committed
Refactored Packages
1 parent 2f254fc commit 3d8e446

30 files changed

+135
-145
lines changed

‎src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAPluginDialog.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
import com.magento.idea.magento2plugin.actions.generation.generator.PluginDiXmlGenerator;
1616
import com.magento.idea.magento2plugin.indexes.ModuleIndex;
1717
import com.magento.idea.magento2plugin.magento.files.Plugin;
18+
import com.magento.idea.magento2plugin.magento.packages.Areas;
1819
import com.magento.idea.magento2plugin.magento.packages.Package;
1920
import com.magento.idea.magento2plugin.ui.FilteredComboBox;
2021
import org.jetbrains.annotations.NotNull;
2122
import javax.swing.*;
22-
import java.awt.*;
2323
import java.awt.event.*;
2424
import com.magento.idea.magento2plugin.magento.packages.File;
2525
import java.util.List;
@@ -94,7 +94,7 @@ private void fillPluginTypeOptions() {
9494
}
9595

9696
private void fillTargetAreaOptions() {
97-
for(Package.Areas area: Package.Areas.values()) {
97+
for(Areas area: Areas.values()) {
9898
pluginArea.addItem(area.toString());
9999
}
100100
}
@@ -169,12 +169,12 @@ private void createUIComponents() {
169169

170170
private String getNamespace() {
171171
String targetModule = getPluginModule();
172-
String namespace = targetModule.replace(Package.VENDOR_MODULE_NAME_SEPARATOR, Package.FQN_SEPARATOR);
173-
namespace = namespace.concat(Package.FQN_SEPARATOR);
174-
return namespace.concat(getPluginDirectory().replace(File.separator, Package.FQN_SEPARATOR));
172+
String namespace = targetModule.replace(Package.vendorModuleNameSeparator, Package.fqnSeparator);
173+
namespace = namespace.concat(Package.fqnSeparator);
174+
return namespace.concat(getPluginDirectory().replace(File.separator, Package.fqnSeparator));
175175
}
176176

177177
private String getPluginClassFqn() {
178-
return getNamespace().concat(Package.FQN_SEPARATOR).concat(getPluginClassName());
178+
return getNamespace().concat(Package.fqnSeparator).concat(getPluginClassName());
179179
}
180180
}

‎src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAnObserverDialog.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.magento.idea.magento2plugin.actions.generation.generator.ObserverClassGenerator;
1515
import com.magento.idea.magento2plugin.actions.generation.generator.ObserverEventsXmlGenerator;
1616
import com.magento.idea.magento2plugin.indexes.ModuleIndex;
17+
import com.magento.idea.magento2plugin.magento.packages.Areas;
1718
import com.magento.idea.magento2plugin.magento.packages.File;
1819
import com.magento.idea.magento2plugin.magento.packages.Package;
1920
import com.magento.idea.magento2plugin.ui.FilteredComboBox;
@@ -102,7 +103,7 @@ public static void open(@NotNull final Project project, final String targetEvent
102103
* Setup observer area combobox.
103104
*/
104105
private void fillTargetAreaOptions() {
105-
for (final Package.Areas area : Package.Areas.values()) {
106+
for (final Areas area : Areas.values()) {
106107
observerArea.addItem(area.toString());
107108
}
108109
}
@@ -164,19 +165,19 @@ private void createUIComponents() { //NOPMD
164165
private String getNamespace() {
165166
final String targetModule = getObserverModule();
166167
String namespace = targetModule.replace(
167-
Package.VENDOR_MODULE_NAME_SEPARATOR,
168-
Package.FQN_SEPARATOR
168+
Package.vendorModuleNameSeparator,
169+
Package.fqnSeparator
169170
);
170171

171-
namespace = namespace.concat(Package.FQN_SEPARATOR);
172+
namespace = namespace.concat(Package.fqnSeparator);
172173
return namespace.concat(getObserverDirectory().replace(
173174
File.separator,
174-
Package.FQN_SEPARATOR)
175+
Package.fqnSeparator)
175176
);
176177
}
177178

178179
private String getObserverClassFqn() {
179-
return getNamespace().concat(Package.FQN_SEPARATOR).concat(getObserverClassName());
180+
return getNamespace().concat(Package.fqnSeparator).concat(getObserverClassName());
180181
}
181182
}
182183

‎src/com/magento/idea/magento2plugin/actions/generation/dialog/NewBlockDialog.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,20 +130,20 @@ private void suggestBlockDirectory() {
130130
}
131131

132132
private String getModuleIdentifierPath() {
133-
String[]parts = moduleName.split(Package.VENDOR_MODULE_NAME_SEPARATOR);
133+
String[]parts = moduleName.split(Package.vendorModuleNameSeparator);
134134
if (parts[0] == null || parts[1] == null || parts.length > 2) {
135135
return null;
136136
}
137137
return parts[0] + File.separator + parts[1];
138138
}
139139

140140
private String getNamespace() {
141-
String[]parts = moduleName.split(Package.VENDOR_MODULE_NAME_SEPARATOR);
141+
String[]parts = moduleName.split(Package.vendorModuleNameSeparator);
142142
if (parts[0] == null || parts[1] == null || parts.length > 2) {
143143
return null;
144144
}
145-
String directoryPart = getBlockDirectory().replace(File.separator, Package.FQN_SEPARATOR);
146-
return parts[0] + Package.FQN_SEPARATOR + parts[1]+ Package.FQN_SEPARATOR + directoryPart;
145+
String directoryPart = getBlockDirectory().replace(File.separator, Package.fqnSeparator);
146+
return parts[0] + Package.fqnSeparator + parts[1]+ Package.fqnSeparator + directoryPart;
147147
}
148148

149149
public void onCancel() {

‎src/com/magento/idea/magento2plugin/actions/generation/dialog/NewGraphQlResolverDialog.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,24 +129,24 @@ private void suggestGraphQlResolverDirectory() {
129129
}
130130

131131
private String getModuleIdentifierPath() {
132-
String[]parts = moduleName.split(Package.VENDOR_MODULE_NAME_SEPARATOR);
132+
String[]parts = moduleName.split(Package.vendorModuleNameSeparator);
133133
if (parts[0] == null || parts[1] == null || parts.length > 2) {
134134
return null;
135135
}
136136
return parts[0] + File.separator + parts[1];
137137
}
138138

139139
private String getNamespace() {
140-
String[]parts = moduleName.split(Package.VENDOR_MODULE_NAME_SEPARATOR);
140+
String[]parts = moduleName.split(Package.vendorModuleNameSeparator);
141141
if (parts[0] == null || parts[1] == null || parts.length > 2) {
142142
return null;
143143
}
144-
String directoryPart = getGraphQlResolverDirectory().replace(File.separator, Package.FQN_SEPARATOR);
145-
return parts[0] + Package.FQN_SEPARATOR + parts[1] + Package.FQN_SEPARATOR + directoryPart;
144+
String directoryPart = getGraphQlResolverDirectory().replace(File.separator, Package.fqnSeparator);
145+
return parts[0] + Package.fqnSeparator + parts[1] + Package.fqnSeparator + directoryPart;
146146
}
147147

148148
private String getGraphQlResolverClassFqn() {
149-
return getNamespace().concat(Package.FQN_SEPARATOR).concat(getGraphQlResolverClassName());
149+
return getNamespace().concat(Package.fqnSeparator).concat(getGraphQlResolverClassName());
150150
}
151151

152152
public void onCancel() {

‎src/com/magento/idea/magento2plugin/actions/generation/dialog/NewModuleDialog.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.magento.idea.magento2plugin.actions.generation.util.NavigateToCreatedFile;
2323
import com.magento.idea.magento2plugin.indexes.ModuleIndex;
2424
import com.magento.idea.magento2plugin.magento.files.ComposerJson;
25+
import com.magento.idea.magento2plugin.magento.packages.Licenses;
2526
import com.magento.idea.magento2plugin.magento.packages.Package;
2627
import com.magento.idea.magento2plugin.project.Settings;
2728
import com.magento.idea.magento2plugin.util.CamelCaseToHyphen;
@@ -32,10 +33,8 @@
3233
import javax.swing.event.ListSelectionEvent;
3334
import javax.swing.event.ListSelectionListener;
3435
import java.awt.event.*;
35-
import java.util.ArrayList;
3636
import java.util.List;
3737
import java.util.Vector;
38-
import java.util.stream.IntStream;
3938

4039
public class NewModuleDialog extends AbstractDialog implements ListSelectionListener {
4140
@NotNull
@@ -130,7 +129,7 @@ public void actionPerformed(ActionEvent e) {
130129

131130
private void detectPackageName(@NotNull PsiDirectory initialBaseDir) {
132131
PsiDirectory parentDir = initialBaseDir.getParent();
133-
if (parentDir != null && parentDir.toString().endsWith(Package.PACKAGES_ROOT)) {
132+
if (parentDir != null && parentDir.toString().endsWith(Package.packagesRoot)) {
134133
packageName.setVisible(false);
135134
packageNameLabel.setVisible(false);
136135
this.detectedPackageName = initialBaseDir.getName();
@@ -215,7 +214,7 @@ public String getModuleVersion() {
215214

216215
public List getModuleLicense() {
217216
List selectedLicenses = this.moduleLicense.getSelectedValuesList();
218-
Package.License customLicense = Package.License.CUSTOM;
217+
Licenses customLicense = Licenses.CUSTOM;
219218

220219
if (selectedLicenses.contains(customLicense.getLicenseName())) {
221220
selectedLicenses.remove(customLicense.getLicenseName());
@@ -244,10 +243,10 @@ private String getComposerPackageName() {
244243
}
245244

246245
private void setLicenses() {
247-
Package.License[] licenses = Package.License.values();
246+
Licenses[] licenses = Licenses.values();
248247
Vector<String> licenseNames = new Vector<>(licenses.length);
249248

250-
for (Package.License license: licenses) {
249+
for (Licenses license: licenses) {
251250
licenseNames.add(license.getLicenseName());
252251
}
253252

@@ -272,7 +271,7 @@ private void handleModuleCustomLicenseInputVisibility() {
272271
boolean isCustomLicenseSelected = false;
273272

274273
for (Object value: moduleLicense.getSelectedValuesList()) {
275-
if (Package.License.CUSTOM.getLicenseName().equals(value.toString())) {
274+
if (Licenses.CUSTOM.getLicenseName().equals(value.toString())) {
276275
isCustomLicenseSelected = true;
277276

278277
break;

‎src/com/magento/idea/magento2plugin/actions/generation/dialog/NewViewModelDialog.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,20 +128,20 @@ private void suggestViewModelDirectory() {
128128
}
129129

130130
private String getModuleIdentifierPath() {
131-
String[]parts = moduleName.split(Package.VENDOR_MODULE_NAME_SEPARATOR);
131+
String[]parts = moduleName.split(Package.vendorModuleNameSeparator);
132132
if (parts[0] == null || parts[1] == null || parts.length > 2) {
133133
return null;
134134
}
135135
return parts[0] + File.separator + parts[1];
136136
}
137137

138138
private String getNamespace() {
139-
String[]parts = moduleName.split(Package.VENDOR_MODULE_NAME_SEPARATOR);
139+
String[]parts = moduleName.split(Package.vendorModuleNameSeparator);
140140
if (parts[0] == null || parts[1] == null || parts.length > 2) {
141141
return null;
142142
}
143-
String directoryPart = getViewModelDirectory().replace(File.separator, Package.FQN_SEPARATOR);
144-
return parts[0] + Package.FQN_SEPARATOR + parts[1] + Package.FQN_SEPARATOR + directoryPart;
143+
String directoryPart = getViewModelDirectory().replace(File.separator, Package.fqnSeparator);
144+
return parts[0] + Package.fqnSeparator + parts[1] + Package.fqnSeparator + directoryPart;
145145
}
146146

147147
public void onCancel() {

‎src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideClassByAPreferenceDialog.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import com.magento.idea.magento2plugin.actions.generation.generator.PreferenceDiXmlGenerator;
1717
import com.magento.idea.magento2plugin.bundles.CommonBundle;
1818
import com.magento.idea.magento2plugin.indexes.ModuleIndex;
19+
import com.magento.idea.magento2plugin.magento.packages.Areas;
1920
import com.magento.idea.magento2plugin.magento.packages.Package;
2021
import com.magento.idea.magento2plugin.ui.FilteredComboBox;
2122
import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
@@ -111,7 +112,7 @@ private void suggestPreferenceClassName(PhpClass targetClass) {
111112
}
112113

113114
private void fillTargetAreaOptions() {
114-
for(Package.Areas area: Package.Areas.values()) {
115+
for(Areas area: Areas.values()) {
115116
preferenceArea.addItem(area.toString());
116117
}
117118
}
@@ -184,12 +185,12 @@ private void createUIComponents() {
184185

185186
private String getNamespace() {
186187
String targetModule = getPreferenceModule();
187-
String namespace = targetModule.replace(Package.VENDOR_MODULE_NAME_SEPARATOR, Package.FQN_SEPARATOR);
188-
namespace = namespace.concat(Package.FQN_SEPARATOR);
189-
return namespace.concat(getPreferenceDirectory().replace(File.separator, Package.FQN_SEPARATOR));
188+
String namespace = targetModule.replace(Package.vendorModuleNameSeparator, Package.fqnSeparator);
189+
namespace = namespace.concat(Package.fqnSeparator);
190+
return namespace.concat(getPreferenceDirectory().replace(File.separator, Package.fqnSeparator));
190191
}
191192

192193
private String getPreferenceClassFqn() {
193-
return getNamespace().concat(Package.FQN_SEPARATOR).concat(getPreferenceClassName());
194+
return getNamespace().concat(Package.fqnSeparator).concat(getPreferenceClassName());
194195
}
195196
}

‎src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleBlockClassGenerator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public PsiFile generate(String actionName) {
6666

6767
@NotNull
6868
private String getBlockFqn() {
69-
return blockFileData.getNamespace() + Package.FQN_SEPARATOR + blockFileData.getBlockClassName();
69+
return blockFileData.getNamespace() + Package.fqnSeparator + blockFileData.getBlockClassName();
7070
}
7171

7272
private PhpFile createBlockClass(String actionName) {
@@ -94,7 +94,7 @@ protected void fillAttributes(Properties attributes) {
9494
attributes.setProperty("EXTENDS", BlockPhp.STOREFRONT_BLOCK_NAME);
9595
return;
9696
}
97-
attributes.setProperty("EXTENDS", Package.FQN_SEPARATOR + BlockPhp.STOREFRONT_BLOCK_FQN);
97+
attributes.setProperty("EXTENDS", Package.fqnSeparator + BlockPhp.STOREFRONT_BLOCK_FQN);
9898
}
9999

100100
public String getBlockModule() {

‎src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleViewModelClassGenerator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public PsiFile generate(String actionName) {
6565

6666
@NotNull
6767
private String getViewModelFqn() {
68-
return viewModelFileData.getNamespace() + Package.FQN_SEPARATOR + viewModelFileData.getViewModelClassName();
68+
return viewModelFileData.getNamespace() + Package.fqnSeparator + viewModelFileData.getViewModelClassName();
6969
}
7070

7171
private PhpFile createViewModelClass(String actionName) {

‎src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleXmlGenerator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public PsiFile generate(String actionName) {
3535
ModuleDirectoriesData moduleDirectoriesData = directoryGenerator.createOrFindModuleDirectories(moduleXmlData.getPackageName(), moduleXmlData.getModuleName(), moduleXmlData.getBaseDir());
3636
return fileFromTemplateGenerator.generate(ModuleXml.getInstance(), getAttributes(), moduleDirectoriesData.getModuleEtcDirectory(), actionName);
3737
}
38-
PsiDirectory etcDirectory = directoryGenerator.findOrCreateSubdirectory(moduleXmlData.getBaseDir(), Package.MODULE_BASE_AREA_DIR);
38+
PsiDirectory etcDirectory = directoryGenerator.findOrCreateSubdirectory(moduleXmlData.getBaseDir(), Package.moduleBaseAreaDir);
3939
return fileFromTemplateGenerator.generate(ModuleXml.getInstance(), getAttributes(), etcDirectory, actionName);
4040
}
4141

0 commit comments

Comments
 (0)