Permalink
Browse files

Minor refinements.

  • Loading branch information...
1 parent 9b6fb8a commit f3ae07156929d63444e45f444d297a9bbbd1a5f8 @chicagoscala chicagoscala committed Apr 20, 2011
View
1 .gitignore
@@ -4,3 +4,4 @@ src_managed/
boot/
logs/
*.class
+.scala_dependencies
View
3 SeductionsOfScala/code-examples/actors/.idea/misc.xml
@@ -23,6 +23,9 @@
<component name="ProjectDetails">
<option value="ActorsExample" name="projectName" />
</component>
+ <component name="ProjectResources">
+ <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
+ </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
View
159 SeductionsOfScala/code-examples/actors/.idea/workspace.xml
@@ -68,10 +68,10 @@
</provider>
</entry>
</file>
- <file leaf-file-name="SynchronousShapesDrawingDriver.scala" pinned="false" current="true" current-in-tab="true">
+ <file leaf-file-name="SynchronousShapesDrawingDriver.scala" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/scala/SynchronousShapesDrawingDriver.scala">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="54" selection-start="865" selection-end="865" vertical-scroll-proportion="0.7748593">
+ <state line="23" column="55" selection-start="541" selection-end="541" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -86,10 +86,10 @@
</provider>
</entry>
</file>
- <file leaf-file-name="ShapesDrawingActor.scala" pinned="false" current="false" current-in-tab="false">
+ <file leaf-file-name="ShapesDrawingActor.scala" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/scala/ShapesDrawingActor.scala">
<provider selected="true" editor-type-id="text-editor">
- <state line="4" column="12" selection-start="49" selection-end="49" vertical-scroll-proportion="0.0">
+ <state line="11" column="16" selection-start="233" selection-end="233" vertical-scroll-proportion="0.78571427">
<folding />
</state>
</provider>
@@ -123,6 +123,7 @@
<option value="$PROJECT_DIR$/src/main/scala/ShapesDrawingDriver.scala" />
<option value="$PROJECT_DIR$/project/build/ActorExample.scala" />
<option value="$PROJECT_DIR$/src/main/scala/SynchronousShapesDrawingDriver.scala" />
+ <option value="$PROJECT_DIR$/src/main/scala/ShapesDrawingActor.scala" />
</list>
</option>
</component>
@@ -156,6 +157,9 @@
<sortByType />
</navigator>
<panes>
+ <pane id="Favorites" />
+ <pane id="Scope" />
+ <pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -195,88 +199,6 @@
<option name="myItemId" value="scala" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="SynchronousShapesDrawingDriver.scala" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.ClassesTreeStructureProvider$PsiClassOwnerTreeNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="actors" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="actors" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="scala" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="ShapesDrawingDriver.scala" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.ClassesTreeStructureProvider$PsiClassOwnerTreeNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="actors" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="actors" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="scala" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="ShapesDrawingActor.scala" />
- <option name="myItemType" value="org.jetbrains.plugins.scala.components.ScalaDefsProjectViewProvider$MyClassOwnerTreeNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="actors" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="actors" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="scala" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="shapes.scala" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.ClassesTreeStructureProvider$PsiClassOwnerTreeNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -330,17 +252,18 @@
</PATH>
</subPane>
</pane>
- <pane id="PackagesPane" />
- <pane id="Scope" />
- <pane id="Favorites" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="GoToFile.includeJavaFiles" value="false" />
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
+ <property name="options.splitter.main.proportions" value="0.3" />
+ <property name="options.lastSelected" value="preferences.pluginManager" />
<property name="MemberChooser.sorted" value="false" />
<property name="MemberChooser.showClasses" value="true" />
<property name="GoToClass.includeLibraries" value="false" />
+ <property name="options.searchVisible" value="true" />
+ <property name="options.splitter.details.proportions" value="0.2" />
<property name="MemberChooser.copyJavadoc" value="false" />
</component>
<component name="RunManager">
@@ -442,37 +365,39 @@
<option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
<option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
<option name="FORCE_UPDATE" value="false" />
+ <configuration useDefault="true">$USER_HOME$/.subversion_IDEA</configuration>
<myIsUseDefaultProxy>false</myIsUseDefaultProxy>
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
+ <changelist id="c30ac7e8-62e0-4d6c-ae67-22cc2fe893ee" name="Default" comment="" />
<created>1303267042788</created>
<updated>1303267042788</updated>
</task>
<servers />
</component>
<component name="ToolWindowManager">
- <frame x="0" y="22" width="1680" height="958" extended-state="0" />
+ <frame x="0" y="22" width="1280" height="694" extended-state="0" />
<editor active="false" />
<layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3293556" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="SBT Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3293556" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="SBT Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3292683" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.6706444" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24918832" sideWeight="0.6707317" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3293556" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="combo" />
+ <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="VcsManagerConfiguration">
@@ -508,48 +433,54 @@
<breakpoint-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/scala/shapes.scala">
+ <entry file="jar://$PROJECT_DIR$/project/boot/scala-2.7.7/org.scala-tools.sbt/sbt/0.7.4/sbt_2.7.7-0.7.4.jar!/sbt/BasicScalaProject.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="11" selection-start="141" selection-end="141" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="3" column="6" selection-start="214" selection-end="214" vertical-scroll-proportion="0.144" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/scala/ShapesDrawingActor.scala">
+ <entry file="file://$PROJECT_DIR$/src/main/scala/ShapesDrawingDriver.scala">
<provider selected="true" editor-type-id="text-editor">
- <state line="4" column="12" selection-start="49" selection-end="49" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="19" column="0" selection-start="362" selection-end="499" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="jar://$PROJECT_DIR$/project/boot/scala-2.7.7/org.scala-tools.sbt/sbt/0.7.4/sbt_2.7.7-0.7.4.jar!/sbt/BasicScalaProject.class">
+ <entry file="file://$PROJECT_DIR$/project/build/ActorExample.scala">
<provider selected="true" editor-type-id="text-editor">
- <state line="3" column="6" selection-start="214" selection-end="214" vertical-scroll-proportion="0.144">
- <folding />
- </state>
+ <state line="30" column="63" selection-start="1191" selection-end="1221" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/project/build/ActorExample.scala">
+ <entry file="file://$PROJECT_DIR$/src/main/scala/shapes.scala">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="63" selection-start="1191" selection-end="1221" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="7" column="11" selection-start="141" selection-end="141" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/scala/ShapesDrawingDriver.scala">
+ <entry file="file://$PROJECT_DIR$/src/main/scala/SynchronousShapesDrawingDriver.scala">
<provider selected="true" editor-type-id="text-editor">
- <state line="19" column="0" selection-start="362" selection-end="499" vertical-scroll-proportion="0.0">
+ <state line="23" column="55" selection-start="541" selection-end="541" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/scala/SynchronousShapesDrawingDriver.scala">
+ <entry file="file://$PROJECT_DIR$/src/main/scala/ShapesDrawingActor.scala">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="54" selection-start="865" selection-end="865" vertical-scroll-proportion="0.7748593">
+ <state line="11" column="16" selection-start="233" selection-end="233" vertical-scroll-proportion="0.78571427">
<folding />
</state>
</provider>
</entry>
</component>
+ <component name="masterDetails">
+ <states>
+ <state key="Copyright.UI">
+ <settings>
+ <splitter-proportions />
+ </settings>
+ </state>
+ <state key="ScopeChooserConfigurable.UI">
+ <settings>
+ <splitter-proportions />
+ </settings>
+ </state>
+ </states>
+ </component>
</project>
View
3 SeductionsOfScala/code-examples/actors/project/build/ActorExample.scala
@@ -2,7 +2,8 @@ import sbt._
import sbt.CompileOrder._
import de.element34.sbteclipsify._
-class ActorExample(info: ProjectInfo) extends DefaultProject(info) with AkkaProject with IdeaProject with Eclipsify with Exec {
+class ActorExample(info: ProjectInfo) extends DefaultProject(info)
+ with AkkaProject with IdeaProject with Eclipsify with Exec {
lazy val EmbeddedRepo = MavenRepository("Embedded Repo", (info.projectPath / "embedded-repo").asURL.toString)
lazy val LocalMavenRepo = MavenRepository("Local Maven Repo", (Path.userHome / ".m2" / "repository").asURL.toString)
View
2 SeductionsOfScala/code-examples/actors/src/main/resources/akka.conf
@@ -20,7 +20,7 @@
# FQN to the class doing initial active object/actorsupervisor bootstrap, etc.,
# which does its work in the default constructor.
# "AWSE" ==> "AkkaWebSampleExercise"
- boot = ["org.chicagoscala.awse.boot.BootAWSE"]
+ boot = ["org.Boot"]
<actor>
timeout = 1000 # default timeout for future based invocations
View
2 SeductionsOfScala/code-examples/actors/src/main/scala/ShapesDrawingActor.scala
@@ -9,7 +9,7 @@ class ShapeDrawingActor extends Actor {
s.draw()
self.reply("Shape drawn.")
- case "exit" =>
+ case "exit" =>
println("-> exiting...")
self.reply("good bye!")

0 comments on commit f3ae071

Please sign in to comment.