[close #1164] Add finder for RHDS >=10

* add forgotten finder for RHDS
* use correct location in RhdsLocationProvider

3 files changed, 71 insertions, 1 deletions

diff --git a/src/installer/lombok/installer/eclipse/RhdsFinder.java b/src/installer/lombok/installer/eclipse/RhdsFinder.java
new file mode 100644
index 00000000..5e639fa5
--- /dev/null
+++ b/src/installer/lombok/installer/eclipse/RhdsFinder.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2013 The Project Lombok Authors.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package lombok.installer.eclipse;
+
+import java.util.Arrays;
+import java.util.List;
+
+import lombok.installer.CorruptedIdeLocationException;
+import lombok.installer.IdeFinder;
+import lombok.installer.IdeLocation;
+
+import org.mangosdk.spi.ProviderFor;
+
+/**
+ * RHDS (Red Hat JBoss Developer Studio) is an eclipse variant.
+ * Other than different executable names, it's the same as eclipse, as far as lombok support goes.
+ */
+@ProviderFor(IdeFinder.class)
+public class RhdsFinder extends EclipseFinder {
+	@Override protected IdeLocation createLocation(String guess) throws CorruptedIdeLocationException {
+		return new RhdsLocationProvider().create0(guess);
+	}
+	
+	@Override protected String getDirName() {
+		return "studio";
+	}
+	
+	@Override protected String getMacExecutableName() {
+		return "devstudio.app";
+	}
+	
+	@Override protected String getUnixExecutableName() {
+		return "devstudio";
+	}
+	
+	@Override protected String getWindowsExecutableName() {
+		return "devstudio.exe";
+	}
+	
+	@Override protected List<String> getSourceDirsOnWindows() {
+		return Arrays.asList("\\", "\\Program Files", "\\Program Files (x86)", System.getProperty("user.home", "."));
+	}
+	
+	@Override protected List<String> getSourceDirsOnMac() {
+		return Arrays.asList("/Applications", System.getProperty("user.home", "."));
+	}
+	
+	@Override protected List<String> getSourceDirsOnUnix() {
+		return Arrays.asList(System.getProperty("user.home", "."));
+	}
+}
diff --git a/src/installer/lombok/installer/eclipse/RhdsLocationProvider.java b/src/installer/lombok/installer/eclipse/RhdsLocationProvider.java
index 008cbf86..fabddba2 100644
--- a/src/installer/lombok/installer/eclipse/RhdsLocationProvider.java
+++ b/src/installer/lombok/installer/eclipse/RhdsLocationProvider.java
@@ -44,7 +44,7 @@ public class RhdsLocationProvider extends EclipseLocationProvider {
 	}
 	
 	@Override protected IdeLocation makeLocation(String name, File ini) throws CorruptedIdeLocationException {
-		return new JbdsLocation(name, ini);
+		return new RhdsLocation(name, ini);
 	}
 	
 	@Override protected String getMacAppName() {
diff --git a/src/installer/lombok/installer/eclipse/rhds.png b/src/installer/lombok/installer/eclipse/rhds.png
index bd0f534d..ca7738e6 100644
--- a/src/installer/lombok/installer/eclipse/rhds.png
+++ b/src/installer/lombok/installer/eclipse/rhds.png