Skip to content

Commit

Permalink
JBIDE-19105: Remove obsolete uses of ForgeEmbeddedRuntime
Browse files Browse the repository at this point in the history
  • Loading branch information
koentsje committed Jan 28, 2015
1 parent 5e9518c commit 4e8dd9d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ public class ForgeRuntimeManager {
public static List<ForgeRuntime> getEmbeddedRuntimes() {
ArrayList<ForgeRuntime> result = new ArrayList<ForgeRuntime>();
result.add(FurnaceRuntime.INSTANCE);
result.add(ForgeEmbeddedRuntime.INSTANCE);
return result;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ private String getForgeRuntimesPreference() {
private void initializeRuntimes() {
runtimes = new ArrayList<ForgeRuntime>();
runtimes.add(FurnaceRuntime.INSTANCE);
runtimes.add(ForgeEmbeddedRuntime.INSTANCE);
addFromXml(getForgeRuntimesPreference());
initializeDefaultRuntime();
}
Expand All @@ -118,11 +117,7 @@ private void initializeDefaultRuntime() {
}
}
if (defaultRuntime == null) {
if ("embedded".equals(defaultRuntimeName)) {
defaultRuntime = ForgeEmbeddedRuntime.INSTANCE;
} else {
defaultRuntime = FurnaceRuntime.INSTANCE;
}
defaultRuntime = FurnaceRuntime.INSTANCE;
defaultRuntimeName = defaultRuntime.getName();
}
}
Expand Down Expand Up @@ -263,9 +258,7 @@ private Document createRuntimesDocument() {
for (ForgeRuntime runtime : runtimes) {
Element element = document.createElement("runtime");
element.setAttribute("name", runtime.getName());
if (!(runtime instanceof ForgeEmbeddedRuntime)) {
element.setAttribute("location", runtime.getLocation());
}
element.setAttribute("location", runtime.getLocation());
element.setAttribute("type", runtime.getType().name().toLowerCase());
main.appendChild(element);
}
Expand Down

0 comments on commit 4e8dd9d

Please sign in to comment.