From 3fc7e849dea0812788d485e5ca690995ab4b5c7d Mon Sep 17 00:00:00 2001
From: pTalanov <talanov.pavel@gmail.com>
Date: Mon, 27 Feb 2012 19:15:28 +0400
Subject: [PATCH] Reverting wrong changes

---
 .idea/inspectionProfiles/idea_default.xml                    | 4 ++++
 .idea/modules.xml                                            | 1 -
 .../org/jetbrains/jet/lang/resolve/AnnotationResolver.java   | 4 ++--
 .../src/org/jetbrains/jet/lang/types/JetStandardLibrary.java | 5 -----
 idea/src/META-INF/plugin.xml                                 | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
index e5f3ca2c256..1dfe9e84ad8 100644
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -228,6 +228,10 @@
       <scope name="idea openapi" level="WARNING" enabled="true" />
       <scope name="runtime.classes" level="ERROR" enabled="true" />
     </inspection_tool>
+    <inspection_tool class="MethodMayBeStatic" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="m_onlyPrivateOrFinal" value="false" />
+      <option name="m_ignoreEmptyMethods" value="true" />
+    </inspection_tool>
     <inspection_tool class="MethodNamesDifferOnlyByCase" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="MethodOverloadsParentMethod" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="MethodOverridesPrivateMethod" enabled="true" level="WARNING" enabled_by_default="true" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 745a36b3cec..15f498ac8d8 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -17,7 +17,6 @@
       <module fileurl="file://$PROJECT_DIR$/j2k/j2k.iml" filepath="$PROJECT_DIR$/j2k/j2k.iml" />
       <module fileurl="file://$PROJECT_DIR$/j2k/tests/j2k-tests.iml" filepath="$PROJECT_DIR$/j2k/tests/j2k-tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/jet.as.java.psi/jet.as.java.psi.iml" filepath="$PROJECT_DIR$/compiler/jet.as.java.psi/jet.as.java.psi.iml" />
-      <module fileurl="file://$PROJECT_DIR$/js/js.examples/js.examples.iml" filepath="$PROJECT_DIR$/js/js.examples/js.examples.iml" />
       <module fileurl="file://$PROJECT_DIR$/js/js.libraries/js.libraries.iml" filepath="$PROJECT_DIR$/js/js.libraries/js.libraries.iml" />
       <module fileurl="file://$PROJECT_DIR$/js/js.tests/js.tests.iml" filepath="$PROJECT_DIR$/js/js.tests/js.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/js/js.translator/js.translator.iml" filepath="$PROJECT_DIR$/js/js.translator/js.translator.iml" />
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
index e083630520d..c0c6351fc31 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
@@ -173,8 +173,8 @@ public class AnnotationResolver {
         List<AnnotationDescriptor> result = Lists.newArrayList();
         for (JetAnnotationEntry annotation : annotations) {
             AnnotationDescriptor annotationDescriptor = new AnnotationDescriptor();
-            // result.add(annotationDescriptor);
-            //  trace.record(BindingContext.ANNOTATION, annotation, annotationDescriptor);
+            result.add(annotationDescriptor);
+            trace.record(BindingContext.ANNOTATION, annotation, annotationDescriptor);
         }
         return result;
     }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/JetStandardLibrary.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/JetStandardLibrary.java
index 530295b493d..f3086e20f22 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/JetStandardLibrary.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/JetStandardLibrary.java
@@ -462,11 +462,6 @@ public class JetStandardLibrary {
         return volatileType;
     }
 
-    @NotNull
-    public Collection<ClassDescriptor> getArrayClasses() {
-        return primitiveTypeToArrayClass.values();
-    }
-
     public final boolean isVolatile(PropertyDescriptor descriptor) {
         List<AnnotationDescriptor> annotations = descriptor.getOriginal().getAnnotations();
         if(annotations != null) {
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index fe46ef44266..8c85bf304a7 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin version="2">
   <name>Kotlin</name>
   <description>Kotlin language support</description>
-  <version>1.0</version>
+  <version>@snapshot@</version>
   <vendor>JetBrains</vendor>
 
   <depends optional="true">JUnit</depends>