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

Conflicts: .idea/modules.xml build/scripts/layouts.gant platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java Change-Id: Ic1bd5a256d432347bb300789049df6e7149ed6db
author: Tor Norbye <tnorbye@google.com> 2014-06-10 18:44:01 -0700
committer: Tor Norbye <tnorbye@google.com> 2014-06-10 18:44:01 -0700
commit: a262cd22c7721801b23fc2110628528a2b2161ee (patch)
tree: 730858b253b75d4c79f3a5be007d96fcef6df44a /resources-en
parent: ebae45aa9834b169df939c5d70d37be853ee4bba (diff)
parent: 9ea67227e8fdcf8ed37e65bb96e32767291d0f4f (diff)
download: idea-a262cd22c7721801b23fc2110628528a2b2161ee.tar.gz
21 files changed, 117 insertions, 35 deletions
diff --git a/resources-en/src/inspectionDescriptions/BlockMarkerComments.html b/resources-en/src/inspectionDescriptions/BlockMarkerComments.html
new file mode 100644
index 000000000000..a101cf2e3a06
--- /dev/null
+++ b/resources-en/src/inspectionDescriptions/BlockMarkerComments.html
@@ -0,0 +1,20 @@
+<!--
+  ~ 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.
+  -->
+<html>
+<body>
+This inspection reports comments which are code block markers
+</body>
+</html>
diff --git a/resources-en/src/inspectionDescriptions/Contract.html b/resources-en/src/inspectionDescriptions/Contract.html
new file mode 100644
index 000000000000..099c1594ad60
--- /dev/null
+++ b/resources-en/src/inspectionDescriptions/Contract.html
@@ -0,0 +1,9 @@
+<html>
+<body>
+This inspection reports various method contract (@Contract annotation) well-formedness issues:
+<!-- tooltip end -->
+<li>Errors in contract syntax</li>
+<li>Contracts not conforming to the method signature (wrong parameter count)</li>
+<li>Method implementations that contradict the contract (e.g. returning "true" when the contract says "false")</li>
+</body>
+</html>
+\ No newline at end of file
diff --git a/resources-en/src/inspectionDescriptions/FieldAccessNotGuarded.html b/resources-en/src/inspectionDescriptions/FieldAccessNotGuarded.html
index 8e24462ead8d..cd726d57151f 100644
--- a/resources-en/src/inspectionDescriptions/FieldAccessNotGuarded.html
+++ b/resources-en/src/inspectionDescriptions/FieldAccessNotGuarded.html
@@ -2,6 +2,5 @@
 <body>
                This inspection reports any accesses of fields declared as @net.jcip.annotations.GuardedBy
                 which are are not guarded by an appropriate synchronization structure.
-           <br><small>New in 9</small>
 </body>
 </html>
 \ No newline at end of file
diff --git a/resources-en/src/inspectionDescriptions/InconsistentLanguageLevel.html b/resources-en/src/inspectionDescriptions/InconsistentLanguageLevel.html
index 74f8a76f3743..e5775ea7dd76 100644
--- a/resources-en/src/inspectionDescriptions/InconsistentLanguageLevel.html
+++ b/resources-en/src/inspectionDescriptions/InconsistentLanguageLevel.html
@@ -2,6 +2,5 @@
 <body>
 <font face="verdana" size="-1">This inspection lists modules which depend on other modules with higher language level. Such dependencies should be broken off.
 </font>
-<br><small>New in 9</small>
 </body>
 </html>
diff --git a/resources-en/src/inspectionDescriptions/InstanceGuardedByStatic.html b/resources-en/src/inspectionDescriptions/InstanceGuardedByStatic.html
index 6e430dd35f27..565f32dfac3f 100644
--- a/resources-en/src/inspectionDescriptions/InstanceGuardedByStatic.html
+++ b/resources-en/src/inspectionDescriptions/InstanceGuardedByStatic.html
@@ -6,6 +6,5 @@
                 as access to each locked field in any object instance will prevent simultaneous access to that field in
                 every object
                 instance.
-           <br><small>New in 9</small>
 </body>
 </html>
 \ No newline at end of file
diff --git a/resources-en/src/inspectionDescriptions/NonFinalFieldInImmutable.html b/resources-en/src/inspectionDescriptions/NonFinalFieldInImmutable.html
index 3606a6af7f8e..a0b877f4f440 100644
--- a/resources-en/src/inspectionDescriptions/NonFinalFieldInImmutable.html
+++ b/resources-en/src/inspectionDescriptions/NonFinalFieldInImmutable.html
@@ -3,6 +3,5 @@
                 This inspection reports any non-final field in a class with annotation
                 @net.jcip.annotations.Immutable. This violates the contract of the @Immutable
                 annotation.
-           <br><small>New in 9</small>
 </body>
 </html>
 \ No newline at end of file
diff --git a/resources-en/src/inspectionDescriptions/NonFinalGuard.html b/resources-en/src/inspectionDescriptions/NonFinalGuard.html
index db32641b522e..aa0e3e7c3cf2 100644
--- a/resources-en/src/inspectionDescriptions/NonFinalGuard.html
+++ b/resources-en/src/inspectionDescriptions/NonFinalGuard.html
@@ -3,6 +3,5 @@
                This inspection reports any @net.jcip.annotations.GuardedBy annotations where the guarding field
                 is not final. Gaurding on a non-final field may result in unexpected race conditions, as locks will
                 be held on the value of the field (which may change), rather than the field itself.
-           <br><small>New in 9</small>
 </body>
 </html>
 \ No newline at end of file
diff --git a/resources-en/src/inspectionDescriptions/StaticGuardedByInstance.html b/resources-en/src/inspectionDescriptions/StaticGuardedByInstance.html
index 18a9cacb209e..d2efdbc2b6c9 100644
--- a/resources-en/src/inspectionDescriptions/StaticGuardedByInstance.html
+++ b/resources-en/src/inspectionDescriptions/StaticGuardedByInstance.html
@@ -7,6 +7,5 @@
                 concurrency, multiple threads may be able to access the guarded field simultaneously, by locking in
                 different
                 object contexts.
-           <br><small>New in 9</small>
 </body>
 </html>
 \ No newline at end of file
diff --git a/resources-en/src/inspectionDescriptions/UnknownGuard.html b/resources-en/src/inspectionDescriptions/UnknownGuard.html
index 3044276fb9bb..fa76c83a3bff 100644
--- a/resources-en/src/inspectionDescriptions/UnknownGuard.html
+++ b/resources-en/src/inspectionDescriptions/UnknownGuard.html
@@ -2,6 +2,5 @@
 <body>
                 This inspection reports any @net.jcip.annotations.GuardedBy annotations where the guarding field
                 is unknown.
-           <br><small>New in 9</small>
 </body>
 </html>
 \ No newline at end of file
diff --git a/resources-en/src/intentionDescriptions/AddJavadocIntention/after.java.template b/resources-en/src/intentionDescriptions/AddJavadocIntention/after.java.template
new file mode 100644
index 000000000000..d8ef26140dc3
--- /dev/null
+++ b/resources-en/src/intentionDescriptions/AddJavadocIntention/after.java.template
@@ -0,0 +1,8 @@
+public class X {
+  /**
+   * @param j
+   */
+  public void m(int j) {
+
+  }
+}
diff --git a/resources-en/src/intentionDescriptions/AddJavadocIntention/before.java.template b/resources-en/src/intentionDescriptions/AddJavadocIntention/before.java.template
new file mode 100644
index 000000000000..81f77ff5f591
--- /dev/null
+++ b/resources-en/src/intentionDescriptions/AddJavadocIntention/before.java.template
@@ -0,0 +1,5 @@
+public class X {
+  public void <spot>m</spot>(int j) {
+
+  }
+}
diff --git a/resources-en/src/intentionDescriptions/AddJavadocIntention/description.html b/resources-en/src/intentionDescriptions/AddJavadocIntention/description.html
new file mode 100644
index 000000000000..12558ab6beac
--- /dev/null
+++ b/resources-en/src/intentionDescriptions/AddJavadocIntention/description.html
@@ -0,0 +1,20 @@
+<!--
+  ~ 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.
+  -->
+<html>
+<body>
+Creates documentation comment for class, method or field if it's not created yet.
+</body>
+</html>
diff --git a/resources-en/src/intentionDescriptions/CreateSwitchIntention/after.java.template b/resources-en/src/intentionDescriptions/CreateSwitchIntention/after.java.template
new file mode 100644
index 000000000000..f5d18e048de3
--- /dev/null
+++ b/resources-en/src/intentionDescriptions/CreateSwitchIntention/after.java.template
@@ -0,0 +1,5 @@
+void m(int var) {
+  switch(var) {
+
+  }
+}
+\ No newline at end of file
diff --git a/resources-en/src/intentionDescriptions/CreateSwitchIntention/before.java.template b/resources-en/src/intentionDescriptions/CreateSwitchIntention/before.java.template
new file mode 100644
index 000000000000..76cda38ec23c
--- /dev/null
+++ b/resources-en/src/intentionDescriptions/CreateSwitchIntention/before.java.template
@@ -0,0 +1,3 @@
+void m(int var) {
+  <spot>var<spot>
+}
+\ No newline at end of file
diff --git a/resources-en/src/intentionDescriptions/CreateSwitchIntention/description.html b/resources-en/src/intentionDescriptions/CreateSwitchIntention/description.html
new file mode 100644
index 000000000000..f83b1d041727
--- /dev/null
+++ b/resources-en/src/intentionDescriptions/CreateSwitchIntention/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Creates switch statement for selected variable
+</body>
+</html>
diff --git a/resources-en/src/intentionDescriptions/GenerateMissedTestsAction/after.java.template b/resources-en/src/intentionDescriptions/GenerateMissedTestsAction/after.java.template
new file mode 100644
index 000000000000..5d0e5b487205
--- /dev/null
+++ b/resources-en/src/intentionDescriptions/GenerateMissedTestsAction/after.java.template
@@ -0,0 +1,16 @@
+public class Foo {
+  public void doSomething() {
+  }
+
+  public void doSomethingElse(){
+  }
+}
+public class FooTest extends TestCase {
+  public void testDoSomething() {
+
+  }
+  <spot>
+  public void testDoSomethingElse() {
+  }
+  </spot>
+}
diff --git a/resources-en/src/intentionDescriptions/GenerateMissedTestsAction/before.java.template b/resources-en/src/intentionDescriptions/GenerateMissedTestsAction/before.java.template
new file mode 100644
index 000000000000..7bcdfe8c47d8
--- /dev/null
+++ b/resources-en/src/intentionDescriptions/GenerateMissedTestsAction/before.java.template
@@ -0,0 +1,10 @@
+<spot>public class Foo</spot> {
+  public void doSomething() {
+  }
+
+  public void doSomethingElse(){
+  }
+}
+public class FooTest extends TestCase {
+  public void testDoSomething() {}
+}
diff --git a/resources-en/src/intentionDescriptions/GenerateMissedTestsAction/description.html b/resources-en/src/intentionDescriptions/GenerateMissedTestsAction/description.html
new file mode 100644
index 000000000000..898929479507
--- /dev/null
+++ b/resources-en/src/intentionDescriptions/GenerateMissedTestsAction/description.html
@@ -0,0 +1,6 @@
+<html>
+<body>
+This intention generates missed tests for the selected class. <br>
+Generated skeleton test methods for the chosen public methods would be appended to the existing test class.
+</body>
+</html>
diff --git a/resources-en/src/messages/CompilerBundle.properties b/resources-en/src/messages/CompilerBundle.properties
index 27a33a6d02df..be7367512247 100644
--- a/resources-en/src/messages/CompilerBundle.properties
+++ b/resources-en/src/messages/CompilerBundle.properties
@@ -51,18 +51,11 @@ generated.ant.build.build.all.target.name=build all
 generated.ant.build.building.concrete.module.section.title=Module {0}
 compiler.error.exception=Error: {0}
 error.compiler.caches.corrupted=Compiler caches are corrupted. Starting rebuild...
-error.caches.old.format=Compiler caches on disk have old format. Project rebuild is required.
-error.previous.compilation.failed=Previous compilation did not terminate properly. Caches may have been corrupted. Starting rebuild...
 error.dependency.info.on.disk.corrupted=Compiler dependency information on disk is corrupted. Rebuild required.
-error.vfs.was.rebuilt=File system caches were invalidated. Rebuild required.
 status.compilation.aborted=Compilation aborted
 status.all.up.to.date=All files are up-to-date
-progress.saving.caches=Saving caches...
-progress.clearing.output=Clearing output directories...
 compiler.error.failed.to.delete=Failed to delete {0}
-progress.synchronizing.output.directory=Synchronizing output directory...
 progress.updating.caches=Updating caches...
-progress.processing.outdated.files=Processing outdated files...
 compiler.content.name.compile=Compile
 compiler.content.name.make=Make
 status.compilation.completed.successfully.with.warnings=Compilation completed successfully with {0} {0,choice, 0#warnings|1#warning|2#warnings}
@@ -73,25 +66,19 @@ progress.executing.postcompile.tasks=Executing post-compile tasks...
 error.failed.to.create.directory=Failed to create directory {0}
 error.chunk.modules.must.have.same.jdk=The following modules must have the same JDK assigned because of cyclic dependencies between them:\n{0}\nPlease update modules configuration
 error.chunk.modules.must.have.same.language.level=The following modules must have the same language level assigned because of cyclic dependencies between them:\n{0}\nPlease update modules configuration
-error.annotation.processing.not.supported.for.module.cycles=Annotation processors running is not supported for module cycles. The following modules form a cycle:\n{0}\nPlease either update modules configuration or exclude these modules from annotation processing
 warning.sources.under.output.paths=Compiler option \"Clear output directory on rebuild\" is currently on.\nHowever, source files may exist in the following output paths:\n{0}\nCompilation will proceed without clearing output directories.
 action.compiler.properties.text=Compiler Properties
 actions.exclude.from.compile.text=Exclude from Compile
-progress.deleting.temp.files=Deleting temp files...
 progress.checking.dependencies=Checking dependencies...
 progress.found.dependent.files=Found {0} dependent files
 error.compiler.internal.error=Compiler internal error. Process terminated with exit code {0}
 error.bad.class.file.format=Bad class file format:\n{0}
 java.compiler.description=Java Compiler
-annotation.processing.compiler.description=Java Annotation Processing Compiler
 resource.compiler.description=Resource Compiler
-progress.copying.resources=Copying resources...
-progress.generating.rmi.stubs=Generating RMI stubs...
 rmi.compiler.description=RMI Compiler
 error.jdk.not.specified=Cannot start compiler: the SDK is not specified for {0,choice, 1#module|2#modules\n} {1}.\nSpecify the SDK at Project Structure dialog.
 error.output.not.specified=Cannot start compilation: the output path is not specified for {0,choice, 1#module|2#modules\n} {1}.\nSpecify the output path in Configure Project.
 error.project.output.not.specified=Cannot start compilation: some compilers require that project path is defined.\nSpecify project output path in Configure Project.
-statistics.files.classes.module=Files: {0} - Classes: {1} - Module: {2}
 statistics.files.classes=Files: {0} - Classes: {1}
 compiler.javac.name=Javac
 javac.error.jdk.home.missing=Cannot find home directory ''{1}'' for JDK ''{0}''.\nUpdate JDK configuration.
@@ -99,16 +86,8 @@ javac.error.vm.executable.missing=Cannot obtain path to VM executable for JDK {0
 javac.error.tools.jar.missing=Cannot obtain path javac classes for JDK {0}.\nUpdate JDK configuration.
 javac.error.unknown.jdk.version=Cannot determine version for JDK {0}.\nUpdate JDK configuration.
 javac.error.1_0_compilation.not.supported=Compilation is not supported for JDK 1.0
-compiler.jikes.name=Jikes
-jikes.error.path.to.compiler.unspecified=Cannot start Jikes compiler.\nThe path to compiler executable is not configured
-jikes.error.path.to.compiler.missing=Cannot start Jikes compiler.\nThe file {0} not found.
 compiler.configurable.display.name=Compiler
-label.option.honor.dependencies=Honor &dependencies on "Compile" command
 label.option.compile.in.background=C&ompile in background
-label.option.deploy.ask=Ask
-label.option.deploy.never=Never
-label.option.deploy.always=Always
-label.option.deploy.text=Deploy web applications to server after compilation:
 label.option.clear.output.directory.on.rebuild=C&lear output directory on rebuild
 label.option.resource.patterns.text=Resource patterns\:
 error.compiler.configurable.malformed.patterns=The following resource patterns are malformed:\n{0}
@@ -121,8 +100,6 @@ java.compiler.option.generate.no.warnings=Generate no warnings
 java.compiler.option.generate.debugging.info=Generate debugging info
 java.compiler.option.report.deprecated=Report use of deprecated features
 javac.option.max.heap.size=Maximum heap size (MB):
-jikes.option.path.to.executable=Path to Jikes executable:
-jikes.options.group.title=Jikes Options
 javac.options.group.title=Javac Options
 rmic.option.generate.iiop.stubs=Generate IIOP stubs
 rmic.option.enable.rmi.stubs=Enable RMI stubs generation
@@ -139,7 +116,6 @@ error.signature.parsing.expected.other.symbol=Symbol ''{0}'' expected: {1}
 error.compiler.process.not.started=Compiler not started: {0}
 add.notnull.assertions=Add @NotNull &assertions
 
-eclipse.compiler.error.jar.not.found=Cannot start Eclipse compiler.\nThe file {0} not found.
 compiler.eclipse.name=Eclipse
 eclipse.options.group.title=Eclipse Options
 eclipse.compiler.parsing=Parsing {0}
diff --git a/resources-en/src/messages/DebuggerBundle.properties b/resources-en/src/messages/DebuggerBundle.properties
index 09907f7513c9..ff3238c7dab2 100644
--- a/resources-en/src/messages/DebuggerBundle.properties
+++ b/resources-en/src/messages/DebuggerBundle.properties
@@ -329,8 +329,8 @@ title.error.evaluating.breakpoint.action=Breakpoint Action Error
 error.evaluating.breakpoint.condition.or.action=Problem processing VM event:\nBreakpoint: ''{0}''\nError: {1}\nWould you like to stop at the breakpoint?
 error.unable.to.evaluate.expression=unable to evaluate the expression
 breakpoint.properties.panel.option.pass.count=&Pass count:
-breakpoint.properties.panel.option.class.filters=C&lass filters
-breakpoint.properties.panel.option.instance.filters=&Instance filters
+breakpoint.properties.panel.option.class.filters=C&lass filters:
+breakpoint.properties.panel.option.instance.filters=&Instance filters:
 breakpoint.properties.panel.option.condition=Co&ndition:
 breakpoint.properties.panel.option.suspend.all=All
 breakpoint.properties.panel.option.suspend.none=None
@@ -431,7 +431,6 @@ title.smart.step.popup=Method to Step Into
 action.show.watches.description=Shows or hides 'watches' pane
 action.show.watches.text.hide=Hide Watches
 action.show.watches.text.show=Show Watches
-action.unmute.on.stop.text=Unmute breakpoints on session finish
 action.watch.method.return.value.description=Enables watching last executed method return value
 action.watches.method.return.value.enable=Watch method return values
 action.watches.method.return.value.disable=Stop watching method return values
diff --git a/resources-en/src/messages/QuickFixBundle.properties b/resources-en/src/messages/QuickFixBundle.properties
index 93a969d9f26f..9e94379d7892 100644
--- a/resources-en/src/messages/QuickFixBundle.properties
+++ b/resources-en/src/messages/QuickFixBundle.properties
@@ -274,4 +274,11 @@ remove.redundant.arguments.family=Remove redundant arguments
 replace.with.list.access.text=Replace with list access
 
 add.qualifier=Add qualifier
-add.qualifier.original.class.chooser.title=Original class
-\ No newline at end of file
+add.qualifier.original.class.chooser.title=Original class
+
+wrap.array.to.arrays.as.list.parameter.text=Wrap {0, choice, 1#1st|2#2nd|3#3rd|4#{0,number}th} parameter using ''Arrays.asList''
+wrap.array.to.arrays.as.list.single.parameter.text=Wrap using ''Arrays.asList''
+
+annotations.fix=Annotations
+add.missing.annotation.parameters.fix=Add missing annotation parameters - {0}
+add.missing.annotation.single.parameter.fix=Add missing annotation parameter ''{0}''
+\ No newline at end of file
author	Tor Norbye <tnorbye@google.com>	2014-06-10 18:44:01 -0700
committer	Tor Norbye <tnorbye@google.com>	2014-06-10 18:44:01 -0700
commit	a262cd22c7721801b23fc2110628528a2b2161ee (patch)
tree	730858b253b75d4c79f3a5be007d96fcef6df44a /resources-en
parent	ebae45aa9834b169df939c5d70d37be853ee4bba (diff)
parent	9ea67227e8fdcf8ed37e65bb96e32767291d0f4f (diff)
download	idea-a262cd22c7721801b23fc2110628528a2b2161ee.tar.gz