@@ -39,8 +39,9 @@
 import java.io.File;
 import java.util.Set;
 import java.util.HashSet;
-import edu.rice.cs.plt.io.IOUtil;
+import edu.rice.cs.drjava.DrJava;
 import edu.rice.cs.drjava.config.OptionConstants;
+import edu.rice.cs.plt.io.IOUtil;
 
 /** Some common methods for determining Java source files, language level files, etc.
   * @version $Id$
@@ -58,6 +59,13 @@ public static Set<String> getSourceFileExtensions() {
     return extensions;
   }
 
+  /** Return the suggested file extension that will be appended to a file without extension.
+    * @return the suggested file extension */
+  public static String getSuggestedFileExtension() {
+    return OptionConstants.LANGUAGE_LEVEL_EXTENSIONS[DrJava.getConfig().getSetting(OptionConstants.LANGUAGE_LEVEL)];
+  }
+
+  
   /** .java --> true
     * .dj   --> true
     * .dj0  --> true
 
@@ -103,6 +103,10 @@ List<? extends DJError> compile(List<? extends File> files, List<? extends File>
   /** Return the set of source file extensions that this compiler supports.
     * @return the set of source file extensions that this compiler supports. */
   Set<String> getSourceFileExtensions();
+
+  /** Return the suggested file extension that will be appended to a file without extension.
+    * @return the suggested file extension */
+  public String getSuggestedFileExtension();
 
   /** Return a file filter that can be used to open files this compiler supports.
     * @return file filter for appropriate source files for this compiler. */
 
@@ -96,6 +96,12 @@ public List<? extends DJError> compile(List<? extends File> files, List<? extend
   /** Return the set of source file extensions that this compiler supports.
     * @return the set of source file extensions that this compiler supports. */
   public Set<String> getSourceFileExtensions() { return DrJavaFileUtils.getSourceFileExtensions(); }
+  
+  /** Return the suggested file extension that will be appended to a file without extension.
+    * @return the suggested file extension */
+  public String getSuggestedFileExtension() {
+    return DrJavaFileUtils.getSuggestedFileExtension();
+  }
 
   /** Return a file filter that can be used to open files this compiler supports.
     * @return file filter for appropriate source files for this compiler */
 
@@ -344,6 +344,18 @@ private javax.swing.filechooser.FileFilter getSourceFileFilter() {
       return cm.getActiveCompiler().getFileFilter();
     }
   }
+
+  /** Return the suggested file extension that will be appended to a file without extension.
+    * @return the suggested file extension */
+  private String getSuggestedFileExtension() {
+    edu.rice.cs.drjava.model.compiler.CompilerModel cm = _model.getCompilerModel();
+    if (cm==null) {
+      return DrJavaFileUtils.getSuggestedFileExtension();
+    }
+    else {
+      return cm.getActiveCompiler().getSuggestedFileExtension();
+    }
+  }
 
   /** Returns the files to open to the model (command pattern). */
   private final FileOpenSelector _openSelector = new FileOpenSelector() {
@@ -5955,8 +5967,7 @@ private File getChosenFile(JFileChooser fc, int choice, File previous,
               String previousName = (previous!=null)?previous.getName():"";
               if (!DrJavaFileUtils.isSourceFile(previousName)) {
                 // previous file name doesn't have a file extension either
-                File newFile = new File(chosen.getAbsolutePath() + OptionConstants.
-                                            LANGUAGE_LEVEL_EXTENSIONS[DrJava.getConfig().getSetting(LANGUAGE_LEVEL)]);
+                File newFile = new File(chosen.getAbsolutePath() + getSuggestedFileExtension());
                 return newFile;
               }
               else {