From e088b5e8c9731f1cf2098c69375dfa600f6e08a5 Mon Sep 17 00:00:00 2001
From: Branislav Stojkovic <bancika@gmail.com>
Date: Tue, 11 Mar 2025 12:18:00 +0100
Subject: [PATCH] fix mavenized

---
 .../diylc/presenter/BuildingBlockManager.java |  15 +-
 .../java/org/diylc/presenter/Presenter.java   |  27 ++--
 .../org/diylc/presenter/VariantManager.java   |  68 ++++-----
 .../java/org/diylc/utils/VersionReader.java   |   7 +-
 .../java/org/diylc/components/misc/Image.java |  16 ++-
 diylc/diylc-swing/.DS_Store                   | Bin 8196 -> 8196 bytes
 diylc/diylc-swing/pom.xml                     |   5 +
 .../src/main/java/org/diylc/DIYLCStarter.java |  16 +--
 .../java/org/diylc/utils/BatchConverter.java  | 129 +++++++++---------
 .../src/test/java/org/diylc/TestBase.java     | 105 +++++++-------
 10 files changed, 198 insertions(+), 190 deletions(-)

diff --git a/diylc/diylc-core/src/main/java/org/diylc/presenter/BuildingBlockManager.java b/diylc/diylc-core/src/main/java/org/diylc/presenter/BuildingBlockManager.java
index 4fa11508..45484187 100644
--- a/diylc/diylc-core/src/main/java/org/diylc/presenter/BuildingBlockManager.java
+++ b/diylc/diylc-core/src/main/java/org/diylc/presenter/BuildingBlockManager.java
@@ -17,11 +17,7 @@
  */
 package org.diylc.presenter;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import java.io.*;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -67,9 +63,11 @@ public class BuildingBlockManager {
     // import default templates from variants.xml file only if we didn't do it already
     if (!configManager.readBoolean(IPlugInPort.DEFAULT_BLOCKS_IMPORTED_KEY, false)) {
       try {
-        URL resource = Presenter.class.getResource(BLOCKS_FILE_NAME);
-        if (resource != null) {
-          BufferedInputStream in = new BufferedInputStream(resource.openStream());
+        InputStream inputStream = Presenter.class.getResourceAsStream("/" + BLOCKS_FILE_NAME);
+        if (inputStream == null) {
+          return;
+        }
+        BufferedInputStream in = new BufferedInputStream(inputStream);
           Map<String, List<IDIYComponent<?>>> defaults =
               (Map<String, List<IDIYComponent<?>>>) ProjectFileManager.xStreamSerializer
                   .fromXML(in);
@@ -92,7 +90,6 @@ public class BuildingBlockManager {
           configManager.writeValue(IPlugInPort.BLOCKS_KEY, blocksMap);
           LOG.info(String.format("Imported %d default building blocks",
               defaults == null ? 0 : defaults.size()));
-        }
       } catch (Exception e) {
         LOG.error("Could not load default blocks", e);
       }
diff --git a/diylc/diylc-core/src/main/java/org/diylc/presenter/Presenter.java b/diylc/diylc-core/src/main/java/org/diylc/presenter/Presenter.java
index 2aeda614..2ca5013c 100644
--- a/diylc/diylc-core/src/main/java/org/diylc/presenter/Presenter.java
+++ b/diylc/diylc-core/src/main/java/org/diylc/presenter/Presenter.java
@@ -142,21 +142,18 @@ public class Presenter implements IPlugInPort, IConfigListener {
   // Read the latest version from the local update.xml file
 	static {
 		try {
-			URL resource = Presenter.class.getResource("update.xml");
-			if (resource != null) {
-				BufferedInputStream in = new BufferedInputStream(resource.openStream());
-				XStream xStream = new XStream(new DomDriver());
-				xStream.addPermission(AnyTypePermission.ANY);
-				@SuppressWarnings("unchecked")
-				List<Version> allVersions = (List<Version>) xStream.fromXML(in);
-				CURRENT_VERSION = allVersions.get(allVersions.size() - 1).getVersionNumber();
-				LOG.info("Current DIYLC version: " + CURRENT_VERSION);
-				RECENT_VERSIONS = allVersions.stream()
-				    .sorted(Comparator.comparing(x -> ((Version)x).getVersionNumber()).reversed())
-				    .limit(10)
-				    .collect(Collectors.toList());
-				in.close();
-			}
+              BufferedInputStream in = new BufferedInputStream(Presenter.class.getResourceAsStream("/update.xml"));
+              XStream xStream = new XStream(new DomDriver());
+              xStream.addPermission(AnyTypePermission.ANY);
+              @SuppressWarnings("unchecked")
+              List<Version> allVersions = (List<Version>) xStream.fromXML(in);
+              CURRENT_VERSION = allVersions.get(allVersions.size() - 1).getVersionNumber();
+              LOG.info("Current DIYLC version: " + CURRENT_VERSION);
+              RECENT_VERSIONS = allVersions.stream()
+                  .sorted(Comparator.comparing(x -> ((Version)x).getVersionNumber()).reversed())
+                  .limit(10)
+                  .collect(Collectors.toList());
+              in.close();
 		} catch (Exception e) {
 			LOG.error("Could not find version number, using default", e);
 		}
diff --git a/diylc/diylc-core/src/main/java/org/diylc/presenter/VariantManager.java b/diylc/diylc-core/src/main/java/org/diylc/presenter/VariantManager.java
index 0ecc4add..4761b4e4 100644
--- a/diylc/diylc-core/src/main/java/org/diylc/presenter/VariantManager.java
+++ b/diylc/diylc-core/src/main/java/org/diylc/presenter/VariantManager.java
@@ -20,6 +20,7 @@ package org.diylc.presenter;
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -67,40 +68,41 @@ public class VariantManager {
     int importCount = 0;
 
     try {
-      URL resource = Presenter.class.getResource(VARIANTS_FILE_NAME);
-      if (resource != null) {
-        BufferedInputStream in = new BufferedInputStream(resource.openStream());
-        Map<String, List<Template>> defaults =
-            (Map<String, List<Template>>) ProjectFileManager.xStreamSerializer.fromXML(in);
-        in.close();
-
-        Map<String, List<Template>> variantMap =
-            (Map<String, List<Template>>) configManager.readObject(IPlugInPort.TEMPLATES_KEY, null);
-        if (variantMap == null)
-          variantMap = new HashMap<String, List<Template>>();
-
-        // merge default variants with user's
-        for (Map.Entry<String, List<Template>> entry : defaults.entrySet()) {
-          List<Template> existingVariants = variantMap.computeIfAbsent(entry.getKey(), key -> new ArrayList<Template>());
-          Set<String> existingNames = existingVariants.stream()
-            .map(x -> x.getName())
-            .collect(Collectors.toSet());
-          
-          for (Template variant : entry.getValue()) {
-            if ((variant.getCreatedOn() == null || importDate.compareTo(variant.getCreatedOn()) < 0) 
-                && !existingNames.contains(variant.getName())) {
-              existingVariants.add(variant);
-              importCount++;
-            }
-          }          
-        }
-
-        // update templates and a flag marking that we imported them
-        configManager.writeValue(IPlugInPort.DEFAULT_TEMPLATES_IMPORT_DATE_KEY,
-            LocalDateTime.now());
-        configManager.writeValue(IPlugInPort.TEMPLATES_KEY, variantMap);
-        LOG.info(String.format("Imported default %d variants", importCount));
+      InputStream inputStream = Presenter.class.getResourceAsStream("/" + VARIANTS_FILE_NAME);
+      if (inputStream == null) {
+        return;
       }
+      BufferedInputStream in = new BufferedInputStream(inputStream);
+      Map<String, List<Template>> defaults =
+          (Map<String, List<Template>>) ProjectFileManager.xStreamSerializer.fromXML(in);
+      in.close();
+
+      Map<String, List<Template>> variantMap =
+          (Map<String, List<Template>>) configManager.readObject(IPlugInPort.TEMPLATES_KEY, null);
+      if (variantMap == null)
+        variantMap = new HashMap<String, List<Template>>();
+
+      // merge default variants with user's
+      for (Map.Entry<String, List<Template>> entry : defaults.entrySet()) {
+        List<Template> existingVariants = variantMap.computeIfAbsent(entry.getKey(), key -> new ArrayList<Template>());
+        Set<String> existingNames = existingVariants.stream()
+          .map(x -> x.getName())
+          .collect(Collectors.toSet());
+
+        for (Template variant : entry.getValue()) {
+          if ((variant.getCreatedOn() == null || importDate.compareTo(variant.getCreatedOn()) < 0)
+              && !existingNames.contains(variant.getName())) {
+            existingVariants.add(variant);
+            importCount++;
+          }
+        }
+      }
+
+      // update templates and a flag marking that we imported them
+      configManager.writeValue(IPlugInPort.DEFAULT_TEMPLATES_IMPORT_DATE_KEY,
+          LocalDateTime.now());
+      configManager.writeValue(IPlugInPort.TEMPLATES_KEY, variantMap);
+      LOG.info(String.format("Imported default %d variants", importCount));
     } catch (Exception e) {
       LOG.error("Could not load default variants", e);
     }
diff --git a/diylc/diylc-core/src/main/java/org/diylc/utils/VersionReader.java b/diylc/diylc-core/src/main/java/org/diylc/utils/VersionReader.java
index 472213d9..a69e134a 100644
--- a/diylc/diylc-core/src/main/java/org/diylc/utils/VersionReader.java
+++ b/diylc/diylc-core/src/main/java/org/diylc/utils/VersionReader.java
@@ -1,6 +1,7 @@
 package org.diylc.utils;
 
 import java.io.BufferedInputStream;
+import java.io.InputStream;
 import java.net.URL;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -17,9 +18,9 @@ import org.diylc.presenter.Presenter;
 public class VersionReader {
   public static void main(String[] args) {
     try {
-      URL resource = Presenter.class.getResource("update.xml");
-      if (resource != null) {
-        BufferedInputStream in = new BufferedInputStream(resource.openStream());
+      InputStream inputStream = Presenter.class.getResourceAsStream("/update.xml");
+      if (inputStream != null) {
+        BufferedInputStream in = new BufferedInputStream(inputStream);
         XStream xStream = new XStream(new DomDriver());
         xStream.addPermission(AnyTypePermission.ANY);
         @SuppressWarnings("unchecked")
diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/misc/Image.java b/diylc/diylc-library/src/main/java/org/diylc/components/misc/Image.java
index e008745a..94c9fdc4 100644
--- a/diylc/diylc-library/src/main/java/org/diylc/components/misc/Image.java
+++ b/diylc/diylc-library/src/main/java/org/diylc/components/misc/Image.java
@@ -26,8 +26,11 @@ import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import javax.imageio.ImageIO;
 import javax.swing.ImageIcon;
+
+import org.apache.log4j.Logger;
 import org.apache.poi.util.IOUtils;
 import org.diylc.appframework.miscutils.IconImageConverter;
 
@@ -55,6 +58,8 @@ import org.diylc.core.annotations.PercentEditor;
     flexibleZOrder = true, bomPolicy = BomPolicy.NEVER_SHOW, transformer = ImageTransformer.class)
 public class Image extends AbstractTransparentComponent<Void> {
 
+  private static final Logger LOG = Logger.getLogger(Image.class);
+
   private static final long serialVersionUID = 1L;
   public static String DEFAULT_TEXT = "Double click to edit text";
   private static ImageIcon ICON;
@@ -67,10 +72,13 @@ public class Image extends AbstractTransparentComponent<Void> {
 
   static {
     String name = "/image.png";
-    java.net.URL imgURL = Image.class.getResource(name);
-    if (imgURL != null) {
-      ICON = new ImageIcon(imgURL, name);
-    }
+      try (InputStream inputStream = Image.class.getResourceAsStream(name)) {
+          if (inputStream != null) {
+            ICON = new ImageIcon(inputStream.readAllBytes(), name);
+          }
+      } catch (IOException e) {
+        LOG.error("Error loading image " + name, e);
+      }
   }
 
   @Override
diff --git a/diylc/diylc-swing/.DS_Store b/diylc/diylc-swing/.DS_Store
index e9daf38ebb1857d78d7473295003b5bef3035ade..225a94344de13c3eeeb10e906836917f24fdb49b 100644
GIT binary patch
delta 34
qcmZp1XmOa}&nUbxU^hRb@MazXA?D3K!kUbm-FXf$Z)TVH%MJjvatay%

delta 51
zcmZp1XmOa}&nU7nU^hRb$Yve^A!c@Vh609shTO?n0@950HVX@zFmA4sX=9$)z_XcM
H;x9V@XtNGE

diff --git a/diylc/diylc-swing/pom.xml b/diylc/diylc-swing/pom.xml
index afd926b1..b9cd4b4a 100644
--- a/diylc/diylc-swing/pom.xml
+++ b/diylc/diylc-swing/pom.xml
@@ -107,6 +107,11 @@
             <artifactId>gestures-wrapper</artifactId>
             <version>0.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.36</version>
+        </dependency>
 
         <!-- Local dependencies from lib folder -->
         <dependency>
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/DIYLCStarter.java b/diylc/diylc-swing/src/main/java/org/diylc/DIYLCStarter.java
index e6215d86..3c41772b 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/DIYLCStarter.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/DIYLCStarter.java
@@ -19,6 +19,7 @@ package org.diylc;
 
 import java.awt.Desktop;
 import java.io.File;
+import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.net.URL;
 import java.util.Arrays;
@@ -88,10 +89,9 @@ public class DIYLCStarter {
     		}
 		}
 
-		URL url = DIYLCStarter.class.getResource("/log4j.properties");
 		Properties properties = new Properties();
-		try {
-			properties.load(url.openStream());
+		try (InputStream inputStream = DIYLCStarter.class.getResourceAsStream("/log4j.properties")) {
+			properties.load(inputStream);
 			PropertyConfigurator.configure(properties);
 		} catch (Exception e) {
 			LOG.error("Could not initialize log4j configuration", e);
@@ -222,13 +222,9 @@ public class DIYLCStarter {
 		}
 
 		properties = new Properties();
-		try {
-			LOG.info("Injecting default properties.");
-			URL resource = Presenter.class.getResource("config.properties");
-			if (resource != null) {
-				properties.load(resource.openStream());
-				PropertyInjector.injectProperties(properties);
-			}
+		try (InputStream inputStream = Presenter.class.getResourceAsStream("/config.properties")) {
+			properties.load(inputStream);
+			PropertyInjector.injectProperties(properties);
 		} catch (Exception e) {
 			LOG.error("Could not read config.properties file", e);
 		}
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/utils/BatchConverter.java b/diylc/diylc-swing/src/main/java/org/diylc/utils/BatchConverter.java
index 8500be22..c2aa7fff 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/utils/BatchConverter.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/utils/BatchConverter.java
@@ -1,64 +1,65 @@
-/*
-
-    DIY Layout Creator (DIYLC).
-    Copyright (c) 2009-2018 held jointly by the individual authors.
-
-    This file is part of DIYLC.
-
-    DIYLC is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    DIYLC is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-package org.diylc.utils;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.net.URL;
-import java.util.Properties;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
-import org.diylc.appframework.miscutils.InMemoryConfigurationManager;
-
-import org.diylc.DIYLCStarter;
-import org.diylc.presenter.Presenter;
-import org.diylc.swing.gui.DummyView;
-
-public class BatchConverter {
-  
-  private static final Logger LOG = Logger.getLogger(BatchConverter.class);
-
-  public static void main(String[] args) {
-    URL url = DIYLCStarter.class.getResource("log4j.properties");
-    Properties properties = new Properties();
-    try {
-      properties.load(url.openStream());
-      PropertyConfigurator.configure(properties);
-    } catch (Exception e) {
-      LOG.error("Could not initialize log4j configuration", e);
-    }
-
-    File dir = new File("C:\\Users\\Branislav Stojkovic\\Documents\\layouts_v1");
-    File[] matchingFiles = dir.listFiles(new FilenameFilter() {
-      public boolean accept(File dir, String name) {
-        return true;
-      }
-    });
-    Presenter presenter = new Presenter(new DummyView(), InMemoryConfigurationManager.getInstance());
-    for (File file : matchingFiles) {
-      if (file.getName() != "" && file.getName() != "." && file.getName() != ".." && !file.isDirectory())
-      presenter.loadProjectFromFile(file.getAbsolutePath());
-      presenter.saveProjectToFile(file.getParentFile().getAbsolutePath() + "\\converted\\" + file.getName(), false);
-    }
-  }
-
-}
+/*
+
+    DIY Layout Creator (DIYLC).
+    Copyright (c) 2009-2018 held jointly by the individual authors.
+
+    This file is part of DIYLC.
+
+    DIYLC is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    DIYLC is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+package org.diylc.utils;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Properties;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PropertyConfigurator;
+import org.diylc.appframework.miscutils.InMemoryConfigurationManager;
+
+import org.diylc.DIYLCStarter;
+import org.diylc.presenter.Presenter;
+import org.diylc.swing.gui.DummyView;
+
+public class BatchConverter {
+  
+  private static final Logger LOG = Logger.getLogger(BatchConverter.class);
+
+  public static void main(String[] args) {
+    URL url = DIYLCStarter.class.getResource("/log4j.properties");
+    Properties properties = new Properties();
+    try (InputStream inputStream = url.openStream()) {
+      properties.load(inputStream);
+      PropertyConfigurator.configure(properties);
+    } catch (Exception e) {
+      LOG.error("Could not initialize log4j configuration", e);
+    }
+
+    File dir = new File("C:\\Users\\Branislav Stojkovic\\Documents\\layouts_v1");
+    File[] matchingFiles = dir.listFiles(new FilenameFilter() {
+      public boolean accept(File dir, String name) {
+        return true;
+      }
+    });
+    Presenter presenter = new Presenter(new DummyView(), InMemoryConfigurationManager.getInstance());
+    for (File file : matchingFiles) {
+      if (file.getName() != "" && file.getName() != "." && file.getName() != ".." && !file.isDirectory())
+      presenter.loadProjectFromFile(file.getAbsolutePath());
+      presenter.saveProjectToFile(file.getParentFile().getAbsolutePath() + "\\converted\\" + file.getName(), false);
+    }
+  }
+
+}
diff --git a/diylc/diylc-swing/src/test/java/org/diylc/TestBase.java b/diylc/diylc-swing/src/test/java/org/diylc/TestBase.java
index c7c44b55..212c8974 100644
--- a/diylc/diylc-swing/src/test/java/org/diylc/TestBase.java
+++ b/diylc/diylc-swing/src/test/java/org/diylc/TestBase.java
@@ -1,52 +1,53 @@
-package org.diylc;
-
-import java.awt.Point;
-import java.awt.event.MouseEvent;
-import java.net.URL;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import org.apache.log4j.PropertyConfigurator;
-import org.diylc.appframework.miscutils.ConfigurationManager;
-import org.diylc.appframework.miscutils.InMemoryConfigurationManager;
-
-import org.diylc.common.ComponentType;
-import org.diylc.core.IView;
-import org.diylc.presenter.Presenter;
-
-public class TestBase {
-
-  protected Presenter presenter;
-  protected IView view;
-  
-  public TestBase() {
-    URL url = DIYLCStarter.class.getResource("log4j.properties");
-    Properties properties = new Properties();
-    try {
-        properties.load(url.openStream());
-        PropertyConfigurator.configure(properties);
-    } catch (Exception e) {
-        System.err.println("Could not initialize log4j configuration: " + e.getMessage());
-    }
-    
-    ConfigurationManager.getInstance().initialize("diylc-test");
-    view = new MockView();
-    presenter = new Presenter(view, InMemoryConfigurationManager.getInstance());
-  }
-  
-  protected void instantiateOneClick(String category, String name, Point point1) {
-    Map<String, List<ComponentType>> componentTypes = presenter.getComponentTypes();
-    ComponentType resistorType = componentTypes.get(category).stream().filter(x -> x.getName().equals(name)).findFirst().get();
-    presenter.setNewComponentTypeSlot(resistorType, null, null, false);
-    presenter.mouseClicked(point1, MouseEvent.BUTTON1, false, false, false, 1);
-  }
-  
-  protected void instantiateTwoClick(String category, String name, Point point1, Point point2) {
-    Map<String, List<ComponentType>> componentTypes = presenter.getComponentTypes();
-    ComponentType resistorType = componentTypes.get(category).stream().filter(x -> x.getName().equals(name)).findFirst().get();
-    presenter.setNewComponentTypeSlot(resistorType, null, null, false);
-    presenter.mouseClicked(point1, MouseEvent.BUTTON1, false, false, false, 1);
-    presenter.mouseMoved(point2, false, false, false);
-    presenter.mouseClicked(point2, MouseEvent.BUTTON1, false, false, false, 1);
-  }
-}
+package org.diylc;
+
+import java.awt.Point;
+import java.awt.event.MouseEvent;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import org.apache.log4j.PropertyConfigurator;
+import org.diylc.appframework.miscutils.ConfigurationManager;
+import org.diylc.appframework.miscutils.InMemoryConfigurationManager;
+
+import org.diylc.common.ComponentType;
+import org.diylc.core.IView;
+import org.diylc.presenter.Presenter;
+
+public class TestBase {
+
+  protected Presenter presenter;
+  protected IView view;
+  
+  public TestBase() {
+    URL url = DIYLCStarter.class.getResource("/log4j.properties");
+    Properties properties = new Properties();
+    try (InputStream inputStream = url.openStream()) {
+        properties.load(inputStream);
+        PropertyConfigurator.configure(properties);
+    } catch (Exception e) {
+        System.err.println("Could not initialize log4j configuration: " + e.getMessage());
+    }
+    
+    ConfigurationManager.getInstance().initialize("diylc-test");
+    view = new MockView();
+    presenter = new Presenter(view, InMemoryConfigurationManager.getInstance());
+  }
+  
+  protected void instantiateOneClick(String category, String name, Point point1) {
+    Map<String, List<ComponentType>> componentTypes = presenter.getComponentTypes();
+    ComponentType resistorType = componentTypes.get(category).stream().filter(x -> x.getName().equals(name)).findFirst().get();
+    presenter.setNewComponentTypeSlot(resistorType, null, null, false);
+    presenter.mouseClicked(point1, MouseEvent.BUTTON1, false, false, false, 1);
+  }
+  
+  protected void instantiateTwoClick(String category, String name, Point point1, Point point2) {
+    Map<String, List<ComponentType>> componentTypes = presenter.getComponentTypes();
+    ComponentType resistorType = componentTypes.get(category).stream().filter(x -> x.getName().equals(name)).findFirst().get();
+    presenter.setNewComponentTypeSlot(resistorType, null, null, false);
+    presenter.mouseClicked(point1, MouseEvent.BUTTON1, false, false, false, 1);
+    presenter.mouseMoved(point2, false, false, false);
+    presenter.mouseClicked(point2, MouseEvent.BUTTON1, false, false, false, 1);
+  }
+}