[jbosstools-commits] JBoss Tools SVN: r32437 - in trunk/forge: plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process and 1 other directories.

Author: koen.aers(a)jboss.com Date: 2011-06-29 07:29:45 -0400 (Wed, 29 Jun 2011) New Revision: 32437 Added: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntime.java trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntimeTest.java Removed: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeRuntimeTest.java Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java Log: added ForgeEmbeddedRuntime Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java 2011-06-29 10:48:56 UTC (rev 32436) +++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java 2011-06-29 11:29:45 UTC (rev 32437) @@ -1,22 +1,20 @@ package org.jboss.tools.forge.core.preferences; -import java.util.List; - import org.jboss.tools.forge.core.process.ForgeRuntime; public class ForgeInstallations { - private static final String PREF_FORGE_INSTALLATIONS = "installations"; +// private static final String PREF_FORGE_INSTALLATIONS = "installations"; - private static List<ForgeRuntime> installations = null; +// private static List<ForgeRuntime> installations = null; private static ForgeRuntime defaultInstallation = null; - public static ForgeRuntime[] getInstallations() { +// public static ForgeRuntime[] getInstallations() { // if (installations == null) { // initializeInstallations(); // } - return (ForgeRuntime[])installations.toArray(new ForgeRuntime[installations.size()]); - } +// return (ForgeRuntime[])installations.toArray(new ForgeRuntime[installations.size()]); +// } public static ForgeRuntime getDefault() { // if (installations == null) { @@ -28,8 +26,16 @@ // private static IEclipsePreferences getForgeCorePreferences() { // return InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID); // } -// + // private static void initializeInstallations() { +// initializeEmbeddedRuntime(); +// } + +// private static void initializeEmbeddedRuntime() { + +// } + +// private static void initializeInstallations() { // String installPrefsXml = getForgeCorePreferences().get(PREF_FORGE_INSTALLATIONS, null); // if (installPrefsXml == null || "".equals(installPrefsXml)) { // createInitialInstallations(); Added: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntime.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntime.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntime.java 2011-06-29 11:29:45 UTC (rev 32437) @@ -0,0 +1,31 @@ +package org.jboss.tools.forge.core.process; + +import java.io.IOException; + +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.Platform; +import org.jboss.tools.forge.core.ForgeCorePlugin; + +public class ForgeEmbeddedRuntime implements ForgeRuntime { + + public static final ForgeRuntime INSTANCE = new ForgeEmbeddedRuntime(); + + private ForgeEmbeddedRuntime() {} + + @Override + public final String getName() { + return "embedded"; + } + + @Override + public String getLocation() { + String result = null; + try { + result = FileLocator.getBundleFile(Platform.getBundle("org.jboss.tools.forge.runtime")).getAbsolutePath(); + } catch (IOException e) { + ForgeCorePlugin.log(e); + } + return result; + } + +} Copied: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntimeTest.java (from rev 32429, trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeRuntimeTest.java) =================================================================== --- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntimeTest.java (rev 0) +++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntimeTest.java 2011-06-29 11:29:45 UTC (rev 32437) @@ -0,0 +1,36 @@ +package org.jboss.tools.forge.core.process; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.Platform; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class ForgeEmbeddedRuntimeTest { + + private String name = null; + private String location = null; + + @Before + public void setUp() throws Exception { + name = "embedded"; + location = FileLocator.getBundleFile(Platform.getBundle("org.jboss.tools.forge.runtime")).getAbsolutePath(); + } + + @After + public void tearDown() { + name = null; + location = null; + } + + @Test + public void testForgeEmbeddedRuntime() { + assertNotNull(ForgeEmbeddedRuntime.INSTANCE); + assertEquals(name, ForgeEmbeddedRuntime.INSTANCE.getName()); + assertEquals(location, ForgeEmbeddedRuntime.INSTANCE.getLocation()); + } + +} Deleted: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeRuntimeTest.java =================================================================== --- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeRuntimeTest.java 2011-06-29 10:48:56 UTC (rev 32436) +++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeRuntimeTest.java 2011-06-29 11:29:45 UTC (rev 32437) @@ -1,27 +0,0 @@ -package org.jboss.tools.forge.core.process; - -import static org.junit.Assert.fail; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class ForgeRuntimeTest { - - private ForgeRuntime forgeRuntime = null; - - @Before - public void setUp() throws Exception { -// forgeRuntime = new ForgeRuntime("test", ) - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testStartStop() { - fail("Not yet implemented"); - } - -}