ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r895195 - in /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde: common/ivyfile/ common/model/ eclipse/ eclipse/cpcontainer/ eclipse/cpcontainer/fragmentinfo/ eclipse/revdepexplorer/ eclipse/ui/ eclipse/ui/actions/ ecli...
Date Sat, 02 Jan 2010 14:00:56 GMT
Author: hibou
Date: Sat Jan  2 14:00:47 2010
New Revision: 895195

URL: http://svn.apache.org/viewvc?rev=895195&view=rev
Log:
cleanup of most checkstyle errors

Modified:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileResourceListener.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileUpdater.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorFile.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyFile.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/FakeProjectManager.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDERuntimeClasspathEntryResolver.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyMultiResolveJob.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobThread.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/fragmentinfo/PreferenceStoreInfo.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/IvyUtil.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/MultiRevisionDependencyDescriptor.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/SyncIvyFilesJob.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/PathEditor.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsEditor.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/CleanCacheAction.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/IvyDEProjectAction.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/IvyDEProjectMenuAction.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsoleFilterAction.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/IvyContentAssistProcessor.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/NonRuleBasedDamagerRepairer.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLDoubleClickStrategy.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLEditor.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyPreferencePage.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceConstants.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceInitializer.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/WorkspaceResolverPreferencePage.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/views/ReverseDependencyExplorerView.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileResourceListener.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileResourceListener.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileResourceListener.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileResourceListener.java Sat Jan  2 14:00:47 2010
@@ -80,17 +80,15 @@
         }
     }
 
-    private static final IResourceDeltaVisitor visitor = new IvyVisitor();
+    private static final IResourceDeltaVisitor VISITOR = new IvyVisitor();
 
     public void resourceChanged(IResourceChangeEvent event) {
-        switch (event.getType()) {
-            case IResourceChangeEvent.PRE_BUILD:
-                try {
-                    event.getDelta().accept(visitor);
-                } catch (CoreException e) {
-                    IvyPlugin.log(e);
-                }
-                break;
+        if (event.getType() == IResourceChangeEvent.PRE_BUILD) {
+            try {
+                event.getDelta().accept(VISITOR);
+            } catch (CoreException e) {
+                IvyPlugin.log(e);
+            }
         }
     }
 }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileUpdater.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileUpdater.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileUpdater.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileUpdater.java Sat Jan  2 14:00:47 2010
@@ -32,16 +32,21 @@
 public class IvyFileUpdater {
     private static final String NL = System.getProperty("line.separator");
 
-    private static class UpdateInfo {
-        int insertFromIndex = 0;
+    private static final class UpdateInfo {
 
-        int insertToIndex = 0;
+        private int insertFromIndex = 0;
 
-        String prefix = "";
+        private int insertToIndex = 0;
 
-        String suffix = "";
+        private String prefix = "";
 
-        String insert = "";
+        private String suffix = "";
+
+        private String insert = "";
+
+        private UpdateInfo() {
+            // nothing to do
+        }
     }
 
     public void addDependency(File ivyFile, String org, String name, String revision,
@@ -78,7 +83,8 @@
         }
     }
 
-    private void update(File ivyFile, String content, UpdateInfo info) throws FileNotFoundException {
+    private void update(File ivyFile, String content, UpdateInfo info)
+            throws FileNotFoundException {
         PrintWriter w = new PrintWriter(new FileOutputStream(ivyFile));
         try {
             w.print(content.substring(0, info.insertFromIndex));

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorFile.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorFile.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorFile.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorFile.java Sat Jan  2 14:00:47 2010
@@ -39,7 +39,8 @@
         this(settings, projectName, doc, 0);
     }
 
-    public IvyModuleDescriptorFile(IvyModelSettings settings, String projectName, String doc, int currentOffset) {
+    public IvyModuleDescriptorFile(IvyModelSettings settings, String projectName, String doc,
+            int currentOffset) {
         super(settings, projectName, doc, currentOffset);
     }
 

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java Sat Jan  2 14:00:47 2010
@@ -168,7 +168,8 @@
         ivyTag.addChildIvyTag(info);
 
         // configurations
-        IvyTag configurations = new IvyTag("configurations", "container for configuration elements");
+        IvyTag configurations = new IvyTag("configurations",
+            "container for configuration elements");
         IvyTag conf = new IvyTag("conf", "declares a configuration of this module");
         conf.addAttribute(new IvyTagAttribute("name", "the name of the declared configuration",
                 true));
@@ -424,12 +425,11 @@
 
         });
         IvyTag conf3 = new IvyTag("conf", "defines configuration mapping has sub element");
-        conf3
-                .addAttribute(new IvyTagAttribute(
-                        "name",
-                        "the name of the master configuration to map. \n"
-                                + "'*' wildcard can be used to designate all configurations of this module",
-                        true, masterConfValueProvider));
+        conf3.addAttribute(new IvyTagAttribute(
+            "name",
+            "the name of the master configuration to map. \n"
+            + "'*' wildcard can be used to designate all configurations of this module",
+            true, masterConfValueProvider));
         conf3.addAttribute(new IvyTagAttribute("mapped",
                 "a comma separated list of dependency configurations \n"
                         + "to which this master configuration should be mapped", false,
@@ -485,53 +485,45 @@
         allConf.add(conf3);
         IvyTag mapped = new IvyTag("mapped",
                 "map dependency configurations for this master configuration");
-        mapped
-                .addAttribute(new IvyTagAttribute(
-                        "name",
-                        "the name of the dependency configuration mapped. \n"
-                                + "'*' wildcard can be used to designate all configurations of this module",
-                        true, new IValueProvider() {
-                            public String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
-                                Ivy ivy = getIvy();
-                                int[] indexes = ivyFile.getParentTagIndex();
-                                if (indexes != null && ivy != null) {
-                                    indexes = ivyFile.getParentTagIndex(indexes[0]);
-                                    if (indexes != null) {
-                                        Map otherAttValues = ivyFile
-                                                .getAllAttsValues(indexes[0] + 1);
-                                        String org = ((IvyModuleDescriptorFile) ivyFile)
-                                                .getDependencyOrganisation(otherAttValues);
-                                        if (org != null && otherAttValues != null
-                                                && otherAttValues.get("name") != null
-                                                && otherAttValues.get("rev") != null) {
-                                            ResolveData data = new ResolveData(ivy
-                                                    .getResolveEngine(), new ResolveOptions());
-                                            ModuleRevisionId mrid = ModuleRevisionId.newInstance(
-                                                org, (String) otherAttValues.get("name"),
-                                                (String) otherAttValues.get("rev"));
-                                            DefaultDependencyDescriptor ddd = new DefaultDependencyDescriptor(
-                                                    mrid, false);
-                                            try {
-                                                String[] confs = ivy.getSettings()
-                                                        .getResolver(mrid).getDependency(ddd, data)
-                                                        .getDescriptor().getConfigurationsNames();
-                                                List ret = new ArrayList(Arrays.asList(confs));
-                                                ret.add("*");
-                                                return (String[]) ret
-                                                        .toArray(new String[ret.size()]);
-                                            } catch (ParseException e) {
-                                                getSettings().logError(
-                                                    "The dependencies of " + mrid
-                                                            + " could not be parsed", e);
-                                                return new String[] {"*"};
-                                            }
-                                        }
-                                    }
-                                }
-                                return new String[] {"*"};
-                            }
-
-                        }));
+        mapped.addAttribute(new IvyTagAttribute("name",
+            "the name of the dependency configuration mapped. \n"
+                + "'*' wildcard can be used to designate all configurations of this module",
+            true, new IValueProvider() {
+                public String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
+                    Ivy ivy = getIvy();
+                    int[] indexes = ivyFile.getParentTagIndex();
+                    if (indexes == null || ivy == null) {
+                        return new String[] {"*"};
+                    }
+                    indexes = ivyFile.getParentTagIndex(indexes[0]);
+                    if (indexes == null) {
+                        return new String[] {"*"};
+                    }
+                    Map otherAttValues = ivyFile.getAllAttsValues(indexes[0] + 1);
+                    String org = ((IvyModuleDescriptorFile) ivyFile)
+                        .getDependencyOrganisation(otherAttValues);
+                    if (org == null || otherAttValues == null || otherAttValues.get("name") == null
+                            || otherAttValues.get("rev") == null) {
+                        return new String[] {"*"};
+                    }
+                    ResolveData data = new ResolveData(ivy.getResolveEngine(),
+                        new ResolveOptions());
+                    ModuleRevisionId mrid = ModuleRevisionId.newInstance(org,
+                        (String) otherAttValues.get("name"), (String) otherAttValues.get("rev"));
+                    DefaultDependencyDescriptor ddd = new DefaultDependencyDescriptor(mrid, false);
+                    try {
+                        String[] confs = ivy.getSettings().getResolver(mrid)
+                            .getDependency(ddd, data).getDescriptor().getConfigurationsNames();
+                        List ret = new ArrayList(Arrays.asList(confs));
+                        ret.add("*");
+                        return (String[]) ret.toArray(new String[ret.size()]);
+                    } catch (ParseException e) {
+                        getSettings().logError("The dependencies of " + mrid
+                            + " could not be parsed", e);
+                    }
+                    return new String[] {"*"};
+                }
+            }));
         conf3.addChildIvyTag(mapped);
         addTag(mapped);
 
@@ -560,13 +552,11 @@
                 "an url where this artifact can be found \n"
                         + "if it isn't present at the standard \n" + "location in the repository",
                 false));
-        artifact2
-                .addAttribute(new IvyTagAttribute(
-                        "conf",
-                        "comma separated list of the master configurations \n"
-                                + "in which this artifact should be included. \n"
-                                + "'*' wildcard can be used to designate all configurations of this module",
-                        false, masterConfsValueProvider));
+        artifact2.addAttribute(new IvyTagAttribute("conf",
+            "comma separated list of the master configurations \n"
+                + "in which this artifact should be included. \n"
+                + "'*' wildcard can be used to designate all configurations of this module",
+            false, masterConfsValueProvider));
         IvyTag conf4 = new IvyTag("conf", "configuration in which the artifact should be included");
         conf4.addAttribute(new IvyTagAttribute("name",
                 "the name of the master configuration in which \n"
@@ -591,13 +581,11 @@
                         getDefault("ext"))));
         include.addAttribute(new IvyTagAttribute("matcher",
                 "the matcher to use to match the modules to include", false, matcherNamesProvider));
-        include
-                .addAttribute(new IvyTagAttribute(
-                        "conf",
-                        "comma separated list of the master configurations \n"
-                                + "in which this artifact should be included. \n"
-                                + "'*' wildcard can be used to designate all configurations of this module",
-                        false, masterConfsValueProvider));
+        include.addAttribute(new IvyTagAttribute("conf",
+            "comma separated list of the master configurations \n"
+                + "in which this artifact should be included. \n"
+                + "'*' wildcard can be used to designate all configurations of this module",
+            false, masterConfsValueProvider));
         IvyTag conf5 = new IvyTag("conf", "configuration in which the artifact should be included");
         conf5.addAttribute(new IvyTagAttribute("name",
                 "the name of the master configuration in which \n"

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyFile.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyFile.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyFile.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyFile.java Sat Jan  2 14:00:47 2010
@@ -86,8 +86,8 @@
                 return false;
             }
             if (c == '<'
-                    && (documentOffset + 1 >= doc.length() || (doc.charAt(documentOffset + 1) != '!' && doc
-                            .charAt(documentOffset + 1) != '?'))) {
+                    && (documentOffset + 1 >= doc.length() || (doc.charAt(documentOffset + 1) != '!'
+                    && doc.charAt(documentOffset + 1) != '?'))) {
                 return hasSpace;
             }
         }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/FakeProjectManager.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/FakeProjectManager.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/FakeProjectManager.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/FakeProjectManager.java Sat Jan  2 14:00:47 2010
@@ -31,7 +31,11 @@
  * see also:
  * org.eclipse.jdt.internal.ui.preferencesUserLibraryPreferencePage#createPlaceholderProject()
  */
-public class FakeProjectManager {
+public final class FakeProjectManager {
+
+    private FakeProjectManager() {
+        // utility class
+    }
 
     public static boolean isFake(IJavaProject project) {
         // a fake project doesn't have real path

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDERuntimeClasspathEntryResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDERuntimeClasspathEntryResolver.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDERuntimeClasspathEntryResolver.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDERuntimeClasspathEntryResolver.java Sat Jan  2 14:00:47 2010
@@ -129,8 +129,9 @@
 
     public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry,
             IJavaProject project) throws CoreException {
-        if(!(entry instanceof IRuntimeClasspathEntry2))
-            return new IRuntimeClasspathEntry[] { entry };
+        if (!(entry instanceof IRuntimeClasspathEntry2)) {
+            return new IRuntimeClasspathEntry[] {entry};
+        }
         
         IRuntimeClasspathEntry2 entry2 = (IRuntimeClasspathEntry2) entry;
         IRuntimeClasspathEntry[] entries = entry2.getRuntimeClasspathEntries(null);

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java Sat Jan  2 14:00:47 2010
@@ -108,7 +108,7 @@
                             || event.getProperty() == PreferenceConstants.SOURCES_SUFFIXES
                             || event.getProperty() == PreferenceConstants.JAVADOC_SUFFIXES
                             || event.getProperty() == PreferenceConstants.DO_RETRIEVE_DEPRECATED
-                            || event.getProperty() == PreferenceConstants.RETRIEVE_PATTERN_DEPRECATED
+                           || event.getProperty() == PreferenceConstants.RETRIEVE_PATTERN_DEPRECATED
                             || event.getProperty() == PreferenceConstants.DO_RETRIEVE
                             || event.getProperty() == PreferenceConstants.RETRIEVE_PATTERN
                             || event.getProperty() == PreferenceConstants.RETRIEVE_SYNC

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java Sat Jan  2 14:00:47 2010
@@ -54,7 +54,8 @@
  */
 public class IvyClasspathContainer implements IClasspathContainer {
 
-    public static final String CONTAINER_ID = "org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER";
+    public static final String CONTAINER_ID =
+        "org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER";
 
     private IClasspathEntry[] classpathEntries;
 
@@ -139,7 +140,8 @@
         }
     };
 
-    private IvyResolveJob createResolveJob(final boolean usePreviousResolveIfExist, boolean isUser) {
+    private IvyResolveJob createResolveJob(final boolean usePreviousResolveIfExist,
+            boolean isUser) {
         synchronized (this) {
             if (job != null) {
                 // resolve job already running
@@ -196,8 +198,8 @@
                 null);
 
             // the following code was imported from:
-            // http://svn.codehaus.org/m2eclipse/trunk/org.maven.ide.eclipse/src/org/maven/ide/eclipse
-            // /embedder/BuildPathManager.java
+            // http://svn.codehaus.org/m2eclipse/trunk/org.maven.ide.eclipse/src/org/maven/ide
+            // /eclipse/embedder/BuildPathManager.java
             // revision: 370; function setClasspathContainer; line 215
 
             // XXX In Eclipse 3.3, changes to resolved classpath are not announced by JDT Core

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java Sat Jan  2 14:00:47 2010
@@ -23,10 +23,7 @@
 
 import org.apache.ivyde.eclipse.IvyDEException;
 import org.apache.ivyde.eclipse.IvyPlugin;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.variables.IStringVariableManager;
-import org.eclipse.core.variables.VariablesPlugin;
 import org.eclipse.jdt.core.IClasspathAttribute;
 import org.eclipse.jdt.core.IJavaProject;
 
@@ -210,7 +207,8 @@
 
     public String getInheritedIvySettingsPath() throws IvyDEException {
         if (!isSettingsProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().getIvySettingsSetup().getResolvedIvySettingsPath();
+            return IvyPlugin.getPreferenceStoreHelper().getIvySettingsSetup()
+                    .getResolvedIvySettingsPath();
         }
         return ivySettingsSetup.getResolvedIvySettingsPath();
     }
@@ -225,7 +223,8 @@
 
     public Collection getInheritedPropertyFiles() throws IvyDEException {
         if (!isSettingsProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().getIvySettingsSetup().getResolvedPropertyFiles();
+            return IvyPlugin.getPreferenceStoreHelper().getIvySettingsSetup()
+                    .getResolvedPropertyFiles();
         } else {
             return ivySettingsSetup.getResolvedPropertyFiles();
         }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.java Sat Jan  2 14:00:47 2010
@@ -158,7 +158,8 @@
                 } catch (IOException e) {
                     IvyDEException ex = new IvyDEException(
                             "Read error of the default Ivy settings",
-                            "The default Ivy settings file could not be read: " + e.getMessage(), e);
+                            "The default Ivy settings file could not be read: "
+                            + e.getMessage(), e);
                     setConfStatus(ex);
                     throw ex;
                 }
@@ -359,7 +360,8 @@
             return md;
         } catch (MalformedURLException e) {
             IvyDEException ex = new IvyDEException("Incorrect URL of the Ivy file",
-                    "The URL to the ivy.xml file is incorrect: '" + file.getAbsolutePath() + "'", e);
+                    "The URL to the ivy.xml file is incorrect: '" + file.getAbsolutePath()
+                    + "'", e);
             setConfStatus(ex);
             throw ex;
         } catch (ParseException e) {

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java Sat Jan  2 14:00:47 2010
@@ -272,7 +272,8 @@
      *            the project to search into
      * @return the Ivy classpath container if found, otherwise return <code>null</code>
      */
-    public static IClasspathEntry getIvyClasspathEntry(IPath containerPath, IJavaProject javaProject) {
+    public static IClasspathEntry getIvyClasspathEntry(IPath containerPath,
+            IJavaProject javaProject) {
         if (FakeProjectManager.isFake(javaProject)) {
             return null;
         }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyMultiResolveJob.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyMultiResolveJob.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyMultiResolveJob.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyMultiResolveJob.java Sat Jan  2 14:00:47 2010
@@ -65,6 +65,9 @@
                 case IStatus.ERROR:
                     errorsStatus.add(jobStatus);
                     break;
+                default:
+                    IvyPlugin.log(IStatus.WARNING, "Unknown IStatus: " + jobStatus.getCode(),
+                        null);
             }
         }
 

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobThread.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobThread.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobThread.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobThread.java Sat Jan  2 14:00:47 2010
@@ -47,7 +47,6 @@
 import org.apache.ivy.util.filter.ArtifactTypeFilter;
 import org.apache.ivyde.eclipse.FakeProjectManager;
 import org.apache.ivyde.eclipse.IvyPlugin;
-import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/fragmentinfo/PreferenceStoreInfo.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/fragmentinfo/PreferenceStoreInfo.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/fragmentinfo/PreferenceStoreInfo.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/fragmentinfo/PreferenceStoreInfo.java Sat Jan  2 14:00:47 2010
@@ -79,7 +79,8 @@
                 .toPortableString());
     }
 
-    public void setJavaDocLocation(IPath containerPath, String entryPath, URL libraryJavadocLocation) {
+    public void setJavaDocLocation(IPath containerPath, String entryPath,
+            URL libraryJavadocLocation) {
         preferenceStore.setValue(entryPath + DOC_SUFFIX, libraryJavadocLocation == null ? ""
                 : libraryJavadocLocation.toString());
     }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/IvyUtil.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/IvyUtil.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/IvyUtil.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/IvyUtil.java Sat Jan  2 14:00:47 2010
@@ -35,7 +35,11 @@
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IStatus;
 
-public class IvyUtil {
+public final class IvyUtil {
+
+    private IvyUtil() {
+        // utility class
+    }
 
     /**
      * This will return all ivy projects in the workspace <br>
@@ -73,8 +77,9 @@
                             .getDependencies();
                     for (int j = 0; j < descriptors.length; j++) {
                         DependencyDescriptor descriptor = descriptors[j];
-                        MultiRevisionDependencyDescriptor syncableDependencyDescriptor = (MultiRevisionDependencyDescriptor) moduleDescriptorMap
-                                .get(descriptor.getDependencyId());
+                        MultiRevisionDependencyDescriptor syncableDependencyDescriptor
+                                = (MultiRevisionDependencyDescriptor) moduleDescriptorMap
+                                        .get(descriptor.getDependencyId());
 
                         if (syncableDependencyDescriptor == null) {
                             syncableDependencyDescriptor = new MultiRevisionDependencyDescriptor(

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/MultiRevisionDependencyDescriptor.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/MultiRevisionDependencyDescriptor.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/MultiRevisionDependencyDescriptor.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/MultiRevisionDependencyDescriptor.java Sat Jan  2 14:00:47 2010
@@ -31,7 +31,10 @@
 public class MultiRevisionDependencyDescriptor {
     private final ModuleId moduleId;
 
-    private final Map/* <IvyClasspathContainer, Collection<DependencyDescriptor>> */dependenciesByContainer = new HashMap();
+    /**
+     * Map<IvyClasspathContainer, Collection<DependencyDescriptor>>
+     */
+    private final Map dependenciesByContainer = new HashMap();
 
     private String newRevision;
 
@@ -46,11 +49,11 @@
 
     public boolean equals(Object o) {
         if (o instanceof MultiRevisionDependencyDescriptor) {
-            MultiRevisionDependencyDescriptor dependencyDescriptor = (MultiRevisionDependencyDescriptor) o;
+            MultiRevisionDependencyDescriptor mrdd = (MultiRevisionDependencyDescriptor) o;
 
-            if (getOrganization().equals(dependencyDescriptor.getOrganization())
-                    && getModule().equals(dependencyDescriptor.getModule())
-                    && dependenciesByContainer.equals(dependencyDescriptor.dependenciesByContainer)) {
+            if (getOrganization().equals(mrdd.getOrganization())
+                    && getModule().equals(mrdd.getModule())
+                    && dependenciesByContainer.equals(mrdd.dependenciesByContainer)) {
                 return true;
             }
         }
@@ -101,13 +104,12 @@
     public String[] getRevisions() {
         Set/* <String> */revisions = new HashSet/* <String> */();
 
-        Collection/* <Collection<DependencyDescriptor>> */projectDependencyDescriptors = dependenciesByContainer
-                .values();
+        /* Collection<Collection<DependencyDescriptor>> */
+        Collection projectDependencyDescriptors = dependenciesByContainer.values();
 
-        Iterator projectCollectionIter = projectDependencyDescriptors.iterator();
-        while (projectCollectionIter.hasNext()) {
-            Collection/* <DependencyDescriptor> */projectCollection = (Collection) projectCollectionIter
-                    .next();
+        Iterator it = projectDependencyDescriptors.iterator();
+        while (it.hasNext()) {
+            Collection/* <DependencyDescriptor> */projectCollection = (Collection) it.next();
             Iterator descriptorIter = projectCollection.iterator();
             while (descriptorIter.hasNext()) {
                 DependencyDescriptor descriptor = (DependencyDescriptor) descriptorIter.next();
@@ -185,7 +187,8 @@
      * @return revision
      */
     public String[] getRevisions(IvyClasspathContainer container) {
-        Collection/* <DependencyDescriptor> */containerDependencyDescriptors = (Collection) dependenciesByContainer
+        /* Collection<DependencyDescriptor> */
+        Collection containerDependencyDescriptors = (Collection) dependenciesByContainer
                 .get(container);
 
         if (containerDependencyDescriptors == null) {

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/SyncIvyFilesJob.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/SyncIvyFilesJob.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/SyncIvyFilesJob.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/SyncIvyFilesJob.java Sat Jan  2 14:00:47 2010
@@ -85,7 +85,7 @@
             }
     
             public ModuleRevisionId transform(ModuleRevisionId mrid) {
-                if(mrid.getRevision().indexOf("working@") > -1) {
+                if (mrid.getRevision().indexOf("working@") > -1) {
                     return new NullableRevisionModuleRevisionId(mrid.getModuleId(), null);
                 }
                 return new ModuleRevisionId(mrid.getModuleId(), mrid.getRevision());
@@ -120,17 +120,20 @@
                                         + container.getConf().getIvyXmlPath(), e));
                 continue;
             }
-            
-            Map/*<ModuleRevisionId, String> */ newRevisions = new HashMap/*<ModuleRevisionId, String>*/();
-            
-            DependencyDescriptor[] dependencies = moduleDescriptor.getDependencies();            
-            for(int j = 0; j < dependencies.length; j++) {
+
+            Map/* <ModuleRevisionId, String> */newRevisions = new HashMap();
+
+            DependencyDescriptor[] dependencies = moduleDescriptor.getDependencies();
+            for (int j = 0; j < dependencies.length; j++) {
                 for (int k = 0; k < multiRevisionDependencies.length; k++) {
                     MultiRevisionDependencyDescriptor multiRevision = multiRevisionDependencies[k];
-                    ModuleRevisionId dependencyRevisionId = dependencies[j].getDependencyRevisionId(); 
-                    if (dependencies[j].getDependencyId().equals(multiRevision.getModuleId()) &&
-                            multiRevision.hasNewRevision() && multiRevision.isForContainer(container)) {
-                        newRevisions.put(dependencyRevisionId, multiRevisionDependencies[k].getNewRevision());
+                    ModuleRevisionId dependencyRevisionId = dependencies[j]
+                            .getDependencyRevisionId();
+                    if (dependencies[j].getDependencyId().equals(multiRevision.getModuleId())
+                            && multiRevision.hasNewRevision()
+                            && multiRevision.isForContainer(container)) {
+                        newRevisions.put(dependencyRevisionId, multiRevisionDependencies[k]
+                                .getNewRevision());
                         break; // move on to the next dependency
                     }
                 }
@@ -144,8 +147,9 @@
             File ivyFile = container.getState().getIvyFile();
             
             File ivyTempFile = new File(ivyFile.toString() + ".temp");
-            try {                
-                XmlModuleDescriptorUpdater.update(ivyFile.toURI().toURL(), ivyTempFile, updateOptions);
+            try {
+                XmlModuleDescriptorUpdater.update(ivyFile.toURI().toURL(), ivyTempFile,
+                    updateOptions);
                 saveChanges(container, ivyFile, ivyTempFile);
             } catch (MalformedURLException e) {
                 errorStatuses.add(new Status(IStatus.ERROR, IvyPlugin.ID, IStatus.ERROR,
@@ -196,7 +200,8 @@
                 .size()]);
     }
 
-    private void saveChanges(IvyClasspathContainer container, File permanentSaveTarget, File temporaryChanges) throws IOException {
+    private void saveChanges(IvyClasspathContainer container, File permanentSaveTarget,
+            File temporaryChanges) throws IOException {
         IvyClasspathContainerConfiguration conf = container.getConf();
         IFile virtualIvyFile = conf.getJavaProject().getProject().getFile(conf.getIvyXmlPath());
         IStatus writable = virtualIvyFile.getWorkspace().validateEdit(new IFile[] {virtualIvyFile},
@@ -204,7 +209,7 @@
         if (writable.isOK()) {            
             FileWriter writer = new FileWriter(permanentSaveTarget, false);            
             BufferedReader reader = new BufferedReader(new FileReader(temporaryChanges));
-            while(reader.ready()) {
+            while (reader.ready()) {
                 writer.write(reader.readLine() + "\n");
             }
             writer.flush();

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/PathEditor.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/PathEditor.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/PathEditor.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/PathEditor.java Sat Jan  2 14:00:47 2010
@@ -38,7 +38,7 @@
 
 public abstract class PathEditor extends Composite {
 
-    protected Text text;
+    private Text text;
 
     private Button variableButton;
 
@@ -62,7 +62,9 @@
 
         Composite buttons = new Composite(this, SWT.NONE);
         buttons.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, true, 2, 1));
+        // CheckStyle:MagicNumber| OFF
         layout = new GridLayout(4, false);
+        // CheckStyle:MagicNumber| ON
         layout.marginHeight = 0;
         layout.marginWidth = 0;
         buttons.setLayout(layout);

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsEditor.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsEditor.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsEditor.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsEditor.java Sat Jan  2 14:00:47 2010
@@ -157,12 +157,12 @@
             }
 
             protected void setFile(String file) {
-                text.insert(file);
+                getText().insert(file);
                 textUpdated();
             }
 
             protected void setWorkspaceLoc(String workspaceLoc) {
-                text.insert(workspaceLoc);
+                getText().insert(workspaceLoc);
                 textUpdated();
             }
         };

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/CleanCacheAction.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/CleanCacheAction.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/CleanCacheAction.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/CleanCacheAction.java Sat Jan  2 14:00:47 2010
@@ -30,7 +30,7 @@
 
     private final Cleanable[] cleanables;
 
-    public static abstract class Cleanable {
+    public abstract static class Cleanable {
         public void launchClean() {
             Job cleanJob = new Job("Cleaning cache " + getName()) {
                 protected IStatus run(IProgressMonitor monitor) {

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/IvyDEProjectAction.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/IvyDEProjectAction.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/IvyDEProjectAction.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/IvyDEProjectAction.java Sat Jan  2 14:00:47 2010
@@ -36,7 +36,7 @@
 public abstract class IvyDEProjectAction implements IObjectActionDelegate {
     protected abstract void selectionChanged(IAction action, IProject[] projects);
 
-    protected IWorkbenchPage page;
+    private IWorkbenchPage page;
 
     public void setActivePart(IAction action, IWorkbenchPart targetPart) {
         this.page = targetPart.getSite().getPage();

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/IvyDEProjectMenuAction.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/IvyDEProjectMenuAction.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/IvyDEProjectMenuAction.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/IvyDEProjectMenuAction.java Sat Jan  2 14:00:47 2010
@@ -52,8 +52,8 @@
 
     protected void fill(Menu menu, IProject[] projects) {
         ProjectResolveAction resolveAction = new ProjectResolveAction(projects);
-        ProjectViewReverseDependenciesAction viewReverseAction = new ProjectViewReverseDependenciesAction(
-                projects, getPage());
+        ProjectViewReverseDependenciesAction viewReverseAction =
+            new ProjectViewReverseDependenciesAction(projects, getPage());
 
         new ActionContributionItem(resolveAction).fill(menu, -1);
         new Separator().fill(menu, -1);

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsoleFilterAction.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsoleFilterAction.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsoleFilterAction.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsoleFilterAction.java Sat Jan  2 14:00:47 2010
@@ -58,7 +58,7 @@
         }
 
         fMenu = new Menu(parent);
-        for (int i = 0; i < 5; i++) {
+        for (int i = 0; i < LOG_LEVEL_MESSAGES.length; i++) {
             final int logLevel = i;
             Action action = new Action(LOG_LEVEL_MESSAGES[i]) {
                 public void run() {

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/IvyContentAssistProcessor.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/IvyContentAssistProcessor.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/IvyContentAssistProcessor.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/IvyContentAssistProcessor.java Sat Jan  2 14:00:47 2010
@@ -50,7 +50,8 @@
     /**
      * Call by viewer to retrieve a list of ICompletionProposal
      */
-    public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentOffset) {
+    public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer,
+            int documentOffset) {
         // Retrieve current document
         IDocument doc = viewer.getDocument();
         // Retrieve current selection range

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/NonRuleBasedDamagerRepairer.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/NonRuleBasedDamagerRepairer.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/NonRuleBasedDamagerRepairer.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/NonRuleBasedDamagerRepairer.java Sat Jan  2 14:00:47 2010
@@ -35,10 +35,10 @@
 public class NonRuleBasedDamagerRepairer implements IPresentationDamager, IPresentationRepairer {
 
     /** The document this object works on */
-    protected IDocument fDocument;
+    private IDocument fDocument;
 
     /** The default text attribute if non is returned as data by the current token */
-    protected TextAttribute fDefaultTextAttribute;
+    private TextAttribute fDefaultTextAttribute;
 
     /**
      * Constructor for NonRuleBasedDamagerRepairer.

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLDoubleClickStrategy.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLDoubleClickStrategy.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLDoubleClickStrategy.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLDoubleClickStrategy.java Sat Jan  2 14:00:47 2010
@@ -25,7 +25,7 @@
 import org.eclipse.jface.text.ITextViewer;
 
 public class XMLDoubleClickStrategy implements ITextDoubleClickStrategy {
-    protected ITextViewer fText;
+    private ITextViewer fText;
 
     public void doubleClicked(ITextViewer part) {
         int pos = part.getSelectedRange().x;

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLEditor.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLEditor.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLEditor.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLEditor.java Sat Jan  2 14:00:47 2010
@@ -43,7 +43,8 @@
         super.dispose();
     }
 
-    private static final String CONTENTASSIST_PROPOSAL_ID = "org.apache.ivyde.ContentAssistProposal";
+    private static final String CONTENTASSIST_PROPOSAL_ID
+            = "org.apache.ivyde.ContentAssistProposal";
 
     private XMLConfiguration configuration;
 

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyPreferencePage.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyPreferencePage.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyPreferencePage.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyPreferencePage.java Sat Jan  2 14:00:47 2010
@@ -20,6 +20,7 @@
 import org.apache.ivy.Ivy;
 import org.apache.ivyde.eclipse.IvyPlugin;
 import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathInitializer;
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -47,7 +48,8 @@
 public class IvyPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
 
     /** the ID of the preference page */
-    public static final String PEREFERENCE_PAGE_ID = "org.apache.ivyde.eclipse.ui.preferences.IvyPreferencePage";
+    public static final String PEREFERENCE_PAGE_ID
+            = "org.apache.ivyde.eclipse.ui.preferences.IvyPreferencePage";
 
     private Text organizationText;
 
@@ -155,6 +157,9 @@
             case IvyClasspathInitializer.ON_STARTUP_RESOLVE:
                 resolveOnStartupButton.setSelection(true);
                 break;
+            default:
+                IvyPlugin.log(IStatus.WARNING, "Unkwnon resolve-on-startup mode: "
+                        + helper.getResolveOnStartup(), null);
         }
 
         if (helper.getAutoResolveOnChange()) {
@@ -200,6 +205,9 @@
             case IvyClasspathInitializer.ON_STARTUP_RESOLVE:
                 resolveOnStartupButton.setSelection(true);
                 break;
+            default:
+                IvyPlugin.log(IStatus.WARNING, "Unkwnon resolve-on-startup mode: "
+                        + PreferenceInitializer.DEFAULT_RESOLVE_ON_STARTUP, null);
         }
 
         if (PreferenceInitializer.DEFAULT_AUTO_RESOLVE_ON_CHANGE) {

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceConstants.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceConstants.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceConstants.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceConstants.java Sat Jan  2 14:00:47 2010
@@ -82,5 +82,6 @@
 
     public static final String IVY_CONSOLE_LOG_LEVEL = "ivyConsole.logLevel";
 
-    public static final String IGNORE_VERSION_ON_WORKSPACE_PROJECTS = "workspaceResolver.ignoreVersion";
+    public static final String IGNORE_VERSION_ON_WORKSPACE_PROJECTS
+        = "workspaceResolver.ignoreVersion";
 }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceInitializer.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceInitializer.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceInitializer.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceInitializer.java Sat Jan  2 14:00:47 2010
@@ -159,11 +159,14 @@
 
         store.setDefault(PreferenceConstants.AUTO_RESOLVE_ON_CLOSE, DEFAULT_AUTO_RESOLVE_ON_CLOSE);
         store.setDefault(PreferenceConstants.AUTO_RESOLVE_ON_OPEN, DEFAULT_AUTO_RESOLVE_ON_OPEN);
-        store.setDefault(PreferenceConstants.AUTO_RESOLVE_ON_CHANGE, DEFAULT_AUTO_RESOLVE_ON_CHANGE);
+        store.setDefault(PreferenceConstants.AUTO_RESOLVE_ON_CHANGE,
+            DEFAULT_AUTO_RESOLVE_ON_CHANGE);
 
-        store.setDefault(PreferenceConstants.IVY_CONSOLE_LOG_LEVEL, DEFAULT_IVY_CONSOLE_LOG_MESSAGE);
+        store.setDefault(PreferenceConstants.IVY_CONSOLE_LOG_LEVEL,
+            DEFAULT_IVY_CONSOLE_LOG_MESSAGE);
 
-        store.setDefault(PreferenceConstants.IGNORE_VERSION_ON_WORKSPACE_PROJECTS, DEFAULT_IGNORE_VERSION_ON_WORKSPACE_PROJECTS);
+        store.setDefault(PreferenceConstants.IGNORE_VERSION_ON_WORKSPACE_PROJECTS,
+            DEFAULT_IGNORE_VERSION_ON_WORKSPACE_PROJECTS);
     }
 
 }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/WorkspaceResolverPreferencePage.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/WorkspaceResolverPreferencePage.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/WorkspaceResolverPreferencePage.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/WorkspaceResolverPreferencePage.java Sat Jan  2 14:00:47 2010
@@ -30,6 +30,8 @@
 public class WorkspaceResolverPreferencePage extends FieldEditorPreferencePage implements
         IWorkbenchPreferencePage {
 
+    private static final int HORIZ_INDENT = 40;
+
     public WorkspaceResolverPreferencePage() {
         super(GRID);
         setPreferenceStore(IvyPlugin.getDefault().getPreferenceStore());
@@ -86,11 +88,12 @@
                 + "in your workspace can actually work with each other, be carefull with\n"
                 + "branch management for instance)");
         GridData gridData = new GridData();
-        gridData.horizontalIndent = 40;
+        gridData.horizontalIndent = HORIZ_INDENT;
         warning.setLayoutData(gridData);
     }
 
     public void init(IWorkbench workbench) {
+        // nothing to do
     }
 
 }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/views/ReverseDependencyExplorerView.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/views/ReverseDependencyExplorerView.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/views/ReverseDependencyExplorerView.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/views/ReverseDependencyExplorerView.java Sat Jan  2 14:00:47 2010
@@ -60,6 +60,15 @@
  * This is a view to manage synchronizing ivy files in a workspace
  */
 public class ReverseDependencyExplorerView extends ViewPart {
+
+    private static final int COLUMN_MIN_WITH = 75;
+
+    private static final int COLUMN_DEFAULT_WEIGHT = 50;
+
+    private static final int COLUMN_LIGHT_WEIGHT = 25;
+
+    private static final RGB LIGHT_GREEEN = new RGB(50, 150, 50);
+
     private static TreeViewer viewer;
 
     private static MultiRevisionDependencyDescriptor[] dependencies;
@@ -140,10 +149,10 @@
         tree.setLayoutData(new GridData(GridData.FILL_BOTH));
 
         TableLayout layout = new TableLayout();
-        layout.addColumnData(new ColumnWeightData(50, 75, true));
-        layout.addColumnData(new ColumnWeightData(50, 75, true));
-        layout.addColumnData(new ColumnWeightData(25, 75, true));
-        layout.addColumnData(new ColumnWeightData(50, 75, true));
+        layout.addColumnData(new ColumnWeightData(COLUMN_DEFAULT_WEIGHT, COLUMN_MIN_WITH, true));
+        layout.addColumnData(new ColumnWeightData(COLUMN_DEFAULT_WEIGHT, COLUMN_MIN_WITH, true));
+        layout.addColumnData(new ColumnWeightData(COLUMN_LIGHT_WEIGHT, COLUMN_MIN_WITH, true));
+        layout.addColumnData(new ColumnWeightData(COLUMN_DEFAULT_WEIGHT, COLUMN_MIN_WITH, true));
         tree.setLayout(layout);
 
         new TreeColumn(tree, SWT.LEFT).setText("Organization");
@@ -162,7 +171,9 @@
         editors[0] = new TextCellEditor(tree);
         editors[1] = new TextCellEditor(tree);
         editors[2] = new TextCellEditor(tree);
+        // CheckStyle:MagicNumber| OFF
         editors[3] = new TextCellEditor(tree);
+        // CheckStyle:MagicNumber| ON
 
         viewer.setCellModifier(new CellModifier());
         viewer.setCellEditors(editors);
@@ -186,14 +197,14 @@
 
                 for (int i = 0; i < items.length; i++) {
                     TreeItem item = items[i];
-                    MultiRevisionDependencyDescriptor multiRevisionDescriptor = (MultiRevisionDependencyDescriptor) item
-                            .getData();
+                    MultiRevisionDependencyDescriptor multiRevisionDescriptor
+                        = (MultiRevisionDependencyDescriptor) item.getData();
 
                     if (multiRevisionDescriptor.hasMultipleRevisons()
                             && !multiRevisionDescriptor.hasNewRevision()) {
                         item.setForeground(display.getSystemColor(SWT.COLOR_RED));
                     } else if (multiRevisionDescriptor.hasNewRevision()) {
-                        item.setForeground(new Color(Display.getDefault(), new RGB(50, 150, 50)));
+                        item.setForeground(new Color(Display.getDefault(), LIGHT_GREEEN));
                     } else {
                         item.setForeground(display.getSystemColor(SWT.COLOR_BLACK));
                     }
@@ -222,22 +233,25 @@
 
         public String getColumnText(Object obj, int index) {
             if (obj instanceof MultiRevisionDependencyDescriptor) {
-                MultiRevisionDependencyDescriptor dependencyDescriptor = (MultiRevisionDependencyDescriptor) obj;
+                MultiRevisionDependencyDescriptor mrdd = (MultiRevisionDependencyDescriptor) obj;
 
                 switch (index) {
                     case 0:
-                        return dependencyDescriptor.getOrganization();
+                        return mrdd.getOrganization();
                     case 1:
-                        return dependencyDescriptor.getModule();
+                        return mrdd.getModule();
                     case 2:
-                        return toRevisionList(dependencyDescriptor.getRevisions());
+                        return toRevisionList(mrdd.getRevisions());
+                        // CheckStyle:MagicNumber| OFF
                     case 3:
-                        return dependencyDescriptor.getNewRevision();
+                        // CheckStyle:MagicNumber| ON
+                        return mrdd.getNewRevision();
                     default:
                         break;
                 }
             } else if (obj instanceof ClasspathContainerDependencyDescriptorComposite) {
-                ClasspathContainerDependencyDescriptorComposite containerDescriptorComposite = (ClasspathContainerDependencyDescriptorComposite) obj;
+                ClasspathContainerDependencyDescriptorComposite containerDescriptorComposite
+                        = (ClasspathContainerDependencyDescriptorComposite) obj;
                 switch (index) {
                     case 0:
                         return containerDescriptorComposite.getIvyClasspathContainer()
@@ -282,10 +296,9 @@
         public Image getImage(Object obj) {
             ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
             if (obj instanceof MultiRevisionDependencyDescriptor) {
-                MultiRevisionDependencyDescriptor multiRevisionDescriptor = (MultiRevisionDependencyDescriptor) obj;
+                MultiRevisionDependencyDescriptor mrdd = (MultiRevisionDependencyDescriptor) obj;
 
-                if (multiRevisionDescriptor.hasMultipleRevisons()
-                        && !multiRevisionDescriptor.hasNewRevision()) {
+                if (mrdd.hasMultipleRevisons() && !mrdd.hasNewRevision()) {
                     return sharedImages.getImage(ISharedImages.IMG_OBJS_WARN_TSK);
                 } else {
                     return IvyPlugin.getImageDescriptor("icons/synced.gif").createImage();
@@ -300,14 +313,13 @@
 
         public Object[] getChildren(Object parent) {
             if (parent instanceof MultiRevisionDependencyDescriptor) {
-                MultiRevisionDependencyDescriptor multiRevisionDescriptor = (MultiRevisionDependencyDescriptor) parent;
-                IvyClasspathContainer[] containers = multiRevisionDescriptor
-                        .getIvyClasspathContainers();
+                MultiRevisionDependencyDescriptor mrdd = (MultiRevisionDependencyDescriptor) parent;
+                IvyClasspathContainer[] containers = mrdd.getIvyClasspathContainers();
 
                 Object[] wrappedProjects = new Object[containers.length];
                 for (int i = 0; i < containers.length; i++) {
                     wrappedProjects[i] = new ClasspathContainerDependencyDescriptorComposite(
-                            containers[i], multiRevisionDescriptor);
+                            containers[i], mrdd);
                 }
 
                 return wrappedProjects;
@@ -322,9 +334,9 @@
 
         public boolean hasChildren(Object parent) {
             if (parent instanceof MultiRevisionDependencyDescriptor) {
-                MultiRevisionDependencyDescriptor multiRevisionDescriptor = (MultiRevisionDependencyDescriptor) parent;
+                MultiRevisionDependencyDescriptor mrdd = (MultiRevisionDependencyDescriptor) parent;
 
-                if (multiRevisionDescriptor.getIvyClasspathContainers().length > 0) {
+                if (mrdd.getIvyClasspathContainers().length > 0) {
                     return true;
                 }
             }
@@ -370,20 +382,16 @@
         }
 
         public Object getValue(Object element, String property) {
-            if (property.equals(NEW_REVISION)) {
-                if (element instanceof MultiRevisionDependencyDescriptor) {
-                    MultiRevisionDependencyDescriptor dependencyDescriptor = (MultiRevisionDependencyDescriptor) element;
-                    String revision = dependencyDescriptor.getNewRevision();
-
-                    if (revision == null) {
-                        return "";
-                    } else {
-                        return revision;
-                    }
-                }
+            if (!property.equals(NEW_REVISION)
+                    || !(element instanceof MultiRevisionDependencyDescriptor)) {
+                return null;
             }
-
-            return null;
+            MultiRevisionDependencyDescriptor mrdd = (MultiRevisionDependencyDescriptor) element;
+            String revision = mrdd.getNewRevision();
+            if (revision == null) {
+                return "";
+            }
+            return revision;
         }
 
         public void modify(Object element, String property, Object value) {
@@ -393,8 +401,7 @@
 
             if (element instanceof MultiRevisionDependencyDescriptor
                     && property.equals(NEW_REVISION)) {
-                MultiRevisionDependencyDescriptor multiRevisionDescriptor = (MultiRevisionDependencyDescriptor) element;
-                multiRevisionDescriptor.setNewRevision((String) value);
+                ((MultiRevisionDependencyDescriptor) element).setNewRevision((String) value);
 
                 refresh(false);
             }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java?rev=895195&r1=895194&r2=895195&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java Sat Jan  2 14:00:47 2010
@@ -121,7 +121,8 @@
                     + resolvingJavaProject.getElementName(), e);
         }
 
-        ignoreVersionOnWorkspaceProjects = IvyPlugin.getPreferenceStoreHelper().getIgnoreVersionOnWorkspaceProjects();
+        ignoreVersionOnWorkspaceProjects = IvyPlugin.getPreferenceStoreHelper()
+                .getIgnoreVersionOnWorkspaceProjects();
     }
 
     public DownloadReport download(Artifact[] artifacts, DownloadOptions options) {



Mime
View raw message