Attachment #21365 for bug #55132

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 55132
Collapse All | Expand All

Lines 42-48 Link Here

(-)editor/bookmarks/src/org/netbeans/lib/editor/bookmarks/actions/BookmarksKitInstallAction.java (-1 / +1 lines)
42	public static final BookmarksKitInstallAction INSTANCE = new BookmarksKitInstallAction();	42	public static final BookmarksKitInstallAction INSTANCE = new BookmarksKitInstallAction();
43		43
44	BookmarksKitInstallAction() {	44	BookmarksKitInstallAction() {
45	super("bookmarks-kit-install");	45	super("bookmarks-kit-install"); // NOI18N
46	putValue(BaseAction.NO_KEYBINDING, Boolean.TRUE);	46	putValue(BaseAction.NO_KEYBINDING, Boolean.TRUE);
47	}	47	}
48		48

Lines 33-41 Link Here

(-)editor/bookmarks/src/org/netbeans/lib/editor/bookmarks/actions/GotoBookmarkAction.java (-2 / +2 lines)
33		33
34	public final class GotoBookmarkAction extends BaseAction {	34	public final class GotoBookmarkAction extends BaseAction {
35		35
36	public static final String GOTO_NEXT_NAME = "bookmark-next";	36	public static final String GOTO_NEXT_NAME = "bookmark-next"; // NOI18N
37		37
38	public static final String GOTO_PREVIOUS_NAME = "bookmark-previous";	38	public static final String GOTO_PREVIOUS_NAME = "bookmark-previous"; // NOI18N
39		39
40	static final long serialVersionUID = -5169554640178645108L;	40	static final long serialVersionUID = -5169554640178645108L;
41		41

Lines 31-37 Link Here

(-)editor/bookmarks/src/org/netbeans/lib/editor/bookmarks/actions/ToggleBookmarkAction.java (-1 / +1 lines)
31		31
32	public final class ToggleBookmarkAction extends BaseAction {	32	public final class ToggleBookmarkAction extends BaseAction {
33		33
34	public static final String NAME = "bookmark-toggle";	34	public static final String NAME = "bookmark-toggle"; // NOI18N
35		35
36	static final long serialVersionUID = -8438899482709646741L;	36	static final long serialVersionUID = -8438899482709646741L;
37		37

Lines 41-51 Link Here

(-)editor/bookmarks/src/org/netbeans/modules/editor/bookmarks/BookmarksXMLHandler.java (-5 / +5 lines)
41	class BookmarksXMLHandler {	41	class BookmarksXMLHandler {
42		42
43	// Element names	43	// Element names
44	static final String EDITOR_BOOKMARKS_NAMESPACE_URI = "http://www.netbeans.org/ns/editor-bookmarks/1";	44	static final String EDITOR_BOOKMARKS_NAMESPACE_URI = "http://www.netbeans.org/ns/editor-bookmarks/1"; // NOI18N
45	static final String EDITOR_BOOKMARKS_ELEM = "editor-bookmarks";	45	static final String EDITOR_BOOKMARKS_ELEM = "editor-bookmarks"; // NOI18N
46	private static final String FILE_ELEM = "file";	46	private static final String FILE_ELEM = "file"; // NOI18N
47	private static final String URL_ELEM = "url";	47	private static final String URL_ELEM = "url"; // NOI18N
48	private static final String LINE_ELEM = "line";	48	private static final String LINE_ELEM = "line"; // NOI18N
49		49
50	private BookmarksXMLHandler() {	50	private BookmarksXMLHandler() {
51	}	51	}

Lines 90-96 Link Here

(-)editor/bookmarks/src/org/netbeans/modules/editor/bookmarks/EditorBookmarksModule.java (-1 / +1 lines)
90		90
91	private static final class BookmarksSettingsInitializer extends Settings.AbstractInitializer {	91	private static final class BookmarksSettingsInitializer extends Settings.AbstractInitializer {
92		92
93	static final String NAME = "bookmarks-settings-initializer";	93	static final String NAME = "bookmarks-settings-initializer"; // NOI18N
94		94
95	BookmarksSettingsInitializer() {	95	BookmarksSettingsInitializer() {
96	super(NAME);	96	super(NAME);

Lines 49-59 Link Here

(-)editor/bookmarks/src/org/netbeans/modules/editor/bookmarks/FileBookmarks.java (-2 / +2 lines)
49	StringBuffer sb = new StringBuffer();	49	StringBuffer sb = new StringBuffer();
50	sb.append("url="); // NOI18N	50	sb.append("url="); // NOI18N
51	sb.append(url);	51	sb.append(url);
52	sb.append(" { ");	52	sb.append(" { "); // NOI18N
53	for (int i = 0; i < bookmarkLineIndexes.length; i++) {	53	for (int i = 0; i < bookmarkLineIndexes.length; i++) {
54	sb.append(bookmarkLineIndexes[i]);	54	sb.append(bookmarkLineIndexes[i]);
55	}	55	}
56	sb.append("}");	56	sb.append("}"); // NOI18N
57	return sb.toString();	57	return sb.toString();
58	}	58	}
59		59

Lines 132-137 Link Here

(-)editor/errorstripe/annotations/src/org/netbeans/modules/editor/errorstripe/annotations/AnnotationStatus.java (-1 / +1 lines)
132	}	132	}
133		133
134	public String toString() {	134	public String toString() {
135	return "[AnnotationStatus: status= " + getStatus() + ", enhancedColor= " + getEnhancedColor() + "]";	135	return "[AnnotationStatus: status= " + getStatus() + ", enhancedColor= " + getEnhancedColor() + "]"; // NOI18N
136	}	136	}
137	}	137	}




            
            String content = kit.getContentType();
            BaseDocument document = (BaseDocument) pane.getDocument();
            FileObject baseFolder = Repository.getDefault().getDefaultFileSystem().findResource("Editors/text/base/Services"); // NOI18N
            FileObject contentFolder = Repository.getDefault().getDefaultFileSystem().findResource("Editors/" + content + "/Services"); // NOI18N
            
            if (ERR.isLoggable(ErrorManager.INFORMATIONAL)) {
                ERR.log(ErrorManager.INFORMATIONAL, "baseFolder = " + baseFolder );

        int x = (THICKNESS - STATUS_BOX_SIZE) / 2;
        int y = (HEIGHT_OFFSET - STATUS_BOX_SIZE) / 2;
        
        g.drawString("*", x + 1, y + STATUS_BOX_SIZE * 3 / 2 - 1); // NOI18N
    }
    
    private void drawGlobalStatus(Graphics g) {

        return null;
    }
    
    private static String[] c = new String[] {"&", "<", ">", "\n", "\""}; // NOI18N
    private static String[] tags = new String[] {"&amp;", "&lt;", "&gt;", "<br>", "&quot;"}; // NOI18N
    
    private String translate(String input) {
        for (int cntr = 0; cntr < c.length; cntr++) {

Lines 34-44 Link Here

(-)editor/errorstripe/src/org/netbeans/modules/editor/errorstripe/spi/MarkProvider.java (-2 / +2 lines)
34		34
35	/**Name of property which should be fired when the list of {@link Mark}s changes.	35	/**Name of property which should be fired when the list of {@link Mark}s changes.
36	*/	36	*/
37	public static final String PROP_MARKS = "marks";	37	public static final String PROP_MARKS = "marks"; // NOI18N
38		38
39	/**Name of property which should be fired when the up-to-date status changes.	39	/**Name of property which should be fired when the up-to-date status changes.
40	*/	40	*/
41	public static final String PROP_UP_TO_DATE = "upToDate";	41	public static final String PROP_UP_TO_DATE = "upToDate"; // NOI18N
42		42
43	/**Up-to-date status saying everything is up-to-date.	43	/**Up-to-date status saying everything is up-to-date.
44	*/	44	*/




     */
    public Status(int status) throws IllegalArgumentException {
        if (status != STATUS_ERROR && status != STATUS_WARNING && status != STATUS_OK)
            throw new IllegalArgumentException("Invalid status provided: " + status); // NOI18N
        this.status = status;
    }
    

    }
    
    private static String[] STATUS_NAMES = new String[] {
        "OK", "WARNING", "ERROR" // NOI18N
    };
    
    /**Returns a {@link String} representation of the {@link Status}.

     * @return {@link String} representation of this object
     */
    public String toString() {
        return "[Status: " + STATUS_NAMES[getStatus()] + "]"; // NOI18N
    }
    
    /**Return the more important status out of the two given statuses.

     */
    public static int getCompoundStatus(int first, int second) throws IllegalArgumentException {
        if (first != STATUS_ERROR && first != STATUS_WARNING && first != STATUS_OK)
            throw new IllegalArgumentException("Invalid status provided: " + first); // NOI18N
        
        if (second != STATUS_ERROR && second != STATUS_WARNING && second != STATUS_OK)
            throw new IllegalArgumentException("Invalid status provided: " + second); // NOI18N
        
        return Math.max(first, second);
    }

Lines 1341-1347 Link Here

(-)editor/libsrc/org/netbeans/editor/BaseDocument.java (-2 / +2 lines)
1341	VetoableChangeListener bml = notifyModifyStatus.getBeforeModificationListener();	1341	VetoableChangeListener bml = notifyModifyStatus.getBeforeModificationListener();
1342	if (bml != null) {	1342	if (bml != null) {
1343	try {	1343	try {
1344	bml.vetoableChange(new PropertyChangeEvent(this, "modified", null, Boolean.TRUE));	1344	bml.vetoableChange(new PropertyChangeEvent(this, "modified", null, Boolean.TRUE)); // NOI18N
1345	} catch (PropertyVetoException ex) {	1345	} catch (PropertyVetoException ex) {
1346	// Modification is prohibited	1346	// Modification is prohibited
1347	notifyModifyStatus.setModificationVetoed(true);	1347	notifyModifyStatus.setModificationVetoed(true);
Lines 1358-1364 Link Here
1358	VetoableChangeListener bml = notifyModifyStatus.getBeforeModificationListener();	1358	VetoableChangeListener bml = notifyModifyStatus.getBeforeModificationListener();
1359	if (bml != null) {	1359	if (bml != null) {
1360	try {	1360	try {
1361	bml.vetoableChange(new PropertyChangeEvent(this, "modified", null, Boolean.FALSE));	1361	bml.vetoableChange(new PropertyChangeEvent(this, "modified", null, Boolean.FALSE)); // NOI18N
1362	} catch (PropertyVetoException e) {	1362	} catch (PropertyVetoException e) {
1363	// ignore	1363	// ignore
1364	}	1364	}

Lines 227-233 Link Here

(-)editor/libsrc/org/netbeans/editor/BaseDocumentEvent.java (-1 / +1 lines)
227		227
228	boolean notifyMod;	228	boolean notifyMod;
229	try {	229	try {
230	notifyMod = doc.notifyModifyCheckStart(0, "undo() vetoed");	230	notifyMod = doc.notifyModifyCheckStart(0, "undo() vetoed"); // NOI18N
231	} catch (BadLocationException ex) {	231	} catch (BadLocationException ex) {
232	throw new CannotUndoException();	232	throw new CannotUndoException();
233	}	233	}

Lines 497-503 Link Here

(-)editor/libsrc/org/netbeans/editor/BaseKit.java (-1 / +1 lines)
497	c.enableInputMethods(enableIM);	497	c.enableInputMethods(enableIM);
498	executeInstallActions(c);	498	executeInstallActions(c);
499		499
500	c.putClientProperty("hyperlink-operation",	500	c.putClientProperty("hyperlink-operation", // NOI18N
501	org.netbeans.lib.editor.hyperlink.HyperlinkOperation.create(c, getContentType()));	501	org.netbeans.lib.editor.hyperlink.HyperlinkOperation.create(c, getContentType()));
502	}	502	}
503		503

Lines 414-420 Link Here

(-)editor/libsrc/org/netbeans/editor/CustomFoldManager.java (-1 / +1 lines)
414	Matcher matcher = pattern.matcher(doc.getText(tokenInfo.getOffset(), tokenInfo.getLength()));	414	Matcher matcher = pattern.matcher(doc.getText(tokenInfo.getOffset(), tokenInfo.getLength()));
415	if (matcher.find()) {	415	if (matcher.find()) {
416	if (matcher.group(1) != null) { // fold's start mark found	416	if (matcher.group(1) != null) { // fold's start mark found
417	boolean state = "collapsed".equals(matcher.group(3)); // remember the defaultstate	417	boolean state = "collapsed".equals(matcher.group(3)); // remember the defaultstate // NOI18N
418	if (matcher.group(2) != null) { // fold's id exists	418	if (matcher.group(2) != null) { // fold's id exists
419	Boolean collapsed = (Boolean)customFoldId.get(matcher.group(2));	419	Boolean collapsed = (Boolean)customFoldId.get(matcher.group(2));
420	if (collapsed != null)	420	if (collapsed != null)

Lines 48-54 Link Here

(-)editor/libsrc/org/netbeans/editor/SettingsDefaults.java (-1 / +1 lines)
48	// Default coloring	48	// Default coloring
49	private static int defaultFontSize; // Fix of #33249	49	private static int defaultFontSize; // Fix of #33249
50	static {	50	static {
51	Integer customFontSize = (Integer)UIManager.get("customFontSize");	51	Integer customFontSize = (Integer)UIManager.get("customFontSize"); // NOI18N
52	if (customFontSize != null) {	52	if (customFontSize != null) {
53	defaultFontSize = customFontSize.intValue();	53	defaultFontSize = customFontSize.intValue();
54	} else {	54	} else {

Lines 301-307 Link Here

(-)editor/libsrc/org/netbeans/editor/ext/ExtKit.java (-1 / +1 lines)
301	}	301	}
302		302
303	} else { // null item means separator	303	} else { // null item means separator
304	sb.append("--Separator--");	304	sb.append("--Separator--"); // NOI18N
305	}	305	}
306		306
307	/DEBUG/System.err.println(sb.toString());	307	/DEBUG/System.err.println(sb.toString());




        readSettings();
        
        if (hyperlinkEnabled)
            component.addPropertyChangeListener("document", this); // NOI18N
    }
    
    private void documentUpdated() {

        String hyperlinkActivationKeyPropertyValue = System.getProperty("org.netbeans.lib.editor.hyperlink.HyperlinkOperation.activationKey");
        
        if (hyperlinkActivationKeyPropertyValue != null) {
            if ("off".equals(hyperlinkActivationKeyPropertyValue)) { // NOI18N
                this.hyperlinkEnabled = false;
                this.actionKeyMask = (-1);
            } else {

        private Position hyperlinkStart = null;
        private Position hyperlinkEnd = null;
        
        public static final String NAME = "hyperlink-layer"; // NOI18N
        
        public static final int VISIBILITY = 1050;
        




        public static final int SOUTH = 3;
        public static final int EAST  = 4;
        
        public static final String WEST_NAME   = "West"; // NOI18N
        public static final String NORTH_NAME  = "North"; // NOI18N
        public static final String SOUTH_NAME  = "South"; // NOI18N
        public static final String EAST_NAME   = "East"; // NOI18N
        
        private int position;
        private boolean scrollable;
        
        private SideBarPosition(FileObject fo) {
            Object position = fo.getAttribute("position"); // NOI18N
            
            if (position != null && position instanceof String) {
                String positionName = (String) position;

                this.position = WEST;
            }
            
            Object scrollable = fo.getAttribute("scrollable"); // NOI18N
            
            if (scrollable != null && scrollable instanceof Boolean) {
                this.scrollable = ((Boolean) scrollable).booleanValue();

        }
        
        public String toString() {
            return "[SideBarPosition: scrollable=" + scrollable + ", position=" + position + "]"; // NOI18N
        }
    }
            

Lines 170-176 Link Here

(-)editor/src/org/netbeans/modules/editor/NbEditorUI.java (-1 / +1 lines)
170	if (position.getPosition() == SideBarPosition.NORTH) {	170	if (position.getPosition() == SideBarPosition.NORTH) {
171	scroller.setColumnHeaderView(sideBar);	171	scroller.setColumnHeaderView(sideBar);
172	} else {	172	} else {
173	throw new IllegalArgumentException("Unsupported side bar position, scrollable = true, position=" + position.getBorderLayoutPosition());	173	throw new IllegalArgumentException("Unsupported side bar position, scrollable = true, position=" + position.getBorderLayoutPosition()); // NOI18N
174	}	174	}
175	}	175	}
176	} else {	176	} else {

Lines 65-71 Link Here

(-)editor/src/org/netbeans/modules/editor/NbToolTip.java (-1 / +1 lines)
65		65
66	private Annotation[] tipAnnotations;	66	private Annotation[] tipAnnotations;
67		67
68	private RequestProcessor toolTipRP = new RequestProcessor("ToolTip-Evaluator", 1);	68	private RequestProcessor toolTipRP = new RequestProcessor("ToolTip-Evaluator", 1); // NOI18N
69		69
70	static synchronized void buildToolTip(JTextComponent target) {	70	static synchronized void buildToolTip(JTextComponent target) {
71	String mimeType = NbEditorUtilities.getMimeType(target.getDocument());	71	String mimeType = NbEditorUtilities.getMimeType(target.getDocument());

Lines 45-51 Link Here

(-)editor/src/org/netbeans/modules/editor/hyperlink/LayerHyperlinkProviderManager.java (-1 / +1 lines)
45		45
46	public List/<HyperlinkProvider>/ getHyperlinkProviders(String mimeType) {	46	public List/<HyperlinkProvider>/ getHyperlinkProviders(String mimeType) {
47	FileObject hyperlinkProvidersFolder = Repository.getDefault().getDefaultFileSystem().	47	FileObject hyperlinkProvidersFolder = Repository.getDefault().getDefaultFileSystem().
48	findResource("Editors/" + mimeType + "/HyperlinkProviders");	48	findResource("Editors/" + mimeType + "/HyperlinkProviders"); // NOI18N
49		49
50	if (hyperlinkProvidersFolder!= null	50	if (hyperlinkProvidersFolder!= null
51	&& !hyperlinkProvidersFolder.isData()	51	&& !hyperlinkProvidersFolder.isData()

Lines 54-61 Link Here

(-)editor/src/org/netbeans/modules/editor/options/AnnotationTypesNode.java (-2 / +2 lines)
54	public AnnotationTypesNode() {	54	public AnnotationTypesNode() {
55	super(new AnnotationTypesSubnodes ());	55	super(new AnnotationTypesSubnodes ());
56	setName("annotationtypes"); // NOI18N	56	setName("annotationtypes"); // NOI18N
57	setDisplayName(getBundleString("ATN_AnnotationTypesNode_Name"));	57	setDisplayName(getBundleString("ATN_AnnotationTypesNode_Name")); // NOI18N
58	setShortDescription (getBundleString("ATN_AnnotationTypesNode_Description"));	58	setShortDescription (getBundleString("ATN_AnnotationTypesNode_Description")); // NOI18N
59	setIconBase (ICON_BASE);	59	setIconBase (ICON_BASE);
60	}	60	}
61		61

Lines 104-110 Link Here

(-)editor/src/org/netbeans/modules/editor/options/ScrollInsetsEditor.java (-1 / +1 lines)
104		104
105	/** Always throws the new exception */	105	/** Always throws the new exception */
106	private void badFormat() throws IllegalArgumentException {	106	private void badFormat() throws IllegalArgumentException {
107	throw new IllegalArgumentException( getBundleString("SIE_EXC_BadFormatValue" ) );	107	throw new IllegalArgumentException( getBundleString("SIE_EXC_BadFormatValue" ) ); // NOI18N
108	}	108	}
109		109
110	private String int2percent( int i ) {	110	private String int2percent( int i ) {




     * Fold update gets notified first (prior view updates etc.).
     */
    public static final DocumentListenerPriority FOLD_UPDATE
            = new DocumentListenerPriority(2, "fold-update"); // NOI18N

    /**
     * Default level is used for all listeners added

     * javax.swing.event.DocumentListener)} method.
     */
    public static final DocumentListenerPriority DEFAULT
            = new DocumentListenerPriority(1, "default"); // NOI18N

    /**
     * Caret udpate gets notified as last.
     */
    public static final DocumentListenerPriority CARET_UPDATE
            = new DocumentListenerPriority(0, "caret-update"); // NOI18N

    
    private int priority;




                    // also for offset-1...
                    // + bugfix of #52909 - the > is recognized as SyntaxElement.TAG so we need to 
                    // get a syntax element before, when cc is called before > in a tag e.g. <table w|>
                    if (elem == null || (elem.getType() == SyntaxElement.TYPE_TAG && ">".equals(elem.getText())) ) { // NOI18N
                        elem = sup.getElementChain( offset - 1 );
                    }
                    

                        
                        String quotationChar = null;
                        if(preText != null && preText.length() > 0) {
                            if(preText.substring(0,1).equals("'")) quotationChar = "'"; // NOI18N
                            if(preText.substring(0,1).equals("\"")) quotationChar = "\""; // NOI18N
                        }
                        
                        l = translateValues( offset-len, len, arg.getValueList( quotationChar == null ? preText : preText.substring(1)) , quotationChar );

    
    List translateAttribs( int offset, int length, List attribs, DTD.Element tag ) {
        List result = new ArrayList( attribs.size() );
        String tagName = tag.getName() + "#"; // NOI18N
        for( Iterator i = attribs.iterator(); i.hasNext(); ) {
            DTD.Attribute attrib = (DTD.Attribute)i.next();
            String name = attrib.getName();




        TokenItem ti = tagTokenItem;
        while(ti != null) {
            if(ti.getTokenID() == HTMLTokenContext.TAG_CLOSE_SYMBOL) {
                if("/>".equals(ti.getImage())) { // NOI18N
                    //it is a singleton tag => do not match
                    return true;
                }
                if(">".equals(ti.getImage())) break; // NOI18N
            }
            //break the loop on TEXT or on another open tag symbol
            //(just to prevent long loop in case the tag is not closed)

        }
        
        for( ; elem != null; elem = elem.getPrevious() ) {
            if( elem.getType() == SyntaxElement.TYPE_ENDTAG && elem.getText().endsWith(">") ) { // NOI18N
                stack.push( ((SyntaxElement.Named)elem).getName().toUpperCase() );
            } else if( (elem.getType() == SyntaxElement.TYPE_TAG) && (elem.getText().indexOf("<") == -1)) { //now </ and > are returned as SyntaxElement.TAG so I need to filter them  NOI18N
                DTD.Element tag = dtd.getElement( ((SyntaxElement.Tag)elem).getName().toUpperCase() );

                if( tag == null ) continue; // Unknown tag - ignore

Lines 136-142 Link Here

(-)html/editor/src/org/netbeans/modules/editor/html/javadoc/HelpManager.java (-1 / +1 lines)
136	url = url.substring(0, url.lastIndexOf('/'));	136	url = url.substring(0, url.lastIndexOf('/'));
137	link = link.substring(index+3);	137	link = link.substring(index+3);
138	}	138	}
139	url = url + "/" + link;	139	url = url + "/" + link; // NOI18N
140	}	140	}
141	URL newURL = null;	141	URL newURL = null;
142	try{	142	try{

Lines 90-96 Link Here

(-)html/editor/src/org/netbeans/modules/editor/html/javadoc/SAXHelpHandler.java (-1 / +1 lines)
90	value = attrs.getValue(NAME_STRING);	90	value = attrs.getValue(NAME_STRING);
91	attribute = new TagHelpItem(value);	91	attribute = new TagHelpItem(value);
92	state = ATTRIBUTE_STATE;	92	state = ATTRIBUTE_STATE;
93	map.put((tag.getName() + "#" + attribute.getName()).toUpperCase(), attribute);	93	map.put((tag.getName() + "#" + attribute.getName()).toUpperCase(), attribute); // NOI18N
94	value = attrs.getValue(IDENTICAL_STRING);	94	value = attrs.getValue(IDENTICAL_STRING);
95	if (value != null){	95	if (value != null){
96	//System.out.println("value: " + value);	96	//System.out.println("value: " + value);




    }

    public String getHelp(){
        return "help for key "; // NOI18N
    }

    /**

        StringBuffer sb = new StringBuffer();
        sb.append(name);
        if (identical == null){
            sb.append("\n    file: "); // NOI18N
            sb.append(file);
            sb.append("\n    start text: "); // NOI18N
            sb.append(startText);
            sb.append("\n    start text offset: "); // NOI18N
            sb.append(startTextOffset);
            sb.append("\n    end text: "); // NOI18N
            sb.append(endText);
            sb.append("\n    end text offset: "); // NOI18N
            sb.append(endTextOffset);
            sb.append("\n    text before: "); // NOI18N
            sb.append(textBefore);
            sb.append("\n    text after: "); // NOI18N
            sb.append(textAfter);
        }
        else{
            sb.append("\n    indentical to: "); // NOI18N
            sb.append(identical);
        }
        return sb.toString();




    private TimerTask createTimerTask() {
        return new TimerTask() {
            public void run() {
                if(debug) System.out.println("computing folds..."); // NOI18N
                updateFolds();
                if(debug) System.out.println("done."); // NOI18N
            }
        };
    }

            
            //get existing folds
            existingFolds = FoldUtilities.findRecursive(fh.getRootFold());
            assert existingFolds != null : "Existing folds is null!"; // NOI18N
            
            int offset = 0;
            int old = -1;

                        start = start - 2; //include also preceding '<' token into the fold
                        
                        String text = ti.getImage();
                        String foldName = "<" + text + ">...</" + text + ">"; // NOI18N
                        
                        addFold(existingFolds, HTMLFoldTypes.TAG, foldName, start, end);
                    }    

            
            //the timer is set to null when release() is called on this FoldManager => document is about to be closed
            if(timer == null) {
                if (debug) System.out.println("release() called -> cancelling folds update"); // NOI18N
                return ;
            }
            

            
            SwingUtilities.invokeAndWait(new Runnable() {
                public void run() {
                    if(debug) System.out.println("updating folds --> locking document!"); // NOI18N
                    //lock the document for changes
                    ((AbstractDocument)getDocument()).readLock();
                    try {

                    } finally {
                        ((AbstractDocument)getDocument()).readUnlock();
                    }
                    if(debug) System.out.println("document unlocked!"); // NOI18N
                }
            });
            




    private static void printChildren(Fold f, int level) {
        int foldCount = f.getFoldCount();
        //indent
        for( int i = 0; i < level; i ++) System.out.print(" "); // NOI18N
        //print this fold info
        System.out.println(f.getDescription() + " [" + f.getStartOffset() + " - " + f.getEndOffset() + "]"); // NOI18N
        //print children
        for (int i = 0; i < foldCount; i++) {
            Fold childFold = f.getFold(i);

    public static String getContextName(int typeId) {
        switch(typeId) {
            case SyntaxElement.TYPE_TAG:
                return "tag"; // NOI18N
            case SyntaxElement.TYPE_COMMENT:
                return "comment"; // NOI18N
            default:
                return "?"; // NOI18N
        }
    } 
    

Lines 86-92 Link Here

(-)java/editor/lib/src/org/netbeans/editor/ext/java/JavaSettingsNames.java (-1 / +1 lines)
86	* on the next line.	86	* on the next line.
87	*/	87	*/
88	public static final String JAVA_FORMAT_STATEMENT_CONTINUATION_INDENT	88	public static final String JAVA_FORMAT_STATEMENT_CONTINUATION_INDENT
89	= "java-format-statement-continuation-indent";	89	= "java-format-statement-continuation-indent"; // NOI18N
90		90
91	/** Completion of { } [ ] " " ' ' */	91	/** Completion of { } [ ] " " ' ' */
92	public static final String PAIR_CHARACTERS_COMPLETION	92	public static final String PAIR_CHARACTERS_COMPLETION





        setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(12, 12, 12, 12)));
        setPreferredSize(new java.awt.Dimension(560, 200));
        jLabel1.setText("<html>~More than one class found in classpath for some Type Name in source.  Select class to use in import statement for each Type Name below:</html>"); // NOI18N
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;


        packagesTbl.setModel(new javax.swing.table.DefaultTableModel(
            new Object [][] {
                {"MyType", "com.foo.AllTypes"}, // NOI18N
                {"OtherType", "com.foo.AllTypes"}, // NOI18N
                {null, null},
                {null, null},
                {null, null}
            },
            new String [] {
                "~Type Name", "~Class to Import" // NOI18N
            }
        ) {
            Class[] types = new Class [] {

Lines 484-490 Link Here

(-)java/editor/src/org/netbeans/modules/editor/java/JMIUtils.java (-1 / +1 lines)
484	Resource res = getResource();	484	Resource res = getResource();
485	if (res != null) {	485	if (res != null) {
486	// class imports	486	// class imports
487	String simpleNamePrefix=".".concat(simpleName);	487	String simpleNamePrefix=".".concat(simpleName); // NOI18N
488	Object[] imports=res.getImports().toArray();	488	Object[] imports=res.getImports().toArray();
489	for (int i=0;i<imports.length;i++) {	489	for (int i=0;i<imports.length;i++) {
490	Import imp=(Import)imports[i];	490	Import imp=(Import)imports[i];

Return to bug 55132

Lines 113-121 Link Here

(-)html/editor/src/org/netbeans/modules/html/editor/folding/HTMLFoldManager.java (-7 / +7 lines)
113	private TimerTask createTimerTask() {	113	private TimerTask createTimerTask() {
114	return new TimerTask() {	114	return new TimerTask() {
115	public void run() {	115	public void run() {
116	if(debug) System.out.println("computing folds...");	116	if(debug) System.out.println("computing folds..."); // NOI18N
117	updateFolds();	117	updateFolds();
118	if(debug) System.out.println("done.");	118	if(debug) System.out.println("done."); // NOI18N
119	}	119	}
120	};	120	};
121	}	121	}
Lines 175-181 Link Here
175		175
176	//get existing folds	176	//get existing folds
177	existingFolds = FoldUtilities.findRecursive(fh.getRootFold());	177	existingFolds = FoldUtilities.findRecursive(fh.getRootFold());
178	assert existingFolds != null : "Existing folds is null!";	178	assert existingFolds != null : "Existing folds is null!"; // NOI18N
179		179
180	int offset = 0;	180	int offset = 0;
181	int old = -1;	181	int old = -1;
Lines 195-201 Link Here
195	start = start - 2; //include also preceding '<' token into the fold	195	start = start - 2; //include also preceding '<' token into the fold
196		196
197	String text = ti.getImage();	197	String text = ti.getImage();
198	String foldName = "<" + text + ">...</" + text + ">";	198	String foldName = "<" + text + ">...</" + text + ">"; // NOI18N
199		199
200	addFold(existingFolds, HTMLFoldTypes.TAG, foldName, start, end);	200	addFold(existingFolds, HTMLFoldTypes.TAG, foldName, start, end);
201	}	201	}
Lines 234-240 Link Here
234		234
235	//the timer is set to null when release() is called on this FoldManager => document is about to be closed	235	//the timer is set to null when release() is called on this FoldManager => document is about to be closed
236	if(timer == null) {	236	if(timer == null) {
237	if (debug) System.out.println("release() called -> cancelling folds update");	237	if (debug) System.out.println("release() called -> cancelling folds update"); // NOI18N
238	return ;	238	return ;
239	}	239	}
240		240
Lines 243-249 Link Here
243		243
244	SwingUtilities.invokeAndWait(new Runnable() {	244	SwingUtilities.invokeAndWait(new Runnable() {
245	public void run() {	245	public void run() {
246	if(debug) System.out.println("updating folds --> locking document!");	246	if(debug) System.out.println("updating folds --> locking document!"); // NOI18N
247	//lock the document for changes	247	//lock the document for changes
248	((AbstractDocument)getDocument()).readLock();	248	((AbstractDocument)getDocument()).readLock();
249	try {	249	try {
Lines 286-292 Link Here
286	} finally {	286	} finally {
287	((AbstractDocument)getDocument()).readUnlock();	287	((AbstractDocument)getDocument()).readUnlock();
288	}	288	}
289	if(debug) System.out.println("document unlocked!");	289	if(debug) System.out.println("document unlocked!"); // NOI18N
290	}	290	}
291	});	291	});
292		292

Lines 158-165 Link Here

(-)editor/errorstripe/src/org/netbeans/modules/editor/errorstripe/AnnotationView.java (-5 / +5 lines)
158		158
159	String content = kit.getContentType();	159	String content = kit.getContentType();
160	BaseDocument document = (BaseDocument) pane.getDocument();	160	BaseDocument document = (BaseDocument) pane.getDocument();
161	FileObject baseFolder = Repository.getDefault().getDefaultFileSystem().findResource("Editors/text/base/Services");	161	FileObject baseFolder = Repository.getDefault().getDefaultFileSystem().findResource("Editors/text/base/Services"); // NOI18N
162	FileObject contentFolder = Repository.getDefault().getDefaultFileSystem().findResource("Editors/" + content + "/Services");	162	FileObject contentFolder = Repository.getDefault().getDefaultFileSystem().findResource("Editors/" + content + "/Services"); // NOI18N
163		163
164	if (ERR.isLoggable(ErrorManager.INFORMATIONAL)) {	164	if (ERR.isLoggable(ErrorManager.INFORMATIONAL)) {
165	ERR.log(ErrorManager.INFORMATIONAL, "baseFolder = " + baseFolder );	165	ERR.log(ErrorManager.INFORMATIONAL, "baseFolder = " + baseFolder );
Lines 309-315 Link Here
309	int x = (THICKNESS - STATUS_BOX_SIZE) / 2;	309	int x = (THICKNESS - STATUS_BOX_SIZE) / 2;
310	int y = (HEIGHT_OFFSET - STATUS_BOX_SIZE) / 2;	310	int y = (HEIGHT_OFFSET - STATUS_BOX_SIZE) / 2;
311		311
312	g.drawString("", x + 1, y + STATUS_BOX_SIZE 3 / 2 - 1);	312	g.drawString("", x + 1, y + STATUS_BOX_SIZE 3 / 2 - 1); // NOI18N
313	}	313	}
314		314
315	private void drawGlobalStatus(Graphics g) {	315	private void drawGlobalStatus(Graphics g) {
Lines 790-797 Link Here
790	return null;	790	return null;
791	}	791	}
792		792
793	private static String[] c = new String[] {"&", "<", ">", "\n", "\""};	793	private static String[] c = new String[] {"&", "<", ">", "\n", "\""}; // NOI18N
794	private static String[] tags = new String[] {"&", "<", ">", "<br>", """};	794	private static String[] tags = new String[] {"&", "<", ">", "<br>", """}; // NOI18N
795		795
796	private String translate(String input) {	796	private String translate(String input) {
797	for (int cntr = 0; cntr < c.length; cntr++) {	797	for (int cntr = 0; cntr < c.length; cntr++) {

Lines 55-61 Link Here

(-)editor/errorstripe/src/org/netbeans/modules/editor/errorstripe/spi/Status.java (-5 / +5 lines)
55	*/	55	*/
56	public Status(int status) throws IllegalArgumentException {	56	public Status(int status) throws IllegalArgumentException {
57	if (status != STATUS_ERROR && status != STATUS_WARNING && status != STATUS_OK)	57	if (status != STATUS_ERROR && status != STATUS_WARNING && status != STATUS_OK)
58	throw new IllegalArgumentException("Invalid status provided: " + status);	58	throw new IllegalArgumentException("Invalid status provided: " + status); // NOI18N
59	this.status = status;	59	this.status = status;
60	}	60	}
61		61
Lines 100-106 Link Here
100	}	100	}
101		101
102	private static String[] STATUS_NAMES = new String[] {	102	private static String[] STATUS_NAMES = new String[] {
103	"OK", "WARNING", "ERROR"	103	"OK", "WARNING", "ERROR" // NOI18N
104	};	104	};
105		105
106	/**Returns a {@link String} representation of the {@link Status}.	106	/**Returns a {@link String} representation of the {@link Status}.
Lines 110-116 Link Here
110	* @return {@link String} representation of this object	110	* @return {@link String} representation of this object
111	*/	111	*/
112	public String toString() {	112	public String toString() {
113	return "[Status: " + STATUS_NAMES[getStatus()] + "]";	113	return "[Status: " + STATUS_NAMES[getStatus()] + "]"; // NOI18N
114	}	114	}
115		115
116	/**Return the more important status out of the two given statuses.	116	/**Return the more important status out of the two given statuses.
Lines 127-136 Link Here
127	*/	127	*/
128	public static int getCompoundStatus(int first, int second) throws IllegalArgumentException {	128	public static int getCompoundStatus(int first, int second) throws IllegalArgumentException {
129	if (first != STATUS_ERROR && first != STATUS_WARNING && first != STATUS_OK)	129	if (first != STATUS_ERROR && first != STATUS_WARNING && first != STATUS_OK)
130	throw new IllegalArgumentException("Invalid status provided: " + first);	130	throw new IllegalArgumentException("Invalid status provided: " + first); // NOI18N
131		131
132	if (second != STATUS_ERROR && second != STATUS_WARNING && second != STATUS_OK)	132	if (second != STATUS_ERROR && second != STATUS_WARNING && second != STATUS_OK)
133	throw new IllegalArgumentException("Invalid status provided: " + second);	133	throw new IllegalArgumentException("Invalid status provided: " + second); // NOI18N
134		134
135	return Math.max(first, second);	135	return Math.max(first, second);
136	}	136	}

Lines 79-85 Link Here

(-)editor/libsrc/org/netbeans/lib/editor/hyperlink/HyperlinkOperation.java (-3 / +3 lines)
79	readSettings();	79	readSettings();
80		80
81	if (hyperlinkEnabled)	81	if (hyperlinkEnabled)
82	component.addPropertyChangeListener("document", this);	82	component.addPropertyChangeListener("document", this); // NOI18N
83	}	83	}
84		84
85	private void documentUpdated() {	85	private void documentUpdated() {
Lines 106-112 Link Here
106	String hyperlinkActivationKeyPropertyValue = System.getProperty("org.netbeans.lib.editor.hyperlink.HyperlinkOperation.activationKey");	106	String hyperlinkActivationKeyPropertyValue = System.getProperty("org.netbeans.lib.editor.hyperlink.HyperlinkOperation.activationKey");
107		107
108	if (hyperlinkActivationKeyPropertyValue != null) {	108	if (hyperlinkActivationKeyPropertyValue != null) {
109	if ("off".equals(hyperlinkActivationKeyPropertyValue)) {	109	if ("off".equals(hyperlinkActivationKeyPropertyValue)) { // NOI18N
110	this.hyperlinkEnabled = false;	110	this.hyperlinkEnabled = false;
111	this.actionKeyMask = (-1);	111	this.actionKeyMask = (-1);
112	} else {	112	} else {
Lines 340-346 Link Here
340	private Position hyperlinkStart = null;	340	private Position hyperlinkStart = null;
341	private Position hyperlinkEnd = null;	341	private Position hyperlinkEnd = null;
342		342
343	public static final String NAME = "hyperlink-layer";	343	public static final String NAME = "hyperlink-layer"; // NOI18N
344		344
345	public static final int VISIBILITY = 1050;	345	public static final int VISIBILITY = 1050;
346		346

Lines 150-165 Link Here

(-)editor/src/org/netbeans/modules/editor/CustomizableSideBar.java (-7 / +7 lines)
150	public static final int SOUTH = 3;	150	public static final int SOUTH = 3;
151	public static final int EAST = 4;	151	public static final int EAST = 4;
152		152
153	public static final String WEST_NAME = "West";	153	public static final String WEST_NAME = "West"; // NOI18N
154	public static final String NORTH_NAME = "North";	154	public static final String NORTH_NAME = "North"; // NOI18N
155	public static final String SOUTH_NAME = "South";	155	public static final String SOUTH_NAME = "South"; // NOI18N
156	public static final String EAST_NAME = "East";	156	public static final String EAST_NAME = "East"; // NOI18N
157		157
158	private int position;	158	private int position;
159	private boolean scrollable;	159	private boolean scrollable;
160		160
161	private SideBarPosition(FileObject fo) {	161	private SideBarPosition(FileObject fo) {
162	Object position = fo.getAttribute("position");	162	Object position = fo.getAttribute("position"); // NOI18N
163		163
164	if (position != null && position instanceof String) {	164	if (position != null && position instanceof String) {
165	String positionName = (String) position;	165	String positionName = (String) position;
Lines 188-194 Link Here
188	this.position = WEST;	188	this.position = WEST;
189	}	189	}
190		190
191	Object scrollable = fo.getAttribute("scrollable");	191	Object scrollable = fo.getAttribute("scrollable"); // NOI18N
192		192
193	if (scrollable != null && scrollable instanceof Boolean) {	193	if (scrollable != null && scrollable instanceof Boolean) {
194	this.scrollable = ((Boolean) scrollable).booleanValue();	194	this.scrollable = ((Boolean) scrollable).booleanValue();
Lines 243-249 Link Here
243	}	243	}
244		244
245	public String toString() {	245	public String toString() {
246	return "[SideBarPosition: scrollable=" + scrollable + ", position=" + position + "]";	246	return "[SideBarPosition: scrollable=" + scrollable + ", position=" + position + "]"; // NOI18N
247	}	247	}
248	}	248	}
249		249

Lines 26-32 Link Here

(-)editor/util/src/org/netbeans/lib/editor/util/swing/DocumentListenerPriority.java (-3 / +3 lines)
26	* Fold update gets notified first (prior view updates etc.).	26	* Fold update gets notified first (prior view updates etc.).
27	*/	27	*/
28	public static final DocumentListenerPriority FOLD_UPDATE	28	public static final DocumentListenerPriority FOLD_UPDATE
29	= new DocumentListenerPriority(2, "fold-update");	29	= new DocumentListenerPriority(2, "fold-update"); // NOI18N
30		30
31	/**	31	/**
32	* Default level is used for all listeners added	32	* Default level is used for all listeners added
Lines 34-46 Link Here
34	* javax.swing.event.DocumentListener)} method.	34	* javax.swing.event.DocumentListener)} method.
35	*/	35	*/
36	public static final DocumentListenerPriority DEFAULT	36	public static final DocumentListenerPriority DEFAULT
37	= new DocumentListenerPriority(1, "default");	37	= new DocumentListenerPriority(1, "default"); // NOI18N
38		38
39	/**	39	/**
40	* Caret udpate gets notified as last.	40	* Caret udpate gets notified as last.
41	*/	41	*/
42	public static final DocumentListenerPriority CARET_UPDATE	42	public static final DocumentListenerPriority CARET_UPDATE
43	= new DocumentListenerPriority(0, "caret-update");	43	= new DocumentListenerPriority(0, "caret-update"); // NOI18N
44		44
45		45
46	private int priority;	46	private int priority;

Lines 222-228 Link Here

(-)html/editor/lib/src/org/netbeans/editor/ext/html/HTMLCompletionQuery.java (-4 / +4 lines)
222	// also for offset-1...	222	// also for offset-1...
223	// + bugfix of #52909 - the > is recognized as SyntaxElement.TAG so we need to	223	// + bugfix of #52909 - the > is recognized as SyntaxElement.TAG so we need to
224	// get a syntax element before, when cc is called before > in a tag e.g. <table w\|>	224	// get a syntax element before, when cc is called before > in a tag e.g. <table w\|>
225	if (elem == null \|\| (elem.getType() == SyntaxElement.TYPE_TAG && ">".equals(elem.getText())) ) {	225	if (elem == null \|\| (elem.getType() == SyntaxElement.TYPE_TAG && ">".equals(elem.getText())) ) { // NOI18N
226	elem = sup.getElementChain( offset - 1 );	226	elem = sup.getElementChain( offset - 1 );
227	}	227	}
228		228
Lines 314-321 Link Here
314		314
315	String quotationChar = null;	315	String quotationChar = null;
316	if(preText != null && preText.length() > 0) {	316	if(preText != null && preText.length() > 0) {
317	if(preText.substring(0,1).equals("'")) quotationChar = "'";	317	if(preText.substring(0,1).equals("'")) quotationChar = "'"; // NOI18N
318	if(preText.substring(0,1).equals("\"")) quotationChar = "\"";	318	if(preText.substring(0,1).equals("\"")) quotationChar = "\""; // NOI18N
319	}	319	}
320		320
321	l = translateValues( offset-len, len, arg.getValueList( quotationChar == null ? preText : preText.substring(1)) , quotationChar );	321	l = translateValues( offset-len, len, arg.getValueList( quotationChar == null ? preText : preText.substring(1)) , quotationChar );
Lines 356-362 Link Here
356		356
357	List translateAttribs( int offset, int length, List attribs, DTD.Element tag ) {	357	List translateAttribs( int offset, int length, List attribs, DTD.Element tag ) {
358	List result = new ArrayList( attribs.size() );	358	List result = new ArrayList( attribs.size() );
359	String tagName = tag.getName() + "#";	359	String tagName = tag.getName() + "#"; // NOI18N
360	for( Iterator i = attribs.iterator(); i.hasNext(); ) {	360	for( Iterator i = attribs.iterator(); i.hasNext(); ) {
361	DTD.Attribute attrib = (DTD.Attribute)i.next();	361	DTD.Attribute attrib = (DTD.Attribute)i.next();
362	String name = attrib.getName();	362	String name = attrib.getName();

Lines 257-267 Link Here

(-)html/editor/lib/src/org/netbeans/editor/ext/html/HTMLSyntaxSupport.java (-4 / +4 lines)
257	TokenItem ti = tagTokenItem;	257	TokenItem ti = tagTokenItem;
258	while(ti != null) {	258	while(ti != null) {
259	if(ti.getTokenID() == HTMLTokenContext.TAG_CLOSE_SYMBOL) {	259	if(ti.getTokenID() == HTMLTokenContext.TAG_CLOSE_SYMBOL) {
260	if("/>".equals(ti.getImage())) {	260	if("/>".equals(ti.getImage())) { // NOI18N
261	//it is a singleton tag => do not match	261	//it is a singleton tag => do not match
262	return true;	262	return true;
263	}	263	}
264	if(">".equals(ti.getImage())) break;	264	if(">".equals(ti.getImage())) break; // NOI18N
265	}	265	}
266	//break the loop on TEXT or on another open tag symbol	266	//break the loop on TEXT or on another open tag symbol
267	//(just to prevent long loop in case the tag is not closed)	267	//(just to prevent long loop in case the tag is not closed)
Lines 542-550 Link Here
542	}	542	}
543		543
544	for( ; elem != null; elem = elem.getPrevious() ) {	544	for( ; elem != null; elem = elem.getPrevious() ) {
545	if( elem.getType() == SyntaxElement.TYPE_ENDTAG && elem.getText().endsWith(">") ) {	545	if( elem.getType() == SyntaxElement.TYPE_ENDTAG && elem.getText().endsWith(">") ) { // NOI18N
546	stack.push( ((SyntaxElement.Named)elem).getName().toUpperCase() );	546	stack.push( ((SyntaxElement.Named)elem).getName().toUpperCase() );
547	} else if( (elem.getType() == SyntaxElement.TYPE_TAG) && (elem.getText().indexOf("<") == -1)) { //now </ and > are returned as SyntaxElement.TAG so I need to filter them	547	} else if( (elem.getType() == SyntaxElement.TYPE_TAG) && (elem.getText().indexOf("<") == -1)) { //now </ and > are returned as SyntaxElement.TAG so I need to filter them NOI18N
548	DTD.Element tag = dtd.getElement( ((SyntaxElement.Tag)elem).getName().toUpperCase() );	548	DTD.Element tag = dtd.getElement( ((SyntaxElement.Tag)elem).getName().toUpperCase() );
549		549
550	if( tag == null ) continue; // Unknown tag - ignore	550	if( tag == null ) continue; // Unknown tag - ignore

Lines 173-179 Link Here

(-)html/editor/src/org/netbeans/modules/editor/html/javadoc/TagHelpItem.java (-9 / +9 lines)
173	}	173	}
174		174
175	public String getHelp(){	175	public String getHelp(){
176	return "help for key ";	176	return "help for key "; // NOI18N
177	}	177	}
178		178
179	/**	179	/**
Lines 271-293 Link Here
271	StringBuffer sb = new StringBuffer();	271	StringBuffer sb = new StringBuffer();
272	sb.append(name);	272	sb.append(name);
273	if (identical == null){	273	if (identical == null){
274	sb.append("\n file: ");	274	sb.append("\n file: "); // NOI18N
275	sb.append(file);	275	sb.append(file);
276	sb.append("\n start text: ");	276	sb.append("\n start text: "); // NOI18N
277	sb.append(startText);	277	sb.append(startText);
278	sb.append("\n start text offset: ");	278	sb.append("\n start text offset: "); // NOI18N
279	sb.append(startTextOffset);	279	sb.append(startTextOffset);
280	sb.append("\n end text: ");	280	sb.append("\n end text: "); // NOI18N
281	sb.append(endText);	281	sb.append(endText);
282	sb.append("\n end text offset: ");	282	sb.append("\n end text offset: "); // NOI18N
283	sb.append(endTextOffset);	283	sb.append(endTextOffset);
284	sb.append("\n text before: ");	284	sb.append("\n text before: "); // NOI18N
285	sb.append(textBefore);	285	sb.append(textBefore);
286	sb.append("\n text after: ");	286	sb.append("\n text after: "); // NOI18N
287	sb.append(textAfter);	287	sb.append(textAfter);
288	}	288	}
289	else{	289	else{
290	sb.append("\n indentical to: ");	290	sb.append("\n indentical to: "); // NOI18N
291	sb.append(identical);	291	sb.append(identical);
292	}	292	}
293	return sb.toString();	293	return sb.toString();

Lines 40-48 Link Here

(-)html/editor/src/org/netbeans/modules/html/editor/folding/HTMLFoldUtils.java (-5 / +5 lines)
40	private static void printChildren(Fold f, int level) {	40	private static void printChildren(Fold f, int level) {
41	int foldCount = f.getFoldCount();	41	int foldCount = f.getFoldCount();
42	//indent	42	//indent
43	for( int i = 0; i < level; i ++) System.out.print(" ");	43	for( int i = 0; i < level; i ++) System.out.print(" "); // NOI18N
44	//print this fold info	44	//print this fold info
45	System.out.println(f.getDescription() + " [" + f.getStartOffset() + " - " + f.getEndOffset() + "]");	45	System.out.println(f.getDescription() + " [" + f.getStartOffset() + " - " + f.getEndOffset() + "]"); // NOI18N
46	//print children	46	//print children
47	for (int i = 0; i < foldCount; i++) {	47	for (int i = 0; i < foldCount; i++) {
48	Fold childFold = f.getFold(i);	48	Fold childFold = f.getFold(i);
Lines 54-64 Link Here
54	public static String getContextName(int typeId) {	54	public static String getContextName(int typeId) {
55	switch(typeId) {	55	switch(typeId) {
56	case SyntaxElement.TYPE_TAG:	56	case SyntaxElement.TYPE_TAG:
57	return "tag";	57	return "tag"; // NOI18N
58	case SyntaxElement.TYPE_COMMENT:	58	case SyntaxElement.TYPE_COMMENT:
59	return "comment";	59	return "comment"; // NOI18N
60	default:	60	default:
61	return "?";	61	return "?"; // NOI18N
62	}	62	}
63	}	63	}
64		64

Lines 132-138 Link Here

(-)java/editor/src/org/netbeans/modules/editor/java/FixDuplicateImportStmts.java (-4 / +4 lines)
132		132
133	setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(12, 12, 12, 12)));	133	setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(12, 12, 12, 12)));
134	setPreferredSize(new java.awt.Dimension(560, 200));	134	setPreferredSize(new java.awt.Dimension(560, 200));
135	jLabel1.setText("<html>~More than one class found in classpath for some Type Name in source. Select class to use in import statement for each Type Name below:</html>");	135	jLabel1.setText("<html>~More than one class found in classpath for some Type Name in source. Select class to use in import statement for each Type Name below:</html>"); // NOI18N
136	gridBagConstraints = new java.awt.GridBagConstraints();	136	gridBagConstraints = new java.awt.GridBagConstraints();
137	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;	137	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
138	gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;	138	gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
Lines 142-155 Link Here
142		142
143	packagesTbl.setModel(new javax.swing.table.DefaultTableModel(	143	packagesTbl.setModel(new javax.swing.table.DefaultTableModel(
144	new Object [][] {	144	new Object [][] {
145	{"MyType", "com.foo.AllTypes"},	145	{"MyType", "com.foo.AllTypes"}, // NOI18N
146	{"OtherType", "com.foo.AllTypes"},	146	{"OtherType", "com.foo.AllTypes"}, // NOI18N
147	{null, null},	147	{null, null},
148	{null, null},	148	{null, null},
149	{null, null}	149	{null, null}
150	},	150	},
151	new String [] {	151	new String [] {
152	"~Type Name", "~Class to Import"	152	"~Type Name", "~Class to Import" // NOI18N
153	}	153	}
154	) {	154	) {
155	Class[] types = new Class [] {	155	Class[] types = new Class [] {