mavenization

diylc/diylc-swing/src/main/java/org/diylc/DIYLCSplash.java

@@ -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.

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/CheckProximityAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/ExportGerberAction.java

@@ -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 {

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/ExportPNGAction.java

@@ -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 {

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/FindAction.java

@@ -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 {

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/FlexibleLeadsAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/GenerateNetlistAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/SummarizeNetlistAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/BringToFrontAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/CopyAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/CutAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/DeleteSelectionAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/DuplicateAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/EditProjectAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/EditSelectionAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/GroupAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/MirrorSelectionAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/NudgeAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/PasteAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/RotateSelectionAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/SaveAsBlockAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/SaveAsTemplateAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/SelectAllAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/SendToBackAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/UngroupAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/CreateBomAction.java

@@ -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;
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ExitAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ExportPDFAction.java

@@ -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 {

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ImportAction.java

@@ -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 {

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ImportNetlistAction.java

@@ -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 {

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/NewAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/OpenAction.java

@@ -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 {

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/PrintAction.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/SaveAction.java

@@ -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 {

diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/SaveAsAction.java

@@ -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 {

diylc/diylc-swing/src/main/java/org/diylc/swing/gui/ComponentPopupMenu.java

@@ -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 {

diylc/diylc-swing/src/main/java/org/diylc/swing/gui/InfoDialog.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/gui/SearchTextField.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/gui/actionbar/ActionBarPlugin.java

@@ -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;
 
 /**

diylc/diylc-swing/src/main/java/org/diylc/swing/loadline/LoadlineEditorFrame.java

@@ -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;
 

diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/CloudPlugIn.java

@@ -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;

diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/AnimatedCloudGlassPane.java

@@ -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.

diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/CloudBrowserFrame.java

@@ -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;
 
 /**

diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/ResultsScrollPanel.java

@@ -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;

diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/SearchHeaderPanel.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/SimpleCloudGlassPane.java

@@ -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.

diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/UploadManagerFrame.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/config/ConfigPlugin.java

@@ -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;
 
 /**

diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/edit/EditMenuPlugin.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/file/FileMenuPlugin.java

@@ -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;
 
 /**

diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/help/HelpMenuPlugin.java

@@ -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.

diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/statusbar/StatusBar.java

@@ -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 {
 

diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java

@@ -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

diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java

@@ -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;

diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/tree/TreePanel.java

@@ -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 {

diylc/diylc-swing/src/main/java/org/diylc/utils/FlagLoader.java

@@ -19,25 +19,27 @@
     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;
+import javax.swing.ImageIcon;
-
+
-/**
+/**
- * Loads image resources as Icons.
+ * Loads image resources as Icons.
- * 
+ * 
- * @author Branislav Stojkovic
+ * @author Branislav Stojkovic
- */
+ */
-public class FlagLoader {
+public class FlagLoader {
-
+
-  public static Icon getIcon(String name) {
+  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) {
+    if (imgURL != null) {
-      return new ImageIcon(imgURL, name);
+      return new ImageIcon(imgURL, name);
-    } else {
+    } else {
-      System.err.println("Couldn't find file: " + name);
+      Logger.getLogger(FlagLoader.class).error("Couldn't find file: " + name);
-      return null;
+      return null;
-    }
+    }
-  }
+  }
-}
+}

diylc/diylc-swing/src/main/java/org/diylc/utils/IconLoader.java

@@ -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;