ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r992782 - in /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse: ./ revdepexplorer/ ui/preferences/ ui/views/
Date Sun, 05 Sep 2010 13:50:11 GMT
Author: hibou
Date: Sun Sep  5 13:50:10 2010
New Revision: 992782

URL: http://svn.apache.org/viewvc?rev=992782&view=rev
Log:
Fix last checkstyle errors

Added:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/MultiRevDependencyDescriptor.java
      - copied, changed from r992643, ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/MultiRevisionDependencyDescriptor.java
Removed:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/MultiRevisionDependencyDescriptor.java
Modified:
    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/revdepexplorer/IvyUtil.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/preferences/IvyDEPreferenceStoreHelper.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEProjectPreferences.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/preferences/XMLEditorPreferencesPage.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/views/ReverseDependencyExplorerView.java

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=992782&r1=992781&r2=992782&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
Sun Sep  5 13:50:10 2010
@@ -126,6 +126,7 @@ public class IvyPlugin extends AbstractU
         propertyListener = new IPropertyChangeListener() {
             public void propertyChange(PropertyChangeEvent event) {
                 try {
+                    // CheckStyle:LineLength| OFF
                     if (event.getProperty() == PreferenceConstants.IVYSETTINGS_PATH
                             || event.getProperty() == PreferenceConstants.ACCEPTED_TYPES
                             || event.getProperty() == PreferenceConstants.SOURCES_TYPES
@@ -143,6 +144,7 @@ public class IvyPlugin extends AbstractU
                             || event.getProperty() == PreferenceConstants.IGNORE_VERSION_ON_WORKSPACE_PROJECTS)
{
                         prefStoreChanged();
                     }
+                    // CheckStyle:LineLength| ON
                 } catch (JavaModelException e) {
                     MessageDialog.openError(IvyPlugin.getDefault().getWorkbench()
                             .getActiveWorkbenchWindow().getShell(),

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=992782&r1=992781&r2=992782&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
Sun Sep  5 13:50:10 2010
@@ -60,7 +60,7 @@ public final class IvyUtil {
         return (IProject[]) ivyProjects.toArray(new IProject[ivyProjects.size()]);
     }
 
-    public static MultiRevisionDependencyDescriptor[] getDependencyDescriptorsByProjects(
+    public static MultiRevDependencyDescriptor[] getDependencyDescriptorsByProjects(
             IProject[] projects) {
         // a temporary cache of multi-revision dependency descriptors
         Map/* <ModuleId, MultiRevisionDependencyDescriptor> */mdMap = new HashMap();
@@ -78,11 +78,11 @@ public final class IvyUtil {
                 DependencyDescriptor[] descriptors = md.getDependencies();
                 for (int j = 0; j < descriptors.length; j++) {
                     DependencyDescriptor descriptor = descriptors[j];
-                    MultiRevisionDependencyDescriptor syncabledd = (MultiRevisionDependencyDescriptor)
mdMap
+                    MultiRevDependencyDescriptor syncabledd = (MultiRevDependencyDescriptor)
mdMap
                             .get(descriptor.getDependencyId());
 
                     if (syncabledd == null) {
-                        syncabledd = new MultiRevisionDependencyDescriptor(
+                        syncabledd = new MultiRevDependencyDescriptor(
                                 descriptor.getDependencyId());
 
                         mdMap.put(descriptor.getDependencyId(), syncabledd);
@@ -98,8 +98,8 @@ public final class IvyUtil {
 
         Collections.sort(sorted, new Comparator/* <MultiRevisionDependencyDescriptor>
*/() {
             public int compare(Object o1, Object o2) {
-                MultiRevisionDependencyDescriptor desc1 = (MultiRevisionDependencyDescriptor)
o1;
-                MultiRevisionDependencyDescriptor desc2 = (MultiRevisionDependencyDescriptor)
o2;
+                MultiRevDependencyDescriptor desc1 = (MultiRevDependencyDescriptor) o1;
+                MultiRevDependencyDescriptor desc2 = (MultiRevDependencyDescriptor) o2;
 
                 int equal = desc1.getOrganization().compareTo(desc2.getOrganization());
                 if (equal == 0) {
@@ -111,8 +111,8 @@ public final class IvyUtil {
             }
         });
 
-        return (MultiRevisionDependencyDescriptor[]) sorted
-                .toArray(new MultiRevisionDependencyDescriptor[sorted.size()]);
+        return (MultiRevDependencyDescriptor[]) sorted
+                .toArray(new MultiRevDependencyDescriptor[sorted.size()]);
     }
 
     /**
@@ -121,7 +121,7 @@ public final class IvyUtil {
      * 
      * @return multi-revision dependency descriptors
      */
-    public static MultiRevisionDependencyDescriptor[] getAllDependencyDescriptorsInWorkspace()
{
+    public static MultiRevDependencyDescriptor[] getAllDependencyDescriptorsInWorkspace()
{
         return getDependencyDescriptorsByProjects(getIvyProjectsInWorkspace());
     }
 }

Copied: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/MultiRevDependencyDescriptor.java
(from r992643, 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/MultiRevDependencyDescriptor.java?p2=ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/MultiRevDependencyDescriptor.java&p1=ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/revdepexplorer/MultiRevisionDependencyDescriptor.java&r1=992643&r2=992782&rev=992782&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/MultiRevDependencyDescriptor.java
Sun Sep  5 13:50:10 2010
@@ -28,7 +28,7 @@ import org.apache.ivy.core.module.descri
 import org.apache.ivy.core.module.id.ModuleId;
 import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathContainer;
 
-public class MultiRevisionDependencyDescriptor {
+public class MultiRevDependencyDescriptor {
     private final ModuleId moduleId;
 
     /**
@@ -38,7 +38,7 @@ public class MultiRevisionDependencyDesc
 
     private String newRevision;
 
-    public MultiRevisionDependencyDescriptor(ModuleId moduleId) {
+    public MultiRevDependencyDescriptor(ModuleId moduleId) {
         this.moduleId = moduleId;
     }
 
@@ -48,8 +48,8 @@ public class MultiRevisionDependencyDesc
     }
 
     public boolean equals(Object o) {
-        if (o instanceof MultiRevisionDependencyDescriptor) {
-            MultiRevisionDependencyDescriptor mrdd = (MultiRevisionDependencyDescriptor)
o;
+        if (o instanceof MultiRevDependencyDescriptor) {
+            MultiRevDependencyDescriptor mrdd = (MultiRevDependencyDescriptor) o;
 
             if (getOrganization().equals(mrdd.getOrganization())
                     && getModule().equals(mrdd.getModule())

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=992782&r1=992781&r2=992782&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
Sun Sep  5 13:50:10 2010
@@ -57,7 +57,7 @@ import org.xml.sax.SAXException;
  */
 public class SyncIvyFilesJob extends WorkspaceJob {
 
-    private MultiRevisionDependencyDescriptor[] multiRevisionDependencies;
+    private MultiRevDependencyDescriptor[] multiRevisionDependencies;
 
     /**
      * FIXME Here we seriously abuse the Ivy core API to allow us to preserve an info element
@@ -96,7 +96,7 @@ public class SyncIvyFilesJob extends Wor
         }
     }
     
-    public SyncIvyFilesJob(MultiRevisionDependencyDescriptor[] multiRevisionDependencies)
{
+    public SyncIvyFilesJob(MultiRevDependencyDescriptor[] multiRevisionDependencies) {
         super("Synchronizing Ivy Files");
         this.multiRevisionDependencies = multiRevisionDependencies;
     }    
@@ -119,7 +119,7 @@ public class SyncIvyFilesJob extends Wor
             DependencyDescriptor[] dependencies = md.getDependencies();
             for (int j = 0; j < dependencies.length; j++) {
                 for (int k = 0; k < multiRevisionDependencies.length; k++) {
-                    MultiRevisionDependencyDescriptor multiRevision = multiRevisionDependencies[k];
+                    MultiRevDependencyDescriptor multiRevision = multiRevisionDependencies[k];
                     ModuleRevisionId dependencyRevisionId = dependencies[j]
                             .getDependencyRevisionId();
                     if (dependencies[j].getDependencyId().equals(multiRevision.getModuleId())
@@ -183,7 +183,7 @@ public class SyncIvyFilesJob extends Wor
         Collection/* <IvyClasspathContainer> */containers = new HashSet();
 
         for (int i = 0; i < multiRevisionDependencies.length; i++) {
-            MultiRevisionDependencyDescriptor multiRevision = multiRevisionDependencies[i];
+            MultiRevDependencyDescriptor multiRevision = multiRevisionDependencies[i];
             if (multiRevision.hasNewRevision()) {
                 containers.addAll(Arrays.asList(multiRevision.getIvyClasspathContainers()));
             }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java?rev=992782&r1=992781&r2=992782&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java
Sun Sep  5 13:50:10 2010
@@ -79,8 +79,10 @@ public class IvyDEPreferenceStoreHelper 
                 .getString(PreferenceConstants.SOURCES_SUFFIXES)));
         setup.setJavadocSuffixes(IvyClasspathUtil.split(prefStore
                 .getString(PreferenceConstants.JAVADOC_SUFFIXES)));
-        setup.setMapIfOnlyOneSource(prefStore.getBoolean(PreferenceConstants.MAP_IF_ONLY_ONE_SOURCE));
-        setup.setMapIfOnlyOneJavadoc(prefStore.getBoolean(PreferenceConstants.MAP_IF_ONLY_ONE_JAVADOC));
+        setup.setMapIfOnlyOneSource(prefStore
+                .getBoolean(PreferenceConstants.MAP_IF_ONLY_ONE_SOURCE));
+        setup.setMapIfOnlyOneJavadoc(prefStore
+                .getBoolean(PreferenceConstants.MAP_IF_ONLY_ONE_JAVADOC));
         return setup;
     }
 
@@ -95,8 +97,10 @@ public class IvyDEPreferenceStoreHelper 
                 .getSourceSuffixes()));
         prefStore.setValue(PreferenceConstants.JAVADOC_SUFFIXES, IvyClasspathUtil.concat(setup
                 .getJavadocSuffixes()));
-        prefStore.setValue(PreferenceConstants.MAP_IF_ONLY_ONE_SOURCE, setup.isMapIfOnlyOneSource());
-        prefStore.setValue(PreferenceConstants.MAP_IF_ONLY_ONE_JAVADOC, setup.isMapIfOnlyOneJavadoc());
+        prefStore.setValue(PreferenceConstants.MAP_IF_ONLY_ONE_SOURCE,
+                setup.isMapIfOnlyOneSource());
+        prefStore.setValue(PreferenceConstants.MAP_IF_ONLY_ONE_JAVADOC,
+                setup.isMapIfOnlyOneJavadoc());
     }
 
     public boolean isAlphOrder() {

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEProjectPreferences.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEProjectPreferences.java?rev=992782&r1=992781&r2=992782&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEProjectPreferences.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEProjectPreferences.java
Sun Sep  5 13:50:10 2010
@@ -184,6 +184,7 @@ public class IvyDEProjectPreferences ext
 
         public String getColumnText(Object element, int columnIndex) {
             StandaloneRetrieveSetup setup = (StandaloneRetrieveSetup) element;
+            // CheckStyle:MagicNumber| OFF
             switch (columnIndex) {
                 case 0:
                     return setup.getName();
@@ -194,6 +195,7 @@ public class IvyDEProjectPreferences ext
                 case 3:
                     return setup.getRetrieveSetup().getRetrieveTypes();
             }
+            // CheckStyle:MagicNumber| ON
             return null;
         }
 

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=992782&r1=992781&r2=992782&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
Sun Sep  5 13:50:10 2010
@@ -134,8 +134,10 @@ public class PreferenceInitializer exten
         store.setDefault(PreferenceConstants.JAVADOC_TYPES, DEFAULT_JAVADOC_TYPES);
         store.setDefault(PreferenceConstants.SOURCES_SUFFIXES, DEFAULT_SOURCES_SUFFIXES);
         store.setDefault(PreferenceConstants.JAVADOC_SUFFIXES, DEFAULT_JAVADOC_SUFFIXES);
-        store.setDefault(PreferenceConstants.MAP_IF_ONLY_ONE_SOURCE, DEFAULT_MAP_IF_ONLY_ONE_SOURCE);
-        store.setDefault(PreferenceConstants.MAP_IF_ONLY_ONE_JAVADOC, DEFAULT_MAP_IF_ONLY_ONE_JAVADOC);
+        store.setDefault(PreferenceConstants.MAP_IF_ONLY_ONE_SOURCE,
+                DEFAULT_MAP_IF_ONLY_ONE_SOURCE);
+        store.setDefault(PreferenceConstants.MAP_IF_ONLY_ONE_JAVADOC,
+                DEFAULT_MAP_IF_ONLY_ONE_JAVADOC);
 
         store.setDefault(PreferenceConstants.ALPHABETICAL_ORDER, DEFAULT_ALPHABETICAL_ORDER);
         store.setDefault(PreferenceConstants.RESOLVE_IN_WORKSPACE, DEFAULT_RESOLVE_IN_WORKSPACE);

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=992782&r1=992781&r2=992782&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
Sun Sep  5 13:50:10 2010
@@ -97,10 +97,10 @@ public class WorkspaceResolverPreference
         addField(ignoreVersionOnWorkspaceProjects);
 
         Label warning = new Label(fieldParent, SWT.NONE);
-        warning.setText("WARNING: you should ignore branch and/or revision only\n" +
-        		        "if you are sure that all the project revisions that are\n" +
-        		        "open in your workspace can actually work together\n" +
-                        "(be careful with branch management for instance)");
+        warning.setText("WARNING: you should ignore branch and/or revision only\n"
+                    + "if you are sure that all the project revisions that are\n"
+                    + "open in your workspace can actually work together\n"
+                    + "(be careful with branch management for instance)");
         GridData gridData = new GridData();
         gridData.horizontalIndent = HORIZ_INDENT;
         warning.setLayoutData(gridData);

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/XMLEditorPreferencesPage.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/XMLEditorPreferencesPage.java?rev=992782&r1=992781&r2=992782&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/XMLEditorPreferencesPage.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/XMLEditorPreferencesPage.java
Sun Sep  5 13:50:10 2010
@@ -49,7 +49,8 @@ public class XMLEditorPreferencesPage ex
         addField(new ColorFieldEditor(PreferenceConstants.EDITOR_COLOR_DEFAULT, "Default",
                 fieldParent));
 
-        addField(new ColorFieldEditor(PreferenceConstants.EDITOR_COLOR_TAG, "XML tag", fieldParent));
+        addField(new ColorFieldEditor(PreferenceConstants.EDITOR_COLOR_TAG, "XML tag",
+                fieldParent));
     }
 
     public void init(IWorkbench workbench) {

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=992782&r1=992781&r2=992782&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
Sun Sep  5 13:50:10 2010
@@ -20,7 +20,7 @@ package org.apache.ivyde.eclipse.ui.view
 import org.apache.ivyde.eclipse.IvyPlugin;
 import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathContainer;
 import org.apache.ivyde.eclipse.revdepexplorer.IvyUtil;
-import org.apache.ivyde.eclipse.revdepexplorer.MultiRevisionDependencyDescriptor;
+import org.apache.ivyde.eclipse.revdepexplorer.MultiRevDependencyDescriptor;
 import org.apache.ivyde.eclipse.revdepexplorer.SyncIvyFilesJob;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
@@ -71,7 +71,7 @@ public class ReverseDependencyExplorerVi
 
     private static TreeViewer viewer;
 
-    private static MultiRevisionDependencyDescriptor[] dependencies;
+    private static MultiRevDependencyDescriptor[] dependencies;
 
     private static Display display;
 
@@ -197,8 +197,8 @@ public class ReverseDependencyExplorerVi
 
                 for (int i = 0; i < items.length; i++) {
                     TreeItem item = items[i];
-                    MultiRevisionDependencyDescriptor multiRevisionDescriptor
-                        = (MultiRevisionDependencyDescriptor) item.getData();
+                    MultiRevDependencyDescriptor multiRevisionDescriptor
+                        = (MultiRevDependencyDescriptor) item.getData();
 
                     if (multiRevisionDescriptor.hasMultipleRevisons()
                             && !multiRevisionDescriptor.hasNewRevision()) {
@@ -232,8 +232,8 @@ public class ReverseDependencyExplorerVi
         }
 
         public String getColumnText(Object obj, int index) {
-            if (obj instanceof MultiRevisionDependencyDescriptor) {
-                MultiRevisionDependencyDescriptor mrdd = (MultiRevisionDependencyDescriptor)
obj;
+            if (obj instanceof MultiRevDependencyDescriptor) {
+                MultiRevDependencyDescriptor mrdd = (MultiRevDependencyDescriptor) obj;
 
                 switch (index) {
                     case 0:
@@ -295,8 +295,8 @@ public class ReverseDependencyExplorerVi
 
         public Image getImage(Object obj) {
             ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
-            if (obj instanceof MultiRevisionDependencyDescriptor) {
-                MultiRevisionDependencyDescriptor mrdd = (MultiRevisionDependencyDescriptor)
obj;
+            if (obj instanceof MultiRevDependencyDescriptor) {
+                MultiRevDependencyDescriptor mrdd = (MultiRevDependencyDescriptor) obj;
 
                 if (mrdd.hasMultipleRevisons() && !mrdd.hasNewRevision()) {
                     return sharedImages.getImage(ISharedImages.IMG_OBJS_WARN_TSK);
@@ -312,8 +312,8 @@ public class ReverseDependencyExplorerVi
         }
 
         public Object[] getChildren(Object parent) {
-            if (parent instanceof MultiRevisionDependencyDescriptor) {
-                MultiRevisionDependencyDescriptor mrdd = (MultiRevisionDependencyDescriptor)
parent;
+            if (parent instanceof MultiRevDependencyDescriptor) {
+                MultiRevDependencyDescriptor mrdd = (MultiRevDependencyDescriptor) parent;
                 IvyClasspathContainer[] containers = mrdd.getIvyClasspathContainers();
 
                 Object[] wrappedProjects = new Object[containers.length];
@@ -333,8 +333,8 @@ public class ReverseDependencyExplorerVi
         }
 
         public boolean hasChildren(Object parent) {
-            if (parent instanceof MultiRevisionDependencyDescriptor) {
-                MultiRevisionDependencyDescriptor mrdd = (MultiRevisionDependencyDescriptor)
parent;
+            if (parent instanceof MultiRevDependencyDescriptor) {
+                MultiRevDependencyDescriptor mrdd = (MultiRevDependencyDescriptor) parent;
 
                 if (mrdd.getIvyClasspathContainers().length > 0) {
                     return true;
@@ -348,10 +348,10 @@ public class ReverseDependencyExplorerVi
     class ClasspathContainerDependencyDescriptorComposite {
         private IvyClasspathContainer container;
 
-        private MultiRevisionDependencyDescriptor multiRevisionDescriptor;
+        private MultiRevDependencyDescriptor multiRevisionDescriptor;
 
         public ClasspathContainerDependencyDescriptorComposite(IvyClasspathContainer container,
-                MultiRevisionDependencyDescriptor multiRevisionDescriptor) {
+                MultiRevDependencyDescriptor multiRevisionDescriptor) {
             this.container = container;
             this.multiRevisionDescriptor = multiRevisionDescriptor;
         }
@@ -367,7 +367,7 @@ public class ReverseDependencyExplorerVi
             return container;
         }
 
-        public MultiRevisionDependencyDescriptor getMultiRevisionDescriptor() {
+        public MultiRevDependencyDescriptor getMultiRevisionDescriptor() {
             return multiRevisionDescriptor;
         }
     }
@@ -383,10 +383,10 @@ public class ReverseDependencyExplorerVi
 
         public Object getValue(Object element, String property) {
             if (!property.equals(NEW_REVISION)
-                    || !(element instanceof MultiRevisionDependencyDescriptor)) {
+                    || !(element instanceof MultiRevDependencyDescriptor)) {
                 return null;
             }
-            MultiRevisionDependencyDescriptor mrdd = (MultiRevisionDependencyDescriptor)
element;
+            MultiRevDependencyDescriptor mrdd = (MultiRevDependencyDescriptor) element;
             String revision = mrdd.getNewRevision();
             if (revision == null) {
                 return "";
@@ -399,9 +399,9 @@ public class ReverseDependencyExplorerVi
                 element = ((Item) element).getData();
             }
 
-            if (element instanceof MultiRevisionDependencyDescriptor
+            if (element instanceof MultiRevDependencyDescriptor
                     && property.equals(NEW_REVISION)) {
-                ((MultiRevisionDependencyDescriptor) element).setNewRevision((String) value);
+                ((MultiRevDependencyDescriptor) element).setNewRevision((String) value);
 
                 refresh(false);
             }



Mime
View raw message