Revision 1200 org.gvsig.scripting/trunk/org.gvsig.scripting/org.gvsig.scripting.swing/org.gvsig.scripting.swing.impl/src/main/java/org/gvsig/scripting/swing/impl/syntaxhighlight/JRSyntaxTextArea.java

View differences:

JRSyntaxTextArea.java
6 6
import java.awt.Container;
7 7
import java.awt.Cursor;
8 8
import java.awt.Dimension;
9
import java.awt.Graphics;
10 9
import java.awt.Point;
11 10
import java.awt.Rectangle;
12 11
import java.awt.event.ActionEvent;
......
16 15
import java.awt.event.KeyListener;
17 16
import java.awt.event.MouseAdapter;
18 17
import java.awt.event.MouseEvent;
19
import java.awt.event.MouseListener;
20 18
import java.net.URL;
21 19
import java.util.ArrayList;
22 20
import java.util.Arrays;
......
61 59

  
62 60
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
63 61
import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
62
import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
64 63
import org.fife.ui.rtextarea.GutterIconInfo;
65 64
import org.fife.ui.rtextarea.RTextScrollPane;
66 65
import org.fife.ui.rtextarea.SearchContext;
67 66
import org.fife.ui.rtextarea.SearchEngine;
68 67
import org.fife.ui.rtextarea.SearchResult;
69
import org.gvsig.scripting.ScriptingLocator;
70 68
import org.gvsig.scripting.swing.api.ScriptingSwingLocator;
71 69
import org.gvsig.scripting.swing.api.ScriptingUIManager;
72 70
import org.gvsig.scripting.swing.api.SyntaxtHighlightTextComponent;
......
559 557
    }
560 558

  
561 559
    public void setContentType(String contentType) {
562
        this.textArea.setSyntaxEditingStyle(this.normalizeContentType(contentType));
560
        TokenMakerFactory factory = TokenMakerFactory.getDefaultInstance();
561
        Set<String> mimetypes = factory.keySet();
562
        String mimetype = this.normalizeContentType(contentType);
563
        if( !mimetypes.contains(mimetype)) {
564
          mimetype = mimetype.replace("-source", "");
565
          if( !mimetypes.contains(mimetype)) {
566
            mimetype = mimetype.replace("/x-", "/");
567
            if( !mimetypes.contains(mimetype)) {
568
              mimetype = this.normalizeContentType(contentType);
569
            }
570
          }
571
        }
572
        this.textArea.setSyntaxEditingStyle(mimetype);
563 573
    }
564 574

  
565 575
    public JScrollPane getJScrollPane() {

Also available in: Unified diff