From 264c24ddf64df2f00d3b6e40113acbd8407d643a Mon Sep 17 00:00:00 2001 From: hfazai Date: Wed, 11 May 2022 14:31:55 +0100 Subject: [PATCH 1/4] DSL/Galite 2.0.0: Migrate DSL package to visual --- .../vkopi/lib/ui/swing/visual/DActor.java | 22 +- .../vkopi/lib/ui/swing/visual/DMenuBar.java | 8 +- .../vkopi/lib/ui/swing/visual/DWindow.java | 6 +- .../vkopi/lib/ui/swing/visual/JUIFactory.java | 8 +- .../kotlin/org/kopi/galite/visual/Actor.kt | 409 ++++++++++++++++++ .../org/kopi/galite/visual/DefaultActor.kt | 1 - .../kotlin/org/kopi/galite/visual/UActor.kt | 6 +- .../kotlin/org/kopi/galite/visual/VActor.kt | 194 --------- .../kotlin/org/kopi/galite/visual/VCommand.kt | 2 +- .../org/kopi/galite/visual/VHelpViewer.kt | 14 +- .../org/kopi/galite/visual/VItemTree.kt | 20 +- .../org/kopi/galite/visual/VMenuTree.kt | 20 +- .../kotlin/org/kopi/galite/visual/VWindow.kt | 28 +- .../kopi/galite/visual/chart/VChartCommand.kt | 4 +- .../galite/visual/chart/VDefaultChartActor.kt | 4 +- .../galite/visual/cross/VDynamicReport.kt | 6 +- .../galite/visual/cross/VFullCalendarForm.kt | 4 +- .../kopi/galite/visual/domain/CodeDomain.kt | 20 +- .../galite/visual/dsl/chart/ChartDimension.kt | 2 +- .../galite/visual/dsl/chart/ChartField.kt | 2 +- .../dsl/chart/ChartLocalizationWriter.kt | 2 +- .../galite/visual/dsl/chart/ChartMeasure.kt | 2 +- .../kopi/galite/visual/dsl/common/Actor.kt | 240 ---------- .../kopi/galite/visual/dsl/common/Command.kt | 1 + .../visual/dsl/common/LocalizableElement.kt | 2 +- .../kopi/galite/visual/dsl/common/Window.kt | 1 + .../org/kopi/galite/visual/dsl/field/Field.kt | 2 +- .../org/kopi/galite/visual/dsl/form/Block.kt | 2 +- .../kopi/galite/visual/dsl/form/FormField.kt | 2 +- .../visual/dsl/form/FormLocalizationWriter.kt | 2 +- .../galite/visual/dsl/report/ReportField.kt | 2 +- .../dsl/report/ReportLocalizationWriter.kt | 2 +- .../org/kopi/galite/visual/form/VBlock.kt | 8 +- .../galite/visual/form/VDefaultFormActor.kt | 4 +- .../org/kopi/galite/visual/form/VForm.kt | 14 +- .../visual/form/VFullCalendarCommand.kt | 4 +- .../kopi/galite/visual/form/VImportedBlock.kt | 6 +- .../galite/visual/preview/VPreviewWindow.kt | 142 +++--- .../visual/report/VDefaultReportActor.kt | 4 +- .../galite/visual/report/VReportCommand.kt | 4 +- .../visual/ui/vaadin/form/DGridEditorLabel.kt | 4 +- .../galite/visual/ui/vaadin/form/DLabel.kt | 4 +- .../galite/visual/ui/vaadin/visual/DActor.kt | 13 +- .../galite/visual/ui/vaadin/visual/DWindow.kt | 6 +- .../kopi/galite/visual/util/ReflectTool.kt | 2 +- .../kotlin/org/kopi/galite/demo/bill/BillR.kt | 2 +- .../galite/demo/billproduct/BillProductR.kt | 2 +- .../org/kopi/galite/demo/client/ClientForm.kt | 2 +- .../org/kopi/galite/demo/client/ClientR.kt | 2 +- .../kopi/galite/demo/command/CommandForm.kt | 2 +- .../org/kopi/galite/demo/command/CommandR.kt | 2 +- .../kopi/galite/demo/common/FormDefault.kt | 4 +- .../kopi/galite/demo/common/ReportDefault.kt | 4 +- .../org/kopi/galite/demo/product/ProductR.kt | 2 +- .../kopi/galite/demo/provider/ProviderR.kt | 2 +- .../org/kopi/galite/demo/stock/StockR.kt | 2 +- .../kopi/galite/demo/taxRule/TaxRuleForm.kt | 2 +- .../org/kopi/galite/demo/taxRule/TaxRuleR.kt | 2 +- .../galite/tests/localizer/Initialization.kt | 2 +- .../kotlin/org/kopi/galite/testing/Actor.kt | 2 +- .../kopi/galite/tests/dsl/CommonDSLTest.kt | 2 +- .../org/kopi/galite/tests/dsl/FormDSLTests.kt | 26 +- .../galite/tests/dsl/WindowElementSources.kt | 4 +- .../galite/tests/examples/CommandsForm.kt | 2 +- .../tests/examples/DocumentationBlockForm.kt | 2 +- .../tests/examples/DocumentationChart.kt | 2 +- .../tests/examples/DocumentationChartC.kt | 2 +- .../tests/examples/DocumentationFieldsForm.kt | 4 +- .../tests/examples/DocumentationForm.kt | 2 +- .../tests/examples/DocumentationReport.kt | 2 +- .../tests/examples/DocumentationReportR.kt | 2 +- .../examples/DocumentationReportTriggers.kt | 2 +- .../examples/DocumentationReportTriggersR.kt | 2 +- .../examples/FormToTestSaveMultipleBlock.kt | 2 +- .../galite/tests/examples/FormWithChart.kt | 2 +- .../tests/examples/MultipleBlockForm.kt | 2 +- .../galite/tests/examples/TestFieldsForm.kt | 2 +- .../examples/TestFieldsVisibilityForm.kt | 2 +- .../kopi/galite/tests/examples/TrainingR.kt | 2 +- .../org/kopi/galite/tests/form/FormSample.kt | 2 +- .../kopi/galite/tests/form/FormWithList.kt | 2 +- .../galite/tests/form/FormWithListDomains.kt | 2 +- .../tests/form/FormWithNullableColumns.kt | 2 +- .../kopi/galite/tests/form/FormWithReport.kt | 2 +- .../galite/tests/form/FormWithSpecialTypes.kt | 2 +- .../localization/FormLocalizationTests.kt | 2 +- .../tests/localization/actor/ExternActor.kt | 4 +- .../kopi/galite/tests/report/ReportTests.kt | 2 +- .../kopi/galite/tests/report/VReportTests.kt | 23 +- .../tests/ui/vaadin/field/FieldColorsTests.kt | 2 +- .../tests/ui/vaadin/field/FieldsTests.kt | 2 +- .../galite/tests/ui/vaadin/form/ActorTests.kt | 4 +- .../ui/vaadin/triggers/ChartTriggersTest.kt | 2 +- .../ui/vaadin/triggers/FormTriggersTests.kt | 2 +- .../ui/vaadin/triggers/ReportTriggersTest.kt | 2 +- 95 files changed, 691 insertions(+), 721 deletions(-) create mode 100644 galite-core/src/main/kotlin/org/kopi/galite/visual/Actor.kt delete mode 100644 galite-core/src/main/kotlin/org/kopi/galite/visual/VActor.kt delete mode 100644 galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Actor.kt diff --git a/galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/visual/DActor.java b/galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/visual/DActor.java index e4d1bd738..e9533dd8b 100644 --- a/galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/visual/DActor.java +++ b/galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/visual/DActor.java @@ -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") @@ -40,7 +40,7 @@ public class DActor implements UActor { // CONSTRUCTOR // -------------------------------------------------------------------- - public DActor(VActor model) { + public DActor(Actor model) { this.model = model; init(); } @@ -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; } @@ -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()); @@ -169,5 +169,5 @@ public void actionPerformed(ActionEvent e) { private JButton button; private Action action; - private VActor model; + private Actor model; } diff --git a/galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/visual/DMenuBar.java b/galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/visual/DMenuBar.java index 60b74ae14..a31f71392 100644 --- a/galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/visual/DMenuBar.java +++ b/galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/visual/DMenuBar.java @@ -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())); } } diff --git a/galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/visual/DWindow.java b/galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/visual/DWindow.java index 1d7fafcb0..65047e549 100644 --- a/galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/visual/DWindow.java +++ b/galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/visual/DWindow.java @@ -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; @@ -1009,7 +1009,7 @@ protected DMenuBar getDMenuBar() { /** * add a command in the menu bar */ - private void addActorsToGUI(List actorDefs) { + private void addActorsToGUI(List actorDefs) { if (actorDefs != null) { for (int i = 0; i < actorDefs.size(); i++) { DActor actorView; @@ -1024,7 +1024,7 @@ private void addActorsToGUI(List actorDefs) { } private void addButton(JPanel panel, DActor actorView) { - if (actorView.getModel().getIconName() != null) { + if (actorView.getModel().getIconName$galite_core() != null) { panel.add(actorView.getButton()); } } diff --git a/galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/visual/JUIFactory.java b/galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/visual/JUIFactory.java index 282f54d01..1ccccd29c 100644 --- a/galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/visual/JUIFactory.java +++ b/galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/visual/JUIFactory.java @@ -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; @@ -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()); } @@ -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); } } diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/Actor.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/Actor.kt new file mode 100644 index 000000000..95e327482 --- /dev/null +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/Actor.kt @@ -0,0 +1,409 @@ +/* + * Copyright (c) 2013-2022 kopiLeft Services SARL, Tunis TN + * Copyright (c) 1990-2022 kopiRight Managed Solutions GmbH, Wien AT + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.kopi.galite.visual + +import java.awt.event.InputEvent +import java.awt.event.KeyEvent + +import org.jetbrains.annotations.TestOnly +import org.kopi.galite.visual.dsl.form.Key +import org.kopi.galite.visual.base.UComponent +import org.kopi.galite.visual.dsl.common.LocalizableElement +import org.kopi.galite.visual.dsl.common.LocalizationWriter +import org.kopi.galite.visual.dsl.common.Menu +import org.kopi.galite.visual.l10n.LocalizationManager + +/** + * This class represents an actor, ie a menu element with a name and may be an icon, a shortcut + * and a help + * + * An Actor is an item to be linked to a command, if its [icon] is specified, it will appear + * in the icon_toolbar located under the menu bar, otherwise, it will only be accessible from the menu bar + * + * @param menu the containing menu + * @param label the label + * @param help the help text + * @param source path localization file + */ +open class Actor(val menu: Menu, + val label: String, + var help: String?, + ident: String? = null, + source: String? = null) + : VModel, LocalizableElement(ident, source) { + + // The shortcut key + var key: Key? = null + set(key) { + checkKey(key) + field = key + } + + // The actor icon + var icon: Icon? = null + set(value) { + iconName = value?.iconName + field = value + } + + // -------------------------------------------------------------------- + // INTERNAL DATA MEMBERS + // -------------------------------------------------------------------- + internal var menuName: String = menu.label + internal var menuItem: String? = label + internal var number = 0 // The number for the actor + internal var iconName: String? = null + internal var action: (() -> Unit)? = null + private var display: UActor? = null + internal var handler: ActionHandler? = null // the handler for the actor + + internal val menuIdent: String = menu.label + private val menuSource = menu.sourceFile + internal var acceleratorKey: Int = 0 + internal var acceleratorModifier: Int = 0 + internal var userActor: Boolean = true + + /** + * See kdoc of [Actor] + * + * @param menuIdent the qualified name of menu source file which this actor belongs to + * @param menuSource the menu source qualified name + * @param actorIdent the qualified name of actor's source file + * @param actorSource the actor source qualified name + * @param acceleratorKey the accelerator key description + * @param acceleratorModifier the modifier accelerator key + * @param userActor True if the actor is defined by the user. + * False if the actor is generated by galite and then it should be localized by + * galite localization files such as "org/kopi/galite/visual/General" + */ + constructor(menuIdent: String, + menuSource: String?, + actorIdent: String, + actorSource: String?, + iconName: String?, + acceleratorKey: Int, + acceleratorModifier: Int, + userActor: Boolean = false) + : this(Menu(menuIdent, menuIdent, menuSource), + actorIdent, + null, + actorIdent, + actorSource) { + this.iconName = iconName + this.acceleratorKey = acceleratorKey + this.acceleratorModifier = acceleratorModifier + this.userActor = userActor + } + + override fun getDisplay(): UActor? = display + + override fun setDisplay(display: UComponent) { + assert(display is UActor) { "Actor display should be UActor" } + this.display = display as UActor + } + + var isEnabled: Boolean + get() = display != null && display!!.isEnabled() // Checks whether the actor is enabled + set(enabled) { + display?.setEnabled(enabled) // Enables/disables the actor. + } + + // ---------------------------------------------------------------------- + // ACTIONS HANDLING + // ---------------------------------------------------------------------- + fun performAction() { + handler!!.performAsyncAction(object : Action("$menuItem in $menuName") { + override fun execute() { + handler!!.executeVoidTrigger(number) + action?.let { it() } + } + + /** + * Returns `true` if this action can be cancelled in an action queue context. + * This means that the action can be removed from an action queue when performing + * a clear operation. + * + * quit a reset action cannot be cancelled. They will be executed even if the action + * queue is cleared. Implementations should care about this. + * + * @return `true` if this not a reset action. + */ + override fun isCancellable(): Boolean = + !("quit".equals(ident, ignoreCase = true) || "break".equals(ident, ignoreCase = true)) + }) + } + + fun performBasicAction() { + handler!!.executeVoidTrigger(number) + action?.invoke() + } + + // ---------------------------------------------------------------------- + // HASHCODE AND EQUALS REDEFINITION + // ---------------------------------------------------------------------- + override fun hashCode(): Int = ident.hashCode() * ident.hashCode() + + override fun equals(other: Any?): Boolean { + return if (other !is Actor) { + false + } else { + menuName == other.menuName + && menuItem == other.menuItem + && ((iconName == null && other.iconName == null) + || (iconName != null + && other.iconName != null + && iconName == other.iconName)) + } + } + + // ---------------------------------------------------------------------- + // LOCALIZATION + // ---------------------------------------------------------------------- + /** + * Localizes this actor + * + * @param manager the manger to use for localization + */ + fun localize(manager: LocalizationManager) { + val menuLoc = manager.getMenuLocalizer(menuSource, menuIdent) + val actorLoc = manager.getActorLocalizer(sourceFile, ident) + menuName = menuLoc.getLabel() + menuItem = actorLoc.getLabel() + help = actorLoc.getHelp() + } + + // ---------------------------------------------------------------------- + // HELP HANDLING + // ---------------------------------------------------------------------- + fun helpOnCommand(help: VHelpGenerator) { + help.helpOnCommand(menuName, + menuItem, + iconName, + acceleratorKey, + acceleratorModifier, + this.help) + } + + // -------------------------------------------------------------------- + // DEBUG + // -------------------------------------------------------------------- + override fun toString(): String { + val buffer = StringBuffer() + + buffer.append("Actor[") + buffer.append("menu=$menuName:$menuItem") + if (iconName != null) { + buffer.append(", ") + buffer.append("icon=$iconName") + } + if (acceleratorKey != 0) { + buffer.append(", ") + buffer.append("key=$acceleratorKey:$acceleratorModifier") + } + buffer.append(", ") + buffer.append("help=$help") + buffer.append("]") + return buffer.toString() + } + + val _actorSource @TestOnly get() = sourceFile + val _menuSource @TestOnly get() = menuSource + val _menuIdent @TestOnly get() = menuIdent + val _iconName @TestOnly get() = iconName + val _acceleratorKey @TestOnly get() = acceleratorKey + val _menuName @TestOnly get() = menuName + val _number @TestOnly get() = number + + fun checkKey(key: Key?) { + if (key == null) { + acceleratorModifier = 0 + acceleratorKey = KeyEvent.VK_UNDEFINED + } else { + acceleratorKey = key.value + acceleratorModifier = if (key.toString().contains("SHIFT_")) InputEvent.SHIFT_MASK else 0 + } + } + + // ---------------------------------------------------------------------- + // XML LOCALIZATION GENERATION + // ---------------------------------------------------------------------- + fun genLocalization(writer: LocalizationWriter) { + writer.genActorDefinition(ident, label, help) + } +} + +enum class Icon(val iconName: String) { + ALL("all"), + BLOCK("block"), + BORDER("border"), + BREAD_CRUMB_SEPARATOR("bread_crumb_separator"), + BREAK("break"), + CALENDAR("calendar"), + COLLAPSED("collapsed"), + COLLAPSED_P("collapsed_p"), + COPY("copy"), + DELETE("delete"), + DESK("desk"), + DETAIL("detail"), + DETAIL_VIEW("detail_view"), + DOWN("down"), + DUKE("duke"), + EDIT("edit"), + EXPANDED_A("expanded_a"), + EXPANDED("expanded"), + EXPANDED_P("expanded_p"), + EXPORT_CSV("exportCsv"), + EXPORT_PDF("exportPdf"), + EXPORT_XLSX("exportXlsx"), + FOLD_COLUMN("foldColumn"), + FOLD("fold"), + FORMULA("formula"), + HELP("help"), + HOME("home"), + INSERT_LINE("insertline"), + INSERT("insert"), + LIST("list"), + LOADING("loading"), + LOGIN_IMG("login_img"), + MAIL("mail"), + MENU_QUERY("menuquery"), + NOTE("note"), + NOTHING("nothing"), + OPEN("open"), + OPTIONS("options"), + PREVIEW("preview"), + PRINT("print"), + QUIT("quit"), + SAVE("save"), + SEARCH_OP("searchop"), + SEARCH("search"), + SERIAL_QUERY("serialquery"), + SERVICE_OFF("serviceoff"), + SERVICE_ON("serviceon"), + STORE("store"), + SUGGEST("suggest"), + TIMESTAMP("timeStamp"), + TRI("tri"), + UNFOLD_COLUMN("unfoldColumn"), + UNFOLD("unfold"), + UP("up"), + ADD("add"), + ALIGN_CENTER("align_center"), + ALIGN_JUSTIFY("align_justify"), + ALIGN_LEFT("align_left"), + ALIGN_RIGHT("align_right"), + APPLY("apply"), + AREA_CHART("area_chart"), + ARROW_FIRST("arrowfirst"), + ARROW_LAST("arrowlast"), + ARROW_LEFT("arrowleft"), + ARROW_RIGHT("arrowright"), + ARTICLE("article"), + ASK("ask"), + BAR_CHART("bar_chart"), + BKUP3("bkup3"), + BKUP("bkup"), + BLOCK2("block2"), + BOARD("board"), + BOLD("bold"), + BOMB("bomb"), + BOOKMARK("bookmark"), + BOX_ARROW("boxarrow"), + BW("bw"), + CALCULATE("calculate"), + CFOLDER("cfolder"), + CHART_VIEW("chart_view"), + CHECKBOX("checkbox"), + CLIP("clip"), + COLLAPSE_DB("collapsedb"), + COLLAPSED_F("collapsed_f"), + COLLAPSED_T("collapsed_t"), + COLUMN_CHART("column_chart"), + COMBO("combo"), + CONFIG("config"), + CONVERT("convert"), + CUT("cut"), + DELETE_LINE("deleteline"), + DONE("done"), + ERROR("error"), + EXPANDED_B("expandedb"), + EXPANDED_F("expanded_f"), + EXPANDED_S("expanded_s"), + EXPANDED_T("expanded_t"), + EXPORT("export"), + FAX("fax"), + FW("fw"), + GIF_ICON("gifIcon"), + GREEN("green"), + GUIDE("guide"), + IDENT("ident"), + INDEX("index"), + INTERRUPT("interrupt"), + ITALIC("italic"), + JPG_ICON("jpgIcon"), + LAUNCH("launch"), + LINE_CHART("line_chart"), + LOCK("lock"), + LOGIN("login"), + MONEY_CHECK("moneycheck"), + MONEY("money"), + NOTICE("notice"), + OFOLDER("ofolder"), + PAGE_FIRST("pageFirst"), + PAGE_LAST("pageLast"), + PAGE_LEFT("pageLeft"), + PAGE_RIGHT("pageRight"), + PASSWORD("password"), + PASTE("paste"), + PHONE("phone"), + PIE_CHART("pie_chart"), + PRINT_OPTIONS("printoptions"), + PROJECT("project"), + RED("red"), + REDO("redo"), + REFRESH("refresh"), + RELOAD("reload"), + REPORT("report"), + SEC("sec"), + SELECTED("selected"), + SEND("send"), + SORT("sort"), + SPLIT("split"), + STANDARD("standard"), + STICK("stick"), + STOP("stop"), + TODO("todo"), + TOP("top"), + UNDERLINE("underline"), + UNDO("undo"), + UNIDENT("unident"), + UNSTICK("unstick"), + UPDATE("update"), + USERS("users"), + UTILS("utils"), + VALIDATE("validate"), + WAIT("wait"), + WARNING("warning"), + WINDOW("window"), + YELLOW("yellow"), + ZOOM_HEIGHT("zoomheight"), + ZOOM_MINUS("zoomminus"), + ZOOM_OPTIMAL("zoomoptimal"), + ZOOM_PLUS("zoomplus"), + ZOOM_WIDTH("zoomwidth") +} diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/DefaultActor.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/DefaultActor.kt index d282a5988..208816608 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/DefaultActor.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/DefaultActor.kt @@ -18,7 +18,6 @@ package org.kopi.galite.visual -import org.kopi.galite.visual.dsl.common.Actor import org.kopi.galite.visual.dsl.common.Menu import org.kopi.galite.visual.dsl.common.PredefinedCommand diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/UActor.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/UActor.kt index 8482d909e..2df0ee425 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/UActor.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/UActor.kt @@ -22,7 +22,7 @@ import org.kopi.galite.visual.base.UComponent /** * `UActor` is the top level interface that all visual actor components - * should implement. It is the visual component of [VActor] + * should implement. It is the visual component of [Actor] */ interface UActor : UComponent { @@ -30,11 +30,11 @@ interface UActor : UComponent { * Sets the actor model. * @param model The actor model. */ - fun setModel(model: VActor) + fun setModel(model: Actor) /** * Returns the actor model. * @return The actor model. */ - fun getModel(): VActor + fun getModel(): Actor } diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/VActor.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/VActor.kt deleted file mode 100644 index a14c7be45..000000000 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/VActor.kt +++ /dev/null @@ -1,194 +0,0 @@ -/* - * Copyright (c) 2013-2022 kopiLeft Services SARL, Tunis TN - * Copyright (c) 1990-2022 kopiRight Managed Solutions GmbH, Wien AT - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.kopi.galite.visual - -import org.jetbrains.annotations.TestOnly -import org.kopi.galite.visual.base.UComponent -import org.kopi.galite.visual.dsl.common.LocalizableElement -import org.kopi.galite.visual.l10n.LocalizationManager - -/** - * Represents an actor model. - * - * @param menuIdent the qualified name of menu source file which this actor belongs to - * @param menuSource the menu source qualified name - * @param actorIdent the qualified name of actor's source file - * @param actorSource the actor source qualified name - * @param acceleratorKey the accelerator key description - * @param acceleratorModifier the modifier accelerator key - * @param help the help text - * @param userActor True if the actor is defined by the user. - * False if the actor is generated by galite and then it should be localized by - * galite localization files such as "org/kopi/galite/visual/General" - */ -open class VActor(val menuIdent: String, - private val menuSource: String?, - actorIdent: String?, - actorSource: String?, - var acceleratorKey: Int = 0, - var acceleratorModifier: Int = 0, - var help: String? = null, - val userActor: Boolean = false) - : VModel, LocalizableElement(actorIdent, actorSource) { - - // -------------------------------------------------------------------- - // DATA MEMBERS - // -------------------------------------------------------------------- - var menuName: String = menuIdent - var menuItem: String? = null - var number = 0 // The number for the actor - var iconName: String? = null - var action: (() -> Unit)? = null - internal var handler: ActionHandler? = null // the handler for the actor - - private var display: UActor? = null - - var isEnabled: Boolean - get() = display != null && display!!.isEnabled() // Checks whether the actor is enabled - set(enabled) { - display?.setEnabled(enabled) // Enables/disables the actor. - } - - constructor(menuIdent: String, - menuSource: String?, - actorIdent: String, - actorSource: String?, - iconName: String?, - acceleratorKey: Int, - acceleratorModifier: Int, - userActor: Boolean = false) - : this(menuIdent, - menuSource, - actorIdent, - actorSource, - acceleratorKey, - acceleratorModifier, - null, - userActor) { - this.iconName = iconName - } - - override fun getDisplay(): UActor? = display - - override fun setDisplay(display: UComponent) { - assert(display is UActor) { "VActor display should be UActor" } - this.display = display as UActor - } - - // ---------------------------------------------------------------------- - // ACTIONS HANDLING - // ---------------------------------------------------------------------- - fun performAction() { - handler!!.performAsyncAction(object : Action("$menuItem in $menuName") { - override fun execute() { - handler!!.executeVoidTrigger(number) - action?.let { it() } - } - - /** - * Returns `true` if this action can be cancelled in an action queue context. - * This means that the action can be removed from an action queue when performing - * a clear operation. - * - * quit a reset action cannot be cancelled. They will be executed even if the action - * queue is cleared. Implementations should care about this. - * - * @return `true` if this not a reset action. - */ - override fun isCancellable(): Boolean = - !("quit".equals(ident, ignoreCase = true) || "break".equals(ident, ignoreCase = true)) - }) - } - - fun performBasicAction() { - handler!!.executeVoidTrigger(number) - action?.invoke() - } - - // ---------------------------------------------------------------------- - // HASHCODE AND EQUALS REDEFINITION - // ---------------------------------------------------------------------- - override fun hashCode(): Int = ident.hashCode() * ident.hashCode() - - override fun equals(other: Any?): Boolean { - return if (other !is VActor) { - false - } else { - menuName == other.menuName - && menuItem == other.menuItem - && ((iconName == null && other.iconName == null) - || (iconName != null - && other.iconName != null - && iconName == other.iconName)) - } - } - - // ---------------------------------------------------------------------- - // LOCALIZATION - // ---------------------------------------------------------------------- - /** - * Localizes this actor - * - * @param manager the manger to use for localization - */ - fun localize(manager: LocalizationManager) { - val menuLoc = manager.getMenuLocalizer(menuSource, menuIdent) - val actorLoc = manager.getActorLocalizer(sourceFile, ident) - menuName = menuLoc.getLabel() - menuItem = actorLoc.getLabel() - help = actorLoc.getHelp() - } - - // ---------------------------------------------------------------------- - // HELP HANDLING - // ---------------------------------------------------------------------- - fun helpOnCommand(help: VHelpGenerator) { - help.helpOnCommand(menuName, - menuItem, - iconName, - acceleratorKey, - acceleratorModifier, - this.help) - } - - // -------------------------------------------------------------------- - // DEBUG - // -------------------------------------------------------------------- - override fun toString(): String { - val buffer = StringBuffer() - - buffer.append("VActor[") - buffer.append("menu=$menuName:$menuItem") - if (iconName != null) { - buffer.append(", ") - buffer.append("icon=$iconName") - } - if (acceleratorKey != 0) { - buffer.append(", ") - buffer.append("key=$acceleratorKey:$acceleratorModifier") - } - buffer.append(", ") - buffer.append("help=$help") - buffer.append("]") - return buffer.toString() - } - - val _actorSource @TestOnly get() = sourceFile - val _menuSource @TestOnly get() = menuSource -} diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/VCommand.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/VCommand.kt index 0dbc1313d..e8147340e 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/VCommand.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/VCommand.kt @@ -20,7 +20,7 @@ package org.kopi.galite.visual open class VCommand(mode: Int, protected var handler: ActionHandler?, - var actor: VActor?, + var actor: Actor?, internal val trigger: Int, val actorIdent: String, internal val action: () -> Unit = {}) { diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/VHelpViewer.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/VHelpViewer.kt index d34f7ca28..dc79d7d05 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/VHelpViewer.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/VHelpViewer.kt @@ -39,13 +39,13 @@ class VHelpViewer : VWindow() { init { setTitle(VlibProperties.getString("help_viewer")) addActors(arrayOf( - VActor("File", - HELPVIEWER_LOCALIZATION_RESOURCE, - "Close", - HELPVIEWER_LOCALIZATION_RESOURCE, - "quit", - KeyEvent.VK_ESCAPE, - 0) + Actor("File", + HELPVIEWER_LOCALIZATION_RESOURCE, + "Close", + HELPVIEWER_LOCALIZATION_RESOURCE, + "quit", + KeyEvent.VK_ESCAPE, + 0) )) // localize the help viewer using the default locale diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/VItemTree.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/VItemTree.kt index 6b0d0b606..f0f7e6831 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/VItemTree.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/VItemTree.kt @@ -68,7 +68,7 @@ class VItemTree(rootName: String?, var root: TreeNode? = null private set private var rootItem: RootItem? = null - private val treeActors: Array = arrayOfNulls(10) + private val treeActors: Array = arrayOfNulls(10) private var maxId = 0 private val rootName: String = rootName ?: "Items" @@ -140,7 +140,7 @@ class VItemTree(rootName: String?, * * @param actors the actors to localize */ - override fun localizeActors(vararg actors: VActor) { + override fun localizeActors(vararg actors: Actor) { try { super.localizeActors(*actors) // localizes the actors in VWindow } catch (e: InconsistencyException) { @@ -165,7 +165,7 @@ class VItemTree(rootName: String?, /** * Returns the actor having the given number. */ - override fun getActor(at: Int): VActor = treeActors[at]!! + override fun getActor(at: Int): Actor = treeActors[at]!! /** * Creates a new actor @@ -176,13 +176,13 @@ class VItemTree(rootName: String?, icon: String, key: Int, modifier: Int) { - treeActors[number] = VActor(menu, - MENU_LOCALIZATION_RESOURCE, - item, - MENU_LOCALIZATION_RESOURCE, - icon, - key, - modifier) + treeActors[number] = Actor(menu, + MENU_LOCALIZATION_RESOURCE, + item, + MENU_LOCALIZATION_RESOURCE, + icon, + key, + modifier) treeActors[number]!!.number = number } diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/VMenuTree.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/VMenuTree.kt index e804e3a94..fa050690f 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/VMenuTree.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/VMenuTree.kt @@ -131,7 +131,7 @@ class VMenuTree constructor(ctxt: Connection?, // -------------------------------------------------------------------- var root: TreeNode? = null private set - private val treeActors: Array = arrayOfNulls(9) + private val treeActors: Array = arrayOfNulls(9) lateinit var moduleArray: Array // Sets the accessibility of the module private set private val items = mutableListOf() @@ -165,7 +165,7 @@ class VMenuTree constructor(ctxt: Connection?, * * @param actors the actors to localize */ - override fun localizeActors(vararg actors: VActor) { + override fun localizeActors(vararg actors: Actor) { try { super.localizeActors(*actors) // localizes the actors in VWindow } catch (e: InconsistencyException) { @@ -190,7 +190,7 @@ class VMenuTree constructor(ctxt: Connection?, /** * Returns the actor having the given number. */ - override fun getActor(at: Int): VActor = treeActors[at]!! + override fun getActor(at: Int): Actor = treeActors[at]!! /** * Returns the ID of the current user @@ -206,13 +206,13 @@ class VMenuTree constructor(ctxt: Connection?, icon: String?, key: Int, modifier: Int) { - treeActors[number] = VActor(menu, - MENU_LOCALIZATION_RESOURCE, - item, - MENU_LOCALIZATION_RESOURCE, - icon, - key, - modifier) + treeActors[number] = Actor(menu, + MENU_LOCALIZATION_RESOURCE, + item, + MENU_LOCALIZATION_RESOURCE, + icon, + key, + modifier) treeActors[number]!!.number = number } diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/VWindow.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/VWindow.kt index a496b492f..8f98d44f4 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/VWindow.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/VWindow.kt @@ -54,25 +54,25 @@ abstract class VWindow(var source: String? = null, val dBConnection: Connection? private var extraTitle: String? = null private var display: UWindow? = null val commands = mutableListOf() // commands - val actors = mutableListOf() // Actors + val actors = mutableListOf() // Actors protected var windowTitle: String? = null var smallIcon: Image? = null protected var isProtected = false protected var listenerList = EventListenerList() // List of listeners - protected val f12: VActor + protected val f12: Actor open val locale: Locale? = null // localize the form using the default locale protected val manager = getLocalizationManger() init { - f12 = VActor("File", - WINDOW_LOCALIZATION_RESOURCE, - "GotoShortcuts", - WINDOW_LOCALIZATION_RESOURCE, - null, - KeyEvent.VK_F12, - 0) + f12 = Actor("File", + WINDOW_LOCALIZATION_RESOURCE, + "GotoShortcuts", + WINDOW_LOCALIZATION_RESOURCE, + null, + KeyEvent.VK_F12, + 0) f12.number = Constants.CMD_GOTO_SHORTCUTS f12.handler = this addActors(arrayOf(f12)) @@ -262,27 +262,27 @@ abstract class VWindow(var source: String? = null, val dBConnection: Connection? /** * add actor in menu */ - fun addActor(actorDef: VActor) { + fun addActor(actorDef: Actor) { addActors(arrayOf(actorDef)) } /** * add actors in menu */ - open fun addActors(actorDefs: Array?) { + open fun addActors(actorDefs: Array?) { val actorDefs = actorDefs.orEmpty() actors.addAll(actorDefs) localizeActors(*actorDefs) } - open fun getActor(at: Int): VActor = actors[at + 1] // "+1" because of the f12-Actor + open fun getActor(at: Int): Actor = actors[at + 1] // "+1" because of the f12-Actor /** * Enables/disables the actor. */ open fun setActorEnabled(position: Int, enabled: Boolean) { - val actor: VActor = getActor(position) + val actor: Actor = getActor(position) actor.handler = this actor.isEnabled = enabled } @@ -297,7 +297,7 @@ abstract class VWindow(var source: String? = null, val dBConnection: Connection? * * @param actors the actors to localize */ - open fun localizeActors(vararg actors: VActor) { + open fun localizeActors(vararg actors: Actor) { actors.forEach { if(ApplicationContext.getDefaultLocale() != locale || !it.userActor) { it.localize(manager) diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/chart/VChartCommand.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/chart/VChartCommand.kt index e9224e37f..7034248d2 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/chart/VChartCommand.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/chart/VChartCommand.kt @@ -21,11 +21,11 @@ package org.kopi.galite.visual.chart import org.kopi.galite.visual.dsl.common.Trigger import org.kopi.galite.visual.Action import org.kopi.galite.visual.ActionHandler -import org.kopi.galite.visual.VActor +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.VCommand import org.kopi.galite.visual.VHelpGenerator -class VChartCommand(private val chart: VChart, actor: VActor) +class VChartCommand(private val chart: VChart, actor: Actor) : VCommand(0xFFFF, null, actor, actor.number, actor.ident), ActionHandler { override fun setEnabled(enabled: Boolean) { diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/chart/VDefaultChartActor.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/chart/VDefaultChartActor.kt index a07cf8afb..713c1e5ff 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/chart/VDefaultChartActor.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/chart/VDefaultChartActor.kt @@ -18,7 +18,7 @@ package org.kopi.galite.visual.chart -import org.kopi.galite.visual.VActor +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.VlibProperties class VDefaultChartActor(menuIdent: String, @@ -26,7 +26,7 @@ class VDefaultChartActor(menuIdent: String, iconName: String, acceleratorKey: Int, acceleratorModifier: Int) - : VActor(menuIdent, + : Actor(menuIdent, null, actorIdent, null, diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/cross/VDynamicReport.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/cross/VDynamicReport.kt index 95cedac7a..224ccf146 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/cross/VDynamicReport.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/cross/VDynamicReport.kt @@ -65,7 +65,7 @@ import org.kopi.galite.visual.report.VWeekColumn import org.kopi.galite.util.base.InconsistencyException import org.kopi.galite.visual.Message import org.kopi.galite.visual.MessageCode -import org.kopi.galite.visual.VActor +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.VExecFailedException class VDynamicReport(block: VBlock) : VReport() { @@ -76,7 +76,7 @@ class VDynamicReport(block: VBlock) : VReport() { private val columns: Array private val fields: Array private val block: VBlock - private lateinit var actorsDef: Array + private lateinit var actorsDef: Array private var number = 0 private var idColumn = 0 @@ -470,7 +470,7 @@ class VDynamicReport(block: VBlock) : VReport() { number++ } - override fun addActors(actorDefs: Array?) { + override fun addActors(actorDefs: Array?) { val actorDefs = actorDefs.orEmpty() actors.addAll(actorDefs) diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/cross/VFullCalendarForm.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/cross/VFullCalendarForm.kt index 5ca31f3dc..a01186cb9 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/cross/VFullCalendarForm.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/cross/VFullCalendarForm.kt @@ -28,13 +28,13 @@ import org.kopi.galite.visual.form.VDefaultFormActor import org.kopi.galite.visual.form.VForm import org.kopi.galite.visual.form.VFullCalendarCommand import org.kopi.galite.visual.fullcalendar.VFullCalendarBlock -import org.kopi.galite.visual.VActor +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.VCommand import org.kopi.galite.visual.VException import org.kopi.galite.visual.WindowController abstract class VFullCalendarForm : VForm() { - private var actorsDef = mutableListOf() + private var actorsDef = mutableListOf() private var commandsDef = mutableListOf() companion object { diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/domain/CodeDomain.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/domain/CodeDomain.kt index ed97f9c7b..e5cd4e59f 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/domain/CodeDomain.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/domain/CodeDomain.kt @@ -96,7 +96,7 @@ open class CodeDomain?> : Domain() { */ override fun buildDimensionModel(dimension: ChartDimension<*>, format: VColumnFormat?): VDimension { return with(dimension) { - val source = dimension.source!! + val source = dimension.sourceFile when (kClass) { Boolean::class -> VBooleanCodeDimension(ident, @@ -125,7 +125,7 @@ open class CodeDomain?> : Domain() { codes.map { it.value as? String }.toTypedArray()) else -> throw RuntimeException("Type ${kClass!!.qualifiedName} is not supported") }.also { - it.initLabels(codes.map { it.label }.toTypedArray()) + it.initLabels(codes.map { code -> code.label }.toTypedArray()) } } } @@ -139,18 +139,18 @@ open class CodeDomain?> : Domain() { BigDecimal::class -> VDecimalCodeMeasure(ident, color, this@CodeDomain.ident.ifEmpty { ident }, - measure.source, + measure.sourceFile, codes.map { it.ident }.toTypedArray(), codes.map { it.value as? BigDecimal }.toTypedArray()) Int::class, Long::class -> VIntegerCodeMeasure(ident, color, this@CodeDomain.ident.ifEmpty { ident }, - measure.source, + measure.sourceFile, codes.map { it.ident }.toTypedArray(), codes.map { it.value as? Int }.toTypedArray()) else -> throw RuntimeException("Type ${kClass!!.qualifiedName} is not supported") }.also { - it.initLabels(codes.map { it.label }.toTypedArray()) + it.initLabels(codes.map { code -> code.label }.toTypedArray()) } } } @@ -168,7 +168,7 @@ open class CodeDomain?> : Domain() { Boolean::class -> VBooleanCodeColumn( ident, this@CodeDomain.ident.ifEmpty { ident }, - field.source, + field.sourceFile, options, align.value, groupID, @@ -181,7 +181,7 @@ open class CodeDomain?> : Domain() { BigDecimal::class -> VDecimalCodeColumn( ident, this@CodeDomain.ident.ifEmpty { ident }, - field.source, + field.sourceFile, options, align.value, groupID, @@ -194,7 +194,7 @@ open class CodeDomain?> : Domain() { Int::class, Long::class -> VIntegerCodeColumn( ident, this@CodeDomain.ident.ifEmpty { ident }, - field.source!!, + field.sourceFile, options, align.value, groupID, @@ -207,7 +207,7 @@ open class CodeDomain?> : Domain() { String::class -> VStringCodeColumn( ident, this@CodeDomain.ident.ifEmpty { ident }, - field.source, + field.sourceFile, options, align.value, groupID, @@ -219,7 +219,7 @@ open class CodeDomain?> : Domain() { ) else -> throw RuntimeException("Type ${kClass!!.qualifiedName} is not supported") }.also { - it.initLabels(codes.map { it.label }.toTypedArray()) + it.initLabels(codes.map { code -> code.label }.toTypedArray()) } } } diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/chart/ChartDimension.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/chart/ChartDimension.kt index c4151ced5..dd8b55801 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/chart/ChartDimension.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/chart/ChartDimension.kt @@ -32,7 +32,7 @@ import org.kopi.galite.visual.dsl.common.Trigger */ open class ChartDimension?>(domain: Domain, private val chart: Chart, - override val source: String? = null) : ChartField(domain) { + source: String? = null) : ChartField(domain, source = source) { /** * Dimension values diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/chart/ChartField.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/chart/ChartField.kt index 4a6096c8c..0d9d1f7cb 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/chart/ChartField.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/chart/ChartField.kt @@ -26,7 +26,7 @@ import org.kopi.galite.visual.dsl.field.Field /** * A chart column. */ -abstract class ChartField?>(domain: Domain) : Field(domain), Serializable { +abstract class ChartField?>(domain: Domain, source: String? = null) : Field(domain, source = source), Serializable { // ---------------------------------------------------------------------- // XML LOCALIZATION GENERATION diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/chart/ChartLocalizationWriter.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/chart/ChartLocalizationWriter.kt index d1c8a1ea8..ee05abdc8 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/chart/ChartLocalizationWriter.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/chart/ChartLocalizationWriter.kt @@ -18,7 +18,7 @@ package org.kopi.galite.visual.dsl.chart import org.jdom2.Element -import org.kopi.galite.visual.dsl.common.Actor +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.dsl.common.LocalizationWriter import org.kopi.galite.visual.dsl.common.Menu diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/chart/ChartMeasure.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/chart/ChartMeasure.kt index d3f892c60..38976c0d8 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/chart/ChartMeasure.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/chart/ChartMeasure.kt @@ -30,7 +30,7 @@ import org.kopi.galite.visual.VColor * * @param domain dimension domain. */ -open class ChartMeasure(domain: Domain, override val source: String = "") : ChartField(domain) where T : Comparable?, T : Number? { +open class ChartMeasure(domain: Domain, source: String? = null) : ChartField(domain, source = source) where T : Comparable?, T : Number? { /** Measure's color in chart */ lateinit var color: Color diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Actor.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Actor.kt deleted file mode 100644 index a8c5b5dc1..000000000 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Actor.kt +++ /dev/null @@ -1,240 +0,0 @@ -/* - * Copyright (c) 2013-2022 kopiLeft Services SARL, Tunis TN - * Copyright (c) 1990-2022 kopiRight Managed Solutions GmbH, Wien AT - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -package org.kopi.galite.visual.dsl.common - -import java.awt.event.InputEvent -import java.awt.event.KeyEvent - -import org.kopi.galite.visual.dsl.form.Key -import org.kopi.galite.visual.VActor - -/** - * This class represents an actor, ie a menu element with a name and may be an icon, a shortcut - * and a help - * - * An Actor is an item to be linked to a command, if its [icon] is specified, it will appear - * in the icon_toolbar located under the menu bar, otherwise, it will only be accessible from the menu bar - * - * @param menu the containing menu - * @param label the label - * @param help the help - * @param source path localization file - */ -open class Actor(val menu: Menu, - val label: String, - help: String, - ident: String? = null, - source: String? = null) - : VActor(menu.label, menu.sourceFile, ident, source, help = help, userActor = true) { - - init { - menuItem = label - } - - // The shortcut key - var key: Key? = null - set(key) { - checkKey(key) - field = key - } - - // The actor icon - var icon: Icon? = null - set(value) { - iconName = value?.iconName - field = value - } - - fun checkKey(key: Key?) { - if (key == null) { - acceleratorModifier = 0 - acceleratorKey = KeyEvent.VK_UNDEFINED - } else { - acceleratorKey = key.value - acceleratorModifier = if (key.toString().contains("SHIFT_")) InputEvent.SHIFT_MASK else 0 - } - } - - // ---------------------------------------------------------------------- - // XML LOCALIZATION GENERATION - // ---------------------------------------------------------------------- - fun genLocalization(writer: LocalizationWriter) { - writer.genActorDefinition(ident, label, help) - } -} - -enum class Icon(val iconName: String) { - ALL("all"), - BLOCK("block"), - BORDER("border"), - BREAD_CRUMB_SEPARATOR("bread_crumb_separator"), - BREAK("break"), - CALENDAR("calendar"), - COLLAPSED("collapsed"), - COLLAPSED_P("collapsed_p"), - COPY("copy"), - DELETE("delete"), - DESK("desk"), - DETAIL("detail"), - DETAIL_VIEW("detail_view"), - DOWN("down"), - DUKE("duke"), - EDIT("edit"), - EXPANDED_A("expanded_a"), - EXPANDED("expanded"), - EXPANDED_P("expanded_p"), - EXPORT_CSV("exportCsv"), - EXPORT_PDF("exportPdf"), - EXPORT_XLSX("exportXlsx"), - FOLD_COLUMN("foldColumn"), - FOLD("fold"), - FORMULA("formula"), - HELP("help"), - HOME("home"), - INSERT_LINE("insertline"), - INSERT("insert"), - LIST("list"), - LOADING("loading"), - LOGIN_IMG("login_img"), - MAIL("mail"), - MENU_QUERY("menuquery"), - NOTE("note"), - NOTHING("nothing"), - OPEN("open"), - OPTIONS("options"), - PREVIEW("preview"), - PRINT("print"), - QUIT("quit"), - SAVE("save"), - SEARCH_OP("searchop"), - SEARCH("search"), - SERIAL_QUERY("serialquery"), - SERVICE_OFF("serviceoff"), - SERVICE_ON("serviceon"), - STORE("store"), - SUGGEST("suggest"), - TIMESTAMP("timeStamp"), - TRI("tri"), - UNFOLD_COLUMN("unfoldColumn"), - UNFOLD("unfold"), - UP("up"), - ADD("add"), - ALIGN_CENTER("align_center"), - ALIGN_JUSTIFY("align_justify"), - ALIGN_LEFT("align_left"), - ALIGN_RIGHT("align_right"), - APPLY("apply"), - AREA_CHART("area_chart"), - ARROW_FIRST("arrowfirst"), - ARROW_LAST("arrowlast"), - ARROW_LEFT("arrowleft"), - ARROW_RIGHT("arrowright"), - ARTICLE("article"), - ASK("ask"), - BAR_CHART("bar_chart"), - BKUP3("bkup3"), - BKUP("bkup"), - BLOCK2("block2"), - BOARD("board"), - BOLD("bold"), - BOMB("bomb"), - BOOKMARK("bookmark"), - BOX_ARROW("boxarrow"), - BW("bw"), - CALCULATE("calculate"), - CFOLDER("cfolder"), - CHART_VIEW("chart_view"), - CHECKBOX("checkbox"), - CLIP("clip"), - COLLAPSE_DB("collapsedb"), - COLLAPSED_F("collapsed_f"), - COLLAPSED_T("collapsed_t"), - COLUMN_CHART("column_chart"), - COMBO("combo"), - CONFIG("config"), - CONVERT("convert"), - CUT("cut"), - DELETE_LINE("deleteline"), - DONE("done"), - ERROR("error"), - EXPANDED_B("expandedb"), - EXPANDED_F("expanded_f"), - EXPANDED_S("expanded_s"), - EXPANDED_T("expanded_t"), - EXPORT("export"), - FAX("fax"), - FW("fw"), - GIF_ICON("gifIcon"), - GREEN("green"), - GUIDE("guide"), - IDENT("ident"), - INDEX("index"), - INTERRUPT("interrupt"), - ITALIC("italic"), - JPG_ICON("jpgIcon"), - LAUNCH("launch"), - LINE_CHART("line_chart"), - LOCK("lock"), - LOGIN("login"), - MONEY_CHECK("moneycheck"), - MONEY("money"), - NOTICE("notice"), - OFOLDER("ofolder"), - PAGE_FIRST("pageFirst"), - PAGE_LAST("pageLast"), - PAGE_LEFT("pageLeft"), - PAGE_RIGHT("pageRight"), - PASSWORD("password"), - PASTE("paste"), - PHONE("phone"), - PIE_CHART("pie_chart"), - PRINT_OPTIONS("printoptions"), - PROJECT("project"), - RED("red"), - REDO("redo"), - REFRESH("refresh"), - RELOAD("reload"), - REPORT("report"), - SEC("sec"), - SELECTED("selected"), - SEND("send"), - SORT("sort"), - SPLIT("split"), - STANDARD("standard"), - STICK("stick"), - STOP("stop"), - TODO("todo"), - TOP("top"), - UNDERLINE("underline"), - UNDO("undo"), - UNIDENT("unident"), - UNSTICK("unstick"), - UPDATE("update"), - USERS("users"), - UTILS("utils"), - VALIDATE("validate"), - WAIT("wait"), - WARNING("warning"), - WINDOW("window"), - YELLOW("yellow"), - ZOOM_HEIGHT("zoomheight"), - ZOOM_MINUS("zoomminus"), - ZOOM_OPTIMAL("zoomoptimal"), - ZOOM_PLUS("zoomplus"), - ZOOM_WIDTH("zoomwidth") -} diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Command.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Command.kt index 36e3322c6..51f33ea8a 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Command.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Command.kt @@ -19,6 +19,7 @@ package org.kopi.galite.visual.dsl.common import org.kopi.galite.visual.form.VConstants import org.kopi.galite.visual.ActionHandler +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.VCommand /** diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/LocalizableElement.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/LocalizableElement.kt index c85de71f1..c522d53f8 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/LocalizableElement.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/LocalizableElement.kt @@ -23,7 +23,7 @@ import java.io.File * The Localizable element should be implemented by all classes that can be localized within the application. * It's an element that can be inserted into a window. it can be form element, report element or chart element. */ -abstract class LocalizableElement(ident: String? = null, open val source: String? = null) { // TODO: remove source getter/setter +abstract class LocalizableElement(ident: String? = null, private val source: String? = null) { open val ident: String = ident ?: javaClass.name.removePrefix("${javaClass.`package`.name}.") .substringAfterLast('$') diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Window.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Window.kt index 43346f31d..6877bc812 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Window.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Window.kt @@ -22,6 +22,7 @@ import java.io.File import java.util.Locale import org.kopi.galite.visual.Action +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.DefaultActor import org.kopi.galite.visual.VException import org.kopi.galite.visual.VWindow diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/field/Field.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/field/Field.kt index fabf51ef6..1b8416699 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/field/Field.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/field/Field.kt @@ -28,7 +28,7 @@ import org.kopi.galite.visual.dsl.common.LocalizableElement * * @param domain the field's domain */ -abstract class Field(open val domain: Domain, ident: String? = null): LocalizableElement(ident) { +abstract class Field(open val domain: Domain, ident: String? = null, source: String? = null): LocalizableElement(ident, source) { /** Field's label (text on the left) */ var label: String? = null diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/Block.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/Block.kt index ad3ffad52..dd9540f89 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/Block.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/Block.kt @@ -21,11 +21,11 @@ import java.awt.Point import java.sql.SQLException import org.jetbrains.exposed.sql.Table +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.domain.CodeDomain import org.kopi.galite.visual.domain.Domain import org.kopi.galite.visual.domain.ListDomain import org.kopi.galite.visual.dsl.common.Action -import org.kopi.galite.visual.dsl.common.Actor import org.kopi.galite.visual.dsl.common.Command import org.kopi.galite.visual.dsl.common.FormTrigger import org.kopi.galite.visual.dsl.common.LocalizationWriter diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormField.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormField.kt index ac6e94d74..bb1fbff41 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormField.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormField.kt @@ -27,7 +27,7 @@ import org.kopi.galite.visual.domain.CodeDomain import org.kopi.galite.visual.domain.Domain import org.kopi.galite.visual.domain.ListDomain import org.kopi.galite.visual.dsl.common.Action -import org.kopi.galite.visual.dsl.common.Actor +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.dsl.common.Command import org.kopi.galite.visual.dsl.common.FormTrigger import org.kopi.galite.visual.dsl.common.LocalizationWriter diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormLocalizationWriter.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormLocalizationWriter.kt index 270efe5fe..61ebdaebf 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormLocalizationWriter.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormLocalizationWriter.kt @@ -19,7 +19,7 @@ package org.kopi.galite.visual.dsl.form import org.jdom2.Element import org.kopi.galite.visual.domain.Domain -import org.kopi.galite.visual.dsl.common.Actor +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.dsl.common.LocalizationWriter import org.kopi.galite.visual.dsl.common.Menu diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/report/ReportField.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/report/ReportField.kt index 115245851..a51509ee5 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/report/ReportField.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/report/ReportField.kt @@ -41,7 +41,7 @@ import org.kopi.galite.visual.VCommand class ReportField(override val domain: Domain, val init: ReportField.() -> Unit, ident: String? = null, - override val source: String?) : Field(domain, ident) { + source: String?) : Field(domain, ident, source) { /** the options of the field */ internal var options: Int = 0 diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/report/ReportLocalizationWriter.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/report/ReportLocalizationWriter.kt index 5ef63fe47..a94dcd769 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/report/ReportLocalizationWriter.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/report/ReportLocalizationWriter.kt @@ -18,7 +18,7 @@ package org.kopi.galite.visual.dsl.report import org.jdom2.Element -import org.kopi.galite.visual.dsl.common.Actor +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.dsl.common.LocalizationWriter import org.kopi.galite.visual.dsl.common.Menu diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VBlock.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VBlock.kt index 46ed38474..998f89961 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VBlock.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VBlock.kt @@ -61,7 +61,7 @@ import org.kopi.galite.visual.ActionHandler import org.kopi.galite.visual.ApplicationContext import org.kopi.galite.visual.Message import org.kopi.galite.visual.MessageCode -import org.kopi.galite.visual.VActor +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.VColor import org.kopi.galite.visual.VCommand import org.kopi.galite.visual.VDatabaseUtils @@ -109,8 +109,8 @@ abstract class VBlock(var title: String, internal var indicesIdents = mutableListOf() // error messages for violated indices internal var commands = mutableListOf() // commands internal var fieldID: VField? = null // commands - open var actors: Array? = null // actors to send to form (move to block import) - get(): Array? { + open var actors: Array? = null // actors to send to form (move to block import) + get(): Array? { val temp = field field = null return temp @@ -2770,7 +2770,7 @@ abstract class VBlock(var title: String, /** * */ - open fun getActor(i: Int): VActor = form.getActor(i) + open fun getActor(i: Int): Actor = form.getActor(i) /** * Returns true if this block can display more than one record. diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VDefaultFormActor.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VDefaultFormActor.kt index 775b1d867..e291badba 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VDefaultFormActor.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VDefaultFormActor.kt @@ -18,7 +18,7 @@ package org.kopi.galite.visual.form -import org.kopi.galite.visual.VActor +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.VlibProperties class VDefaultFormActor(menuIdent: String, @@ -26,7 +26,7 @@ class VDefaultFormActor(menuIdent: String, iconName: String, acceleratorKey: Int, acceleratorModifier: Int) - : VActor(menuIdent, + : Actor(menuIdent, null, actorIdent, null, diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VForm.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VForm.kt index 64ed786ce..57cf3563a 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VForm.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VForm.kt @@ -35,7 +35,7 @@ import org.kopi.galite.visual.DefaultActor import org.kopi.galite.visual.MessageCode 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.VCommand import org.kopi.galite.visual.VException import org.kopi.galite.visual.VExecFailedException @@ -63,10 +63,10 @@ abstract class VForm protected constructor(source: String? = null) : VWindow(sou // ---------------------------------------------------------------------- // SHARED DATA MEMBERS // ---------------------------------------------------------------------- - private var autofillActor: VActor? = null - private var editItemActor: VActor? = null - private var editItemActor_S: VActor? = null - private var newItemActor: VActor? = null + private var autofillActor: Actor? = null + private var editItemActor: Actor? = null + private var editItemActor_S: Actor? = null + private var newItemActor: Actor? = null // --------------------------------------------------------------------- // PREDEFINED COMMANDS @@ -203,7 +203,7 @@ abstract class VForm protected constructor(source: String? = null) : VWindow(sou /** * addCommand in menu */ - override fun addActors(actorDefs: Array?) { + override fun addActors(actorDefs: Array?) { actorDefs?.forEach { actor -> if (actor is DefaultActor) { when (actor.code) { @@ -739,7 +739,7 @@ abstract class VForm protected constructor(source: String? = null) : VWindow(sou VHelpViewer().showHelp(genHelp()) } - fun getDefaultActor(type: Int): VActor? { + fun getDefaultActor(type: Int): Actor? { when (type) { CMD_NEWITEM -> return newItemActor CMD_EDITITEM -> return editItemActor diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VFullCalendarCommand.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VFullCalendarCommand.kt index 7b65781b6..72c8d3f5f 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VFullCalendarCommand.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VFullCalendarCommand.kt @@ -22,14 +22,14 @@ import org.kopi.galite.visual.cross.VFullCalendarForm import org.kopi.galite.visual.dsl.common.Trigger import org.kopi.galite.visual.Action import org.kopi.galite.visual.ActionHandler -import org.kopi.galite.visual.VActor +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.VCommand import org.kopi.galite.visual.VHelpGenerator import org.kopi.galite.visual.VWindow class VFullCalendarCommand( val form: VFullCalendarForm, - actor: VActor, + actor: Actor, mode: Int ) : VCommand(mode, null, actor, actor.number, actor.ident), ActionHandler { diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VImportedBlock.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VImportedBlock.kt index 0a21f57c5..811816da6 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VImportedBlock.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VImportedBlock.kt @@ -18,17 +18,17 @@ package org.kopi.galite.visual.form -import org.kopi.galite.visual.VActor +import org.kopi.galite.visual.Actor abstract class VImportedBlock(form: VForm) : VBlock(form) { - override var actors: Array? = null + override var actors: Array? = null // ---------------------------------------------------------------------- // ACTOR HANDLING // ---------------------------------------------------------------------- - override fun getActor(i: Int): VActor { + override fun getActor(i: Int): Actor { return actors!![i] } } diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/preview/VPreviewWindow.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/preview/VPreviewWindow.kt index ce296f05f..328a1b26a 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/preview/VPreviewWindow.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/preview/VPreviewWindow.kt @@ -31,7 +31,7 @@ import org.kopi.galite.visual.ApplicationContext import org.kopi.galite.visual.Constants 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.VWindow import org.kopi.galite.visual.VlibProperties import org.kopi.galite.visual.WindowBuilder @@ -63,76 +63,76 @@ class VPreviewWindow : VWindow() { init { setTitle(VlibProperties.getString("Preview")) addActors(arrayOf( - VActor("File", - PREVIEW_LOCALIZATION_RESOURCE, - "Close", - PREVIEW_LOCALIZATION_RESOURCE, - "quit", - KeyEvent.VK_ESCAPE, - 0), - VActor("Action", - PREVIEW_LOCALIZATION_RESOURCE, - "PageFirst", - PREVIEW_LOCALIZATION_RESOURCE, - "pageFirst", - KeyEvent.VK_HOME, - 0), - VActor("Action", - PREVIEW_LOCALIZATION_RESOURCE, - "PageLeft", - PREVIEW_LOCALIZATION_RESOURCE, - "pageLeft", - KeyEvent.VK_PAGE_UP, - 0), - VActor("Action", - PREVIEW_LOCALIZATION_RESOURCE, - "PageRight", - PREVIEW_LOCALIZATION_RESOURCE, - "pageRight", - KeyEvent.VK_PAGE_DOWN, - 0), - VActor("Action", - PREVIEW_LOCALIZATION_RESOURCE, - "PageLast", - PREVIEW_LOCALIZATION_RESOURCE, - "pageLast", - KeyEvent.VK_END, - 0), - VActor("Action", - PREVIEW_LOCALIZATION_RESOURCE, - "PreviewFit", - PREVIEW_LOCALIZATION_RESOURCE, - "zoomoptimal", - KeyEvent.VK_F5, - 0), - VActor("Action", - PREVIEW_LOCALIZATION_RESOURCE, - "PreviewFitWidth", - PREVIEW_LOCALIZATION_RESOURCE, - "zoomwidth", - KeyEvent.VK_F8, - 0), - VActor("Action", - PREVIEW_LOCALIZATION_RESOURCE, - "PreviewFitHeight", - PREVIEW_LOCALIZATION_RESOURCE, - "zoomheight", - KeyEvent.VK_F9, - 0), - VActor("Action", - PREVIEW_LOCALIZATION_RESOURCE, - "PreviewPlus", - PREVIEW_LOCALIZATION_RESOURCE, - "zoomplus", - KeyEvent.VK_F6, - 0), - VActor("Action", - PREVIEW_LOCALIZATION_RESOURCE, - "PreviewMinus", - PREVIEW_LOCALIZATION_RESOURCE, - "zoomminus", - KeyEvent.VK_F7, - 0) + Actor("File", + PREVIEW_LOCALIZATION_RESOURCE, + "Close", + PREVIEW_LOCALIZATION_RESOURCE, + "quit", + KeyEvent.VK_ESCAPE, + 0), + Actor("Action", + PREVIEW_LOCALIZATION_RESOURCE, + "PageFirst", + PREVIEW_LOCALIZATION_RESOURCE, + "pageFirst", + KeyEvent.VK_HOME, + 0), + Actor("Action", + PREVIEW_LOCALIZATION_RESOURCE, + "PageLeft", + PREVIEW_LOCALIZATION_RESOURCE, + "pageLeft", + KeyEvent.VK_PAGE_UP, + 0), + Actor("Action", + PREVIEW_LOCALIZATION_RESOURCE, + "PageRight", + PREVIEW_LOCALIZATION_RESOURCE, + "pageRight", + KeyEvent.VK_PAGE_DOWN, + 0), + Actor("Action", + PREVIEW_LOCALIZATION_RESOURCE, + "PageLast", + PREVIEW_LOCALIZATION_RESOURCE, + "pageLast", + KeyEvent.VK_END, + 0), + Actor("Action", + PREVIEW_LOCALIZATION_RESOURCE, + "PreviewFit", + PREVIEW_LOCALIZATION_RESOURCE, + "zoomoptimal", + KeyEvent.VK_F5, + 0), + Actor("Action", + PREVIEW_LOCALIZATION_RESOURCE, + "PreviewFitWidth", + PREVIEW_LOCALIZATION_RESOURCE, + "zoomwidth", + KeyEvent.VK_F8, + 0), + Actor("Action", + PREVIEW_LOCALIZATION_RESOURCE, + "PreviewFitHeight", + PREVIEW_LOCALIZATION_RESOURCE, + "zoomheight", + KeyEvent.VK_F9, + 0), + Actor("Action", + PREVIEW_LOCALIZATION_RESOURCE, + "PreviewPlus", + PREVIEW_LOCALIZATION_RESOURCE, + "zoomplus", + KeyEvent.VK_F6, + 0), + Actor("Action", + PREVIEW_LOCALIZATION_RESOURCE, + "PreviewMinus", + PREVIEW_LOCALIZATION_RESOURCE, + "zoomminus", + KeyEvent.VK_F7, + 0) )) // localize the preview using the default locale diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/report/VDefaultReportActor.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/report/VDefaultReportActor.kt index 8207cf983..7038e0b30 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/report/VDefaultReportActor.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/report/VDefaultReportActor.kt @@ -18,7 +18,7 @@ package org.kopi.galite.visual.report -import org.kopi.galite.visual.VActor +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.VlibProperties class VDefaultReportActor(menuIdent: String, @@ -26,7 +26,7 @@ class VDefaultReportActor(menuIdent: String, iconName: String, acceleratorKey: Int, acceleratorModifier: Int) - : VActor(menuIdent, + : Actor(menuIdent, null, actorIdent, null, diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/report/VReportCommand.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/report/VReportCommand.kt index 42a830e83..19c7e25b1 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/report/VReportCommand.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/report/VReportCommand.kt @@ -24,13 +24,13 @@ import org.kopi.galite.visual.print.PrintManager import org.kopi.galite.visual.Action import org.kopi.galite.visual.ActionHandler import org.kopi.galite.visual.PrinterManager -import org.kopi.galite.visual.VActor +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.VCommand import org.kopi.galite.visual.VHelpGenerator class VReportCommand( val report: VReport, - actor: VActor + actor: Actor ) : VCommand(0xFFFF, null, actor, actor.number, actor.ident), ActionHandler { override fun setEnabled(enabled: Boolean) { diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/form/DGridEditorLabel.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/form/DGridEditorLabel.kt index a88c08ea0..c53739918 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/form/DGridEditorLabel.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/form/DGridEditorLabel.kt @@ -27,7 +27,7 @@ import org.kopi.galite.visual.form.VFieldUI import org.kopi.galite.visual.ui.vaadin.base.BackgroundThreadHandler.access import org.kopi.galite.visual.ui.vaadin.base.Utils import org.kopi.galite.visual.ui.vaadin.grid.GridEditorLabel -import org.kopi.galite.visual.VActor +import org.kopi.galite.visual.Actor import com.vaadin.flow.component.AttachEvent import com.vaadin.flow.component.UI @@ -124,7 +124,7 @@ class DGridEditorLabel(text: String?, * @param actor The actor model. * @return The actor description. */ - private fun getDescription(actor: VActor): String? { + private fun getDescription(actor: Actor): String? { return if (actor.acceleratorKey > 0) { if (actor.acceleratorModifier == 0) { actor.menuItem + " [" + KeyEvent.getKeyText(actor.acceleratorKey) + "]" diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/form/DLabel.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/form/DLabel.kt index 04e28950a..ca743206c 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/form/DLabel.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/form/DLabel.kt @@ -25,7 +25,7 @@ import org.kopi.galite.visual.form.VFieldUI import org.kopi.galite.visual.ui.vaadin.base.BackgroundThreadHandler.access import org.kopi.galite.visual.ui.vaadin.base.Utils import org.kopi.galite.visual.ui.vaadin.label.SortableLabel -import org.kopi.galite.visual.VActor +import org.kopi.galite.visual.Actor import com.vaadin.flow.component.AttachEvent import com.vaadin.flow.component.UI @@ -205,7 +205,7 @@ open class DLabel(text: String?, help: String?) : SortableLabel(text), ULabel { * @param actor The actor model. * @return The actor description. */ - private fun getDescription(actor: VActor?): String? { + private fun getDescription(actor: Actor?): String? { return if (actor!!.acceleratorKey > 0) { if (actor.acceleratorModifier == 0) { actor.menuItem + " [" + KeyEvent.getKeyText(actor.acceleratorKey) + "]" diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/visual/DActor.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/visual/DActor.kt index 7eeb880ac..ec8fe10da 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/visual/DActor.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/visual/DActor.kt @@ -20,7 +20,6 @@ package org.kopi.galite.visual.ui.vaadin.visual import java.awt.Event import java.awt.event.KeyEvent -import org.kopi.galite.visual.ui.vaadin.actor.Actor import org.kopi.galite.visual.ui.vaadin.actor.VActorNavigationItem import org.kopi.galite.visual.ui.vaadin.base.BackgroundThreadHandler.access import org.kopi.galite.visual.ui.vaadin.base.Styles @@ -33,7 +32,7 @@ import org.kopi.galite.visual.ui.vaadin.grid.GridEditorTextField import org.kopi.galite.visual.ui.vaadin.menu.VNavigationMenu import org.kopi.galite.visual.ui.vaadin.window.Window import org.kopi.galite.visual.UActor -import org.kopi.galite.visual.VActor +import org.kopi.galite.visual.Actor import com.vaadin.flow.component.AttachEvent import com.vaadin.flow.component.ClickEvent @@ -57,8 +56,8 @@ import com.vaadin.flow.component.dependency.CssImport * */ @CssImport("./styles/galite/actor.css") -class DActor(private var model: VActor) - : Actor(model.menuItem, +class DActor(private var model: Actor) + : org.kopi.galite.visual.ui.vaadin.actor.Actor(model.menuItem, Utils.createTooltip(getDescription(model)), model.menuName, Utils.getVaadinIcon(model.iconName), @@ -77,11 +76,11 @@ class DActor(private var model: VActor) // -------------------------------------------------- // ACCESSORS // -------------------------------------------------- - override fun setModel(model: VActor) { + override fun setModel(model: Actor) { this.model = model } - override fun getModel(): VActor { + override fun getModel(): Actor { return model } @@ -179,7 +178,7 @@ class DActor(private var model: VActor) * @param model The actor model. * @return The actor description. */ - private fun getDescription(model: VActor): String? { + private fun getDescription(model: Actor): String? { return if (model.acceleratorKey > 0) { if (model.acceleratorModifier == 0) { model.help + " [" + KeyEvent.getKeyText(model.acceleratorKey) + "]" diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/visual/DWindow.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/visual/DWindow.kt index 0198073e9..984bef7fb 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/visual/DWindow.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/visual/DWindow.kt @@ -49,7 +49,7 @@ import org.kopi.galite.visual.MessageCode import org.kopi.galite.visual.MessageListener import org.kopi.galite.visual.PropertyException import org.kopi.galite.visual.UWindow -import org.kopi.galite.visual.VActor +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.VRuntimeException import org.kopi.galite.visual.VWindow import org.kopi.galite.visual.VlibProperties @@ -171,9 +171,9 @@ abstract class DWindow protected constructor(private var model: VWindow?) : Wind /** * Adds a command in the menu bar. - * @param actorDefs The [VActor] definitions. + * @param actorDefs The [Actor] definitions. */ - private fun addActorsToGUI(actorDefs: List) { + private fun addActorsToGUI(actorDefs: List) { val panel = VActorsNavigationPanel() // Add actors panel diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/util/ReflectTool.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/util/ReflectTool.kt index c371bc434..e6b920682 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/util/ReflectTool.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/util/ReflectTool.kt @@ -22,7 +22,7 @@ import kotlin.reflect.full.memberProperties import kotlin.reflect.jvm.jvmErasure import org.jetbrains.exposed.sql.Table -import org.kopi.galite.visual.dsl.common.Actor +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.dsl.common.Menu import org.kopi.galite.visual.dsl.form.Form import org.kopi.galite.visual.dsl.form.Block diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/bill/BillR.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/bill/BillR.kt index 903f80c2a..5b95c3be6 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/bill/BillR.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/bill/BillR.kt @@ -25,7 +25,7 @@ import org.kopi.galite.visual.domain.DATE import org.kopi.galite.visual.domain.DECIMAL import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.dsl.report.FieldAlignment import org.kopi.galite.visual.dsl.report.Report diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/billproduct/BillProductR.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/billproduct/BillProductR.kt index f03105ecc..19daca906 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/billproduct/BillProductR.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/billproduct/BillProductR.kt @@ -24,7 +24,7 @@ import org.kopi.galite.demo.common.ReportDefault import org.kopi.galite.demo.database.BillProduct import org.kopi.galite.visual.domain.DECIMAL import org.kopi.galite.visual.domain.INT -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.dsl.report.FieldAlignment diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/client/ClientForm.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/client/ClientForm.kt index f4ba69b72..3bff536ad 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/client/ClientForm.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/client/ClientForm.kt @@ -28,7 +28,7 @@ import org.kopi.galite.visual.domain.BOOL import org.kopi.galite.visual.domain.DECIMAL import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Border import org.kopi.galite.visual.dsl.form.FieldOption import org.kopi.galite.visual.dsl.form.Block diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/client/ClientR.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/client/ClientR.kt index 862983aa3..59e6737d2 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/client/ClientR.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/client/ClientR.kt @@ -24,7 +24,7 @@ import org.kopi.galite.demo.database.Client import org.kopi.galite.visual.domain.BOOL import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.dsl.report.FieldAlignment import org.kopi.galite.visual.dsl.report.Report diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/command/CommandForm.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/command/CommandForm.kt index 87f4b3575..11efd0cd5 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/command/CommandForm.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/command/CommandForm.kt @@ -24,7 +24,7 @@ import org.kopi.galite.demo.database.Command import org.kopi.galite.demo.desktop.runForm import org.kopi.galite.visual.domain.CodeDomain import org.kopi.galite.visual.domain.INT -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.Mode import org.kopi.galite.visual.dsl.form.Access import org.kopi.galite.visual.dsl.form.Block diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/command/CommandR.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/command/CommandR.kt index 3799c015f..689f39b73 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/command/CommandR.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/command/CommandR.kt @@ -24,7 +24,7 @@ import org.kopi.galite.demo.database.Command import org.kopi.galite.visual.domain.CodeDomain import org.kopi.galite.visual.domain.DATE import org.kopi.galite.visual.domain.INT -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.dsl.report.FieldAlignment import org.kopi.galite.visual.dsl.report.Report diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/common/FormDefault.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/common/FormDefault.kt index 7d2d1fcac..6edc38f25 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/common/FormDefault.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/common/FormDefault.kt @@ -19,9 +19,9 @@ package org.kopi.galite.demo.common import java.util.Locale -import org.kopi.galite.visual.dsl.common.Actor +import org.kopi.galite.visual.Actor +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.Command -import org.kopi.galite.visual.dsl.common.Icon import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Block import org.kopi.galite.visual.dsl.form.Key diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/common/ReportDefault.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/common/ReportDefault.kt index defad6d8f..5f0d8f341 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/common/ReportDefault.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/common/ReportDefault.kt @@ -19,8 +19,8 @@ package org.kopi.galite.demo.common import java.util.Locale -import org.kopi.galite.visual.dsl.common.Actor -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Actor +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.dsl.report.Report import org.kopi.galite.visual.report.VReport diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/product/ProductR.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/product/ProductR.kt index eb9f4202f..6b8ed8aae 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/product/ProductR.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/product/ProductR.kt @@ -23,7 +23,7 @@ import org.jetbrains.exposed.sql.transactions.transaction import org.kopi.galite.demo.database.Product import org.kopi.galite.visual.domain.DECIMAL import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.dsl.report.Report import org.kopi.galite.visual.report.VReport diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/provider/ProviderR.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/provider/ProviderR.kt index 1eb88d00e..9eb5a18b2 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/provider/ProviderR.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/provider/ProviderR.kt @@ -23,7 +23,7 @@ import org.jetbrains.exposed.sql.transactions.transaction import org.kopi.galite.demo.database.Provider import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.dsl.report.FieldAlignment import org.kopi.galite.visual.dsl.report.Report diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/stock/StockR.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/stock/StockR.kt index 0dfc6fc2c..63f14be5e 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/stock/StockR.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/stock/StockR.kt @@ -26,7 +26,7 @@ import org.kopi.galite.demo.database.Provider import org.kopi.galite.demo.database.Stock import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.dsl.report.FieldAlignment import org.kopi.galite.visual.dsl.report.Report diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/taxRule/TaxRuleForm.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/taxRule/TaxRuleForm.kt index c95566b9d..215652676 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/taxRule/TaxRuleForm.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/taxRule/TaxRuleForm.kt @@ -25,7 +25,7 @@ import org.kopi.galite.visual.domain.BOOL import org.kopi.galite.visual.domain.Fixed import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.Mode import org.kopi.galite.visual.dsl.form.Access import org.kopi.galite.visual.dsl.form.Block diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/taxRule/TaxRuleR.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/taxRule/TaxRuleR.kt index 8e3be5782..c131d4e42 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/taxRule/TaxRuleR.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/taxRule/TaxRuleR.kt @@ -23,7 +23,7 @@ import org.jetbrains.exposed.sql.transactions.transaction import org.kopi.galite.demo.database.TaxRule import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.dsl.report.FieldAlignment import org.kopi.galite.visual.dsl.report.Report diff --git a/galite-localizer/src/test/kotlin/org/kopi/galite/tests/localizer/Initialization.kt b/galite-localizer/src/test/kotlin/org/kopi/galite/tests/localizer/Initialization.kt index ceada6cd5..61181f067 100644 --- a/galite-localizer/src/test/kotlin/org/kopi/galite/tests/localizer/Initialization.kt +++ b/galite-localizer/src/test/kotlin/org/kopi/galite/tests/localizer/Initialization.kt @@ -30,7 +30,7 @@ import org.kopi.galite.database.Modules import org.kopi.galite.database.list_Of_Tables import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.Mode import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Access diff --git a/galite-testing/src/main/kotlin/org/kopi/galite/testing/Actor.kt b/galite-testing/src/main/kotlin/org/kopi/galite/testing/Actor.kt index 7aa770c35..7fdf809be 100644 --- a/galite-testing/src/main/kotlin/org/kopi/galite/testing/Actor.kt +++ b/galite-testing/src/main/kotlin/org/kopi/galite/testing/Actor.kt @@ -16,7 +16,7 @@ */ package org.kopi.galite.testing -import org.kopi.galite.visual.dsl.common.Actor +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.ui.vaadin.actor.VActorNavigationItem import org.kopi.galite.visual.ui.vaadin.actor.VActorsNavigationPanel import org.kopi.galite.visual.ui.vaadin.base.Utils diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/CommonDSLTest.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/CommonDSLTest.kt index 30d81789b..887cc95ca 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/CommonDSLTest.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/CommonDSLTest.kt @@ -25,7 +25,7 @@ import org.junit.Test import org.kopi.galite.tests.examples.Training import org.kopi.galite.tests.ui.vaadin.VApplicationTestBase import org.kopi.galite.visual.domain.ListDomain -import org.kopi.galite.visual.dsl.common.Actor +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.dsl.common.Command import org.kopi.galite.visual.dsl.common.FieldList import org.kopi.galite.visual.dsl.common.ListDescription diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/FormDSLTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/FormDSLTests.kt index a1a4f91a2..fe6983a75 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/FormDSLTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/FormDSLTests.kt @@ -30,7 +30,7 @@ import org.kopi.galite.tests.form.User import org.kopi.galite.tests.ui.vaadin.VApplicationTestBase import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Border import org.kopi.galite.visual.dsl.form.FieldAlignment @@ -239,8 +239,8 @@ class FormDSLTests : VApplicationTestBase() { assertEquals(form.resetForm.ident, formModel.commands[0].actorIdent) assertEquals(form.resetForm.ident, formModel.commands[0].actor!!.ident) - assertEquals(form.resetForm.menu.label, formModel.commands[0].actor!!.menuIdent) - assertEquals(form.resetForm.icon?.iconName, formModel.commands[0].actor!!.iconName) + assertEquals(form.resetForm.menu.label, formModel.commands[0].actor!!._menuIdent) + assertEquals(form.resetForm.icon?.iconName, formModel.commands[0].actor!!._iconName) assertEquals(form.resetForm.help, formModel.commands[0].actor!!.help) } @@ -251,22 +251,22 @@ class FormDSLTests : VApplicationTestBase() { assertEquals(3, formModel.actors.size) - assertEquals("File", formModel.actors[0].menuName) + assertEquals("File", formModel.actors[0]._menuName) assertEquals("GotoShortcuts", formModel.actors[0].ident) - assertEquals(null, formModel.actors[0].iconName) + assertEquals(null, formModel.actors[0]._iconName) assertEquals("Go to shortcut list", formModel.actors[0].help) - assertEquals(KeyEvent.VK_F12, formModel.actors[0].acceleratorKey) + assertEquals(KeyEvent.VK_F12, formModel.actors[0]._acceleratorKey) - assertEquals(form.edit.label, formModel.actors[1].menuName) + assertEquals(form.edit.label, formModel.actors[1]._menuName) assertEquals(form.autoFill.ident, formModel.actors[1].ident) - assertEquals(form.autoFill.icon?.iconName, formModel.actors[1].iconName) + assertEquals(form.autoFill.icon?.iconName, formModel.actors[1]._iconName) assertEquals(form.autoFill.help, formModel.actors[1].help) - assertEquals(form.reset.label, formModel.actors[2].menuName) + assertEquals(form.reset.label, formModel.actors[2]._menuName) assertEquals(form.resetForm.ident, formModel.actors[2].ident) - assertEquals(form.resetForm.icon?.iconName, formModel.actors[2].iconName) + assertEquals(form.resetForm.icon?.iconName, formModel.actors[2]._iconName) assertEquals(form.resetForm.help, formModel.actors[2].help) - assertEquals(form.resetForm.key!!.value, formModel.actors[2].acceleratorKey) + assertEquals(form.resetForm.key!!.value, formModel.actors[2]._acceleratorKey) } @Test @@ -280,8 +280,8 @@ class FormDSLTests : VApplicationTestBase() { assertEquals(form.autoFill.ident, fileModel.command!![0].actorIdent) assertEquals(form.autoFill.ident, fileModel.command!![0].actor!!.ident) - assertEquals(form.autoFill.menu.label, fileModel.command!![0].actor!!.menuIdent) - assertEquals(form.autoFill.icon?.iconName, fileModel.command!![0].actor!!.iconName) + assertEquals(form.autoFill.menu.label, fileModel.command!![0].actor!!._menuIdent) + assertEquals(form.autoFill.icon?.iconName, fileModel.command!![0].actor!!._iconName) assertEquals(form.autoFill.help, fileModel.command!![0].actor!!.help) } diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/WindowElementSources.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/WindowElementSources.kt index 800378c65..cea6a9c25 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/WindowElementSources.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/WindowElementSources.kt @@ -22,8 +22,8 @@ import kotlin.test.assertEquals import org.junit.Test import org.kopi.galite.tests.ui.vaadin.VApplicationTestBase -import org.kopi.galite.visual.dsl.common.Actor -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Actor +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.Menu import org.kopi.galite.visual.dsl.form.Block import org.kopi.galite.visual.dsl.form.Form diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/CommandsForm.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/CommandsForm.kt index afaf7fc71..4cf045f89 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/CommandsForm.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/CommandsForm.kt @@ -19,7 +19,7 @@ package org.kopi.galite.tests.examples import java.util.Locale import org.kopi.galite.tests.desktop.runForm -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.dsl.form.ReportSelectionForm diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationBlockForm.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationBlockForm.kt index 3c08df089..38278391d 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationBlockForm.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationBlockForm.kt @@ -21,7 +21,7 @@ import java.util.Locale import org.kopi.galite.tests.desktop.runForm import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.Mode import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Access diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationChart.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationChart.kt index 3cf742762..8b67dcc09 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationChart.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationChart.kt @@ -20,7 +20,7 @@ import java.util.Locale import org.kopi.galite.tests.desktop.runForm import org.kopi.galite.visual.domain.INT -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.Mode import org.kopi.galite.visual.dsl.form.Form import org.kopi.galite.visual.dsl.form.Block diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationChartC.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationChartC.kt index a5f666284..9d51fdfee 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationChartC.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationChartC.kt @@ -30,7 +30,7 @@ import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.type.Month import org.kopi.galite.visual.VColor import org.jetbrains.exposed.sql.insert -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon /** * test locale, title, help for chart diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationFieldsForm.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationFieldsForm.kt index b2d873089..d1ce39ad3 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationFieldsForm.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationFieldsForm.kt @@ -31,7 +31,7 @@ import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.ListDomain import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.domain.TEXT -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.Mode import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Access @@ -216,7 +216,7 @@ class DocumentationFieldsForm : DictionaryForm(title = "Form to test fields", lo FileHandler.fileHandler!!.openFile(form.model.getDisplay()!!, object : FileHandler.FileFilter { override fun accept(pathname: File?): Boolean { return (pathname!!.isDirectory - || pathname.name.toLowerCase().endsWith(".pdf")) + || pathname.name.lowercase().endsWith(".pdf")) } override val description: String diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationForm.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationForm.kt index 66b41cf12..1f27bb11e 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationForm.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationForm.kt @@ -25,7 +25,7 @@ import org.kopi.galite.visual.domain.CodeDomain import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.ListDomain import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.Mode import org.kopi.galite.visual.dsl.form.Border import org.kopi.galite.visual.dsl.form.DictionaryForm diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReport.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReport.kt index 71017b6f1..7e566b638 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReport.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReport.kt @@ -20,7 +20,7 @@ import java.util.Locale import org.kopi.galite.tests.desktop.runForm import org.kopi.galite.visual.domain.INT -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Block import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.dsl.form.ReportSelectionForm diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReportR.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReportR.kt index b45a14b8a..b5c165f7f 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReportR.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReportR.kt @@ -22,7 +22,7 @@ import org.jetbrains.exposed.sql.selectAll import org.jetbrains.exposed.sql.transactions.transaction import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.dsl.report.FieldAlignment import org.kopi.galite.visual.dsl.report.Report diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReportTriggers.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReportTriggers.kt index f2e0c66e3..dfb61c752 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReportTriggers.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReportTriggers.kt @@ -20,7 +20,7 @@ import java.util.Locale import org.kopi.galite.tests.desktop.runForm import org.kopi.galite.visual.domain.INT -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Form import org.kopi.galite.visual.dsl.form.Block import org.kopi.galite.visual.dsl.form.Key diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReportTriggersR.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReportTriggersR.kt index 016ab3253..4a4a0c80a 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReportTriggersR.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReportTriggersR.kt @@ -27,7 +27,7 @@ import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.dsl.report.Report import org.jetbrains.exposed.sql.insert import org.kopi.galite.visual.database.transaction -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.report.triggers.avgDecimal import org.kopi.galite.visual.report.triggers.avgInteger import org.kopi.galite.visual.report.triggers.sumDecimal diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/FormToTestSaveMultipleBlock.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/FormToTestSaveMultipleBlock.kt index e0aa2f138..5f00693c7 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/FormToTestSaveMultipleBlock.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/FormToTestSaveMultipleBlock.kt @@ -22,7 +22,7 @@ import org.jetbrains.exposed.sql.transactions.transaction import org.kopi.galite.tests.desktop.runForm import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Border import org.kopi.galite.visual.dsl.form.DictionaryForm diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/FormWithChart.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/FormWithChart.kt index 4d8112239..729db12c4 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/FormWithChart.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/FormWithChart.kt @@ -25,7 +25,7 @@ import org.kopi.galite.visual.domain.DECIMAL import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.dsl.chart.Chart -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.Mode import org.kopi.galite.visual.dsl.form.Form import org.kopi.galite.visual.dsl.form.Key diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/MultipleBlockForm.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/MultipleBlockForm.kt index 251dfd290..944816b1f 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/MultipleBlockForm.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/MultipleBlockForm.kt @@ -23,7 +23,7 @@ import org.kopi.galite.tests.desktop.runForm import org.kopi.galite.visual.database.transaction import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Border import org.kopi.galite.visual.dsl.form.DictionaryForm diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TestFieldsForm.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TestFieldsForm.kt index 9086b4389..5e7159a80 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TestFieldsForm.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TestFieldsForm.kt @@ -23,7 +23,7 @@ import org.kopi.galite.visual.domain.Convert import org.kopi.galite.visual.domain.DECIMAL import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.DictionaryForm import org.kopi.galite.visual.dsl.form.FieldOption diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TestFieldsVisibilityForm.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TestFieldsVisibilityForm.kt index 51e1bfe4c..162345a22 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TestFieldsVisibilityForm.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TestFieldsVisibilityForm.kt @@ -20,7 +20,7 @@ import java.util.Locale import org.kopi.galite.tests.desktop.runForm import org.kopi.galite.visual.domain.INT -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.Mode import org.kopi.galite.visual.dsl.form.DictionaryForm import org.kopi.galite.visual.dsl.form.Block diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TrainingR.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TrainingR.kt index 341c08b76..c93a91696 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TrainingR.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TrainingR.kt @@ -24,7 +24,7 @@ import org.kopi.galite.visual.domain.BOOL import org.kopi.galite.visual.domain.DECIMAL import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.dsl.report.FieldAlignment import org.kopi.galite.visual.dsl.report.Report diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormSample.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormSample.kt index 36a5259fe..b64e42aae 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormSample.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormSample.kt @@ -26,7 +26,7 @@ import org.kopi.galite.visual.domain.CodeDomain import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.ListDomain import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.Mode import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Access diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithList.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithList.kt index eb40671b8..c8ae8e8f4 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithList.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithList.kt @@ -27,7 +27,7 @@ import org.kopi.galite.visual.domain.BOOL import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.domain.TIMESTAMP -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.DictionaryForm import org.kopi.galite.visual.dsl.form.Block diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithListDomains.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithListDomains.kt index e19480b4d..cdc3e9532 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithListDomains.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithListDomains.kt @@ -30,7 +30,7 @@ import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.ListDomain import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.domain.TIMESTAMP -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.DictionaryForm import org.kopi.galite.visual.dsl.form.Form diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithNullableColumns.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithNullableColumns.kt index 412318017..6c84201f0 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithNullableColumns.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithNullableColumns.kt @@ -25,7 +25,7 @@ import org.jetbrains.exposed.sql.transactions.transaction import org.kopi.galite.tests.desktop.runForm import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.DictionaryForm import org.kopi.galite.visual.dsl.form.Block diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithReport.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithReport.kt index 3a4ee066b..1d8319bd3 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithReport.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithReport.kt @@ -20,7 +20,7 @@ import java.util.Locale import org.kopi.galite.tests.desktop.runForm import org.kopi.galite.tests.report.SimpleReport -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.dsl.form.ReportSelectionForm diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithSpecialTypes.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithSpecialTypes.kt index 766f1ac20..f39e13e12 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithSpecialTypes.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithSpecialTypes.kt @@ -33,7 +33,7 @@ import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.MONTH import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.domain.TIMESTAMP -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.Mode import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Form diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/localization/FormLocalizationTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/localization/FormLocalizationTests.kt index 3889bb1f9..663f17b89 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/localization/FormLocalizationTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/localization/FormLocalizationTests.kt @@ -32,7 +32,7 @@ import org.kopi.galite.tests.localization.actor.ExternActor import org.kopi.galite.tests.localization.block.ExternBlock import org.kopi.galite.tests.ui.vaadin.GaliteVUITestBase import org.kopi.galite.visual.domain.INT -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Block import org.kopi.galite.visual.dsl.form.Border import org.kopi.galite.visual.dsl.form.Key diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/localization/actor/ExternActor.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/localization/actor/ExternActor.kt index 3cef48ed1..ec123ebea 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/localization/actor/ExternActor.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/localization/actor/ExternActor.kt @@ -17,8 +17,8 @@ package org.kopi.galite.tests.localization.actor import org.kopi.galite.tests.localization.menu.ExternMenu -import org.kopi.galite.visual.dsl.common.Actor -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Actor +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Key class ExternActor: Actor( diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/report/ReportTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/report/ReportTests.kt index a8eb165b2..74975fac9 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/report/ReportTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/report/ReportTests.kt @@ -28,7 +28,7 @@ import org.kopi.galite.tests.ui.vaadin.VApplicationTestBase import org.kopi.galite.visual.domain.DECIMAL import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.dsl.report.FieldAlignment import org.kopi.galite.visual.dsl.report.Report diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/report/VReportTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/report/VReportTests.kt index 5203a985b..b8f68346e 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/report/VReportTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/report/VReportTests.kt @@ -32,6 +32,7 @@ import org.apache.poi.ss.usermodel.Row import org.apache.poi.xssf.usermodel.XSSFWorkbook import org.junit.Test import org.kopi.galite.tests.ui.swing.JApplicationTestBase +import org.kopi.galite.visual.Actor import org.kopi.galite.visual.base.Utils import org.kopi.galite.visual.domain.DECIMAL import org.kopi.galite.visual.domain.INT @@ -45,7 +46,6 @@ import org.kopi.galite.visual.report.VReport.Companion.TYP_CSV import org.kopi.galite.visual.report.VReport.Companion.TYP_XLS import org.kopi.galite.visual.report.VReport.Companion.TYP_XLSX import org.kopi.galite.visual.report.triggers.avgDecimal -import org.kopi.galite.visual.VActor /** * @@ -170,22 +170,17 @@ class VReportTests: JApplicationTestBase() { @Test fun reportVActorTest() { withReport(SimpleReport()) { - val f12 = VActor("File", - "org/kopi/galite/visual/Window", - "GotoShortcuts", - "org/kopi/galite/visual/Window", - null, - KeyEvent.VK_F12, - 0) - .also { - it.menuName = "File" - it.menuItem = "Shortcuts" - } + val f12 = Actor("File", + "org/kopi/galite/visual/Window", + "Shortcuts", + "org/kopi/galite/visual/Window", + null, + KeyEvent.VK_F12, + 0) // Actor checks assertEquals(f12, model.actors[0]) - assertEquals(f12, model.actors[0]) - assertEquals(-8, model.actors[0]!!.number) + assertEquals(-8, model.actors[0]._number) } } diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/field/FieldColorsTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/field/FieldColorsTests.kt index 8e34c1d75..21de4af60 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/field/FieldColorsTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/field/FieldColorsTests.kt @@ -35,7 +35,7 @@ import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.domain.TIME import org.kopi.galite.visual.domain.TIMESTAMP -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Block import org.kopi.galite.visual.dsl.form.Form diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/field/FieldsTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/field/FieldsTests.kt index 624629704..00a117d4b 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/field/FieldsTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/field/FieldsTests.kt @@ -48,7 +48,7 @@ import org.kopi.galite.visual.MessageCode import org.kopi.galite.testing.expectErrorNotification import org.kopi.galite.tests.examples.initData import org.kopi.galite.tests.examples.initModules -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.PredefinedCommand import com.github.mvysny.kaributesting.v10._expectNone diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/form/ActorTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/form/ActorTests.kt index 5cabaa174..af5186655 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/form/ActorTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/form/ActorTests.kt @@ -26,8 +26,8 @@ import org.kopi.galite.testing.getNavigationItem import org.kopi.galite.tests.examples.initDatabase import org.kopi.galite.tests.ui.vaadin.GaliteVUITestBase import org.kopi.galite.visual.domain.INT -import org.kopi.galite.visual.dsl.common.Actor -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Actor +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Block import org.kopi.galite.visual.dsl.form.Form diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/triggers/ChartTriggersTest.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/triggers/ChartTriggersTest.kt index d70e63535..317b199d6 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/triggers/ChartTriggersTest.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/triggers/ChartTriggersTest.kt @@ -23,7 +23,7 @@ import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.dsl.chart.Chart import org.kopi.galite.visual.dsl.form.Key -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon object ChartTriggersTest : Chart(locale = Locale.UK, title = "Chart to test triggers") { val action = menu("Action") diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/triggers/FormTriggersTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/triggers/FormTriggersTests.kt index be008561e..60920d92f 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/triggers/FormTriggersTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/triggers/FormTriggersTests.kt @@ -35,7 +35,7 @@ import org.kopi.galite.testing.findField import org.kopi.galite.testing.triggerCommand import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Access import org.kopi.galite.visual.dsl.form.Block import org.kopi.galite.visual.dsl.form.Key diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/triggers/ReportTriggersTest.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/triggers/ReportTriggersTest.kt index 96230d61e..f9f2acb7c 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/triggers/ReportTriggersTest.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/triggers/ReportTriggersTest.kt @@ -19,7 +19,7 @@ package org.kopi.galite.tests.ui.vaadin.triggers import java.util.Locale import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Icon +import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.dsl.report.Report From 4a824ef21a9e6306f587ec996a03cef4f83eaa2a Mon Sep 17 00:00:00 2001 From: hfazai Date: Wed, 11 May 2022 15:18:11 +0100 Subject: [PATCH 2/4] DSL/Galite 2.0.0: Migrate Command from DSL package to Visual --- .../kotlin/org/kopi/galite/visual/Actor.kt | 63 ++++++++++++------- .../galite/visual/{VCommand.kt => Command.kt} | 57 ++++++++++++++--- .../galite/visual/{dsl/common => }/Mode.kt | 2 +- .../org/kopi/galite/visual/VHelpGenerator.kt | 4 +- .../kotlin/org/kopi/galite/visual/VWindow.kt | 2 +- .../org/kopi/galite/visual/chart/VChart.kt | 18 +++--- .../kopi/galite/visual/chart/VChartCommand.kt | 4 +- .../galite/visual/chart/VHelpGenerator.kt | 4 +- .../galite/visual/cross/VFullCalendarForm.kt | 4 +- .../kopi/galite/visual/dsl/common/Command.kt | 54 ---------------- .../kopi/galite/visual/dsl/common/Window.kt | 2 + .../org/kopi/galite/visual/dsl/form/Block.kt | 6 +- .../kopi/galite/visual/dsl/form/FormField.kt | 4 +- .../galite/visual/dsl/report/ReportField.kt | 4 +- .../org/kopi/galite/visual/form/VBlock.kt | 6 +- .../kopi/galite/visual/form/VDocGenerator.kt | 24 +++---- .../org/kopi/galite/visual/form/VField.kt | 6 +- .../kopi/galite/visual/form/VFieldCommand.kt | 4 +- .../org/kopi/galite/visual/form/VFieldUI.kt | 26 ++++---- .../org/kopi/galite/visual/form/VForm.kt | 10 +-- .../visual/form/VFullCalendarCommand.kt | 4 +- .../kopi/galite/visual/form/VHelpGenerator.kt | 8 +-- .../galite/visual/report/VHelpGenerator.kt | 4 +- .../org/kopi/galite/visual/report/VReport.kt | 26 ++++---- .../galite/visual/report/VReportCommand.kt | 4 +- .../kopi/galite/demo/command/CommandForm.kt | 2 +- .../kopi/galite/demo/product/ProductForm.kt | 2 +- .../kopi/galite/demo/taxRule/TaxRuleForm.kt | 2 +- .../galite/tests/localizer/Initialization.kt | 2 +- .../kopi/galite/tests/dsl/CommonDSLTest.kt | 4 +- .../tests/examples/DocumentationBlockForm.kt | 2 +- .../tests/examples/DocumentationChart.kt | 2 +- .../tests/examples/DocumentationFieldsForm.kt | 2 +- .../tests/examples/DocumentationForm.kt | 2 +- .../galite/tests/examples/FormWithChart.kt | 2 +- .../examples/TestFieldsVisibilityForm.kt | 2 +- .../org/kopi/galite/tests/form/FormSample.kt | 2 +- .../kopi/galite/tests/form/FormSampleTests.kt | 2 +- .../galite/tests/form/FormWithSpecialTypes.kt | 2 +- .../org/kopi/galite/tests/form/VBlockTests.kt | 2 +- .../kopi/galite/tests/report/VReportTests.kt | 14 ++--- .../tests/ui/vaadin/block/SimpleBlockTests.kt | 2 +- 42 files changed, 204 insertions(+), 194 deletions(-) rename galite-core/src/main/kotlin/org/kopi/galite/visual/{VCommand.kt => Command.kt} (67%) rename galite-core/src/main/kotlin/org/kopi/galite/visual/{dsl/common => }/Mode.kt (96%) delete mode 100644 galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Command.kt diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/Actor.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/Actor.kt index 95e327482..fa7ca564e 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/Actor.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/Actor.kt @@ -91,19 +91,19 @@ open class Actor(val menu: Menu, * False if the actor is generated by galite and then it should be localized by * galite localization files such as "org/kopi/galite/visual/General" */ - constructor(menuIdent: String, - menuSource: String?, - actorIdent: String, - actorSource: String?, - iconName: String?, - acceleratorKey: Int, - acceleratorModifier: Int, - userActor: Boolean = false) - : this(Menu(menuIdent, menuIdent, menuSource), - actorIdent, - null, - actorIdent, - actorSource) { + internal constructor(menuIdent: String, + menuSource: String?, + actorIdent: String, + actorSource: String?, + iconName: String?, + acceleratorKey: Int, + acceleratorModifier: Int, + userActor: Boolean = false) + : this(Menu(menuIdent, menuIdent, menuSource), + actorIdent, + null, + actorIdent, + actorSource) { this.iconName = iconName this.acceleratorKey = acceleratorKey this.acceleratorModifier = acceleratorModifier @@ -221,14 +221,6 @@ open class Actor(val menu: Menu, return buffer.toString() } - val _actorSource @TestOnly get() = sourceFile - val _menuSource @TestOnly get() = menuSource - val _menuIdent @TestOnly get() = menuIdent - val _iconName @TestOnly get() = iconName - val _acceleratorKey @TestOnly get() = acceleratorKey - val _menuName @TestOnly get() = menuName - val _number @TestOnly get() = number - fun checkKey(key: Key?) { if (key == null) { acceleratorModifier = 0 @@ -245,6 +237,35 @@ open class Actor(val menu: Menu, fun genLocalization(writer: LocalizationWriter) { writer.genActorDefinition(ident, label, help) } + + // ---------------------------------------------------------------------- + // TO TEST INTERNAL PROPERTIES, DO NOT USE IN YOUR CODE + // ---------------------------------------------------------------------- + + val _actorSource @TestOnly get() = sourceFile + val _menuSource @TestOnly get() = menuSource + val _menuIdent @TestOnly get() = menuIdent + val _iconName @TestOnly get() = iconName + val _acceleratorKey @TestOnly get() = acceleratorKey + val _menuName @TestOnly get() = menuName + val _number @TestOnly get() = number + class _Actor @TestOnly + constructor(menuIdent: String, + menuSource: String?, + actorIdent: String, + actorSource: String?, + iconName: String?, + acceleratorKey: Int, + acceleratorModifier: Int, + userActor: Boolean = false) + :Actor(menuIdent, + menuSource, + actorIdent, + actorSource, + iconName, + acceleratorKey, + acceleratorModifier, + userActor) } enum class Icon(val iconName: String) { diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/VCommand.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/Command.kt similarity index 67% rename from galite-core/src/main/kotlin/org/kopi/galite/visual/VCommand.kt rename to galite-core/src/main/kotlin/org/kopi/galite/visual/Command.kt index e8147340e..c717b9aa4 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/VCommand.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/Command.kt @@ -15,25 +15,66 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - package org.kopi.galite.visual -open class VCommand(mode: Int, - protected var handler: ActionHandler?, - var actor: Actor?, - internal val trigger: Int, - val actorIdent: String, - internal val action: () -> Unit = {}) { +import org.kopi.galite.visual.form.VConstants + +/** + * This class represent a command, ie a link between an actor and + * an action + * + * @param item the item + */ +open class Command(val item: Actor?, + modes: Array, + protected var handler: ActionHandler?, + internal val action: () -> Unit) { // -------------------------------------------------------------------- // DATA MEMBERS // ---------------------------------------------------------------------- - var mode: Int = mode + var mode: Int = VConstants.MOD_ANY protected set private var killed = false + var actor: Actor? = item + internal var trigger: Int = -1 + var actorIdent: String = item?.ident.orEmpty() + + init { + if (modes.isNotEmpty()) { + setModes(*modes) + } + } + + internal constructor(mode: Int, + handler: ActionHandler?, + actor: Actor?, + trigger: Int, + actorIdent: String, + action: () -> Unit = {}) + : this(actor, + *arrayOf(), + handler = handler, + action = action + ) { + this.mode = mode + this.trigger = trigger + this.actorIdent = actorIdent + } + + /** + * Changes the access mode of the command + **/ + fun setModes(vararg access: Mode) { + mode = 0 + for (item in access) { + mode = mode or (1 shl item.value) + } + } + /** * Kill a command: this command will never been enabled again */ diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Mode.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/Mode.kt similarity index 96% rename from galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Mode.kt rename to galite-core/src/main/kotlin/org/kopi/galite/visual/Mode.kt index 90da32907..aa84d2ed6 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Mode.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/Mode.kt @@ -15,7 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.kopi.galite.visual.dsl.common +package org.kopi.galite.visual import org.kopi.galite.visual.form.VConstants diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/VHelpGenerator.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/VHelpGenerator.kt index caf3f5794..f1c4c1ff7 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/VHelpGenerator.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/VHelpGenerator.kt @@ -57,14 +57,14 @@ open class VHelpGenerator { /** * print commands */ - fun helpOnCommands(commands: Array?) { + fun helpOnCommands(commands: Array?) { helpOnCommands(commands!!.toList()) } /** * print commands */ - fun helpOnCommands(commands: List) { + fun helpOnCommands(commands: List) { if (commands.isNotEmpty()) { printer.println("") for (i in commands.indices) { diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/VWindow.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/VWindow.kt index 8f98d44f4..b98e9fe54 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/VWindow.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/VWindow.kt @@ -53,7 +53,7 @@ abstract class VWindow(var source: String? = null, val dBConnection: Connection? private val modelListener = EventListenerList() private var extraTitle: String? = null private var display: UWindow? = null - val commands = mutableListOf() // commands + val commands = mutableListOf() // commands val actors = mutableListOf() // Actors protected var windowTitle: String? = null var smallIcon: Image? = null diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/chart/VChart.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/chart/VChart.kt index f7b959013..1f5a235e6 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/chart/VChart.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/chart/VChart.kt @@ -42,7 +42,7 @@ import org.kopi.galite.visual.FileHandler import org.kopi.galite.visual.MessageCode import org.kopi.galite.visual.UIFactory import org.kopi.galite.visual.UWindow -import org.kopi.galite.visual.VCommand +import org.kopi.galite.visual.Command import org.kopi.galite.visual.VException import org.kopi.galite.visual.VExecFailedException import org.kopi.galite.visual.VHelpViewer @@ -90,11 +90,11 @@ abstract class VChart : VWindow(), CConstants, Printable { // -------------------------------------------------------------------- // DATA MEMBERS // -------------------------------------------------------------------- - private var cmdBarView: VCommand? = null - private var cmdColumnView: VCommand? = null - private var cmdLineView: VCommand? = null - private var cmdAreaView: VCommand? = null - private var cmdPieView: VCommand? = null + private var cmdBarView: Command? = null + private var cmdColumnView: Command? = null + private var cmdLineView: Command? = null + private var cmdAreaView: Command? = null + private var cmdPieView: Command? = null private var built = false private var pageTitle = "" var help: String? = null @@ -105,7 +105,7 @@ abstract class VChart : VWindow(), CConstants, Printable { val VKT_Dimension_Triggers = mutableListOf>() val VKT_Measure_Triggers = mutableListOf>() val VKT_Commands_Triggers = mutableListOf>() - private val activeCommands: ArrayList = ArrayList() + private val activeCommands: ArrayList = ArrayList() var printOptions: VPrintOptions = VPrintOptions() /** @@ -419,7 +419,7 @@ abstract class VChart : VWindow(), CConstants, Printable { /** * Enables/disables the actor. */ - fun setCommandEnabled(command: VCommand, index: Int, enable: Boolean) { + fun setCommandEnabled(command: Command, index: Int, enable: Boolean) { var enable = enable if (enable) { @@ -446,7 +446,7 @@ abstract class VChart : VWindow(), CConstants, Printable { /** * Enables/disables the actor. */ - fun setCommandEnabled(command: VCommand, enable: Boolean) { + fun setCommandEnabled(command: Command, enable: Boolean) { command.setEnabled(enable) if (enable) { activeCommands.add(command) diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/chart/VChartCommand.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/chart/VChartCommand.kt index 7034248d2..1321fa52e 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/chart/VChartCommand.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/chart/VChartCommand.kt @@ -22,11 +22,11 @@ import org.kopi.galite.visual.dsl.common.Trigger import org.kopi.galite.visual.Action import org.kopi.galite.visual.ActionHandler import org.kopi.galite.visual.Actor -import org.kopi.galite.visual.VCommand +import org.kopi.galite.visual.Command import org.kopi.galite.visual.VHelpGenerator class VChartCommand(private val chart: VChart, actor: Actor) - : VCommand(0xFFFF, null, actor, actor.number, actor.ident), ActionHandler { + : Command(0xFFFF, null, actor, actor.number, actor.ident), ActionHandler { override fun setEnabled(enabled: Boolean) { if (actor != null) { diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/chart/VHelpGenerator.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/chart/VHelpGenerator.kt index 82883726e..b99499b06 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/chart/VHelpGenerator.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/chart/VHelpGenerator.kt @@ -25,7 +25,7 @@ import java.io.OutputStreamWriter import java.io.PrintWriter import org.kopi.galite.visual.base.Utils -import org.kopi.galite.visual.VCommand +import org.kopi.galite.visual.Command import org.kopi.galite.visual.VHelpGenerator /** @@ -39,7 +39,7 @@ class VHelpGenerator : VHelpGenerator() { * prints a compilation unit */ fun helpOnChart(name: String, - commands: List?, + commands: List?, columns: Array, help: String?): String? { return try { diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/cross/VFullCalendarForm.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/cross/VFullCalendarForm.kt index a01186cb9..e469f3a2a 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/cross/VFullCalendarForm.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/cross/VFullCalendarForm.kt @@ -29,13 +29,13 @@ import org.kopi.galite.visual.form.VForm import org.kopi.galite.visual.form.VFullCalendarCommand import org.kopi.galite.visual.fullcalendar.VFullCalendarBlock import org.kopi.galite.visual.Actor -import org.kopi.galite.visual.VCommand +import org.kopi.galite.visual.Command import org.kopi.galite.visual.VException import org.kopi.galite.visual.WindowController abstract class VFullCalendarForm : VForm() { private var actorsDef = mutableListOf() - private var commandsDef = mutableListOf() + private var commandsDef = mutableListOf() companion object { const val QUIT_ICON = "quit" diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Command.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Command.kt deleted file mode 100644 index 51f33ea8a..000000000 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Command.kt +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2013-2022 kopiLeft Services SARL, Tunis TN - * Copyright (c) 1990-2022 kopiRight Managed Solutions GmbH, Wien AT - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -package org.kopi.galite.visual.dsl.common - -import org.kopi.galite.visual.form.VConstants -import org.kopi.galite.visual.ActionHandler -import org.kopi.galite.visual.Actor -import org.kopi.galite.visual.VCommand - -/** - * This class represent a command, ie a link between an actor and - * an action - * - * @param item the item - */ -class Command(val item: Actor, modes: Array, handler: ActionHandler, action: () -> Unit) - : VCommand(VConstants.MOD_ANY, - handler, - item, - -1, - item.ident, - action) { - - init { - if (modes.isNotEmpty()) { - setModes(*modes) - } - } - - /** - * Changes the access mode of the command - **/ - fun setModes(vararg access: Mode) { - mode = 0 - for (item in access) { - mode = mode or (1 shl item.value) - } - } -} diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Window.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Window.kt index 6877bc812..aa751f974 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Window.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/common/Window.kt @@ -23,7 +23,9 @@ import java.util.Locale import org.kopi.galite.visual.Action import org.kopi.galite.visual.Actor +import org.kopi.galite.visual.Command import org.kopi.galite.visual.DefaultActor +import org.kopi.galite.visual.Mode import org.kopi.galite.visual.VException import org.kopi.galite.visual.VWindow diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/Block.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/Block.kt index dd9540f89..901d6ec79 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/Block.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/Block.kt @@ -26,10 +26,8 @@ import org.kopi.galite.visual.domain.CodeDomain import org.kopi.galite.visual.domain.Domain import org.kopi.galite.visual.domain.ListDomain import org.kopi.galite.visual.dsl.common.Action -import org.kopi.galite.visual.dsl.common.Command import org.kopi.galite.visual.dsl.common.FormTrigger import org.kopi.galite.visual.dsl.common.LocalizationWriter -import org.kopi.galite.visual.dsl.common.Mode import org.kopi.galite.visual.dsl.common.Trigger import org.kopi.galite.visual.dsl.common.Window import org.kopi.galite.visual.dsl.common.LocalizableElement @@ -40,6 +38,8 @@ import org.kopi.galite.visual.form.VField import org.kopi.galite.visual.form.VForm import org.kopi.galite.util.base.InconsistencyException import org.kopi.galite.visual.Color +import org.kopi.galite.visual.Command +import org.kopi.galite.visual.Mode import org.kopi.galite.visual.VColor import org.kopi.galite.visual.VException @@ -375,7 +375,7 @@ open class Block(val title: String, * @param command the command. */ fun command(window: Window, command: Command) { - window.actors.add(command.item) + window.actors.add(command.item!!) command(item = command.item, action = command.action) } diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormField.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormField.kt index bb1fbff41..8760214a0 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormField.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormField.kt @@ -28,10 +28,8 @@ import org.kopi.galite.visual.domain.Domain import org.kopi.galite.visual.domain.ListDomain import org.kopi.galite.visual.dsl.common.Action import org.kopi.galite.visual.Actor -import org.kopi.galite.visual.dsl.common.Command import org.kopi.galite.visual.dsl.common.FormTrigger import org.kopi.galite.visual.dsl.common.LocalizationWriter -import org.kopi.galite.visual.dsl.common.Mode import org.kopi.galite.visual.dsl.common.Trigger import org.kopi.galite.visual.dsl.field.Field import org.kopi.galite.visual.form.VCodeField @@ -41,6 +39,8 @@ import org.kopi.galite.visual.form.VField import org.kopi.galite.visual.form.VIntegerField import org.kopi.galite.type.Image import org.kopi.galite.type.Type0 +import org.kopi.galite.visual.Command +import org.kopi.galite.visual.Mode import org.kopi.galite.visual.VColor import org.kopi.galite.visual.VException diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/report/ReportField.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/report/ReportField.kt index a51509ee5..ca5bd4699 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/report/ReportField.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/report/ReportField.kt @@ -30,7 +30,7 @@ import org.kopi.galite.visual.report.VCalculateColumn import org.kopi.galite.visual.report.VCellFormat import org.kopi.galite.visual.report.VDecimalColumn import org.kopi.galite.visual.report.VReportColumn -import org.kopi.galite.visual.VCommand +import org.kopi.galite.visual.Command /** * This class represents the definition of a report field. @@ -65,7 +65,7 @@ class ReportField(override val domain: Domain, var align: FieldAlignment = FieldAlignment.DEFAULT /** the commands accessible in this field */ - lateinit var commands: Array + lateinit var commands: Array /** the triggers executed by this field */ internal val triggers = mutableListOf() diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VBlock.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VBlock.kt index 998f89961..4797672f2 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VBlock.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VBlock.kt @@ -63,7 +63,7 @@ import org.kopi.galite.visual.Message import org.kopi.galite.visual.MessageCode import org.kopi.galite.visual.Actor import org.kopi.galite.visual.VColor -import org.kopi.galite.visual.VCommand +import org.kopi.galite.visual.Command import org.kopi.galite.visual.VDatabaseUtils import org.kopi.galite.visual.VException import org.kopi.galite.visual.VExecFailedException @@ -107,7 +107,7 @@ abstract class VBlock(var title: String, internal val access: IntArray = IntArray(3) { VConstants.ACS_MUSTFILL } // access flags for each mode internal var indices = mutableListOf() // error messages for violated indices internal var indicesIdents = mutableListOf() // error messages for violated indices - internal var commands = mutableListOf() // commands + internal var commands = mutableListOf() // commands internal var fieldID: VField? = null // commands open var actors: Array? = null // actors to send to form (move to block import) get(): Array? { @@ -181,7 +181,7 @@ abstract class VBlock(var title: String, return count } - val activeCommands = mutableListOf() // commands currently active + val activeCommands = mutableListOf() // commands currently active private var _currentRecord = 0 var currentRecord diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VDocGenerator.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VDocGenerator.kt index 7c6286de4..2e4719851 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VDocGenerator.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VDocGenerator.kt @@ -19,7 +19,7 @@ package org.kopi.galite.visual.form import java.awt.Event -import org.kopi.galite.visual.VCommand +import org.kopi.galite.visual.Command import org.kopi.galite.visual.VlibProperties /** @@ -35,7 +35,7 @@ class VDocGenerator(val latexPrinter: LatexPrintWriter) : VHelpGenerator() { * prints a compilation unit */ override fun helpOnForm(name: String, - commands: MutableList?, + commands: MutableList?, blocks: List?, title: String, help: String?, @@ -69,7 +69,7 @@ class VDocGenerator(val latexPrinter: LatexPrintWriter) : VHelpGenerator() { override fun helpOnBlock(formCode: String, title: String, help: String?, - commands: MutableList?, + commands: MutableList?, fields: List, alone: Boolean) { latexPrinter.println("\\subsection{$title}") @@ -98,7 +98,7 @@ class VDocGenerator(val latexPrinter: LatexPrintWriter) : VHelpGenerator() { var all = 0 sortCommands(commands) for (i in commands.indices) { - val command: VCommand = commands[i] + val command = commands[i] if (command.isActive(VConstants.MOD_QUERY) && command.isActive(VConstants.MOD_UPDATE) && command.isActive(VConstants.MOD_INSERT)) { @@ -113,7 +113,7 @@ class VDocGenerator(val latexPrinter: LatexPrintWriter) : VHelpGenerator() { latexPrinter.println("\\item{Funktionen}") latexPrinter.uncheckedPrintln("\\begin{description}") for (i in commands.indices) { - val command: VCommand = commands[i] + val command = commands[i] if (command.isActive(VConstants.MOD_QUERY) && command.isActive(VConstants.MOD_UPDATE) && command.isActive(VConstants.MOD_INSERT)) { @@ -126,7 +126,7 @@ class VDocGenerator(val latexPrinter: LatexPrintWriter) : VHelpGenerator() { latexPrinter.println("\\item{Funktionen - Suchmodus}") latexPrinter.uncheckedPrintln("\\begin{description}") for (i in commands.indices) { - val command: VCommand = commands[i] + val command = commands[i] if (command.isActive(VConstants.MOD_QUERY) && !(command.isActive(VConstants.MOD_QUERY) && command.isActive(VConstants.MOD_UPDATE) && @@ -140,7 +140,7 @@ class VDocGenerator(val latexPrinter: LatexPrintWriter) : VHelpGenerator() { latexPrinter.println("\\item{Funktionen - \u00C4nderungsmodus}") latexPrinter.uncheckedPrintln("\\begin{description}") for (i in commands.indices) { - val command: VCommand = commands[i] + val command = commands[i] if (command.isActive(VConstants.MOD_UPDATE) && !(command.isActive(VConstants.MOD_QUERY) && command.isActive(VConstants.MOD_UPDATE) && @@ -154,7 +154,7 @@ class VDocGenerator(val latexPrinter: LatexPrintWriter) : VHelpGenerator() { latexPrinter.println("\\item{Funktionen - Einf\u00FCgemodus}") latexPrinter.uncheckedPrintln("\\begin{description}") for (i in commands.indices) { - val command: VCommand = commands[i] + val command = commands[i] if (command.isActive(VConstants.MOD_INSERT) && !(command.isActive(VConstants.MOD_QUERY) && command.isActive(VConstants.MOD_UPDATE) && @@ -232,7 +232,7 @@ class VDocGenerator(val latexPrinter: LatexPrintWriter) : VHelpGenerator() { /** * printlns a compilation unit */ - override fun helpOnFieldCommand(commands: Array?) { + override fun helpOnFieldCommand(commands: Array?) { if (commands != null && commands.isNotEmpty()) { sortCommands(commands) latexPrinter.println() @@ -269,10 +269,10 @@ class VDocGenerator(val latexPrinter: LatexPrintWriter) : VHelpGenerator() { // ---------------------------------------------------------------------- // PRIVATE UTILITIES // ---------------------------------------------------------------------- - private fun sortCommands(cmds: Array) { // TODO!!!: remove this + private fun sortCommands(cmds: Array) { // TODO!!!: remove this sortCommands(cmds.toMutableList()) } - private fun sortCommands(cmds: MutableList) { + private fun sortCommands(cmds: MutableList) { var i = cmds.size while (--i >= 0) { for (j in 0 until i) { @@ -283,7 +283,7 @@ class VDocGenerator(val latexPrinter: LatexPrintWriter) : VHelpGenerator() { swap = true } if (swap) { - val tmp: VCommand = cmds[j] + val tmp = cmds[j] cmds[j] = cmds[j + 1] cmds[j + 1] = tmp } diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VField.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VField.kt index 62ad286b4..4ceeff7b7 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VField.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VField.kt @@ -70,7 +70,7 @@ import org.kopi.galite.visual.Action import org.kopi.galite.visual.MessageCode import org.kopi.galite.visual.Module import org.kopi.galite.visual.VColor -import org.kopi.galite.visual.VCommand +import org.kopi.galite.visual.Command import org.kopi.galite.visual.VException import org.kopi.galite.visual.VExecFailedException import org.kopi.galite.visual.VModel @@ -194,7 +194,7 @@ abstract class VField protected constructor(width: Int, height: Int) : VConstant var position: VPosition? = null private set - var command: Array? = null + var command: Array? = null private lateinit var foreground: Array // foreground colors for this field. @@ -237,7 +237,7 @@ abstract class VField protected constructor(width: Int, height: Int) : VConstant columns: Array?, indices: Int, priority: Int, - commands: Array?, + commands: Array?, pos: VPosition?, align: Int, alias: VField?) { diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VFieldCommand.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VFieldCommand.kt index 8bad97001..f788bd5df 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VFieldCommand.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VFieldCommand.kt @@ -23,12 +23,12 @@ import java.io.Serializable import org.kopi.galite.visual.dsl.common.Trigger import org.kopi.galite.visual.Action import org.kopi.galite.visual.ActionHandler -import org.kopi.galite.visual.VCommand +import org.kopi.galite.visual.Command import org.kopi.galite.visual.VHelpGenerator class VFieldCommand(private val form: VForm, type: Int) - : VCommand(0xFFFF, + : Command(0xFFFF, null, null, type, diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VFieldUI.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VFieldUI.kt index 83944a2ef..0461e069f 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VFieldUI.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VFieldUI.kt @@ -26,7 +26,7 @@ import org.kopi.galite.util.base.InconsistencyException import org.kopi.galite.visual.Action import org.kopi.galite.visual.ActionHandler import org.kopi.galite.visual.MessageCode -import org.kopi.galite.visual.VCommand +import org.kopi.galite.visual.Command import org.kopi.galite.visual.VException import org.kopi.galite.visual.VExecFailedException @@ -53,7 +53,7 @@ abstract class VFieldUI @JvmOverloads protected constructor(open val blockView: private var hasEditItem = false // VE //private boolean hasEditItem_S; // IT !!!! - private val commands: Array? // commands + private val commands: Array? // commands lateinit var displays: Array // the object displayed on screen private set val isDisplayInitialized get() = ::displays.isInitialized @@ -68,10 +68,10 @@ abstract class VFieldUI @JvmOverloads protected constructor(open val blockView: private var chartPos = 0 // dynamic data - private val activeCommands = arrayListOf() // commands currently actives - private var incrementCommand: VCommand? = null - private var decrementCommand: VCommand? = null - private var autofillCommand: VCommand? = null + private val activeCommands = arrayListOf() // commands currently actives + private var incrementCommand: Command? = null + private var decrementCommand: Command? = null + private var autofillCommand: Command? = null init { model.addFieldListener(fieldHandler) @@ -226,18 +226,18 @@ abstract class VFieldUI @JvmOverloads protected constructor(open val blockView: // for boolean fields, the auto fill command is not included for boolean field // when row controller does not allow it. if (model !is VBooleanField || includeBooleanAutofillCommand()) { - val command: VCommand = model.getForm().cmdAutofill + val command: Command = model.getForm().cmdAutofill activeCommands.add(command) command.setEnabled(true) } } if (hasNewItem) { - val command: VCommand = model.getForm().cmdNewItem + val command: Command = model.getForm().cmdNewItem activeCommands.add(command) command.setEnabled(true) } if (hasEditItem) { - val command: VCommand = model.getForm().cmdEditItem + val command: Command = model.getForm().cmdEditItem activeCommands.add(command) command.setEnabled(true) } @@ -271,8 +271,8 @@ abstract class VFieldUI @JvmOverloads protected constructor(open val blockView: } } - fun getAllCommands(): Array { - val cmds = mutableListOf() + fun getAllCommands(): Array { + val cmds = mutableListOf() var i = 0 while (commands != null && i < commands.size) { cmds.add(commands[i]) @@ -399,12 +399,12 @@ abstract class VFieldUI @JvmOverloads protected constructor(open val blockView: /** * @return the associated incrementCommand */ - fun getIncrementCommand(): VCommand? = incrementCommand + fun getIncrementCommand(): Command? = incrementCommand /** * @return the associated decrementCommand */ - fun getDecrementCommand(): VCommand? = decrementCommand + fun getDecrementCommand(): Command? = decrementCommand /** * Returns true if the UI controller should include the auto fill diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VForm.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VForm.kt index 57cf3563a..2d30dfa6e 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VForm.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VForm.kt @@ -36,7 +36,7 @@ import org.kopi.galite.visual.MessageCode import org.kopi.galite.visual.UIFactory import org.kopi.galite.visual.UWindow import org.kopi.galite.visual.Actor -import org.kopi.galite.visual.VCommand +import org.kopi.galite.visual.Command import org.kopi.galite.visual.VException import org.kopi.galite.visual.VExecFailedException import org.kopi.galite.visual.VHelpViewer @@ -71,10 +71,10 @@ abstract class VForm protected constructor(source: String? = null) : VWindow(sou // --------------------------------------------------------------------- // PREDEFINED COMMANDS // --------------------------------------------------------------------- - val cmdAutofill: VCommand = VFieldCommand(this, CMD_AUTOFILL) - val cmdEditItem_S: VCommand = VFieldCommand(this, CMD_EDITITEM_S) - val cmdEditItem: VCommand = VFieldCommand(this, CMD_EDITITEM) - val cmdNewItem: VCommand = VFieldCommand(this, CMD_NEWITEM) + val cmdAutofill: Command = VFieldCommand(this, CMD_AUTOFILL) + val cmdEditItem_S: Command = VFieldCommand(this, CMD_EDITITEM_S) + val cmdEditItem: Command = VFieldCommand(this, CMD_EDITITEM) + val cmdNewItem: Command = VFieldCommand(this, CMD_NEWITEM) companion object { const val CMD_NEWITEM = -2 diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VFullCalendarCommand.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VFullCalendarCommand.kt index 72c8d3f5f..921312c32 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VFullCalendarCommand.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VFullCalendarCommand.kt @@ -23,7 +23,7 @@ import org.kopi.galite.visual.dsl.common.Trigger import org.kopi.galite.visual.Action import org.kopi.galite.visual.ActionHandler import org.kopi.galite.visual.Actor -import org.kopi.galite.visual.VCommand +import org.kopi.galite.visual.Command import org.kopi.galite.visual.VHelpGenerator import org.kopi.galite.visual.VWindow @@ -31,7 +31,7 @@ class VFullCalendarCommand( val form: VFullCalendarForm, actor: Actor, mode: Int -) : VCommand(mode, null, actor, actor.number, actor.ident), ActionHandler { +) : Command(mode, null, actor, actor.number, actor.ident), ActionHandler { override fun setEnabled(enabled: Boolean) { if (actor != null) { diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VHelpGenerator.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VHelpGenerator.kt index fa7ec2dac..30946a128 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VHelpGenerator.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VHelpGenerator.kt @@ -26,7 +26,7 @@ import java.io.PrintWriter import java.io.Serializable import org.kopi.galite.visual.base.Utils -import org.kopi.galite.visual.VCommand +import org.kopi.galite.visual.Command import org.kopi.galite.visual.VHelpGenerator import org.kopi.galite.visual.VlibProperties @@ -39,7 +39,7 @@ open class VHelpGenerator : VHelpGenerator(), VConstants, Serializable { * prints a compilation unit */ open fun helpOnForm(name: String, - commands: MutableList?, + commands: MutableList?, blocks: List?, title: String, help: String?, @@ -108,7 +108,7 @@ open class VHelpGenerator : VHelpGenerator(), VConstants, Serializable { open fun helpOnBlock(formCode: String, title: String, help: String?, - commands: MutableList?, + commands: MutableList?, fields: List, alone: Boolean) { if (!alone) { @@ -197,7 +197,7 @@ open class VHelpGenerator : VHelpGenerator(), VConstants, Serializable { printer.println("") } - open fun helpOnFieldCommand(commands: Array?) { + open fun helpOnFieldCommand(commands: Array?) { commands?.let { helpOnCommands(it) } } } diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/report/VHelpGenerator.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/report/VHelpGenerator.kt index 146a7e8fd..47c260e3a 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/report/VHelpGenerator.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/report/VHelpGenerator.kt @@ -26,7 +26,7 @@ import java.io.OutputStreamWriter import java.io.PrintWriter import org.kopi.galite.visual.base.Utils -import org.kopi.galite.visual.VCommand +import org.kopi.galite.visual.Command import org.kopi.galite.visual.VHelpGenerator /** @@ -40,7 +40,7 @@ class VHelpGenerator : VHelpGenerator() { * prints a compilation unit */ fun helpOnReport(name: String, - commands: List, + commands: List, model: MReport, help: String?): String? { return try { diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/report/VReport.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/report/VReport.kt index b2a084008..3522bd65e 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/report/VReport.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/report/VReport.kt @@ -42,7 +42,7 @@ import org.kopi.galite.visual.FileHandler import org.kopi.galite.visual.Message import org.kopi.galite.visual.UIFactory import org.kopi.galite.visual.UWindow -import org.kopi.galite.visual.VCommand +import org.kopi.galite.visual.Command import org.kopi.galite.visual.VException import org.kopi.galite.visual.VHelpViewer import org.kopi.galite.visual.VRuntimeException @@ -77,14 +77,14 @@ abstract class VReport internal constructor() : VWindow(), Constants, VConstants // ---------------------------------------------------------------------- // DATA MEMBERS // ---------------------------------------------------------------------- - private var cmdFold: VCommand? = null - private var cmdUnfold: VCommand? = null - private var cmdSort: VCommand? = null - private var cmdOpenLine: VCommand? = null - private var cmdFoldColumn: VCommand? = null - private var cmdUnfoldColumn: VCommand? = null - private var cmdColumnInfo: VCommand? = null - private var cmdEditColumn: VCommand? = null + private var cmdFold: Command? = null + private var cmdUnfold: Command? = null + private var cmdSort: Command? = null + private var cmdOpenLine: Command? = null + private var cmdFoldColumn: Command? = null + private var cmdUnfoldColumn: Command? = null + private var cmdColumnInfo: Command? = null + private var cmdEditColumn: Command? = null val model: MReport = MReport() private var built = false private var pageTitle = "" @@ -92,7 +92,7 @@ abstract class VReport internal constructor() : VWindow(), Constants, VConstants var VKT_Report_Triggers = mutableListOf>(arrayOfNulls(Constants.TRG_TYPES.size)) var VKT_Fields_Triggers = mutableListOf>() var VKT_Commands_Triggers = mutableListOf>() - private val activeCommands = ArrayList() + private val activeCommands = ArrayList() var printOptions: PConfig = PConfig() // The print options var media: String? = null // The media for this document var help: String? = null @@ -206,7 +206,7 @@ abstract class VReport internal constructor() : VWindow(), Constants, VConstants /** * Enables/disables the actor. */ - fun setCommandEnabled(command: VCommand, index: Int, enable: Boolean) { + fun setCommandEnabled(command: Command, index: Int, enable: Boolean) { @Suppress("NAME_SHADOWING") var enable = enable @@ -234,7 +234,7 @@ abstract class VReport internal constructor() : VWindow(), Constants, VConstants /** * Enables/disables the actor. */ - fun setCommandEnabled(command: VCommand, enable: Boolean) { + fun setCommandEnabled(command: Command, enable: Boolean) { command.setEnabled(enable) if (enable) { @@ -638,7 +638,7 @@ abstract class VReport internal constructor() : VWindow(), Constants, VConstants private fun initDefaultCommands() { actors.forEachIndexed { index, vActor -> - commands.add(VCommand(VConstants.MOD_ANY, this, vActor, index, vActor.ident)) + commands.add(Command(VConstants.MOD_ANY, this, vActor, index, vActor.ident)) } } diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/report/VReportCommand.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/report/VReportCommand.kt index 19c7e25b1..a86a6e772 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/report/VReportCommand.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/report/VReportCommand.kt @@ -25,13 +25,13 @@ import org.kopi.galite.visual.Action import org.kopi.galite.visual.ActionHandler import org.kopi.galite.visual.PrinterManager import org.kopi.galite.visual.Actor -import org.kopi.galite.visual.VCommand +import org.kopi.galite.visual.Command import org.kopi.galite.visual.VHelpGenerator class VReportCommand( val report: VReport, actor: Actor -) : VCommand(0xFFFF, null, actor, actor.number, actor.ident), ActionHandler { +) : Command(0xFFFF, null, actor, actor.number, actor.ident), ActionHandler { override fun setEnabled(enabled: Boolean) { if (actor != null) { diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/command/CommandForm.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/command/CommandForm.kt index 11efd0cd5..94b7e2cc6 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/command/CommandForm.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/command/CommandForm.kt @@ -25,7 +25,7 @@ import org.kopi.galite.demo.desktop.runForm import org.kopi.galite.visual.domain.CodeDomain import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.Icon -import org.kopi.galite.visual.dsl.common.Mode +import org.kopi.galite.visual.Mode import org.kopi.galite.visual.dsl.form.Access import org.kopi.galite.visual.dsl.form.Block import org.kopi.galite.visual.dsl.form.Key diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/product/ProductForm.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/product/ProductForm.kt index 8c3048ee8..5787b5b68 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/product/ProductForm.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/product/ProductForm.kt @@ -26,7 +26,7 @@ import org.kopi.galite.visual.domain.DECIMAL import org.kopi.galite.visual.domain.IMAGE import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.common.Mode +import org.kopi.galite.visual.Mode import org.kopi.galite.visual.dsl.form.Access import org.kopi.galite.visual.dsl.form.Block diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/taxRule/TaxRuleForm.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/taxRule/TaxRuleForm.kt index 215652676..137a21c6f 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/taxRule/TaxRuleForm.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/taxRule/TaxRuleForm.kt @@ -26,7 +26,7 @@ import org.kopi.galite.visual.domain.Fixed import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.Icon -import org.kopi.galite.visual.dsl.common.Mode +import org.kopi.galite.visual.Mode import org.kopi.galite.visual.dsl.form.Access import org.kopi.galite.visual.dsl.form.Block import org.kopi.galite.visual.dsl.form.Key diff --git a/galite-localizer/src/test/kotlin/org/kopi/galite/tests/localizer/Initialization.kt b/galite-localizer/src/test/kotlin/org/kopi/galite/tests/localizer/Initialization.kt index 61181f067..59b2ec3c6 100644 --- a/galite-localizer/src/test/kotlin/org/kopi/galite/tests/localizer/Initialization.kt +++ b/galite-localizer/src/test/kotlin/org/kopi/galite/tests/localizer/Initialization.kt @@ -31,7 +31,7 @@ import org.kopi.galite.database.list_Of_Tables import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.Icon -import org.kopi.galite.visual.dsl.common.Mode +import org.kopi.galite.visual.Mode import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Access import org.kopi.galite.visual.dsl.form.FieldOption diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/CommonDSLTest.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/CommonDSLTest.kt index 887cc95ca..1b31e3afa 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/CommonDSLTest.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/CommonDSLTest.kt @@ -26,16 +26,16 @@ import org.kopi.galite.tests.examples.Training import org.kopi.galite.tests.ui.vaadin.VApplicationTestBase import org.kopi.galite.visual.domain.ListDomain import org.kopi.galite.visual.Actor -import org.kopi.galite.visual.dsl.common.Command import org.kopi.galite.visual.dsl.common.FieldList import org.kopi.galite.visual.dsl.common.ListDescription import org.kopi.galite.visual.dsl.common.Menu -import org.kopi.galite.visual.dsl.common.Mode import org.kopi.galite.visual.dsl.common.Trigger import org.kopi.galite.visual.form.VConstants.Companion.MOD_ANY import org.kopi.galite.visual.list.VList import org.kopi.galite.visual.Action import org.kopi.galite.visual.ActionHandler +import org.kopi.galite.visual.Command +import org.kopi.galite.visual.Mode class CommonDSLTests : VApplicationTestBase() { diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationBlockForm.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationBlockForm.kt index 38278391d..e02c4c406 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationBlockForm.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationBlockForm.kt @@ -22,7 +22,7 @@ import org.kopi.galite.tests.desktop.runForm import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.Icon -import org.kopi.galite.visual.dsl.common.Mode +import org.kopi.galite.visual.Mode import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Access import org.kopi.galite.visual.dsl.form.BlockOption diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationChart.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationChart.kt index 8b67dcc09..d58de3440 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationChart.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationChart.kt @@ -21,7 +21,7 @@ import java.util.Locale import org.kopi.galite.tests.desktop.runForm import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.Icon -import org.kopi.galite.visual.dsl.common.Mode +import org.kopi.galite.visual.Mode import org.kopi.galite.visual.dsl.form.Form import org.kopi.galite.visual.dsl.form.Block import org.kopi.galite.visual.dsl.form.Key diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationFieldsForm.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationFieldsForm.kt index d1ce39ad3..c2588067f 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationFieldsForm.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationFieldsForm.kt @@ -32,7 +32,7 @@ import org.kopi.galite.visual.domain.ListDomain import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.domain.TEXT import org.kopi.galite.visual.Icon -import org.kopi.galite.visual.dsl.common.Mode +import org.kopi.galite.visual.Mode import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Access import org.kopi.galite.visual.dsl.form.Border diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationForm.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationForm.kt index 1f27bb11e..9b639f723 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationForm.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationForm.kt @@ -26,7 +26,7 @@ import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.ListDomain import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.Icon -import org.kopi.galite.visual.dsl.common.Mode +import org.kopi.galite.visual.Mode import org.kopi.galite.visual.dsl.form.Border import org.kopi.galite.visual.dsl.form.DictionaryForm import org.kopi.galite.visual.dsl.form.Block diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/FormWithChart.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/FormWithChart.kt index 729db12c4..965510ec9 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/FormWithChart.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/FormWithChart.kt @@ -26,7 +26,7 @@ import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.dsl.chart.Chart import org.kopi.galite.visual.Icon -import org.kopi.galite.visual.dsl.common.Mode +import org.kopi.galite.visual.Mode import org.kopi.galite.visual.dsl.form.Form import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.VColor diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TestFieldsVisibilityForm.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TestFieldsVisibilityForm.kt index 162345a22..31edaddbd 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TestFieldsVisibilityForm.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TestFieldsVisibilityForm.kt @@ -21,7 +21,7 @@ import java.util.Locale import org.kopi.galite.tests.desktop.runForm import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.Icon -import org.kopi.galite.visual.dsl.common.Mode +import org.kopi.galite.visual.Mode import org.kopi.galite.visual.dsl.form.DictionaryForm import org.kopi.galite.visual.dsl.form.Block diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormSample.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormSample.kt index b64e42aae..ff233314b 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormSample.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormSample.kt @@ -27,7 +27,7 @@ import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.ListDomain import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.Icon -import org.kopi.galite.visual.dsl.common.Mode +import org.kopi.galite.visual.Mode import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Access import org.kopi.galite.visual.dsl.form.BlockOption diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormSampleTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormSampleTests.kt index 371365558..f11094dc6 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormSampleTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormSampleTests.kt @@ -24,7 +24,7 @@ import kotlin.test.assertTrue import org.junit.Assert.assertArrayEquals import org.junit.Test import org.kopi.galite.tests.ui.swing.JApplicationTestBase -import org.kopi.galite.visual.dsl.common.Mode +import org.kopi.galite.visual.Mode import org.kopi.galite.visual.form.VConstants import org.kopi.galite.visual.form.VForm diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithSpecialTypes.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithSpecialTypes.kt index f39e13e12..3da3c3165 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithSpecialTypes.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithSpecialTypes.kt @@ -34,7 +34,7 @@ import org.kopi.galite.visual.domain.MONTH import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.domain.TIMESTAMP import org.kopi.galite.visual.Icon -import org.kopi.galite.visual.dsl.common.Mode +import org.kopi.galite.visual.Mode import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Form import org.kopi.galite.visual.dsl.form.Block diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/VBlockTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/VBlockTests.kt index e77042bf7..62178201d 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/VBlockTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/VBlockTests.kt @@ -41,7 +41,7 @@ import org.kopi.galite.tests.examples.centerSequence import org.kopi.galite.tests.examples.initModules import org.kopi.galite.tests.ui.vaadin.VApplicationTestBase import org.kopi.galite.database.Users -import org.kopi.galite.visual.dsl.common.Mode +import org.kopi.galite.visual.Mode import org.kopi.galite.visual.form.VConstants import org.kopi.galite.visual.form.VQueryNoRowException import org.kopi.galite.visual.form.VSkipRecordException diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/report/VReportTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/report/VReportTests.kt index b8f68346e..600a29c12 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/report/VReportTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/report/VReportTests.kt @@ -170,13 +170,13 @@ class VReportTests: JApplicationTestBase() { @Test fun reportVActorTest() { withReport(SimpleReport()) { - val f12 = Actor("File", - "org/kopi/galite/visual/Window", - "Shortcuts", - "org/kopi/galite/visual/Window", - null, - KeyEvent.VK_F12, - 0) + val f12 = Actor._Actor("File", + "org/kopi/galite/visual/Window", + "Shortcuts", + "org/kopi/galite/visual/Window", + null, + KeyEvent.VK_F12, + 0) // Actor checks assertEquals(f12, model.actors[0]) diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/block/SimpleBlockTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/block/SimpleBlockTests.kt index cee16d703..70d2518e3 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/block/SimpleBlockTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/block/SimpleBlockTests.kt @@ -39,7 +39,7 @@ import org.kopi.galite.tests.examples.FormExample import org.kopi.galite.tests.examples.TestFieldsVisibilityForm import org.kopi.galite.tests.examples.initModules import org.kopi.galite.tests.ui.vaadin.GaliteVUITestBase -import org.kopi.galite.visual.dsl.common.Mode +import org.kopi.galite.visual.Mode import org.kopi.galite.visual.form.VConstants import org.kopi.galite.type.Month import org.kopi.galite.type.Week From 69480c57f6e77dbb2dbbc7fcc3bf92a227834497 Mon Sep 17 00:00:00 2001 From: hfazai Date: Sun, 15 May 2022 13:54:55 +0100 Subject: [PATCH 3/4] DSL: remove block model --- .../kopi/vkopi/lib/ui/swing/form/DBlock.java | 4 +- .../galite/visual/cross/VDynamicReport.kt | 4 +- .../kopi/galite/visual/dsl/form/BlockModel.kt | 105 +-- .../galite/visual/dsl/form/DictionaryForm.kt | 5 +- .../org/kopi/galite/visual/dsl/form/Form.kt | 8 +- .../galite/visual/dsl/form/FormBlockAlign.kt | 34 - .../galite/visual/dsl/form/FormBlockIndex.kt | 2 +- .../galite/visual/dsl/form/FormBlockTable.kt | 28 - .../kopi/galite/visual/dsl/form/FormField.kt | 15 +- .../visual/dsl/form/FormLocalizationWriter.kt | 1 + .../galite/visual/dsl/form/FullCalendar.kt | 73 ++- .../visual/dsl/form/ReportSelectionForm.kt | 3 +- .../galite/visual/{dsl => }/form/Block.kt | 596 ++---------------- .../org/kopi/galite/visual/form/VBlock.kt | 289 +++++---- .../visual/form/VBlockDefaultOuterJoin.kt | 2 +- .../galite/visual/form/VDictionaryForm.kt | 4 +- .../visual/fullcalendar/VFullCalendarBlock.kt | 50 +- .../vaadin/calendar/DAbstractFullCalendar.kt | 2 +- .../galite/visual/ui/vaadin/form/DBlock.kt | 2 +- .../visual/ui/vaadin/form/DGridBlock.kt | 4 +- .../kopi/galite/visual/ui/vaadin/form/Form.kt | 2 +- .../kopi/galite/visual/util/ReflectTool.kt | 2 +- .../org/kopi/galite/demo/bill/BillForm.kt | 2 +- .../demo/billproduct/BillProductForm.kt | 2 +- .../org/kopi/galite/demo/client/ClientForm.kt | 2 +- .../kopi/galite/demo/command/CommandForm.kt | 2 +- .../kopi/galite/demo/common/FormDefault.kt | 2 +- .../kopi/galite/demo/product/ProductForm.kt | 2 +- .../kopi/galite/demo/provider/ProviderForm.kt | 2 +- .../org/kopi/galite/demo/stock/StockForm.kt | 2 +- .../kopi/galite/demo/taxRule/TaxRuleForm.kt | 2 +- .../galite/tests/localizer/Initialization.kt | 2 +- .../kotlin/org/kopi/galite/testing/Block.kt | 6 +- .../kotlin/org/kopi/galite/testing/Field.kt | 8 +- .../galite/tests/domain/CodeDomainTests.kt | 4 +- .../kopi/galite/tests/domain/DomainTests.kt | 2 +- .../org/kopi/galite/tests/dsl/FormDSLTests.kt | 30 +- .../galite/tests/dsl/WindowElementSources.kt | 6 +- .../org/kopi/galite/tests/examples/Common.kt | 2 +- .../tests/examples/DocumentationBlockForm.kt | 8 +- .../tests/examples/DocumentationChart.kt | 2 +- .../tests/examples/DocumentationFieldsForm.kt | 8 +- .../tests/examples/DocumentationForm.kt | 2 +- .../tests/examples/DocumentationReport.kt | 2 +- .../examples/DocumentationReportTriggers.kt | 2 +- .../kopi/galite/tests/examples/FormExample.kt | 2 +- .../examples/FormToTestSaveMultipleBlock.kt | 7 +- .../galite/tests/examples/ManyPagesForm.kt | 2 +- .../tests/examples/MultipleBlockForm.kt | 2 +- .../kopi/galite/tests/examples/SimpleForm.kt | 2 +- .../galite/tests/examples/TestFieldsForm.kt | 2 +- .../examples/TestFieldsVisibilityForm.kt | 2 +- .../org/kopi/galite/tests/form/FormSample.kt | 4 +- .../kopi/galite/tests/form/FormSampleTests.kt | 16 +- .../tests/form/FormToCheckFieldVisibility.kt | 2 +- .../galite/tests/form/FormWithAlignedBlock.kt | 2 +- .../FormWithAlignedBlockWithMultiplePages.kt | 2 +- .../galite/tests/form/FormWithBlockTrigger.kt | 2 +- .../galite/tests/form/FormWithCodeDomains.kt | 2 +- .../kopi/galite/tests/form/FormWithFields.kt | 2 +- .../kopi/galite/tests/form/FormWithList.kt | 2 +- .../galite/tests/form/FormWithListDomains.kt | 2 +- .../tests/form/FormWithMultipleBlock.kt | 2 +- .../tests/form/FormWithMultipleBlockTests.kt | 2 +- .../tests/form/FormWithNullableColumnTest.kt | 56 +- .../tests/form/FormWithNullableColumns.kt | 2 +- .../galite/tests/form/FormWithSpecialTypes.kt | 2 +- .../tests/form/VBlockDefaultOuterJoinTests.kt | 4 +- .../org/kopi/galite/tests/form/VBlockTests.kt | 166 ++--- .../org/kopi/galite/tests/form/VFieldTests.kt | 22 +- .../localization/FormLocalizationTests.kt | 2 +- .../tests/localization/block/ExternBlock.kt | 2 +- .../field/DocumentationFieldsFormTests.kt | 2 +- .../tests/ui/vaadin/field/FieldColorsTests.kt | 2 +- .../tests/ui/vaadin/field/FieldsTests.kt | 2 +- .../galite/tests/ui/vaadin/form/ActorTests.kt | 2 +- .../ui/vaadin/form/MultipleBlockFormTests.kt | 2 +- .../ui/vaadin/triggers/FormTriggersTests.kt | 2 +- .../tests/ui/vaadin/triggers/TriggersTests.kt | 4 +- 79 files changed, 566 insertions(+), 1102 deletions(-) delete mode 100644 galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormBlockAlign.kt delete mode 100644 galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormBlockTable.kt rename galite-core/src/main/kotlin/org/kopi/galite/visual/{dsl => }/form/Block.kt (59%) diff --git a/galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/form/DBlock.java b/galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/form/DBlock.java index 5bc8a804d..ba916a9d5 100644 --- a/galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/form/DBlock.java +++ b/galite-core/src/main/java/org/kopi/vkopi/lib/ui/swing/form/DBlock.java @@ -59,7 +59,7 @@ public class DBlock extends JPanel implements UBlock { public DBlock(DForm parent, VBlock model) { SwingThreadHandler.verifyRunsInEventThread("DBlock "); - setBorder(model.getBorder(), model.getTitle()); + setBorder(model.getBorder().getValue(), model.getTitle()); setBorder(border); setFocusCycleRoot(true); setFocusable(false); @@ -89,7 +89,7 @@ public DBlock(DForm parent, VBlock model) { } protected void createFields() { - List fields = model.getFields(); + List fields = model.getBlockFields(); columnViews = new VFieldUI[fields.size()]; for (int i = 0; i < fields.size(); i++) { diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/cross/VDynamicReport.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/cross/VDynamicReport.kt index 224ccf146..b3fe2c7ab 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/cross/VDynamicReport.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/cross/VDynamicReport.kt @@ -83,7 +83,7 @@ class VDynamicReport(block: VBlock) : VReport() { init { printOptions = PConfig() this.block = block - fields = initFields(block.fields) + fields = initFields(block.blockFields) columns = arrayOfNulls(fields.size) idColumn = -1 setPageTitle(block.title) @@ -489,7 +489,7 @@ class VDynamicReport(block: VBlock) : VReport() { * return the report column group for the given table. */ private fun getColumnGroups(table: Table): Int { - val fields = block.fields + val fields = block.blockFields for (i in fields.indices) { if (fields[i].isInternal() && fields[i].getColumnCount() > 1) { val col: Int = fields[i].fetchColumn(table) diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/BlockModel.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/BlockModel.kt index 0ce13eae9..9a8abdbec 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/BlockModel.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/BlockModel.kt @@ -16,18 +16,14 @@ */ package org.kopi.galite.visual.dsl.form -import java.util.Locale - -import org.kopi.galite.visual.cross.VFullCalendarForm import org.kopi.galite.visual.form.VBlock import org.kopi.galite.visual.form.VForm -import org.kopi.galite.visual.fullcalendar.VFullCalendarBlock -import org.kopi.galite.visual.DefaultActor +import org.kopi.galite.visual.form.Block class BlockModel(vForm: VForm, val block: Block, formSource: String? = null) - : VBlock(block.block.title, - block.block.bufferSize, - block.block.displaySize, + : VBlock(block.title, + block.bufferSize, + block.displaySize, vForm) { init { @@ -42,81 +38,32 @@ class BlockModel(vForm: VForm, val block: Block, formSource: String? = null) } fun VBlock.initializeBlock(block: Block, formSource: String?) { - val model = block.block this.source = if (block::class.isInner && formSource != null) formSource else block.sourceFile - help = model.help - pageNumber = model.pageNumber - border = model.border - maxRowPos = model.maxRowPos - maxColumnPos = model.maxColumnPos - displayedFields = model.displayedFields - name = model.name - options = model.options - model.access.copyInto(access) - alignment = block.align?.getBlockAlignModel() - dropListMap = model.dropListMap - - fields = block.fields.map { formField -> + help = block.help + pageNumber = block.pageNumber + border = block.border + maxRowPos = block.maxRowPos + maxColumnPos = block.maxColumnPos + displayedFields = block.displayedFields + options = block.options + name = block.name + block.access.copyInto(access) + alignment = block.alignment + dropListMap = block.dropListMap + + blockFields = block.fields.map { formField -> formField.vField }.toMutableList() // Initialize from model - VKT_Block_Triggers = model.VKT_Block_Triggers - VKT_Field_Triggers = model.VKT_Field_Triggers - VKT_Command_Triggers = model.VKT_Command_Triggers - VKT_Field_Command_Triggers = model.VKT_Field_Command_Triggers - commands = model.commands - tables = model.tables - fields = model.fields - indices = model.indices - indicesIdents = model.indicesIdents -} - -class FullCalendarBlockModel(val block: FullCalendar): VFullCalendarBlock(block.title, block.buffer, block.visible) { - - override fun setInfo(form: VForm) { - block.fields.forEach { - it.setInfo(super.source) - } - } - - fun buildFullCalendarForm() { - fullCalendarForm = object : VFullCalendarForm() { - - init { - init() - initDefaultActors() - initDefaultCommands() - } - - override val locale: Locale? - get() = this@FullCalendarBlockModel.block.form.locale - override val fullCalendarBlock: VFullCalendarBlock - get() = this@FullCalendarBlockModel - - fun init() { - val vSimpleBlock = BlockModel(this, this@FullCalendarBlockModel.block, source) - - vSimpleBlock.setInfo(pageNumber, this) - vSimpleBlock.initIntern() - - val defaultActors = form.actors.filter { actor -> - actor is DefaultActor && - (actor.code == CMD_AUTOFILL - || actor.code == CMD_EDITITEM - || actor.code == CMD_EDITITEM_S - || actor.code == CMD_NEWITEM) - - }.toTypedArray() - addActors(defaultActors) - - addBlock(vSimpleBlock) - source = vSimpleBlock.source - setTitle(vSimpleBlock.title) - } - - override fun formClassName(): String = block.javaClass.name - } - } + VKT_Block_Triggers = block.VKT_Block_Triggers + VKT_Field_Triggers = block.VKT_Field_Triggers + VKT_Command_Triggers = block.VKT_Command_Triggers + VKT_Field_Command_Triggers = block.VKT_Field_Command_Triggers + commands = block.commands + tables = block.tables + blockFields = block.blockFields + indices = block.indices + indicesIdents = block.indicesIdents } diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/DictionaryForm.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/DictionaryForm.kt index bcb48ca02..fbc712794 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/DictionaryForm.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/DictionaryForm.kt @@ -22,6 +22,7 @@ import org.kopi.galite.visual.cross.VDynamicReport import org.kopi.galite.visual.form.VDictionaryForm import org.kopi.galite.visual.ApplicationContext import org.kopi.galite.visual.VException +import org.kopi.galite.visual.form.Block /** * Represents a dictionary form. @@ -109,9 +110,9 @@ abstract class DictionaryForm(title: String, locale: Locale? = null) : Form(titl * create a report for this form */ protected fun Block.createDynamicReport() { - val field = this.block.activeField + val field = this.activeField field?.validate() - VDynamicReport.createDynamicReport(this.block) + VDynamicReport.createDynamicReport(this) } // ---------------------------------------------------------------------- diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/Form.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/Form.kt index 27e7401ff..8312a679b 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/Form.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/Form.kt @@ -27,13 +27,13 @@ import org.kopi.galite.visual.dsl.common.Trigger import org.kopi.galite.visual.dsl.common.Window import org.kopi.galite.visual.dsl.common.LocalizableElement import org.kopi.galite.visual.form.Commands -import org.kopi.galite.visual.form.VBlock import org.kopi.galite.visual.form.VConstants import org.kopi.galite.visual.form.VForm import org.kopi.galite.visual.fullcalendar.VFullCalendarBlock import org.kopi.galite.visual.ApplicationContext import org.kopi.galite.visual.VException import org.kopi.galite.visual.WindowController +import org.kopi.galite.visual.form.Block /** * Represents a form. @@ -97,13 +97,13 @@ abstract class Form(title: String, locale: Locale? = null) : Window(title, local block.init() } if (formPage != null) { - block.block.pageNumber = formPage.pageNumber + block.pageNumber = formPage.pageNumber } block.initialize(this) blocks.add(block) val vBlock = block.getBlockModel(model) - vBlock.setInfo(block.block.pageNumber, model) + vBlock.setInfo(block.pageNumber, model) if(vBlock !is VFullCalendarBlock) { vBlock.initIntern() } @@ -219,7 +219,7 @@ abstract class Form(title: String, locale: Locale? = null) : Window(title, local * @exception org.kopi.galite.visual.VException an exception may be raised by field.leave */ fun gotoBlock(target: Block) { - model.gotoBlock(target.block) + model.gotoBlock(target) } fun showChart(chart: Chart) { diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormBlockAlign.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormBlockAlign.kt deleted file mode 100644 index 36bfc7ce5..000000000 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormBlockAlign.kt +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2013-2022 kopiLeft Services SARL, Tunis TN - * Copyright (c) 1990-2022 kopiRight Managed Solutions GmbH, Wien AT - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -package org.kopi.galite.visual.dsl.form - -import java.util.ArrayList - -import org.kopi.galite.visual.form.BlockAlignment - -/** - * This class describe the alignment of multi blocks - * - * @param targetBlock block alignment - * @param targets the target column list - */ -class FormBlockAlign(private val targetBlock: Block, - private val targets: ArrayList) { - - fun getBlockAlignModel() = BlockAlignment(targetBlock.block, targets.toIntArray()) -} diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormBlockIndex.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormBlockIndex.kt index 271a08f4b..1160f1c7f 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormBlockIndex.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormBlockIndex.kt @@ -26,7 +26,7 @@ import org.kopi.galite.visual.dsl.common.LocalizationWriter * @param message the error message in the default locale * @param number the number of this index */ -class FormBlockIndex(val ident: String, val message: String, private val number: Int) { +class FormBlockIndex(val ident: String, var message: String, private val number: Int) { /** * Represents a combination of a list of [FormBlockIndex]. diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormBlockTable.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormBlockTable.kt deleted file mode 100644 index e770bbb4f..000000000 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormBlockTable.kt +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2013-2022 kopiLeft Services SARL, Tunis TN - * Copyright (c) 1990-2022 kopiRight Managed Solutions GmbH, Wien AT - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -package org.kopi.galite.visual.dsl.form - -import org.jetbrains.exposed.sql.Table - -/** - * A block table information - * - * @param name the name of the table - * @param corr the shortcut - */ -class FormBlockTable(val name: String, val corr: String, val table: Table) diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormField.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormField.kt index 8760214a0..e565b6bb3 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormField.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormField.kt @@ -43,6 +43,7 @@ import org.kopi.galite.visual.Command import org.kopi.galite.visual.Mode import org.kopi.galite.visual.VColor import org.kopi.galite.visual.VException +import org.kopi.galite.visual.form.Block /** * This class represents a form field. It represents an editable element of a block @@ -155,13 +156,13 @@ open class FormField(internal val block: Block, * @param action the action function. */ fun command(item: Actor, vararg modes: Mode, action: () -> Unit): Command { - val command = Command(item, modes, block.block, action = action) + val command = Command(item, modes, block, action = action) commands.add(command) // FIELDS COMMANDS TRIGGERS // TODO : Add field commands triggers here - block.block.VKT_Field_Command_Triggers.add(arrayOfNulls(VConstants.TRG_TYPES.size)) + block.VKT_Field_Command_Triggers.add(arrayOfNulls(VConstants.TRG_TYPES.size)) return command } @@ -447,7 +448,7 @@ open class FormField(internal val block: Block, it.toolTip = help } if (isID) { - block.block.fieldID = model + block.fieldID = model } model @@ -518,14 +519,14 @@ open class FormField(internal val block: Block, /** * return table num */ - fun getTable(name: Table): FormBlockTable { + fun getTable(name: Table): Table { return block.getTable(name) } /** * return table num */ - fun getTableNum(table: FormBlockTable): Int { + fun getTableNum(table: Table): Int { return block.getTableNum(table) } @@ -690,11 +691,11 @@ open class FormField(internal val block: Block, return options and option == option } - fun fetchColumn(table: FormBlockTable): Int { + fun fetchColumn(table: Table): Int { if (columns != null) { val cols = columns!!.columns for (i in cols.indices) { - if (cols[i].corr == table.corr) { + if (cols[i].corr == table.tableName) { return i } } diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormLocalizationWriter.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormLocalizationWriter.kt index 61ebdaebf..9e3a6e589 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormLocalizationWriter.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FormLocalizationWriter.kt @@ -22,6 +22,7 @@ import org.kopi.galite.visual.domain.Domain import org.kopi.galite.visual.Actor import org.kopi.galite.visual.dsl.common.LocalizationWriter import org.kopi.galite.visual.dsl.common.Menu +import org.kopi.galite.visual.form.Block /** * This class implements an XML localization file generator diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FullCalendar.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FullCalendar.kt index 97de8756c..331bbee0e 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FullCalendar.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/FullCalendar.kt @@ -19,6 +19,9 @@ package org.kopi.galite.visual.dsl.form import java.time.Instant import java.time.LocalDate import java.time.LocalTime +import java.util.* +import org.kopi.galite.visual.DefaultActor +import org.kopi.galite.visual.cross.VFullCalendarForm import org.kopi.galite.visual.domain.Domain import org.kopi.galite.visual.form.VBlock @@ -26,6 +29,7 @@ import org.kopi.galite.visual.form.VDateField import org.kopi.galite.visual.form.VForm import org.kopi.galite.visual.form.VTimeField import org.kopi.galite.visual.form.VTimestampField +import org.kopi.galite.visual.fullcalendar.VFullCalendarBlock /** * A block is a set of data which are stocked in the database and shown on a [Form]. @@ -34,7 +38,7 @@ import org.kopi.galite.visual.form.VTimestampField * * @param title the title of the block */ -open class FullCalendar(title: String) : Block(title, 1, 1) { +open class FullCalendar(title: String) : VFullCalendarBlock(title, 1, 1) { var dateField: FormField<*>? = null var fromTimeField: FormField<*>? = null @@ -66,7 +70,7 @@ open class FullCalendar(title: String) : Block(title, 1, 1) { return mustFill(domain, position, init).also { field -> dateField = field - block.dateField = field.vField as VDateField + dateFieldModel = field.vField as VDateField } } @@ -94,7 +98,7 @@ open class FullCalendar(title: String) : Block(title, 1, 1) { return mustFill(domain, position, init).also { field -> fromTimeField = field - block.fromTimeField = field.vField as VTimeField + fromTimeFieldModel = field.vField as VTimeField } } @@ -122,7 +126,7 @@ open class FullCalendar(title: String) : Block(title, 1, 1) { return mustFill(domain, position, init).also { field -> toTimeField = field - block.toTimeField = field.vField as VTimeField + toTimeFieldModel = field.vField as VTimeField } } @@ -149,7 +153,7 @@ open class FullCalendar(title: String) : Block(title, 1, 1) { init: FormField.() -> Unit): FormField { return mustFill(domain, position, init).also { field -> fromField = field - block.fromField = field.vField as VTimestampField + fromFieldModel = field.vField as VTimestampField } } @@ -176,40 +180,63 @@ open class FullCalendar(title: String) : Block(title, 1, 1) { init: FormField.() -> Unit): FormField { return mustFill(domain, position, init).also { field -> toField = field - block.toField = field.vField as VTimestampField + toFieldModel = field.vField as VTimestampField } } - /** - * Sets the block into insert mode. - * @exception VException an exception may occur during DB access - */ - override fun insertMode() { - block.insertMode() + override fun setInfo(form: VForm) { + fields.forEach { + it.setInfo(super.source) + } } - fun goToDate(date: LocalDate) { - block.goToDate(date) - } + fun buildFullCalendarForm() { + fullCalendarForm = object : VFullCalendarForm() { - fun getSelectedDate(): LocalDate? = block.getSelectedDate() + init { + init() + initDefaultActors() + initDefaultCommands() + } - /** - * Refreshes the full calendar block data. - */ - fun refreshEntries() { - block.refreshEntries() + override val locale: Locale? + get() = form.locale + override val fullCalendarBlock: VFullCalendarBlock + get() = this@FullCalendar + + fun init() { + val vSimpleBlock = BlockModel(this, this@FullCalendar, source) + + vSimpleBlock.setInfo(pageNumber, this) + vSimpleBlock.initIntern() + + val defaultActors = form.actors.filter { actor -> + actor is DefaultActor && + (actor.code == CMD_AUTOFILL + || actor.code == CMD_EDITITEM + || actor.code == CMD_EDITITEM_S + || actor.code == CMD_NEWITEM) + + }.toTypedArray() + addActors(defaultActors) + + addBlock(vSimpleBlock) + source = vSimpleBlock.source + setTitle(vSimpleBlock.title) + } + + override fun formClassName(): String = block.javaClass.name + } } // ---------------------------------------------------------------------- // BLOCK MODEL // ---------------------------------------------------------------------- - override val block = FullCalendarBlockModel(this@FullCalendar) override fun getBlockModel(vForm: VForm): VBlock { val model = super.getBlockModel(vForm) - block.buildFullCalendarForm() + buildFullCalendarForm() return model } } diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/ReportSelectionForm.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/ReportSelectionForm.kt index 56634cfbf..713087bc3 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/ReportSelectionForm.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/ReportSelectionForm.kt @@ -21,6 +21,7 @@ import java.util.Locale import org.kopi.galite.visual.cross.VReportSelectionForm import org.kopi.galite.visual.dsl.report.Report import org.kopi.galite.visual.ApplicationContext +import org.kopi.galite.visual.form.Block /** * Represents a report selection form. @@ -34,7 +35,7 @@ abstract class ReportSelectionForm(title: String, locale: Locale? = null) : Dict * create a report for this form */ protected fun Block.createReport(reportbuilder: () -> Report) { - model.createReport(block) { + model.createReport(this) { reportbuilder().model } } diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/Block.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/Block.kt similarity index 59% rename from galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/Block.kt rename to galite-core/src/main/kotlin/org/kopi/galite/visual/form/Block.kt index 901d6ec79..e8d8c3cf2 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/dsl/form/Block.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/Block.kt @@ -15,10 +15,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.kopi.galite.visual.dsl.form +package org.kopi.galite.visual.form import java.awt.Point -import java.sql.SQLException import org.jetbrains.exposed.sql.Table import org.kopi.galite.visual.Actor @@ -30,18 +29,24 @@ import org.kopi.galite.visual.dsl.common.FormTrigger import org.kopi.galite.visual.dsl.common.LocalizationWriter import org.kopi.galite.visual.dsl.common.Trigger import org.kopi.galite.visual.dsl.common.Window -import org.kopi.galite.visual.dsl.common.LocalizableElement -import org.kopi.galite.visual.form.Commands -import org.kopi.galite.visual.form.VBlock -import org.kopi.galite.visual.form.VConstants -import org.kopi.galite.visual.form.VField -import org.kopi.galite.visual.form.VForm import org.kopi.galite.util.base.InconsistencyException import org.kopi.galite.visual.Color import org.kopi.galite.visual.Command import org.kopi.galite.visual.Mode import org.kopi.galite.visual.VColor import org.kopi.galite.visual.VException +import org.kopi.galite.visual.dsl.form.Access +import org.kopi.galite.visual.dsl.form.BlockOption +import org.kopi.galite.visual.dsl.form.DictionaryForm +import org.kopi.galite.visual.dsl.form.Form +import org.kopi.galite.visual.dsl.form.FormBlockIndex +import org.kopi.galite.visual.dsl.form.FormCoordinatePosition +import org.kopi.galite.visual.dsl.form.FormDescriptionPosition +import org.kopi.galite.visual.dsl.form.FormField +import org.kopi.galite.visual.dsl.form.FormLocalizationWriter +import org.kopi.galite.visual.dsl.form.FormMultiFieldPosition +import org.kopi.galite.visual.dsl.form.FormPage +import org.kopi.galite.visual.dsl.form.FormPosition /** * A block is a set of data which are stocked in the database and shown on a [Form]. @@ -51,40 +56,11 @@ import org.kopi.galite.visual.VException * @param title the title of the block. * @param buffer the buffer size of this block. * @param visible the number of visible elements. - * @param form the form to which belongs the block. */ -open class Block(val title: String, +open class Block(title: String, var buffer: Int, var visible: Int) - : LocalizableElement(), VConstants { - - val dropListMap = HashMap>() - - val fields = mutableListOf>() // the block's fields. - val tables: MutableList = mutableListOf() // the tables accessed on the database - val indices: MutableList = mutableListOf() // the indices for database - val triggers = mutableListOf() // the triggers executed by this form - val commands = mutableListOf() // the commands associated with this block - val ownDomains = mutableListOf>() // Domains of fields added to this block - - var border: Border = Border.NONE // the border of the block - set(b) { - block.border = b.value - field = b - } - var align: FormBlockAlign? = null // the type of alignment in form - private set(value) { - block.alignment = value?.getBlockAlignModel() - field = value - } - var help: String? = null // the help - set(value) { - block.help = value - field = value - } - - lateinit var shortcut: String // the shortcut of this block - lateinit var form: Form // the form containing this block + : VBlock(title, buffer, visible), VConstants { // ---------------------------------------------------------------------- @@ -121,7 +97,7 @@ open class Block(val title: String, // BLOCK TRIGGERS for (i in VConstants.TRG_TYPES.indices) { if (trigger.events shr i and 1 > 0) { - block.VKT_Block_Triggers[0][i] = trigger + VKT_Block_Triggers[0][i] = trigger } } @@ -146,10 +122,7 @@ open class Block(val title: String, * @param table the database table */ fun table(table: T): T { - val formBlockTable = FormBlockTable(table.tableName, table.tableName, table) - - tables.add(formBlockTable) - block.tables.add(formBlockTable.table) + tables.add(table) return table } @@ -236,7 +209,7 @@ open class Block(val title: String, field.initializer() field.initialize(this) field.addFieldTrigger() - block.fields.add(field.vField) + blockFields.add(field.vField) fields.add(field) return field } @@ -252,7 +225,7 @@ open class Block(val title: String, } } } - this@Block.block.VKT_Field_Triggers.add(fieldTriggerArray) + this@Block.VKT_Field_Triggers.add(fieldTriggerArray) } inline fun initDomain(domain: Domain) { @@ -337,8 +310,7 @@ open class Block(val title: String, val formBlockIndex = FormBlockIndex("Id\$${indices.size}", message, indices.size) indices.add(formBlockIndex) - block.indices.add(formBlockIndex.message) - block.indicesIdents.add(formBlockIndex.ident) + indicesIdents.add(formBlockIndex.ident) return formBlockIndex } @@ -353,15 +325,13 @@ open class Block(val title: String, * @param action the action function. */ fun command(item: Actor, vararg modes: Mode, action: () -> Unit): Command { - val command = Command(item, modes, block, action = action) + val command = Command(item, modes, this, action = action) commands.add(command) // COMMANDS TRIGGERS // TODO : Add commands triggers here - block.VKT_Command_Triggers.add(arrayOfNulls(VConstants.TRG_TYPES.size)) - - block.commands.add(command) + VKT_Command_Triggers.add(arrayOfNulls(VConstants.TRG_TYPES.size)) return command } @@ -388,7 +358,7 @@ open class Block(val title: String, */ fun options(vararg options: BlockOption) { options.forEach { blockOption -> - block.options = block.options or blockOption.value + this.options = this.options or blockOption.value } } @@ -403,13 +373,13 @@ open class Block(val title: String, */ fun blockVisibility(access: Access, vararg modes: Mode) { if (modes.contains(Mode.QUERY)) { - block.access[VConstants.MOD_QUERY] = access.value + this.access[VConstants.MOD_QUERY] = access.value } if (modes.contains(Mode.INSERT)) { - block.access[VConstants.MOD_INSERT] = access.value + this.access[VConstants.MOD_INSERT] = access.value } if (modes.contains(Mode.UPDATE)) { - block.access[VConstants.MOD_UPDATE] = access.value + this.access[VConstants.MOD_UPDATE] = access.value } } @@ -422,7 +392,7 @@ open class Block(val title: String, * the other one is for the target block form field */ fun align(targetBlock: Block, vararg positions: Pair, FormField<*>>) { - val targets = ArrayList() + val targets = mutableListOf() fields.forEach { field -> if(positions.toMap().contains(field)) { @@ -432,8 +402,7 @@ open class Block(val title: String, } } - align = FormBlockAlign(targetBlock, - targets) + alignment = BlockAlignment(targetBlock, targets.toIntArray()) } /** @@ -443,7 +412,7 @@ open class Block(val title: String, * @param window the actual context of analyse */ fun initialize(window: Window) { - this.form = window as Form + this.form = window.model as VForm val bottomRight = Point(0, 0) fields.forEach { field -> @@ -452,12 +421,12 @@ open class Block(val title: String, } // ACCESS for (i in 0..2) { - field.access[i] = field.access[i].coerceAtMost(block.access[i]) + field.access[i] = field.access[i].coerceAtMost(access[i]) } } - block.maxRowPos = bottomRight.y - block.maxColumnPos = bottomRight.x + maxRowPos = bottomRight.y + maxColumnPos = bottomRight.x } // ---------------------------------------------------------------------- @@ -465,14 +434,14 @@ open class Block(val title: String, // ---------------------------------------------------------------------- fun positionField(field: FormField<*>): FormPosition { - return FormCoordinatePosition(++block.displayedFields) + return FormCoordinatePosition(++displayedFields) } fun positionField(pos: FormPosition?) { - pos!!.setChartPosition(++block.displayedFields) + pos!!.setChartPosition(++displayedFields) } - fun hasOption(option: Int): Boolean = block.options and option == option + fun hasOption(option: Int): Boolean = options and option == option /** * Returns true if the size of the buffer == 1, false otherwise @@ -482,106 +451,32 @@ open class Block(val title: String, /** * Returns the form block table */ - fun getTable(table: Table): FormBlockTable { - return tables.find { it.table == table } - ?: throw Exception("The table ${table.tableName} is not defined in this block") + fun getTable(table: Table): Table { + return if (tables.contains(table)) { + table + } else { + throw Exception("The table ${table.tableName} is not defined in this block") + } } /** * Returns the table number * */ - fun getTableNum(table: FormBlockTable): Int { + fun getTableNum(table: Table): Int { val indexOfTable = tables.indexOf(table) - return if (indexOfTable >= -1) indexOfTable else throw InconsistencyException("Table ${table.name} not found.") - } - - // ---------------------------------------------------------------------- - // BLOCK APIs - // ---------------------------------------------------------------------- - - var activeRecord - get() = block.activeRecord - set(rec) { - block.activeRecord = rec - } - - var activeField: FormField<*>? - get() = resolve(block.activeField) - set(value) { - block.activeField = value?.vField - } - - var isDetailMode - get() = block.isDetailMode - set(mode: Boolean) { - block.isDetailMode = mode - } - - // number of active records - val recordCount - get(): Int = block.recordCount - - var currentRecord - get(): Int = block.currentRecord - set(rec) { - block.currentRecord = rec - } - - fun getActiveCommands(): List { - val activeCommands = block.activeCommands - - return commands.filter { it in activeCommands } - } - - fun getMode(): Int = block.getMode() - - fun setMode(mode: Int) { - block.setMode(mode) + return if (indexOfTable >= -1) indexOfTable else throw InconsistencyException("Table ${table.tableName} not found.") } /** * @param page the page number of this block */ fun setInfo(page: FormPage, form: Form) { - block.setInfo(page.pageNumber, form.model) + setInfo(page.pageNumber, form.model) } - /** - * Returns true if this block can display more than one record. - */ - val isMulti: Boolean get() = block.isMulti() - - /** - * @return true if this block follows an other block - */ - val isFollow: Boolean get() = block.isFollow - - val isDroppable: Boolean get() = block.isDroppable - - fun isAccepted(flavor: String): Boolean = block.isAccepted(flavor) - - val acceptedFlavors: MutableSet get() = block.acceptedFlavors - - fun getDropTarget(flavor: String): FormField<*>? = resolve(block.getDropTarget(flavor)) - fun resolve(field: VField?): FormField<*>? = fields.singleOrNull { it.vField == field } - /** - * Sets the access of the block - * (if [isAccessible] does not evaluate the - * access of the block, this method can be made - * public) - */ - protected fun setAccess(access: Boolean) { - block.setAccess(access) - } - - /** - * Returns true if the block is accessible - */ - val isAccessible: Boolean get() = block.isAccessible - /** * Sets the color properties of the given record. * @param r The record number. @@ -600,206 +495,21 @@ open class Block(val title: String, VColor(background.red, background.green, background.blue) } - block.setColor(r, foreground, background) - } - - /** - * nb record read (and not deleted) - */ - val numberOfValidRecord: Int - get() = block.numberOfValidRecord - - /** - * nb record read (and not deleted) - */ - fun getNumberOfValidRecordBefore(recno: Int): Int = block.getNumberOfValidRecordBefore(recno) - - val numberOfFilledRecords: Int - get() = block.numberOfFilledRecords - - /** - * enter record - */ - protected fun enterRecord(recno: Int) { - block.enterRecord(recno) - } - - /** - * leave record - * @exception VException an exception may occur in field.leave() - */ - fun leaveRecord(check: Boolean) { - block.leaveRecord(check) - } - - /** - * GOTO FIRST RECORD - * @exception VException an exception may occur in record.leave() - */ - fun gotoFirstRecord() { - block.gotoFirstRecord() - } - - /** - * GOTO LAST RECORD - * @exception VException an exception may occur in record.leave() - */ - fun gotoLastRecord() { - block.gotoLastRecord() - } - - fun isRecordInsertAllowed(rec: Int): Boolean = block.isRecordInsertAllowed(rec) - - fun isRecordAccessible(rec: Int): Boolean = block.isRecordAccessible(rec) - - fun changeActiveRecord(record: Int) { - block.changeActiveRecord(record) - } - - /** - * GOTO NEXT RECORD OF CURRENT BLOCK - * @exception VException an exception may be raised bu record.leave - */ - fun gotoNextRecord() { - block.gotoNextRecord() - } - - /** - * GOTO PREVIOUS RECORD - * @exception VException an exception may occur in record.leave() - */ - fun gotoPrevRecord() { - block.gotoPrevRecord() - } - - /** - * GOTO SPECIFIED RECORD - * @param recno the record number - * @exception VException an exception may occur in record.leave() - */ - fun gotoRecord(recno: Int) { - block.gotoRecord(recno) - } - - /** - * Goto field in current block and in current record. - * @exception VException an exception may occur in record.leave() - */ - fun gotoField(fld: VField) { - block.gotoField(fld) - } - - /** - * Goto next field in current record - * @exception VException an exception may occur in record.leave() - */ - fun gotoNextField() { - block.gotoNextField() - } - - /** - * Goto previous field in current record - * @exception VException an exception may occur in field.leave() - */ - fun gotoPrevField() { - block.gotoPrevField() - } - - /** - * Goto first accessible field in current record - * @exception VException an exception may occur in field.leave() - */ - open fun gotoFirstField() { - block.gotoFirstField() - } - - /** - * Goto first accessible field in current record that is not fill - * @exception VException an exception may occur in field.leave() - */ - fun gotoFirstUnfilledField() { - block.gotoFirstUnfilledField() - } - - /** - * Goto next accessible field in current record that is not fill - * @exception VException an exception may occur in field.leave() - */ - fun gotoNextEmptyMustfill() { - block.gotoNextEmptyMustfill() - } - - /** - * Goto last accessible field in current record. - * @exception VException an exception may occur in field.leave() - */ - fun gotoLastField() { - block.gotoLastField() - } - - /** - * enter a new block - */ - fun enter() { - block.enter() - } - - /** - * exit block - * @exception VException an exception may be raised by record.leave - */ - fun leave(check: Boolean): Boolean = block.leave(check) - - /** - * Validate current block. - * @exception VException an exception may be raised by triggers - */ - fun validate() { - block.validate() - } - - /** - * Returns true if the block has changed wrt the database. - */ - val isChanged: Boolean - get() = block.isChanged - - val record: Int - get() = block.record - - /** - * check that user has proper UI with focus on a field on the good page - */ - fun checkBlock() { - block.checkBlock() - } - - /** - * Checks that all mustfill fields are filled. - */ - protected fun checkMustfillFields() { - block.checkMustfillFields() - } - - /** - * Clears the entire block. - */ - open fun clear() { - block.clear() + setColor(r, foreground, background) } /** * Saves current block (insert or update) */ fun saveBlock() { - Commands.saveBlock(block) + Commands.saveBlock(this) } /** * Resets current block */ fun resetBlock() { - Commands.resetBlock(block) + Commands.resetBlock(this) } /** @@ -807,33 +517,7 @@ open class Block(val title: String, * @exception VException an exception may occur during DB access */ fun serialQuery() { - Commands.serialQuery(block) - } - - /** - * Sets the block into insert mode. - * @exception VException an exception may occur during DB access - */ - open fun insertMode() { - block.insertMode() - } - - /** - * Saves changes in block to database. - * @exception VException an exception may be raised by triggers - * @exception SQLException an exception may be raised DB access - */ - fun save() { - block.save() - } - - /** - * Deletes in database - * @exception VException an exception may be raised by triggers - * @exception SQLException an exception may be raised DB access - */ - fun delete() { - block.delete() + Commands.serialQuery(this) } /** @@ -841,7 +525,7 @@ open class Block(val title: String, * @exception VException an exception may occur during DB access */ fun insertLine() { - Commands.insertLine(block) + Commands.insertLine(this) } /** @@ -849,7 +533,7 @@ open class Block(val title: String, * @exception VException an exception may occur during DB access */ fun changeBlock() { - Commands.changeBlock(block) + Commands.changeBlock(this) } /** @@ -857,43 +541,32 @@ open class Block(val title: String, * @exception VException an exception may occur during DB access */ fun searchOperator() { - Commands.setSearchOperator(block) - } - - fun showHideFilter() { - Commands.showHideFilter(block) - } - - /** - * * Loads block from database - */ - open fun load() { - block.load() + Commands.setSearchOperator(this) } /** * * Loads block from database */ open fun deleteBlock() { - Commands.deleteBlock(block) + Commands.deleteBlock(this) } /** * Menu query block, fetches selected record. */ fun DictionaryForm.recursiveQuery() { - Commands.recursiveQuery(block) + Commands.recursiveQuery(this@Block) } /** * Menu query block, fetches selected record, then moves to next block */ fun queryMove() { - Commands.queryMove(block) + Commands.queryMove(this) } fun setMode(mode: Mode) { - block.setMode(mode.value) + setMode(mode.value) } /** @@ -908,152 +581,10 @@ open class Block(val title: String, return extension } dropListMap[extension] = field - block.dropListMap[extension] = field.ident } return null } - fun fireBlockChanged() { - block.fireBlockChanged() - } - - // ---------------------------------------------------------------------- - // SETS/GETS INFORMATION ABOUT THE BLOCK - // ---------------------------------------------------------------------- - - /** - * Returns the record info value for the given record. - * @param rec The record number. - * @return The record info value. - */ - fun getRecordInfoAt(rec: Int): Int = block.getRecordInfoAt(rec) - - /** - * Returns true if at least one record is filled - */ - fun isFilled(): Boolean = block.isFilled() - - /** - * Returns true if the record is filled - */ - fun isRecordFilled(rec: Int): Boolean = block.isRecordFilled(rec) - - /** - * Returns true if the specified record has been fetched from the database - */ - fun isRecordFetched(rec: Int): Boolean = block.isRecordFetched(rec) - - /** - * Returns true if the specified record has been changed - */ - fun isRecordChanged(rec: Int): Boolean = block.isRecordChanged(rec) - - /** - * Returns true if the specified record has been deleted - */ - fun isRecordDeleted(rec: Int): Boolean = block.isRecordDeleted(rec) - - /** - * Returns true if the specified record has been deleted - */ - fun isSortedRecordDeleted(sortedRec: Int): Boolean = block.isSortedRecordDeleted(sortedRec) - - /** - * Returns true if the specified record is trailed - */ - fun isRecordTrailed(rec: Int): Boolean = block.isRecordTrailed(rec) - - /** - * Returns true if the current record is filled - */ - fun isCurrentRecordFilled(): Boolean = block.isCurrentRecordFilled() - - /** - * Returns true if the current record has been fetched from the database - */ - fun isCurrentRecordFetched(): Boolean = block.isCurrentRecordFetched() - - /** - * Returns true if the current record has been changed - */ - fun isCurrentRecordChanged(): Boolean = block.isCurrentRecordChanged() - - /** - * Returns true if the current record has been deleted - */ - fun isCurrentRecordDeleted(): Boolean = block.isCurrentRecordDeleted() - - /** - * Returns true if the current record is trailed - */ - fun isCurrentRecordTrailed(): Boolean = block.isCurrentRecordTrailed() - - /** - * Returns the current block access. - */ - fun getAccess(): Int = block.getAccess() - - /** - * Updates current access of block fields in the current Record. - */ - fun updateAccess(record: Int = activeRecord) { - block.updateAccess(record) - } - - fun setRecordFetched(rec: Int, value: Boolean) { - block.setRecordFetched(rec, value) - } - - /** - * Use the default record - */ - fun setRecordFetched(value: Boolean) { - block.setRecordFetched(value) - } - - fun setRecordChanged(rec: Int, value: Boolean) { - block.setRecordChanged(rec, value) - } - - /** - * Use the default record - */ - fun setRecordChanged(value: Boolean) { - block.setRecordChanged(value) - } - - fun setRecordDeleted(rec: Int, value: Boolean) { - block.setRecordDeleted(rec, value) - } - - /** - * Use the default record - */ - fun setRecordDeleted(value: Boolean) { - block.setRecordDeleted(value) - } - - /** - * - */ - fun setRecordTrailed(rec: Int, value: Boolean) { - block.setRecordTrailed(rec, value) - } - - /** - * Use the default record - */ - fun setRecordTrailed(value: Boolean) { - block.setRecordTrailed(value) - } - - /** - * COPY RECORD IN BLOCK - */ - fun copyRecord(from: Int, to: Int, trail: Boolean) { - block.copyRecord(from, to, trail) - } - // ---------------------------------------------------------------------- // BLOCK TRIGGERS EVENTS // ---------------------------------------------------------------------- @@ -1197,12 +728,9 @@ open class Block(val title: String, // BLOCK MODEL // ---------------------------------------------------------------------- - /** The block model */ - open val block: VBlock = object : VBlock(title, buffer, visible) { - override fun setInfo(form: VForm) { - this@Block.fields.forEach { - it.setInfo(super.source) - } + override fun setInfo(form: VForm) { + this@Block.fields.forEach { + it.setInfo(super.source) } } @@ -1210,10 +738,10 @@ open class Block(val title: String, /** Returns block model */ open fun getBlockModel(vForm: VForm): VBlock { - block.form = vForm - block.source = if (this::class.isInner && vForm.source != null) vForm.source!! else sourceFile - block.name = ident + form = vForm + source = if (this::class.isInner && vForm.source != null) vForm.source!! else sourceFile + name = ident isModelInitialized = true - return block + return this } } diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VBlock.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VBlock.kt index 4797672f2..06f0b77b5 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VBlock.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VBlock.kt @@ -50,12 +50,12 @@ import org.kopi.galite.database.DBDeadLockException import org.kopi.galite.database.DBForeignKeyException import org.kopi.galite.database.DBInterruptionException import org.kopi.galite.database.Utils +import org.kopi.galite.util.base.InconsistencyException import org.kopi.galite.visual.database.transaction import org.kopi.galite.visual.dsl.common.Trigger import org.kopi.galite.visual.form.VConstants.Companion.TRG_PREDEL import org.kopi.galite.visual.l10n.LocalizationManager import org.kopi.galite.visual.list.VListColumn -import org.kopi.galite.util.base.InconsistencyException import org.kopi.galite.visual.Action import org.kopi.galite.visual.ActionHandler import org.kopi.galite.visual.ApplicationContext @@ -68,11 +68,32 @@ import org.kopi.galite.visual.VDatabaseUtils import org.kopi.galite.visual.VException import org.kopi.galite.visual.VExecFailedException import org.kopi.galite.visual.VWindow +import org.kopi.galite.visual.domain.Domain +import org.kopi.galite.visual.dsl.common.LocalizableElement +import org.kopi.galite.visual.dsl.form.Border +import org.kopi.galite.visual.dsl.form.FormBlockIndex +import org.kopi.galite.visual.dsl.form.FormField abstract class VBlock(var title: String, buffer: Int, visible: Int) - : VConstants, DBContextHandler, ActionHandler { + : VConstants, DBContextHandler, ActionHandler, LocalizableElement() { + + var dropListMap = HashMap>() + internal set + val fields = mutableListOf>() // the block's fields. + var tables: MutableList
= mutableListOf() // the tables accessed on the database + internal set + var indices: MutableList = mutableListOf() // the indices for database shows error messages for violated indices + internal set + val triggers = mutableListOf() // the triggers executed by this form + var commands = mutableListOf() // the commands associated with this block + internal set + val ownDomains = mutableListOf>() // Domains of fields added to this block + + var border: Border = Border.NONE // the border of the block + + var help: String? = null // the help on this block // ---------------------------------------------------------------------- // DATA MEMBERS @@ -98,16 +119,12 @@ abstract class VBlock(var title: String, var displaySize = visible // max number of displayed records var pageNumber = 0 // page number of this block internal lateinit var source: String // qualified name of source file - lateinit var name: String // block name - protected lateinit var shortcut: String // block short name + lateinit var shortcut: String // block short name + internal lateinit var name: String // block name var alignment: BlockAlignment? = null - internal var help: String? = null // the help on this block - internal var tables = mutableListOf
() // names of database tables internal var options = 0 // block options internal val access: IntArray = IntArray(3) { VConstants.ACS_MUSTFILL } // access flags for each mode - internal var indices = mutableListOf() // error messages for violated indices internal var indicesIdents = mutableListOf() // error messages for violated indices - internal var commands = mutableListOf() // commands internal var fieldID: VField? = null // commands open var actors: Array? = null // actors to send to form (move to block import) get(): Array? { @@ -116,7 +133,7 @@ abstract class VBlock(var title: String, return temp } - var fields = mutableListOf() // fields + var blockFields = mutableListOf() // fields internal var VKT_Block_Triggers = mutableListOf(arrayOfNulls(VConstants.TRG_TYPES.size)) internal var VKT_Field_Triggers = mutableListOf>() internal var VKT_Command_Triggers = mutableListOf>() @@ -124,12 +141,10 @@ abstract class VBlock(var title: String, protected var blockListener = EventListenerList() internal var orderModel = OrderModel() - var border = VConstants.BRD_NONE var maxRowPos = 0 var maxColumnPos = 0 var displayedFields = 0 private var isFilterVisible = false - internal var dropListMap = HashMap() // dynamic data private var mode = VConstants.MOD_QUERY // current mode @@ -285,8 +300,8 @@ abstract class VBlock(var title: String, fun setMode(mode: Int) { if (this !== form.getActiveBlock()) { this.mode = mode - for (i in fields.indices) { - fields[i].updateModeAccess() + for (i in blockFields.indices) { + blockFields[i].updateModeAccess() } } else { // is this restriction acceptable ? @@ -294,8 +309,8 @@ abstract class VBlock(var title: String, val act = activeField act?.leave(true) this.mode = mode - for (i in fields.indices) { - fields[i].updateModeAccess() + for (i in blockFields.indices) { + blockFields[i].updateModeAccess() } if (act != null && !act.hasAction() && act.getAccess(activeRecord) >= VConstants.ACS_VISIT) { act.enter() @@ -330,7 +345,7 @@ abstract class VBlock(var title: String, val acceptedFlavors: MutableSet get() = dropListMap.keys - fun getDropTarget(flavor: String): VField? = getField(dropListMap[flavor.lowercase()]) + fun getDropTarget(flavor: String): VField? = dropListMap[flavor.lowercase()]?.vField // ---------------------------------------------------------------------- // LOCALIZATION @@ -350,10 +365,10 @@ abstract class VBlock(var title: String, for (i in indices.indices) { //!!! for now, overwrite ident with localized message //!!! inhibits relocalization of a running form - indices[i] = loc.getIndexMessage(indices[i]) + indices[i].message = loc.getIndexMessage(indices[i].message) } } - fields.forEach { + blockFields.forEach { if (!it.isInternal()) { if(ApplicationContext.getDefaultLocale() != locale) { val loc = manager.getBlockLocalizer(source, name) @@ -365,6 +380,8 @@ abstract class VBlock(var title: String, } } } + + fun getName(): String = name // ---------------------------------------------------------------------- // Navigation // ---------------------------------------------------------------------- @@ -412,7 +429,7 @@ abstract class VBlock(var title: String, * access of the block, this method can be made * public) */ - internal fun setAccess(access: Boolean) { + protected fun setAccess(access: Boolean) { if (blockAccess != access) { blockAccess = access // inform BlockListener @@ -464,7 +481,7 @@ abstract class VBlock(var title: String, // for simple blocks return } - for (field in fields) { + for (field in blockFields) { if (!field.isInternal()) { field.setColor(r, foreground, background) } @@ -481,7 +498,7 @@ abstract class VBlock(var title: String, // for simple blocks return } - for (field in fields) { + for (field in blockFields) { if (!field.isInternal()) { field.resetColor(r) } @@ -498,7 +515,7 @@ abstract class VBlock(var title: String, // for simple blocks return } - for (field in fields) { + for (field in blockFields) { if (!field.isInternal()) { if (isRecordFilled(r)) { field.updateColor(r) @@ -549,7 +566,7 @@ abstract class VBlock(var title: String, hi: Int, scratch: IntArray) { // a one-element array is always sorted - val field = fields[column] + val field = blockFields[column] if (lo < hi) { val mid = (lo + hi) / 2 @@ -659,7 +676,7 @@ abstract class VBlock(var title: String, /** * enter record */ - internal fun enterRecord(recno: Int) { + protected fun enterRecord(recno: Int) { assert(this == form.getActiveBlock()) { name + " != " + form.getActiveBlock()!!.name } assert(isMulti()) { "Is not multiblock" } assert(activeRecord == -1) { "Is multi and activeRecord = $activeRecord" } @@ -975,15 +992,15 @@ abstract class VBlock(var title: String, activeField!!.leave(true) var i = 0 - while (target == null && i < fields.size) { + while (target == null && i < blockFields.size) { index += 1 - if (index == fields.size) { + if (index == blockFields.size) { index = 0 } - if (!fields[index].hasAction() && - fields[index].getAccess(activeRecord) >= VConstants.ACS_VISIT && - (isDetailMode && !fields[index].noDetail() || !isDetailMode && !fields[index].noChart())) { - target = fields[index] + if (!blockFields[index].hasAction() && + blockFields[index].getAccess(activeRecord) >= VConstants.ACS_VISIT && + (isDetailMode && !blockFields[index].noDetail() || !isDetailMode && !blockFields[index].noChart())) { + target = blockFields[index] } i += 1 } @@ -1008,15 +1025,15 @@ abstract class VBlock(var title: String, activeField!!.leave(true) var i = 0 - while (target == null && i < fields.size) { + while (target == null && i < blockFields.size) { if (index == 0) { - index = fields.size + index = blockFields.size } index -= 1 - if (!fields[index].hasAction() && - fields[index].getAccess(activeRecord) >= VConstants.ACS_VISIT && - (isDetailMode && !fields[index].noDetail() || !isDetailMode && !fields[index].noChart())) { - target = fields[index] + if (!blockFields[index].hasAction() && + blockFields[index].getAccess(activeRecord) >= VConstants.ACS_VISIT && + (isDetailMode && !blockFields[index].noDetail() || !isDetailMode && !blockFields[index].noChart())) { + target = blockFields[index] } i += 1 } @@ -1041,9 +1058,9 @@ abstract class VBlock(var title: String, var target: VField? = null var i = 0 - while (target == null && i < fields.size) { - if (!fields[i].hasAction() && fields[i].getAccess(activeRecord) >= VConstants.ACS_VISIT) { - target = fields[i] + while (target == null && i < blockFields.size) { + if (!blockFields[i].hasAction() && blockFields[i].getAccess(activeRecord) >= VConstants.ACS_VISIT) { + target = blockFields[i] } i += 1 } @@ -1069,11 +1086,11 @@ abstract class VBlock(var title: String, var target: VField? = null var i = 0 - while (target == null && i < fields.size) { - if (!fields[i].hasAction() - && fields[i].getAccess(activeRecord) >= VConstants.ACS_VISIT - && fields[i].isNull(activeRecord)) { - target = fields[i] + while (target == null && i < blockFields.size) { + if (!blockFields[i].hasAction() + && blockFields[i].getAccess(activeRecord) >= VConstants.ACS_VISIT + && blockFields[i].isNull(activeRecord)) { + target = blockFields[i] } i += 1 } @@ -1107,29 +1124,29 @@ abstract class VBlock(var title: String, var target: VField? = null // found field var i = 0 - while (i < fields.size && fields[i] !== current) { + while (i < blockFields.size && blockFields[i] !== current) { i += 1 } - assert(i < fields.size) { "i: " + i + " fields.length" + fields.size } + assert(i < blockFields.size) { "i: " + i + " fields.length" + blockFields.size } i += 1 // walk next to next - while (target == null && i < fields.size) { - if (!fields[i].hasAction() - && fields[i].getAccess(activeRecord) == VConstants.ACS_MUSTFILL - && fields[i].isNull(activeRecord)) { - target = fields[i] + while (target == null && i < blockFields.size) { + if (!blockFields[i].hasAction() + && blockFields[i].getAccess(activeRecord) == VConstants.ACS_MUSTFILL + && blockFields[i].isNull(activeRecord)) { + target = blockFields[i] } i += 1 } // redo from start i = 0 - while (target == null && i < fields.size) { - if (!fields[i].hasAction() - && fields[i].getAccess(activeRecord) == VConstants.ACS_MUSTFILL - && fields[i].isNull(activeRecord)) { - target = fields[i] + while (target == null && i < blockFields.size) { + if (!blockFields[i].hasAction() + && blockFields[i].getAccess(activeRecord) == VConstants.ACS_MUSTFILL + && blockFields[i].isNull(activeRecord)) { + target = blockFields[i] } i += 1 } @@ -1153,11 +1170,11 @@ abstract class VBlock(var title: String, activeField?.leave(true) var target: VField? = null - var i = fields.size - 1 + var i = blockFields.size - 1 while (i >= 0) { - if (!fields[i].hasAction() && fields[i].getAccess(activeRecord) >= VConstants.ACS_VISIT) { - target = fields[i] + if (!blockFields[i].hasAction() && blockFields[i].getAccess(activeRecord) >= VConstants.ACS_VISIT) { + target = blockFields[i] } i -= 1 } @@ -1305,14 +1322,14 @@ abstract class VBlock(var title: String, if (isRecordChanged(i)) { j = 0 - while (j < fields.size) { - val fld = fields[j] + while (j < blockFields.size) { + val fld = blockFields[j] if (fld.getAccess(activeRecord) >= VConstants.ACS_VISIT && !fld.isNull(i)) { break } j++ } - if (j == fields.size && !noDelete()) { + if (j == blockFields.size && !noDelete()) { if (!isRecordFetched(i)) { setRecordChanged(i, false) } else { @@ -1465,8 +1482,8 @@ abstract class VBlock(var title: String, /** * Checks that all mustfill fields are filled. */ - internal fun checkMustfillFields() { - fields.forEach { field -> + protected fun checkMustfillFields() { + blockFields.forEach { field -> if (field.getAccess(activeRecord) == VConstants.ACS_MUSTFILL && field.isNull(activeRecord)) { // !!! lackner 04.10.2003 I don't know if it is really necessary here fireBlockChanged() @@ -1499,8 +1516,8 @@ abstract class VBlock(var title: String, } } } - for (i in fields.indices) { - fields[i].setSearchOperator(VConstants.SOP_EQ) + for (i in blockFields.indices) { + blockFields[i].setSearchOperator(VConstants.SOP_EQ) } if (!noChart() && isDetailMode) { isDetailMode = false @@ -1531,8 +1548,8 @@ abstract class VBlock(var title: String, } for (i in 0 until bufferSize) { activeRecord = i // also valid for single blocks - for (j in fields.indices) { - fields[j].setDefault() + for (j in blockFields.indices) { + blockFields[j].setDefault() } setRecordChanged(i, false) } @@ -1549,8 +1566,8 @@ abstract class VBlock(var title: String, assert(this !== form.getActiveBlock() || activeField == null) { "current block: " + form.getActiveBlock().toString() + "; current field: " + activeField } - for (i in fields.indices) { - fields[i].setAccess(value) + for (i in blockFields.indices) { + blockFields[i].setAccess(value) } } @@ -1587,8 +1604,8 @@ abstract class VBlock(var title: String, // don't update access ignoreAccessChange = true - for (i in fields.indices) { - fields[i].clear(recno) + for (i in blockFields.indices) { + blockFields[i].clear(recno) } setRecordFetched(recno, false) setRecordChanged(recno, false) @@ -1668,7 +1685,7 @@ abstract class VBlock(var title: String, var idqry = 0 for (i in 0 until idfld) { - if (fields[i].getColumnCount() > 0) { + if (blockFields[i].getColumnCount() > 0) { idqry += 1 } } @@ -1698,9 +1715,9 @@ abstract class VBlock(var title: String, } else { var i = 0 var j = 0 - while (i < fields.size) { - if (fields[i].getColumnCount() > 0) { - fields[i].setQuery(fetchCount, result,columns[j]) + while (i < blockFields.size) { + if (blockFields[i].getColumnCount() > 0) { + blockFields[i].setQuery(fetchCount, result, columns[j]) j += 1 } i++ @@ -1757,8 +1774,8 @@ abstract class VBlock(var title: String, val condition = mutableListOf>() condition.add(Op.build { idColumn eq id }) - if (VBlockDefaultOuterJoin.getFetchRecordCondition(fields) != null) { - condition.add(VBlockDefaultOuterJoin.getFetchRecordCondition(fields)!!) + if (VBlockDefaultOuterJoin.getFetchRecordCondition(blockFields) != null) { + condition.add(VBlockDefaultOuterJoin.getFetchRecordCondition(blockFields)!!) } try { @@ -1766,7 +1783,7 @@ abstract class VBlock(var title: String, /* set values */ var j = 0 - fields.forEach { field -> + blockFields.forEach { field -> if (field.getColumnCount() > 0) { field.setQuery(result, columns[j]) j += 1 @@ -2029,10 +2046,10 @@ abstract class VBlock(var title: String, * @return the field if found, otherwise null */ protected fun getBaseTableField(field: String): VField? { - for (i in fields.indices) { - val column = fields[i].lookupColumn(0) + for (i in blockFields.indices) { + val column = blockFields[i].lookupColumn(0) if (column != null && column.name == field) { - return fields[i] + return blockFields[i] } } return null @@ -2045,7 +2062,7 @@ abstract class VBlock(var title: String, val result = mutableListOf>() // take all visible fields with database access - fields.forEach { field -> + blockFields.forEach { field -> // image fields cannot be handled in a report. if (field !is VImageField && !field.isInternal() @@ -2055,7 +2072,7 @@ abstract class VBlock(var title: String, } // add ID field AT END if it exists and not already taken - for (field in fields) { + for (field in blockFields) { //!!! graf 20080329: should we replace fld!!.name.equals("ID") by fld == getIdField() ? if (field.isInternal() && field.name == idField.name && field.getColumnCount() > 0) { result.add(field.getColumn(0)!!.column) @@ -2069,7 +2086,7 @@ abstract class VBlock(var title: String, * Returns the database columns of block. */ fun getSearchColumns(): List> = - fields.filter { it.getColumnCount() > 0 } + blockFields.filter { it.getColumnCount() > 0 } .map { it.getColumn(0)!!.column } /** @@ -2085,7 +2102,7 @@ abstract class VBlock(var title: String, * Tests whether the specified table has nullable columns. */ fun hasNullableColumns(table: Int): Boolean { - fields.forEach { field -> + blockFields.forEach { field -> if (field.fetchColumn(table) != -1 && field.isInternal() && field.getColumn(field.fetchColumn(table))!!.nullable) { return true @@ -2099,7 +2116,7 @@ abstract class VBlock(var title: String, */ @Deprecated("use hasOnlyInternalFields(table: Table)") fun hasOnlyInternalFields(table: Int): Boolean { - fields.forEach { field -> + blockFields.forEach { field -> if (field.fetchColumn(table) != -1 && !field.isInternal()) { return false } @@ -2110,7 +2127,7 @@ abstract class VBlock(var title: String, /** * Tests whether this table has only internal fields. */ - fun hasOnlyInternalFields(table: Table): Boolean = fields.all { it.fetchColumn(table) == -1 || it.isInternal() } + fun hasOnlyInternalFields(table: Table): Boolean = blockFields.all { it.fetchColumn(table) == -1 || it.isInternal() } /** * Returns the tables for database query, with outer joins conditions. @@ -2123,7 +2140,7 @@ abstract class VBlock(var title: String, fun getSearchConditions(): Op? { val conditionList: MutableList> = mutableListOf() - fields.forEach { field -> + blockFields.forEach { field -> if (field.getColumnCount() > 0) { val condColumn = field.getColumn(0)!!.column as Column val searchColumn = when (field.options and VConstants.FDO_SEARCH_MASK) { @@ -2153,12 +2170,12 @@ abstract class VBlock(var title: String, */ open fun getSearchOrder(): MutableList, SortOrder>> { val columns = mutableListOf>() - val priorities = IntArray(fields.size) - val sizes = IntArray(fields.size) + val priorities = IntArray(blockFields.size) + val sizes = IntArray(blockFields.size) var elems = 0 // get the fields connected to the database with their priorities - fields.forEach { field -> + blockFields.forEach { field -> if (field.getColumnCount() != 0 && field.getPriority() != 0) { // this is a field connected to the database columns.add(field.getColumn(0)!!.column) @@ -2245,13 +2262,13 @@ abstract class VBlock(var title: String, val columns = mutableListOf>() // columns to select val conditions = mutableListOf>() // search conditions - fields.forEach { field -> + blockFields.forEach { field -> if (field != currentField && field.lookupColumn(table) != null && !field.isLookupKey(table)) { field.setNull(activeRecord) } } - fields.forEach { field -> + blockFields.forEach { field -> val column : Column<*>? = field.lookupColumn(table) if (column != null) { @@ -2279,7 +2296,7 @@ abstract class VBlock(var title: String, val result = query.single() var j = 0 - fields.forEach { field -> + blockFields.forEach { field -> if (field.lookupColumn(table) != null) { field.setQuery(result, columns[j]) j++ @@ -2372,11 +2389,11 @@ abstract class VBlock(var title: String, * Warning, you should use this method inside a transaction */ fun buildQueryDialog(): VListDialog? { - val query_tab = arrayOfNulls(fields.size) + val query_tab = arrayOfNulls(blockFields.size) var query_cnt = 0 /* get the fields to be displayed in the dialog */ - for (field in fields) { + for (field in blockFields) { /* skip fields not related to the database */ if (field.getColumnCount() == 0) { @@ -2581,8 +2598,8 @@ abstract class VBlock(var title: String, * Returns the current block access. */ fun getAccess(): Int { - for (i in fields.indices) { - if (fields[i].getAccess(activeRecord) >= VConstants.ACS_VISIT) { + for (i in blockFields.indices) { + if (blockFields[i].getAccess(activeRecord) >= VConstants.ACS_VISIT) { return VConstants.ACS_VISIT } } @@ -2594,11 +2611,11 @@ abstract class VBlock(var title: String, */ @JvmOverloads fun updateAccess(record: Int = activeRecord) { - for (i in fields.indices) { - if (!fields[i].isInternal()) { + for (i in blockFields.indices) { + if (!blockFields[i].isInternal()) { // internal fields are always hidden // no need for an update - fields[i].updateAccess(record) + blockFields[i].updateAccess(record) } } } @@ -2742,8 +2759,8 @@ abstract class VBlock(var title: String, trailRecord(to) } recordInfo[to] = recordInfo[from] - for (i in fields.indices) { - fields[i].copyRecord(from, to) + for (i in blockFields.indices) { + blockFields[i].copyRecord(from, to) } } @@ -2756,11 +2773,11 @@ abstract class VBlock(var title: String, } open fun initIntern() { - for (i in fields.indices) { - fields[i].block = this + for (i in blockFields.indices) { + blockFields[i].block = this } - for (i in fields.indices) { - fields[i].build() + for (i in blockFields.indices) { + blockFields[i].build() } } // ---------------------------------------------------------------------- @@ -2786,7 +2803,7 @@ abstract class VBlock(var title: String, /** * nb field on this block */ - fun getFieldCount(): Int = fields.size + fun getFieldCount(): Int = blockFields.size /** * Returns a field from its name @@ -2795,7 +2812,7 @@ abstract class VBlock(var title: String, * @return the field or null if no field with that name has been found */ fun getField(name: String?): VField? { - return fields.find { name == it.name || name == it.label } + return blockFields.find { name == it.name || name == it.label } } fun getFieldID(): VField? { @@ -2806,8 +2823,8 @@ abstract class VBlock(var title: String, * Returns the index of field in block */ fun getFieldIndex(fld: VField?): Int { - for (i in fields.indices) { - if (fld == fields[i]) { + for (i in blockFields.indices) { + if (fld == blockFields[i]) { return i } } @@ -3107,7 +3124,7 @@ abstract class VBlock(var title: String, protected fun clearLookups(recno: Int) { for (i in 1 until tables.size) { val table = tables[i] - fields.forEach { field -> + blockFields.forEach { field -> if (field.isInternal() && field.lookupColumn(table) != null && field.eraseOnLookup()) { field.setNull(recno) } @@ -3137,7 +3154,7 @@ abstract class VBlock(var title: String, // check if all lookup fields for this table are null. nullReference = true - for (field in fields) { + for (field in blockFields) { if (!nullReference) { break } @@ -3150,7 +3167,7 @@ abstract class VBlock(var title: String, } // this test is useful since we use outer join only for nullable columns. - for (field in fields) { + for (field in blockFields) { if (!nullReference) { break } @@ -3175,13 +3192,13 @@ abstract class VBlock(var title: String, // set internal fields to null (null reference) if (isNullReference(table, recno)) { - fields.forEach { field -> + blockFields.forEach { field -> if (field.isInternal() && field.lookupColumn(table) != null) { field.setNull(recno) } } } else { - fields.forEach { field -> + blockFields.forEach { field -> val column = field.lookupColumn(table) as Column? if (column != null) { @@ -3207,7 +3224,7 @@ abstract class VBlock(var title: String, val result = table.slice(columns).select(conditions.compoundAnd()).single() var j = 0 - fields.forEach { field -> + blockFields.forEach { field -> if (field.lookupColumn(table) != null) { field.setQuery(recno, result, columns[j]) j++ @@ -3243,7 +3260,7 @@ abstract class VBlock(var title: String, protected open fun checkUniqueIndex(index: Int, recno: Int, id: Int) { val condition = mutableListOf>() - for (field in fields) { + for (field in blockFields) { val column = if (field.isNull(recno) || !field.hasIndex(index)) { null } else { @@ -3264,7 +3281,7 @@ abstract class VBlock(var title: String, form.setActiveBlock(this@VBlock) activeRecord = recno gotoFirstField() - throw VExecFailedException(MessageCode.getMessage("VIS-00014", arrayOf(indices[index]))) + throw VExecFailedException(MessageCode.getMessage("VIS-00014", arrayOf(indices[index].message))) } assert(resultCount == 1L) { error("too many rows") @@ -3289,7 +3306,7 @@ abstract class VBlock(var title: String, activeRecord = recno } callProtectedTrigger(VConstants.TRG_PREINS) - for (field in fields) { + for (field in blockFields) { field.callProtectedTrigger(VConstants.TRG_PREINS) } if (isMulti()) { @@ -3313,7 +3330,7 @@ abstract class VBlock(var title: String, val result = mutableListOf, Any?>>() - for (field in fields) { + for (field in blockFields) { @Suppress("UNCHECKED_CAST") val column = field.lookupColumn(0) as? Column @@ -3340,7 +3357,7 @@ abstract class VBlock(var title: String, activeRecord = recno } callProtectedTrigger(VConstants.TRG_POSTINS) - for (field in fields) { + for (field in blockFields) { field.callProtectedTrigger(VConstants.TRG_POSTINS) } if (isMulti()) { @@ -3377,7 +3394,7 @@ abstract class VBlock(var title: String, activeRecord = recno } callProtectedTrigger(VConstants.TRG_PREUPD) - for (field in fields) { + for (field in blockFields) { field.callProtectedTrigger(VConstants.TRG_PREUPD) } if (isMulti()) { @@ -3397,7 +3414,7 @@ abstract class VBlock(var title: String, tsField?.setInt(recno, (System.currentTimeMillis() / 1000).toInt()) ucField?.setInt(recno, ucField!!.getInt()!! + 1) - for (field in fields) { + for (field in blockFields) { /* do not update ID field */ if (field == idField) { continue @@ -3427,7 +3444,7 @@ abstract class VBlock(var title: String, activeRecord = recno } callProtectedTrigger(VConstants.TRG_POSTUPD) - for (field in fields) { + for (field in blockFields) { field.callProtectedTrigger(VConstants.TRG_POSTUPD) } if (isMulti()) { @@ -3451,7 +3468,7 @@ abstract class VBlock(var title: String, activeRecord = recno } callProtectedTrigger(TRG_PREDEL) - fields.forEach { + blockFields.forEach { it.callProtectedTrigger(TRG_PREDEL) } if (isMulti()) { @@ -3762,7 +3779,7 @@ abstract class VBlock(var title: String, title, this.help, commands, - fields, + blockFields, form.blocks.size == 1) } } @@ -3770,11 +3787,11 @@ abstract class VBlock(var title: String, fun getFieldPos(field: VField): Int { var count = 1 - for (i in fields.indices) { - if (field == fields[i]) { + for (i in blockFields.indices) { + if (field == blockFields[i]) { return count } - if (fields[i].getDefaultAccess() != VConstants.ACS_HIDDEN) { + if (blockFields[i].getDefaultAccess() != VConstants.ACS_HIDDEN) { count++ } } @@ -3794,9 +3811,9 @@ abstract class VBlock(var title: String, } var count = 1 - for (i in fields.indices) { - if (fields[i].getDefaultAccess() != VConstants.ACS_HIDDEN) { - fields[i].prepareSnapshot(count++, active) + for (i in blockFields.indices) { + if (blockFields[i].getDefaultAccess() != VConstants.ACS_HIDDEN) { + blockFields[i].prepareSnapshot(count++, active) } } } @@ -3841,8 +3858,8 @@ abstract class VBlock(var title: String, append(fetchPosition) append("\n") append("CURRENT RECORD:\n") - for (i in fields.indices) { - append(fields[i].toString()) + for (i in blockFields.indices) { + append(blockFields[i].toString()) } } catch (e: Exception) { append("Exception while retrieving bock information. \n") diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VBlockDefaultOuterJoin.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VBlockDefaultOuterJoin.kt index b19abaa88..9a9b513d6 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VBlockDefaultOuterJoin.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VBlockDefaultOuterJoin.kt @@ -234,7 +234,7 @@ class VBlockDefaultOuterJoin(block: VBlock) { private fun isProcessedField(field: Int): Boolean = processedFields!!.contains(field.toString()) - private var fields: List = block.fields + private var fields: List = block.blockFields private var joinedTables: ArrayList
? = ArrayList() private var processedFields: ArrayList? = ArrayList() private var tables: List
? = block.tables diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VDictionaryForm.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VDictionaryForm.kt index 6a484ba23..f5398f95d 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VDictionaryForm.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/form/VDictionaryForm.kt @@ -135,7 +135,7 @@ abstract class VDictionaryForm protected constructor(source: String? = null) : V isRecursiveQuery = true savedData = arrayListOf() savedState = arrayListOf() - val fields = block!!.fields + val fields = block!!.blockFields fields.forEach { field -> savedData!!.add(field.getObject(0)) } @@ -147,7 +147,7 @@ abstract class VDictionaryForm protected constructor(source: String? = null) : V private fun retrieveFilledField() { isRecursiveQuery = false super.reset() - val fields = block!!.fields + val fields = block!!.blockFields for (i in fields.indices) { fields[i].setObject(0, savedData!!.elementAt(i)) } diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/fullcalendar/VFullCalendarBlock.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/fullcalendar/VFullCalendarBlock.kt index 7e616f01e..27d83e2cc 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/fullcalendar/VFullCalendarBlock.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/fullcalendar/VFullCalendarBlock.kt @@ -32,7 +32,6 @@ import org.kopi.galite.database.DBDeadLockException import org.kopi.galite.database.DBInterruptionException import org.kopi.galite.visual.database.transaction import org.kopi.galite.visual.form.BlockListener -import org.kopi.galite.visual.form.VBlock import org.kopi.galite.visual.form.VConstants import org.kopi.galite.visual.form.VDateField import org.kopi.galite.visual.form.VField @@ -43,15 +42,16 @@ import org.kopi.galite.visual.Message import org.kopi.galite.visual.MessageCode import org.kopi.galite.visual.VException import org.kopi.galite.visual.VExecFailedException +import org.kopi.galite.visual.form.Block -abstract class VFullCalendarBlock(title: String, buffer: Int, visible: Int) : VBlock(title, buffer, visible) { +abstract class VFullCalendarBlock(title: String, buffer: Int, visible: Int) : Block(title, buffer, visible) { lateinit var fullCalendarForm: VFullCalendarForm - var dateField: VDateField? = null - var fromTimeField: VTimeField? = null - var toTimeField: VTimeField? = null - var fromField: VTimestampField? = null - var toField: VTimestampField? = null + var dateFieldModel: VDateField? = null + var fromTimeFieldModel: VTimeField? = null + var toTimeFieldModel: VTimeField? = null + var fromFieldModel: VTimestampField? = null + var toFieldModel: VTimestampField? = null /** * Returns true if this block can display more than one record. @@ -126,11 +126,11 @@ abstract class VFullCalendarBlock(title: String, buffer: Int, visible: Int) : VB * Warning, you should use this method inside a transaction */ private fun queryEntries(week: Week): MutableList { - val query_tab = arrayOfNulls(fields.size) + val query_tab = arrayOfNulls(blockFields.size) var query_cnt = 0 /* get the fields to build query */ - for (field in fields) { + for (field in blockFields) { /* skip fields not related to the database */ if (field.getColumnCount() == 0) { @@ -173,8 +173,8 @@ abstract class VFullCalendarBlock(title: String, buffer: Int, visible: Int) : VB val entries = mutableListOf() val ids = mutableListOf() - val query = if(dateField != null) { - val dateColumn = dateField!!.getColumn(0)!!.column + val query = if(dateFieldModel != null) { + val dateColumn = dateFieldModel!!.getColumn(0)!!.column val startDate = week.getFirstDay() val lastDay = week.getLastDay() lastDay.plusDays(1) @@ -183,8 +183,8 @@ abstract class VFullCalendarBlock(title: String, buffer: Int, visible: Int) : VB .select { (dateColumn greaterEq startDate) and (dateColumn less lastDay) } .orderBy(*orderBys.toTypedArray()) } else { - val fromColumn = fromField!!.getColumn(0)!!.column - val toColumn = toField!!.getColumn(0)!!.column + val fromColumn = fromFieldModel!!.getColumn(0)!!.column + val toColumn = toFieldModel!!.getColumn(0)!!.column val firstDayOfWeek = java.sql.Timestamp.valueOf(week.getFirstDay().atStartOfDay()) val lastDay = week.getLastDay() val firstDayOfNextWeek = java.sql.Timestamp.valueOf(lastDay.plusDays(1).atStartOfDay()) @@ -205,7 +205,7 @@ abstract class VFullCalendarBlock(title: String, buffer: Int, visible: Int) : VB ids.add(result[idColumn]) - val entry = if(dateField != null) { + val entry = if(dateFieldModel != null) { val values = mutableMapOf() lateinit var date: LocalDate lateinit var start: LocalTime @@ -216,13 +216,13 @@ abstract class VFullCalendarBlock(title: String, buffer: Int, visible: Int) : VB val value = vField.retrieveQuery(result, columns[i]) when (vField) { - dateField -> { + dateFieldModel -> { date = value as LocalDate } - fromTimeField -> { + fromTimeFieldModel -> { start = value as LocalTime } - toTimeField -> { + toTimeFieldModel -> { end = value as LocalTime } else -> values[vField] = value @@ -240,10 +240,10 @@ abstract class VFullCalendarBlock(title: String, buffer: Int, visible: Int) : VB val value = vField.retrieveQuery(result, columns[i]) when (vField) { - fromField -> { + fromFieldModel -> { start = value as Instant } - toField -> { + toFieldModel -> { end = value as Instant } else -> values[vField] = value @@ -282,13 +282,13 @@ abstract class VFullCalendarBlock(title: String, buffer: Int, visible: Int) : VB } fun set(startDateTime: Instant, endDateTime: Instant) { - if (dateField != null) { - dateField!!.setDate(LocalDate.from(startDateTime)) - fromTimeField!!.setTime(LocalTime.from(startDateTime)) - toTimeField!!.setTime(LocalTime.from(endDateTime)) + if (dateFieldModel != null) { + dateFieldModel!!.setDate(LocalDate.from(startDateTime)) + fromTimeFieldModel!!.setTime(LocalTime.from(startDateTime)) + toTimeFieldModel!!.setTime(LocalTime.from(endDateTime)) } else { - fromField!!.setTimestamp(startDateTime) - toField!!.setTimestamp(endDateTime) + fromFieldModel!!.setTimestamp(startDateTime) + toFieldModel!!.setTimestamp(endDateTime) } } diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/calendar/DAbstractFullCalendar.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/calendar/DAbstractFullCalendar.kt index 1d7616c19..45b503ff5 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/calendar/DAbstractFullCalendar.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/calendar/DAbstractFullCalendar.kt @@ -210,7 +210,7 @@ open class DAbstractFullCalendar protected constructor(protected val model: VFul @Deprecated("to be removed when dateField is not supported") private fun check(startDateTime: LocalDateTime, endDateTime: LocalDateTime) { - if(model.dateField != null && startDateTime.dayOfWeek != endDateTime.dayOfWeek) { + if(model.dateFieldModel != null && startDateTime.dayOfWeek != endDateTime.dayOfWeek) { updateEntries(calendar.entries.map { (it as FullCalendarEntry).model }) throw VExecFailedException(MessageCode.getMessage("VIS-00070")) } diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/form/DBlock.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/form/DBlock.kt index 0abeeeddb..fa4bf7e48 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/form/DBlock.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/form/DBlock.kt @@ -106,7 +106,7 @@ open class DBlock(val parent: DForm, * Creates block fields */ protected open fun createFields() { - val fields = model.fields + val fields = model.blockFields var index = 0 columnViews = arrayOfNulls(fields.size) diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/form/DGridBlock.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/form/DGridBlock.kt index a1622c4e3..2ac88f445 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/form/DGridBlock.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/form/DGridBlock.kt @@ -479,7 +479,7 @@ open class DGridBlock(parent: DForm, model: VBlock) : DBlock(parent, model) { } for (i in 0 until model.getFieldCount()) { - val field = model.fields[i] + val field = model.blockFields[i] if (!field.isInternal() && !field.noChart()) { val columnView: DGridBlockFieldUI = columnViews[i] as DGridBlockFieldUI @@ -580,7 +580,7 @@ open class DGridBlock(parent: DForm, model: VBlock) : DBlock(parent, model) { * @return The field model. */ protected fun getField(propertyId: Any): VField { - return model.fields[propertyId as Int] + return model.blockFields[propertyId as Int] } /** diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/form/Form.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/form/Form.kt index 15f1f3dd8..de2a85fcc 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/form/Form.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/form/Form.kt @@ -163,7 +163,7 @@ class Form(val pageCount: Int, val titles: List) : Div(), PositionPanelL * @param block The block. */ internal fun setBorder(block: DBlock, page: Int) { - block.setBorder(block.model.border, block.model.title, pages[page]) + block.setBorder(block.model.border.value, block.model.title, pages[page]) } /** diff --git a/galite-core/src/main/kotlin/org/kopi/galite/visual/util/ReflectTool.kt b/galite-core/src/main/kotlin/org/kopi/galite/visual/util/ReflectTool.kt index e6b920682..4e4cfa8fb 100644 --- a/galite-core/src/main/kotlin/org/kopi/galite/visual/util/ReflectTool.kt +++ b/galite-core/src/main/kotlin/org/kopi/galite/visual/util/ReflectTool.kt @@ -25,7 +25,7 @@ import org.jetbrains.exposed.sql.Table import org.kopi.galite.visual.Actor import org.kopi.galite.visual.dsl.common.Menu import org.kopi.galite.visual.dsl.form.Form -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.FormBlockIndex import org.kopi.galite.visual.dsl.form.FormField diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/bill/BillForm.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/bill/BillForm.kt index c524c6ecc..ff1316960 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/bill/BillForm.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/bill/BillForm.kt @@ -26,7 +26,7 @@ import org.kopi.galite.visual.domain.DATE import org.kopi.galite.visual.domain.DECIMAL import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block class BillForm : FormDefault(title = "Bills", locale = Locale.UK) { val page = page("Bill") diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/billproduct/BillProductForm.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/billproduct/BillProductForm.kt index 5ff9a04da..4ed035509 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/billproduct/BillProductForm.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/billproduct/BillProductForm.kt @@ -25,7 +25,7 @@ import org.kopi.galite.demo.database.Product import org.kopi.galite.demo.desktop.runForm import org.kopi.galite.visual.domain.DECIMAL import org.kopi.galite.visual.domain.INT -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block class BillProductForm : FormDefault("Bill products", Locale.UK) { val page = page("Bill product") diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/client/ClientForm.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/client/ClientForm.kt index 3bff536ad..06aa94645 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/client/ClientForm.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/client/ClientForm.kt @@ -31,7 +31,7 @@ import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Border import org.kopi.galite.visual.dsl.form.FieldOption -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.VExecFailedException diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/command/CommandForm.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/command/CommandForm.kt index 94b7e2cc6..af26c2faf 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/command/CommandForm.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/command/CommandForm.kt @@ -27,7 +27,7 @@ import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.Icon import org.kopi.galite.visual.Mode import org.kopi.galite.visual.dsl.form.Access -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key class CommandForm : FormDefault(title = "Commands", locale = Locale.UK) { diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/common/FormDefault.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/common/FormDefault.kt index 6edc38f25..b138838f6 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/common/FormDefault.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/common/FormDefault.kt @@ -23,7 +23,7 @@ import org.kopi.galite.visual.Actor import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.Command import org.kopi.galite.visual.dsl.common.PredefinedCommand -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.dsl.form.ReportSelectionForm import org.kopi.galite.visual.form.Commands diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/product/ProductForm.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/product/ProductForm.kt index 5787b5b68..f5e17376d 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/product/ProductForm.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/product/ProductForm.kt @@ -28,7 +28,7 @@ import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.Mode import org.kopi.galite.visual.dsl.form.Access -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block class ProductForm : FormDefault(title = "Products", locale = Locale.UK) { val page = page("Product") diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/provider/ProviderForm.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/provider/ProviderForm.kt index 14c792d3f..051ad0b28 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/provider/ProviderForm.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/provider/ProviderForm.kt @@ -24,7 +24,7 @@ import org.kopi.galite.demo.desktop.runForm import org.kopi.galite.visual.domain.IMAGE import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block class ProviderForm : FormDefault(title = "Providers", locale = Locale.UK) { val page = page("Provider") diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/stock/StockForm.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/stock/StockForm.kt index 555945c52..73b0f6b5e 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/stock/StockForm.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/stock/StockForm.kt @@ -24,7 +24,7 @@ import org.kopi.galite.demo.database.Provider import org.kopi.galite.demo.database.Stock import org.kopi.galite.demo.desktop.runForm import org.kopi.galite.visual.domain.INT -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block class StockForm : FormDefault(title = "Stocks", locale = Locale.UK) { diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/taxRule/TaxRuleForm.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/taxRule/TaxRuleForm.kt index 137a21c6f..c614b7758 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/taxRule/TaxRuleForm.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/taxRule/TaxRuleForm.kt @@ -28,7 +28,7 @@ import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.Icon import org.kopi.galite.visual.Mode import org.kopi.galite.visual.dsl.form.Access -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.form.Commands diff --git a/galite-localizer/src/test/kotlin/org/kopi/galite/tests/localizer/Initialization.kt b/galite-localizer/src/test/kotlin/org/kopi/galite/tests/localizer/Initialization.kt index 59b2ec3c6..6a0b9b37d 100644 --- a/galite-localizer/src/test/kotlin/org/kopi/galite/tests/localizer/Initialization.kt +++ b/galite-localizer/src/test/kotlin/org/kopi/galite/tests/localizer/Initialization.kt @@ -36,7 +36,7 @@ import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Access import org.kopi.galite.visual.dsl.form.FieldOption import org.kopi.galite.visual.dsl.form.Form -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key const val testURL = "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1" diff --git a/galite-testing/src/main/kotlin/org/kopi/galite/testing/Block.kt b/galite-testing/src/main/kotlin/org/kopi/galite/testing/Block.kt index 4d284743a..df9c6fe1e 100644 --- a/galite-testing/src/main/kotlin/org/kopi/galite/testing/Block.kt +++ b/galite-testing/src/main/kotlin/org/kopi/galite/testing/Block.kt @@ -16,7 +16,7 @@ */ package org.kopi.galite.testing -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.form.VBlock import org.kopi.galite.visual.ui.vaadin.field.Field import org.kopi.galite.visual.ui.vaadin.form.DBlock @@ -79,7 +79,7 @@ fun Block.findBlock(): DBlock { ._find() val block = blocks.singleOrNull { - it.model eq this.block + it.model eq this } if (block != null) { @@ -98,7 +98,7 @@ fun Block.findMultiBlock(): DGridBlock = infix fun VBlock.eq(block: VBlock): Boolean { return this.title == block.title && this.form eq block.form - && this.name == block.name + && this.getName() == block.getName() && this.bufferSize == block.bufferSize && this.displaySize == block.displaySize } diff --git a/galite-testing/src/main/kotlin/org/kopi/galite/testing/Field.kt b/galite-testing/src/main/kotlin/org/kopi/galite/testing/Field.kt index 1ee7e218c..575d06cd2 100644 --- a/galite-testing/src/main/kotlin/org/kopi/galite/testing/Field.kt +++ b/galite-testing/src/main/kotlin/org/kopi/galite/testing/Field.kt @@ -61,7 +61,7 @@ import com.vaadin.flow.component.grid.Grid fun FormField.edit(value: T?): UField { val mainWindow = _get() - return if (this.parentBlock.isMulti) { + return if (this.parentBlock.isMulti()) { editInMultipleBlock(value, mainWindow) } else { editInSimpleBlock(value, mainWindow) @@ -178,7 +178,7 @@ fun FormField.editText(value: String?): UField = edit(value as T?) fun FormField.findField(): HasValue, Any?> { val mainWindow = _get() - return if (parentBlock.isMulti) { + return if (parentBlock.isMulti()) { mainWindow ._find>() .single { (it.editorComponent as GridEditorField<*>).dGridEditorField.getModel() eq vField } @@ -196,7 +196,7 @@ fun FormField<*>.findModel(): VField = findModel(parentBlock.findBlock().model) /** * Finds the the field model. */ -fun FormField<*>.findModel(block: VBlock): VField = block.fields.single { it eq vField } +fun FormField<*>.findModel(block: VBlock): VField = block.blockFields.single { it eq vField } /** * Click on a field. @@ -206,7 +206,7 @@ fun FormField.click(): UField { val mainWindow = _get() lateinit var field: UField - val editorField = if (this.parentBlock.isMulti) { + val editorField = if (this.parentBlock.isMulti()) { val column = mainWindow ._find>() .single { (it.editorComponent as GridEditorField<*>).dGridEditorField.getModel() eq this.vField } diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/domain/CodeDomainTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/domain/CodeDomainTests.kt index b0946645c..e4f47bbd7 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/domain/CodeDomainTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/domain/CodeDomainTests.kt @@ -28,7 +28,7 @@ import org.kopi.galite.visual.chart.VIntegerCodeMeasure import org.kopi.galite.visual.chart.VStringCodeDimension import org.kopi.galite.visual.domain.CodeDomain import org.kopi.galite.visual.dsl.chart.Chart -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Form import org.kopi.galite.visual.dsl.report.Report import org.kopi.galite.visual.form.VStringCodeField @@ -70,7 +70,7 @@ class CodeDomainTests: VApplicationTestBase() { val testForm = TestForm() val model = testForm.model val block = model.blocks.single() - val field = block.fields.single() + val field = block.blockFields.single() assertIs(field) assertIs>(testForm.block.field1.domain) diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/domain/DomainTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/domain/DomainTests.kt index 2928ca69d..c825b1860 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/domain/DomainTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/domain/DomainTests.kt @@ -26,7 +26,7 @@ import kotlin.test.assertIs import org.junit.Test import org.kopi.galite.tests.ui.vaadin.VApplicationTestBase import org.kopi.galite.visual.domain.Domain -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.FormField import org.kopi.galite.visual.form.VBooleanField import org.kopi.galite.visual.form.VDateField diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/FormDSLTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/FormDSLTests.kt index fe6983a75..e18fcb10c 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/FormDSLTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/FormDSLTests.kt @@ -36,7 +36,7 @@ import org.kopi.galite.visual.dsl.form.Border import org.kopi.galite.visual.dsl.form.FieldAlignment import org.kopi.galite.visual.dsl.form.FieldOption import org.kopi.galite.visual.dsl.form.Form -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.FormCoordinatePosition import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.form.VConstants @@ -64,7 +64,7 @@ class FormDSLTests : VApplicationTestBase() { assertEquals(form.block.title, blockModel.title) assertEquals(form.block.buffer, blockModel.bufferSize) assertEquals(form.block.visible, blockModel.displaySize) - assertEquals(form.block.border.value, blockModel.border) + assertEquals(form.block.border, blockModel.border) assertEquals(2, blockModel.maxColumnPos) assertEquals(1, blockModel.maxRowPos) assertEquals(0, blockModel.pageNumber) @@ -76,7 +76,7 @@ class FormDSLTests : VApplicationTestBase() { fun `test a form field`() { val form = FormWithOneSimpleBlock() val block = form.model.blocks.single() - val model = block.fields.single() + val model = block.blockFields.single() assertEquals(form.block.idClt.label, model.label) assertEquals(form.block.idClt.help, model.toolTip) @@ -93,8 +93,8 @@ class FormDSLTests : VApplicationTestBase() { @Test fun `test form with aligned block`() { val form = FormWithAlignedBlock() - val targetBlockModel = form.model.blocks.single { it == form.targetBlock.block } - val totalBlockModel = form.model.blocks.single { it == form.totalBlock.block } + val targetBlockModel = form.model.blocks.single { it == form.targetBlock } + val totalBlockModel = form.model.blocks.single { it == form.totalBlock } assertEquals(targetBlockModel, totalBlockModel.alignment!!.block) assertArraysEquals(arrayOf(2, 3), totalBlockModel.alignment!!.targets.toTypedArray()) @@ -114,10 +114,10 @@ class FormDSLTests : VApplicationTestBase() { assertEquals(form.title, formModel.getTitle()) assertEquals(form.locale, formModel.locale) //clientBlock - assertEquals(3, clientBlock.fields.size) + assertEquals(3, clientBlock.blockFields.size) assertEquals(form.clientBlock.buffer, clientBlock.bufferSize) assertEquals(form.clientBlock.visible, clientBlock.displaySize) - assertEquals(form.clientBlock.border.value, clientBlock.border) + assertEquals(form.clientBlock.border, clientBlock.border) assertEquals(form.clientBlock.title, clientBlock.title) assertEquals(1, clientBlock.maxColumnPos) assertEquals(3, clientBlock.maxRowPos) @@ -125,9 +125,9 @@ class FormDSLTests : VApplicationTestBase() { assertEquals(0, clientBlock.displayedFields) assertEquals(null, clientBlock.alignment) //commandsBlock - assertEquals(2, commandsBlock.fields.size) + assertEquals(2, commandsBlock.blockFields.size) assertEquals(form.commandsBlock.visible, commandsBlock.displaySize) - assertEquals(form.commandsBlock.border.value, commandsBlock.border) + assertEquals(form.commandsBlock.border, commandsBlock.border) assertEquals(form.commandsBlock.title, commandsBlock.title) assertEquals(1, commandsBlock.maxColumnPos) assertEquals(1, commandsBlock.maxRowPos) @@ -204,8 +204,8 @@ class FormDSLTests : VApplicationTestBase() { val form = FormWithMultipleBlock() val formModel = form.model val clientBlock = formModel.blocks[0] - val idClientModel = clientBlock.fields[0] - val nameClientModel = clientBlock.fields[1] + val idClientModel = clientBlock.blockFields[0] + val nameClientModel = clientBlock.blockFields[1] assertTrue(nameClientModel.hasTrigger(VConstants.TRG_POSTCHG)) @@ -222,7 +222,7 @@ class FormDSLTests : VApplicationTestBase() { val form = FormWithMultipleBlock() val formModel = form.model val clientBlock = formModel.blocks[0] - val nameClientModel = clientBlock.fields[1] + val nameClientModel = clientBlock.blockFields[1] assertEquals(User.name.name, nameClientModel.getColumn(0)!!.name) assertEquals(User, nameClientModel.getColumn(0)!!.getTable()) @@ -274,7 +274,7 @@ class FormDSLTests : VApplicationTestBase() { val form = FormWithMultipleBlock() val formModel = form.model val clientBlock = formModel.blocks[0] - val fileModel = clientBlock.fields[2] + val fileModel = clientBlock.blockFields[2] assertEquals(1, fileModel.command!!.size) @@ -290,8 +290,8 @@ class FormDSLTests : VApplicationTestBase() { val form = FormWithMultipleBlock() val formModel = form.model val clientBlock = formModel.blocks[0] - val nameClientModel = clientBlock.fields[1] - val fileModel = clientBlock.fields[2] + val nameClientModel = clientBlock.blockFields[1] + val fileModel = clientBlock.blockFields[2] assertEquals(FieldOption.QUERY_LOWER.value, nameClientModel.options) assertEquals(FieldOption.QUERY_UPPER.value, fileModel.options) diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/WindowElementSources.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/WindowElementSources.kt index cea6a9c25..20e0c3f6c 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/WindowElementSources.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/dsl/WindowElementSources.kt @@ -25,7 +25,7 @@ import org.kopi.galite.tests.ui.vaadin.VApplicationTestBase import org.kopi.galite.visual.Actor import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.Menu -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Form import org.kopi.galite.visual.dsl.form.Key @@ -38,8 +38,8 @@ class WindowElementSources: VApplicationTestBase() { val blockName = Product::class.java.`package`.name.replace(".", File.separator) + File.separator + "ProductBlock" val formName = ProductInnerBlock::class.java.`package`.name.replace(".", File.separator) + File.separator + "ProductInnerBlock" - assertEquals(blockName, product.block._source) - assertEquals(formName, productInnerBlock.block._source) + assertEquals(blockName, product._source) + assertEquals(formName, productInnerBlock._source) } @Test diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/Common.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/Common.kt index 56216b2e9..cd730bf70 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/Common.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/Common.kt @@ -23,7 +23,7 @@ import org.kopi.galite.visual.domain.Fixed import org.kopi.galite.visual.domain.IMAGE import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block class Traineeship : Block("Training", 1, 10) { val t = table(Training) diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationBlockForm.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationBlockForm.kt index e02c4c406..f46cfce29 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationBlockForm.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationBlockForm.kt @@ -28,7 +28,7 @@ import org.kopi.galite.visual.dsl.form.Access import org.kopi.galite.visual.dsl.form.BlockOption import org.kopi.galite.visual.dsl.form.Border import org.kopi.galite.visual.dsl.form.DictionaryForm -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key /*** Block Tables & Block Indexes ***/ @@ -394,7 +394,7 @@ class DocumentationBlockForm : DictionaryForm(title = "Form to test Blocks", loc // test PREDEL : click on list then delete trigger(PREDEL) { - block.form.notice("PREDEL Trigger") + form.notice("PREDEL Trigger") } // test POSTDEL : click on deleteBlock command and assert that that POSTDEL trigger change the field value of lastBlock @@ -419,12 +419,12 @@ class DocumentationBlockForm : DictionaryForm(title = "Form to test Blocks", loc // test POSTUPD : click on list changes values then save trigger(POSTUPD) { - block.form.notice("POSTUPD Trigger") + form.notice("POSTUPD Trigger") } // test PRESAVE : enter values then click on insert command then save trigger(PRESAVE) { - block.form.notice("PRESAVE Trigger") + form.notice("PRESAVE Trigger") } // test PREBLK : enter block, check preBlkTrigger field diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationChart.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationChart.kt index d58de3440..604a5e4e5 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationChart.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationChart.kt @@ -23,7 +23,7 @@ import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.Icon import org.kopi.galite.visual.Mode import org.kopi.galite.visual.dsl.form.Form -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key class DocumentationChart : Form(title = "Test Report Form", locale = Locale.UK) { diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationFieldsForm.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationFieldsForm.kt index c2588067f..0c975b6b4 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationFieldsForm.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationFieldsForm.kt @@ -39,7 +39,7 @@ import org.kopi.galite.visual.dsl.form.Border import org.kopi.galite.visual.dsl.form.DictionaryForm import org.kopi.galite.visual.dsl.form.FieldAlignment import org.kopi.galite.visual.dsl.form.FieldOption -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.FileHandler @@ -213,7 +213,7 @@ class DocumentationFieldsForm : DictionaryForm(title = "Form to test fields", lo label = "drop File" droppable("pdf") trigger(ACTION) { - FileHandler.fileHandler!!.openFile(form.model.getDisplay()!!, object : FileHandler.FileFilter { + FileHandler.fileHandler!!.openFile(form.getDisplay()!!, object : FileHandler.FileFilter { override fun accept(pathname: File?): Boolean { return (pathname!!.isDirectory || pathname.name.lowercase().endsWith(".pdf")) @@ -557,7 +557,7 @@ class DocumentationFieldsForm : DictionaryForm(title = "Form to test fields", lo this.value = "PREUPD Trigger" } trigger(POSTUPD) { - block.form.notice("POSTUPD Trigger") + form.notice("POSTUPD Trigger") } } @@ -565,7 +565,7 @@ class DocumentationFieldsForm : DictionaryForm(title = "Form to test fields", lo val preDelTriggerField = visit(domain = STRING(20), position = at(4, 3)) { label = "PREDEL Trigger Field" trigger(PREDEL) { - block.form.notice("PREDEL Trigger") + form.notice("PREDEL Trigger") } } diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationForm.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationForm.kt index 9b639f723..8e9c5f71f 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationForm.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationForm.kt @@ -29,7 +29,7 @@ import org.kopi.galite.visual.Icon import org.kopi.galite.visual.Mode import org.kopi.galite.visual.dsl.form.Border import org.kopi.galite.visual.dsl.form.DictionaryForm -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key class DocumentationForm : DictionaryForm(title = "Test Form", locale = Locale.UK) { diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReport.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReport.kt index 7e566b638..5c66af73d 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReport.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReport.kt @@ -21,7 +21,7 @@ import java.util.Locale import org.kopi.galite.tests.desktop.runForm import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.Icon -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.dsl.form.ReportSelectionForm diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReportTriggers.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReportTriggers.kt index dfb61c752..e5330a9cf 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReportTriggers.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/DocumentationReportTriggers.kt @@ -22,7 +22,7 @@ import org.kopi.galite.tests.desktop.runForm import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Form -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.WindowController diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/FormExample.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/FormExample.kt index 780f8fcc6..05e648b05 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/FormExample.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/FormExample.kt @@ -30,7 +30,7 @@ import org.kopi.galite.visual.domain.WEEK import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Border import org.kopi.galite.visual.dsl.form.DictionaryForm -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block class FormExample : DictionaryForm(title = "Clients", locale = Locale.UK) { val action = menu("Action") diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/FormToTestSaveMultipleBlock.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/FormToTestSaveMultipleBlock.kt index 5f00693c7..96c95cd7b 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/FormToTestSaveMultipleBlock.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/FormToTestSaveMultipleBlock.kt @@ -26,7 +26,7 @@ import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Border import org.kopi.galite.visual.dsl.form.DictionaryForm -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.VExecFailedException @@ -68,6 +68,9 @@ class FormToTestSaveMultipleBlock : DictionaryForm(title = "Training Form", loca } } + val uc = hidden(domain = INT(20)) { columns(t.uc) } + val ts = hidden(domain = INT(20)) { columns(t.ts) } + val name = skipped(domain = STRING(25), position = at(2, 1)) { label = "Name" } @@ -140,7 +143,7 @@ class FormToTestSaveMultipleBlock : DictionaryForm(title = "Training Form", loca border = Border.LINE command(item = saveBlock) { - val b = block + val b = this val rec: Int = b.activeRecord b.validate() diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/ManyPagesForm.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/ManyPagesForm.kt index 6285225ca..99016bbab 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/ManyPagesForm.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/ManyPagesForm.kt @@ -23,7 +23,7 @@ import org.kopi.galite.visual.domain.Fixed import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.dsl.form.DictionaryForm -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block class ManyPagesForm : DictionaryForm(title = "Clients", locale = Locale.UK) { val clientsPage= page("Clients") diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/MultipleBlockForm.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/MultipleBlockForm.kt index 944816b1f..88f99bb7b 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/MultipleBlockForm.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/MultipleBlockForm.kt @@ -27,7 +27,7 @@ import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Border import org.kopi.galite.visual.dsl.form.DictionaryForm -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key class MultipleBlockForm : DictionaryForm(title = "Training Form", locale = Locale.UK) { diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/SimpleForm.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/SimpleForm.kt index 17fde32ac..557f57520 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/SimpleForm.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/SimpleForm.kt @@ -32,7 +32,7 @@ import org.kopi.galite.visual.domain.TIME import org.kopi.galite.visual.domain.WEEK import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.DictionaryForm -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block class SimpleForm : DictionaryForm(title = "Training", locale = Locale.UK) { val action = menu("Action") diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TestFieldsForm.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TestFieldsForm.kt index 5e7159a80..d7d9b9cf0 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TestFieldsForm.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TestFieldsForm.kt @@ -27,7 +27,7 @@ import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.DictionaryForm import org.kopi.galite.visual.dsl.form.FieldOption -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key class TestFieldsForm : DictionaryForm(title = "Fields Form", locale = Locale.UK) { diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TestFieldsVisibilityForm.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TestFieldsVisibilityForm.kt index 31edaddbd..a75bbadc0 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TestFieldsVisibilityForm.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/examples/TestFieldsVisibilityForm.kt @@ -23,7 +23,7 @@ import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.Icon import org.kopi.galite.visual.Mode import org.kopi.galite.visual.dsl.form.DictionaryForm -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block class TestFieldsVisibilityForm : DictionaryForm(title = "Fields Visibility Form", locale = Locale.UK) { val action = menu("Action") diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormSample.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormSample.kt index ff233314b..6541154e1 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormSample.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormSample.kt @@ -33,7 +33,7 @@ import org.kopi.galite.visual.dsl.form.Access import org.kopi.galite.visual.dsl.form.BlockOption import org.kopi.galite.visual.dsl.form.FieldOption import org.kopi.galite.visual.dsl.form.Form -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.FileHandler @@ -219,7 +219,7 @@ class TestBlock : Block("Test block", 1, 5) { columns(u.cv) droppable("pdf") trigger(ACTION) { - FileHandler.fileHandler!!.openFile(form.model.getDisplay()!!, object : FileHandler.FileFilter { + FileHandler.fileHandler!!.openFile(form.getDisplay()!!, object : FileHandler.FileFilter { override fun accept(pathname: File?): Boolean { return (pathname!!.isDirectory || pathname.name.toLowerCase().endsWith(".pdf")) diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormSampleTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormSampleTests.kt index f11094dc6..f16f611a7 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormSampleTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormSampleTests.kt @@ -41,7 +41,7 @@ class FormSampleTests: JApplicationTestBase() { fun changeBlockAccessTest() { val formSample = FormSample() - assertEquals(1, formSample.tb4ToTestChangeBlockAccess.block.getAccess()) + assertEquals(1, formSample.tb4ToTestChangeBlockAccess.getAccess()) assertArrayEquals(intArrayOf(0, 0, 0), formSample.tb4ToTestChangeBlockAccess.id.access) assertArrayEquals(intArrayOf(1, 1, 2), formSample.tb4ToTestChangeBlockAccess.name.access) @@ -57,7 +57,7 @@ class FormSampleTests: JApplicationTestBase() { assertNull(formModel.getActiveBlock()) assertNull(formModel.getActiveBlock()?.activeCommands) formModel.prepareForm() - assertEquals(form.tb1.block, formModel.getActiveBlock()) + assertEquals(form.tb1, formModel.getActiveBlock()) assertNotNull(formModel.getActiveBlock()?.activeCommands) } @@ -67,10 +67,10 @@ class FormSampleTests: JApplicationTestBase() { val formModel = form.model form.tb1.setMode(Mode.INSERT) - form.tb1.block.enter() + form.tb1.enter() formModel.reset() assertTrue(formModel.blocks.all { it.getMode() == VConstants.MOD_QUERY }) - assertEquals(form.tb1.block, formModel.getActiveBlock()) + assertEquals(form.tb1, formModel.getActiveBlock()) } @Test @@ -98,7 +98,7 @@ class FormSampleTests: JApplicationTestBase() { val targetPage = 1 formModel.gotoPage(targetPage) - assertEquals(form.tb2.block, formModel.getActiveBlock()) + assertEquals(form.tb2, formModel.getActiveBlock()) } @Test @@ -108,7 +108,7 @@ class FormSampleTests: JApplicationTestBase() { val targetBlock = 2 formModel.gotoBlock(formModel.getBlock(targetBlock)) - assertEquals(form.blocks[targetBlock].block, formModel.getActiveBlock()) + assertEquals(form.blocks[targetBlock], formModel.getActiveBlock()) } @Test @@ -119,7 +119,7 @@ class FormSampleTests: JApplicationTestBase() { formModel.gotoBlock(formModel.getBlock(targetBlock)) formModel.gotoNextBlock() - assertEquals(form.blocks[targetBlock + 1].block, formModel.getActiveBlock()) + assertEquals(form.blocks[targetBlock + 1], formModel.getActiveBlock()) } @Test @@ -128,7 +128,7 @@ class FormSampleTests: JApplicationTestBase() { val formModel = form.model formModel.enterBlock() - assertEquals(form.blocks[0].block, formModel.getActiveBlock()) + assertEquals(form.blocks[0], formModel.getActiveBlock()) } @Test diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormToCheckFieldVisibility.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormToCheckFieldVisibility.kt index 63220561e..58c2795a1 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormToCheckFieldVisibility.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormToCheckFieldVisibility.kt @@ -23,7 +23,7 @@ import org.kopi.galite.tests.desktop.runForm import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.dsl.form.Form -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block object FormToCheckFieldVisibility: Form(title = "form for test fields visibility", locale = Locale.UK) { val testPage = page("test page") diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithAlignedBlock.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithAlignedBlock.kt index a3c52d1ce..aac07836a 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithAlignedBlock.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithAlignedBlock.kt @@ -23,7 +23,7 @@ import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.dsl.form.BlockOption import org.kopi.galite.visual.dsl.form.Form -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block class FormWithAlignedBlock : Form(title = "form for test", locale = Locale.UK) { diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithAlignedBlockWithMultiplePages.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithAlignedBlockWithMultiplePages.kt index c3e5defb6..2efd40bd7 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithAlignedBlockWithMultiplePages.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithAlignedBlockWithMultiplePages.kt @@ -23,7 +23,7 @@ import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.dsl.form.BlockOption import org.kopi.galite.visual.dsl.form.Form -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block class FormWithAlignedBlockWithMultiplePages : Form(title = "form for test", locale = Locale.UK) { diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithBlockTrigger.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithBlockTrigger.kt index 349cd6e9e..0ad0b103d 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithBlockTrigger.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithBlockTrigger.kt @@ -22,7 +22,7 @@ import java.util.Locale import org.kopi.galite.tests.desktop.runForm import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.dsl.form.Form -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block object FormWithBlockTrigger: Form(title = "form for test", locale = Locale.UK) { val testPage = page("test page") diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithCodeDomains.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithCodeDomains.kt index 3e38d9723..ece5f0ff6 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithCodeDomains.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithCodeDomains.kt @@ -23,7 +23,7 @@ import org.kopi.galite.tests.desktop.runForm import org.kopi.galite.visual.domain.CodeDomain import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Form -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block class FormWithCodeDomains: Form(title = "form to test domains", locale = Locale.UK) { val edit = menu("Edit") diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithFields.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithFields.kt index ef8c2d521..a69ce35cd 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithFields.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithFields.kt @@ -23,7 +23,7 @@ import org.kopi.galite.tests.desktop.runForm import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.dsl.form.Form -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block class FormWithFields: Form(title = "form with fields", locale = Locale.UK) { diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithList.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithList.kt index c8ae8e8f4..eb3e478a0 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithList.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithList.kt @@ -30,7 +30,7 @@ import org.kopi.galite.visual.domain.TIMESTAMP import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.DictionaryForm -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key class FormWithList : DictionaryForm(title = "form for test", locale = Locale.UK) { diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithListDomains.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithListDomains.kt index cdc3e9532..678184293 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithListDomains.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithListDomains.kt @@ -34,7 +34,7 @@ import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.DictionaryForm import org.kopi.galite.visual.dsl.form.Form -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.FileHandler diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithMultipleBlock.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithMultipleBlock.kt index ff516d004..4dd624060 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithMultipleBlock.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithMultipleBlock.kt @@ -22,7 +22,7 @@ import org.kopi.galite.tests.desktop.runForm import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.dsl.form.Form -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block object FormWithMultipleBlock : Form(title = "form for test", locale = Locale.UK) { val blockSample = insertBlock(BlockSample) diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithMultipleBlockTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithMultipleBlockTests.kt index df308cb69..ae41b5a12 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithMultipleBlockTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithMultipleBlockTests.kt @@ -84,7 +84,7 @@ class FormWithMultipleBlockTests : JApplicationTestBase() { assertEquals(formModel.getBlock(1).displaySize, 100) assertEquals(formModel.getBlock(1).displayedFields, 1) - val nameField = formModel.getBlock(1).fields[1] + val nameField = formModel.getBlock(1).blockFields[1] assertEquals(1, nameField.position!!.column) assertEquals(1, nameField.position!!.columnEnd) assertEquals(1, nameField.position!!.line) diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithNullableColumnTest.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithNullableColumnTest.kt index 740f76135..c0734601f 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithNullableColumnTest.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithNullableColumnTest.kt @@ -32,8 +32,8 @@ class FormWithNullableColumnsTest : JApplicationTestBase() { block.name.value = "client1" - val table = VBlockDefaultOuterJoin.getSearchTables(block.block) - val columns = block.block.getSearchColumns() + val table = VBlockDefaultOuterJoin.getSearchTables(block) + val columns = block.getSearchColumns() val query = table!!.slice(columns).selectAll() transaction { @@ -49,8 +49,8 @@ class FormWithNullableColumnsTest : JApplicationTestBase() { block.name.value = "client1" - val table = VBlockDefaultOuterJoin.getSearchTables(block.block) - val columns = block.block.getSearchColumns() + val table = VBlockDefaultOuterJoin.getSearchTables(block) + val columns = block.getSearchColumns() val query = table!!.slice(columns).selectAll() transaction { @@ -66,8 +66,8 @@ class FormWithNullableColumnsTest : JApplicationTestBase() { block.name.value = "client1" - val table = VBlockDefaultOuterJoin.getSearchTables(block.block) - val columns = block.block.getSearchColumns() + val table = VBlockDefaultOuterJoin.getSearchTables(block) + val columns = block.getSearchColumns() val query = table!!.slice(columns).selectAll() transaction { @@ -85,8 +85,8 @@ class FormWithNullableColumnsTest : JApplicationTestBase() { block.name.value = "client1" - val table = VBlockDefaultOuterJoin.getSearchTables(block.block) - val columns = block.block.getSearchColumns() + val table = VBlockDefaultOuterJoin.getSearchTables(block) + val columns = block.getSearchColumns() val query = table!!.slice(columns).selectAll() transaction { @@ -104,8 +104,8 @@ class FormWithNullableColumnsTest : JApplicationTestBase() { block.name.value = "client1" - val table = VBlockDefaultOuterJoin.getSearchTables(block.block) - val columns = block.block.getSearchColumns() + val table = VBlockDefaultOuterJoin.getSearchTables(block) + val columns = block.getSearchColumns() val query = table!!.slice(columns).selectAll() transaction { @@ -123,8 +123,8 @@ class FormWithNullableColumnsTest : JApplicationTestBase() { block.name.value = "client1" - val table = VBlockDefaultOuterJoin.getSearchTables(block.block) - val columns = block.block.getSearchColumns() + val table = VBlockDefaultOuterJoin.getSearchTables(block) + val columns = block.getSearchColumns() val query = table!!.slice(columns).selectAll() transaction { @@ -141,8 +141,8 @@ class FormWithNullableColumnsTest : JApplicationTestBase() { block.name.value = "client1" - val table = VBlockDefaultOuterJoin.getSearchTables(block.block) - val columns = block.block.getSearchColumns() + val table = VBlockDefaultOuterJoin.getSearchTables(block) + val columns = block.getSearchColumns() val query = table!!.slice(columns).selectAll() transaction { @@ -161,8 +161,8 @@ class FormWithNullableColumnsTest : JApplicationTestBase() { block.name.value = "client1" - val table = VBlockDefaultOuterJoin.getSearchTables(block.block) - val columns = block.block.getSearchColumns() + val table = VBlockDefaultOuterJoin.getSearchTables(block) + val columns = block.getSearchColumns() val query = table!!.slice(columns).selectAll() transaction { @@ -181,8 +181,8 @@ class FormWithNullableColumnsTest : JApplicationTestBase() { block.name.value = "client1" - val table = VBlockDefaultOuterJoin.getSearchTables(block.block) - val columns = block.block.getSearchColumns() + val table = VBlockDefaultOuterJoin.getSearchTables(block) + val columns = block.getSearchColumns() val query = table!!.slice(columns).selectAll() transaction { @@ -200,8 +200,8 @@ class FormWithNullableColumnsTest : JApplicationTestBase() { block.name.value = "client1" - val table = VBlockDefaultOuterJoin.getSearchTables(block.block) - val columns = block.block.getSearchColumns() + val table = VBlockDefaultOuterJoin.getSearchTables(block) + val columns = block.getSearchColumns() val query = table!!.slice(columns).selectAll() transaction { @@ -217,8 +217,8 @@ class FormWithNullableColumnsTest : JApplicationTestBase() { fun innerJoinNoJoinTwoTables() { val block = FormWithNullableColumn.blockTwoTablesInnerJoinNoJoin - val table = VBlockDefaultOuterJoin.getSearchTables(block.block) - val columns = block.block.getSearchColumns() + val table = VBlockDefaultOuterJoin.getSearchTables(block) + val columns = block.getSearchColumns() val query = table!!.slice(columns).selectAll() transaction { @@ -232,8 +232,8 @@ class FormWithNullableColumnsTest : JApplicationTestBase() { fun noJoinInnerJoinTwoTables() { val block = FormWithNullableColumn.blockTwoTablesNoJoinInnerJoin - val table = VBlockDefaultOuterJoin.getSearchTables(block.block) - val columns = block.block.getSearchColumns() + val table = VBlockDefaultOuterJoin.getSearchTables(block) + val columns = block.getSearchColumns() val query = table!!.slice(columns).selectAll() transaction { @@ -247,8 +247,8 @@ class FormWithNullableColumnsTest : JApplicationTestBase() { fun leftJoinNoJoinTwoTables() { val block = FormWithNullableColumn.blockTwoTablesLeftJoinNoJoin - val table = VBlockDefaultOuterJoin.getSearchTables(block.block) - val columns = block.block.getSearchColumns() + val table = VBlockDefaultOuterJoin.getSearchTables(block) + val columns = block.getSearchColumns() val query = table!!.slice(columns).selectAll() transaction { @@ -262,8 +262,8 @@ class FormWithNullableColumnsTest : JApplicationTestBase() { fun noJoinLeftJoinTwoTables() { val block = FormWithNullableColumn.blockTwoTablesNoJoinLeftJoin - val table = VBlockDefaultOuterJoin.getSearchTables(block.block) - val columns = block.block.getSearchColumns() + val table = VBlockDefaultOuterJoin.getSearchTables(block) + val columns = block.getSearchColumns() val query = table!!.slice(columns).selectAll() transaction { diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithNullableColumns.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithNullableColumns.kt index 6c84201f0..f360f7de7 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithNullableColumns.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithNullableColumns.kt @@ -28,7 +28,7 @@ import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.DictionaryForm -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key object Clients : Table() { diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithSpecialTypes.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithSpecialTypes.kt index 3da3c3165..f79058ed3 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithSpecialTypes.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/FormWithSpecialTypes.kt @@ -37,7 +37,7 @@ import org.kopi.galite.visual.Icon import org.kopi.galite.visual.Mode import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.Form -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.type.Month diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/VBlockDefaultOuterJoinTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/VBlockDefaultOuterJoinTests.kt index 88540c46f..07665bf05 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/VBlockDefaultOuterJoinTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/VBlockDefaultOuterJoinTests.kt @@ -37,7 +37,7 @@ class VBlockDefaultOuterJoinTests : JApplicationTestBase() { @Test fun getSearchTablesTest() { - val searchTables = VBlockDefaultOuterJoin.getSearchTables(FormWithList.blockWithManyTables.block) + val searchTables = VBlockDefaultOuterJoin.getSearchTables(FormWithList.blockWithManyTables) assertNotNull(searchTables) @@ -50,7 +50,7 @@ class VBlockDefaultOuterJoinTests : JApplicationTestBase() { @Test fun getFetchRecordConditionTest() { val block = FormWithList.blockWithManyTables - val fetchRecordCondition = VBlockDefaultOuterJoin.getFetchRecordCondition(block.block.fields) + val fetchRecordCondition = VBlockDefaultOuterJoin.getFetchRecordCondition(block.blockFields) assertNotNull(fetchRecordCondition) diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/VBlockTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/VBlockTests.kt index 62178201d..eefb3e952 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/VBlockTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/VBlockTests.kt @@ -124,10 +124,10 @@ class VBlockTests : VApplicationTestBase() { transaction { initSampleFormTables() - FormSample.tb1.block.load() + FormSample.tb1.load() val query = User.slice(User.name, User.age).selectAll() - FormSample.tb1.block.deleteRecord(0) + FormSample.tb1.deleteRecord(0) val deleteRecordList = query.map { listOf(it[User.name], it[User.age]) } @@ -147,7 +147,7 @@ class VBlockTests : VApplicationTestBase() { val vExecFailedException = assertFailsWith { transaction { - FormWithList.blockWithManyTables.block.checkUniqueIndices(0) + FormWithList.blockWithManyTables.checkUniqueIndices(0) } } assertEquals("VIS-00014: ID should be unique", vExecFailedException.message) @@ -189,7 +189,7 @@ class VBlockTests : VApplicationTestBase() { formMultiple.multipleBlock.mail[0] = "6" val vExecFailedException = assertFailsWith { transaction { - formMultiple.multipleBlock.block.checkUniqueIndices(0) + formMultiple.multipleBlock.checkUniqueIndices(0) } } assertEquals("VIS-00014: Index 0", vExecFailedException.message) @@ -202,7 +202,7 @@ class VBlockTests : VApplicationTestBase() { formMultiple.multipleBlock.mail[0] = "3" val vExecFailedException2 = assertFailsWith { transaction { - formMultiple.multipleBlock.block.checkUniqueIndices(0) + formMultiple.multipleBlock.checkUniqueIndices(0) } } assertEquals("VIS-00014: Index 1", vExecFailedException2.message) @@ -213,7 +213,7 @@ class VBlockTests : VApplicationTestBase() { formMultiple.multipleBlock.address[0] = "12" formMultiple.multipleBlock.mail[0] = "13" transaction { - formMultiple.multipleBlock.block.checkUniqueIndices(0) + formMultiple.multipleBlock.checkUniqueIndices(0) } // Should works without throwing exception @@ -222,7 +222,7 @@ class VBlockTests : VApplicationTestBase() { formMultiple.multipleBlock.address[0] = "17" formMultiple.multipleBlock.mail[0] = "9" transaction { - formMultiple.multipleBlock.block.checkUniqueIndices(0) + formMultiple.multipleBlock.checkUniqueIndices(0) } } finally { transaction { @@ -238,7 +238,7 @@ class VBlockTests : VApplicationTestBase() { val vExecFailedException = assertFailsWith { transaction { - FormWithList.blockWithManyTables.block.refreshLookup(0) + FormWithList.blockWithManyTables.refreshLookup(0) } } @@ -251,7 +251,7 @@ class VBlockTests : VApplicationTestBase() { transaction { initModules() - FormWithList.blockWithManyTables.block.refreshLookup(0) + FormWithList.blockWithManyTables.refreshLookup(0) } } @@ -266,7 +266,7 @@ class VBlockTests : VApplicationTestBase() { FormSample.tb1.age.value = 6 FormSample.tb1.job.value = "jobValue" - val blockSearchCondition = FormSample.tb1.block.getSearchConditions() + val blockSearchCondition = FormSample.tb1.getSearchConditions() transaction { assertEquals( "(\"USER\".TS = 0) AND (\"USER\".UC = 0) AND (\"USER\".\"NAME\" = 'myName') AND " + @@ -278,9 +278,9 @@ class VBlockTests : VApplicationTestBase() { @Test fun getSearchConditionsTest2() { val FormSample = FormSample() - with(FormSample.tb1.block) { - fields[5].setSearchOperator(VConstants.SOP_LT) - fields[6].setSearchOperator(VConstants.SOP_NE) + with(FormSample.tb1) { + blockFields[5].setSearchOperator(VConstants.SOP_LT) + blockFields[6].setSearchOperator(VConstants.SOP_NE) } FormSample.tb1.id.value = null FormSample.tb1.uc.value = 0 @@ -288,7 +288,7 @@ class VBlockTests : VApplicationTestBase() { FormSample.tb1.name.value = "myName*" FormSample.tb1.age.value = 8 FormSample.tb1.job.value = "jobValue*" - val blockSearchCondition = FormSample.tb1.block.getSearchConditions() + val blockSearchCondition = FormSample.tb1.getSearchConditions() transaction { assertEquals( @@ -302,9 +302,9 @@ class VBlockTests : VApplicationTestBase() { @Test fun getSearchConditionsTest3() { val FormSample = FormSample() - with(FormSample.tb1.block) { - fields[5].setSearchOperator(VConstants.SOP_GT) - fields[6].setSearchOperator(VConstants.SOP_EQ) + with(FormSample.tb1) { + blockFields[5].setSearchOperator(VConstants.SOP_GT) + blockFields[6].setSearchOperator(VConstants.SOP_EQ) } FormSample.tb1.id.value = null @@ -314,7 +314,7 @@ class VBlockTests : VApplicationTestBase() { FormSample.tb1.age.value = 9 FormSample.tb1.job.value = "jobValue" - val blockSearchCondition = FormSample.tb1.block.getSearchConditions() + val blockSearchCondition = FormSample.tb1.getSearchConditions() transaction { assertEquals( "(\"USER\".TS = 0) AND (\"USER\".UC = 0) AND (\"USER\".\"NAME\" LIKE '%myName') AND " + @@ -326,9 +326,9 @@ class VBlockTests : VApplicationTestBase() { @Test fun getSearchConditionsTest4() { val FormSample = FormSample() - with(FormSample.tb1.block) { - fields[5].setSearchOperator(VConstants.SOP_LE) - fields[6].setSearchOperator(VConstants.SOP_EQ) + with(FormSample.tb1) { + blockFields[5].setSearchOperator(VConstants.SOP_LE) + blockFields[6].setSearchOperator(VConstants.SOP_EQ) } FormSample.tb1.id.value = null FormSample.tb1.uc.value = 0 @@ -337,7 +337,7 @@ class VBlockTests : VApplicationTestBase() { FormSample.tb1.age.value = 10 FormSample.tb1.job.value = "*jobValue" - val blockSearchCondition = FormSample.tb1.block.getSearchConditions() + val blockSearchCondition = FormSample.tb1.getSearchConditions() transaction { assertEquals( "(\"USER\".TS = 0) AND (\"USER\".UC = 0) AND (\"USER\".\"NAME\" LIKE 'my%Name') AND " + @@ -350,9 +350,9 @@ class VBlockTests : VApplicationTestBase() { @Test fun getSearchConditionsTest5() { val FormSample = FormSample() - with(FormSample.tb1.block) { - fields[5].setSearchOperator(VConstants.SOP_GE) - fields[6].setSearchOperator(VConstants.SOP_EQ) + with(FormSample.tb1) { + blockFields[5].setSearchOperator(VConstants.SOP_GE) + blockFields[6].setSearchOperator(VConstants.SOP_EQ) } FormSample.tb1.uc.value = 0 FormSample.tb1.ts.value = 0 @@ -360,7 +360,7 @@ class VBlockTests : VApplicationTestBase() { FormSample.tb1.age.value = 11 FormSample.tb1.job.value = "job*Value" - val blockSearchCondition = FormSample.tb1.block.getSearchConditions() + val blockSearchCondition = FormSample.tb1.getSearchConditions() transaction { assertEquals( "(\"USER\".TS = 0) AND (\"USER\".UC = 0) AND (\"USER\".\"NAME\" LIKE '%') AND " + @@ -372,7 +372,7 @@ class VBlockTests : VApplicationTestBase() { @Test fun getSearchOrderTest() { - val orderBys = FormWithList.block3.block.getSearchOrder() + val orderBys = FormWithList.block3.getSearchOrder() assertCollectionsEquals(arrayListOf(Users.name to SortOrder.ASC), orderBys) } @@ -383,8 +383,8 @@ class VBlockTests : VApplicationTestBase() { transaction { initSampleFormTables() //fetch record search with id 1 and there is no exception - FormSample.tb1.block.fetchRecord(1) - assertEquals(VConstants.MOD_UPDATE, FormSample.tb1.block.getMode()) + FormSample.tb1.fetchRecord(1) + assertEquals(VConstants.MOD_UPDATE, FormSample.tb1.getMode()) SchemaUtils.drop(User) } } @@ -396,7 +396,7 @@ class VBlockTests : VApplicationTestBase() { SchemaUtils.create(User) assertThrows(VSkipRecordException::class.java) { - FormSample.tb1.block.fetchRecord(1) + FormSample.tb1.fetchRecord(1) } SchemaUtils.drop(User) } @@ -413,7 +413,7 @@ class VBlockTests : VApplicationTestBase() { it[ts] = 0 it[uc] = 0 } - val error = assertThrows(AssertionError::class.java) { FormSample.tb1.block.fetchRecord(1) } + val error = assertThrows(AssertionError::class.java) { FormSample.tb1.fetchRecord(1) } assertEquals("too many rows", error.message) SchemaUtils.drop(User) @@ -427,8 +427,8 @@ class VBlockTests : VApplicationTestBase() { initSampleFormTables() FormSample.tb1.name.value = "AUDREY" FormSample.tb1.age.value = 26 - FormSample.tb1.block.load() - FormSample.tb1.block.fetchNextRecord(0) + FormSample.tb1.load() + FormSample.tb1.fetchNextRecord(0) val query = User.select { User.name.eq("AUDREY") and User.age.eq(26) }.single() val listInfoUser = listOf(query[User.id], query[User.name], query[User.age], query[User.job]) @@ -437,7 +437,7 @@ class VBlockTests : VApplicationTestBase() { listOf(1, FormSample.tb1.name.value, FormSample.tb1.age.value, FormSample.tb1.job.value), listInfoUser ) - assertEquals(VConstants.MOD_UPDATE, FormSample.tb1.block.getMode()) + assertEquals(VConstants.MOD_UPDATE, FormSample.tb1.getMode()) SchemaUtils.drop(User) } } @@ -445,17 +445,17 @@ class VBlockTests : VApplicationTestBase() { @Test fun `fetchNextRecord multi block scenario test`() { val error = assertThrows(AssertionError::class.java) { - FormWithMultipleBlock.multipleBlock.block.fetchNextRecord(0) + FormWithMultipleBlock.multipleBlock.fetchNextRecord(0) } - assertEquals(FormWithMultipleBlock.multipleBlock.block.name + " is a multi block", error.message) + assertEquals(FormWithMultipleBlock.multipleBlock.getName() + " is a multi block", error.message) } @Test fun `fetchNextRecord exec failed scenario test`() { val FormSample = FormSample() assertThrows(VExecFailedException::class.java) { - FormSample.tb1.block.fetchNextRecord(3) + FormSample.tb1.fetchNextRecord(3) } } @@ -473,7 +473,7 @@ class VBlockTests : VApplicationTestBase() { FormSample.tb1.job.value = "job" FormSample.tb1.setMode(Mode.INSERT) - FormSample.tb1.block.save() + FormSample.tb1.save() val query = User.selectAll().single() val listInfoUser = listOf(query[User.id], query[User.name], query[User.age], query[User.job]) @@ -502,7 +502,7 @@ class VBlockTests : VApplicationTestBase() { FormSample.tb1.job.value = "work" FormSample.tb1.setMode(Mode.UPDATE) - FormSample.tb1.block.save() + FormSample.tb1.save() val query = User.select { User.id eq 1 }.single() val listInfoUser = listOf(query[User.id], query[User.name], query[User.age], query[User.job]) @@ -545,7 +545,7 @@ class VBlockTests : VApplicationTestBase() { formMultiple.multipleBlock.setMode(Mode.INSERT) - formMultiple.multipleBlock.block.save() + formMultiple.multipleBlock.save() val listInfoCenter = mutableListOf() @@ -603,10 +603,10 @@ class VBlockTests : VApplicationTestBase() { formMultiple.multipleBlock.mail[2] = "center333@gmail.com" formMultiple.multipleBlock.setMode(Mode.UPDATE) - formMultiple.multipleBlock.block.setRecordFetched(0, true) - formMultiple.multipleBlock.block.setRecordFetched(1, true) - formMultiple.multipleBlock.block.setRecordFetched(2, true) - formMultiple.multipleBlock.block.save() + formMultiple.multipleBlock.setRecordFetched(0, true) + formMultiple.multipleBlock.setRecordFetched(1, true) + formMultiple.multipleBlock.setRecordFetched(2, true) + formMultiple.multipleBlock.save() val listInfoCenter = mutableListOf() @@ -656,8 +656,8 @@ class VBlockTests : VApplicationTestBase() { FormSample.tb1.age.value = 23 FormSample.tb1.job.value = "job" - FormSample.tb1.block.setRecordFetched(0, true) - FormSample.tb1.block.delete() + FormSample.tb1.setRecordFetched(0, true) + FormSample.tb1.delete() count = User.select { User.id eq 1 }.count() assertEquals(0, count) @@ -690,9 +690,9 @@ class VBlockTests : VApplicationTestBase() { formMultiple.multipleBlock.mail[1] = "center222@gmail.com" formMultiple.multipleBlock.setMode(Mode.UPDATE) - formMultiple.multipleBlock.block.setRecordFetched(0, true) - formMultiple.multipleBlock.block.setRecordFetched(1, true) - formMultiple.multipleBlock.block.delete() + formMultiple.multipleBlock.setRecordFetched(0, true) + formMultiple.multipleBlock.setRecordFetched(1, true) + formMultiple.multipleBlock.delete() count = Center.selectAll().count() assertEquals(1, count) @@ -711,7 +711,7 @@ class VBlockTests : VApplicationTestBase() { FormSample.tb1.age.columns?.getColumnsModels()?.get(0)?.column, FormSample.tb1.job.columns?.getColumnsModels()?.get(0)?.column, FormSample.tb1.cv.columns?.getColumnsModels()?.get(0)?.column), - FormSample.tb1.block.getSearchColumns() + FormSample.tb1.getSearchColumns() ) } @@ -728,8 +728,8 @@ class VBlockTests : VApplicationTestBase() { it[age] = 26 it[job] = "job" } - FormSample.tb1.block.clear() - FormSample.tb1.block.load() + FormSample.tb1.clear() + FormSample.tb1.load() val query = User.selectAll().single() val listInfoUser = listOf(query[User.id], query[User.ts], query[User.uc], query[User.name], query[User.age], query[User.job]) @@ -741,7 +741,7 @@ class VBlockTests : VApplicationTestBase() { FormSample.tb1.age.value, FormSample.tb1.job.value), listInfoUser) - assertEquals(VConstants.MOD_UPDATE, FormSample.tb1.block.getMode()) + assertEquals(VConstants.MOD_UPDATE, FormSample.tb1.getMode()) SchemaUtils.drop(User) } } @@ -752,10 +752,10 @@ class VBlockTests : VApplicationTestBase() { transaction { initSampleFormTables() - FormSample.tb1.block.clear() + FormSample.tb1.clear() FormSample.tb1.id.value = 3 FormSample.tb1.age.value = 25 - FormSample.tb1.block.load() + FormSample.tb1.load() val query = User.select { User.id eq 3 }.single() val listInfoUser = listOf(query[User.id], query[User.ts], query[User.uc], query[User.name], query[User.age], query[User.job]) @@ -767,7 +767,7 @@ class VBlockTests : VApplicationTestBase() { FormSample.tb1.age.value, FormSample.tb1.job.value), listInfoUser) - assertEquals(VConstants.MOD_UPDATE, FormSample.tb1.block.getMode()) + assertEquals(VConstants.MOD_UPDATE, FormSample.tb1.getMode()) SchemaUtils.drop(User) } } @@ -780,7 +780,7 @@ class VBlockTests : VApplicationTestBase() { FormSample.tb1.id.value = 2 FormSample.tb1.age.value = 27 - val error = assertThrows(VQueryNoRowException::class.java) { FormSample.tb1.block.load() } + val error = assertThrows(VQueryNoRowException::class.java) { FormSample.tb1.load() } assertEquals("VIS-00022: No matching value found.", error.message) SchemaUtils.drop(User) @@ -791,11 +791,11 @@ class VBlockTests : VApplicationTestBase() { fun `load multiple block scenario test`() { transaction { initMultipleBlockFormTables() - formMultiple.multipleBlock.block.clear() + formMultiple.multipleBlock.clear() formMultiple.multipleBlock.trainingId[0] = 1 formMultiple.multipleBlock.trainingId[1] = 1 formMultiple.multipleBlock.trainingId[2] = 1 - formMultiple.multipleBlock.block.load() + formMultiple.multipleBlock.load() val listInfoCenter = mutableListOf() @@ -835,9 +835,9 @@ class VBlockTests : VApplicationTestBase() { transaction { initSampleFormTables() - FormSample.model.setActiveBlock(FormSample.tb1.block) + FormSample.model.setActiveBlock(FormSample.tb1) FormSample.tb1.id.value = 1 - FormSample.tb1.block.fetchLookup(FormSample.tb1.id.vField) + FormSample.tb1.fetchLookup(FormSample.tb1.id.vField) val query = User.select { User.name.eq("AUDREY") and User.age.eq(26) }.single() val listInfoUser = listOf(query[User.id], query[User.ts], query[User.uc], query[User.name], query[User.age], query[User.job]) @@ -859,11 +859,11 @@ class VBlockTests : VApplicationTestBase() { transaction { initSampleFormTables() - FormSample.model.setActiveBlock(FormSample.tb1.block) + FormSample.model.setActiveBlock(FormSample.tb1) FormSample.tb1.id.value = 2 val vExecFailedException = assertThrows(VExecFailedException::class.java) { - FormSample.tb1.block.fetchLookup(FormSample.tb1.id.vField) + FormSample.tb1.fetchLookup(FormSample.tb1.id.vField) } assertEquals("VIS-00016: No matching value in User.", vExecFailedException.message) SchemaUtils.drop(User) @@ -874,11 +874,11 @@ class VBlockTests : VApplicationTestBase() { fun `fetchLookup no table found exception scenario test`() { val FormSample = FormSample() transaction { - FormSample.model.setActiveBlock(FormSample.tb1.block) + FormSample.model.setActiveBlock(FormSample.tb1) FormSample.tb1.id.value = 1 val vExecFailedException = assertThrows(VExecFailedException::class.java) { - FormSample.tb1.block.fetchLookup(FormSample.tb1.id.vField) + FormSample.tb1.fetchLookup(FormSample.tb1.id.vField) } assertTrue( @@ -903,11 +903,11 @@ class VBlockTests : VApplicationTestBase() { it[age] = 6 it[job] = "job" } - FormSample.model.setActiveBlock(FormSample.tb1.block) + FormSample.model.setActiveBlock(FormSample.tb1) FormSample.tb1.id.value = 1 val vExecFailedException = assertThrows(VExecFailedException::class.java) { - FormSample.tb1.block.fetchLookup(FormSample.tb1.id.vField) + FormSample.tb1.fetchLookup(FormSample.tb1.id.vField) } assertEquals("VIS-00020: The value in User is not unique.", vExecFailedException.message) SchemaUtils.drop(User) @@ -919,9 +919,9 @@ class VBlockTests : VApplicationTestBase() { val FormSample = FormSample() transaction { initSampleFormTables() - FormSample.tb1.block.clear() + FormSample.tb1.clear() - val query = FormSample.tb1.block.buildQueryDialog()!! + val query = FormSample.tb1.buildQueryDialog()!! val listInfoUser = mutableListOf() User.selectAll().forEach { @@ -947,7 +947,7 @@ class VBlockTests : VApplicationTestBase() { @Test fun `getActiveCommands test`() { - val model = formMultiple.multipleBlock.block + val model = formMultiple.multipleBlock model.setCommandsEnabled(true) assertEquals(1, model.activeCommands.size) @@ -956,12 +956,12 @@ class VBlockTests : VApplicationTestBase() { @Test fun `setMode test`() { - val model = formMultiple.multipleBlock.block + val model = formMultiple.multipleBlock model.setMode(VConstants.MOD_INSERT) assertEquals(VConstants.MOD_INSERT, model.getMode()) // all fields are configured with onInsertHidden() - assertTrue(model.fields.all { + assertTrue(model.blockFields.all { for (counter in 0..model.recordCount) { if (it.getAccess(counter) != VConstants.ACS_HIDDEN) return@all false @@ -972,7 +972,7 @@ class VBlockTests : VApplicationTestBase() { @Test fun `test active field after setting mode`() { - val model = formMultiple.block.block + val model = formMultiple.block model.enter() model.setMode(VConstants.MOD_INSERT) @@ -987,16 +987,16 @@ class VBlockTests : VApplicationTestBase() { @Test fun `set and reset Color test`() { - val model = formMultiple.multipleBlock.block + val model = formMultiple.multipleBlock val recordId = 0 model.setColor(recordId, VColor.BLACK, VColor.WHITE) - assertTrue(model.fields.filter { !it.isInternal() }.all { + assertTrue(model.blockFields.filter { !it.isInternal() }.all { it.getForeground(recordId) == VColor.BLACK && it.getBackground(recordId) == VColor.WHITE }) model.resetColor(recordId) - assertTrue(model.fields.filter { !it.isInternal() }.all { + assertTrue(model.blockFields.filter { !it.isInternal() }.all { it.getForeground(recordId) == null && it.getBackground(recordId) == null }) } @@ -1004,7 +1004,7 @@ class VBlockTests : VApplicationTestBase() { @Test fun `leave block test`() { val formSample = FormSample() - val blockModel = formSample.tb1.block + val blockModel = formSample.tb1 formSample.model.getActiveBlock()?.leave(false) assertNotEquals(blockModel, formSample.model.getActiveBlock()) @@ -1013,7 +1013,7 @@ class VBlockTests : VApplicationTestBase() { @Test fun `sort test`() { - val blockModel = formMultiple.multipleBlock.block + val blockModel = formMultiple.multipleBlock transaction { try { @@ -1034,7 +1034,7 @@ class VBlockTests : VApplicationTestBase() { @Test fun `getNumberOfValidRecord test`() { - val blockModel = formMultiple.multipleBlock.block + val blockModel = formMultiple.multipleBlock transaction { try { @@ -1052,7 +1052,7 @@ class VBlockTests : VApplicationTestBase() { @Test fun `enter test`() { val formSample = FormSample() - val blockModel = formSample.tb1.block + val blockModel = formSample.tb1 blockModel.enter() assertEquals(blockModel, formSample.model.getActiveBlock()) @@ -1071,13 +1071,13 @@ class VBlockTests : VApplicationTestBase() { formSample.tb1.cv.columns?.getColumnsModels()?.get(0)?.column, formSample.tb1.id.columns?.getColumnsModels()?.get(0)?.column ), - formSample.tb1.block.getReportSearchColumns() + formSample.tb1.getReportSearchColumns() ) } @Test fun `trailRecord test`() { - val singleBlockModel = FormWithList.block3.block + val singleBlockModel = FormWithList.block3 transaction { FormWithList.block3.load() @@ -1089,7 +1089,7 @@ class VBlockTests : VApplicationTestBase() { @Test fun `abortTrail test`() { - val singleBlockModel = FormWithList.block3.block + val singleBlockModel = FormWithList.block3 transaction { FormWithList.block3.load() diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/VFieldTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/VFieldTests.kt index fbee06a60..8d684d425 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/VFieldTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/form/VFieldTests.kt @@ -127,7 +127,7 @@ class VFieldTests : JApplicationTestBase() { assertFailsWith(MessageCode.getMessage("VIS-00001")) { transaction { SchemaUtils.create(User) - FormSample.tb1.block.fields[3].validate() + FormSample.tb1.blockFields[3].validate() } } } @@ -167,14 +167,14 @@ class VFieldTests : JApplicationTestBase() { assertFailsWith(MessageCode.getMessage("VIS-00001")) { transaction { SchemaUtils.create(User) - FormSample.tb1.block.fields[5].validate() + FormSample.tb1.blockFields[5].validate() } } } @Test fun `getSearchCondition string field equal to value scenario test`() { - FormSample.tb1.block.clear() + FormSample.tb1.clear() FormSample.tb1.name.value = "name" val column: Column<*>? = FormSample.tb1.name.vField.lookupColumn(User) val fieldSearchCondition = FormSample.tb1.name.vField.getSearchCondition(column!!) @@ -186,7 +186,7 @@ class VFieldTests : JApplicationTestBase() { @Test fun `getSearchCondition string field equal to null scenario test`() { - FormSample.tb1.block.clear() + FormSample.tb1.clear() val column: Column<*>? = FormSample.tb1.name.vField.lookupColumn(User) val fieldSearchCondition = FormSample.tb1.name.vField.getSearchCondition(column!!) @@ -197,7 +197,7 @@ class VFieldTests : JApplicationTestBase() { @Test fun `getSearchCondition string field like value scenario test`() { - FormSample.tb1.block.clear() + FormSample.tb1.clear() FormSample.tb1.name.value = "*name" val column: Column<*>? = FormSample.tb1.name.vField.lookupColumn(User) val fieldSearchCondition = FormSample.tb1.name.vField.getSearchCondition(column!!) @@ -209,7 +209,7 @@ class VFieldTests : JApplicationTestBase() { @Test fun `getSearchCondition string field not like value scenario test`() { - FormSample.tb1.block.clear() + FormSample.tb1.clear() FormSample.tb1.name.vField.setSearchOperator(VConstants.SOP_NE) FormSample.tb1.name.value = "*name" val column: Column<*>? = FormSample.tb1.name.vField.lookupColumn(User) @@ -222,7 +222,7 @@ class VFieldTests : JApplicationTestBase() { @Test fun `getSearchCondition upper string field not like value scenario test`() { - FormSample.tb1.block.clear() + FormSample.tb1.clear() FormSample.tb1.job.vField.setSearchOperator(VConstants.SOP_NE) FormSample.tb1.job.value = "*job" val column: Column<*>? = FormSample.tb1.job.vField.lookupColumn(User) @@ -247,7 +247,7 @@ class VFieldTests : JApplicationTestBase() { @Test fun `getSearchCondition int field equal to value scenario test`() { - FormSample.tb1.block.clear() + FormSample.tb1.clear() FormSample.tb1.id.value = 1 val column: Column<*>? = FormSample.tb1.id.vField.lookupColumn(User) val fieldSearchCondition = FormSample.tb1.id.vField.getSearchCondition(column!!) @@ -259,7 +259,7 @@ class VFieldTests : JApplicationTestBase() { @Test fun `getSearchCondition int field less than value scenario test`() { - FormSample.tb1.block.clear() + FormSample.tb1.clear() FormSample.tb1.id.vField.setSearchOperator(VConstants.SOP_LT) FormSample.tb1.id.value = 1 val column: Column<*>? = FormSample.tb1.id.vField.lookupColumn(User) @@ -272,7 +272,7 @@ class VFieldTests : JApplicationTestBase() { @Test fun `getSearchCondition int field greater than value scenario test`() { - FormSample.tb1.block.clear() + FormSample.tb1.clear() FormSample.tb1.id.vField.setSearchOperator(VConstants.SOP_GT) FormSample.tb1.id.value = 1 val column: Column<*>? = FormSample.tb1.id.vField.lookupColumn(User) @@ -285,7 +285,7 @@ class VFieldTests : JApplicationTestBase() { @Test fun `getSearchCondition int field less than or equal to value scenario test`() { - FormSample.tb1.block.clear() + FormSample.tb1.clear() FormSample.tb1.id.vField.setSearchOperator(VConstants.SOP_LE) FormSample.tb1.id.value = 1 val column: Column<*>? = FormSample.tb1.id.vField.lookupColumn(User) diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/localization/FormLocalizationTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/localization/FormLocalizationTests.kt index 663f17b89..6e3708d05 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/localization/FormLocalizationTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/localization/FormLocalizationTests.kt @@ -33,7 +33,7 @@ import org.kopi.galite.tests.localization.block.ExternBlock import org.kopi.galite.tests.ui.vaadin.GaliteVUITestBase import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.Icon -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Border import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.l10n.LocalizationManager diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/localization/block/ExternBlock.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/localization/block/ExternBlock.kt index 3c4ac93ae..98ee92c73 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/localization/block/ExternBlock.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/localization/block/ExternBlock.kt @@ -17,7 +17,7 @@ package org.kopi.galite.tests.localization.block import org.kopi.galite.visual.domain.INT -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Border class ExternBlock: Block("Block Externe", 1, 1) { diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/field/DocumentationFieldsFormTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/field/DocumentationFieldsFormTests.kt index 4949da84b..163e22649 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/field/DocumentationFieldsFormTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/field/DocumentationFieldsFormTests.kt @@ -520,7 +520,7 @@ class DocumentationFieldsFormTests : GaliteVUITestBase() { // enter letter in this field then assert that th AUTOLEAVE trigger is called and the activate field is set to nextField form.triggersFieldsBlock.autoleaveTriggerField.edit("a") - assertEquals(form.triggersFieldsBlock.preInsTriggerField.vField, form.triggersFieldsBlock.block.activeField) + assertEquals(form.triggersFieldsBlock.preInsTriggerField.vField, form.triggersFieldsBlock.activeField) } @Test diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/field/FieldColorsTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/field/FieldColorsTests.kt index 21de4af60..61ec0a4f8 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/field/FieldColorsTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/field/FieldColorsTests.kt @@ -37,7 +37,7 @@ import org.kopi.galite.visual.domain.TIME import org.kopi.galite.visual.domain.TIMESTAMP import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.PredefinedCommand -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Form import org.kopi.galite.visual.ui.vaadin.field.TextField import org.kopi.galite.visual.ui.vaadin.grid.GridEditorField diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/field/FieldsTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/field/FieldsTests.kt index 00a117d4b..754de168b 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/field/FieldsTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/field/FieldsTests.kt @@ -42,7 +42,7 @@ import org.kopi.galite.testing.triggerCommand import org.kopi.galite.tests.examples.TestFieldsForm import org.kopi.galite.tests.examples.Trainer import org.kopi.galite.tests.ui.vaadin.GaliteVUITestBase -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.ui.vaadin.notif.ErrorNotification import org.kopi.galite.visual.MessageCode import org.kopi.galite.testing.expectErrorNotification diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/form/ActorTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/form/ActorTests.kt index af5186655..d74501001 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/form/ActorTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/form/ActorTests.kt @@ -29,7 +29,7 @@ import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.Actor import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.common.PredefinedCommand -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Form import org.kopi.galite.visual.dsl.form.Key diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/form/MultipleBlockFormTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/form/MultipleBlockFormTests.kt index 76bf47616..3130c73e7 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/form/MultipleBlockFormTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/form/MultipleBlockFormTests.kt @@ -292,7 +292,7 @@ class MultipleBlockFormTests : GaliteVUITestBase() { multipleBlockSaveForm.block._enter() multipleBlockSaveForm.multipleBlock._enter() - multipleBlockSaveForm.multipleBlock.block.activeRecord = 0 + multipleBlockSaveForm.multipleBlock.activeRecord = 0 multipleBlockSaveForm.multipleBlock.address.edit("10,Rue Lac") multipleBlockSaveForm.saveBlock.triggerCommand() val newdata = arrayOf( diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/triggers/FormTriggersTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/triggers/FormTriggersTests.kt index 60920d92f..4de43fdf2 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/triggers/FormTriggersTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/triggers/FormTriggersTests.kt @@ -37,7 +37,7 @@ import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.Icon import org.kopi.galite.visual.dsl.form.Access -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key import org.kopi.galite.visual.dsl.form.ReportSelectionForm diff --git a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/triggers/TriggersTests.kt b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/triggers/TriggersTests.kt index fc0dd7349..75dd4c4c1 100644 --- a/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/triggers/TriggersTests.kt +++ b/galite-tests/src/test/kotlin/org/kopi/galite/tests/ui/vaadin/triggers/TriggersTests.kt @@ -34,7 +34,7 @@ import org.kopi.galite.visual.domain.INT import org.kopi.galite.visual.domain.STRING import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.dsl.form.DictionaryForm -import org.kopi.galite.visual.dsl.form.Block +import org.kopi.galite.visual.form.Block class TriggersTests : GaliteVUITestBase() { @@ -138,7 +138,7 @@ class FormToTestTriggers : DictionaryForm(title = "Form to test triggers", local } val salesSimpleBlock = insertBlock(SalesSimpleBlock()) { trigger(PREBLK) { - block.setDefault() + setDefault() } trigger(DEFAULT) { defaultValueFromBlock.value = "Setting by block" From 6d97ac3e98d18ac0dd01865d450dfde192707a69 Mon Sep 17 00:00:00 2001 From: hfazai Date: Sun, 15 May 2022 14:05:26 +0100 Subject: [PATCH 4/4] Fix compilation error in galite-demo --- .../kotlin/org/kopi/galite/demo/common/FormDefault.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/common/FormDefault.kt b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/common/FormDefault.kt index b138838f6..9fe59c42f 100644 --- a/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/common/FormDefault.kt +++ b/galite-demo/galite-vaadin/src/main/kotlin/org/kopi/galite/demo/common/FormDefault.kt @@ -20,8 +20,8 @@ package org.kopi.galite.demo.common import java.util.Locale import org.kopi.galite.visual.Actor +import org.kopi.galite.visual.Command import org.kopi.galite.visual.Icon -import org.kopi.galite.visual.dsl.common.Command import org.kopi.galite.visual.dsl.common.PredefinedCommand import org.kopi.galite.visual.form.Block import org.kopi.galite.visual.dsl.form.Key @@ -142,22 +142,22 @@ open class FormDefault(title: String, locale: Locale? = null): ReportSelectionFo val Block.recursiveQueryCmd: Command get() = command(item = menuQuery) { - Commands.recursiveQuery(block) + Commands.recursiveQuery(this) } val Block.menuQueryCmd: Command get() = command(item = menuQuery) { - Commands.menuQuery(block) + Commands.menuQuery(this) } val Block.queryMoveCmd: Command get() = command(item = menuQuery) { - Commands.queryMove(block) + Commands.queryMove(this) } val Block.serialQueryCmd: Command get() = command(item = serialQuery) { - Commands.serialQuery(block) + Commands.serialQuery(this) } val Block.insertModeCmd: Command