Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"

1 files changed, 14 insertions, 2 deletions

diff --git a/xml/dom-tests/tests/com/intellij/util/xml/MockGenericAttributeValue.java b/xml/dom-tests/tests/com/intellij/util/xml/MockGenericAttributeValue.java
index 15b7a0468d30..22f18218ad85 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/MockGenericAttributeValue.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/MockGenericAttributeValue.java
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved.
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.intellij.util.xml;
 
@@ -23,7 +35,7 @@ public class MockGenericAttributeValue extends MockDomElement implements Generic
 
   @Override
   @NotNull
-  public Converter getConverter() {
+  public Converter<Object> getConverter() {
     throw new UnsupportedOperationException("Method getConverter is not yet implemented in " + getClass().getName());
   }