From 9294c246845c554f31c6e7c81c33a7818762ee8b Mon Sep 17 00:00:00 2001 From: bancika Date: Thu, 19 Nov 2020 18:00:12 +0100 Subject: [PATCH] reorganize IconLoader to avoid namespace clash, fix for Sierra OSX --- .../diylc/{ => core}/images/IconLoader.java | 2 +- .../src/org/diylc/{ => core}/images/about.png | Bin .../src/org/diylc/{ => core}/images/add.png | Bin .../{ => core}/images/arrow_down_blue.png | Bin .../{ => core}/images/arrow_left_blue.png | Bin .../{ => core}/images/arrow_right_blue.png | Bin .../diylc/{ => core}/images/arrow_up_blue.png | Bin .../src/org/diylc/{ => core}/images/at.png | Bin .../src/org/diylc/{ => core}/images/back.png | Bin .../diylc/{ => core}/images/blackboard.png | Bin .../src/org/diylc/{ => core}/images/bom.png | Bin .../src/org/diylc/{ => core}/images/bug.png | Bin .../src/org/diylc/{ => core}/images/check.png | Bin .../src/org/diylc/{ => core}/images/chest.png | Bin .../org/diylc/{ => core}/images/component.png | Bin .../src/org/diylc/{ => core}/images/copy.png | Bin .../src/org/diylc/{ => core}/images/csv.png | Bin .../src/org/diylc/{ => core}/images/cut.png | Bin .../org/diylc/{ => core}/images/delete.png | Bin .../org/diylc/{ => core}/images/disk_blue.png | Bin .../src/org/diylc/{ => core}/images/disks.png | Bin .../org/diylc/{ => core}/images/document.png | Bin .../diylc/{ => core}/images/document_edit.png | Bin .../diylc/{ => core}/images/document_info.png | Bin .../images/document_plain_yellow.png | Bin .../org/diylc/{ => core}/images/donate.gif | Bin .../org/diylc/{ => core}/images/donate.png | Bin .../src/org/diylc/{ => core}/images/edit.png | Bin .../{ => core}/images/edit_component.png | Bin .../{ => core}/images/elements_selection.png | Bin .../src/org/diylc/{ => core}/images/error.png | Bin .../src/org/diylc/{ => core}/images/excel.png | Bin .../src/org/diylc/{ => core}/images/exit.png | Bin .../org/diylc/{ => core}/images/export.png | Bin .../src/org/diylc/{ => core}/images/faq.png | Bin .../diylc/{ => core}/images/folder_music.png | Bin .../diylc/{ => core}/images/folder_out.png | Bin .../org/diylc/{ => core}/images/forbidden.png | Bin .../org/diylc/{ => core}/images/form_blue.png | Bin .../diylc/{ => core}/images/form_blue_add.png | Bin .../src/org/diylc/{ => core}/images/front.png | Bin .../org/diylc/{ => core}/images/garbage.png | Bin .../src/org/diylc/{ => core}/images/gear.png | Bin .../src/org/diylc/{ => core}/images/gears.png | Bin .../diylc/{ => core}/images/graph_edge.png | Bin .../{ => core}/images/graph_edge_curved.png | Bin .../{ => core}/images/graph_edge_directed.png | Bin .../src/org/diylc/{ => core}/images/group.png | Bin .../src/org/diylc/{ => core}/images/html.png | Bin .../diylc/{ => core}/images/icon_large.png | Bin .../diylc/{ => core}/images/icon_medium.png | Bin .../diylc/{ => core}/images/icon_small.png | Bin .../org/diylc/{ => core}/images/id_card.png | Bin .../diylc/{ => core}/images/id_card_add.png | Bin .../src/org/diylc/{ => core}/images/image.png | Bin .../diylc/{ => core}/images/lightbulb_off.png | Bin .../diylc/{ => core}/images/lightbulb_on.png | Bin .../org/diylc/{ => core}/images/manual.png | Bin .../{ => core}/images/media_play_green.png | Bin .../{ => core}/images/media_stop_red.png | Bin .../diylc/{ => core}/images/move_small.png | Bin .../{ => core}/images/navigate_check.png | Bin .../diylc/{ => core}/images/navigate_plus.png | Bin .../diylc/{ => core}/images/notebook_add.png | Bin .../src/org/diylc/{ => core}/images/paste.png | Bin .../src/org/diylc/{ => core}/images/pdf.png | Bin .../src/org/diylc/{ => core}/images/pens.png | Bin .../diylc/{ => core}/images/photo_scenery.png | Bin .../org/diylc/{ => core}/images/plugin.png | Bin .../src/org/diylc/{ => core}/images/print.png | Bin .../src/org/diylc/{ => core}/images/redo.png | Bin .../org/diylc/{ => core}/images/refresh.png | Bin .../org/diylc/{ => core}/images/save_as.png | Bin .../org/diylc/{ => core}/images/selection.png | Bin .../src/org/diylc/{ => core}/images/size.png | Bin .../src/org/diylc/{ => core}/images/sort.png | Bin .../diylc/{ => core}/images/trace_mask.png | Bin .../src/org/diylc/{ => core}/images/undo.png | Bin .../org/diylc/{ => core}/images/ungroup.png | Bin .../org/diylc/{ => core}/images/upload.png | Bin .../src/org/diylc/{ => core}/images/view.png | Bin .../org/diylc/{ => core}/images/warning.png | Bin .../diylc/{ => core}/images/window_colors.png | Bin .../org/diylc/{ => core}/images/wrench.png | Bin .../org/diylc/{ => core}/images/zoom_in.png | Bin .../org/diylc/{ => core}/images/zoom_out.png | Bin .../diylc/{ => core}/images/zoom_small.png | Bin .../src/org/diylc/presenter/update.xml | 4 ++++ diylc/diylc-library/lib/diylc-core.jar | Bin 337206 -> 338132 bytes diylc/diylc-swing/lib/diylc-core.jar | Bin 337206 -> 338132 bytes diylc/diylc-swing/library/main.jar | Bin 718491 -> 718491 bytes .../src/org/diylc/DIYLCSplash.java | 2 +- .../src/org/diylc/swing/ActionFactory.java | 2 +- .../src/org/diylc/swing/gui/InfoDialog.java | 2 +- .../src/org/diylc/swing/gui/MainFrame.java | 2 +- .../swing/gui/actionbar/ActionBarPlugin.java | 2 +- .../diylc/{ => swing}/images/IconLoader.java | 2 +- .../org/diylc/{ => swing}/images/about.png | Bin .../src/org/diylc/{ => swing}/images/add.png | Bin .../{ => swing}/images/application_edit.png | Bin .../org/diylc/{ => swing}/images/arrow.png | Bin .../{ => swing}/images/arrow_down_blue.png | Bin .../{ => swing}/images/arrow_left_blue.png | Bin .../{ => swing}/images/arrow_right_blue.png | Bin .../{ => swing}/images/arrow_up_blue.png | Bin .../src/org/diylc/{ => swing}/images/at.png | Bin .../src/org/diylc/{ => swing}/images/back.png | Bin .../diylc/{ => swing}/images/blackboard.png | Bin .../src/org/diylc/{ => swing}/images/bom.png | Bin .../diylc/{ => swing}/images/branch_add.png | Bin .../{ => swing}/images/briefcase_add.png | Bin .../{ => swing}/images/briefcase_into.png | Bin .../src/org/diylc/{ => swing}/images/bug.png | Bin .../org/diylc/{ => swing}/images/check.png | Bin .../org/diylc/{ => swing}/images/chest.png | Bin .../org/diylc/{ => swing}/images/cloud.png | Bin .../org/diylc/{ => swing}/images/cloud_bg.png | Bin .../diylc/{ => swing}/images/cloud_big.png | Bin .../diylc/{ => swing}/images/cloud_delete.png | Bin .../{ => swing}/images/cloud_download.png | Bin .../diylc/{ => swing}/images/cloud_edit.png | Bin .../diylc/{ => swing}/images/cloud_gear.png | Bin .../org/diylc/{ => swing}/images/cloud_up.png | Bin .../diylc/{ => swing}/images/cloud_upload.png | Bin .../diylc/{ => swing}/images/cloud_wait.png | Bin .../{ => swing}/images/coffeebean_edit.png | Bin .../diylc/{ => swing}/images/component.png | Bin .../{ => swing}/images/component_add.png | Bin .../src/org/diylc/{ => swing}/images/copy.png | Bin .../src/org/diylc/{ => swing}/images/csv.png | Bin .../src/org/diylc/{ => swing}/images/cut.png | Bin .../diylc/{ => swing}/images/dashboard.png | Bin .../diylc/{ => swing}/images/data_find.png | Bin .../org/diylc/{ => swing}/images/delete.png | Bin .../diylc/{ => swing}/images/disk_blue.png | Bin .../org/diylc/{ => swing}/images/disks.png | Bin .../org/diylc/{ => swing}/images/document.png | Bin .../{ => swing}/images/document_edit.png | Bin .../{ => swing}/images/document_info.png | Bin .../{ => swing}/images/document_plain.png | Bin .../images/document_plain_yellow.png | Bin .../{ => swing}/images/documents_gear.png | Bin .../org/diylc/{ => swing}/images/donate.gif | Bin .../org/diylc/{ => swing}/images/donate.png | Bin .../org/diylc/{ => swing}/images/download.png | Bin .../org/diylc/{ => swing}/images/earth.png | Bin .../src/org/diylc/{ => swing}/images/edit.png | Bin .../{ => swing}/images/edit_component.png | Bin .../diylc/{ => swing}/images/element_into.png | Bin .../diylc/{ => swing}/images/elements1.png | Bin .../{ => swing}/images/elements_selection.png | Bin .../org/diylc/{ => swing}/images/error.png | Bin .../org/diylc/{ => swing}/images/excel.png | Bin .../src/org/diylc/{ => swing}/images/exit.png | Bin .../org/diylc/{ => swing}/images/export.png | Bin .../src/org/diylc/{ => swing}/images/eye.png | Bin .../src/org/diylc/{ => swing}/images/faq.png | Bin .../src/org/diylc/{ => swing}/images/find.png | Bin .../diylc/{ => swing}/images/fit_to_size.png | Bin .../{ => swing}/images/flexible_leads.png | Bin .../{ => swing}/images/flip_horizontal.png | Bin .../{ => swing}/images/flip_vertical.png | Bin .../diylc/{ => swing}/images/folder_music.png | Bin .../diylc/{ => swing}/images/folder_out.png | Bin .../diylc/{ => swing}/images/forbidden.png | Bin .../diylc/{ => swing}/images/form_blue.png | Bin .../{ => swing}/images/form_blue_add.png | Bin .../org/diylc/{ => swing}/images/front.png | Bin .../org/diylc/{ => swing}/images/garbage.png | Bin .../src/org/diylc/{ => swing}/images/gear.png | Bin .../org/diylc/{ => swing}/images/gears.png | Bin .../diylc/{ => swing}/images/graph_edge.png | Bin .../{ => swing}/images/graph_edge_curved.png | Bin .../images/graph_edge_directed.png | Bin .../diylc/{ => swing}/images/graph_nodes.png | Bin .../org/diylc/{ => swing}/images/group.png | Bin .../org/diylc/{ => swing}/images/guitar.png | Bin .../org/diylc/{ => swing}/images/hammer.png | Bin .../org/diylc/{ => swing}/images/help2.png | Bin .../org/diylc/{ => swing}/images/history.png | Bin .../src/org/diylc/{ => swing}/images/html.png | Bin .../diylc/{ => swing}/images/icon_large.png | Bin .../diylc/{ => swing}/images/icon_medium.png | Bin .../diylc/{ => swing}/images/icon_small.png | Bin .../org/diylc/{ => swing}/images/id_card.png | Bin .../diylc/{ => swing}/images/id_card_add.png | Bin .../diylc/{ => swing}/images/id_card_edit.png | Bin .../org/diylc/{ => swing}/images/image.png | Bin .../{ => swing}/images/jar_bean_into.png | Bin .../org/diylc/{ => swing}/images/key_edit.png | Bin .../diylc/{ => swing}/images/laserpointer.png | Bin .../{ => swing}/images/lightbulb_off.png | Bin .../diylc/{ => swing}/images/lightbulb_on.png | Bin .../org/diylc/{ => swing}/images/loadline.png | Bin .../diylc/{ => swing}/images/loadline_add.png | Bin .../src/org/diylc/{ => swing}/images/lock.png | Bin .../diylc/{ => swing}/images/lock_open.png | Bin .../diylc/{ => swing}/images/magic_wand.png | Bin .../org/diylc/{ => swing}/images/manual.png | Bin .../{ => swing}/images/media_play_green.png | Bin .../{ => swing}/images/media_stop_red.png | Bin .../diylc/{ => swing}/images/megaphone.png | Bin .../org/diylc/{ => swing}/images/messages.png | Bin .../{ => swing}/images/missing_image.png | Bin .../diylc/{ => swing}/images/move_small.png | Bin .../{ => swing}/images/nav_left_blue.png | Bin .../{ => swing}/images/nav_right_blue.png | Bin .../{ => swing}/images/navigate_check.png | Bin .../{ => swing}/images/navigate_plus.png | Bin .../src/org/diylc/{ => swing}/images/node.png | Bin .../diylc/{ => swing}/images/notebook_add.png | Bin .../src/org/diylc/{ => swing}/images/pads.png | Bin .../org/diylc/{ => swing}/images/paste.png | Bin .../src/org/diylc/{ => swing}/images/pdf.png | Bin .../src/org/diylc/{ => swing}/images/pens.png | Bin .../{ => swing}/images/photo_scenery.png | Bin .../diylc/{ => swing}/images/pin_green.png | Bin .../org/diylc/{ => swing}/images/pin_grey.png | Bin .../org/diylc/{ => swing}/images/plugin.png | Bin .../org/diylc/{ => swing}/images/print.png | Bin .../src/org/diylc/{ => swing}/images/redo.png | Bin .../org/diylc/{ => swing}/images/refresh.png | Bin .../diylc/{ => swing}/images/rotate_ccw.png | Bin .../diylc/{ => swing}/images/rotate_cw.png | Bin .../org/diylc/{ => swing}/images/save_as.png | Bin .../diylc/{ => swing}/images/scientist.png | Bin .../diylc/{ => swing}/images/screwdriver.png | Bin .../{ => swing}/images/scroll_information.png | Bin .../diylc/{ => swing}/images/search-box.png | Bin .../diylc/{ => swing}/images/selection.png | Bin .../src/org/diylc/{ => swing}/images/size.png | Bin .../src/org/diylc/{ => swing}/images/sort.png | Bin .../org/diylc/{ => swing}/images/spinning.gif | Bin .../org/diylc/{ => swing}/images/splash.png | Bin .../{ => swing}/images/splash_ceramic.png | Bin .../images/splash_electrolytic.png | Bin .../diylc/{ => swing}/images/splash_film.png | Bin .../{ => swing}/images/splash_resistor.png | Bin .../diylc/{ => swing}/images/star_blue.png | Bin .../diylc/{ => swing}/images/star_grey.png | Bin .../diylc/{ => swing}/images/star_yellow.png | Bin .../{ => swing}/images/tape_measure1.png | Bin .../diylc/{ => swing}/images/trace_mask.png | Bin .../src/org/diylc/{ => swing}/images/undo.png | Bin .../org/diylc/{ => swing}/images/ungroup.png | Bin .../org/diylc/{ => swing}/images/upload.png | Bin .../org/diylc/{ => swing}/images/user1.png | Bin .../src/org/diylc/{ => swing}/images/view.png | Bin .../org/diylc/{ => swing}/images/warning.png | Bin .../src/org/diylc/{ => swing}/images/web.png | Bin .../{ => swing}/images/window_colors.png | Bin .../org/diylc/{ => swing}/images/wrench.png | Bin .../org/diylc/{ => swing}/images/zoom_in.png | Bin .../org/diylc/{ => swing}/images/zoom_out.png | Bin .../diylc/{ => swing}/images/zoom_small.png | Bin .../swing/loadline/LoadlineEditorFrame.java | 2 +- .../swing/plugins/canvas/CanvasPlugin.java | 2 +- .../swing/plugins/cloud/CloudPlugIn.java | 4 ++-- .../view/browser/AnimatedCloudGlassPane.java | 6 +++--- .../cloud/view/browser/CloudBrowserFrame.java | 4 ++-- .../view/browser/ResultsScrollPanel.java | 4 ++-- .../cloud/view/browser/SearchHeaderPanel.java | 6 +++--- .../view/browser/SimpleCloudGlassPane.java | 6 +++--- .../view/browser/UploadManagerFrame.java | 4 ++-- .../swing/plugins/config/ConfigPlugin.java | 2 +- .../swing/plugins/edit/EditMenuPlugin.java | 2 +- .../diylc/swing/plugins/file/BomDialog.java | 4 ++-- .../swing/plugins/file/FileMenuPlugin.java | 4 ++-- .../swing/plugins/help/HelpMenuPlugin.java | 2 +- .../swing/plugins/statusbar/StatusBar.java | 2 +- .../toolbox/ComponentButtonFactory.java | 2 +- .../diylc/swing/plugins/tree/TreePanel.java | 2 +- 272 files changed, 40 insertions(+), 36 deletions(-) rename diylc/diylc-core/src/org/diylc/{ => core}/images/IconLoader.java (97%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/about.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/add.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/arrow_down_blue.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/arrow_left_blue.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/arrow_right_blue.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/arrow_up_blue.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/at.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/back.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/blackboard.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/bom.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/bug.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/check.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/chest.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/component.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/copy.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/csv.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/cut.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/delete.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/disk_blue.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/disks.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/document.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/document_edit.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/document_info.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/document_plain_yellow.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/donate.gif (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/donate.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/edit.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/edit_component.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/elements_selection.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/error.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/excel.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/exit.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/export.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/faq.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/folder_music.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/folder_out.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/forbidden.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/form_blue.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/form_blue_add.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/front.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/garbage.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/gear.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/gears.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/graph_edge.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/graph_edge_curved.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/graph_edge_directed.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/group.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/html.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/icon_large.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/icon_medium.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/icon_small.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/id_card.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/id_card_add.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/image.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/lightbulb_off.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/lightbulb_on.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/manual.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/media_play_green.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/media_stop_red.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/move_small.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/navigate_check.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/navigate_plus.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/notebook_add.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/paste.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/pdf.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/pens.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/photo_scenery.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/plugin.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/print.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/redo.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/refresh.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/save_as.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/selection.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/size.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/sort.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/trace_mask.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/undo.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/ungroup.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/upload.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/view.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/warning.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/window_colors.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/wrench.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/zoom_in.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/zoom_out.png (100%) rename diylc/diylc-core/src/org/diylc/{ => core}/images/zoom_small.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/IconLoader.java (98%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/about.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/add.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/application_edit.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/arrow.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/arrow_down_blue.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/arrow_left_blue.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/arrow_right_blue.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/arrow_up_blue.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/at.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/back.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/blackboard.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/bom.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/branch_add.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/briefcase_add.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/briefcase_into.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/bug.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/check.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/chest.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/cloud.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/cloud_bg.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/cloud_big.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/cloud_delete.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/cloud_download.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/cloud_edit.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/cloud_gear.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/cloud_up.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/cloud_upload.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/cloud_wait.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/coffeebean_edit.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/component.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/component_add.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/copy.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/csv.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/cut.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/dashboard.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/data_find.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/delete.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/disk_blue.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/disks.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/document.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/document_edit.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/document_info.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/document_plain.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/document_plain_yellow.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/documents_gear.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/donate.gif (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/donate.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/download.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/earth.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/edit.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/edit_component.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/element_into.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/elements1.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/elements_selection.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/error.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/excel.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/exit.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/export.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/eye.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/faq.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/find.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/fit_to_size.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/flexible_leads.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/flip_horizontal.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/flip_vertical.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/folder_music.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/folder_out.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/forbidden.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/form_blue.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/form_blue_add.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/front.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/garbage.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/gear.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/gears.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/graph_edge.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/graph_edge_curved.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/graph_edge_directed.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/graph_nodes.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/group.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/guitar.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/hammer.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/help2.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/history.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/html.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/icon_large.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/icon_medium.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/icon_small.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/id_card.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/id_card_add.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/id_card_edit.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/image.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/jar_bean_into.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/key_edit.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/laserpointer.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/lightbulb_off.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/lightbulb_on.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/loadline.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/loadline_add.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/lock.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/lock_open.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/magic_wand.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/manual.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/media_play_green.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/media_stop_red.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/megaphone.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/messages.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/missing_image.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/move_small.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/nav_left_blue.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/nav_right_blue.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/navigate_check.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/navigate_plus.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/node.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/notebook_add.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/pads.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/paste.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/pdf.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/pens.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/photo_scenery.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/pin_green.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/pin_grey.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/plugin.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/print.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/redo.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/refresh.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/rotate_ccw.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/rotate_cw.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/save_as.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/scientist.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/screwdriver.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/scroll_information.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/search-box.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/selection.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/size.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/sort.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/spinning.gif (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/splash.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/splash_ceramic.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/splash_electrolytic.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/splash_film.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/splash_resistor.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/star_blue.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/star_grey.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/star_yellow.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/tape_measure1.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/trace_mask.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/undo.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/ungroup.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/upload.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/user1.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/view.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/warning.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/web.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/window_colors.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/wrench.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/zoom_in.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/zoom_out.png (100%) rename diylc/diylc-swing/src/org/diylc/{ => swing}/images/zoom_small.png (100%) diff --git a/diylc/diylc-core/src/org/diylc/images/IconLoader.java b/diylc/diylc-core/src/org/diylc/core/images/IconLoader.java similarity index 97% rename from diylc/diylc-core/src/org/diylc/images/IconLoader.java rename to diylc/diylc-core/src/org/diylc/core/images/IconLoader.java index 2002e495..b5179366 100644 --- a/diylc/diylc-core/src/org/diylc/images/IconLoader.java +++ b/diylc/diylc-core/src/org/diylc/core/images/IconLoader.java @@ -19,7 +19,7 @@ along with DIYLC. If not, see . */ -package org.diylc.images; +package org.diylc.core.images; import java.awt.Image; import java.awt.image.BufferedImage; diff --git a/diylc/diylc-core/src/org/diylc/images/about.png b/diylc/diylc-core/src/org/diylc/core/images/about.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/about.png rename to diylc/diylc-core/src/org/diylc/core/images/about.png diff --git a/diylc/diylc-core/src/org/diylc/images/add.png b/diylc/diylc-core/src/org/diylc/core/images/add.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/add.png rename to diylc/diylc-core/src/org/diylc/core/images/add.png diff --git a/diylc/diylc-core/src/org/diylc/images/arrow_down_blue.png b/diylc/diylc-core/src/org/diylc/core/images/arrow_down_blue.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/arrow_down_blue.png rename to diylc/diylc-core/src/org/diylc/core/images/arrow_down_blue.png diff --git a/diylc/diylc-core/src/org/diylc/images/arrow_left_blue.png b/diylc/diylc-core/src/org/diylc/core/images/arrow_left_blue.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/arrow_left_blue.png rename to diylc/diylc-core/src/org/diylc/core/images/arrow_left_blue.png diff --git a/diylc/diylc-core/src/org/diylc/images/arrow_right_blue.png b/diylc/diylc-core/src/org/diylc/core/images/arrow_right_blue.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/arrow_right_blue.png rename to diylc/diylc-core/src/org/diylc/core/images/arrow_right_blue.png diff --git a/diylc/diylc-core/src/org/diylc/images/arrow_up_blue.png b/diylc/diylc-core/src/org/diylc/core/images/arrow_up_blue.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/arrow_up_blue.png rename to diylc/diylc-core/src/org/diylc/core/images/arrow_up_blue.png diff --git a/diylc/diylc-core/src/org/diylc/images/at.png b/diylc/diylc-core/src/org/diylc/core/images/at.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/at.png rename to diylc/diylc-core/src/org/diylc/core/images/at.png diff --git a/diylc/diylc-core/src/org/diylc/images/back.png b/diylc/diylc-core/src/org/diylc/core/images/back.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/back.png rename to diylc/diylc-core/src/org/diylc/core/images/back.png diff --git a/diylc/diylc-core/src/org/diylc/images/blackboard.png b/diylc/diylc-core/src/org/diylc/core/images/blackboard.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/blackboard.png rename to diylc/diylc-core/src/org/diylc/core/images/blackboard.png diff --git a/diylc/diylc-core/src/org/diylc/images/bom.png b/diylc/diylc-core/src/org/diylc/core/images/bom.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/bom.png rename to diylc/diylc-core/src/org/diylc/core/images/bom.png diff --git a/diylc/diylc-core/src/org/diylc/images/bug.png b/diylc/diylc-core/src/org/diylc/core/images/bug.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/bug.png rename to diylc/diylc-core/src/org/diylc/core/images/bug.png diff --git a/diylc/diylc-core/src/org/diylc/images/check.png b/diylc/diylc-core/src/org/diylc/core/images/check.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/check.png rename to diylc/diylc-core/src/org/diylc/core/images/check.png diff --git a/diylc/diylc-core/src/org/diylc/images/chest.png b/diylc/diylc-core/src/org/diylc/core/images/chest.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/chest.png rename to diylc/diylc-core/src/org/diylc/core/images/chest.png diff --git a/diylc/diylc-core/src/org/diylc/images/component.png b/diylc/diylc-core/src/org/diylc/core/images/component.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/component.png rename to diylc/diylc-core/src/org/diylc/core/images/component.png diff --git a/diylc/diylc-core/src/org/diylc/images/copy.png b/diylc/diylc-core/src/org/diylc/core/images/copy.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/copy.png rename to diylc/diylc-core/src/org/diylc/core/images/copy.png diff --git a/diylc/diylc-core/src/org/diylc/images/csv.png b/diylc/diylc-core/src/org/diylc/core/images/csv.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/csv.png rename to diylc/diylc-core/src/org/diylc/core/images/csv.png diff --git a/diylc/diylc-core/src/org/diylc/images/cut.png b/diylc/diylc-core/src/org/diylc/core/images/cut.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/cut.png rename to diylc/diylc-core/src/org/diylc/core/images/cut.png diff --git a/diylc/diylc-core/src/org/diylc/images/delete.png b/diylc/diylc-core/src/org/diylc/core/images/delete.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/delete.png rename to diylc/diylc-core/src/org/diylc/core/images/delete.png diff --git a/diylc/diylc-core/src/org/diylc/images/disk_blue.png b/diylc/diylc-core/src/org/diylc/core/images/disk_blue.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/disk_blue.png rename to diylc/diylc-core/src/org/diylc/core/images/disk_blue.png diff --git a/diylc/diylc-core/src/org/diylc/images/disks.png b/diylc/diylc-core/src/org/diylc/core/images/disks.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/disks.png rename to diylc/diylc-core/src/org/diylc/core/images/disks.png diff --git a/diylc/diylc-core/src/org/diylc/images/document.png b/diylc/diylc-core/src/org/diylc/core/images/document.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/document.png rename to diylc/diylc-core/src/org/diylc/core/images/document.png diff --git a/diylc/diylc-core/src/org/diylc/images/document_edit.png b/diylc/diylc-core/src/org/diylc/core/images/document_edit.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/document_edit.png rename to diylc/diylc-core/src/org/diylc/core/images/document_edit.png diff --git a/diylc/diylc-core/src/org/diylc/images/document_info.png b/diylc/diylc-core/src/org/diylc/core/images/document_info.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/document_info.png rename to diylc/diylc-core/src/org/diylc/core/images/document_info.png diff --git a/diylc/diylc-core/src/org/diylc/images/document_plain_yellow.png b/diylc/diylc-core/src/org/diylc/core/images/document_plain_yellow.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/document_plain_yellow.png rename to diylc/diylc-core/src/org/diylc/core/images/document_plain_yellow.png diff --git a/diylc/diylc-core/src/org/diylc/images/donate.gif b/diylc/diylc-core/src/org/diylc/core/images/donate.gif similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/donate.gif rename to diylc/diylc-core/src/org/diylc/core/images/donate.gif diff --git a/diylc/diylc-core/src/org/diylc/images/donate.png b/diylc/diylc-core/src/org/diylc/core/images/donate.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/donate.png rename to diylc/diylc-core/src/org/diylc/core/images/donate.png diff --git a/diylc/diylc-core/src/org/diylc/images/edit.png b/diylc/diylc-core/src/org/diylc/core/images/edit.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/edit.png rename to diylc/diylc-core/src/org/diylc/core/images/edit.png diff --git a/diylc/diylc-core/src/org/diylc/images/edit_component.png b/diylc/diylc-core/src/org/diylc/core/images/edit_component.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/edit_component.png rename to diylc/diylc-core/src/org/diylc/core/images/edit_component.png diff --git a/diylc/diylc-core/src/org/diylc/images/elements_selection.png b/diylc/diylc-core/src/org/diylc/core/images/elements_selection.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/elements_selection.png rename to diylc/diylc-core/src/org/diylc/core/images/elements_selection.png diff --git a/diylc/diylc-core/src/org/diylc/images/error.png b/diylc/diylc-core/src/org/diylc/core/images/error.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/error.png rename to diylc/diylc-core/src/org/diylc/core/images/error.png diff --git a/diylc/diylc-core/src/org/diylc/images/excel.png b/diylc/diylc-core/src/org/diylc/core/images/excel.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/excel.png rename to diylc/diylc-core/src/org/diylc/core/images/excel.png diff --git a/diylc/diylc-core/src/org/diylc/images/exit.png b/diylc/diylc-core/src/org/diylc/core/images/exit.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/exit.png rename to diylc/diylc-core/src/org/diylc/core/images/exit.png diff --git a/diylc/diylc-core/src/org/diylc/images/export.png b/diylc/diylc-core/src/org/diylc/core/images/export.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/export.png rename to diylc/diylc-core/src/org/diylc/core/images/export.png diff --git a/diylc/diylc-core/src/org/diylc/images/faq.png b/diylc/diylc-core/src/org/diylc/core/images/faq.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/faq.png rename to diylc/diylc-core/src/org/diylc/core/images/faq.png diff --git a/diylc/diylc-core/src/org/diylc/images/folder_music.png b/diylc/diylc-core/src/org/diylc/core/images/folder_music.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/folder_music.png rename to diylc/diylc-core/src/org/diylc/core/images/folder_music.png diff --git a/diylc/diylc-core/src/org/diylc/images/folder_out.png b/diylc/diylc-core/src/org/diylc/core/images/folder_out.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/folder_out.png rename to diylc/diylc-core/src/org/diylc/core/images/folder_out.png diff --git a/diylc/diylc-core/src/org/diylc/images/forbidden.png b/diylc/diylc-core/src/org/diylc/core/images/forbidden.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/forbidden.png rename to diylc/diylc-core/src/org/diylc/core/images/forbidden.png diff --git a/diylc/diylc-core/src/org/diylc/images/form_blue.png b/diylc/diylc-core/src/org/diylc/core/images/form_blue.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/form_blue.png rename to diylc/diylc-core/src/org/diylc/core/images/form_blue.png diff --git a/diylc/diylc-core/src/org/diylc/images/form_blue_add.png b/diylc/diylc-core/src/org/diylc/core/images/form_blue_add.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/form_blue_add.png rename to diylc/diylc-core/src/org/diylc/core/images/form_blue_add.png diff --git a/diylc/diylc-core/src/org/diylc/images/front.png b/diylc/diylc-core/src/org/diylc/core/images/front.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/front.png rename to diylc/diylc-core/src/org/diylc/core/images/front.png diff --git a/diylc/diylc-core/src/org/diylc/images/garbage.png b/diylc/diylc-core/src/org/diylc/core/images/garbage.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/garbage.png rename to diylc/diylc-core/src/org/diylc/core/images/garbage.png diff --git a/diylc/diylc-core/src/org/diylc/images/gear.png b/diylc/diylc-core/src/org/diylc/core/images/gear.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/gear.png rename to diylc/diylc-core/src/org/diylc/core/images/gear.png diff --git a/diylc/diylc-core/src/org/diylc/images/gears.png b/diylc/diylc-core/src/org/diylc/core/images/gears.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/gears.png rename to diylc/diylc-core/src/org/diylc/core/images/gears.png diff --git a/diylc/diylc-core/src/org/diylc/images/graph_edge.png b/diylc/diylc-core/src/org/diylc/core/images/graph_edge.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/graph_edge.png rename to diylc/diylc-core/src/org/diylc/core/images/graph_edge.png diff --git a/diylc/diylc-core/src/org/diylc/images/graph_edge_curved.png b/diylc/diylc-core/src/org/diylc/core/images/graph_edge_curved.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/graph_edge_curved.png rename to diylc/diylc-core/src/org/diylc/core/images/graph_edge_curved.png diff --git a/diylc/diylc-core/src/org/diylc/images/graph_edge_directed.png b/diylc/diylc-core/src/org/diylc/core/images/graph_edge_directed.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/graph_edge_directed.png rename to diylc/diylc-core/src/org/diylc/core/images/graph_edge_directed.png diff --git a/diylc/diylc-core/src/org/diylc/images/group.png b/diylc/diylc-core/src/org/diylc/core/images/group.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/group.png rename to diylc/diylc-core/src/org/diylc/core/images/group.png diff --git a/diylc/diylc-core/src/org/diylc/images/html.png b/diylc/diylc-core/src/org/diylc/core/images/html.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/html.png rename to diylc/diylc-core/src/org/diylc/core/images/html.png diff --git a/diylc/diylc-core/src/org/diylc/images/icon_large.png b/diylc/diylc-core/src/org/diylc/core/images/icon_large.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/icon_large.png rename to diylc/diylc-core/src/org/diylc/core/images/icon_large.png diff --git a/diylc/diylc-core/src/org/diylc/images/icon_medium.png b/diylc/diylc-core/src/org/diylc/core/images/icon_medium.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/icon_medium.png rename to diylc/diylc-core/src/org/diylc/core/images/icon_medium.png diff --git a/diylc/diylc-core/src/org/diylc/images/icon_small.png b/diylc/diylc-core/src/org/diylc/core/images/icon_small.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/icon_small.png rename to diylc/diylc-core/src/org/diylc/core/images/icon_small.png diff --git a/diylc/diylc-core/src/org/diylc/images/id_card.png b/diylc/diylc-core/src/org/diylc/core/images/id_card.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/id_card.png rename to diylc/diylc-core/src/org/diylc/core/images/id_card.png diff --git a/diylc/diylc-core/src/org/diylc/images/id_card_add.png b/diylc/diylc-core/src/org/diylc/core/images/id_card_add.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/id_card_add.png rename to diylc/diylc-core/src/org/diylc/core/images/id_card_add.png diff --git a/diylc/diylc-core/src/org/diylc/images/image.png b/diylc/diylc-core/src/org/diylc/core/images/image.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/image.png rename to diylc/diylc-core/src/org/diylc/core/images/image.png diff --git a/diylc/diylc-core/src/org/diylc/images/lightbulb_off.png b/diylc/diylc-core/src/org/diylc/core/images/lightbulb_off.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/lightbulb_off.png rename to diylc/diylc-core/src/org/diylc/core/images/lightbulb_off.png diff --git a/diylc/diylc-core/src/org/diylc/images/lightbulb_on.png b/diylc/diylc-core/src/org/diylc/core/images/lightbulb_on.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/lightbulb_on.png rename to diylc/diylc-core/src/org/diylc/core/images/lightbulb_on.png diff --git a/diylc/diylc-core/src/org/diylc/images/manual.png b/diylc/diylc-core/src/org/diylc/core/images/manual.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/manual.png rename to diylc/diylc-core/src/org/diylc/core/images/manual.png diff --git a/diylc/diylc-core/src/org/diylc/images/media_play_green.png b/diylc/diylc-core/src/org/diylc/core/images/media_play_green.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/media_play_green.png rename to diylc/diylc-core/src/org/diylc/core/images/media_play_green.png diff --git a/diylc/diylc-core/src/org/diylc/images/media_stop_red.png b/diylc/diylc-core/src/org/diylc/core/images/media_stop_red.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/media_stop_red.png rename to diylc/diylc-core/src/org/diylc/core/images/media_stop_red.png diff --git a/diylc/diylc-core/src/org/diylc/images/move_small.png b/diylc/diylc-core/src/org/diylc/core/images/move_small.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/move_small.png rename to diylc/diylc-core/src/org/diylc/core/images/move_small.png diff --git a/diylc/diylc-core/src/org/diylc/images/navigate_check.png b/diylc/diylc-core/src/org/diylc/core/images/navigate_check.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/navigate_check.png rename to diylc/diylc-core/src/org/diylc/core/images/navigate_check.png diff --git a/diylc/diylc-core/src/org/diylc/images/navigate_plus.png b/diylc/diylc-core/src/org/diylc/core/images/navigate_plus.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/navigate_plus.png rename to diylc/diylc-core/src/org/diylc/core/images/navigate_plus.png diff --git a/diylc/diylc-core/src/org/diylc/images/notebook_add.png b/diylc/diylc-core/src/org/diylc/core/images/notebook_add.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/notebook_add.png rename to diylc/diylc-core/src/org/diylc/core/images/notebook_add.png diff --git a/diylc/diylc-core/src/org/diylc/images/paste.png b/diylc/diylc-core/src/org/diylc/core/images/paste.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/paste.png rename to diylc/diylc-core/src/org/diylc/core/images/paste.png diff --git a/diylc/diylc-core/src/org/diylc/images/pdf.png b/diylc/diylc-core/src/org/diylc/core/images/pdf.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/pdf.png rename to diylc/diylc-core/src/org/diylc/core/images/pdf.png diff --git a/diylc/diylc-core/src/org/diylc/images/pens.png b/diylc/diylc-core/src/org/diylc/core/images/pens.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/pens.png rename to diylc/diylc-core/src/org/diylc/core/images/pens.png diff --git a/diylc/diylc-core/src/org/diylc/images/photo_scenery.png b/diylc/diylc-core/src/org/diylc/core/images/photo_scenery.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/photo_scenery.png rename to diylc/diylc-core/src/org/diylc/core/images/photo_scenery.png diff --git a/diylc/diylc-core/src/org/diylc/images/plugin.png b/diylc/diylc-core/src/org/diylc/core/images/plugin.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/plugin.png rename to diylc/diylc-core/src/org/diylc/core/images/plugin.png diff --git a/diylc/diylc-core/src/org/diylc/images/print.png b/diylc/diylc-core/src/org/diylc/core/images/print.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/print.png rename to diylc/diylc-core/src/org/diylc/core/images/print.png diff --git a/diylc/diylc-core/src/org/diylc/images/redo.png b/diylc/diylc-core/src/org/diylc/core/images/redo.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/redo.png rename to diylc/diylc-core/src/org/diylc/core/images/redo.png diff --git a/diylc/diylc-core/src/org/diylc/images/refresh.png b/diylc/diylc-core/src/org/diylc/core/images/refresh.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/refresh.png rename to diylc/diylc-core/src/org/diylc/core/images/refresh.png diff --git a/diylc/diylc-core/src/org/diylc/images/save_as.png b/diylc/diylc-core/src/org/diylc/core/images/save_as.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/save_as.png rename to diylc/diylc-core/src/org/diylc/core/images/save_as.png diff --git a/diylc/diylc-core/src/org/diylc/images/selection.png b/diylc/diylc-core/src/org/diylc/core/images/selection.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/selection.png rename to diylc/diylc-core/src/org/diylc/core/images/selection.png diff --git a/diylc/diylc-core/src/org/diylc/images/size.png b/diylc/diylc-core/src/org/diylc/core/images/size.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/size.png rename to diylc/diylc-core/src/org/diylc/core/images/size.png diff --git a/diylc/diylc-core/src/org/diylc/images/sort.png b/diylc/diylc-core/src/org/diylc/core/images/sort.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/sort.png rename to diylc/diylc-core/src/org/diylc/core/images/sort.png diff --git a/diylc/diylc-core/src/org/diylc/images/trace_mask.png b/diylc/diylc-core/src/org/diylc/core/images/trace_mask.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/trace_mask.png rename to diylc/diylc-core/src/org/diylc/core/images/trace_mask.png diff --git a/diylc/diylc-core/src/org/diylc/images/undo.png b/diylc/diylc-core/src/org/diylc/core/images/undo.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/undo.png rename to diylc/diylc-core/src/org/diylc/core/images/undo.png diff --git a/diylc/diylc-core/src/org/diylc/images/ungroup.png b/diylc/diylc-core/src/org/diylc/core/images/ungroup.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/ungroup.png rename to diylc/diylc-core/src/org/diylc/core/images/ungroup.png diff --git a/diylc/diylc-core/src/org/diylc/images/upload.png b/diylc/diylc-core/src/org/diylc/core/images/upload.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/upload.png rename to diylc/diylc-core/src/org/diylc/core/images/upload.png diff --git a/diylc/diylc-core/src/org/diylc/images/view.png b/diylc/diylc-core/src/org/diylc/core/images/view.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/view.png rename to diylc/diylc-core/src/org/diylc/core/images/view.png diff --git a/diylc/diylc-core/src/org/diylc/images/warning.png b/diylc/diylc-core/src/org/diylc/core/images/warning.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/warning.png rename to diylc/diylc-core/src/org/diylc/core/images/warning.png diff --git a/diylc/diylc-core/src/org/diylc/images/window_colors.png b/diylc/diylc-core/src/org/diylc/core/images/window_colors.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/window_colors.png rename to diylc/diylc-core/src/org/diylc/core/images/window_colors.png diff --git a/diylc/diylc-core/src/org/diylc/images/wrench.png b/diylc/diylc-core/src/org/diylc/core/images/wrench.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/wrench.png rename to diylc/diylc-core/src/org/diylc/core/images/wrench.png diff --git a/diylc/diylc-core/src/org/diylc/images/zoom_in.png b/diylc/diylc-core/src/org/diylc/core/images/zoom_in.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/zoom_in.png rename to diylc/diylc-core/src/org/diylc/core/images/zoom_in.png diff --git a/diylc/diylc-core/src/org/diylc/images/zoom_out.png b/diylc/diylc-core/src/org/diylc/core/images/zoom_out.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/zoom_out.png rename to diylc/diylc-core/src/org/diylc/core/images/zoom_out.png diff --git a/diylc/diylc-core/src/org/diylc/images/zoom_small.png b/diylc/diylc-core/src/org/diylc/core/images/zoom_small.png similarity index 100% rename from diylc/diylc-core/src/org/diylc/images/zoom_small.png rename to diylc/diylc-core/src/org/diylc/core/images/zoom_small.png diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml index e3bdce27..975952f2 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/update.xml +++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml @@ -3230,6 +3230,10 @@ IMPROVEMENT macOS: added meta +/- keyboard shortcuts for zooming + + BUG_FIX + macOS Sierra: the app starts and immediately stops on some older mac systems + BUG_FIX Favorites on building blocks show up as "null" diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index 2f45ffe3610fc8389c1d3539f4efe082526780c7..39a1b73208924186026903db2474e988c1ee45ce 100644 GIT binary patch delta 19897 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. */ -package org.diylc.images; +package org.diylc.swing.images; import java.awt.Image; import java.awt.image.BufferedImage; diff --git a/diylc/diylc-swing/src/org/diylc/images/about.png b/diylc/diylc-swing/src/org/diylc/swing/images/about.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/about.png rename to diylc/diylc-swing/src/org/diylc/swing/images/about.png diff --git a/diylc/diylc-swing/src/org/diylc/images/add.png b/diylc/diylc-swing/src/org/diylc/swing/images/add.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/add.png rename to diylc/diylc-swing/src/org/diylc/swing/images/add.png diff --git a/diylc/diylc-swing/src/org/diylc/images/application_edit.png b/diylc/diylc-swing/src/org/diylc/swing/images/application_edit.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/application_edit.png rename to diylc/diylc-swing/src/org/diylc/swing/images/application_edit.png diff --git a/diylc/diylc-swing/src/org/diylc/images/arrow.png b/diylc/diylc-swing/src/org/diylc/swing/images/arrow.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/arrow.png rename to diylc/diylc-swing/src/org/diylc/swing/images/arrow.png diff --git a/diylc/diylc-swing/src/org/diylc/images/arrow_down_blue.png b/diylc/diylc-swing/src/org/diylc/swing/images/arrow_down_blue.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/arrow_down_blue.png rename to diylc/diylc-swing/src/org/diylc/swing/images/arrow_down_blue.png diff --git a/diylc/diylc-swing/src/org/diylc/images/arrow_left_blue.png b/diylc/diylc-swing/src/org/diylc/swing/images/arrow_left_blue.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/arrow_left_blue.png rename to diylc/diylc-swing/src/org/diylc/swing/images/arrow_left_blue.png diff --git a/diylc/diylc-swing/src/org/diylc/images/arrow_right_blue.png b/diylc/diylc-swing/src/org/diylc/swing/images/arrow_right_blue.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/arrow_right_blue.png rename to diylc/diylc-swing/src/org/diylc/swing/images/arrow_right_blue.png diff --git a/diylc/diylc-swing/src/org/diylc/images/arrow_up_blue.png b/diylc/diylc-swing/src/org/diylc/swing/images/arrow_up_blue.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/arrow_up_blue.png rename to diylc/diylc-swing/src/org/diylc/swing/images/arrow_up_blue.png diff --git a/diylc/diylc-swing/src/org/diylc/images/at.png b/diylc/diylc-swing/src/org/diylc/swing/images/at.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/at.png rename to diylc/diylc-swing/src/org/diylc/swing/images/at.png diff --git a/diylc/diylc-swing/src/org/diylc/images/back.png b/diylc/diylc-swing/src/org/diylc/swing/images/back.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/back.png rename to diylc/diylc-swing/src/org/diylc/swing/images/back.png diff --git a/diylc/diylc-swing/src/org/diylc/images/blackboard.png b/diylc/diylc-swing/src/org/diylc/swing/images/blackboard.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/blackboard.png rename to diylc/diylc-swing/src/org/diylc/swing/images/blackboard.png diff --git a/diylc/diylc-swing/src/org/diylc/images/bom.png b/diylc/diylc-swing/src/org/diylc/swing/images/bom.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/bom.png rename to diylc/diylc-swing/src/org/diylc/swing/images/bom.png diff --git a/diylc/diylc-swing/src/org/diylc/images/branch_add.png b/diylc/diylc-swing/src/org/diylc/swing/images/branch_add.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/branch_add.png rename to diylc/diylc-swing/src/org/diylc/swing/images/branch_add.png diff --git a/diylc/diylc-swing/src/org/diylc/images/briefcase_add.png b/diylc/diylc-swing/src/org/diylc/swing/images/briefcase_add.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/briefcase_add.png rename to diylc/diylc-swing/src/org/diylc/swing/images/briefcase_add.png diff --git a/diylc/diylc-swing/src/org/diylc/images/briefcase_into.png b/diylc/diylc-swing/src/org/diylc/swing/images/briefcase_into.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/briefcase_into.png rename to diylc/diylc-swing/src/org/diylc/swing/images/briefcase_into.png diff --git a/diylc/diylc-swing/src/org/diylc/images/bug.png b/diylc/diylc-swing/src/org/diylc/swing/images/bug.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/bug.png rename to diylc/diylc-swing/src/org/diylc/swing/images/bug.png diff --git a/diylc/diylc-swing/src/org/diylc/images/check.png b/diylc/diylc-swing/src/org/diylc/swing/images/check.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/check.png rename to diylc/diylc-swing/src/org/diylc/swing/images/check.png diff --git a/diylc/diylc-swing/src/org/diylc/images/chest.png b/diylc/diylc-swing/src/org/diylc/swing/images/chest.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/chest.png rename to diylc/diylc-swing/src/org/diylc/swing/images/chest.png diff --git a/diylc/diylc-swing/src/org/diylc/images/cloud.png b/diylc/diylc-swing/src/org/diylc/swing/images/cloud.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/cloud.png rename to diylc/diylc-swing/src/org/diylc/swing/images/cloud.png diff --git a/diylc/diylc-swing/src/org/diylc/images/cloud_bg.png b/diylc/diylc-swing/src/org/diylc/swing/images/cloud_bg.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/cloud_bg.png rename to diylc/diylc-swing/src/org/diylc/swing/images/cloud_bg.png diff --git a/diylc/diylc-swing/src/org/diylc/images/cloud_big.png b/diylc/diylc-swing/src/org/diylc/swing/images/cloud_big.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/cloud_big.png rename to diylc/diylc-swing/src/org/diylc/swing/images/cloud_big.png diff --git a/diylc/diylc-swing/src/org/diylc/images/cloud_delete.png b/diylc/diylc-swing/src/org/diylc/swing/images/cloud_delete.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/cloud_delete.png rename to diylc/diylc-swing/src/org/diylc/swing/images/cloud_delete.png diff --git a/diylc/diylc-swing/src/org/diylc/images/cloud_download.png b/diylc/diylc-swing/src/org/diylc/swing/images/cloud_download.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/cloud_download.png rename to diylc/diylc-swing/src/org/diylc/swing/images/cloud_download.png diff --git a/diylc/diylc-swing/src/org/diylc/images/cloud_edit.png b/diylc/diylc-swing/src/org/diylc/swing/images/cloud_edit.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/cloud_edit.png rename to diylc/diylc-swing/src/org/diylc/swing/images/cloud_edit.png diff --git a/diylc/diylc-swing/src/org/diylc/images/cloud_gear.png b/diylc/diylc-swing/src/org/diylc/swing/images/cloud_gear.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/cloud_gear.png rename to diylc/diylc-swing/src/org/diylc/swing/images/cloud_gear.png diff --git a/diylc/diylc-swing/src/org/diylc/images/cloud_up.png b/diylc/diylc-swing/src/org/diylc/swing/images/cloud_up.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/cloud_up.png rename to diylc/diylc-swing/src/org/diylc/swing/images/cloud_up.png diff --git a/diylc/diylc-swing/src/org/diylc/images/cloud_upload.png b/diylc/diylc-swing/src/org/diylc/swing/images/cloud_upload.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/cloud_upload.png rename to diylc/diylc-swing/src/org/diylc/swing/images/cloud_upload.png diff --git a/diylc/diylc-swing/src/org/diylc/images/cloud_wait.png b/diylc/diylc-swing/src/org/diylc/swing/images/cloud_wait.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/cloud_wait.png rename to diylc/diylc-swing/src/org/diylc/swing/images/cloud_wait.png diff --git a/diylc/diylc-swing/src/org/diylc/images/coffeebean_edit.png b/diylc/diylc-swing/src/org/diylc/swing/images/coffeebean_edit.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/coffeebean_edit.png rename to diylc/diylc-swing/src/org/diylc/swing/images/coffeebean_edit.png diff --git a/diylc/diylc-swing/src/org/diylc/images/component.png b/diylc/diylc-swing/src/org/diylc/swing/images/component.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/component.png rename to diylc/diylc-swing/src/org/diylc/swing/images/component.png diff --git a/diylc/diylc-swing/src/org/diylc/images/component_add.png b/diylc/diylc-swing/src/org/diylc/swing/images/component_add.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/component_add.png rename to diylc/diylc-swing/src/org/diylc/swing/images/component_add.png diff --git a/diylc/diylc-swing/src/org/diylc/images/copy.png b/diylc/diylc-swing/src/org/diylc/swing/images/copy.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/copy.png rename to diylc/diylc-swing/src/org/diylc/swing/images/copy.png diff --git a/diylc/diylc-swing/src/org/diylc/images/csv.png b/diylc/diylc-swing/src/org/diylc/swing/images/csv.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/csv.png rename to diylc/diylc-swing/src/org/diylc/swing/images/csv.png diff --git a/diylc/diylc-swing/src/org/diylc/images/cut.png b/diylc/diylc-swing/src/org/diylc/swing/images/cut.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/cut.png rename to diylc/diylc-swing/src/org/diylc/swing/images/cut.png diff --git a/diylc/diylc-swing/src/org/diylc/images/dashboard.png b/diylc/diylc-swing/src/org/diylc/swing/images/dashboard.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/dashboard.png rename to diylc/diylc-swing/src/org/diylc/swing/images/dashboard.png diff --git a/diylc/diylc-swing/src/org/diylc/images/data_find.png b/diylc/diylc-swing/src/org/diylc/swing/images/data_find.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/data_find.png rename to diylc/diylc-swing/src/org/diylc/swing/images/data_find.png diff --git a/diylc/diylc-swing/src/org/diylc/images/delete.png b/diylc/diylc-swing/src/org/diylc/swing/images/delete.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/delete.png rename to diylc/diylc-swing/src/org/diylc/swing/images/delete.png diff --git a/diylc/diylc-swing/src/org/diylc/images/disk_blue.png b/diylc/diylc-swing/src/org/diylc/swing/images/disk_blue.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/disk_blue.png rename to diylc/diylc-swing/src/org/diylc/swing/images/disk_blue.png diff --git a/diylc/diylc-swing/src/org/diylc/images/disks.png b/diylc/diylc-swing/src/org/diylc/swing/images/disks.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/disks.png rename to diylc/diylc-swing/src/org/diylc/swing/images/disks.png diff --git a/diylc/diylc-swing/src/org/diylc/images/document.png b/diylc/diylc-swing/src/org/diylc/swing/images/document.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/document.png rename to diylc/diylc-swing/src/org/diylc/swing/images/document.png diff --git a/diylc/diylc-swing/src/org/diylc/images/document_edit.png b/diylc/diylc-swing/src/org/diylc/swing/images/document_edit.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/document_edit.png rename to diylc/diylc-swing/src/org/diylc/swing/images/document_edit.png diff --git a/diylc/diylc-swing/src/org/diylc/images/document_info.png b/diylc/diylc-swing/src/org/diylc/swing/images/document_info.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/document_info.png rename to diylc/diylc-swing/src/org/diylc/swing/images/document_info.png diff --git a/diylc/diylc-swing/src/org/diylc/images/document_plain.png b/diylc/diylc-swing/src/org/diylc/swing/images/document_plain.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/document_plain.png rename to diylc/diylc-swing/src/org/diylc/swing/images/document_plain.png diff --git a/diylc/diylc-swing/src/org/diylc/images/document_plain_yellow.png b/diylc/diylc-swing/src/org/diylc/swing/images/document_plain_yellow.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/document_plain_yellow.png rename to diylc/diylc-swing/src/org/diylc/swing/images/document_plain_yellow.png diff --git a/diylc/diylc-swing/src/org/diylc/images/documents_gear.png b/diylc/diylc-swing/src/org/diylc/swing/images/documents_gear.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/documents_gear.png rename to diylc/diylc-swing/src/org/diylc/swing/images/documents_gear.png diff --git a/diylc/diylc-swing/src/org/diylc/images/donate.gif b/diylc/diylc-swing/src/org/diylc/swing/images/donate.gif similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/donate.gif rename to diylc/diylc-swing/src/org/diylc/swing/images/donate.gif diff --git a/diylc/diylc-swing/src/org/diylc/images/donate.png b/diylc/diylc-swing/src/org/diylc/swing/images/donate.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/donate.png rename to diylc/diylc-swing/src/org/diylc/swing/images/donate.png diff --git a/diylc/diylc-swing/src/org/diylc/images/download.png b/diylc/diylc-swing/src/org/diylc/swing/images/download.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/download.png rename to diylc/diylc-swing/src/org/diylc/swing/images/download.png diff --git a/diylc/diylc-swing/src/org/diylc/images/earth.png b/diylc/diylc-swing/src/org/diylc/swing/images/earth.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/earth.png rename to diylc/diylc-swing/src/org/diylc/swing/images/earth.png diff --git a/diylc/diylc-swing/src/org/diylc/images/edit.png b/diylc/diylc-swing/src/org/diylc/swing/images/edit.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/edit.png rename to diylc/diylc-swing/src/org/diylc/swing/images/edit.png diff --git a/diylc/diylc-swing/src/org/diylc/images/edit_component.png b/diylc/diylc-swing/src/org/diylc/swing/images/edit_component.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/edit_component.png rename to diylc/diylc-swing/src/org/diylc/swing/images/edit_component.png diff --git a/diylc/diylc-swing/src/org/diylc/images/element_into.png b/diylc/diylc-swing/src/org/diylc/swing/images/element_into.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/element_into.png rename to diylc/diylc-swing/src/org/diylc/swing/images/element_into.png diff --git a/diylc/diylc-swing/src/org/diylc/images/elements1.png b/diylc/diylc-swing/src/org/diylc/swing/images/elements1.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/elements1.png rename to diylc/diylc-swing/src/org/diylc/swing/images/elements1.png diff --git a/diylc/diylc-swing/src/org/diylc/images/elements_selection.png b/diylc/diylc-swing/src/org/diylc/swing/images/elements_selection.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/elements_selection.png rename to diylc/diylc-swing/src/org/diylc/swing/images/elements_selection.png diff --git a/diylc/diylc-swing/src/org/diylc/images/error.png b/diylc/diylc-swing/src/org/diylc/swing/images/error.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/error.png rename to diylc/diylc-swing/src/org/diylc/swing/images/error.png diff --git a/diylc/diylc-swing/src/org/diylc/images/excel.png b/diylc/diylc-swing/src/org/diylc/swing/images/excel.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/excel.png rename to diylc/diylc-swing/src/org/diylc/swing/images/excel.png diff --git a/diylc/diylc-swing/src/org/diylc/images/exit.png b/diylc/diylc-swing/src/org/diylc/swing/images/exit.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/exit.png rename to diylc/diylc-swing/src/org/diylc/swing/images/exit.png diff --git a/diylc/diylc-swing/src/org/diylc/images/export.png b/diylc/diylc-swing/src/org/diylc/swing/images/export.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/export.png rename to diylc/diylc-swing/src/org/diylc/swing/images/export.png diff --git a/diylc/diylc-swing/src/org/diylc/images/eye.png b/diylc/diylc-swing/src/org/diylc/swing/images/eye.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/eye.png rename to diylc/diylc-swing/src/org/diylc/swing/images/eye.png diff --git a/diylc/diylc-swing/src/org/diylc/images/faq.png b/diylc/diylc-swing/src/org/diylc/swing/images/faq.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/faq.png rename to diylc/diylc-swing/src/org/diylc/swing/images/faq.png diff --git a/diylc/diylc-swing/src/org/diylc/images/find.png b/diylc/diylc-swing/src/org/diylc/swing/images/find.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/find.png rename to diylc/diylc-swing/src/org/diylc/swing/images/find.png diff --git a/diylc/diylc-swing/src/org/diylc/images/fit_to_size.png b/diylc/diylc-swing/src/org/diylc/swing/images/fit_to_size.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/fit_to_size.png rename to diylc/diylc-swing/src/org/diylc/swing/images/fit_to_size.png diff --git a/diylc/diylc-swing/src/org/diylc/images/flexible_leads.png b/diylc/diylc-swing/src/org/diylc/swing/images/flexible_leads.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/flexible_leads.png rename to diylc/diylc-swing/src/org/diylc/swing/images/flexible_leads.png diff --git a/diylc/diylc-swing/src/org/diylc/images/flip_horizontal.png b/diylc/diylc-swing/src/org/diylc/swing/images/flip_horizontal.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/flip_horizontal.png rename to diylc/diylc-swing/src/org/diylc/swing/images/flip_horizontal.png diff --git a/diylc/diylc-swing/src/org/diylc/images/flip_vertical.png b/diylc/diylc-swing/src/org/diylc/swing/images/flip_vertical.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/flip_vertical.png rename to diylc/diylc-swing/src/org/diylc/swing/images/flip_vertical.png diff --git a/diylc/diylc-swing/src/org/diylc/images/folder_music.png b/diylc/diylc-swing/src/org/diylc/swing/images/folder_music.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/folder_music.png rename to diylc/diylc-swing/src/org/diylc/swing/images/folder_music.png diff --git a/diylc/diylc-swing/src/org/diylc/images/folder_out.png b/diylc/diylc-swing/src/org/diylc/swing/images/folder_out.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/folder_out.png rename to diylc/diylc-swing/src/org/diylc/swing/images/folder_out.png diff --git a/diylc/diylc-swing/src/org/diylc/images/forbidden.png b/diylc/diylc-swing/src/org/diylc/swing/images/forbidden.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/forbidden.png rename to diylc/diylc-swing/src/org/diylc/swing/images/forbidden.png diff --git a/diylc/diylc-swing/src/org/diylc/images/form_blue.png b/diylc/diylc-swing/src/org/diylc/swing/images/form_blue.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/form_blue.png rename to diylc/diylc-swing/src/org/diylc/swing/images/form_blue.png diff --git a/diylc/diylc-swing/src/org/diylc/images/form_blue_add.png b/diylc/diylc-swing/src/org/diylc/swing/images/form_blue_add.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/form_blue_add.png rename to diylc/diylc-swing/src/org/diylc/swing/images/form_blue_add.png diff --git a/diylc/diylc-swing/src/org/diylc/images/front.png b/diylc/diylc-swing/src/org/diylc/swing/images/front.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/front.png rename to diylc/diylc-swing/src/org/diylc/swing/images/front.png diff --git a/diylc/diylc-swing/src/org/diylc/images/garbage.png b/diylc/diylc-swing/src/org/diylc/swing/images/garbage.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/garbage.png rename to diylc/diylc-swing/src/org/diylc/swing/images/garbage.png diff --git a/diylc/diylc-swing/src/org/diylc/images/gear.png b/diylc/diylc-swing/src/org/diylc/swing/images/gear.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/gear.png rename to diylc/diylc-swing/src/org/diylc/swing/images/gear.png diff --git a/diylc/diylc-swing/src/org/diylc/images/gears.png b/diylc/diylc-swing/src/org/diylc/swing/images/gears.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/gears.png rename to diylc/diylc-swing/src/org/diylc/swing/images/gears.png diff --git a/diylc/diylc-swing/src/org/diylc/images/graph_edge.png b/diylc/diylc-swing/src/org/diylc/swing/images/graph_edge.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/graph_edge.png rename to diylc/diylc-swing/src/org/diylc/swing/images/graph_edge.png diff --git a/diylc/diylc-swing/src/org/diylc/images/graph_edge_curved.png b/diylc/diylc-swing/src/org/diylc/swing/images/graph_edge_curved.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/graph_edge_curved.png rename to diylc/diylc-swing/src/org/diylc/swing/images/graph_edge_curved.png diff --git a/diylc/diylc-swing/src/org/diylc/images/graph_edge_directed.png b/diylc/diylc-swing/src/org/diylc/swing/images/graph_edge_directed.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/graph_edge_directed.png rename to diylc/diylc-swing/src/org/diylc/swing/images/graph_edge_directed.png diff --git a/diylc/diylc-swing/src/org/diylc/images/graph_nodes.png b/diylc/diylc-swing/src/org/diylc/swing/images/graph_nodes.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/graph_nodes.png rename to diylc/diylc-swing/src/org/diylc/swing/images/graph_nodes.png diff --git a/diylc/diylc-swing/src/org/diylc/images/group.png b/diylc/diylc-swing/src/org/diylc/swing/images/group.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/group.png rename to diylc/diylc-swing/src/org/diylc/swing/images/group.png diff --git a/diylc/diylc-swing/src/org/diylc/images/guitar.png b/diylc/diylc-swing/src/org/diylc/swing/images/guitar.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/guitar.png rename to diylc/diylc-swing/src/org/diylc/swing/images/guitar.png diff --git a/diylc/diylc-swing/src/org/diylc/images/hammer.png b/diylc/diylc-swing/src/org/diylc/swing/images/hammer.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/hammer.png rename to diylc/diylc-swing/src/org/diylc/swing/images/hammer.png diff --git a/diylc/diylc-swing/src/org/diylc/images/help2.png b/diylc/diylc-swing/src/org/diylc/swing/images/help2.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/help2.png rename to diylc/diylc-swing/src/org/diylc/swing/images/help2.png diff --git a/diylc/diylc-swing/src/org/diylc/images/history.png b/diylc/diylc-swing/src/org/diylc/swing/images/history.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/history.png rename to diylc/diylc-swing/src/org/diylc/swing/images/history.png diff --git a/diylc/diylc-swing/src/org/diylc/images/html.png b/diylc/diylc-swing/src/org/diylc/swing/images/html.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/html.png rename to diylc/diylc-swing/src/org/diylc/swing/images/html.png diff --git a/diylc/diylc-swing/src/org/diylc/images/icon_large.png b/diylc/diylc-swing/src/org/diylc/swing/images/icon_large.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/icon_large.png rename to diylc/diylc-swing/src/org/diylc/swing/images/icon_large.png diff --git a/diylc/diylc-swing/src/org/diylc/images/icon_medium.png b/diylc/diylc-swing/src/org/diylc/swing/images/icon_medium.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/icon_medium.png rename to diylc/diylc-swing/src/org/diylc/swing/images/icon_medium.png diff --git a/diylc/diylc-swing/src/org/diylc/images/icon_small.png b/diylc/diylc-swing/src/org/diylc/swing/images/icon_small.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/icon_small.png rename to diylc/diylc-swing/src/org/diylc/swing/images/icon_small.png diff --git a/diylc/diylc-swing/src/org/diylc/images/id_card.png b/diylc/diylc-swing/src/org/diylc/swing/images/id_card.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/id_card.png rename to diylc/diylc-swing/src/org/diylc/swing/images/id_card.png diff --git a/diylc/diylc-swing/src/org/diylc/images/id_card_add.png b/diylc/diylc-swing/src/org/diylc/swing/images/id_card_add.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/id_card_add.png rename to diylc/diylc-swing/src/org/diylc/swing/images/id_card_add.png diff --git a/diylc/diylc-swing/src/org/diylc/images/id_card_edit.png b/diylc/diylc-swing/src/org/diylc/swing/images/id_card_edit.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/id_card_edit.png rename to diylc/diylc-swing/src/org/diylc/swing/images/id_card_edit.png diff --git a/diylc/diylc-swing/src/org/diylc/images/image.png b/diylc/diylc-swing/src/org/diylc/swing/images/image.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/image.png rename to diylc/diylc-swing/src/org/diylc/swing/images/image.png diff --git a/diylc/diylc-swing/src/org/diylc/images/jar_bean_into.png b/diylc/diylc-swing/src/org/diylc/swing/images/jar_bean_into.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/jar_bean_into.png rename to diylc/diylc-swing/src/org/diylc/swing/images/jar_bean_into.png diff --git a/diylc/diylc-swing/src/org/diylc/images/key_edit.png b/diylc/diylc-swing/src/org/diylc/swing/images/key_edit.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/key_edit.png rename to diylc/diylc-swing/src/org/diylc/swing/images/key_edit.png diff --git a/diylc/diylc-swing/src/org/diylc/images/laserpointer.png b/diylc/diylc-swing/src/org/diylc/swing/images/laserpointer.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/laserpointer.png rename to diylc/diylc-swing/src/org/diylc/swing/images/laserpointer.png diff --git a/diylc/diylc-swing/src/org/diylc/images/lightbulb_off.png b/diylc/diylc-swing/src/org/diylc/swing/images/lightbulb_off.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/lightbulb_off.png rename to diylc/diylc-swing/src/org/diylc/swing/images/lightbulb_off.png diff --git a/diylc/diylc-swing/src/org/diylc/images/lightbulb_on.png b/diylc/diylc-swing/src/org/diylc/swing/images/lightbulb_on.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/lightbulb_on.png rename to diylc/diylc-swing/src/org/diylc/swing/images/lightbulb_on.png diff --git a/diylc/diylc-swing/src/org/diylc/images/loadline.png b/diylc/diylc-swing/src/org/diylc/swing/images/loadline.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/loadline.png rename to diylc/diylc-swing/src/org/diylc/swing/images/loadline.png diff --git a/diylc/diylc-swing/src/org/diylc/images/loadline_add.png b/diylc/diylc-swing/src/org/diylc/swing/images/loadline_add.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/loadline_add.png rename to diylc/diylc-swing/src/org/diylc/swing/images/loadline_add.png diff --git a/diylc/diylc-swing/src/org/diylc/images/lock.png b/diylc/diylc-swing/src/org/diylc/swing/images/lock.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/lock.png rename to diylc/diylc-swing/src/org/diylc/swing/images/lock.png diff --git a/diylc/diylc-swing/src/org/diylc/images/lock_open.png b/diylc/diylc-swing/src/org/diylc/swing/images/lock_open.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/lock_open.png rename to diylc/diylc-swing/src/org/diylc/swing/images/lock_open.png diff --git a/diylc/diylc-swing/src/org/diylc/images/magic_wand.png b/diylc/diylc-swing/src/org/diylc/swing/images/magic_wand.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/magic_wand.png rename to diylc/diylc-swing/src/org/diylc/swing/images/magic_wand.png diff --git a/diylc/diylc-swing/src/org/diylc/images/manual.png b/diylc/diylc-swing/src/org/diylc/swing/images/manual.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/manual.png rename to diylc/diylc-swing/src/org/diylc/swing/images/manual.png diff --git a/diylc/diylc-swing/src/org/diylc/images/media_play_green.png b/diylc/diylc-swing/src/org/diylc/swing/images/media_play_green.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/media_play_green.png rename to diylc/diylc-swing/src/org/diylc/swing/images/media_play_green.png diff --git a/diylc/diylc-swing/src/org/diylc/images/media_stop_red.png b/diylc/diylc-swing/src/org/diylc/swing/images/media_stop_red.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/media_stop_red.png rename to diylc/diylc-swing/src/org/diylc/swing/images/media_stop_red.png diff --git a/diylc/diylc-swing/src/org/diylc/images/megaphone.png b/diylc/diylc-swing/src/org/diylc/swing/images/megaphone.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/megaphone.png rename to diylc/diylc-swing/src/org/diylc/swing/images/megaphone.png diff --git a/diylc/diylc-swing/src/org/diylc/images/messages.png b/diylc/diylc-swing/src/org/diylc/swing/images/messages.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/messages.png rename to diylc/diylc-swing/src/org/diylc/swing/images/messages.png diff --git a/diylc/diylc-swing/src/org/diylc/images/missing_image.png b/diylc/diylc-swing/src/org/diylc/swing/images/missing_image.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/missing_image.png rename to diylc/diylc-swing/src/org/diylc/swing/images/missing_image.png diff --git a/diylc/diylc-swing/src/org/diylc/images/move_small.png b/diylc/diylc-swing/src/org/diylc/swing/images/move_small.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/move_small.png rename to diylc/diylc-swing/src/org/diylc/swing/images/move_small.png diff --git a/diylc/diylc-swing/src/org/diylc/images/nav_left_blue.png b/diylc/diylc-swing/src/org/diylc/swing/images/nav_left_blue.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/nav_left_blue.png rename to diylc/diylc-swing/src/org/diylc/swing/images/nav_left_blue.png diff --git a/diylc/diylc-swing/src/org/diylc/images/nav_right_blue.png b/diylc/diylc-swing/src/org/diylc/swing/images/nav_right_blue.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/nav_right_blue.png rename to diylc/diylc-swing/src/org/diylc/swing/images/nav_right_blue.png diff --git a/diylc/diylc-swing/src/org/diylc/images/navigate_check.png b/diylc/diylc-swing/src/org/diylc/swing/images/navigate_check.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/navigate_check.png rename to diylc/diylc-swing/src/org/diylc/swing/images/navigate_check.png diff --git a/diylc/diylc-swing/src/org/diylc/images/navigate_plus.png b/diylc/diylc-swing/src/org/diylc/swing/images/navigate_plus.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/navigate_plus.png rename to diylc/diylc-swing/src/org/diylc/swing/images/navigate_plus.png diff --git a/diylc/diylc-swing/src/org/diylc/images/node.png b/diylc/diylc-swing/src/org/diylc/swing/images/node.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/node.png rename to diylc/diylc-swing/src/org/diylc/swing/images/node.png diff --git a/diylc/diylc-swing/src/org/diylc/images/notebook_add.png b/diylc/diylc-swing/src/org/diylc/swing/images/notebook_add.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/notebook_add.png rename to diylc/diylc-swing/src/org/diylc/swing/images/notebook_add.png diff --git a/diylc/diylc-swing/src/org/diylc/images/pads.png b/diylc/diylc-swing/src/org/diylc/swing/images/pads.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/pads.png rename to diylc/diylc-swing/src/org/diylc/swing/images/pads.png diff --git a/diylc/diylc-swing/src/org/diylc/images/paste.png b/diylc/diylc-swing/src/org/diylc/swing/images/paste.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/paste.png rename to diylc/diylc-swing/src/org/diylc/swing/images/paste.png diff --git a/diylc/diylc-swing/src/org/diylc/images/pdf.png b/diylc/diylc-swing/src/org/diylc/swing/images/pdf.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/pdf.png rename to diylc/diylc-swing/src/org/diylc/swing/images/pdf.png diff --git a/diylc/diylc-swing/src/org/diylc/images/pens.png b/diylc/diylc-swing/src/org/diylc/swing/images/pens.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/pens.png rename to diylc/diylc-swing/src/org/diylc/swing/images/pens.png diff --git a/diylc/diylc-swing/src/org/diylc/images/photo_scenery.png b/diylc/diylc-swing/src/org/diylc/swing/images/photo_scenery.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/photo_scenery.png rename to diylc/diylc-swing/src/org/diylc/swing/images/photo_scenery.png diff --git a/diylc/diylc-swing/src/org/diylc/images/pin_green.png b/diylc/diylc-swing/src/org/diylc/swing/images/pin_green.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/pin_green.png rename to diylc/diylc-swing/src/org/diylc/swing/images/pin_green.png diff --git a/diylc/diylc-swing/src/org/diylc/images/pin_grey.png b/diylc/diylc-swing/src/org/diylc/swing/images/pin_grey.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/pin_grey.png rename to diylc/diylc-swing/src/org/diylc/swing/images/pin_grey.png diff --git a/diylc/diylc-swing/src/org/diylc/images/plugin.png b/diylc/diylc-swing/src/org/diylc/swing/images/plugin.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/plugin.png rename to diylc/diylc-swing/src/org/diylc/swing/images/plugin.png diff --git a/diylc/diylc-swing/src/org/diylc/images/print.png b/diylc/diylc-swing/src/org/diylc/swing/images/print.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/print.png rename to diylc/diylc-swing/src/org/diylc/swing/images/print.png diff --git a/diylc/diylc-swing/src/org/diylc/images/redo.png b/diylc/diylc-swing/src/org/diylc/swing/images/redo.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/redo.png rename to diylc/diylc-swing/src/org/diylc/swing/images/redo.png diff --git a/diylc/diylc-swing/src/org/diylc/images/refresh.png b/diylc/diylc-swing/src/org/diylc/swing/images/refresh.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/refresh.png rename to diylc/diylc-swing/src/org/diylc/swing/images/refresh.png diff --git a/diylc/diylc-swing/src/org/diylc/images/rotate_ccw.png b/diylc/diylc-swing/src/org/diylc/swing/images/rotate_ccw.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/rotate_ccw.png rename to diylc/diylc-swing/src/org/diylc/swing/images/rotate_ccw.png diff --git a/diylc/diylc-swing/src/org/diylc/images/rotate_cw.png b/diylc/diylc-swing/src/org/diylc/swing/images/rotate_cw.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/rotate_cw.png rename to diylc/diylc-swing/src/org/diylc/swing/images/rotate_cw.png diff --git a/diylc/diylc-swing/src/org/diylc/images/save_as.png b/diylc/diylc-swing/src/org/diylc/swing/images/save_as.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/save_as.png rename to diylc/diylc-swing/src/org/diylc/swing/images/save_as.png diff --git a/diylc/diylc-swing/src/org/diylc/images/scientist.png b/diylc/diylc-swing/src/org/diylc/swing/images/scientist.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/scientist.png rename to diylc/diylc-swing/src/org/diylc/swing/images/scientist.png diff --git a/diylc/diylc-swing/src/org/diylc/images/screwdriver.png b/diylc/diylc-swing/src/org/diylc/swing/images/screwdriver.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/screwdriver.png rename to diylc/diylc-swing/src/org/diylc/swing/images/screwdriver.png diff --git a/diylc/diylc-swing/src/org/diylc/images/scroll_information.png b/diylc/diylc-swing/src/org/diylc/swing/images/scroll_information.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/scroll_information.png rename to diylc/diylc-swing/src/org/diylc/swing/images/scroll_information.png diff --git a/diylc/diylc-swing/src/org/diylc/images/search-box.png b/diylc/diylc-swing/src/org/diylc/swing/images/search-box.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/search-box.png rename to diylc/diylc-swing/src/org/diylc/swing/images/search-box.png diff --git a/diylc/diylc-swing/src/org/diylc/images/selection.png b/diylc/diylc-swing/src/org/diylc/swing/images/selection.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/selection.png rename to diylc/diylc-swing/src/org/diylc/swing/images/selection.png diff --git a/diylc/diylc-swing/src/org/diylc/images/size.png b/diylc/diylc-swing/src/org/diylc/swing/images/size.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/size.png rename to diylc/diylc-swing/src/org/diylc/swing/images/size.png diff --git a/diylc/diylc-swing/src/org/diylc/images/sort.png b/diylc/diylc-swing/src/org/diylc/swing/images/sort.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/sort.png rename to diylc/diylc-swing/src/org/diylc/swing/images/sort.png diff --git a/diylc/diylc-swing/src/org/diylc/images/spinning.gif b/diylc/diylc-swing/src/org/diylc/swing/images/spinning.gif similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/spinning.gif rename to diylc/diylc-swing/src/org/diylc/swing/images/spinning.gif diff --git a/diylc/diylc-swing/src/org/diylc/images/splash.png b/diylc/diylc-swing/src/org/diylc/swing/images/splash.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/splash.png rename to diylc/diylc-swing/src/org/diylc/swing/images/splash.png diff --git a/diylc/diylc-swing/src/org/diylc/images/splash_ceramic.png b/diylc/diylc-swing/src/org/diylc/swing/images/splash_ceramic.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/splash_ceramic.png rename to diylc/diylc-swing/src/org/diylc/swing/images/splash_ceramic.png diff --git a/diylc/diylc-swing/src/org/diylc/images/splash_electrolytic.png b/diylc/diylc-swing/src/org/diylc/swing/images/splash_electrolytic.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/splash_electrolytic.png rename to diylc/diylc-swing/src/org/diylc/swing/images/splash_electrolytic.png diff --git a/diylc/diylc-swing/src/org/diylc/images/splash_film.png b/diylc/diylc-swing/src/org/diylc/swing/images/splash_film.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/splash_film.png rename to diylc/diylc-swing/src/org/diylc/swing/images/splash_film.png diff --git a/diylc/diylc-swing/src/org/diylc/images/splash_resistor.png b/diylc/diylc-swing/src/org/diylc/swing/images/splash_resistor.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/splash_resistor.png rename to diylc/diylc-swing/src/org/diylc/swing/images/splash_resistor.png diff --git a/diylc/diylc-swing/src/org/diylc/images/star_blue.png b/diylc/diylc-swing/src/org/diylc/swing/images/star_blue.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/star_blue.png rename to diylc/diylc-swing/src/org/diylc/swing/images/star_blue.png diff --git a/diylc/diylc-swing/src/org/diylc/images/star_grey.png b/diylc/diylc-swing/src/org/diylc/swing/images/star_grey.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/star_grey.png rename to diylc/diylc-swing/src/org/diylc/swing/images/star_grey.png diff --git a/diylc/diylc-swing/src/org/diylc/images/star_yellow.png b/diylc/diylc-swing/src/org/diylc/swing/images/star_yellow.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/star_yellow.png rename to diylc/diylc-swing/src/org/diylc/swing/images/star_yellow.png diff --git a/diylc/diylc-swing/src/org/diylc/images/tape_measure1.png b/diylc/diylc-swing/src/org/diylc/swing/images/tape_measure1.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/tape_measure1.png rename to diylc/diylc-swing/src/org/diylc/swing/images/tape_measure1.png diff --git a/diylc/diylc-swing/src/org/diylc/images/trace_mask.png b/diylc/diylc-swing/src/org/diylc/swing/images/trace_mask.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/trace_mask.png rename to diylc/diylc-swing/src/org/diylc/swing/images/trace_mask.png diff --git a/diylc/diylc-swing/src/org/diylc/images/undo.png b/diylc/diylc-swing/src/org/diylc/swing/images/undo.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/undo.png rename to diylc/diylc-swing/src/org/diylc/swing/images/undo.png diff --git a/diylc/diylc-swing/src/org/diylc/images/ungroup.png b/diylc/diylc-swing/src/org/diylc/swing/images/ungroup.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/ungroup.png rename to diylc/diylc-swing/src/org/diylc/swing/images/ungroup.png diff --git a/diylc/diylc-swing/src/org/diylc/images/upload.png b/diylc/diylc-swing/src/org/diylc/swing/images/upload.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/upload.png rename to diylc/diylc-swing/src/org/diylc/swing/images/upload.png diff --git a/diylc/diylc-swing/src/org/diylc/images/user1.png b/diylc/diylc-swing/src/org/diylc/swing/images/user1.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/user1.png rename to diylc/diylc-swing/src/org/diylc/swing/images/user1.png diff --git a/diylc/diylc-swing/src/org/diylc/images/view.png b/diylc/diylc-swing/src/org/diylc/swing/images/view.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/view.png rename to diylc/diylc-swing/src/org/diylc/swing/images/view.png diff --git a/diylc/diylc-swing/src/org/diylc/images/warning.png b/diylc/diylc-swing/src/org/diylc/swing/images/warning.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/warning.png rename to diylc/diylc-swing/src/org/diylc/swing/images/warning.png diff --git a/diylc/diylc-swing/src/org/diylc/images/web.png b/diylc/diylc-swing/src/org/diylc/swing/images/web.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/web.png rename to diylc/diylc-swing/src/org/diylc/swing/images/web.png diff --git a/diylc/diylc-swing/src/org/diylc/images/window_colors.png b/diylc/diylc-swing/src/org/diylc/swing/images/window_colors.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/window_colors.png rename to diylc/diylc-swing/src/org/diylc/swing/images/window_colors.png diff --git a/diylc/diylc-swing/src/org/diylc/images/wrench.png b/diylc/diylc-swing/src/org/diylc/swing/images/wrench.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/wrench.png rename to diylc/diylc-swing/src/org/diylc/swing/images/wrench.png diff --git a/diylc/diylc-swing/src/org/diylc/images/zoom_in.png b/diylc/diylc-swing/src/org/diylc/swing/images/zoom_in.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/zoom_in.png rename to diylc/diylc-swing/src/org/diylc/swing/images/zoom_in.png diff --git a/diylc/diylc-swing/src/org/diylc/images/zoom_out.png b/diylc/diylc-swing/src/org/diylc/swing/images/zoom_out.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/zoom_out.png rename to diylc/diylc-swing/src/org/diylc/swing/images/zoom_out.png diff --git a/diylc/diylc-swing/src/org/diylc/images/zoom_small.png b/diylc/diylc-swing/src/org/diylc/swing/images/zoom_small.png similarity index 100% rename from diylc/diylc-swing/src/org/diylc/images/zoom_small.png rename to diylc/diylc-swing/src/org/diylc/swing/images/zoom_small.png diff --git a/diylc/diylc-swing/src/org/diylc/swing/loadline/LoadlineEditorFrame.java b/diylc/diylc-swing/src/org/diylc/swing/loadline/LoadlineEditorFrame.java index ff204261..43499abb 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/loadline/LoadlineEditorFrame.java +++ b/diylc/diylc-swing/src/org/diylc/swing/loadline/LoadlineEditorFrame.java @@ -54,11 +54,11 @@ import org.diylc.components.misc.LoadlineEntity; import org.diylc.core.IDIYComponent; import org.diylc.core.IView; import org.diylc.core.Project; +import org.diylc.swing.images.IconLoader; import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; import org.diylc.core.measures.Voltage; import org.diylc.core.measures.VoltageUnit; -import org.diylc.images.IconLoader; import org.diylc.lang.LangUtil; import org.diylc.presenter.Presenter; import org.diylc.swing.gui.DialogFactory; diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java index ac4d4130..7de953d8 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java @@ -61,9 +61,9 @@ import org.diylc.common.IPlugInPort; import org.diylc.core.ExpansionMode; import org.diylc.core.IDIYComponent; import org.diylc.core.Template; +import org.diylc.swing.images.IconLoader; import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; -import org.diylc.images.IconLoader; import org.diylc.swing.ActionFactory; import org.diylc.swing.ISwingUI; import org.diylc.swing.gui.TranslatedMenu; diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/CloudPlugIn.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/CloudPlugIn.java index 431fc0e7..d072dd34 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/CloudPlugIn.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/CloudPlugIn.java @@ -37,8 +37,8 @@ import org.diylc.common.EventType; import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; import org.diylc.common.ITask; -import org.diylc.core.IView; -import org.diylc.images.IconLoader; +import org.diylc.core.IView; +import org.diylc.swing.images.IconLoader; import org.diylc.plugins.cloud.presenter.CloudException; import org.diylc.plugins.cloud.presenter.CloudPresenter; import org.diylc.presenter.Presenter; diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/AnimatedCloudGlassPane.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/AnimatedCloudGlassPane.java index d5266d2c..aea9e114 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/AnimatedCloudGlassPane.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/AnimatedCloudGlassPane.java @@ -40,9 +40,9 @@ import java.awt.event.MouseListener; import java.awt.image.VolatileImage; import javax.swing.JPanel; -import javax.swing.Timer; - -import org.diylc.images.IconLoader; +import javax.swing.Timer; + +import org.diylc.swing.images.IconLoader; /** * JPanel that shows cloud animation while visible. diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/CloudBrowserFrame.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/CloudBrowserFrame.java index cd06dc8f..f753b514 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/CloudBrowserFrame.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/CloudBrowserFrame.java @@ -44,8 +44,8 @@ import javax.swing.event.ChangeListener; import org.apache.log4j.Logger; import org.diylc.common.IPlugInPort; import org.diylc.common.ITask; -import org.diylc.core.IView; -import org.diylc.images.IconLoader; +import org.diylc.core.IView; +import org.diylc.swing.images.IconLoader; import org.diylc.plugins.cloud.model.ProjectEntity; import org.diylc.plugins.cloud.presenter.CloudPresenter; import org.diylc.plugins.cloud.presenter.SearchSession; diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/ResultsScrollPanel.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/ResultsScrollPanel.java index 9dfa48ec..39e7d86d 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/ResultsScrollPanel.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/ResultsScrollPanel.java @@ -59,8 +59,8 @@ import org.diylc.appframework.miscutils.InMemoryConfigurationManager; import org.diylc.common.IPlugInPort; import org.diylc.common.ITask; import org.diylc.common.PropertyWrapper; -import org.diylc.core.IView; -import org.diylc.images.IconLoader; +import org.diylc.core.IView; +import org.diylc.swing.images.IconLoader; import org.diylc.plugins.cloud.model.CommentEntity; import org.diylc.plugins.cloud.model.ProjectEntity; import org.diylc.plugins.cloud.presenter.CloudPresenter; diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SearchHeaderPanel.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SearchHeaderPanel.java index 313da2b7..cf845cda 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SearchHeaderPanel.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SearchHeaderPanel.java @@ -31,9 +31,9 @@ import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.JTextField; - -import org.diylc.images.IconLoader; +import javax.swing.JTextField; + +import org.diylc.swing.images.IconLoader; public class SearchHeaderPanel extends JPanel { diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SimpleCloudGlassPane.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SimpleCloudGlassPane.java index 060f109a..998b2be8 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SimpleCloudGlassPane.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SimpleCloudGlassPane.java @@ -32,9 +32,9 @@ import java.awt.event.MouseListener; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.SwingConstants; - -import org.diylc.images.IconLoader; +import javax.swing.SwingConstants; + +import org.diylc.swing.images.IconLoader; /** * JPanel that shows cloud animation while visible. diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/UploadManagerFrame.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/UploadManagerFrame.java index 399709ee..a895c8b2 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/UploadManagerFrame.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/UploadManagerFrame.java @@ -32,8 +32,8 @@ import javax.swing.SwingWorker; import org.apache.log4j.Logger; import org.diylc.common.IPlugInPort; import org.diylc.common.ITask; -import org.diylc.core.IView; -import org.diylc.images.IconLoader; +import org.diylc.core.IView; +import org.diylc.swing.images.IconLoader; import org.diylc.plugins.cloud.model.ProjectEntity; import org.diylc.plugins.cloud.presenter.CloudPresenter; import org.diylc.swing.ISimpleView; diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/config/ConfigPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/config/ConfigPlugin.java index b873f250..6e20c7e4 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/config/ConfigPlugin.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/config/ConfigPlugin.java @@ -33,8 +33,8 @@ import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; import org.diylc.components.autocreate.SolderPadAutoCreator; import org.diylc.core.Theme; +import org.diylc.swing.images.IconLoader; import org.diylc.flags.FlagLoader; -import org.diylc.images.IconLoader; import org.diylc.lang.LangUtil; import org.diylc.lang.Language; import org.diylc.swing.ActionFactory; diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/edit/EditMenuPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/edit/EditMenuPlugin.java index 07106bfb..12fc6522 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/edit/EditMenuPlugin.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/edit/EditMenuPlugin.java @@ -37,7 +37,7 @@ import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; import org.diylc.core.ExpansionMode; import org.diylc.core.Project; -import org.diylc.images.IconLoader; +import org.diylc.swing.images.IconLoader; import org.diylc.swing.ActionFactory; import org.diylc.swing.ISwingUI; diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/file/BomDialog.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/file/BomDialog.java index b760f50e..06fc8606 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/file/BomDialog.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/file/BomDialog.java @@ -34,9 +34,9 @@ import javax.swing.JButton; import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JPanel; -import javax.swing.JScrollPane; +import javax.swing.JScrollPane; -import org.diylc.images.IconLoader; +import org.diylc.core.images.IconLoader; import org.diylc.swing.gui.DialogFactory; import org.diylc.swingframework.export.TableExporter; import org.diylc.swingframework.objecttable.ObjectListTable; diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileMenuPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileMenuPlugin.java index 39ae2fa4..f6a3c857 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileMenuPlugin.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileMenuPlugin.java @@ -31,8 +31,8 @@ import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.EventType; import org.diylc.common.INetlistAnalyzer; import org.diylc.common.IPlugIn; -import org.diylc.common.IPlugInPort; -import org.diylc.images.IconLoader; +import org.diylc.common.IPlugInPort; +import org.diylc.swing.images.IconLoader; import org.diylc.swing.ActionFactory; import org.diylc.swing.IDynamicSubmenuHandler; import org.diylc.swing.ISwingUI; diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/help/HelpMenuPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/help/HelpMenuPlugin.java index 22fbcc72..1423c61b 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/help/HelpMenuPlugin.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/help/HelpMenuPlugin.java @@ -38,7 +38,7 @@ import org.diylc.common.EventType; import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; import org.diylc.core.IView; -import org.diylc.images.IconLoader; +import org.diylc.swing.images.IconLoader; import org.diylc.lang.LangUtil; import org.diylc.swing.ISwingUI; import org.diylc.swing.gui.DialogFactory; diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java index a5f97c38..50b72d45 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java @@ -65,7 +65,7 @@ import org.diylc.common.IPlugInPort; import org.diylc.common.ITask; import org.diylc.core.IDIYComponent; import org.diylc.core.IView; -import org.diylc.images.IconLoader; +import org.diylc.swing.images.IconLoader; import org.diylc.lang.LangUtil; import org.diylc.presenter.Presenter; import org.diylc.swing.ISwingUI; diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java index 6f9a1cc7..643c00df 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java @@ -46,7 +46,7 @@ import org.diylc.common.ComponentType; import org.diylc.common.IPlugInPort; import org.diylc.core.IDIYComponent; import org.diylc.core.Template; -import org.diylc.images.IconLoader; +import org.diylc.swing.images.IconLoader; import org.diylc.swingframework.openide.DropDownButtonFactory; /** diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreePanel.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreePanel.java index 670964dc..b870eda4 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreePanel.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreePanel.java @@ -75,7 +75,7 @@ import org.diylc.common.IPlugInPort; import org.diylc.core.IDIYComponent; import org.diylc.core.IView; import org.diylc.core.Template; -import org.diylc.images.IconLoader; +import org.diylc.swing.images.IconLoader; import org.diylc.lang.LangUtil; import org.diylc.swing.ISwingUI; import org.diylc.swing.plugins.toolbox.ComponentButtonFactory;