[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2966] trunk/com.aptana.rdt/src/com/aptana/rdt/ internal/core/gems/GemManager.java

[<caw...@us...>]

Revision: 2966
          http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=2966&view=rev
Author:   cawilliams
Date:     2007-08-13 13:57:21 -0700 (Mon, 13 Aug 2007)

Log Message:
-----------
fix #5385 - Make install gem button enabled as soon as remote listing is loaded

Modified Paths:
--------------
    trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemManager.java

Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemManager.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemManager.java	2007-08-13 20:57:16 UTC (rev 2965)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemManager.java	2007-08-13 20:57:21 UTC (rev 2966)
@@ -585,19 +585,7 @@
 	 * @see com.aptana.rdt.internal.gems.IGemManager#getRemoteGems()
 	 */
 	public Set<Gem> getRemoteGems() {
-		SortedSet<Gem> sorted = new TreeSet<Gem>(remoteGems);
-		SortedSet<Gem> logical = new TreeSet<Gem>();
-		String name = null;
-		Collection<Gem> temp = new HashSet<Gem>();
-		for (Gem gem : sorted) {
-			if (name != null && !gem.getName().equals(name)) {
-				logical.add(LogicalGem.create(temp));
-				temp.clear();
-			}
-			name = gem.getName();
-			temp.add(gem);
-		}
-		return Collections.unmodifiableSortedSet(logical);
+		return Collections.unmodifiableSortedSet(new TreeSet<Gem>(remoteGems));
 	}
 
 	/*
@@ -728,6 +716,7 @@
 						remoteGems = loadRemoteGems();
 						storeGemCache(remoteGems,
 								getConfigFile(REMOTE_GEMS_CACHE_FILE));
+						remoteGems = makeLogical(remoteGems);
 //					}
 				} catch (Exception e) {
 					AptanaRDTPlugin.log(e);
@@ -739,4 +728,20 @@
 		};
 		job.schedule();
 	}
+
+	protected Set<Gem> makeLogical(Set<Gem> remoteGems) {
+		SortedSet<Gem> sorted = new TreeSet<Gem>(remoteGems);
+		SortedSet<Gem> logical = new TreeSet<Gem>();
+		String name = null;
+		Collection<Gem> temp = new HashSet<Gem>();
+		for (Gem gem : sorted) {
+			if (name != null && !gem.getName().equals(name)) {
+				logical.add(LogicalGem.create(temp));
+				temp.clear();
+			}
+			name = gem.getName();
+			temp.add(gem);
+		}
+		return Collections.unmodifiableSortedSet(logical);
+	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.