From 851446513c86cd1577b5ee2d089d542fbca9a26b Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 14 Mar 2016 14:22:10 +0300
Subject: [PATCH] renamed package-local to package-private

---
 .../org/jetbrains/java/generate/package.html  |  2 +-
 .../enter/Performance.properties              | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugins/generate-tostring/src/org/jetbrains/java/generate/package.html b/plugins/generate-tostring/src/org/jetbrains/java/generate/package.html
index 59030937a65d..aa0881be31a9 100644
--- a/plugins/generate-tostring/src/org/jetbrains/java/generate/package.html
+++ b/plugins/generate-tostring/src/org/jetbrains/java/generate/package.html
@@ -305,7 +305,7 @@
     <tr><td>$member.modifierStatic</td><td>boolean</td><td>Does the type have a static modifier?</td></tr>
     <tr><td>$member.modifierPublic</td><td>boolean</td><td>Does the type have a public modifier?</td></tr>
     <tr><td>$member.modifierProtected</td><td>boolean</td><td>Does the type have a protected modifier?</td></tr>
-    <tr><td>$member.modifierPackageLocal</td><td>boolean</td><td>Does the type have a package-local modifier?</td></tr>
+    <tr><td>$member.modifierPackageLocal</td><td>boolean</td><td>Does the type have a package-private modifier?</td></tr>
     <tr><td>$member.modifierPrivate</td><td>boolean</td><td>Does the type have a private modifier?</td></tr>
     <tr><td>$member.modifierFinal</td><td>boolean</td><td>Does the type have a final modifier?</td></tr>
     <tr><td>$member.string</td><td>boolean</td><td>Is the type assignable from java.lang.String?</td></tr>
diff --git a/plugins/properties/testData/propertiesFile/enter/Performance.properties b/plugins/properties/testData/propertiesFile/enter/Performance.properties
index 84f925a856b3..e0811a35aad4 100644
--- a/plugins/properties/testData/propertiesFile/enter/Performance.properties
+++ b/plugins/properties/testData/propertiesFile/enter/Performance.properties
@@ -466,8 +466,8 @@ large.initializer.primitive.type.array.problem.descriptor=Primitive array initia
 large.initializer.primitive.type.array.maximum.number.of.elements.option=Maximum number of elements:
 private.member.access.between.outer.and.inner.classes.display.name=Private member access between outer and inner classes
 private.member.access.between.outer.and.inner.classes.problem.descriptor=Access to private member of class ''{0}'' #loc
-private.member.access.between.outer.and.inner.classes.make.local.quickfix=Make ''{0}'' package-local
-private.member.access.between.outer.and.inner.classes.make.constructor.package.local.quickfix=Make ''{0}'' constructor package-local
+private.member.access.between.outer.and.inner.classes.make.local.quickfix=Make ''{0}'' package-private
+private.member.access.between.outer.and.inner.classes.make.constructor.package.local.quickfix=Make ''{0}'' constructor package-private
 recordstore.opened.not.safely.closed.display.name=RecordStore opened but not safely closed
 overly.complex.anonymous.inner.class.display.name=Overly complex anonymous inner class
 cyclomatic.complexity.limit.option=Cyclomatic complexity limit:
@@ -1428,8 +1428,8 @@ cached.number.constructor.call.ignore.string.arguments.option=Ignore new number
 chained.equality.comparisons.problem.descriptor=Chained equality comparison <code>#ref</code> #loc
 confusing.octal.escape.sequence.problem.descriptor=Octal escape sequence <code>#ref</code> immediately followed by digit #loc
 field.accessed.synchronized.and.unsynchronized.option=Simple getters and setters are considered field accesses too
-method.overrides.package.local.method.display.name=Method overrides package-local method of superclass located in other package
-method.overrides.package.local.method.problem.descriptor=Method <code>#ref()</code> overrides a package-local method of a superclass located in another package #loc
+method.overrides.package.local.method.display.name=Method overrides package-private method of superclass located in other package
+method.overrides.package.local.method.problem.descriptor=Method <code>#ref()</code> overrides a package-private method of a superclass located in another package #loc
 suspicious.to.array.call.display.name=Suspicious 'Collection.toArray()' call
 suspicious.to.array.call.problem.descriptor=Array of type ''{0}[]'' expected #loc
 suspicious.system.arraycopy.display.name=Suspicious 'System.arraycopy()' call
@@ -10211,8 +10211,8 @@ do.you.wish.to.continue=Do you wish to continue?
 all.these.directories.will.be.moved.and.all.references.to.0.will.be.changed=All these directories will be moved, and all references to {0} \nwill be changed.
 select.source.root.chooser.title=Select Source Root
 moving.directories.command=Moving directories
-0.uses.a.package.local.1={0} uses package-local {1}
-a.package.local.class.0.will.no.longer.be.accessible.from.1=Package-local class {0} will no longer be accessible from {1}
+0.uses.a.package.local.1={0} uses package-private {1}
+a.package.local.class.0.will.no.longer.be.accessible.from.1=package-private class {0} will no longer be accessible from {1}
 element.will.no.longer.be.accessible={0} will no longer be accessible from {1}
 move.instance.method.command=Move Instance method
 move.instance.method.elements.header=Move instance method
@@ -15957,8 +15957,8 @@ large.initializer.primitive.type.array.problem.descriptor=Primitive array initia
 large.initializer.primitive.type.array.maximum.number.of.elements.option=Maximum number of elements:
 private.member.access.between.outer.and.inner.classes.display.name=Private member access between outer and inner classes
 private.member.access.between.outer.and.inner.classes.problem.descriptor=Access to private member of class ''{0}'' #loc
-private.member.access.between.outer.and.inner.classes.make.local.quickfix=Make ''{0}'' package-local
-private.member.access.between.outer.and.inner.classes.make.constructor.package.local.quickfix=Make ''{0}'' constructor package-local
+private.member.access.between.outer.and.inner.classes.make.local.quickfix=Make ''{0}'' package-private
+private.member.access.between.outer.and.inner.classes.make.constructor.package.local.quickfix=Make ''{0}'' constructor package-private
 recordstore.opened.not.safely.closed.display.name=RecordStore opened but not safely closed
 overly.complex.anonymous.inner.class.display.name=Overly complex anonymous inner class
 cyclomatic.complexity.limit.option=Cyclomatic complexity limit:
@@ -16919,8 +16919,8 @@ cached.number.constructor.call.ignore.string.arguments.option=Ignore new number
 chained.equality.comparisons.problem.descriptor=Chained equality comparison <code>#ref</code> #loc
 confusing.octal.escape.sequence.problem.descriptor=Octal escape sequence <code>#ref</code> immediately followed by digit #loc
 field.accessed.synchronized.and.unsynchronized.option=Simple getters and setters are considered field accesses too
-method.overrides.package.local.method.display.name=Method overrides package-local method of superclass located in other package
-method.overrides.package.local.method.problem.descriptor=Method <code>#ref()</code> overrides a package-local method of a superclass located in another package #loc
+method.overrides.package.local.method.display.name=Method overrides package-private method of superclass located in other package
+method.overrides.package.local.method.problem.descriptor=Method <code>#ref()</code> overrides a package-private method of a superclass located in another package #loc
 suspicious.to.array.call.display.name=Suspicious 'Collection.toArray()' call
 suspicious.to.array.call.problem.descriptor=Array of type ''{0}[]'' expected #loc
 suspicious.system.arraycopy.display.name=Suspicious 'System.arraycopy()' call
@@ -25699,8 +25699,8 @@ do.you.wish.to.continue=Do you wish to continue?
 all.these.directories.will.be.moved.and.all.references.to.0.will.be.changed=All these directories will be moved, and all references to {0} \nwill be changed.
 select.source.root.chooser.title=Select Source Root
 moving.directories.command=Moving directories
-0.uses.a.package.local.1={0} uses package-local {1}
-a.package.local.class.0.will.no.longer.be.accessible.from.1=Package-local class {0} will no longer be accessible from {1}
+0.uses.a.package.local.1={0} uses package-private {1}
+a.package.local.class.0.will.no.longer.be.accessible.from.1=package-private class {0} will no longer be accessible from {1}
 element.will.no.longer.be.accessible={0} will no longer be accessible from {1}
 move.instance.method.command=Move Instance method
 move.instance.method.elements.header=Move instance method