[jboss-cvs] jboss-seam/src/gen/org/jboss/seam/tool ...

[Gavin King]

  User: gavin   
  Date: 06/11/03 12:38:58

  Modified:    src/gen/org/jboss/seam/tool   FaceletGenerator.java
                        SeamGenCommandLine.java
  Log:
  more on seam-gen
  
  Revision  Changes    Path
  1.7       +2 -2      jboss-seam/src/gen/org/jboss/seam/tool/FaceletGenerator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FaceletGenerator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/gen/org/jboss/seam/tool/FaceletGenerator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- FaceletGenerator.java	3 Nov 2006 04:29:21 -0000	1.6
  +++ FaceletGenerator.java	3 Nov 2006 17:38:58 -0000	1.7
  @@ -40,7 +40,7 @@
   		projectName = args[1];
         actionName = args[2];
         componentName = lower(actionName);
  -      if ( !"".equals(args[3]) )
  +      if ( args.length>3 && !"".equals(args[3]) )
         {
            pageName = args[3];
         }
  @@ -48,7 +48,7 @@
         {
            pageName = componentName;
         }
  -      if ( !"".equals(args[4]) )
  +      if ( args.length>4 && !"".equals(args[4]) )
         {
            masterPageName = args[4];
         }
  
  
  
  1.7       +72 -64    jboss-seam/src/gen/org/jboss/seam/tool/SeamGenCommandLine.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamGenCommandLine.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/gen/org/jboss/seam/tool/SeamGenCommandLine.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- SeamGenCommandLine.java	3 Nov 2006 03:46:16 -0000	1.6
  +++ SeamGenCommandLine.java	3 Nov 2006 17:38:58 -0000	1.7
  @@ -23,87 +23,95 @@
   
   public class SeamGenCommandLine {
   
  -	public static void main(String[] args) throws Exception {
  +	public static void main(String[] args) {
   
  -		if (args[0].equals("set-properties")) {
  -			// check to make sure we have right # of arguments
  -			if (args.length == 8) {
  -				BuildPropertiesBean projectProps = new BuildPropertiesBean(args);
  -				BuildPropertiesGenerator propsGen = new BuildPropertiesGenerator(
  -						projectProps);
  -				propsGen.generate();
  -			} else {
  -				throw new Exception("Wrong number of arguments");
  -			}
  +      try
  +      {
  +      
  +         validateArgs(args, 2);
  +   
  +   		if ( args[0].equals("set-properties") ) 
  +         {
  +   			new BuildPropertiesGenerator( new BuildPropertiesBean(args) ).generate();
   		} 
   
  -      else if (args[0].equals("new-stateful-action")) {
  -         if (args.length == 4) {
  +         else if ( args[0].equals("new-stateful-action") ) 
  +         {
  +            validateArgs(args, 3);
               JavaClassGenerator actionGen = new JavaClassGenerator(args);            
               FaceletGenerator faceletGen = new FaceletGenerator(args);
  -            
               faceletGen.newFormPage();
               actionGen.newStatefulAction();            
               actionGen.newTestcase();
  -         } else {
  -            throw new Exception("Wrong number of arguments");
  -         }
         }
   
  -		else if (args[0].equals("new-stateless-action")) {
  -			if (args.length == 4) {
  +   		else if ( args[0].equals("new-stateless-action") ) 
  +         {
  +            validateArgs(args, 3);
   				JavaClassGenerator actionGen = new JavaClassGenerator(args);            
               FaceletGenerator faceletGen = new FaceletGenerator(args);
  -            
               faceletGen.newActionPage();
               actionGen.newStatelessAction();            
               actionGen.newTestcase();
  -			} else {
  -				throw new Exception("Wrong number of arguments");
  -			}
   		}
   
  -		else if (args[0].equals("new-conversation")) {
  -			if (args.length == 4) {
  +   		else if ( args[0].equals("new-conversation") ) 
  +         {
  +            validateArgs(args, 3);
   				JavaClassGenerator actionGen = new JavaClassGenerator(args);
               FaceletGenerator faceletGen = new FaceletGenerator(args);
  -                       
               faceletGen.newConversationPage();
   				actionGen.newConversation();
               actionGen.newTestcase();
  -			} else {
  -				throw new Exception("Wrong number of arguments");
  -			}
   		}
   
  -		else if (args[0].equals("new-entity")) {
  -			if (args.length == 5) {
  +   		else if ( args[0].equals("new-entity") ) 
  +         {
  +            validateArgs(args, 3);
   				JavaClassGenerator actionGen = new JavaClassGenerator(args);
               FaceletGenerator faceletGen = new FaceletGenerator(args);
  -            
   				actionGen.newEntity();
               actionGen.newEntityHome();
               actionGen.newEntityList();
               faceletGen.newEditPage();
               faceletGen.newListPage();
  -			} else {
  -				throw new Exception("Wrong number of arguments");
  -			}
   		}
   
  -		else if (args[0].equals("new-mdb")) {
  -			if (args.length == 5) {
  +   		else if ( args[0].equals("new-mdb") ) 
  +         {
  +            validateArgs(args, 5);
   				JavaClassGenerator actionGen = new JavaClassGenerator(args);
   				actionGen.setMdbDestination(args[3]);
   				actionGen.setMdbDestinationType(args[4]);
   				actionGen.newMdb();
  -			} else {
  -				throw new Exception("Wrong number of arguments");
  -			}
   		} 
   		
   		else {
  -			System.out.println("No command executed");
  +   			throw new Exception("Unknown command");
  +   		}
  +         
  +      }
  +      catch (Exception e)
  +      {
  +         System.out.println( "ERROR: " + e.getMessage() );
  +      }
  +	}
  +   
  +   private static void validateArgs(String[] args, int length)
  +   {
  +      if ( args.length>=length )
  +      {
  +         for (int i=0; i<length; i++)
  +         {
  +            if ( args[i].length()==0 )
  +            {
  +               throw new IllegalArgumentException("Missing parameter");
  +            }
  +         }
  +      }
  +      else
  +      {
  +         throw new IllegalArgumentException("Not enough parameters");
   		}
   	}