This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 3fba58830d Prevent CCE NbGradleProjectImpl to DataObject
new 33b4306c74 Merge pull request #4943 from
lkishalmi/gradle-prevent-cce-dataobject
3fba58830d is described below
commit 3fba58830d08a07dbad75b54f1064c2536a8b5b8
Author: Laszlo Kishalmi <[email protected]>
AuthorDate: Tue Nov 8 16:41:09 2022 -0800
Prevent CCE NbGradleProjectImpl to DataObject
---
.../modules/gradle/editor/cli/GradleCliCompletionProvider.java | 5 ++++-
.../org/netbeans/modules/gradle/api/execute/GradleCommandLine.java | 1 +
.../modules/gradle/configurations/NewConfigurationPanel.java | 4 ++--
.../netbeans/modules/gradle/customizer/BuildActionsCustomizer.java | 6 ++++--
.../netbeans/modules/gradle/execute/GradleExecutorOptionsPanel.java | 4 ++--
5 files changed, 13 insertions(+), 7 deletions(-)
diff --git
a/extide/gradle.editor/src/org/netbeans/modules/gradle/editor/cli/GradleCliCompletionProvider.java
b/extide/gradle.editor/src/org/netbeans/modules/gradle/editor/cli/GradleCliCompletionProvider.java
index c9dde04c0a..9d93d84d12 100644
---
a/extide/gradle.editor/src/org/netbeans/modules/gradle/editor/cli/GradleCliCompletionProvider.java
+++
b/extide/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 @@ public class GradleCliCompletionProvider implements
CompletionProvider {
}
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
index df937eb4ab..bd90db0362 100644
---
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 @@ import org.openide.util.Utilities;
*/
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
index cf3e3003d9..fcf92a425e 100644
---
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.function.Supplier;
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 class NewConfigurationPanel extends javax.swing.JPanel
implements Documen
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
index b2c77d3053..a752bcbd40 100644
---
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.JLabel;
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 @@ import org.openide.util.NbBundle.Messages;
@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 class BuildActionsCustomizer extends
javax.swing.JPanel {
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
index 6f3cca70ae..e87cec2c6c 100644
---
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 class GradleExecutorOptionsPanel extends
javax.swing.JPanel {
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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
