From eafb4b130752f953338abf49b584fff1a2fcb1d7 Mon Sep 17 00:00:00 2001
From: Bane Stojkovic <bancika@gmail.com>
Date: Mon, 24 Mar 2025 11:29:18 +0100
Subject: [PATCH] refactor resources

---
 .../org/diylc/presenter/BuildingBlockManager.java     |  3 +--
 .../src/main/java/org/diylc/presenter/Presenter.java  | 11 ++---------
 .../main/java/org/diylc/presenter/VariantManager.java |  3 +--
 .../main/resources/{ => import-defaults}/blocks.xml   |  0
 .../main/resources/{ => import-defaults}/variants.xml |  0
 5 files changed, 4 insertions(+), 13 deletions(-)
 rename diylc/diylc-core/src/main/resources/{ => import-defaults}/blocks.xml (100%)
 rename diylc/diylc-core/src/main/resources/{ => import-defaults}/variants.xml (100%)

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 45484187..1685f568 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
@@ -18,7 +18,6 @@
 package org.diylc.presenter;
 
 import java.io.*;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -42,7 +41,7 @@ import org.diylc.serialization.ProjectFileManager;
 
 public class BuildingBlockManager {
 
-  private static final String BLOCKS_FILE_NAME = "blocks.xml";
+  private static final String BLOCKS_FILE_NAME = "import-defaults/blocks.xml";
 
   private static final Logger LOG = Logger.getLogger(VariantManager.class);
 
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 a6eaa454..65c4291b 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
@@ -32,7 +32,6 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Modifier;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -50,7 +49,6 @@ import javax.swing.JOptionPane;
 import org.apache.log4j.Logger;
 import org.diylc.appframework.miscutils.IConfigListener;
 import org.diylc.appframework.miscutils.IConfigurationManager;
-import org.diylc.appframework.miscutils.JarScanner;
 import org.diylc.appframework.miscutils.Utils;
 import org.diylc.appframework.simplemq.MessageDispatcher;
 import org.diylc.appframework.update.Version;
@@ -80,7 +78,6 @@ import org.diylc.core.Project;
 import org.diylc.core.Template;
 import org.diylc.core.Theme;
 import org.diylc.core.VisibilityPolicy;
-import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.IAutoCreator;
 import org.diylc.core.gerber.GerberExporter;
 import org.diylc.core.measures.Size;
@@ -96,11 +93,6 @@ import org.diylc.test.DIYTest;
 import org.diylc.test.Snapshot;
 import org.diylc.utils.Constants;
 import org.diylc.utils.ReflectionUtils;
-import org.reflections.Reflections;
-import org.reflections.util.ConfigurationBuilder;
-import org.reflections.util.FilterBuilder;
-
-import static org.reflections.scanners.Scanners.TypesAnnotated;
 
 /**
  * The main presenter class, contains core app logic and drawing routines.
@@ -2521,7 +2513,8 @@ public class Presenter implements IPlugInPort, IConfigListener {
         }
       }
       try {
-        BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream("variants.xml"));
+        BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(
+            "import-defaults/variants.xml"));
         XStream xStream = new XStream(new DomDriver());
         xStream.addPermission(AnyTypePermission.ANY);
         ProjectFileManager.xStreamSerializer.toXML(defaultVariantMap, out);
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 4761b4e4..6e857688 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
@@ -21,7 +21,6 @@ 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;
 import java.util.Collections;
@@ -46,7 +45,7 @@ import org.diylc.serialization.ProjectFileManager;
 
 public class VariantManager {
 
-  private static final String VARIANTS_FILE_NAME = "variants.xml";
+  private static final String VARIANTS_FILE_NAME = "import-defaults/variants.xml";
 
   private static final Logger LOG = Logger.getLogger(VariantManager.class);
 
diff --git a/diylc/diylc-core/src/main/resources/blocks.xml b/diylc/diylc-core/src/main/resources/import-defaults/blocks.xml
similarity index 100%
rename from diylc/diylc-core/src/main/resources/blocks.xml
rename to diylc/diylc-core/src/main/resources/import-defaults/blocks.xml
diff --git a/diylc/diylc-core/src/main/resources/variants.xml b/diylc/diylc-core/src/main/resources/import-defaults/variants.xml
similarity index 100%
rename from diylc/diylc-core/src/main/resources/variants.xml
rename to diylc/diylc-core/src/main/resources/import-defaults/variants.xml