Mercurial Hosting > luan
changeset 1944:bb12d502b72e default tip
minor
| author | Franklin Schmidt <fschmidt@gmail.com> |
|---|---|
| date | Tue, 20 May 2025 11:18:26 -0600 |
| parents | 763e8e77c468 |
| children | |
| files | src/luan/modules/swing/Abstract_button.luan src/luan/modules/swing/Awt_container.luan src/luan/modules/swing/Awt_window.luan src/luan/modules/swing/Check_box_menu_item.luan src/luan/modules/swing/Component.luan src/luan/modules/swing/Dialog.luan src/luan/modules/swing/File_chooser.luan src/luan/modules/swing/Frame.luan src/luan/modules/swing/Label.luan src/luan/modules/swing/Menu.luan src/luan/modules/swing/Menu_bar.luan src/luan/modules/swing/Menu_item.luan src/luan/modules/swing/Scroll_pane.luan src/luan/modules/swing/Text_area.luan src/luan/modules/swing/Text_area_line_numbers.luan src/luan/modules/swing/Text_field.luan src/luan/modules/swing/Utils.luan |
| diffstat | 17 files changed, 68 insertions(+), 68 deletions(-) [+] |
line wrap: on
line diff
--- a/src/luan/modules/swing/Abstract_button.luan Mon May 19 17:19:23 2025 -0600 +++ b/src/luan/modules/swing/Abstract_button.luan Tue May 20 11:18:26 2025 -0600 @@ -5,7 +5,7 @@ local Utils = require "luan:swing/Utils.luan" local fail = Utils.fail or error() local make_metatable = Utils.make_metatable or error() -local delete = Utils.delete or error() +local remove = Utils.remove or error() local Component = require "luan:swing/Component.luan" local super__index = Component.__index or error() local super__new_index = Component.__new_index or error() @@ -59,27 +59,27 @@ local function construct(button,props) super_construct(button,props) local jbutton = button.java - local text = delete(props,"text") + local text = remove(props,"text") if text~=nil then jbutton.setText(text) end - local enabled = delete(props,"enabled") + local enabled = remove(props,"enabled") if enabled~=nil then jbutton.setEnabled(enabled) end - local margin = delete(props,"margin") + local margin = remove(props,"margin") if margin~=nil then jbutton.setMargin(margin) end - local action = delete(props,"action") + local action = remove(props,"action") if action~=nil then jbutton.setActionCommand(action) end -- mnemonic doesn't work on Mac - local mnemonic = delete(props,"mnemonic") + local mnemonic = remove(props,"mnemonic") if mnemonic~=nil then jbutton.setMnemonic(KeyEvent.getExtendedKeyCodeForChar(char_to_int(mnemonic))) end - local action_listener = delete(props,"action_listener") + local action_listener = remove(props,"action_listener") if action_listener~=nil then jbutton.addActionListener(newActionListener(action_listener)) end - local change_listener = delete(props,"change_listener") + local change_listener = remove(props,"change_listener") if change_listener~=nil then jbutton.addChangeListener(newChangeListener(change_listener)) end - local horizontal_alignment = delete(props,"horizontal_alignment") + local horizontal_alignment = remove(props,"horizontal_alignment") if horizontal_alignment~=nil then local align = alignments[horizontal_alignment] or error "invalid horizontal_alignment" jbutton.setHorizontalAlignment(align) end - local horizontal_text_position = delete(props,"horizontal_text_position") + local horizontal_text_position = remove(props,"horizontal_text_position") if horizontal_text_position~=nil then local align = alignments[horizontal_text_position] or error "invalid horizontal_text_position" jbutton.setHorizontalTextPosition(align)
--- a/src/luan/modules/swing/Awt_container.luan Mon May 19 17:19:23 2025 -0600 +++ b/src/luan/modules/swing/Awt_container.luan Tue May 20 11:18:26 2025 -0600 @@ -3,7 +3,7 @@ local ipairs = Luan.ipairs or error() local Utils = require "luan:swing/Utils.luan" local fail = Utils.fail or error() -local delete = Utils.delete or error() +local remove = Utils.remove or error() local check_not_nil = Utils.check_not_nil or error() local to_dimension = Utils.to_dimension or error() local from_dimension = Utils.from_dimension or error() @@ -54,13 +54,13 @@ function Awt_container.construct(component,props) check_not_nil(props) local jcomponent = component.java - local size = delete(props,"size") + local size = remove(props,"size") if size~=nil then jcomponent.setSize(size.width,size.height) end - local location = delete(props,"location") + local location = remove(props,"location") if location~=nil then jcomponent.setLocation(location.x,location.y) end - local preferred_size = delete(props,"preferred_size") + local preferred_size = remove(props,"preferred_size") if preferred_size~=nil then jcomponent.setPreferredSize(to_dimension(preferred_size)) end - local maximum_size = delete(props,"maximum_size") + local maximum_size = remove(props,"maximum_size") if maximum_size~=nil then jcomponent.setMaximumSize(to_dimension(maximum_size)) end --[[ component.repaint = jcomponent.repaint
--- a/src/luan/modules/swing/Awt_window.luan Mon May 19 17:19:23 2025 -0600 +++ b/src/luan/modules/swing/Awt_window.luan Tue May 20 11:18:26 2025 -0600 @@ -2,7 +2,7 @@ local error = Luan.error local Utils = require "luan:swing/Utils.luan" local fail = Utils.fail or error() -local delete = Utils.delete or error() +local remove = Utils.remove or error() local to_dimension = Utils.to_dimension or error() local Awt_container = require "luan:swing/Awt_container.luan" local super__index = Awt_container.__index or error() @@ -41,7 +41,7 @@ function Awt_window.construct(window,props) super_construct(window,props) local jwindow = window.java - local focusable_window_state = delete(props,"focusable_window_state") + local focusable_window_state = remove(props,"focusable_window_state") if focusable_window_state~=nil then jwindow.setFocusableWindowState(focusable_window_state) end window.pack = jwindow.pack function window.add_close_listener(close_listener)
--- a/src/luan/modules/swing/Check_box_menu_item.luan Mon May 19 17:19:23 2025 -0600 +++ b/src/luan/modules/swing/Check_box_menu_item.luan Tue May 20 11:18:26 2025 -0600 @@ -5,7 +5,7 @@ local fail = Utils.fail or error() local make_metatable = Utils.make_metatable or error() local check_empty = Utils.check_empty or error() -local delete = Utils.delete or error() +local remove = Utils.remove or error() local Menu_item = require "luan:swing/Menu_item.luan" local super__index = Menu_item.__index or error() local super__new_index = Menu_item.__new_index or error() @@ -41,7 +41,7 @@ local jcbmi = JCheckBoxMenuItem.new() local cbmi = { java = jcbmi } super_construct(cbmi,props) - local state = delete(props,"state") + local state = remove(props,"state") if state~=nil then jcbmi.setState(state) end check_empty(props) set_metatable(cbmi,mt)
--- a/src/luan/modules/swing/Component.luan Mon May 19 17:19:23 2025 -0600 +++ b/src/luan/modules/swing/Component.luan Tue May 20 11:18:26 2025 -0600 @@ -6,7 +6,7 @@ local Utils = require "luan:swing/Utils.luan" local fail = Utils.fail or error() local make_metatable = Utils.make_metatable or error() -local delete = Utils.delete or error() +local remove = Utils.remove or error() local check_empty = Utils.check_empty or error() local get_font = require("luan:swing/Font.luan").get or error() local Awt_container = require "luan:swing/Awt_container.luan" @@ -65,7 +65,7 @@ super_construct(component,props) local jcomponent = component.java jcomponent.putClientProperty("luan",component) - local layout = delete(props,"layout") + local layout = remove(props,"layout") if layout~=nil then if type(layout) == "function" then layout = layout(component) @@ -78,25 +78,25 @@ end jcomponent.setFont(font) end - local font = delete(props,"font") + local font = remove(props,"font") if font~=nil then set_font(font) end - local border = delete(props,"border") + local border = remove(props,"border") if border~=nil then jcomponent.setBorder(border) end - local foreground_color = delete(props,"foreground_color") + local foreground_color = remove(props,"foreground_color") if foreground_color~=nil then jcomponent.setForeground(foreground_color) end - local background_color = delete(props,"background_color") + local background_color = remove(props,"background_color") if background_color~=nil then jcomponent.setBackground(background_color) end - local visible = delete(props,"visible") + local visible = remove(props,"visible") if visible~=nil then jcomponent.setVisible(visible) end - local alignment_x = delete(props,"alignment_x") + local alignment_x = remove(props,"alignment_x") if alignment_x~=nil then alignment_x = alignments[alignment_x] or error "invalid alignment_x" jcomponent.setAlignmentX(alignment_x) end - local tool_tip_text = delete(props,"tool_tip_text") + local tool_tip_text = remove(props,"tool_tip_text") if tool_tip_text~=nil then jcomponent.setToolTipText(tool_tip_text) end - component.constraints = delete(props,"constraints") - local children = delete(props,"children") + component.constraints = remove(props,"constraints") + local children = remove(props,"children") if children~=nil then for _, child in ipairs(children) do jcomponent.add(child.java,child.constraints)
--- a/src/luan/modules/swing/Dialog.luan Mon May 19 17:19:23 2025 -0600 +++ b/src/luan/modules/swing/Dialog.luan Tue May 20 11:18:26 2025 -0600 @@ -4,7 +4,7 @@ local Utils = require "luan:swing/Utils.luan" local fail = Utils.fail or error() local make_metatable = Utils.make_metatable or error() -local delete = Utils.delete or error() +local remove = Utils.remove or error() local check_empty = Utils.check_empty or error() local check_not_nil = Utils.check_not_nil or error() local new_component = require("luan:swing/Component.luan").new_component or error() @@ -48,11 +48,11 @@ function Dialog.new(props) check_not_nil(props) - local owner_frame = delete(props,"owner_frame") + local owner_frame = remove(props,"owner_frame") local jdialog = JDialog.new( owner_frame and owner_frame.java ) local dialog = { java = jdialog } super_construct(dialog,props) - local content_pane = delete(props,"content_pane") + local content_pane = remove(props,"content_pane") if content_pane~=nil then jdialog.setContentPane(content_pane.java) end check_empty(props) function dialog.move_into_owner()
--- a/src/luan/modules/swing/File_chooser.luan Mon May 19 17:19:23 2025 -0600 +++ b/src/luan/modules/swing/File_chooser.luan Tue May 20 11:18:26 2025 -0600 @@ -3,7 +3,7 @@ local Io = require "luan:Io.luan" local new_file = Io.schemes.file or error() local Utils = require "luan:swing/Utils.luan" -local delete = Utils.delete or error() +local remove = Utils.remove or error() local check_empty = Utils.check_empty or error() require "java" local FileDialog = require "java:java.awt.FileDialog" @@ -19,12 +19,12 @@ } function File_chooser.awt_choose_file(props) - local parent = delete(props,"parent") + local parent = remove(props,"parent") parent = parent and parent.java local file_dialog = FileDialog.new(parent) - local directory = delete(props,"directory") + local directory = remove(props,"directory") if directory~=nil then file_dialog.setDirectory(directory.to_string()) end - local action = delete(props,"action") or error[["action" property required]] + local action = remove(props,"action") or error[["action" property required]] action = awt_actions[action] or error[["action" property must be "load" or "save"]] check_empty(props) file_dialog.setMode(action) @@ -39,11 +39,11 @@ function File_chooser.swing_choose_file(props) local file_chooser = JFileChooser.new() - local directory = delete(props,"directory") + local directory = remove(props,"directory") if directory~=nil then file_chooser.setCurrentDirectory(directory.java.file) end - local parent = delete(props,"parent") + local parent = remove(props,"parent") parent = parent and parent.java - local action = delete(props,"action") or error[["action" property required]] + local action = remove(props,"action") or error[["action" property required]] check_empty(props) local state if action == "load" then
--- a/src/luan/modules/swing/Frame.luan Mon May 19 17:19:23 2025 -0600 +++ b/src/luan/modules/swing/Frame.luan Tue May 20 11:18:26 2025 -0600 @@ -5,7 +5,7 @@ local Utils = require "luan:swing/Utils.luan" local fail = Utils.fail or error() local make_metatable = Utils.make_metatable or error() -local delete = Utils.delete or error() +local remove = Utils.remove or error() local check_empty = Utils.check_empty or error() local Awt_window = require "luan:swing/Awt_window.luan" local super__index = Awt_window.__index or error() @@ -46,7 +46,7 @@ local function new2(frame,props) super_construct(frame,props) local jframe = frame.java - local content_pane = delete(props,"content_pane") + local content_pane = remove(props,"content_pane") if content_pane~=nil then jframe.setContentPane(content_pane.java) end check_empty(props) function frame.set_menu_bar(menu_bar)
--- a/src/luan/modules/swing/Label.luan Mon May 19 17:19:23 2025 -0600 +++ b/src/luan/modules/swing/Label.luan Tue May 20 11:18:26 2025 -0600 @@ -4,7 +4,7 @@ local Utils = require "luan:swing/Utils.luan" local fail = Utils.fail or error() local make_metatable = Utils.make_metatable or error() -local delete = Utils.delete or error() +local remove = Utils.remove or error() local check_empty = Utils.check_empty or error() local Component = require "luan:swing/Component.luan" local super__index = Component.__index or error() @@ -49,7 +49,7 @@ jlabel.setFont(UIManager.getFont("Label.font")) local label = { java = jlabel } super_construct(label,props) - local text = delete(props,"text") + local text = remove(props,"text") if text~=nil then jlabel.setText(text) end check_empty(props) set_metatable(label,mt)
--- a/src/luan/modules/swing/Menu.luan Mon May 19 17:19:23 2025 -0600 +++ b/src/luan/modules/swing/Menu.luan Tue May 20 11:18:26 2025 -0600 @@ -5,7 +5,7 @@ local Utils = require "luan:swing/Utils.luan" local make_metatable = Utils.make_metatable or error() local check_empty = Utils.check_empty or error() -local delete = Utils.delete or error() +local remove = Utils.remove or error() local Menu_item = require "luan:swing/Menu_item.luan" local super__index = Menu_item.__index or error() local super__new_index = Menu_item.__new_index or error() @@ -27,7 +27,7 @@ local jmenu = JMenu.new() local menu = { java = jmenu } super_construct(menu,props) - local menu_items = delete(props,"menu_items") + local menu_items = remove(props,"menu_items") if menu_items~=nil then for _, menu_item in ipairs(menu_items) do if menu_item == separator then
--- a/src/luan/modules/swing/Menu_bar.luan Mon May 19 17:19:23 2025 -0600 +++ b/src/luan/modules/swing/Menu_bar.luan Tue May 20 11:18:26 2025 -0600 @@ -5,7 +5,7 @@ local Utils = require "luan:swing/Utils.luan" local make_metatable = Utils.make_metatable or error() local check_empty = Utils.check_empty or error() -local delete = Utils.delete or error() +local remove = Utils.remove or error() local Component = require "luan:swing/Component.luan" local super_construct = Component.construct or error() require "java" @@ -20,7 +20,7 @@ local jmenu_bar = JMenuBar.new() local menu_bar = { java = jmenu_bar } super_construct(menu_bar,props) - local menus = delete(props,"menus") + local menus = remove(props,"menus") if menus~=nil then for _, menu in ipairs(menus) do jmenu_bar.add(menu.java)
--- a/src/luan/modules/swing/Menu_item.luan Mon May 19 17:19:23 2025 -0600 +++ b/src/luan/modules/swing/Menu_item.luan Tue May 20 11:18:26 2025 -0600 @@ -4,7 +4,7 @@ local Utils = require "luan:swing/Utils.luan" local fail = Utils.fail or error() local make_metatable = Utils.make_metatable or error() -local delete = Utils.delete or error() +local remove = Utils.remove or error() local check_empty = Utils.check_empty or error() local Abstract_button = require "luan:swing/Abstract_button.luan" local super__index = Abstract_button.__index or error() @@ -44,7 +44,7 @@ local function construct(menu_item,props) super_construct(menu_item,props) local jmenu_item = menu_item.java - local accelerator = delete(props,"accelerator") + local accelerator = remove(props,"accelerator") if accelerator~=nil then jmenu_item.setAccelerator(KeyStroke.getKeyStroke(accelerator)) end return menu_item end
--- a/src/luan/modules/swing/Scroll_pane.luan Mon May 19 17:19:23 2025 -0600 +++ b/src/luan/modules/swing/Scroll_pane.luan Tue May 20 11:18:26 2025 -0600 @@ -3,7 +3,7 @@ local set_metatable = Luan.set_metatable or error() local Utils = require "luan:swing/Utils.luan" local make_metatable = Utils.make_metatable or error() -local delete = Utils.delete or error() +local remove = Utils.remove or error() local check_empty = Utils.check_empty or error() local Component = require "luan:swing/Component.luan" local super_construct = Component.construct or error() @@ -19,11 +19,11 @@ local Scroll_pane = {} function Scroll_pane.new(props) - local view = delete(props,"view") or error "view property requied" + local view = remove(props,"view") or error "view property requied" local jscroll_pane = JScrollPane.new(view.java) local scroll_pane = { java = jscroll_pane } super_construct(scroll_pane,props) - local row_header_view = delete(props,"row_header_view") + local row_header_view = remove(props,"row_header_view") if row_header_view~=nil then jscroll_pane.setRowHeaderView(row_header_view.java) end check_empty(props) function scroll_pane.set_row_header_view(view)
--- a/src/luan/modules/swing/Text_area.luan Mon May 19 17:19:23 2025 -0600 +++ b/src/luan/modules/swing/Text_area.luan Tue May 20 11:18:26 2025 -0600 @@ -5,7 +5,7 @@ local Utils = require "luan:swing/Utils.luan" local fail = Utils.fail or error() local make_metatable = Utils.make_metatable or error() -local delete = Utils.delete or error() +local remove = Utils.remove or error() local check_empty = Utils.check_empty or error() local Text_component = require("luan:swing/Text_component.luan") local super__index = Text_component.__index or error() @@ -84,17 +84,17 @@ local jtext_area = TextAreaLuan.new() local text_area = { java = jtext_area } super_construct(text_area,props) - local rows = delete(props,"rows") + local rows = remove(props,"rows") if rows~=nil then jtext_area.setRows(rows) end - local columns = delete(props,"columns") + local columns = remove(props,"columns") if columns~=nil then jtext_area.setColumns(columns) end - local wrap_style_word = delete(props,"wrap_style_word") + local wrap_style_word = remove(props,"wrap_style_word") if wrap_style_word~=nil then jtext_area.setWrapStyleWord(wrap_style_word) end - local line_wrap = delete(props,"line_wrap") + local line_wrap = remove(props,"line_wrap") if line_wrap~=nil then jtext_area.setLineWrap(line_wrap) end - local tab_size = delete(props,"tab_size") + local tab_size = remove(props,"tab_size") if tab_size~=nil then jtext_area.setTabSize(tab_size) end - local whitespace_visible = delete(props,"whitespace_visible") + local whitespace_visible = remove(props,"whitespace_visible") if whitespace_visible~=nil then jtext_area.setWhitespaceVisible(whitespace_visible) end check_empty(props) function text_area.get_line_from_position(pos)
--- a/src/luan/modules/swing/Text_area_line_numbers.luan Mon May 19 17:19:23 2025 -0600 +++ b/src/luan/modules/swing/Text_area_line_numbers.luan Tue May 20 11:18:26 2025 -0600 @@ -3,7 +3,7 @@ local set_metatable = Luan.set_metatable or error() local Utils = require "luan:swing/Utils.luan" local make_metatable = Utils.make_metatable or error() -local delete = Utils.delete or error() +local remove = Utils.remove or error() local check_empty = Utils.check_empty or error() local Component = require "luan:swing/Component.luan" local super_construct = Component.construct or error() @@ -16,7 +16,7 @@ local mt = make_metatable(Component) function Text_area_line_numbers.new(props) - local text_area = delete(props,"text_area") or error "text_area property requied" + local text_area = remove(props,"text_area") or error "text_area property requied" local jtaln = TextAreaLineNumbersLuan.new(text_area.java) local taln = { java = jtaln } super_construct(taln,props)
--- a/src/luan/modules/swing/Text_field.luan Mon May 19 17:19:23 2025 -0600 +++ b/src/luan/modules/swing/Text_field.luan Tue May 20 11:18:26 2025 -0600 @@ -2,7 +2,7 @@ local error = Luan.error local set_metatable = Luan.set_metatable or error() local Utils = require "luan:swing/Utils.luan" -local delete = Utils.delete or error() +local remove = Utils.remove or error() local check_empty = Utils.check_empty or error() local Text_component = require("luan:swing/Text_component.luan") local super_construct = Text_component.construct or error() @@ -21,13 +21,13 @@ local jtext_field = TextFieldLuan.new() local text_field = { java = jtext_field } super_construct(text_field,props) - local columns = delete(props,"columns") + local columns = remove(props,"columns") if columns~=nil then jtext_field.setColumns(columns) end - local action = delete(props,"action") + local action = remove(props,"action") if action~=nil then jtext_field.setActionCommand(action) end - local action_listener = delete(props,"action_listener") + local action_listener = remove(props,"action_listener") if action_listener~=nil then jtext_field.addActionListener(newActionListener(action_listener)) end - local whitespace_visible = delete(props,"whitespace_visible") + local whitespace_visible = remove(props,"whitespace_visible") if whitespace_visible~=nil then jtext_field.setWhitespaceVisible(whitespace_visible) end check_empty(props) set_metatable(text_field,super_mt)