Skip to content

Commit c9e897c

Browse files
author
Vitaliy Boyko
committed
Refactoring
1 parent 4d60ef0 commit c9e897c

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateCrontabXml.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import java.util.ArrayList;
1616
import java.util.Properties;
1717

18-
// todo: should be converted to another generator
1918
public class FindOrCreateCrontabXml {
2019
private Project project;
2120
private DirectoryGenerator directoryGenerator;
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/*
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
package com.magento.idea.magento2plugin.magento.files;
6+
7+
public class CronGroups {
8+
public static String FILE_NAME_NO_EXTENSION = "cron_groups";
9+
public static String CONFIG_TAG = "config";
10+
public static String GROUP_TAG = "group";
11+
public static String ID_ATTRIBUTE = "id";
12+
}

src/com/magento/idea/magento2plugin/stubs/indexes/CronGroupIndexer.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@
1414
import com.intellij.util.io.DataExternalizer;
1515
import com.intellij.util.io.EnumeratorStringDescriptor;
1616
import com.intellij.util.io.KeyDescriptor;
17+
import com.magento.idea.magento2plugin.magento.files.CronGroups;
1718
import com.magento.idea.magento2plugin.project.Settings;
1819
import org.jetbrains.annotations.NotNull;
19-
2020
import java.util.HashMap;
2121
import java.util.Map;
2222

2323
/**
2424
* CronGroupIndex collects all cron groups from cron_groups.xml files.
25-
* It's used for autocompleting groups during cronjob generation
2625
*/
2726
public class CronGroupIndexer extends FileBasedIndexExtension<String, String> {
2827
public static final ID<String, String> KEY
@@ -60,11 +59,10 @@ public DataIndexer<String, String, FileContent> getIndexer() {
6059
return map;
6160
}
6261

63-
// cron_groups file is load, now it's time to collect group IDs
6462
for (XmlTag xmlTag: xmlTags) {
65-
if (xmlTag.getName().equals("config")) {
66-
for (XmlTag typeNode: xmlTag.findSubTags("group")) {
67-
String groupId = typeNode.getAttributeValue("id");
63+
if (xmlTag.getName().equals(CronGroups.CONFIG_TAG)) {
64+
for (XmlTag typeNode: xmlTag.findSubTags(CronGroups.GROUP_TAG)) {
65+
String groupId = typeNode.getAttributeValue(CronGroups.ID_ATTRIBUTE);
6866

6967
if (groupId != null) {
7068
map.put(groupId, fileContent.getFile().getPath());
@@ -93,7 +91,7 @@ public DataExternalizer<String> getValueExternalizer() {
9391
@Override
9492
public FileBasedIndex.InputFilter getInputFilter() {
9593
return virtualFile -> (virtualFile.getFileType() == XmlFileType.INSTANCE
96-
&& virtualFile.getNameWithoutExtension().equals("cron_groups"));
94+
&& virtualFile.getNameWithoutExtension().equals(CronGroups.FILE_NAME_NO_EXTENSION));
9795
}
9896

9997
@Override

0 commit comments

Comments
 (0)