svn commit: r692671 - /tuscany/java/sca/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java

[jsdelfino]

Author: jsdelfino
Date: Sat Sep  6 08:52:15 2008
New Revision: 692671

URL: http://svn.apache.org/viewvc?rev=692671&view=rev
Log:
Minor code simplification.

Modified:
    
tuscany/java/sca/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java

Modified: 
tuscany/java/sca/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java?rev=692671&r1=692670&r2=692671&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
 (original)
+++ 
tuscany/java/sca/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
 Sat Sep  6 08:52:15 2008
@@ -76,7 +76,14 @@
 
     public BundleContext start() {
         try {
-            return startup();
+            Map<Object, Object> props = new HashMap<Object, Object>();
+            props.put("org.osgi.framework.system.packages", systemPackages);
+            props.put(EclipseStarter.PROP_CLEAN, "true");
+            props.put(LocationManager.PROP_INSTANCE_AREA, new 
File("target/workspace").toURI().toString());
+            props.put(LocationManager.PROP_INSTALL_AREA, new 
File("target/eclipse").toURI().toString());
+            EclipseStarter.setInitialProperties(props);
+            BundleContext context = EclipseStarter.startup(new String[]{}, 
null);
+            return context;
         } catch (Exception e) {
             throw new IllegalStateException(e);
         }
@@ -84,26 +91,10 @@
 
     public void stop() {
         try {
-            shutdown();
+            EclipseStarter.shutdown();
         } catch (Exception e) {
             throw new IllegalStateException(e);
         }
     }
 
-    private BundleContext startup() throws Exception {
-        String args[] = {};
-        Map<Object, Object> props = new HashMap<Object, Object>();
-        props.put("org.osgi.framework.system.packages", systemPackages);
-        props.put(EclipseStarter.PROP_CLEAN, "true");
-        props.put(LocationManager.PROP_INSTANCE_AREA, new 
File("target/workspace").toURI().toString());
-        props.put(LocationManager.PROP_INSTALL_AREA, new 
File("target/eclipse").toURI().toString());
-        EclipseStarter.setInitialProperties(props);
-        BundleContext context = EclipseStarter.startup(args, null);
-        return context;
-    }
-
-    private void shutdown() throws Exception {
-        EclipseStarter.shutdown();
-    }
-
 }