Skip to content

Move DUI to submodule #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
babaissarkar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Move DUI to submodule #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "dui"]
path = dui
url = https://github.com/babaissarkar/dui.git
1 change: 1 addition & 0 deletions dui
Open in desktop
Submodule dui added at 33ab5b
6 changes: 6 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@
</repositories>

<dependencies>
<dependency>
<groupId>com.babai.dui</groupId>
<artifactId>dui</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.formdev</groupId>
<artifactId>flatlaf</artifactId>
Expand Down Expand Up @@ -119,6 +124,7 @@
<includes>
<include>com.formdev:flatlaf</include>
<include>com.formdev:flatlaf-intellij-themes</include>
<include>com.babai.dui:dui</include>
</includes>
</artifactSet>
<transformers>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/babai/ssplot/ui/CenteredField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

import javax.swing.JTextField;

import com.babai.ssplot.ui.controls.DUI.Text;
import com.babai.dui.controls.DUI.Text;

public class CenteredField extends JTextField {
public CenteredField(int count) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/babai/ssplot/ui/CrashFrame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

import javax.swing.*;

import com.babai.ssplot.ui.controls.DUI.Text;
import com.babai.dui.controls.DUI.Text;
import com.babai.ssplot.util.SystemInfo;

import static com.babai.ssplot.util.UIHelper.openLink;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/babai/ssplot/ui/DataView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@

import com.babai.ssplot.math.plot.Axis;
import com.babai.ssplot.math.plot.PlotData;
import com.babai.ssplot.ui.controls.DUI.Text;
import com.babai.ssplot.ui.controls.UIFrame;
import static com.babai.ssplot.ui.controls.DUI.*;
import com.babai.dui.controls.DUI.Text;
import com.babai.dui.controls.UIFrame;
import static com.babai.dui.controls.DUI.*;
import com.babai.ssplot.util.InfoLogger;
import com.babai.ssplot.util.UIHelper;

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/babai/ssplot/ui/MainFrame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
import com.babai.ssplot.math.io.NumParse;
import com.babai.ssplot.math.plot.*;
import com.babai.ssplot.math.plot.PlotData.PlotType;
import com.babai.ssplot.ui.controls.DUI.Text;
import com.babai.ssplot.ui.controls.UIButton;
import com.babai.ssplot.ui.controls.UIRadioItem;
import com.babai.dui.controls.DUI.Text;
import com.babai.dui.controls.UIButton;
import com.babai.dui.controls.UIRadioItem;
import com.babai.ssplot.ui.help.HelpFrame;
import com.babai.ssplot.util.SwingFileChooser;
import com.babai.ssplot.util.FocusTracker;
Expand All @@ -60,7 +60,7 @@
import static javax.swing.JOptionPane.*;

import static com.babai.ssplot.cli.ArgParse.*;
import static com.babai.ssplot.ui.controls.DUI.*;
import static com.babai.dui.controls.DUI.*;
import static com.babai.ssplot.util.UIHelper.*;

public class MainFrame extends JFrame {
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/babai/ssplot/ui/PlotFrame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
import com.babai.ssplot.math.plot.Axis;
import com.babai.ssplot.math.plot.PlotData;
import com.babai.ssplot.math.plot.Plotter;
import com.babai.ssplot.ui.controls.StateVar;
import com.babai.ssplot.ui.controls.UIFrame;
import com.babai.ssplot.ui.controls.UIInput;
import com.babai.dui.controls.StateVar;
import com.babai.dui.controls.UIFrame;
import com.babai.dui.controls.UIInput;

import static com.babai.ssplot.ui.controls.DUI.button;
import static com.babai.ssplot.ui.controls.DUI.input;
import static com.babai.ssplot.ui.controls.DUI.label;
import static com.babai.ssplot.ui.controls.DUI.toolbar;
import static com.babai.dui.controls.DUI.button;
import static com.babai.dui.controls.DUI.input;
import static com.babai.dui.controls.DUI.label;
import static com.babai.dui.controls.DUI.toolbar;
import static com.babai.ssplot.util.UIHelper.bindAction;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/babai/ssplot/ui/PlotView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
import com.babai.ssplot.math.plot.Plotter;
import com.babai.ssplot.math.plot.Project2D;

import com.babai.ssplot.ui.controls.DUI.Text;
import com.babai.dui.controls.DUI.Text;

public class PlotView extends JLabel implements MouseListener, MouseMotionListener {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/babai/ssplot/ui/StatLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import javax.swing.JTextPane;
import javax.swing.ScrollPaneConstants;

import com.babai.ssplot.ui.controls.DUI.Text;
import com.babai.dui.controls.DUI.Text;
import com.babai.ssplot.util.InfoLogger;

public class StatLogger implements InfoLogger {
Expand Down
18 changes: 12 additions & 6 deletions src/main/java/com/babai/ssplot/ui/SystemInputFrame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
import com.babai.ssplot.math.system.core.SystemMode;
import com.babai.ssplot.math.system.parser.ParserManager;
import com.babai.ssplot.math.system.solver.Solver;
import com.babai.ssplot.ui.controls.DUI.Text;
import com.babai.ssplot.ui.controls.StateVar;
import com.babai.ssplot.ui.controls.UIFrame;
import com.babai.ssplot.ui.controls.UIGrid;
import com.babai.ssplot.ui.controls.UIInput;
import com.babai.dui.controls.DUI.Text;
import com.babai.dui.controls.StateVar;
import com.babai.dui.controls.UIFrame;
import com.babai.dui.controls.UIGrid;
import com.babai.dui.controls.UIInput;

import static com.babai.ssplot.ui.controls.DUI.*;
import static com.babai.dui.controls.DUI.*;

/**
* This class takes the input from user, sends data to Solver backend,
Expand Down Expand Up @@ -415,6 +415,12 @@ public EquationSystem getSystem() {
return this.builder.build();
}

// FIXME: This method imperatively mutates UI components and builder state,
// bypassing StateVar bindings and derived logic.
// Loading an EquationSystem should be a pure *state* operation:
// system -> StateVar -> UI + builder (via bindings).
// Refactor by promoting equation text and mode into StateVars
// and drive both UI and builder exclusively from state.
public void setSystem(EquationSystem system) {
if (system == null) return;
String[] eqns = system.eqns();
Expand Down
229 changes: 0 additions & 229 deletions src/main/java/com/babai/ssplot/ui/controls/DUI.java
View file
Open in desktop

This file was deleted.

Loading
Loading