Fix TokenHierarchy problem for NB7.3

lorenzos · Feb 15, 2013 · 27ecb47 · 27ecb47
1 parent 7219774
commit 27ecb47
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/src/org/lorenzos/zencoding/zeneditor/ZenEditor.java b/src/org/lorenzos/zencoding/zeneditor/ZenEditor.java
@@ -4,6 +4,7 @@
 import java.awt.Rectangle;
 import javax.swing.JEditorPane;
 import javax.swing.JOptionPane;
+import javax.swing.text.AbstractDocument;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
@@ -192,15 +193,21 @@ private void setup() throws ZenEditorException {
 			String cTemp;
 
 			// Get content type
-			TokenSequence tokenSequence = TokenHierarchy.get(this.doc).tokenSequence();
-			while (tokenSequence != null) {
-				tokenSequence.move(this.caretPosition - 1);
-				if (tokenSequence.moveNext()) {
-					this.setContentType(tokenSequence.language().mimeType());
-					tokenSequence = tokenSequence.embedded();
-				} else {
-					tokenSequence = null;
+			AbstractDocument abstractDoc = (AbstractDocument) doc;
+			abstractDoc.readLock();
+			try{
+				TokenSequence tokenSequence = TokenHierarchy.get(this.doc).tokenSequence();
+				while (tokenSequence != null) {
+					tokenSequence.move(this.caretPosition - 1);
+					if (tokenSequence.moveNext()) {
+						this.setContentType(tokenSequence.language().mimeType());
+						tokenSequence = tokenSequence.embedded();
+					} else {
+						tokenSequence = null;
+					}
 				}
+			} finally {
+				abstractDoc.readUnlock();
 			}
 
 			// Search for line start