move CanonicalCodeBuilder to the core #430

LinguaPhylo · Dec 3, 2023 · c002c09 · c002c09
1 parent 5fa1349
commit c002c09
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 11 deletions.
diff --git a/lphy-studio/src/main/java/lphystudio/app/LinguaPhyloStudio.java b/lphy-studio/src/main/java/lphystudio/app/LinguaPhyloStudio.java
@@ -1,5 +1,6 @@
 package lphystudio.app;
 
+import lphy.core.codebuilder.CanonicalCodeBuilder;
 import lphy.core.logger.LoggerUtils;
 import lphy.core.logger.ValueFileLoggerListener;
 import lphy.core.model.Value;
@@ -10,7 +11,6 @@
 import lphystudio.app.manager.DependencyUtils;
 import lphystudio.core.awt.AboutMenuHelper;
 import lphystudio.core.awt.PreferencesHelper;
-import lphystudio.core.codebuilder.CanonicalCodeBuilder;
 import lphystudio.core.editor.UndoManagerHelper;
 import lphystudio.core.logger.AlignmentLog;
 import lphystudio.core.narrative.HTMLNarrative;

diff --git a/lphy-studio/src/main/java/lphystudio/app/graphicalmodelpanel/CanonicalModelPanel.java b/lphy-studio/src/main/java/lphystudio/app/graphicalmodelpanel/CanonicalModelPanel.java
@@ -1,7 +1,7 @@
 package lphystudio.app.graphicalmodelpanel;
 
+import lphy.core.codebuilder.CanonicalCodeBuilder;
 import lphy.core.logger.LoggerUtils;
-import lphystudio.core.codebuilder.CanonicalCodeBuilder;
 import lphystudio.core.codecolorizer.DataModelCodeColorizer;
 
 import javax.swing.*;

diff --git a/lphy-studio/src/main/java/lphystudio/app/graphicalmodelpanel/GraphicalModelPanel.java b/lphy-studio/src/main/java/lphystudio/app/graphicalmodelpanel/GraphicalModelPanel.java
@@ -1,6 +1,7 @@
 package lphystudio.app.graphicalmodelpanel;
 
 import jebl.evolution.sequences.SequenceType;
+import lphy.core.codebuilder.CanonicalCodeBuilder;
 import lphy.core.logger.LoggerUtils;
 import lphy.core.model.*;
 import lphy.core.parser.LPhyParserDictionary;
@@ -15,7 +16,6 @@
 import lphystudio.app.graphicalmodelcomponent.interactive.InteractiveGraphicalModelComponent;
 import lphystudio.app.treecomponent.TimeTreeComponent;
 import lphystudio.app.treecomponent.TimeTreeExtraPlotComponent;
-import lphystudio.core.codebuilder.CanonicalCodeBuilder;
 import lphystudio.core.codecolorizer.LineCodeColorizer;
 import lphystudio.core.editor.UndoManagerHelper;
 import lphystudio.core.layeredgraph.Layering;

diff --git a/lphy-studio/src/main/java/lphystudio/core/codebuilder/LaTexCodeBuilder.java b/lphy-studio/src/main/java/lphystudio/core/codebuilder/LaTexCodeBuilder.java
@@ -1,5 +1,6 @@
 package lphystudio.core.codebuilder;
 
+import lphy.core.codebuilder.CodeBuilder;
 import lphy.core.model.Generator;
 import lphy.core.model.RandomVariable;
 import lphy.core.model.Value;

diff --git a/lphy-studio/src/main/java/lphystudio/core/narrative/HTMLNarrative.java b/lphy-studio/src/main/java/lphystudio/core/narrative/HTMLNarrative.java
@@ -1,10 +1,10 @@
 package lphystudio.core.narrative;
 
+import lphy.core.codebuilder.CanonicalCodeBuilder;
 import lphy.core.model.NarrativeUtils;
 import lphy.core.model.Value;
 import lphy.core.model.annotation.Citation;
 import lphy.core.parser.LPhyParserDictionary;
-import lphystudio.core.codebuilder.CanonicalCodeBuilder;
 import lphystudio.core.layeredgraph.ProperLayeredGraph;
 import lphystudio.core.theme.ThemeColours;
 import org.scilab.forge.jlatexmath.TeXConstants;

diff --git a/lphy-studio/src/main/java/lphystudio/core/narrative/LaTeXNarrative.java b/lphy-studio/src/main/java/lphystudio/core/narrative/LaTeXNarrative.java
@@ -1,12 +1,12 @@
 package lphystudio.core.narrative;
 
+import lphy.core.codebuilder.CanonicalCodeBuilder;
 import lphy.core.model.*;
 import lphy.core.model.annotation.Citation;
 import lphy.core.parser.LPhyParserDictionary;
 import lphy.core.vectorization.IID;
 import lphy.core.vectorization.VectorizedDistribution;
 import lphy.core.vectorization.VectorizedFunction;
-import lphystudio.core.codebuilder.CanonicalCodeBuilder;
 import lphystudio.core.layeredgraph.*;
 import lphystudio.core.theme.ThemeColours;
 

diff --git a/lphy-studio/src/test/java/lphystudio/core/codecolorizer/LineCodeColorizerTest.java b/lphy-studio/src/test/java/lphystudio/core/codecolorizer/LineCodeColorizerTest.java
@@ -1,9 +1,9 @@
 package lphystudio.core.codecolorizer;
 
+import lphy.core.codebuilder.CanonicalCodeBuilder;
 import lphy.core.parser.LPhyParserDictionary;
 import lphystudio.app.graphicalmodelpanel.GraphicalModelParserDictionary;
 import lphystudio.app.graphicalmodelpanel.StudioConsoleInterpreter;
-import lphystudio.core.codebuilder.CanonicalCodeBuilder;
 import lphystudio.core.narrative.DataModelToHTML;
 import lphystudio.core.narrative.DataModelToLaTeX;
 import lphystudio.core.theme.ThemeColours;

diff --git a/...ore/codebuilder/CanonicalCodeBuilder.java → ...ore/codebuilder/CanonicalCodeBuilder.java b/...ore/codebuilder/CanonicalCodeBuilder.java → ...ore/codebuilder/CanonicalCodeBuilder.java
@@ -1,4 +1,4 @@
-package lphystudio.core.codebuilder;
+package lphy.core.codebuilder;
 
 import lphy.core.model.Generator;
 import lphy.core.model.Value;

diff --git a/...ystudio/core/codebuilder/CodeBuilder.java → ...va/lphy/core/codebuilder/CodeBuilder.java b/...ystudio/core/codebuilder/CodeBuilder.java → ...va/lphy/core/codebuilder/CodeBuilder.java
@@ -1,4 +1,4 @@
-package lphystudio.core.codebuilder;
+package lphy.core.codebuilder;
 
 import lphy.core.model.Generator;
 import lphy.core.model.Value;

diff --git a/lphy/src/main/java/module-info.java b/lphy/src/main/java/module-info.java
@@ -16,8 +16,6 @@
 
     requires info.picocli;
 
-    exports lphy.core.logger;
-
     // graphical model
     exports lphy.core.model;
     exports lphy.core.model.annotation;
@@ -37,7 +35,9 @@
     exports lphy.core.vectorization.operation;
 
     // others
-//    exports lphy.core.narrative;
+    exports lphy.core.codebuilder;
+    exports lphy.core.logger;
+    //    exports lphy.core.narrative;
     exports lphy.core.exception;
     exports lphy.core.io;