1.1 --- a/ada.project/src/org/netbeans/modules/ada/project/ui/wizards/NewAdaProjectWizardIterator.java	Wed Sep 23 02:06:44 2009 +0200
     1.2 +++ b/ada.project/src/org/netbeans/modules/ada/project/ui/wizards/NewAdaProjectWizardIterator.java	Sun Aug 22 23:37:11 2010 +0200
     1.3 @@ -48,6 +48,7 @@
     1.4  import java.util.Map;
     1.5  import java.util.NoSuchElementException;
     1.6  import java.util.Set;
     1.7 +import java.util.StringTokenizer;
     1.8  import javax.swing.event.ChangeListener;
     1.9  import org.netbeans.api.progress.ProgressHandle;
    1.10  import org.netbeans.api.project.Project;
    1.11 @@ -64,7 +65,6 @@
    1.12  import org.openide.WizardDescriptor;
    1.13  import org.openide.filesystems.FileObject;
    1.14  import org.openide.filesystems.FileUtil;
    1.15 -import org.openide.filesystems.Repository;
    1.16  import org.openide.loaders.DataFolder;
    1.17  import org.openide.loaders.DataObject;
    1.18  import org.openide.util.Exceptions;
    1.19 @@ -134,6 +134,15 @@
    1.20          return null;
    1.21      }
    1.22  
    1.23 +    private String removeSpaces(String s) {
    1.24 +        StringTokenizer st = new StringTokenizer(s, " ", false);
    1.25 +        String t = "";
    1.26 +        while (st.hasMoreElements()) {
    1.27 +            t += st.nextElement();
    1.28 +        }
    1.29 +        return t;
    1.30 +    }
    1.31 +
    1.32      public Set instantiate(ProgressHandle handle) throws IOException {
    1.33          final Set<FileObject> resultSet = new HashSet<FileObject>();
    1.34  
    1.35 @@ -163,8 +172,8 @@
    1.36              // main file
    1.37              final String mainName = (String) descriptor.getProperty(NewAdaProjectWizardIterator.MAIN_FILE);
    1.38              if (mainName != null) {
    1.39 -                resultSet.add(createMainFile(Repository.getDefault().getDefaultFileSystem().findResource("Templates/Ada/NewAdaMain"),
    1.40 -                        sourceDir, mainName).getPrimaryFile());
    1.41 +                resultSet.add(createMainFile(FileUtil.getConfigFile("Templates/Ada/NewMain"),
    1.42 +                        sourceDir, removeSpaces(mainName)).getPrimaryFile());
    1.43              }
    1.44          }
    1.45  
    1.46 @@ -279,7 +288,6 @@
    1.47                          nameEl.appendChild(doc.createTextNode(name));
    1.48                          data.appendChild(nameEl);
    1.49  
    1.50 -
    1.51                          EditableProperties properties = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);
    1.52  
    1.53                          configureSources(helper, data, properties);
    1.54 @@ -351,11 +359,11 @@
    1.55          String platformId = (String) descriptor.getProperty(PROP_PLATFORM_ID);
    1.56          assert platformId != null;
    1.57          properties.setProperty(AdaProjectProperties.ACTIVE_PLATFORM, platformId);
    1.58 -        properties.setProperty(AdaProjectProperties.ADA_LIB_PATH, "");    //NOI18N
    1.59 -        final File projectDirectory = FileUtil.toFile(helper.getProjectDirectory());
    1.60 -        String buildPath = projectDirectory + File.separator + DEFAULT_BUILD_DIR;
    1.61 +        properties.setProperty(AdaProjectProperties.OUTPUT_BUILD_FORMAT, AdaProjectProperties.NATIVE_FORMAT);
    1.62 +        properties.setProperty(AdaProjectProperties.ADA_LIB_PATH, ""); //NOI18N
    1.63 +        String buildPath = DEFAULT_BUILD_DIR;
    1.64          properties.setProperty(AdaProjectProperties.BUILD_DIR, buildPath);
    1.65 -        String distPath = projectDirectory + File.separator + DEFAULT_DIST_DIR;
    1.66 +        String distPath = DEFAULT_DIST_DIR;
    1.67          properties.setProperty(AdaProjectProperties.DIST_DIR, distPath);
    1.68      }
    1.69