ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sbaill...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb WebsphereDeploymentTool.java
Date Tue, 08 Jan 2002 19:56:56 GMT
sbailliez    02/01/08 11:56:56

  Modified:    src/main/org/apache/tools/ant/taskdefs War.java
               src/main/org/apache/tools/ant/taskdefs/optional/ide
                        VAJAntToolGUI.java
               src/main/org/apache/tools/ant/taskdefs/optional/ejb
                        WebsphereDeploymentTool.java
  Log:
  Fix bad coding style.
  then/else parts of if statement and loop body must always been enclosed
  in a block statement.
  
  Revision  Changes    Path
  1.17      +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/War.java
  
  Index: War.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/War.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- War.java	7 Jan 2002 06:20:56 -0000	1.16
  +++ War.java	8 Jan 2002 19:56:55 -0000	1.17
  @@ -92,8 +92,9 @@
        */
       public void setWebxml(File descr) {
           deploymentDescriptor = descr; 
  -        if (!deploymentDescriptor.exists())
  +        if (!deploymentDescriptor.exists()) {
               throw new BuildException("Deployment descriptor: " + deploymentDescriptor +
" does not exist.");
  +        }
   
           // Create a ZipFileSet for this file, and pass it up.
           ZipFileSet fs = new ZipFileSet();
  
  
  
  1.5       +32 -16    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
  
  Index: VAJAntToolGUI.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- VAJAntToolGUI.java	15 Dec 2001 00:29:43 -0000	1.4
  +++ VAJAntToolGUI.java	8 Jan 2002 19:56:55 -0000	1.5
  @@ -258,8 +258,9 @@
           public void messageLogged(BuildEvent event) {
               if (event.getPriority() <= getBuildInfo().getOutputMessageLevel()) {
                   String msg = "";
  -                if (event.getTask() != null)
  +                if (event.getTask() != null) {
                       msg = "[" + event.getTask().getTaskName() + "] ";
  +                }
                   getMessageTextArea().append(lineSeparator + msg + event.getMessage());
               }
           }
  @@ -345,22 +346,29 @@
                       }
                   }
                   // MenuItems
  -                if (e.getSource() == VAJAntToolGUI.this.getSaveMenuItem())
  +                if (e.getSource() == VAJAntToolGUI.this.getSaveMenuItem()) {
                       saveBuildInfo();
  -                if (e.getSource() == VAJAntToolGUI.this.getAboutMenuItem())
  +                }
  +                if (e.getSource() == VAJAntToolGUI.this.getAboutMenuItem()) {
                       getAboutDialog().show();
  -                if (e.getSource() == VAJAntToolGUI.this.getShowLogMenuItem())
  +                }
  +                if (e.getSource() == VAJAntToolGUI.this.getShowLogMenuItem()) {
                       getMessageFrame().show();
  +                }
                   /* #### About dialog #### */
  -                if (e.getSource() == VAJAntToolGUI.this.getAboutOkButton())
  +                if (e.getSource() == VAJAntToolGUI.this.getAboutOkButton()) {
                       getAboutDialog().dispose();
  +                }
                   /* #### Log frame #### */
  -                if (e.getSource() == VAJAntToolGUI.this.getMessageOkButton())
  +                if (e.getSource() == VAJAntToolGUI.this.getMessageOkButton()) {
                       getMessageFrame().dispose();
  -                if (e.getSource() == VAJAntToolGUI.this.getMessageClearLogButton())
  +                }
  +                if (e.getSource() == VAJAntToolGUI.this.getMessageClearLogButton()) {
                       getMessageTextArea().setText("");
  -                if (e.getSource() == VAJAntToolGUI.this.getMessageOkButton())
  +                }
  +                if (e.getSource() == VAJAntToolGUI.this.getMessageOkButton()) {
                       getMessageFrame().dispose();
  +                }
               }
               catch (Throwable exc) {
                   handleException(exc);
  @@ -372,12 +380,15 @@
            */
           public void itemStateChanged(ItemEvent e) {
               try {
  -                if (e.getSource() == VAJAntToolGUI.this.getTargetList())
  +                if (e.getSource() == VAJAntToolGUI.this.getTargetList()) {
                       getBuildButton().setEnabled(true);
  -                if (e.getSource() == VAJAntToolGUI.this.getMessageOutputLevelChoice())
  +                }
  +                if (e.getSource() == VAJAntToolGUI.this.getMessageOutputLevelChoice())
{
                       getBuildInfo().setOutputMessageLevel(getMessageOutputLevelChoice().getSelectedIndex());
  -                if (e.getSource() == VAJAntToolGUI.this.getTargetList())
  +                }
  +                if (e.getSource() == VAJAntToolGUI.this.getTargetList()) {
                       getBuildInfo().setTarget(getTargetList().getSelectedItem());
  +                }
               }
               catch (Throwable exc) {
                   handleException(exc);
  @@ -388,18 +399,21 @@
            * PropertyChangeListener method
            */
           public void propertyChange(java.beans.PropertyChangeEvent evt) {
  -            if (evt.getSource() == VAJAntToolGUI.this.getBuildInfo() && (evt.getPropertyName().equals("projectName")))
  +            if (evt.getSource() == VAJAntToolGUI.this.getBuildInfo() && (evt.getPropertyName().equals("projectName")))
{
                   connectProjectNameToLabel();
  -            if (evt.getSource() == VAJAntToolGUI.this.getBuildInfo() && (evt.getPropertyName().equals("buildFileName")))
  +            }
  +            if (evt.getSource() == VAJAntToolGUI.this.getBuildInfo() && (evt.getPropertyName().equals("buildFileName")))
{
                   connectBuildFileNameToTextField();
  +            }
           }
   
           /**
            * TextListener method
            */
           public void textValueChanged(TextEvent e) {
  -            if (e.getSource() == VAJAntToolGUI.this.getBuildFileTextField())
  +            if (e.getSource() == VAJAntToolGUI.this.getBuildFileTextField()) {
                   connectTextFieldToBuildFileName();
  +            }
           }
   
           /**
  @@ -411,10 +425,12 @@
                       dispose();
                       System.exit(0);
                   }
  -                if (e.getSource() == VAJAntToolGUI.this.getAboutDialog())
  +                if (e.getSource() == VAJAntToolGUI.this.getAboutDialog()) {
                       getAboutDialog().dispose();
  -                if (e.getSource() == VAJAntToolGUI.this.getMessageFrame())
  +                }
  +                if (e.getSource() == VAJAntToolGUI.this.getMessageFrame()) {
                       getMessageFrame().dispose();
  +                }
               }
               catch (Throwable exc) {
                   handleException(exc);
  
  
  
  1.2       +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
  
  Index: WebsphereDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WebsphereDeploymentTool.java	11 Dec 2001 14:18:52 -0000	1.1
  +++ WebsphereDeploymentTool.java	8 Jan 2002 19:56:56 -0000	1.2
  @@ -517,8 +517,9 @@
   		    " " + destJar.getPath() +

   		    " " + getOptions();

   

  -		if (getCombinedClasspath() != null && getCombinedClasspath().toString().length()
> 0)

  -		    args += " -cp " + getCombinedClasspath();

  +		if (getCombinedClasspath() != null && getCombinedClasspath().toString().length()
> 0) {

  +		    args += " -cp " + getCombinedClasspath();
  +                }

   

   		// Why do my ""'s get stripped away???

   		log("EJB Deploy Options: " + args, Project.MSG_VERBOSE);

  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message