MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Dmitry Trofimov
2013-11-26 18:19:36 +01:00
parent aa906186ec 3656e43728
commit cbcc0e87dc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightManager.java
+4 -4
View File
@@ -164,13 +164,13 @@ public class CopyrightManager extends AbstractProjectComponent implements Persis
state.addContent(map);
}
if (myDefaultCopyright != null) {
state.setAttribute(DEFAULT, myDefaultCopyright.getName());
}
boolean hasAttributes = myDefaultCopyright != null;
// CR-IC-3403#CFR-62470, idea <= 12 compatibility
state.setAttribute(DEFAULT, hasAttributes ? myDefaultCopyright.getName() : "");
myOptions.writeExternal(state);
return state.getChildren().isEmpty() && state.getAttributes().isEmpty() ? null : state;
return !hasAttributes && state.getChildren().isEmpty() ? null : state;
}
catch (WriteExternalException e) {
LOG.error(e);