fix mavenized

diylc/diylc-swing/dict.txt

@@ -188,6 +188,7 @@ Default Font Size
 Delete Selection
 Description
 Designation
+Deutsch
 Diameter
 Dimension Mode
 Directional
@@ -206,6 +207,7 @@ Drag control point(s) of
 Drag the mouse over the canvas to place a new
 Draw Standard
 Drop
+DualPot
 Duodecar B12C
 Duplicate
 E+
@@ -219,9 +221,11 @@ Electro-Mechanical
 Electrode Labels
 Enable Cache Boost
 End Arrow
+English
 Enjoying DIYLC? Click here to buy me a coffee :)
 Error
 Error occurred while editing selection. Check the log for details.
+Español
 Exit
 Expand Selection
 Explicit Dimensions
@@ -250,6 +254,7 @@ Font Italic
 Font Size
 Font Size Override
 Four
+Français
 Full
 Fuse
 G-D-S     JFET
@@ -306,6 +311,7 @@ Inner 6
 Inside Color
 Integration
 Invert Polarity
+Italiano
 Label
 Label Color
 Label Orientation
@@ -358,6 +364,7 @@ Moveable Label
 NPN
 Name
 Nand
+Nederlands
 Negative
 New
 New version available
@@ -420,6 +427,7 @@ Pole Pieces
 Pole Pieces 1
 Pole Pieces 2
 Poles
+Português
 Positions
 Positive
 Power Rating
@@ -513,6 +521,7 @@ Source Type
 Spacing
 Square
 Square BR-3
+Srpski
 Standard
 Start Arrow
 Start Recording
@@ -533,6 +542,8 @@ Submit a Bug
 Suppressor grid
 Switched
 Switches
+TO-92 w/ 2 Leads
+TO-92 w/ 3 Leads
 Tab
 Tab Border
 Tabbed Toolbar
@@ -554,6 +565,7 @@ Tick Width
 Ticks
 Timing
 Title
+Title Block
 Toolbox
 Top
 Top Lead

diylc/diylc-swing/pom.xml

@@ -77,43 +77,48 @@
             <artifactId>pdfbox</artifactId>
             <version>2.0.27</version>
         </dependency>
-        
-        <!-- Local dependencies from lib folder -->
         <dependency>
-            <groupId>org.diylc.local</groupId>
-            <artifactId>AppleJavaExtensions</artifactId>
-            <version>1.0</version>
+            <groupId>com.orsonpdf</groupId>
+            <artifactId>orsonpdf</artifactId>
+            <version>1.9.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.janino</groupId>
+            <artifactId>janino</artifactId>
+            <version>3.1.12</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.janino</groupId>
+            <artifactId>commons-compiler</artifactId>
+            <version>3.1.12</version>
+        </dependency>
+        <dependency>
+            <groupId>net.java.balloontip</groupId>
+            <artifactId>balloontip</artifactId>
+            <version>1.2.4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jettison</groupId>
+            <artifactId>jettison</artifactId>
+            <version>1.5.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.guigarage</groupId>
+            <artifactId>gestures-wrapper</artifactId>
+            <version>0.2</version>
+        </dependency>
+
+        <!-- Local dependencies from lib folder -->
         <dependency>
             <groupId>org.diylc.local</groupId>
             <artifactId>app-framework</artifactId>
             <version>1.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.diylc.local</groupId>
-            <artifactId>balloontip-1.2.4.1</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.diylc.local</groupId>
-            <artifactId>commons-compiler-3.0.6</artifactId>
-            <version>1.0</version>
-        </dependency>
         <dependency>
             <groupId>org.diylc.local</groupId>
             <artifactId>gerber-writer-api-1.0.0</artifactId>
             <version>1.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.diylc.local</groupId>
-            <artifactId>gestures-wrapper-0.2</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.diylc.local</groupId>
-            <artifactId>janino-3.0.6</artifactId>
-            <version>1.0</version>
-        </dependency>
         <dependency>
             <groupId>org.diylc.local</groupId>
             <artifactId>jar-loader</artifactId>
@@ -129,16 +134,6 @@
             <artifactId>jep-2.4.1</artifactId>
             <version>1.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.diylc.local</groupId>
-            <artifactId>jettison-1.0.1</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.diylc.local</groupId>
-            <artifactId>orsonpdf-1.8</artifactId>
-            <version>1.0</version>
-        </dependency>
         <dependency>
             <groupId>org.diylc.local</groupId>
             <artifactId>svgSalamander-1.1.2.4</artifactId>

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

@@ -88,7 +88,7 @@ public class DIYLCStarter {
     		}
 		}
 
-		URL url = DIYLCStarter.class.getResource("log4j.properties");
+		URL url = DIYLCStarter.class.getResource("/log4j.properties");
 		Properties properties = new Properties();
 		try {
 			properties.load(url.openStream());
@@ -116,6 +116,7 @@ public class DIYLCStarter {
 				+ System.getProperty("java.vm.vendor"));
 		LOG.debug("Java home: " + System.getProperty("java.home"));
 		LOG.debug("OS: " + System.getProperty("os.name") + " " + System.getProperty("os.version"));
+//		LOG.debug("Classpath: " + System.getProperty("java.class.path"));
 		
 		// set OS name as HTTP agent, java will append java version
 		Properties props = System.getProperties();

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

@@ -42,14 +42,14 @@ import org.diylc.lang.Language;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.utils.IconLoader;
-import org.diylc.utils.ResourceLoader;
+import org.diylc.utils.ResourceUtils;
 
 /**
  * Controls configuration menu.
  * 
  * @author Branislav Stojkovic
  */
-public class ConfigPlugin implements IPlugIn {   
+public class ConfigPlugin implements IPlugIn {
 
   private static final Logger LOG = Logger.getLogger(ConfigPlugin.class);
 
@@ -64,7 +64,8 @@ public class ConfigPlugin implements IPlugIn {
   public static final String TABBED_TOOLBAR = "Tabbed Toolbar";
   private static final String LANGUAGE_MENU = LangUtil.translate("Language");
   
-  private static final String LANG_RESTART = LangUtil.translate("Language selection will be applied after the application is restarted.");  
+  private static final String LANG_RESTART = LangUtil.translate("Language selection will be applied after the application is restarted.");
+  public static final String THEMES_DIR = "themes";
 
   private ISwingUI swingUI;
 
@@ -170,8 +171,8 @@ public class ConfigPlugin implements IPlugIn {
         ActionFactory.getInstance()
             .createConfigAction(plugInPort, "Sticky Points", IPlugInPort.STICKY_POINTS_KEY, true), CONFIG_MENU);      
 
-    File[] themeFiles = ResourceLoader.getFiles("themes");
-    if (themeFiles != null && themeFiles.length > 0) {
+    List<File> themeFiles = ResourceUtils.getResourceFiles(THEMES_DIR);
+    if (!themeFiles.isEmpty()) {
       XStream xStream = new XStream(new DomDriver());
       xStream.addPermission(AnyTypePermission.ANY);
       swingUI.injectSubmenu(THEME_MENU, IconLoader.Pens.getIcon(), CONFIG_MENU);