changeset 237:905643674ab9

Generators: lower the generated classes to the same package.
author shade
date Wed, 11 May 2016 00:45:54 +0300
parents 49d7d2c14b2f
children d81530020d67
files jcstress-core/src/main/java/org/openjdk/jcstress/infra/processors/JCStressTestProcessor.java
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/processors/JCStressTestProcessor.java	Tue May 10 23:58:18 2016 +0300
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/processors/JCStressTestProcessor.java	Wed May 11 00:45:54 2016 +0300
@@ -184,7 +184,7 @@
             info.setResult(e);
         }
 
-        String packageName = getPackageName(info.getTest()) + ".generated";
+        String packageName = getPackageName(info.getTest());
         String testName = getGeneratedName(info.getTest());
 
         info.setGeneratedName(packageName + "." + testName);
@@ -265,7 +265,7 @@
         PrintWriter pw;
         Writer writer;
         try {
-            writer = processingEnv.getFiler().createSourceFile(getPackageName(info.getTest()) + ".generated." + className).openWriter();
+            writer = processingEnv.getFiler().createSourceFile(getPackageName(info.getTest()) + "." + className).openWriter();
             pw = new PrintWriter(writer);
         } catch (IOException e) {
             throw new GenerationException("IOException: " + e.getMessage(), info.getTest());
@@ -279,7 +279,7 @@
 
         int actorsCount = info.getActors().size();
 
-        pw.println("package " + getPackageName(info.getTest()) + ".generated;");
+        pw.println("package " + getPackageName(info.getTest()) + ";");
 
         printImports(pw, info);
 
@@ -525,7 +525,7 @@
         PrintWriter pw;
         Writer writer;
         try {
-            writer = processingEnv.getFiler().createSourceFile(getPackageName(info.getTest()) + ".generated." + generatedName).openWriter();
+            writer = processingEnv.getFiler().createSourceFile(getPackageName(info.getTest()) + "." + generatedName).openWriter();
             pw = new PrintWriter(writer);
         } catch (IOException e) {
             throw new GenerationException("IOException: " + e.getMessage(), info.getTest());
@@ -535,7 +535,7 @@
 
         ExecutableElement actor = info.getActors().get(0);
 
-        pw.println("package " + getPackageName(info.getTest()) + ".generated;");
+        pw.println("package " + getPackageName(info.getTest()) + ";");
 
         printImports(pw, info);