ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ide VAJAntTool.java VAJAntToolGUI.java VAJBuildInfo.java VAJExportServlet.java VAJImportServlet.java VAJLoad.java VAJLoadProjects.java VAJLoadServlet.java VAJLocalUtil.java VAJProjectDescription.java VAJRemoteUtil.java VAJUtil.java
Date Mon, 14 Jul 2003 15:29:42 GMT
conor       2003/07/14 08:29:42

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/ide
                        VAJAntTool.java VAJAntToolGUI.java
                        VAJBuildInfo.java VAJExportServlet.java
                        VAJImportServlet.java VAJLoad.java
                        VAJLoadProjects.java VAJLoadServlet.java
                        VAJLocalUtil.java VAJProjectDescription.java
                        VAJRemoteUtil.java VAJUtil.java
  Log:
  a bit o' checkstyling
  
  Revision  Changes    Path
  1.13      +1 -2      ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java
  
  Index: VAJAntTool.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -w -u -r1.12 -r1.13
  --- VAJAntTool.java	10 Feb 2003 14:14:05 -0000	1.12
  +++ VAJAntTool.java	14 Jul 2003 15:29:41 -0000	1.13
  @@ -139,8 +139,7 @@
           String data = info.asDataString();
           try {
               ToolData td = new ToolData(TOOL_DATA_KEY, data);
  -            VAJLocalUtil.getWorkspace().loadedProjectNamed(
  -                                                           info.getVAJProjectName()).setToolRepositoryData(td);
  +            VAJLocalUtil.getWorkspace().loadedProjectNamed(info.getVAJProjectName()).setToolRepositoryData(td);
           } catch (Throwable t) {
               throw new BuildException("BuildInfo for Project "
                                        + info.getVAJProjectName() + " could not be saved",
t);
  
  
  
  1.20      +16 -8     ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
  
  Index: VAJAntToolGUI.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -w -u -r1.19 -r1.20
  --- VAJAntToolGUI.java	10 Feb 2003 14:14:06 -0000	1.19
  +++ VAJAntToolGUI.java	14 Jul 2003 15:29:41 -0000	1.20
  @@ -302,7 +302,9 @@
       /**
        * Eventhandler to handle all AWT-events
        */
  -    private class PrivateEventHandler implements ActionListener, ItemListener, TextListener,
WindowListener, PropertyChangeListener {
  +    private class PrivateEventHandler
  +        implements ActionListener, ItemListener, TextListener,
  +                   WindowListener, PropertyChangeListener {
           /**
            * ActionListener method
            */
  @@ -428,12 +430,18 @@
                   handleException(exc);
               }
           }
  -        public void windowActivated(WindowEvent e) {}
  -        public void windowClosed(WindowEvent e) {}
  -        public void windowDeactivated(WindowEvent e) {}
  -        public void windowDeiconified(WindowEvent e) {}
  -        public void windowIconified(WindowEvent e) {}
  -        public void windowOpened(WindowEvent e) {}
  +        public void windowActivated(WindowEvent e) {
  +        }
  +        public void windowClosed(WindowEvent e) {
  +        }
  +        public void windowDeactivated(WindowEvent e) {
  +        }
  +        public void windowDeiconified(WindowEvent e) {
  +        }
  +        public void windowIconified(WindowEvent e) {
  +        }
  +        public void windowOpened(WindowEvent e) {
  +        }
       }
   
       /**
  @@ -850,7 +858,7 @@
               iCommandButtonPanelFlowLayout.setAlignment(FlowLayout.RIGHT);
           } catch (Throwable iExc) {
               handleException(iExc);
  -        };
  +        }
           return iCommandButtonPanelFlowLayout;
       }
       /**
  
  
  
  1.11      +5 -5      ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java
  
  Index: VAJBuildInfo.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -w -u -r1.10 -r1.11
  --- VAJBuildInfo.java	10 Feb 2003 14:14:06 -0000	1.10
  +++ VAJBuildInfo.java	14 Jul 2003 15:29:41 -0000	1.11
  @@ -192,7 +192,7 @@
       private Vector projectTargets = new Vector();
   
       // target selected for execution
  -    private java.lang.String target = "";
  +    private String target = "";
   
       // log level
       private int outputMessageLevel = Project.MSG_INFO;
  @@ -224,7 +224,7 @@
       /**
        * Returns the BuildInfo information as String. The BuildInfo can
        * be rebuilt from that String by calling parse().
  -     * @return java.lang.String
  +     * @return String
        */
       public String asDataString() {
           String result = getOutputMessageLevel() + "|" + getBuildFileName()
  @@ -254,7 +254,7 @@
       /**
        * The firePropertyChange method was generated to support the propertyChange field.
        */
  -    public void firePropertyChange(java.lang.String propertyName, java.lang.Object oldValue,
java.lang.Object newValue) {
  +    public void firePropertyChange(String propertyName, Object oldValue, Object newValue)
{
           getPropertyChange().firePropertyChange(propertyName, oldValue, newValue);
       }
   
  @@ -305,7 +305,7 @@
       /**
        * returns the selected target.
        */
  -    public java.lang.String getTarget() {
  +    public String getTarget() {
           return target;
       }
   
  @@ -350,7 +350,7 @@
        * outputMessageLevel'|'buildFileName'|'defaultTarget'|'(project target'|')*
        *
        * @return org.apache.tools.ant.taskdefs.optional.vaj.BuildInfo
  -     * @param data java.lang.String
  +     * @param data String
        */
       public static VAJBuildInfo parse(String data) {
           VAJBuildInfo result = new VAJBuildInfo();
  
  
  
  1.8       +13 -13    ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java
  
  Index: VAJExportServlet.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -w -u -r1.7 -r1.8
  
  
  
  1.7       +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java
  
  Index: VAJImportServlet.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -u -r1.6 -r1.7
  
  
  
  1.7       +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoad.java
  
  Index: VAJLoad.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoad.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -u -r1.6 -r1.7
  
  
  
  1.13      +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java
  
  Index: VAJLoadProjects.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -w -u -r1.12 -r1.13
  
  
  
  1.7       +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java
  
  Index: VAJLoadServlet.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -u -r1.6 -r1.7
  
  
  
  1.13      +20 -16    ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java
  
  Index: VAJLocalUtil.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -w -u -r1.12 -r1.13
  --- VAJLocalUtil.java	6 May 2003 15:19:17 -0000	1.12
  +++ VAJLocalUtil.java	14 Jul 2003 15:29:41 -0000	1.13
  @@ -126,8 +126,7 @@
       /**
        * export packages
        */
  -    public void exportPackages(
  -                               File dest,
  +    public void exportPackages(File dest,
                                  String[] includePatterns, String[] excludePatterns,
                                  boolean exportClasses, boolean exportDebugInfo,
                                  boolean exportResources, boolean exportSources,
  @@ -197,16 +196,18 @@
               VAJProjectDescription d = (VAJProjectDescription) e.nextElement();
   
               ProjectEdition pe;
  -            if (d.getVersion().equals("*"))
  +            if (d.getVersion().equals("*")) {
                   pe = findLatestProjectEdition(d.getName(), false);
  -            else if (d.getVersion().equals("**"))
  +            } else if (d.getVersion().equals("**")) {
                   pe = findLatestProjectEdition(d.getName(), true);
  -            else
  +            } else {
                   pe = findProjectEdition(d.getName(), d.getVersion());
  +            }
               try {
  -                log("Loading '" + pe.getName() + "', Version '" +
  -                    ((pe.getVersionName() != null)?pe.getVersionName():"("+pe.getVersionStamp()+
")")+
  -                    "' into Workspace", MSG_VERBOSE);
  +                log("Loading '" + pe.getName() + "', Version '"
  +                    + ((pe.getVersionName() != null) ? pe.getVersionName()
  +                        : "("+pe.getVersionStamp()+ ")")
  +                    + "' into Workspace", MSG_VERBOSE);
                   pe.loadIntoWorkspace();
               } catch (IvjException ex) {
                   throw createBuildException("Project '" + d.getName()
  @@ -231,8 +232,8 @@
                       String pattern = d.getName();
                       if (VAJWorkspaceScanner.match(pattern, projectNames[i])) {
                           d.setProjectFound();
  -                        expandedDescs.addElement(new VAJProjectDescription(
  -                                                                           projectNames[i],
d.getVersion()));
  +                        expandedDescs.addElement(new VAJProjectDescription(projectNames[i],
  +                            d.getVersion()));
                           break;
                       }
                   }
  @@ -298,10 +299,12 @@
   
               // find latest (versioned) project edition by date
               ProjectEdition pe = null;
  -            Date latestStamp = new Date(0); // Let's hope there are no projects older than
the epoch ;-)
  +            // Let's hope there are no projects older than the epoch ;-)
  +            Date latestStamp = new Date(0);
               for (int i = 0; i < editions.length; i++) {
  -                if (!includeOpenEditions && !editions[i].isVersion())
  +                if (!includeOpenEditions && !editions[i].isVersion()) {
                       continue;
  +                }
                   if (latestStamp.before(editions[i].getVersionStamp())) {
                       latestStamp = editions[i].getVersionStamp();
                       pe = editions[i];
  @@ -311,8 +314,9 @@
               if (pe == null) {
                   throw new BuildException("Can't determine latest edition for project "
+ name);
               }
  -            log("Using version " + ((pe.getVersionName() != null)?pe.getVersionName():"("+pe.getVersionStamp()+
")") +
  -                " of " + pe.getName(), MSG_INFO);
  +            log("Using version " + ((pe.getVersionName() != null) ? pe.getVersionName()
  +                    : "("+pe.getVersionStamp()+ ")")
  +                + " of " + pe.getName(), MSG_INFO);
               return pe;
           } catch (IvjException e) {
               throw createBuildException("VA Exception occured: ", e);
  
  
  
  1.7       +1 -1      ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJProjectDescription.java
  
  Index: VAJProjectDescription.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJProjectDescription.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -u -r1.6 -r1.7
  
  
  
  1.10      +7 -5      ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java
  
  Index: VAJRemoteUtil.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -w -u -r1.9 -r1.10
  --- VAJRemoteUtil.java	19 Jun 2003 21:25:18 -0000	1.9
  +++ VAJRemoteUtil.java	14 Jul 2003 15:29:41 -0000	1.10
  @@ -91,8 +91,9 @@
        */
       public void exportPackages(File destDir,
                                  String[] includePatterns, String[] excludePatterns,
  -                               boolean exportClasses, boolean exportDebugInfo, boolean
exportResources,
  -                               boolean exportSources, boolean useDefaultExcludes, boolean
overwrite) {
  +                               boolean exportClasses, boolean exportDebugInfo,
  +                               boolean exportResources, boolean exportSources,
  +                               boolean useDefaultExcludes, boolean overwrite) {
           try {
               String request = "http://" + remoteServer + "/servlet/vajexport?"
                   + VAJExportServlet.WITH_DEBUG_INFO + "=" + exportDebugInfo + "&"
  @@ -213,6 +214,7 @@
                       is = connection.getInputStream();
                       break;
                   } catch (IOException ex) {
  +                    // ignore
                   }
               }
               if (is == null) {
  
  
  
  1.11      +5 -5      ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java
  
  Index: VAJUtil.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -w -u -r1.10 -r1.11
  --- VAJUtil.java	10 Feb 2003 14:14:07 -0000	1.10
  +++ VAJUtil.java	14 Jul 2003 15:29:41 -0000	1.11
  @@ -65,11 +65,11 @@
    */
   interface VAJUtil {
       // log levels
  -    public static final int MSG_DEBUG = 4;
  -    public static final int MSG_ERR = 0;
  -    public static final int MSG_INFO = 2;
  -    public static final int MSG_VERBOSE = 3;
  -    public static final int MSG_WARN = 1;
  +    static final int MSG_DEBUG = 4;
  +    static final int MSG_ERR = 0;
  +    static final int MSG_INFO = 2;
  +    static final int MSG_VERBOSE = 3;
  +    static final int MSG_WARN = 1;
   
       /**
        * export the array of Packages
  
  
  

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


Mime
View raw message