Corrected image/font copying

Now works in webbrowser

Author: apocist

lib/MSDlite.jar

@@ -73,22 +73,22 @@ protected JPanel settingsImage(final JDialog owner){
 			//Main.sig.filter.perspective(Main.sig.loadImage(getFilename()), 0, 0, 200, 0, 200, 200, 0, 200);
 		}
 
-		final JFileChooser fc = new JFileChooser(System.getProperty("user.dir") + "/images");
+		final JFileChooser fc = new JFileChooser(System.getProperty("user.dir") + "/images/");
 		FileFilter filter = new FileNameExtensionFilter("Image file", new String[] {"jpg", "jpeg","gif","png","bmp"});
 		fc.addChoosableFileFilter(filter);
 		fc.setFileFilter(filter);
 
 		final JButton imageBut = new JButton("...");
 		imageBut.addActionListener(new ActionListener(){
 			public void actionPerformed(ActionEvent e){
-				File dir = new File(System.getProperty("user.dir") + "/images");
+				File dir = new File(Main.WORKSPACE + "/images/");
 				if(dir.isDirectory() && dir.canRead()){
 					fc.setCurrentDirectory(dir);
 					int returnVal = fc.showOpenDialog(owner);
 					if (returnVal == JFileChooser.APPROVE_OPTION) {
 						File file = fc.getSelectedFile();
 						if(file.isFile()){
-							if(file.getParentFile().compareTo(dir) == 0){//is in the Fonts folder already
+							if(file.getParentFile().compareTo(dir) == 0){//is in the images folder already
 								//TODO add BufferedImage to box
 								setFilename(file.getName());
 								saveObject();
@@ -98,7 +98,7 @@ public void actionPerformed(ActionEvent e){
 							else{//not in images folder
 								System.out.println("not in folder, copying...");
 								try {
-									Files.copy(file.toPath(), dir.toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+									Files.copy(file.toPath(), new File(Main.WORKSPACE + "/images/"+file.getName()).toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING);
 									//TODO add BufferedImage to box
 									setFilename(file.getName());
 									saveObject();

src/com/inverseinnovations/VisualMALSignatureDesigner/BuildingBlock/AddImage.java

@@ -218,7 +218,7 @@ public void itemStateChanged(ItemEvent e){
 	    });
 		fontBut.addActionListener(new ActionListener(){
 			public void actionPerformed(ActionEvent e){
-				File dir = new File(System.getProperty("user.dir") + "/fonts");
+				File dir = new File(Main.WORKSPACE + "/fonts");
 				if(dir.isDirectory() && dir.canRead()){
 					fc.setCurrentDirectory(dir);
 					int returnVal = fc.showOpenDialog(d);
@@ -242,7 +242,7 @@ public void actionPerformed(ActionEvent e){
 									//copy to fonts folder //TODO check
 									System.out.println("not in folder, copying...");
 									try {
-										Files.copy(file.toPath(), dir.toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+										Files.copy(file.toPath(), new File(Main.WORKSPACE + "/fonts/"+file.getName()).toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING);
 										//fontField.setText(file.getName());
 										fontBox.addItem(file.getName());
 										fontBox.setSelectedItem(file.getName());

src/com/inverseinnovations/VisualMALSignatureDesigner/BuildingBlock/AddText.java

@@ -4,14 +4,13 @@
 import java.awt.image.BufferedImage;
 import java.io.File;
 
-import javax.jnlp.*;
-
 import com.inverseinnovations.MALSignatureDesignerLite.*;
 //TODO update when Block ediited, block added, block deleted, block moved(?)
 
 public class Main {
 	public ImageWindow ImageWindow;
 	public BlockWindow BlockWindow;
+	public String WORKSPACE = System.getProperty("user.dir");
 
 	public Signature sig = new Signature(this.getClass());
 
@@ -23,7 +22,6 @@ public Main(){
     	ImageWindow = new ImageWindow(this);
     	BlockWindow = new BlockWindow(this);
     	prepareTempFolder();
-    	//TODO make sure Sig is init before attempting to alter
     	//demoSig();
 
     	//just testing stuff here
@@ -59,21 +57,21 @@ public void demoSig(){
      * Makes sure the required folders exist for the program
      */
     private void prepareTempFolder(){
-    	File dir = new File(System.getProperty("user.dir") + "/images");
+    	File dir = new File(System.getProperty("user.dir") + "/images/");
     	System.out.println(dir.getPath());
-    	if(dir.mkdir()){
+    	if(dir.mkdirs()){
     		System.out.println("folder created");
     	}
-    	if(!dir.exists()){
+    	if(!dir.isDirectory()){
     		System.out.println("folder still doesn't exist tho");
     	}
 
-    	dir = new File(System.getProperty("user.dir") + "/fonts");
+    	dir = new File(System.getProperty("user.dir") + "/fonts/");
     	System.out.println(dir.getPath());
-    	if(dir.mkdir()){
+    	if(dir.mkdirs()){
     		System.out.println("folder created");
     	}
-    	if(!dir.exists()){
+    	if(!dir.isDirectory()){
     		System.out.println("folder still doesn't exist tho");
     	}
 	}