Skip to content

DSL/Galite 2.0.0: Migrate DSL package to visual #586

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
hfazai wants to merge 4 commits into
base: master
Choose a base branch
from
Open

DSL/Galite 2.0.0: Migrate DSL package to visual #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
264c24d
DSL/Galite 2.0.0: Migrate DSL package to visual
hfazai May 11, 2022
4a824ef
DSL/Galite 2.0.0: Migrate Command from DSL package to Visual
hfazai May 11, 2022
69480c5
DSL: remove block model
hfazai May 15, 2022
6d97ac3
Fix compilation error in galite-demo
hfazai May 15, 2022
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
4 changes: 2 additions & 2 deletions galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/form/DBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class DBlock extends JPanel implements UBlock {
public DBlock(DForm parent, VBlock model) {
SwingThreadHandler.verifyRunsInEventThread("DBlock <init>");

setBorder(model.getBorder(), model.getTitle());
setBorder(model.getBorder().getValue(), model.getTitle());
setBorder(border);
setFocusCycleRoot(true);
setFocusable(false);
Expand Down Expand Up @@ -89,7 +89,7 @@ public DBlock(DForm parent, VBlock model) {
}

protected void createFields() {
List<VField> fields = model.getFields();
List<VField> fields = model.getBlockFields();

columnViews = new VFieldUI[fields.size()];
for (int i = 0; i < fields.size(); i++) {
Expand Down
22 changes: 11 additions & 11 deletions galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/visual/DActor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import javax.swing.KeyStroke;

import org.kopi.galite.visual.UActor;
import org.kopi.galite.visual.VActor;
import org.kopi.galite.visual.Actor;
import org.kopi.vkopi.lib.ui.swing.base.JMenuButton;

@SuppressWarnings("serial")
Expand All @@ -40,7 +40,7 @@ public class DActor implements UActor {
// CONSTRUCTOR
// --------------------------------------------------------------------

public DActor(VActor model) {
public DActor(Actor model) {
this.model = model;
init();
}
Expand Down Expand Up @@ -72,13 +72,13 @@ public void setVisible(boolean visible) {
}


public void setModel(VActor model) {
public void setModel(Actor model) {
this.model = model;
init();
}


public VActor getModel() {
public Actor getModel() {
return model;
}

Expand Down Expand Up @@ -113,14 +113,14 @@ private final ImageIcon loadImage(String iconName) {
}

private void init() {
action = new DActorAction(model.getMenuItem(),
(model.getIconName() != null) ?
loadImage(model.getIconName()) :
action = new DActorAction(model.getMenuItem$galite_core(),
(model.getIconName$galite_core() != null) ?
loadImage(model.getIconName$galite_core()) :
null);
if (model.getAcceleratorKey() != KeyEvent.VK_UNDEFINED) {
if (model.getAcceleratorKey$galite_core() != KeyEvent.VK_UNDEFINED) {
action.putValue(Action.ACCELERATOR_KEY,
KeyStroke.getKeyStroke(model.getAcceleratorKey(),
model.getAcceleratorModifier()));
KeyStroke.getKeyStroke(model.getAcceleratorKey$galite_core(),
model.getAcceleratorModifier$galite_core()));
}

action.putValue(Action.SHORT_DESCRIPTION, model.getHelp());
Expand Down Expand Up @@ -169,5 +169,5 @@ public void actionPerformed(ActionEvent e) {

private JButton button;
private Action action;
private VActor model;
private Actor model;
}
8 changes: 4 additions & 4 deletions galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/visual/DMenuBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,21 @@ DMenuItem addItem(DActor actor) { //, DActor dactor) {
DMenuItem item;

//!!! NOT YET IMPLEMENTED IN SWING
if (actor.getModel().getMenuIdent().equals("Help")) {
if (actor.getModel().getMenuIdent$galite_core().equals("Help")) {
if ((menu = getHelpMenu()) == null) {
menu = new JMenu(actor.getModel().getMenuName());
menu = new JMenu(actor.getModel().getMenuName$galite_core());
setHelpMenu(menu);
}
} else {
/* lookup menu with name menuName, add it if necessary */
for (int i = 0; menu == null && i < getMenuCount(); i++) {
if (getMenu(i).getText().equals(actor.getModel().getMenuName())) {
if (getMenu(i).getText().equals(actor.getModel().getMenuName$galite_core())) {
menu = getMenu(i);
}
}

if (menu == null) {
menu = this.add(new JMenu(actor.getModel().getMenuName()));
menu = this.add(new JMenu(actor.getModel().getMenuName$galite_core()));
}
}

Expand Down
6 changes: 3 additions & 3 deletions galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/visual/DWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
import org.kopi.galite.visual.MessageListener;
import org.kopi.galite.visual.UIFactory;
import org.kopi.galite.visual.UWindow;
import org.kopi.galite.visual.VActor;
import org.kopi.galite.visual.Actor;
import org.kopi.galite.visual.VException;
import org.kopi.galite.visual.VRuntimeException;
import org.kopi.galite.visual.VWindow;
Expand Down Expand Up @@ -1009,7 +1009,7 @@ protected DMenuBar getDMenuBar() {
/**
* add a command in the menu bar
*/
private void addActorsToGUI(List<VActor> actorDefs) {
private void addActorsToGUI(List<Actor> actorDefs) {
if (actorDefs != null) {
for (int i = 0; i < actorDefs.size(); i++) {
DActor actorView;
Expand All @@ -1024,7 +1024,7 @@ private void addActorsToGUI(List<VActor> actorDefs) {
}

private void addButton(JPanel panel, DActor actorView) {
if (actorView.getModel().getIconName() != null) {
if (actorView.getModel().getIconName$galite_core() != null) {
panel.add(actorView.getButton());
}
}
Expand Down
8 changes: 4 additions & 4 deletions galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/visual/JUIFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.kopi.galite.visual.report.VReport;
import org.kopi.galite.visual.ui.swing.visual.DMenuTree;
import org.kopi.galite.visual.UIFactory;
import org.kopi.galite.visual.VActor;
import org.kopi.galite.visual.Actor;
import org.kopi.galite.visual.VHelpViewer;
import org.kopi.galite.visual.VItemTree;
import org.kopi.galite.visual.VMenuTree;
Expand Down Expand Up @@ -67,8 +67,8 @@ public UComponent createView(VModel model) {
view = createHelpViewer((VHelpViewer) model);
} else if (model instanceof VListDialog) {
view = createListDialog((VListDialog) model);
} else if (model instanceof VActor) {
view = createActor((VActor) model);
} else if (model instanceof Actor) {
view = createActor((Actor) model);
} else {
throw new IllegalArgumentException("NO UI IMPLEMENTATION FOR " + model.getClass());
}
Expand Down Expand Up @@ -158,7 +158,7 @@ protected DListDialog createListDialog(VListDialog model) {
* @param model The actor model
* @return The {@link DActor} view.
*/
protected DActor createActor(VActor model) {
protected DActor createActor(Actor model) {
return new DActor(model);
}
}
Loading