Change name of MainGenerator

speedment · Jan 13, 2016 · 3c6b19c · 3c6b19c
1 parent 40668c6
commit 3c6b19c
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 21 deletions.
diff --git a/src/main/java/com/speedment/event/AfterGenerate.java b/src/main/java/com/speedment/event/AfterGenerate.java
@@ -21,6 +21,7 @@
 import com.speedment.config.db.Project;
 import com.speedment.event.trait.GeneratorEvent;
 import com.speedment.internal.codegen.base.Generator;
+import com.speedment.internal.core.code.TranslatorManager;
 import static java.util.Objects.requireNonNull;
 
 /**
@@ -33,10 +34,12 @@ public final class AfterGenerate implements ProjectEvent, GeneratorEvent {
 
     private final Project project;
     private final Generator generator;
+    private final TranslatorManager translatorManager;
 
-    public AfterGenerate(Project project, Generator generator) {
-        this.project   = requireNonNull(project);
-        this.generator = requireNonNull(generator);
+    public AfterGenerate(Project project, Generator generator, TranslatorManager translatorManager) {
+        this.project           = requireNonNull(project);
+        this.generator         = requireNonNull(generator);
+        this.translatorManager = requireNonNull(translatorManager);
     }
 
     @Override
@@ -48,4 +51,9 @@ public Project project() {
     public Generator generator() {
         return generator;
     }
+
+    @Override
+    public TranslatorManager translatorManager() {
+        return translatorManager;
+    }
 }
diff --git a/src/main/java/com/speedment/event/BeforeGenerate.java b/src/main/java/com/speedment/event/BeforeGenerate.java
@@ -21,6 +21,7 @@
 import com.speedment.config.db.Project;
 import com.speedment.event.trait.GeneratorEvent;
 import com.speedment.internal.codegen.base.Generator;
+import com.speedment.internal.core.code.TranslatorManager;
 import static java.util.Objects.requireNonNull;
 
 /**
@@ -33,10 +34,12 @@ public final class BeforeGenerate implements ProjectEvent, GeneratorEvent {
 
     private final Project project;
     private final Generator generator;
+    private final TranslatorManager translatorManager;
 
-    public BeforeGenerate(Project project, Generator generator) {
-        this.project   = requireNonNull(project);
-        this.generator = requireNonNull(generator);
+    public BeforeGenerate(Project project, Generator generator, TranslatorManager translatorManager) {
+        this.project           = requireNonNull(project);
+        this.generator         = requireNonNull(generator);
+        this.translatorManager = translatorManager;
     }
 
     @Override
@@ -48,4 +51,9 @@ public Project project() {
     public Generator generator() {
         return generator;
     }
+
+    @Override
+    public TranslatorManager translatorManager() {
+        return translatorManager;
+    }
 }
diff --git a/src/main/java/com/speedment/event/trait/GeneratorEvent.java b/src/main/java/com/speedment/event/trait/GeneratorEvent.java
@@ -19,6 +19,7 @@
 import com.speedment.annotation.Api;
 import com.speedment.event.Event;
 import com.speedment.internal.codegen.base.Generator;
+import com.speedment.internal.core.code.TranslatorManager;
 
 /**
  *
@@ -28,4 +29,5 @@
 @Api(version = "2.3")
 public interface GeneratorEvent extends Event {
     Generator generator();
+    TranslatorManager translatorManager();
 }
diff --git a/...ent/internal/core/code/MainGenerator.java → ...internal/core/code/TranslatorManager.java b/...ent/internal/core/code/MainGenerator.java → ...internal/core/code/TranslatorManager.java
@@ -56,14 +56,14 @@
  *
  * @author pemi
  */
-public class MainGenerator implements Consumer<Project> {
+public class TranslatorManager implements Consumer<Project> {
 
-    private final static Logger LOGGER = LoggerManager.getLogger(MainGenerator.class);
+    private final static Logger LOGGER = LoggerManager.getLogger(TranslatorManager.class);
     private final AtomicInteger fileCounter = new AtomicInteger(0);
 
     private final Speedment speedment;
 
-    public MainGenerator(Speedment speedment) {
+    public TranslatorManager(Speedment speedment) {
         this.speedment = requireNonNull(speedment);
     }
 
@@ -78,7 +78,7 @@ public void accept(Project project) {
         fileCounter.set(0);
         Formatting.tab("    ");
 
-        speedment.getEventComponent().notify(new BeforeGenerate(project, gen));
+        speedment.getEventComponent().notify(new BeforeGenerate(project, gen, this));
 
         translators.add(new SpeedmentApplicationTranslator(speedment, gen, project));
         translators.add(new SpeedmentApplicationMetadataTranslator(speedment, gen, project));
@@ -94,7 +94,7 @@ public void accept(Project project) {
         gen.metaOn(translators.stream()
             .map(Translator::get)
             .collect(Collectors.toList())
-        ).forEach(meta -> writeToFile(project, meta, fileCounter));
+        ).forEach(meta -> writeToFile(project, meta));
 
         final List<Table> tables = traverseOver(project, Table.class)
             .filter(HasEnabled::test)
@@ -105,14 +105,14 @@ public void accept(Project project) {
             fileCounter.incrementAndGet();
         });
 
-        speedment.getEventComponent().notify(new AfterGenerate(project, gen));
+        speedment.getEventComponent().notify(new AfterGenerate(project, gen, this));
     }
 
     public int getFilesCreated() {
         return fileCounter.get();
     }
 
-    protected void writeToFile(Project project, Meta<File, String> meta, AtomicInteger fileCounter) {
+    public void writeToFile(Project project, Meta<File, String> meta) {
         requireNonNull(meta);
 
         final String fname = project.getPackageLocation()

diff --git a/src/main/java/com/speedment/internal/ui/UISession.java b/src/main/java/com/speedment/internal/ui/UISession.java
@@ -24,7 +24,7 @@
 import com.speedment.config.db.Schema;
 import com.speedment.db.DbmsHandler;
 import com.speedment.exception.SpeedmentException;
-import com.speedment.internal.core.code.MainGenerator;
+import com.speedment.internal.core.code.TranslatorManager;
 import com.speedment.internal.ui.config.ProjectProperty;
 import com.speedment.internal.ui.resource.SpeedmentIcon;
 import com.speedment.internal.logging.Logger;
@@ -72,6 +72,8 @@
 import static com.speedment.internal.util.TextUtil.alignRight;
 import java.util.Map;
 import static java.util.Objects.requireNonNull;
+import static com.speedment.internal.util.TextUtil.alignRight;
+import static java.util.Objects.requireNonNull;
 
 /**
  *
@@ -261,7 +263,7 @@ public <T extends Event, E extends EventHandler<T>>  E generate() {
             final Stopwatch stopwatch = Stopwatch.createStarted();
             log(info("Generating classes " + project.getPackageName() + "." + project.getName() + ".*"));
             log(info("Target directory is " + project.getPackageLocation()));
-            final MainGenerator instance = new MainGenerator(speedment);
+            final TranslatorManager instance = new TranslatorManager(speedment);
 
             try {
                 instance.accept(project);

diff --git a/...re/code/model/java/MainGeneratorTest.java → ...ode/model/java/TranslatorManagerTest.java b/...re/code/model/java/MainGeneratorTest.java → ...ode/model/java/TranslatorManagerTest.java
@@ -19,25 +19,23 @@
 import com.speedment.config.db.Project;
 import com.speedment.internal.codegen.base.Meta;
 import com.speedment.internal.codegen.lang.models.File;
-import com.speedment.internal.core.code.MainGenerator;
-import java.util.concurrent.atomic.AtomicInteger;
+import com.speedment.internal.core.code.TranslatorManager;
 import org.junit.Test;
 
 /**
  *
  * @author pemi
  */
-public class MainGeneratorTest extends SimpleModelTest {
+public class TranslatorManagerTest extends SimpleModelTest {
 
     @Test
-
     public void testAccept() {
         System.out.println("accept");
 
-        final MainGenerator instance = new MainGenerator(speedment) {
+        final TranslatorManager instance = new TranslatorManager(speedment) {
 
             @Override
-            protected void writeToFile(Project project, Meta<File, String> meta, AtomicInteger fileCounter) {
+            public void writeToFile(Project project, Meta<File, String> meta) {
                 System.out.println("Processing "+meta.getModel().getName());
                 // Do nothing on file...
             }