merging android studio-1.3-release

diff --git a/.idea/libraries/fest.xml b/.idea/libraries/fest.xml
index 0321e3b110b7f756afbff28b62a80b04adb8145a..ae7d19242e9ec2e208bd15e99b6cc312406b8153 100644 (file)
--- a/.idea/libraries/fest.xml
+++ b/.idea/libraries/fest.xml
@@ -1,10 +1,10 @@
 <component name="libraryTable">
   <library name="fest">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/android/android/lib/fest-assert-1.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/android/android/lib/fest-reflect-1.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/android/android/lib/fest-swing-1.2.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/android/android/lib/fest-util-1.1.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/fest-assert-1.5.0-SNAPSHOT.jar!/" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/fest-reflect-2.0-SNAPSHOT.jar!/" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/fest-swing-1.4-SNAPSHOT.jar!/" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/fest-util-1.3.0-SNAPSHOT.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

diff --git a/.idea/modules.xml b/.idea/modules.xml
index f44ef2057e15e25a50ee03887173faae12e581f7..5047a1c7d30f760966d0e8482ef9453851c0c99a 100644 (file)
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -30,8 +30,11 @@
       <module fileurl="file://$PROJECT_DIR$/platform/boot/boot.iml" filepath="$PROJECT_DIR$/platform/boot/boot.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/bootstrap/bootstrap.iml" filepath="$PROJECT_DIR$/platform/bootstrap/bootstrap.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/build/build.iml" filepath="$PROJECT_DIR$/build/build.iml" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/build-system/builder-model/builder-model.iml" filepath="$PROJECT_DIR$/android/tools-base/build-system/builder-model/builder-model.iml" group="android/sdktools" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/build-system/builder-test-api/builder-test-api.iml" filepath="$PROJECT_DIR$/android/tools-base/build-system/builder-test-api/builder-test-api.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/platform/built-in-server/built-in-server.iml" filepath="$PROJECT_DIR$/platform/built-in-server/built-in-server.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/built-in-server-api/built-in-server-api.iml" filepath="$PROJECT_DIR$/platform/built-in-server-api/built-in-server-api.iml" group="platform" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/chartlib/chartlib.iml" filepath="$PROJECT_DIR$/android/tools-base/chartlib/chartlib.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/colorSchemes/colorSchemes.iml" filepath="$PROJECT_DIR$/colorSchemes/colorSchemes.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/plugins/commander/commander.iml" filepath="$PROJECT_DIR$/plugins/commander/commander.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/android/tools-base/common/common.iml" filepath="$PROJECT_DIR$/android/tools-base/common/common.iml" group="android/sdktools" />
@@ -204,6 +207,7 @@
       <module fileurl="file://$PROJECT_DIR$/resources/resources.iml" filepath="$PROJECT_DIR$/resources/resources.iml" />
       <module fileurl="file://$PROJECT_DIR$/resources-en/resources-en.iml" filepath="$PROJECT_DIR$/resources-en/resources-en.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/rest/rest.iml" filepath="$PROJECT_DIR$/python/rest/rest.iml" group="python" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/rpclib/rpclib.iml" filepath="$PROJECT_DIR$/android/tools-base/rpclib/rpclib.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/platform/script-debugger/backend/script-debugger-backend.iml" filepath="$PROJECT_DIR$/platform/script-debugger/backend/script-debugger-backend.iml" group="platform/script-debugger" />
       <module fileurl="file://$PROJECT_DIR$/platform/script-debugger/debugger-ui/script-debugger-ui.iml" filepath="$PROJECT_DIR$/platform/script-debugger/debugger-ui/script-debugger-ui.iml" group="platform/script-debugger" />
       <module fileurl="file://$PROJECT_DIR$/android/tools-base/sdk-common/sdk-common.iml" filepath="$PROJECT_DIR$/android/tools-base/sdk-common/sdk-common.iml" group="android/sdktools" />

diff --git a/community-tests/src/tests/testGroups.properties b/community-tests/src/tests/testGroups.properties
index 718f7c91366f5b5fdccba54dde70159d877a117a..86295d76aa04dd140aebf4f9092bb9dbf6407e9c 100644 (file)
--- a/community-tests/src/tests/testGroups.properties
+++ b/community-tests/src/tests/testGroups.properties
@@ -50,6 +50,7 @@ com.android.tools.idea.wizard.TemplateWizardStateTest
 com.android.tools.idea.wizard.TemplateWizardModuleBuilderTest
 com.android.tools.idea.wizard.NewTemplateObjectWizardTest
 org.jetbrains.android.run.AndroidRunConfigurationTest
+org.jetbrains.android.run.GradleApkProviderTest
 org.jetbrains.android.facet.IdeaSourceProviderTest
 com.android.tools.idea.gradle.service.resolve.AndroidResolveTest
 com.android.tools.idea.gradle.service.resolve.AndroidDslContributorTest
@@ -70,6 +71,23 @@ com.android.tools.idea.welcome.FirstRunWizardTest
 com.android.tools.idea.welcome.InstallComponentsTest
 com.android.tools.idea.welcome.AndroidVirtualDeviceTest
 com.android.tools.idea.wizard.ConfigureAndroidModuleStepDynamicTest
+com.android.tools.idea.editors.AndroidGeneratedSourcesFilterTest
+com.android.tools.idea.editors.theme.ThemeEditorStyleTest
+com.android.tools.idea.editors.theme.ThemeEditorUtilsTest
+com.android.tools.idea.editors.theme.qualifiers.QualifierUtilsTest
+com.android.tools.idea.gradle.IdeaAndroidProjectTest
+com.android.tools.idea.gradle.project.GradleProjectSyncDataTest
+com.android.tools.idea.npw.ConfigureAndroidModuleStepTest
+com.android.tools.idea.npw.ConfigureAndroidModuleStepDynamicTest
+com.android.tools.idea.npw.NewModuleWizardStateTest
+com.android.tools.idea.npw.NewProjectWizardTest
+com.android.tools.idea.npw.NewTemplateObjectWizardTest
+com.android.tools.idea.npw.TemplateWizardModuleBuilderTest
+com.android.tools.idea.npw.WrapArchiveWizardPathTest
+com.android.tools.idea.sdk.IdeSdksTest
+com.android.tools.idea.welcome.wizard.FirstRunWizardTest
+com.android.tools.idea.wizard.template.TemplateWizardStateTest
+com.android.tools.swing.layoutlib.GraphicsLayoutRendererTest
 
 [ANDROID_BOMBED]
 com.android.tools.idea.gradle.project.GradleModuleImportTest

diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/JavaValue.java b/java/debugger/impl/src/com/intellij/debugger/engine/JavaValue.java
index a78076b790649d7ca757228abf558ddf0acb18df..9e43666e17e015039940a4d618c5ce3317d361de 100644 (file)
--- a/java/debugger/impl/src/com/intellij/debugger/engine/JavaValue.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/JavaValue.java
@@ -181,7 +181,7 @@ public class JavaValue extends XNamedValue implements NodeDescriptorProvider, XV
   }
 
   public abstract static class JavaFullValueEvaluator extends XFullValueEvaluator {
-    private final EvaluationContextImpl myEvaluationContext;
+    protected final EvaluationContextImpl myEvaluationContext;
 
     public JavaFullValueEvaluator(@NotNull String linkText, EvaluationContextImpl evaluationContext) {
       super(linkText);

diff --git a/java/java-impl/src/com/intellij/codeInspection/inferNullity/NullityInferrer.java b/java/java-impl/src/com/intellij/codeInspection/inferNullity/NullityInferrer.java
index 579a4527fc5b4d60bee1d8b3f649409b5cc1cdf0..b9dbaea0d79f014feb8005ed046549f4a4439e09 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInspection/inferNullity/NullityInferrer.java
+++ b/java/java-impl/src/com/intellij/codeInspection/inferNullity/NullityInferrer.java
@@ -157,7 +157,7 @@ public class NullityInferrer {
     }
   }
 
-  static void nothingFoundMessage(final Project project) {
+  public static void nothingFoundMessage(final Project project) {
     SwingUtilities.invokeLater(new Runnable() {
       @Override
       public void run() {

diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/LightInspectionTestCase.java b/java/testFramework/src/com/siyeh/ig/LightInspectionTestCase.java
similarity index 100%
rename from plugins/InspectionGadgets/testsrc/com/siyeh/ig/LightInspectionTestCase.java
rename to java/testFramework/src/com/siyeh/ig/LightInspectionTestCase.java