# This patch file was generated by NetBeans IDE # This patch can be applied using context Tools: Apply Diff Patch action on respective folder. # It uses platform neutral UTF-8 encoding. # Above lines and this line are ignored by the patching process. Index: editor/src/org/netbeans/modules/editor/impl/highlighting/ComposedTextHighlighting.java --- editor/src/org/netbeans/modules/editor/impl/highlighting/ComposedTextHighlighting.java Base (1.2) +++ editor/src/org/netbeans/modules/editor/impl/highlighting/ComposedTextHighlighting.java Locally Modified (Based On 1.2) @@ -197,26 +197,20 @@ InputMethodHighlight imh = (InputMethodHighlight) sourceValue; - // Get the style attributes - Map style = imh.getStyle(); - if (style == null) { - style = Toolkit.getDefaultToolkit().mapInputMethodHighlight(imh); - if (style == null) { - style = Collections.emptyMap(); - } - } - - for(TextAttribute styleAttrKey : style.keySet()) { - Object styleAttrValue = style.get(styleAttrKey); - if (styleAttrKey == TextAttribute.INPUT_METHOD_UNDERLINE) { - LOG.fine("Underline ... " + imh); //NOI18N - return highlightUnderlined; - } else if (styleAttrKey == TextAttribute.SWAP_COLORS) { - LOG.fine("Inverse ... " + imh); //NOI18N + if (imh == InputMethodHighlight.SELECTED_CONVERTED_TEXT_HIGHLIGHT) { + LOG.fine("SELECTED_CONVERTED_TEXT_HIGHLIGHT Inverse ... " + imh); //NOI18N return highlightInverse; + } else if (imh == InputMethodHighlight.SELECTED_RAW_TEXT_HIGHLIGHT) { + LOG.fine("SELECTED_RAW_TEXT_HIGHLIGHT Inverse ... " + imh); //NOI18N + return highlightInverse; + } else if (imh == InputMethodHighlight.UNSELECTED_CONVERTED_TEXT_HIGHLIGHT) { + LOG.fine("UNSELECTED_CONVERTED_TEXT_HIGHLIGHT Underline ... " + imh); //NOI18N + return highlightUnderlined; + } else if (imh == InputMethodHighlight.UNSELECTED_RAW_TEXT_HIGHLIGHT) { + LOG.fine("UNSELECTED_RAW_TEXT_HIGHLIGHT Underline ... " + imh); //NOI18N + return highlightUnderlined; } } - } LOG.fine("No translation for " + source); return SimpleAttributeSet.EMPTY;