fix some deprecations

Haehnchen · Haehnchen · commit 7ea2f17cc44e · 2025-12-17T13:22:22.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -84,6 +84,9 @@ tasks {
         withType<JavaCompile> {
             sourceCompatibility = it
             targetCompatibility = it
+
+            // show deprecations
+            // options.compilerArgs.addAll(listOf("-Xlint:deprecation"))
         }
         withType<KotlinCompile> {
             compilerOptions {
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/model/SymfonySymbolSearchModel.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/model/SymfonySymbolSearchModel.java
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceArgumentSelectionDialog.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceArgumentSelectionDialog.java
@@ -207,7 +207,7 @@ public boolean isCellEditable(ServiceParameter modelParameter) {
         public TableCellEditor getEditor(ServiceParameter modelParameter) {
 
             Set<String> sorted = modelParameter.getPossibleServices();
-            ComboBox comboBox = new ComboBox(sorted.toArray(new String[0]), 200);
+            ComboBox<String> comboBox = new ComboBox<>(sorted.toArray(new String[0]), 200);
             comboBox.setEditable(true);
 
             return new DefaultCellEditor(comboBox);
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineUtil.java
@@ -186,7 +186,7 @@ public static String getAnnotationRepositoryClass(@NotNull PhpDocTag phpDocTag,
             phpClass,
             text,
             "repositoryClass",
-            aVoid -> AnnotationUtil.getUseImportMap(phpDocTag)
+            aVoid -> AnnotationBackportUtil.getUseImportMap(phpDocTag)
         );
 
         if (repositoryClass == null) {
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/EntityHelper.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/EntityHelper.java
@@ -411,7 +411,7 @@ public static Collection<DoctrineModelField> getModelFields(@NotNull PhpClass ph
         PhpDocComment docComment = phpClass.getDocComment();
         if(docComment != null) {
             if(AnnotationBackportUtil.hasReference(docComment, "\\Doctrine\\ORM\\Mapping\\Entity")) {
-                Map<String, String> useImportMap = AnnotationUtil.getUseImportMap(docComment);
+                Map<String, String> useImportMap = AnnotationBackportUtil.getUseImportMap(docComment);
                 for(Field field: phpClass.getFields()) {
                     if (!field.isConstant()) {
                         if (AnnotationBackportUtil.hasReference(field.getDocComment(), ANNOTATION_FIELDS)) {
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrinePhpMappingDriver.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrinePhpMappingDriver.java
@@ -76,7 +76,7 @@ public DoctrineMetadataModel getMetadata(@NotNull DoctrineMappingDriverArguments
                     // collect import context based on the class name
                     String fqn = containingClass.getFQN();
                     if (!maps.containsKey(fqn)) {
-                        maps.put(fqn, AnnotationUtil.getUseImportMap(field.getDocComment()));
+                        maps.put(fqn, AnnotationBackportUtil.getUseImportMap(field.getDocComment()));
                     }
 
                     DoctrineModelField modelField = new DoctrineModelField(field.getName());
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/ContainerCollectionResolver.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/ContainerCollectionResolver.java
@@ -465,7 +465,7 @@ private Map<String, ContainerParameter> getParameters() {
                 // user input here; secure nullable values
                 String key = Entry.getKey();
                 if(key != null) {
-                    parametersMap.put(key, new ContainerParameter(key, Entry.getValue()));
+                    parametersMap.put(key, new ContainerParameter(key, Entry.getValue(), false));
                 }
             }
 
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/externalizer/ObjectStreamDataExternalizer.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/externalizer/ObjectStreamDataExternalizer.java
@@ -32,7 +32,9 @@ public T read(@NotNull DataInput in) throws IOException {
 
         T object = null;
         try {
-            object = (T) input.readObject();
+            @SuppressWarnings("unchecked")
+            T readObject = (T) input.readObject();
+            object = readObject;
         } catch (ClassNotFoundException | ClassCastException ignored) {
         }
 
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/TwigPath.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/TwigPath.java
@@ -46,15 +46,25 @@ public TwigPath(@NotNull String path, @NotNull String namespace, @NotNull TwigUt
         this.customPath = customPath;
     }
 
+    public static TwigPath createTwigPath(@NotNull String path, @NotNull String namespace, @NotNull TwigUtil.NamespaceType namespaceType, boolean customPath, boolean enabled) {
+        TwigPath twigPath = new TwigPath(path, namespace, namespaceType, customPath);
+        twigPath.enabled = enabled;
+        return twigPath;
+    }
+
     public static TwigPath createClone(@NotNull TwigPath twigPath) {
+        return createClone(twigPath, twigPath.isEnabled());
+    }
+
+    public static TwigPath createClone(@NotNull TwigPath twigPath, boolean enabled) {
         TwigPath newTwigPath = new TwigPath(
             twigPath.getPath(),
             twigPath.getNamespace(),
             twigPath.getNamespaceType(),
             twigPath.isCustomPath()
         );
 
-        newTwigPath.setEnabled(twigPath.isEnabled());
+        newTwigPath.enabled = enabled;
         return newTwigPath;
     }
 
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java
@@ -1499,10 +1499,11 @@ public static List<TwigPath> getTwigNamespaces(@NotNull Project project, boolean
         }
 
         // disable namespace explicitly disabled by user
-        for(TwigPath twigPath: twigPaths) {
+        for(int i = 0; i < twigPaths.size(); i++) {
+            TwigPath twigPath = twigPaths.get(i);
             TwigNamespaceSetting twigNamespaceSetting = findManagedTwigNamespace(project, twigPath);
             if(twigNamespaceSetting != null) {
-                twigPath.setEnabled(false);
+                twigPaths.set(i, TwigPath.createClone(twigPath, false));
             }
         }
 
@@ -1516,7 +1517,7 @@ public static List<TwigPath> getTwigNamespaces(@NotNull Project project, boolean
         if(twigNamespaceSettings != null) {
             for(TwigNamespaceSetting twigNamespaceSetting: twigNamespaceSettings) {
                 if(twigNamespaceSetting.isCustom()) {
-                    twigPaths.add(new TwigPath(twigNamespaceSetting.getPath(), twigNamespaceSetting.getNamespace(), twigNamespaceSetting.getNamespaceType(), true).setEnabled(twigNamespaceSetting.isEnabled()));
+                    twigPaths.add(TwigPath.createTwigPath(twigNamespaceSetting.getPath(), twigNamespaceSetting.getNamespace(), twigNamespaceSetting.getNamespaceType(), true, twigNamespaceSetting.isEnabled()));
                 }
             }
         }
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/form/TranslatorKeyExtractorDialog.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/form/TranslatorKeyExtractorDialog.java
@@ -37,7 +37,7 @@ public class TranslatorKeyExtractorDialog extends JDialog {
     private JButton buttonCancel;
     private JTextField textTranslationKey;
     private JPanel panelTableView;
-    private JComboBox comboBox1;
+    private JComboBox<String> comboBox1;
     private JCheckBox checkNavigateTo;
 
     private final ListTableModel<TranslationFileModel> listTableModel;
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterDialog.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterDialog.java
@@ -23,8 +23,8 @@ public class MethodParameterDialog extends JDialog {
     private JPanel contentPane;
     private JButton buttonOK;
     private JButton buttonCancel;
-    private JComboBox comboProvider;
-    private JComboBox comboContributor;
+    private JComboBox<String> comboProvider;
+    private JComboBox<String> comboContributor;
     private JTextField textCallTo;
     private JTextField textMethodName;
     private JTextField textIndex;
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeDialog.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeDialog.java
@@ -23,7 +23,7 @@ public class MethodSignatureTypeDialog extends JDialog {
     private JPanel contentPane;
     private JButton buttonOK;
     private JButton buttonCancel;
-    private JComboBox comboProvider;
+    private JComboBox<String> comboProvider;
     private JTextField textCallTo;
     private JTextField textMethodName;
     private JTextField textIndex;
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigNamespaceDialog.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigNamespaceDialog.java
@@ -87,7 +87,7 @@ private void onOK() {
 
         String namespacePath = this.namespacePath.getText();
 
-        TwigPath twigPath = new TwigPath(namespacePath, namespace, TwigUtil.NamespaceType.valueOf((String) this.namespaceType.getSelectedItem()), true);
+        TwigPath twigPath = TwigPath.createTwigPath(namespacePath, namespace, TwigUtil.NamespaceType.valueOf((String) this.namespaceType.getSelectedItem()), true, this.chkboxEnabled.isSelected());
         if (namespacePath.isEmpty()) {
             dispose();
             return;
@@ -106,7 +106,6 @@ private void onOK() {
             this.tableView.setRowSelectionInterval(row, row);
         }
 
-        twigPath.setEnabled(this.chkboxEnabled.isSelected());
         dispose();
     }
 
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigSettingsForm.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigSettingsForm.java
@@ -107,7 +107,7 @@ public void mouseClicked(MouseEvent e) {
                 for (TwigPath twigPath : sortableLookupItems) {
                     // dont use managed class here
                     // @TODO state to enabled (should not be here)
-                    TwigSettingsForm.this.modelList.addRow(TwigPath.createClone(twigPath).setEnabled(true));
+                    TwigSettingsForm.this.modelList.addRow(TwigPath.createClone(twigPath, true));
                 }
             }
         });
@@ -281,8 +281,12 @@ public Boolean valueOf(TwigPath twigPath) {
         }
 
         public void setValue(TwigPath twigPath, Boolean value) {
-            twigPath.setEnabled(value);
-            TwigSettingsForm.this.tableView.getListTableModel().fireTableDataChanged();
+            int index = TwigSettingsForm.this.tableView.getListTableModel().getItems().indexOf(twigPath);
+            if (index >= 0) {
+                TwigPath newTwigPath = TwigPath.createClone(twigPath, value);
+                TwigSettingsForm.this.tableView.getListTableModel().removeRow(index);
+                TwigSettingsForm.this.tableView.getListTableModel().insertRow(index, newTwigPath);
+            }
         }
 
         public int getWidth(JTable table) {

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public DoctrineMetadataModel getMetadata(@NotNull DoctrineMappingDriverArguments`
`76`	`76`	`// collect import context based on the class name`
`77`	`77`	`String fqn = containingClass.getFQN();`
`78`	`78`	`if (!maps.containsKey(fqn)) {`
`79`		`- maps.put(fqn, AnnotationUtil.getUseImportMap(field.getDocComment()));`
	`79`	`+ maps.put(fqn, AnnotationBackportUtil.getUseImportMap(field.getDocComment()));`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`DoctrineModelField modelField = new DoctrineModelField(field.getName());`
Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ private Map<String, ContainerParameter> getParameters() {`
`465`	`465`	`// user input here; secure nullable values`
`466`	`466`	`String key = Entry.getKey();`
`467`	`467`	`if(key != null) {`
`468`		`- parametersMap.put(key, new ContainerParameter(key, Entry.getValue()));`
	`468`	`+ parametersMap.put(key, new ContainerParameter(key, Entry.getValue(), false));`
`469`	`469`	`}`
`470`	`470`	`}`
`471`	`471`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,9 @@ public T read(@NotNull DataInput in) throws IOException {`
`32`	`32`
`33`	`33`	`T object = null;`
`34`	`34`	`try {`
`35`		`- object = (T) input.readObject();`
	`35`	`+ @SuppressWarnings("unchecked")`
	`36`	`+ T readObject = (T) input.readObject();`
	`37`	`+ object = readObject;`
`36`	`38`	`} catch (ClassNotFoundException \| ClassCastException ignored) {`
`37`	`39`	`}`
`38`	`40`
Original file line number	Diff line number	Diff line change
`@@ -1499,10 +1499,11 @@ public static List<TwigPath> getTwigNamespaces(@NotNull Project project, boolean`
`1499`	`1499`	`}`
`1500`	`1500`
`1501`	`1501`	`// disable namespace explicitly disabled by user`
`1502`		`- for(TwigPath twigPath: twigPaths) {`
	`1502`	`+ for(int i = 0; i < twigPaths.size(); i++) {`
	`1503`	`+ TwigPath twigPath = twigPaths.get(i);`
`1503`	`1504`	`TwigNamespaceSetting twigNamespaceSetting = findManagedTwigNamespace(project, twigPath);`
`1504`	`1505`	`if(twigNamespaceSetting != null) {`
`1505`		`- twigPath.setEnabled(false);`
	`1506`	`+ twigPaths.set(i, TwigPath.createClone(twigPath, false));`
`1506`	`1507`	`}`
`1507`	`1508`	`}`
`1508`	`1509`
`@@ -1516,7 +1517,7 @@ public static List<TwigPath> getTwigNamespaces(@NotNull Project project, boolean`
`1516`	`1517`	`if(twigNamespaceSettings != null) {`
`1517`	`1518`	`for(TwigNamespaceSetting twigNamespaceSetting: twigNamespaceSettings) {`
`1518`	`1519`	`if(twigNamespaceSetting.isCustom()) {`
`1519`		`- twigPaths.add(new TwigPath(twigNamespaceSetting.getPath(), twigNamespaceSetting.getNamespace(), twigNamespaceSetting.getNamespaceType(), true).setEnabled(twigNamespaceSetting.isEnabled()));`
	`1520`	`+ twigPaths.add(TwigPath.createTwigPath(twigNamespaceSetting.getPath(), twigNamespaceSetting.getNamespace(), twigNamespaceSetting.getNamespaceType(), true, twigNamespaceSetting.isEnabled()));`
`1520`	`1521`	`}`
`1521`	`1522`	`}`
`1522`	`1523`	`}`