File tree Expand file tree Collapse file tree 2 files changed +23
-0
lines changed Expand file tree Collapse file tree 2 files changed +23
-0
lines changed Original file line number Diff line number Diff line change 58
58
patches/8289.diff
59
59
patches/7893-draft.diff
60
60
patches/8442-draft.diff
61
+ patches/8460-draft.diff
61
62
patches/disable-error-notification.diff
62
63
patches/mvn-sh.diff
63
64
patches/project-marker-jdk.diff
Original file line number Diff line number Diff line change
1
+ --- a/java/maven.hints/src/org/netbeans/modules/maven/hints/pom/MavenPOMParser.java
2
+ +++ b/java/maven.hints/src/org/netbeans/modules/maven/hints/pom/MavenPOMParser.java
3
+ @@ -23,6 +23,7 @@
4
+ import java.util.prefs.PreferenceChangeListener;
5
+ import java.util.prefs.Preferences;
6
+ import javax.swing.event.ChangeListener;
7
+ + import javax.swing.text.Document;
8
+ import org.netbeans.api.editor.mimelookup.MimeRegistration;
9
+ import org.netbeans.editor.BaseDocument;
10
+ import org.netbeans.modules.maven.embedder.EmbedderFactory;
11
+ @@ -76,9 +77,9 @@
12
+ return;
13
+ }
14
+ //#236116 passing document protects from looking it up later and causing a deadlock.
15
+ - final BaseDocument document = (BaseDocument)snapshot.getSource().getDocument(false);
16
+ + final Document document = snapshot.getSource().getDocument(false);
17
+ final DataObject d = sFile.getLookup().lookup(DataObject.class);
18
+ - ModelSource ms = Utilities.createModelSource(sFile, d, document);
19
+ + ModelSource ms = Utilities.createModelSource(sFile, d, document instanceof BaseDocument bd ? bd : null);
20
+ synchronized (this) {
21
+ theModel = POMModelFactory.getDefault().getModel(ms);
22
+ lastSnapshot = snapshot;
You can’t perform that action at this time.
0 commit comments