Fix bug 950

CHANGELOG

@@ -1,4 +1,5 @@
 [master]
+	- Fix for bug 950: NullPointerException on "Manage custom imports"
 	- Feature 850: Keyboard shortcut for 'Cleanup entries' (by eduardogreco)
     - Change default behaviour to be more non-invasive: timestamps and owners are NOT set by default per entry.
     - "Open Folder" works again

src/main/java/net/sf/jabref/imports/CustomImportList.java

@@ -22,6 +22,8 @@
 
  Further information about the GNU GPL is available at:
  http://www.gnu.org/copyleft/gpl.ja.html
+  Copyright (C) 2005-2014 JabRef contributors.
+
 */
 package net.sf.jabref.imports;
 
@@ -93,13 +95,15 @@ public void setClassName(String className) {
     public void setBasePath(String basePath) {
       this.basePath = basePath;
     }
-
-    public File getBasePath() {
+    public String getBasePath() {
+        return basePath;
+      }
+    public File getFileFromBasePath() {
       return new File(basePath);
     }
 
     public URL getBasePathUrl() throws MalformedURLException {
-      return getBasePath().toURI().toURL();
+      return getFileFromBasePath().toURI().toURL();
     }
 
     public String[] getAsStringArray() {

src/main/java/net/sf/jabref/imports/ImportCustomizationDialog.java

@@ -22,7 +22,7 @@
 
  Further information about the GNU GPL is available at:
  http://www.gnu.org/copyleft/gpl.ja.html
-
+  Copyright (C) 2005-2014 JabRef contributors.
  */
 package net.sf.jabref.imports;
 
@@ -113,14 +113,16 @@ public ImportCustomizationDialog(JabRefFrame frame_) throws HeadlessException {
       JButton addFromFolderButton = new JButton(Globals.lang("Add from folder"));
       addFromFolderButton.addActionListener(new ActionListener() {
           public void actionPerformed(ActionEvent e) {
+        	  String chosenFileStr = null;
               CustomImportList.Importer importer = prefs.customImports.new Importer();
               importer.setBasePath(FileDialogs.getNewDir(frame, new File(prefs.get("workingDirectory")), "",
                       Globals.lang("Select Classpath of New Importer"), JFileChooser.CUSTOM_DIALOG, false));
-              String chosenFileStr = FileDialogs.getNewFile(frame, importer.getBasePath(), ".class",
+              if(importer.getBasePath()!=null)
+              chosenFileStr = FileDialogs.getNewFile(frame, importer.getFileFromBasePath(), ".class",
                       Globals.lang("Select new ImportFormat Subclass"), JFileChooser.CUSTOM_DIALOG, false);
               if (chosenFileStr != null) {
                   try {
-                      importer.setClassName(pathToClass(importer.getBasePath(), new File(chosenFileStr)));
+                      importer.setClassName(pathToClass(importer.getFileFromBasePath(), new File(chosenFileStr)));
                       importer.setName(importer.getInstance().getFormatName());
                       importer.setCliId(importer.getInstance().getCLIId());
                       addOrReplaceImporter(importer);
@@ -286,7 +288,7 @@ public Object getValueAt(int rowIndex, int columnIndex) {
       } else if (columnIndex == 2) {
         value = importer.getClassName();
       } else if (columnIndex == 3) {
-        value = importer.getBasePath();
+        value = importer.getFileFromBasePath();
       }
       return value;
     }

src/main/resources/help/About.html

@@ -90,7 +90,8 @@ <h2>Contributions from:</h2>
         Seb Wills,
         John Zedlewski,
         Waluyo Adi Siswanto,
-		Eduardo Roberto Greco</p>
+		Eduardo Roberto Greco,
+		Thiago Gomes Toledo</p>
 
         <h2>Thanks to:</h2>