mavenization

2026-11-10 17:22:09 +10:00 · 2025-03-10 16:42:35 +01:00
parent a0e8f7411c
commit bc428fad89
289 changed files with 79 additions and 78 deletions
@@ -10,7 +10,7 @@ import javax.swing.ImageIcon;
 import javax.swing.JDialog;
 import javax.swing.SwingUtilities;

-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 /**
 * Custom splash screen with animated components. Does not use standard SplashScreen because of issues with OS X and Java 8.
@@ -19,7 +19,7 @@ import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
 import org.diylc.swing.gui.editor.PropertyEditorDialog;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class CheckProximityAction extends AbstractAction implements Cloneable {

@@ -10,7 +10,7 @@ import org.diylc.common.ITask;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.file.FileFilterEnum;

 public class ExportGerberAction extends AbstractAction {
@@ -12,7 +12,7 @@ import org.diylc.common.ITask;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.file.FileFilterEnum;

 public class ExportPNGAction extends AbstractAction {
@@ -9,7 +9,7 @@ import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.edit.FindDialog;

 public class FindAction extends AbstractAction {
@@ -7,7 +7,7 @@ import org.diylc.editor.FlexibleLeadsEditor;

 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class FlexibleLeadsAction extends AbstractAction {

@@ -14,7 +14,7 @@ import org.diylc.netlist.Group;
 import org.diylc.netlist.Netlist;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class GenerateNetlistAction extends AbstractAction {

@@ -13,7 +13,7 @@ import org.diylc.common.ITask;
 import org.diylc.netlist.Netlist;
 import org.diylc.netlist.Summary;
 import org.diylc.swing.ISwingUI;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class SummarizeNetlistAction extends AbstractAction {

@@ -7,7 +7,7 @@ import javax.swing.KeyStroke;

 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class BringToFrontAction extends AbstractAction {

@@ -11,7 +11,7 @@ import javax.swing.KeyStroke;
 import org.diylc.clipboard.ComponentTransferableFactory;
 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class CopyAction extends AbstractAction {

@@ -11,7 +11,7 @@ import javax.swing.KeyStroke;
 import org.diylc.clipboard.ComponentTransferableFactory;
 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class CutAction extends AbstractAction {

@@ -8,7 +8,7 @@ import org.diylc.appframework.miscutils.Utils;

 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class DeleteSelectionAction extends AbstractAction {

@@ -8,7 +8,7 @@ import javax.swing.KeyStroke;

 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class DuplicateAction extends AbstractAction {

@@ -12,7 +12,7 @@ import org.diylc.core.Project;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.gui.DialogFactory;
 import org.diylc.swing.gui.editor.PropertyEditorDialog;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class EditProjectAction extends AbstractAction {

@@ -10,7 +10,7 @@ import javax.swing.KeyStroke;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.PropertyWrapper;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class EditSelectionAction extends AbstractAction {

@@ -8,7 +8,7 @@ import javax.swing.KeyStroke;

 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class GroupAction extends AbstractAction {

@@ -8,7 +8,7 @@ import javax.swing.KeyStroke;
 import org.diylc.common.IComponentTransformer;
 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class MirrorSelectionAction extends AbstractAction {

@@ -18,7 +18,7 @@ import org.diylc.presenter.Presenter;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.gui.DialogFactory;
 import org.diylc.swing.gui.editor.PropertyEditorDialog;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class NudgeAction extends AbstractAction {

@@ -12,7 +12,7 @@ import org.diylc.clipboard.ComponentTransferable;
 import org.diylc.common.IPlugInPort;
 import org.diylc.presenter.Presenter;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class PasteAction extends AbstractAction {

@@ -7,7 +7,7 @@ import javax.swing.KeyStroke;

 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class RotateSelectionAction extends AbstractAction {

@@ -6,7 +6,7 @@ import javax.swing.JOptionPane;

 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class SaveAsBlockAction extends AbstractAction {

@@ -6,7 +6,7 @@ import javax.swing.JOptionPane;

 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class SaveAsTemplateAction extends AbstractAction {

@@ -8,7 +8,7 @@ import javax.swing.KeyStroke;

 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class SelectAllAction extends AbstractAction {

@@ -7,7 +7,7 @@ import javax.swing.KeyStroke;

 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class SendToBackAction extends AbstractAction {

@@ -8,7 +8,7 @@ import javax.swing.KeyStroke;

 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class UngroupAction extends AbstractAction {

@@ -8,7 +8,7 @@ import javax.swing.AbstractAction;
 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.file.BomDialog;
 import org.diylc.utils.BomEntry;

@@ -5,7 +5,7 @@ import javax.swing.AbstractAction;

 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class ExitAction extends AbstractAction {

@@ -12,7 +12,7 @@ import org.diylc.common.ITask;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.file.FileFilterEnum;

 public class ExportPDFAction extends AbstractAction {
@@ -20,7 +20,7 @@ import org.diylc.presenter.Presenter;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.file.FileFilterEnum;

 public class ImportAction extends AbstractAction {
@@ -22,7 +22,7 @@ import org.diylc.netlist.ParsedNetlistEntry;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.file.NetlistImportDialog;

 public class ImportNetlistAction extends AbstractAction {
@@ -15,7 +15,7 @@ import org.diylc.core.Project;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.gui.DialogFactory;
 import org.diylc.swing.gui.editor.PropertyEditorDialog;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class NewAction extends AbstractAction {

@@ -12,7 +12,7 @@ import org.diylc.common.ITask;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.file.FileFilterEnum;

 public class OpenAction extends AbstractAction {
@@ -13,7 +13,7 @@ import org.diylc.swingframework.export.DrawingExporter;
 import org.diylc.common.ITask;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class PrintAction extends AbstractAction {

@@ -12,7 +12,7 @@ import org.diylc.common.ITask;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.file.FileFilterEnum;

 public class SaveAction extends AbstractAction {
@@ -13,7 +13,7 @@ import org.diylc.common.ITask;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.file.FileFilterEnum;

 public class SaveAsAction extends AbstractAction {
@@ -63,7 +63,7 @@ import org.diylc.swing.actions.edit.SaveAsBlockAction;
 import org.diylc.swing.actions.edit.SaveAsTemplateAction;
 import org.diylc.swing.actions.edit.SendToBackAction;
 import org.diylc.swing.actions.edit.UngroupAction;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.toolbox.ComponentButtonFactory;

 public class ComponentPopupMenu extends JPopupMenu implements ClipboardOwner {
@@ -28,7 +28,7 @@ import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.swingframework.ButtonDialog;

 import org.diylc.common.IPlugInPort;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class InfoDialog extends ButtonDialog {

@@ -33,7 +33,7 @@ import javax.swing.JTextField;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;

-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class SearchTextField extends JTextField {

@@ -46,7 +46,7 @@ import org.diylc.common.IPlugInPort;
 import org.diylc.lang.LangUtil;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.help.HelpMenuPlugin;

 /**
@@ -65,7 +65,7 @@ import org.diylc.presenter.Presenter;
 import org.diylc.swing.gui.DialogFactory;
 import org.diylc.swing.gui.TranslatedPanel;
 import org.diylc.swing.gui.editor.PropertyEditorDialog;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.canvas.CanvasPanel;
 import org.diylc.swing.plugins.file.FileFilterEnum;

@@ -44,7 +44,7 @@ import org.diylc.presenter.Presenter;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
 import org.diylc.swing.gui.DummyView;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.cloud.view.ChangePasswordDialog;
 import org.diylc.swing.plugins.cloud.view.LoginDialog;
 import org.diylc.swing.plugins.cloud.view.UploadDialog;
@@ -41,7 +41,7 @@ import java.awt.image.VolatileImage;
 import javax.swing.JPanel;
 import javax.swing.Timer;

-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 /**
 * JPanel that shows cloud animation while visible.
@@ -49,7 +49,7 @@ import org.diylc.plugins.cloud.presenter.CloudPresenter;
 import org.diylc.plugins.cloud.presenter.SearchSession;
 import org.diylc.swing.ISimpleView;
 import org.diylc.swing.ISwingUI;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.utils.Pair;

 /**
@@ -68,7 +68,7 @@ import org.diylc.swing.gui.DialogFactory;
 import org.diylc.swing.gui.DummyView;
 import org.diylc.swing.gui.components.HTMLTextArea;
 import org.diylc.swing.gui.editor.PropertyEditorDialog;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.cloud.ThumbnailGenerator;
 import org.diylc.swing.plugins.cloud.view.CommentDialog;
 import org.diylc.swing.plugins.file.FileFilterEnum;
@@ -32,7 +32,7 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;

-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class SearchHeaderPanel extends JPanel {

@@ -33,7 +33,7 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;

-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 /**
 * JPanel that shows cloud animation while visible.
@@ -36,7 +36,7 @@ import org.diylc.plugins.cloud.model.ProjectEntity;
 import org.diylc.plugins.cloud.presenter.CloudPresenter;
 import org.diylc.swing.ISimpleView;
 import org.diylc.swing.ISwingUI;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class UploadManagerFrame extends JFrame implements ISimpleView {

@@ -41,7 +41,7 @@ import org.diylc.lang.LangUtil;
 import org.diylc.lang.Language;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.utils.ResourceLoader;

 /**
@@ -59,7 +59,7 @@ import org.diylc.swing.actions.edit.SaveAsBlockAction;
 import org.diylc.swing.actions.edit.SaveAsTemplateAction;
 import org.diylc.swing.actions.edit.SendToBackAction;
 import org.diylc.swing.actions.edit.UngroupAction;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class EditMenuPlugin implements IPlugIn, ClipboardOwner {

@@ -33,7 +33,7 @@ import org.diylc.common.IPlugInPort;
 import org.diylc.common.ITask;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.loadline.LoadlineEditorFrame;

 /**
@@ -43,7 +43,7 @@ import org.diylc.core.IView;
 import org.diylc.lang.LangUtil;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 /**
 * Entry point class for help-related utilities.
@@ -72,7 +72,7 @@ import org.diylc.core.IView;
 import org.diylc.lang.LangUtil;
 import org.diylc.presenter.Presenter;
 import org.diylc.swing.ISwingUI;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 public class StatusBar extends JPanel implements IPlugIn {

@@ -58,7 +58,7 @@ import org.diylc.common.IPlugInPort;
 import org.diylc.common.IBlockProcessor.InvalidBlockException;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.Template;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;

 /**
 * Factory that creates {@link JButton}s which display component type icons and instantiates the
@@ -56,7 +56,7 @@ import org.diylc.lang.LangUtil;
 import org.diylc.presenter.ComparatorFactory;
 import org.diylc.presenter.ComponentProcessor;
 import org.diylc.swing.ISwingUI;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.tree.TreePanel;
 import org.diylc.swing.plugins.tree.TreePanel.DeleteBlockAction;
 import org.diylc.swing.plugins.tree.TreePanel.SelectAllAction;
@@ -70,7 +70,7 @@ import org.diylc.core.Template;
 import org.diylc.lang.LangUtil;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.SearchTextField;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.toolbox.ComponentButtonFactory;

 public class TreePanel extends JPanel {
@@ -19,7 +19,9 @@
    along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.

 */
-package org.diylc.flags;
+package org.diylc.utils;
+
+import org.apache.log4j.Logger;

 import javax.swing.Icon;
 import javax.swing.ImageIcon;
@@ -32,11 +34,11 @@ import javax.swing.ImageIcon;
 public class FlagLoader {

  public static Icon getIcon(String name) {
-    java.net.URL imgURL = FlagLoader.class.getResource("flag_" + name + ".png");
+    java.net.URL imgURL = FlagLoader.class.getResource("/flags/flag_" + name + ".png");
    if (imgURL != null) {
      return new ImageIcon(imgURL, name);
    } else {
-      System.err.println("Couldn't find file: " + name);
+      Logger.getLogger(FlagLoader.class).error("Couldn't find file: " + name);
      return null;
    }
  }
@@ -19,10 +19,9 @@
    along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.

 */
-package org.diylc.swing.images;
+package org.diylc.utils;

 import org.apache.log4j.Logger;
-import org.diylc.components.misc.SVGImage;

 import java.awt.Image;
 import java.awt.image.BufferedImage;
--- a/Show More
+++ b/Show More