simono / scala-orp

Merge branch 'scala-2.10'

Simon Olofsson

Simon Olofsson committed on Mar 30, 2013, 10:51 PM

Showing 18 changed files +194 additions -184 deletions

M README.md +1 -1

M intellij/orp.ipr +14 -12

M intellij/project.iml +5 -5

M orp-examples/src/main/scala/orp/casestudies/office.scala +1 -1

M orp-examples/src/main/scala/orp/casestudies/petclinic/Clinic.scala +2 -1

M orp-examples/src/main/scala/orp/casestudies/petclinic/native.scala +1 -1

M orp-examples/src/main/scala/orp/casestudies/petclinic/orp.scala +1 -1

M orp-examples/src/main/scala/orp/examples/RunTests.scala +1 -1

M orp-examples/src/main/scala/orp/examples/from-orp-paper-test.scala +8 -8

M orp-examples/src/main/scala/orp/examples/inside-object-test.scala +4 -4

M orp-examples/src/main/scala/orp/examples/multiple-annotations-test.scala +1 -1

M orp-examples/src/main/scala/orp/examples/multiplicityTest.scala +1 -1

M orp-framework/src/main/scala/orp/api.scala +7 -6

M orp-plugin/src/main/scala/orp/plugin/components/OrpComponent.scala +99 -95

M orp-plugin/src/main/scala/orp/plugin/components/OrpComponentPlays.scala +1 -1

M orp-plugin/src/main/scala/orp/plugin/components/OrpComponentPlaysFor.scala +26 -24

M orp-plugin/src/main/scala/orp/plugin/components/OrpComponentRelationship.scala +19 -19

M project/Build.scala +2 -2

Browse files at this commit →