diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
| commit | d76e3920c56d37c942092b7dca20fcaded81c0a5 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /xml/dom-impl/src/com/intellij/util/xml | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff) | |
| download | idea-d76e3920c56d37c942092b7dca20fcaded81c0a5.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f
Diffstat (limited to 'xml/dom-impl/src/com/intellij/util/xml')
| -rw-r--r-- | xml/dom-impl/src/com/intellij/util/xml/ui/DomUIFactoryImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xml/dom-impl/src/com/intellij/util/xml/ui/DomUIFactoryImpl.java b/xml/dom-impl/src/com/intellij/util/xml/ui/DomUIFactoryImpl.java index 168b6a514b0a..fd431be7061c 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/ui/DomUIFactoryImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/ui/DomUIFactoryImpl.java @@ -196,12 +196,12 @@ public class DomUIFactoryImpl extends DomUIFactory { } @Override - public void registerCustomControl(Class aClass, Function<DomWrapper<String>, BaseControl> creator) { + public void registerCustomControl(@NotNull Class aClass, Function<DomWrapper<String>, BaseControl> creator) { myCustomControlCreators.put(aClass, creator); } @Override - public void registerCustomCellEditor(final Class aClass, final Function<DomElement, TableCellEditor> creator) { + public void registerCustomCellEditor(@NotNull final Class aClass, final Function<DomElement, TableCellEditor> creator) { myCustomCellEditorCreators.put(aClass, creator); } |