Merge pull request #4943 from lkishalmi/gradle-prevent-cce-dataobject

Prevent CCE NbGradleProjectImpl to DataObject
apache · Nov 9, 2022 · 33b4306 · 33b4306
2 parents 31c6618 + 3fba588
commit 33b4306
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/...gradle.editor/src/org/netbeans/modules/gradle/editor/cli/GradleCliCompletionProvider.java b/...gradle.editor/src/org/netbeans/modules/gradle/editor/cli/GradleCliCompletionProvider.java
@@ -68,6 +68,9 @@ public class GradleCliCompletionProvider implements CompletionProvider {
     private static final Pattern PROP_INPUT = Pattern.compile("\\$\\{([\\w.]*)$"); //NOI18N
     private static final String INPUT_TOKEN = "input:"; //NOI18N
     private static final Set<GradleCommandLine.GradleOptionItem> GRADLE_OPTIONS;
+
+    //TODO: Move this one to GradleCommandLine in NetBeans 17
+    public static final String GRADLE_PROJECT_PROPERTY = "gradle-project"; //NOI18N
 
     static {
         Set<GradleCommandLine.GradleOptionItem> all = new HashSet<>();
@@ -105,7 +108,7 @@ protected void query(CompletionResultSet resultSet, Document doc, int caretOffse
                 }
 
                 Project project = null;
-                Object prop = doc.getProperty(Document.StreamDescriptionProperty);
+                Object prop = doc.getProperty(GRADLE_PROJECT_PROPERTY);
                 if (prop != null && prop instanceof Project) {
                     project = (Project) prop;
                 }

diff --git a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleCommandLine.java b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleCommandLine.java
@@ -60,6 +60,7 @@
  */
 public final class GradleCommandLine implements Serializable {
 
+    private static final String GRADLE_PROJECT_PROPERTY = "gradle-project"; //NOI18N
     private static final Logger LOGGER = Logger.getLogger(GradleCommandLine.class.getName());
     private static final String PROP_JVMARGS = "org.gradle.jvmargs"; // NOI18N
     /**

diff --git a/extide/gradle/src/org/netbeans/modules/gradle/configurations/NewConfigurationPanel.java b/extide/gradle/src/org/netbeans/modules/gradle/configurations/NewConfigurationPanel.java
@@ -27,10 +27,10 @@
 import java.util.stream.Collectors;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import javax.swing.text.Document;
 import javax.swing.text.EditorKit;
 import org.netbeans.api.project.Project;
 import org.netbeans.modules.gradle.api.execute.GradleExecConfiguration;
+import org.netbeans.modules.gradle.customizer.BuildActionsCustomizer;
 import org.openide.NotificationLineSupport;
 import org.openide.filesystems.FileUtil;
 import org.openide.text.CloneableEditorSupport;
@@ -55,7 +55,7 @@ public NewConfigurationPanel(Project project, Supplier<Collection<? extends Grad
         initComponents();
         EditorKit kit = CloneableEditorSupport.getEditorKit("text/x-gradle-cli"); //NOI18N
         txParameters.setEditorKit(kit);
-        txParameters.getDocument().putProperty(Document.StreamDescriptionProperty, project);
+        txParameters.getDocument().putProperty(BuildActionsCustomizer.GRADLE_PROJECT_PROPERTY, project);
         if (isNew) {
             txId.getDocument().addDocumentListener(this);
             txId.getDocument().addDocumentListener(this);

diff --git a/extide/gradle/src/org/netbeans/modules/gradle/customizer/BuildActionsCustomizer.java b/extide/gradle/src/org/netbeans/modules/gradle/customizer/BuildActionsCustomizer.java
@@ -40,7 +40,6 @@
 import javax.swing.JList;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import javax.swing.text.Document;
 import javax.swing.text.EditorKit;
 import org.netbeans.api.project.Project;
 import org.netbeans.modules.gradle.actions.CustomActionRegistrationSupport;
@@ -58,6 +57,9 @@
 @Messages("TXT_CUSTOM=Custom...")
 public class BuildActionsCustomizer extends javax.swing.JPanel {
 
+    //TODO: Move this one to GradleCommandLine in NetBeans 17
+    public static final String GRADLE_PROJECT_PROPERTY = "gradle-project"; //NOI18N
+
     private static final String CUSTOM_ACTION = Bundle.TXT_CUSTOM();
     private static final String CARD_NOSELECT = "empty"; //NOI18N
     private static final String CARD_DETAILS = "details"; //NOI18N
@@ -103,7 +105,7 @@ public BuildActionsCustomizer(Project project, ConfigurationSnapshot snapshot) {
         tfLabel.getDocument().addDocumentListener(applyListener);
         EditorKit kit = CloneableEditorSupport.getEditorKit("text/x-gradle-cli"); //NOI18N
         taArgs.setEditorKit(kit);
-        taArgs.getDocument().putProperty(Document.StreamDescriptionProperty, project);
+        taArgs.getDocument().putProperty(GRADLE_PROJECT_PROPERTY, project);
         taArgs.getDocument().addDocumentListener(applyListener);
         initDefaultModels();
         comboReady = true;

diff --git a/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleExecutorOptionsPanel.java b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleExecutorOptionsPanel.java
@@ -20,11 +20,11 @@
 package org.netbeans.modules.gradle.execute;
 
 import org.netbeans.modules.gradle.api.execute.GradleCommandLine;
-import javax.swing.text.Document;
 import javax.swing.text.EditorKit;
 import org.netbeans.api.project.Project;
 import org.netbeans.modules.gradle.actions.CustomActionRegistrationSupport;
 import org.netbeans.modules.gradle.api.execute.GradleExecConfiguration;
+import org.netbeans.modules.gradle.customizer.BuildActionsCustomizer;
 import org.openide.text.CloneableEditorSupport;
 
 /**
@@ -50,7 +50,7 @@ public GradleExecutorOptionsPanel(Project project) {
         EditorKit kit = CloneableEditorSupport.getEditorKit("text/x-gradle-cli"); //NOI18N
         epCLI.setEditorKit(kit);
         if (project != null) {
-            epCLI.getDocument().putProperty(Document.StreamDescriptionProperty, project);
+            epCLI.getDocument().putProperty(BuildActionsCustomizer.GRADLE_PROJECT_PROPERTY, project);
         } else {
             tfRememberAs.setEnabled(false);
             lbRememberAs.setEnabled(false);