svn commit: r1508385 - in /ant/ivy/ivyde/trunk: org.apache.ivyde.eclipse.resolvevisualizer/icons/ org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/ org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/

[hi...@apache.org]

Author: hibou
Date: Tue Jul 30 10:54:23 2013
New Revision: 1508385

URL: http://svn.apache.org/r1508385
Log:
use the new API of IvyDE

Added:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/icons/refresh.gif   (with props)
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/Plugin.java   (with props)
Modified:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/ClasspathContainerSelectionDialog.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/IvyNodeLabelProvider.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/ResolveVisualizerView.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/IvyClasspathContainer.java

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/icons/refresh.gif
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/icons/refresh.gif?rev=1508385&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/icons/refresh.gif
------------------------------------------------------------------------------
    svn:mime-type = image/gif

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/ClasspathContainerSelectionDialog.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/ClasspathContainerSelectionDialog.java?rev=1508385&r1=1508384&r2=1508385&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/ClasspathContainerSelectionDialog.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/ClasspathContainerSelectionDialog.java Tue Jul 30 10:54:23 2013
@@ -20,8 +20,8 @@ package org.apache.ivyde.eclipse.resolve
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathContainer;
-import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathUtil;
+import org.apache.ivyde.eclipse.cp.IvyClasspathContainer;
+import org.apache.ivyde.eclipse.cp.IvyClasspathContainerHelper;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.widgets.Shell;
@@ -39,10 +39,10 @@ public class ClasspathContainerSelection
         setTitle("Ivy Classpath Containers");
         setMessage("Select a container to view in the resolve visualizer.");
 
-        List/* <IvyClasspathContainer> */classpathContainers = new ArrayList/* <IvyClasspathContainer> */();
-        IProject[] ivyProjects = IvyClasspathUtil.getIvyProjectsInWorkspace();
+        List/* <IvyClasspathContainer> */classpathContainers = new ArrayList();
+        IProject[] ivyProjects = IvyClasspathContainerHelper.getIvyProjectsInWorkspace();
         for (int i = 0; i < ivyProjects.length; i++) {
-            classpathContainers.addAll(IvyClasspathUtil.getIvyClasspathContainers(ivyProjects[i]));
+            classpathContainers.addAll(IvyClasspathContainerHelper.getContainers(ivyProjects[i]));
         }
 
         setElements(classpathContainers.toArray());

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/IvyNodeLabelProvider.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/IvyNodeLabelProvider.java?rev=1508385&r1=1508384&r2=1508385&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/IvyNodeLabelProvider.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/IvyNodeLabelProvider.java Tue Jul 30 10:54:23 2013
@@ -21,7 +21,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.ivyde.eclipse.IvyPlugin;
 import org.apache.ivyde.eclipse.resolvevisualizer.label.ConfigurationConflictAlgorithm;
 import org.apache.ivyde.eclipse.resolvevisualizer.label.ConnectionStyle;
 import org.apache.ivyde.eclipse.resolvevisualizer.label.DirectDependenciesAlgorithm;

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/Plugin.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/Plugin.java?rev=1508385&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/Plugin.java (added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/Plugin.java Tue Jul 30 10:54:23 2013
@@ -0,0 +1,21 @@
+package org.apache.ivyde.eclipse.resolvevisualizer;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+
+public class Plugin {
+
+	public static final String ID = "org.apache.ivyde.eclipse.resolvevisualizer";
+
+    /**
+     * Returns an image descriptor for the image file at the given plug-in relative path.
+     * 
+     * @param path
+     *            the path
+     * @return the image descriptor
+     */
+    public static ImageDescriptor getImageDescriptor(String path) {
+        return AbstractUIPlugin.imageDescriptorFromPlugin(ID, path);
+    }
+
+}

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/Plugin.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/Plugin.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/Plugin.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/ResolveVisualizerView.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/ResolveVisualizerView.java?rev=1508385&r1=1508384&r2=1508385&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/ResolveVisualizerView.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/ResolveVisualizerView.java Tue Jul 30 10:54:23 2013
@@ -27,8 +27,7 @@ import java.util.Iterator;
 import java.util.Stack;
 
 import org.apache.ivy.core.report.ResolveReport;
-import org.apache.ivyde.eclipse.IvyPlugin;
-import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathContainer;
+import org.apache.ivyde.eclipse.cp.IvyClasspathContainer;
 import org.apache.ivyde.eclipse.resolvevisualizer.label.ILabelDecoratorAlgorithm;
 import org.apache.ivyde.eclipse.resolvevisualizer.model.IvyNodeElement;
 import org.apache.ivyde.eclipse.resolvevisualizer.model.IvyNodeElementAdapter;
@@ -255,7 +254,7 @@ public class ResolveVisualizerView exten
         };
         refreshAction.setText("Resolve");
         refreshAction.setEnabled(true);
-        refreshAction.setImageDescriptor(IvyPlugin.getImageDescriptor("icons/refresh.gif"));
+        refreshAction.setImageDescriptor(Plugin.getImageDescriptor("icons/refresh.gif"));
 
         focusDialogAction = new Action() {
             public void run() {

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/IvyClasspathContainer.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/IvyClasspathContainer.java?rev=1508385&r1=1508384&r2=1508385&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/IvyClasspathContainer.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/IvyClasspathContainer.java Tue Jul 30 10:54:23 2013
@@ -38,4 +38,6 @@ public interface IvyClasspathContainer {
     public void reloadSettings();
 
     public ResolveReport getResolveReport();
+
+    public String getDescription();
 }