Skip to content

Commit e3308e0

Browse files
committedJun 28, 2024··
fix deprecations
1 parent 86bc9ed commit e3308e0

File tree

9 files changed

+27
-12
lines changed

9 files changed

+27
-12
lines changed
 

‎src/com/magento/idea/magento2plugin/actions/generation/data/code/ClassPropertyData.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import java.util.ArrayList;
99
import java.util.List;
10-
import org.apache.commons.lang.StringUtils;
10+
import org.apache.commons.lang3.StringUtils;
1111

1212
public class ClassPropertyData {
1313
private final List<String> data = new ArrayList<>();

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
import javax.swing.KeyStroke;
8484
import javax.swing.event.DocumentEvent;
8585
import javax.swing.table.DefaultTableModel;
86-
import org.apache.commons.lang.StringUtils;
86+
import org.apache.commons.lang3.StringUtils;
8787
import org.jetbrains.annotations.NotNull;
8888

8989
@SuppressWarnings({

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import javax.swing.KeyStroke;
4949
import javax.swing.event.ListSelectionEvent;
5050
import javax.swing.event.ListSelectionListener;
51-
import org.apache.commons.lang.ArrayUtils;
51+
import org.apache.commons.lang3.ArrayUtils;
5252
import org.jetbrains.annotations.NotNull;
5353

5454
@SuppressWarnings({"PMD.TooManyFields", "PMD.DataClass", "PMD.UnusedPrivateMethod"})

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import java.util.ArrayList;
1212
import java.util.List;
1313
import javax.swing.table.DefaultTableModel;
14-
import org.apache.commons.lang.StringUtils;
14+
import org.apache.commons.lang3.StringUtils;
1515

1616
public final class ClassPropertyFormatterUtil {
1717

‎src/com/magento/idea/magento2plugin/linemarker/php/PluginLineMarkerProvider.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import java.util.List;
2929
import java.util.Map;
3030
import java.util.Set;
31-
import org.apache.commons.lang.WordUtils;
31+
import org.apache.commons.lang3.StringUtils;
3232
import org.jetbrains.annotations.NotNull;
3333
import org.jetbrains.annotations.Nullable;
3434

@@ -236,7 +236,7 @@ public List<Method> collect(final @NotNull Method psiElement) {
236236

237237
final List<PluginData> pluginDataList = pluginClassCache.getPluginsForClass(methodClass);
238238
final List<PluginMethodData> pluginMethods = pluginClassCache.getPluginMethods(pluginDataList);
239-
final String classMethodName = WordUtils.capitalize(psiElement.getName());
239+
final String classMethodName = StringUtils.capitalize(psiElement.getName());
240240

241241
pluginMethods.removeIf(pluginMethod -> !isPluginMethodName(pluginMethod.getMethodName(), classMethodName));
242242
sortMethods(pluginMethods, results);

‎src/com/magento/idea/magento2plugin/magento/packages/ComposerPackageModelImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package com.magento.idea.magento2plugin.magento.packages;
66

77
import com.intellij.json.psi.*;
8-
import org.apache.commons.lang.StringUtils;
8+
import org.apache.commons.lang3.StringUtils;
99
import org.jetbrains.annotations.NotNull;
1010
import org.jetbrains.annotations.Nullable;
1111
import java.util.ArrayList;

‎src/com/magento/idea/magento2plugin/project/startup/CheckIfMagentoPathIsValidActivity.java

+18-3
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,20 @@
55

66
package com.magento.idea.magento2plugin.project.startup;
77

8+
import kotlin.Unit;
9+
import kotlin.coroutines.Continuation;
810
import com.intellij.openapi.project.Project;
911
import com.intellij.openapi.startup.StartupActivity;
12+
import com.intellij.openapi.startup.ProjectActivity;
1013
import com.magento.idea.magento2plugin.init.ConfigurationManager;
1114
import com.magento.idea.magento2plugin.project.Settings;
1215
import com.magento.idea.magento2plugin.util.magento.MagentoBasePathUtil;
1316
import org.jetbrains.annotations.NotNull;
17+
import org.jetbrains.annotations.Nullable;
1418

15-
public class CheckIfMagentoPathIsValidActivity implements StartupActivity {
19+
public class CheckIfMagentoPathIsValidActivity implements StartupActivity, ProjectActivity {
1620

17-
@Override
18-
public void runActivity(final @NotNull Project project) {
21+
public void registerSettings(final @NotNull Project project) {
1922
final Settings settings = Settings.getInstance(project);
2023
final String path = settings.magentoPath;
2124
if (settings.pluginEnabled && (path == null || path.isEmpty())) {
@@ -27,4 +30,16 @@ public void runActivity(final @NotNull Project project) {
2730
ConfigurationManager.suggestToConfigureMagentoPath(project);
2831
}
2932
}
33+
34+
@Override
35+
public void runActivity(final @NotNull Project project) {
36+
registerSettings(project);
37+
}
38+
39+
@Nullable
40+
@Override
41+
public Object execute(@NotNull Project project, @NotNull Continuation<? super Unit> continuation) {
42+
registerSettings(project);
43+
return null;
44+
}
3045
}

‎src/com/magento/idea/magento2plugin/project/util/GetMagentoVersionUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import java.util.HashMap;
1616
import java.util.List;
1717
import java.util.Map;
18-
import org.apache.commons.lang.StringUtils;
18+
import org.apache.commons.lang3.StringUtils;
1919
import org.jetbrains.annotations.NotNull;
2020
import org.jetbrains.annotations.Nullable;
2121

‎src/com/magento/idea/magento2plugin/util/php/PhpTypeMetadataParserUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.util.regex.Matcher;
2828
import java.util.regex.Pattern;
2929
import java.util.stream.Collectors;
30-
import org.apache.commons.lang.StringUtils;
30+
import org.apache.commons.lang3.StringUtils;
3131
import org.jetbrains.annotations.NotNull;
3232

3333
@SuppressWarnings("PMD.GodClass")

0 commit comments

Comments
 (0)
Please sign in to comment.