modified New Application Wizard to allow for generation of web/command line application

editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/generator/ApplicationGenerator.java

 /*
  * Copyright (c) 2011, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
@@ skipping 29 matching lines @@
 public class ApplicationGenerator extends AbstractGenerator {
 
   public static final String HTML_FILENAME_EXTENSION = ".html"; //$NON-NLS-1$
 
   public static final String DESCRIPTION = GeneratorMessages.ApplicationGenerator_description;
 
   private String applicationName;
 
   private String applicationLocation;
 
+  private boolean isWebApplication;
+
   private IFile iApplicationFile = null;
 
   /**
    * Construct a new instance.
    */
   public ApplicationGenerator() {
   }
 
   /**
    * Create the folder to contain the library and the library declaration file
    * 
    * @param monitor the monitor to which activity is reported
    */
   @Override
   public void execute(IProgressMonitor monitor) throws CoreException {
     // Sanity Check
     Assert.isNotNull(applicationName);
     Assert.isNotNull(applicationLocation);
     IStatus status = validate();
     if (status.getSeverity() == IStatus.ERROR) {
       throw new IllegalStateException(status.getMessage());
     }
 
     String applicationFileName = appendIfNoExtension(applicationName, Extensions.DOT_DART);
-
-    SubMonitor subMonitor = SubMonitor.convert(monitor,
-        GeneratorMessages.ApplicationGenerator_message, 100);
-    String className = applicationFileName.substring(0, applicationFileName.indexOf('.'));
-    final HashMap<String, String> substitutions = new HashMap<String, String>();
-    substitutions.put("className", className); //$NON-NLS-1$
-    substitutions.put("extends", ""); //$NON-NLS-1$ //$NON-NLS-2$
-    substitutions.put("implements", ""); //$NON-NLS-1$ //$NON-NLS-2$
-
-    File applicationFile = getSystemFile(applicationFileName);
-    execute("generated-dart-class-main.txt", applicationFile, substitutions, monitor); //$NON-NLS-1$
-    subMonitor.newChild(100);
-    subMonitor.done();
-
-    // html file
-    subMonitor = SubMonitor.convert(monitor,
-        GeneratorMessages.ApplicationGenerator_htmlFileMessage, 100);
-    String htmlFileName = appendIfNoExtension(applicationName, HTML_FILENAME_EXTENSION);
-    File iHtmlFile = getSystemFile(htmlFileName);
-    substitutions.put("title", className);
-    substitutions.put("dartPath", applicationFileName + "." + JavascriptBackend.EXTENSION_APP_JS);
-    execute("generated-html.txt", iHtmlFile, substitutions, monitor); //$NON-NLS-1$
-    subMonitor.newChild(100);
-    subMonitor.done();
+    File applicationFile;
+    if (isWebApplication) {
+      applicationFile = generateWebApplication(monitor, applicationFileName);
+    } else {
+      applicationFile = generateCommandLineApp(monitor, applicationFileName);
+    }
 
     DartLibrary library = DartCore.openLibrary(applicationFile, monitor);
     if (library != null) {
       library.setTopLevel(true);
     }
     IFile[] files = ResourceUtil.getResources(applicationFile);
     iApplicationFile = files[0];
 
   }
 
@@ skipping 11 matching lines @@
    * 
    * @return the file or <code>null</code> if a file cannot be created
    */
 
   public File getSystemFile(String fileName) {
     // Fail fast for null elements
     Assert.isNotNull(fileName);
     return new File(applicationLocation + File.separator + fileName);
   }
 
+  public boolean isWebApplication() {
+    return isWebApplication;
+  }
+
   public void setApplicationLocation(String applicationLocation) {
     this.applicationLocation = applicationLocation;
   }
 
   public void setApplicationName(String applicationName) {
     this.applicationName = applicationName;
   }
 
+  public void setWebApplication(boolean isWebApplication) {
+    this.isWebApplication = isWebApplication;
+  }
+
   /**
    * Checks that the library location and file name are both valid.
    * 
    * @see #validateLocation()
    * @see #validateName()
    * @return IStatus corresponding to any errors/warnings that would make the lib/app invalid
    */
   @Override
   public IStatus validate() {
     IStatus status = StatusUtil.getMoreSevere(Status.OK_STATUS, validateLocation());
     status = StatusUtil.getMoreSevere(status, validateName());
     return status;
   }
 
+  private File generateCommandLineApp(IProgressMonitor monitor, String applicationFileName)
+      throws CoreException {
+    SubMonitor subMonitor = SubMonitor.convert(monitor,
+        GeneratorMessages.ApplicationGenerator_message, 100);
+
+    final HashMap<String, String> substitutions = new HashMap<String, String>();
+
+    File applicationFile = getSystemFile(applicationFileName);
+    execute("generated-dart-server.txt", applicationFile, substitutions, monitor); //$NON-NLS-1$
+    subMonitor.newChild(100);
+    subMonitor.done();
+
+    return applicationFile;
+  }
+
+  private File generateWebApplication(IProgressMonitor monitor, String applicationFileName)
+      throws CoreException {
+    SubMonitor subMonitor = SubMonitor.convert(monitor,
+        GeneratorMessages.ApplicationGenerator_message, 100);
+
+    String className = applicationFileName.substring(0, applicationFileName.indexOf('.'));
+
+    final HashMap<String, String> substitutions = new HashMap<String, String>();
+    substitutions.put("className", className); //$NON-NLS-1$
+    substitutions.put("extends", ""); //$NON-NLS-1$ //$NON-NLS-2$
+    substitutions.put("implements", ""); //$NON-NLS-1$ //$NON-NLS-2$
+
+    File applicationFile = getSystemFile(applicationFileName);
+    execute("generated-dart-class-main.txt", applicationFile, substitutions, monitor); //$NON-NLS-1$
+    subMonitor.newChild(100);
+    subMonitor.done();
+
+    // html file
+    subMonitor = SubMonitor.convert(monitor,
+        GeneratorMessages.ApplicationGenerator_htmlFileMessage, 100);
+    String htmlFileName = appendIfNoExtension(applicationName, HTML_FILENAME_EXTENSION);
+    File iHtmlFile = getSystemFile(htmlFileName);
+    substitutions.put("title", className);
+    substitutions.put("dartPath", applicationFileName + "." + JavascriptBackend.EXTENSION_APP_JS);
+    execute("generated-html.txt", iHtmlFile, substitutions, monitor); //$NON-NLS-1$
+    subMonitor.newChild(100);
+    subMonitor.done();
+    return applicationFile;
+  }
+
   /**
    * Validate the application location.
    * 
    * @return {@link Status#OK_STATUS} if the name is valid, or a status indicating an error or
    *         warning.
    */
   private IStatus validateLocation() {
     // Validate that:
     // 1) The file is non-empty
     // 2) The directory is a valid path
@@ skipping 37 matching lines @@
               + HTML_FILENAME_EXTENSION}));
     }
     IStatus status = DartIdentifierUtil.validateIdentifier(applicationName);
     if (status != Status.OK_STATUS) {
       return status;
     }
     return Status.OK_STATUS;
   }
 
 }