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 268335
Collapse All | Expand All

(-)a/editor.settings.storage/src/org/netbeans/modules/editor/settings/storage/fontscolors/ColoringStorage.java (-17 / +17 lines)
Lines 187-209 Link Here
187
                String translatedName = null;
187
                String translatedName = null;
188
                SimpleAttributeSet previous = fontsColorsMap.get(name);
188
                SimpleAttributeSet previous = fontsColorsMap.get(name);
189
189
190
                if (previous == null && !modulesFile && FAV_TOKEN.equals(type)) {
190
//                if (previous == null && !modulesFile && FAV_TOKEN.equals(type)) {
191
                    // User files normally don't define extra colorings unless
191
//                    // User files normally don't define extra colorings unless
192
                    // for example loading a settings file from an older version
192
//                    // for example loading a settings file from an older version
193
                    // of Netbeans (or in a completely new profile!!). In this case
193
//                    // of Netbeans (or in a completely new profile!!). In this case
194
                    // try simple heuristic for translating the name and if it does
194
//                    // try simple heuristic for translating the name and if it does
195
                    // not work leave the name alone.
195
//                    // not work leave the name alone.
196
                    int idx = name.indexOf('-'); //NOI18N
196
//                    int idx = name.indexOf('-'); //NOI18N
197
                    if (idx != -1) {
197
//                    if (idx != -1) {
198
                        translatedName = name.substring(idx + 1);
198
//                        translatedName = name.substring(idx + 1);
199
                        previous = fontsColorsMap.get(translatedName);
199
//                        previous = fontsColorsMap.get(translatedName);
200
                        if (previous != null) {
200
//                        if (previous != null) {
201
                            // heuristics worked, fix the name and load the coloring
201
//                            // heuristics worked, fix the name and load the coloring
202
                            as.addAttribute(StyleConstants.NameAttribute, translatedName);
202
//                            as.addAttribute(StyleConstants.NameAttribute, translatedName);
203
                            name = translatedName;
203
//                            name = translatedName;
204
                        }
204
//                        }
205
                    }
205
//                    }
206
                }
206
//                }
207
                
207
                
208
                if (previous == null) {
208
                if (previous == null) {
209
                    // Find display name
209
                    // Find display name

Return to bug 268335