You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2010/11/06 11:19:15 UTC
svn commit: r1031991 - in
/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell:
ConsoleShell.scala Shell.scala ShellFactory.scala
Author: reto
Date: Sat Nov 6 10:19:15 2010
New Revision: 1031991
URL: http://svn.apache.org/viewvc?rev=1031991&view=rev
Log:
CLEREZZA-353: cleaned imports a bit
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/ConsoleShell.scala
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/Shell.scala
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/ShellFactory.scala
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/ConsoleShell.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/ConsoleShell.scala?rev=1031991&r1=1031990&r2=1031991&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/ConsoleShell.scala (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/ConsoleShell.scala Sat Nov 6 10:19:15 2010
@@ -20,36 +20,13 @@ package org.apache.clerezza.shell;
-import org.apache.felix.scr.annotations.Component;
import org.osgi.framework.BundleContext
-import org.osgi.framework.BundleEvent
-import org.osgi.framework.BundleListener
import org.osgi.service.component.ComponentContext;
import org.osgi.framework.Bundle
-import java.io.{File, PrintWriter, Reader, StringWriter}
-import java.lang.reflect.InvocationTargetException
import java.net._
-import java.security.PrivilegedActionException
-import java.security.AccessController
-import java.security.PrivilegedAction
-import java.util.{ArrayList, Arrays};
-import javax.script.ScriptContext
-import javax.script.{ScriptEngineFactory => JavaxEngineFactory, Compilable,
- CompiledScript, ScriptEngine, AbstractScriptEngine, Bindings,
- SimpleBindings, ScriptException}
-//import scala.collection.immutable.Map
-import scala.actors.DaemonActor
import scala.tools.nsc._;
import scala.tools.nsc.interpreter._;
-import scala.tools.nsc.io.{AbstractFile, PlainFile, VirtualDirectory}
import scala.tools.nsc.util._
-import scala.tools.nsc.symtab.SymbolLoaders
-import scala.tools.nsc.reporters.ConsoleReporter
-import scala.tools.nsc.reporters.ConsoleReporter
-import scala.tools.nsc.reporters.ConsoleReporter
-import scala.tools.nsc.reporters.Reporter
-import scala.tools.util.PathResolver
-import scala.tools.nsc.util.{ClassPath, JavaClassPath}
import scala.actors.Actor
import scala.actors.Actor._
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/Shell.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/Shell.scala?rev=1031991&r1=1031990&r2=1031991&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/Shell.scala (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/Shell.scala Sat Nov 6 10:19:15 2010
@@ -58,18 +58,9 @@ import jline.{ ConsoleReader, ArgumentCo
class Shell(factory: InterpreterFactory, val inStream: InputStream, out: Writer) {
- //var _interpreter : Interpreter = null;
+
private var bundleContext: BundleContext = null
- /*def interpreter = {
- if (_interpreter == null) {
- this.synchronized {
- if (_interpreter == null) {
- _interpreter = factory.createInterpreter(new PrintWriter(System.out, true))
- }
- }
- }
- _interpreter
- }*/
+
val interpreterLoop = new InterpreterLoop(new BufferedReader(new InputStreamReader(System.in)), new PrintWriter(System.out, true)) {
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/ShellFactory.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/ShellFactory.scala?rev=1031991&r1=1031990&r2=1031991&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/ShellFactory.scala (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.shell/src/main/scala/org/apache/clerezza/shell/ShellFactory.scala Sat Nov 6 10:19:15 2010
@@ -20,39 +20,11 @@ package org.apache.clerezza.shell;
-import org.apache.felix.scr.annotations.Component;
-import org.osgi.framework.BundleContext
-import org.osgi.framework.BundleEvent
-import org.osgi.framework.BundleListener
+
import org.osgi.service.component.ComponentContext;
-import org.osgi.framework.Bundle
-import java.io.{File, PrintWriter, Reader, StringWriter, FileDescriptor, OutputStreamWriter}
-import java.lang.reflect.InvocationTargetException
-import java.net._
-import java.security.PrivilegedActionException
-import java.security.AccessController
-import java.security.PrivilegedAction
-import java.util.{ArrayList, Arrays};
-import javax.script.ScriptContext
-import javax.script.{ScriptEngineFactory => JavaxEngineFactory, Compilable,
- CompiledScript, ScriptEngine, AbstractScriptEngine, Bindings,
- SimpleBindings, ScriptException}
-//import scala.collection.immutable.Map
-import scala.actors.DaemonActor
-import scala.tools.nsc._;
-import scala.tools.nsc.interpreter._;
-import scala.tools.nsc.io.{AbstractFile, PlainFile, VirtualDirectory}
-import scala.tools.nsc.util._
-import scala.tools.nsc.symtab.SymbolLoaders
-import scala.tools.nsc.reporters.ConsoleReporter
-import scala.tools.nsc.reporters.ConsoleReporter
-import scala.tools.nsc.reporters.ConsoleReporter
-import scala.tools.nsc.reporters.Reporter
-import scala.tools.util.PathResolver
-import scala.tools.nsc.util.{ClassPath, JavaClassPath}
-import scala.actors.Actor
-import scala.actors.Actor._
-import org.apache.clerezza.scala.scripting._
+
+import java.io.OutputStreamWriter
+import org.apache.clerezza.scala.scripting.InterpreterFactory
class ShellFactory() {