usage constrains fixes and optimizations for 'added' fields; more tests added

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePackagePrivateWithPackagePrivate.log

@@ -0,0 +1,12 @@
+Cleaning output files:
+out/production/HidePackagePrivateWithPackagePrivate/ppp/Derived.class
+End of files
+Compiling files:
+src/ppp/Derived.java
+End of files
+Cleaning output files:
+out/production/HidePackagePrivateWithPackagePrivate/ppp/ClientInside.class
+End of files
+Compiling files:
+src/ppp/ClientInside.java
+End of files

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePackagePrivateWithPackagePrivate/src/ppp/Base.java

@@ -0,0 +1,5 @@
+package ppp;
+
+public class Base {
+  String x = "base";
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePackagePrivateWithPackagePrivate/src/ppp/ClientInside.java

@@ -0,0 +1,7 @@
+package ppp;
+
+public class ClientInside {
+  void foo(Derived d) {
+    String str = d.x;
+  }
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePackagePrivateWithPackagePrivate/src/ppp/Derived.java

@@ -0,0 +1,4 @@
+package ppp;
+
+public class Derived extends Base{
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePackagePrivateWithPackagePrivate/src/ppp/Derived.java.new

@@ -0,0 +1,5 @@
+package ppp;
+
+public class Derived extends Base{
+  String x = "derived";
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePackagePrivateWithProtected.log

@@ -0,0 +1,12 @@
+Cleaning output files:
+out/production/HidePackagePrivateWithProtected/ppp/Derived.class
+End of files
+Compiling files:
+src/ppp/Derived.java
+End of files
+Cleaning output files:
+out/production/HidePackagePrivateWithProtected/ppp/ClientInside.class
+End of files
+Compiling files:
+src/ppp/ClientInside.java
+End of files

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePackagePrivateWithProtected/src/ppp/Base.java

@@ -0,0 +1,5 @@
+package ppp;
+
+public class Base {
+  String x = "base";
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePackagePrivateWithProtected/src/ppp/ClientInside.java

@@ -0,0 +1,7 @@
+package ppp;
+
+public class ClientInside {
+  void foo(Derived d) {
+    String str = d.x;
+  }
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePackagePrivateWithProtected/src/ppp/Derived.java

@@ -0,0 +1,4 @@
+package ppp;
+
+public class Derived extends Base{
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePackagePrivateWithProtected/src/ppp/Derived.java.new

@@ -0,0 +1,5 @@
+package ppp;
+
+public class Derived extends Base{
+  protected String x = "derived";
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePackagePrivateWithPublic.log

@@ -0,0 +1,12 @@
+Cleaning output files:
+out/production/HidePackagePrivateWithPublic/ppp/Derived.class
+End of files
+Compiling files:
+src/ppp/Derived.java
+End of files
+Cleaning output files:
+out/production/HidePackagePrivateWithPublic/ppp/ClientInside.class
+End of files
+Compiling files:
+src/ppp/ClientInside.java
+End of files

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePackagePrivateWithPublic/src/ppp/Base.java

@@ -0,0 +1,5 @@
+package ppp;
+
+public class Base {
+  String x = "base";
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePackagePrivateWithPublic/src/ppp/ClientInside.java

@@ -0,0 +1,7 @@
+package ppp;
+
+public class ClientInside {
+  void foo(Derived d) {
+    String str = d.x;
+  }
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePackagePrivateWithPublic/src/ppp/Derived.java

@@ -0,0 +1,4 @@
+package ppp;
+
+public class Derived extends Base{
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePackagePrivateWithPublic/src/ppp/Derived.java.new

@@ -0,0 +1,5 @@
+package ppp;
+
+public class Derived extends Base{
+  public String x = "derived";
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hideProtectedWithPackagePrivate.log

@@ -0,0 +1,12 @@
+Cleaning output files:
+out/production/HideProtectedWithPackagePrivate/ppp/Derived.class
+End of files
+Compiling files:
+src/ppp/Derived.java
+End of files
+Cleaning output files:
+out/production/HideProtectedWithPackagePrivate/qqq/DerivedOutside.class
+End of files
+Compiling files:
+src/qqq/DerivedOutside.java
+End of files

java/java-tests/testData/compileServer/incremental/fieldModifiers/hideProtectedWithPackagePrivate/src/ppp/Base.java

@@ -0,0 +1,5 @@
+package ppp;
+
+public class Base {
+  protected String x = "base";
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hideProtectedWithPackagePrivate/src/ppp/ClientInside.java

@@ -0,0 +1,7 @@
+package ppp;
+
+public class ClientInside {
+  void foo(Derived d) {
+    String str = d.x;
+  }
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hideProtectedWithPackagePrivate/src/ppp/Derived.java

@@ -0,0 +1,4 @@
+package ppp;
+
+public class Derived extends Base{
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hideProtectedWithPackagePrivate/src/ppp/Derived.java.new

@@ -0,0 +1,5 @@
+package ppp;
+
+public class Derived extends Base{
+  String x = "derived";
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hideProtectedWithPackagePrivate/src/qqq/DerivedOutside.java

@@ -0,0 +1,8 @@
+package qqq;
+import ppp.*;
+
+public class DerivedOutside extends Derived{
+  void foo() {
+    String str = x;
+  }
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hideProtectedWithProtected.log

@@ -0,0 +1,14 @@
+Cleaning output files:
+out/production/HideProtectedWithProtected/ppp/Derived.class
+End of files
+Compiling files:
+src/ppp/Derived.java
+End of files
+Cleaning output files:
+out/production/HideProtectedWithProtected/ppp/ClientInside.class
+out/production/HideProtectedWithProtected/qqq/DerivedOutside.class
+End of files
+Compiling files:
+src/ppp/ClientInside.java
+src/qqq/DerivedOutside.java
+End of files

java/java-tests/testData/compileServer/incremental/fieldModifiers/hideProtectedWithProtected/src/ppp/Base.java

@@ -0,0 +1,5 @@
+package ppp;
+
+public class Base {
+  protected String x = "base";
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hideProtectedWithProtected/src/ppp/ClientInside.java

@@ -0,0 +1,7 @@
+package ppp;
+
+public class ClientInside {
+  void foo(Derived d) {
+    String str = d.x;
+  }
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hideProtectedWithProtected/src/ppp/Derived.java

@@ -0,0 +1,4 @@
+package ppp;
+
+public class Derived extends Base{
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hideProtectedWithProtected/src/ppp/Derived.java.new

@@ -0,0 +1,5 @@
+package ppp;
+
+public class Derived extends Base{
+  protected String x = "derived";
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hideProtectedWithProtected/src/qqq/DerivedOutside.java

@@ -0,0 +1,8 @@
+package qqq;
+import ppp.*;
+
+public class DerivedOutside extends Derived{
+  void foo() {
+    String str = x;
+  }
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hideProtectedWithPublic.log

@@ -0,0 +1,14 @@
+Cleaning output files:
+out/production/HideProtectedWithPublic/ppp/Derived.class
+End of files
+Compiling files:
+src/ppp/Derived.java
+End of files
+Cleaning output files:
+out/production/HideProtectedWithPublic/ppp/ClientInside.class
+out/production/HideProtectedWithPublic/qqq/DerivedOutside.class
+End of files
+Compiling files:
+src/ppp/ClientInside.java
+src/qqq/DerivedOutside.java
+End of files

java/java-tests/testData/compileServer/incremental/fieldModifiers/hideProtectedWithPublic/src/ppp/Base.java

@@ -0,0 +1,5 @@
+package ppp;
+
+public class Base {
+  protected String x = "base";
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hideProtectedWithPublic/src/ppp/ClientInside.java

@@ -0,0 +1,7 @@
+package ppp;
+
+public class ClientInside {
+  void foo(Derived d) {
+    String str = d.x;
+  }
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hideProtectedWithPublic/src/ppp/Derived.java

@@ -0,0 +1,4 @@
+package ppp;
+
+public class Derived extends Base{
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hideProtectedWithPublic/src/ppp/Derived.java.new

@@ -0,0 +1,5 @@
+package ppp;
+
+public class Derived extends Base{
+  public String x = "derived";
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hideProtectedWithPublic/src/qqq/DerivedOutside.java

@@ -0,0 +1,8 @@
+package qqq;
+import ppp.*;
+
+public class DerivedOutside extends Derived{
+  void foo() {
+    String str = x;
+  }
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithPackagePrivate.log

@@ -0,0 +1,14 @@
+Cleaning output files:
+out/production/HidePublicWithPackagePrivate/ppp/Derived.class
+End of files
+Compiling files:
+src/ppp/Derived.java
+End of files
+Cleaning output files:
+out/production/HidePublicWithPackagePrivate/qqq/ClientOutside.class
+out/production/HidePublicWithPackagePrivate/qqq/DerivedOutside.class
+End of files
+Compiling files:
+src/qqq/ClientOutside.java
+src/qqq/DerivedOutside.java
+End of files

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithPackagePrivate/src/ppp/Base.java

@@ -0,0 +1,5 @@
+package ppp;
+
+public class Base {
+  public String x = "base";
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithPackagePrivate/src/ppp/ClientInside.java

@@ -0,0 +1,7 @@
+package ppp;
+
+public class ClientInside {
+  void foo(Derived d) {
+    String str = d.x;
+  }
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithPackagePrivate/src/ppp/Derived.java

@@ -0,0 +1,4 @@
+package ppp;
+
+public class Derived extends Base{
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithPackagePrivate/src/ppp/Derived.java.new

@@ -0,0 +1,5 @@
+package ppp;
+
+public class Derived extends Base{
+  String x = "derived";
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithPackagePrivate/src/qqq/ClientOutside.java

@@ -0,0 +1,8 @@
+package qqq;
+import ppp.*;
+
+public class ClientOutside {
+  void foo(Derived d) {
+    String str = d.x;
+  }
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithPackagePrivate/src/qqq/DerivedOutside.java

@@ -0,0 +1,8 @@
+package qqq;
+import ppp.*;
+
+public class DerivedOutside extends Derived{
+  void foo() {
+    String str = x;
+  }
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithProtected.log

@@ -0,0 +1,12 @@
+Cleaning output files:
+out/production/HidePublicWithProtected/ppp/Derived.class
+End of files
+Compiling files:
+src/ppp/Derived.java
+End of files
+Cleaning output files:
+out/production/HidePublicWithProtected/qqq/ClientOutside.class
+End of files
+Compiling files:
+src/qqq/ClientOutside.java
+End of files

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithProtected/src/ppp/Base.java

@@ -0,0 +1,5 @@
+package ppp;
+
+public class Base {
+  public String x = "base";
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithProtected/src/ppp/ClientInside.java

@@ -0,0 +1,7 @@
+package ppp;
+
+public class ClientInside {
+  void foo(Derived d) {
+    String str = d.x;
+  }
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithProtected/src/ppp/Derived.java

@@ -0,0 +1,4 @@
+package ppp;
+
+public class Derived extends Base{
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithProtected/src/ppp/Derived.java.new

@@ -0,0 +1,5 @@
+package ppp;
+
+public class Derived extends Base{
+  protected String x = "derived";
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithProtected/src/qqq/ClientOutside.java

@@ -0,0 +1,8 @@
+package qqq;
+import ppp.*;
+
+public class ClientOutside {
+  void foo(Derived d) {
+    String str = d.x;
+  }
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithProtected/src/qqq/DerivedOutside.java

@@ -0,0 +1,8 @@
+package qqq;
+import ppp.*;
+
+public class DerivedOutside extends Derived{
+  void foo() {
+    String str = x;
+  }
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithPublic.log

@@ -0,0 +1,16 @@
+Cleaning output files:
+out/production/HidePublicWithPublic/ppp/Derived.class
+End of files
+Compiling files:
+src/ppp/Derived.java
+End of files
+Cleaning output files:
+out/production/HidePublicWithPublic/ppp/ClientInside.class
+out/production/HidePublicWithPublic/qqq/ClientOutside.class
+out/production/HidePublicWithPublic/qqq/DerivedOutside.class
+End of files
+Compiling files:
+src/ppp/ClientInside.java
+src/qqq/ClientOutside.java
+src/qqq/DerivedOutside.java
+End of files

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithPublic/src/ppp/Base.java

@@ -0,0 +1,5 @@
+package ppp;
+
+public class Base {
+  public String x = "base";
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithPublic/src/ppp/ClientInside.java

@@ -0,0 +1,7 @@
+package ppp;
+
+public class ClientInside {
+  void foo(Derived d) {
+    String str = d.x;
+  }
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithPublic/src/ppp/Derived.java

@@ -0,0 +1,4 @@
+package ppp;
+
+public class Derived extends Base{
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithPublic/src/ppp/Derived.java.new

@@ -0,0 +1,5 @@
+package ppp;
+
+public class Derived extends Base{
+  public String x = "derived";
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithPublic/src/qqq/ClientOutside.java

@@ -0,0 +1,8 @@
+package qqq;
+import ppp.*;
+
+public class ClientOutside {
+  void foo(Derived d) {
+    String str = d.x;
+  }
+}

java/java-tests/testData/compileServer/incremental/fieldModifiers/hidePublicWithPublic/src/qqq/DerivedOutside.java

@@ -0,0 +1,8 @@
+package qqq;
+import ppp.*;
+
+public class DerivedOutside extends Derived{
+  void foo() {
+    String str = x;
+  }
+}