Merge remote-tracking branch 'origin/master'

platform/core-api/src/com/intellij/openapi/application/ModalityState.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 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.
@@ -24,15 +24,12 @@ import java.awt.*;
  */
 public abstract class ModalityState {
   @NotNull public static final ModalityState NON_MODAL;
-  @NotNull @Deprecated public static final ModalityState NON_MMODAL;
 
   static {
     try {
+      @SuppressWarnings("unchecked")
       final Class<? extends ModalityState> ex = (Class<? extends ModalityState>)Class.forName("com.intellij.openapi.application.impl.ModalityStateEx");
       NON_MODAL = ex.newInstance();
-      NON_MMODAL = NON_MODAL;
-
-      assert NON_MODAL != null;
     }
     catch (ClassNotFoundException e) {
       throw new IllegalStateException(e);

platform/platform-api/src/com/intellij/openapi/project/impl/ProjectLifecycleListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 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.
@@ -13,33 +13,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-/*
- * @author max
- */
 package com.intellij.openapi.project.impl;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.util.messages.Topic;
 import org.jetbrains.annotations.NotNull;
 
+/**
+ * @author max
+ */
 public interface ProjectLifecycleListener {
   Topic<ProjectLifecycleListener> TOPIC = Topic.create("Various stages of project lifecycle notifications", ProjectLifecycleListener.class);
 
   void projectComponentsInitialized(Project project);
 
   void beforeProjectLoaded(@NotNull Project project);
+
   void afterProjectClosed(@NotNull Project project);
 
   abstract class Adapter implements ProjectLifecycleListener {
-    public void projectComponentsInitialized(final Project project) {}
+    public void projectComponentsInitialized(final Project project) { }
 
-    public void beforeProjectLoaded(@NotNull final Project project) {
+    public void beforeProjectLoaded(@NotNull final Project project) { }
 
-    }
-
-    public void afterProjectClosed(@NotNull Project project) {
-
-    }
+    public void afterProjectClosed(@NotNull Project project) { }
   }
 }

platform/util/src/com/intellij/util/io/URLUtil.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 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.
@@ -16,14 +16,17 @@
 
 package com.intellij.util.io;
 
-import com.google.common.base.Charsets;
 import com.intellij.openapi.util.io.FileUtil;
 import gnu.trove.TIntArrayList;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.*;
+import java.io.FileNotFoundException;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
+import java.nio.charset.Charset;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -120,7 +123,7 @@ public class URLUtil {
           for (int j = 0; j < bytes.size(); j++) {
             bytesArray[j] = (byte)bytes.getQuick(j);
           }
-          decoded.append(new String(bytesArray, Charsets.UTF_8));
+          decoded.append(new String(bytesArray, Charset.forName("UTF-8")));
           continue;
         }
       }

platform/util/util.iml

@@ -20,15 +20,6 @@
     <orderEntry type="library" name="OroMatcher" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" scope="TEST" name="Groovy" level="project" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../plugins/gradle/lib/guava-11.0.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
   </component>
   <component name="copyright">
     <Base>