Permalink
Browse files

Updating IntelliJ config to work on 5.0.x branch

  • Loading branch information...
1 parent 7dbb7df commit ae291da5926bae7275a726583783d05406196688 @TheBizzle TheBizzle committed Feb 7, 2013
@@ -8,9 +8,6 @@
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
<value />
</option>
- <ScalaCodeStyleSettings>
- <option name="IMPORTS_MEMBERS_USING_UNDERSCORE" value="false" />
- </ScalaCodeStyleSettings>
<XML>
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
</XML>
View
@@ -21,7 +21,11 @@
<entry name="?*.tld" />
<entry name="?*.ftl" />
</wildcardResourcePatterns>
- <annotationProcessing enabled="false" useClasspath="true" />
+ <annotationProcessing>
+ <profile default="true" name="Default" enabled="false">
+ <processorPath useClasspath="true" />
+ </profile>
+ </annotationProcessing>
</component>
<component name="EclipseCompilerSettings">
<option name="GENERATE_NO_WARNINGS" value="true" />
View
@@ -1,16 +1,69 @@
<component name="libraryTable">
<library name="all">
<CLASSES>
- <root url="file://$PROJECT_DIR$/lib_managed/scala_2.9.2/test" />
- <root url="file://$PROJECT_DIR$/lib_managed/scala_2.9.2/compile" />
- <root url="file://$PROJECT_DIR$/project/boot/scala-2.9.2/lib" />
- <root url="file://$PROJECT_DIR$/lib" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/steveroy/mrjadapter" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/org.scalatest/scalatest_2.9.2" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/org.scalacheck/scalacheck_2.9.2" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/org.scala-tools.testing/test-interface" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/org.picocontainer/picocontainer" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/org.pegdown/pegdown" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/org.parboiled/parboiled-java" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/org.parboiled/parboiled-core" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/org.objenesis/objenesis" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/org.jogl/jogl" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/org.jmock/jmock-legacy" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/org.jmock/jmock-junit4" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/org.jmock/jmock" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/org.jhotdraw/jhotdraw" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/org.hamcrest/hamcrest-library" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/org.hamcrest/hamcrest-core" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/org.gluegen-rt/gluegen-rt" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/junit/junit-dep" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/javax.media/jmf" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/ch.randelshofer/swing-layout" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/ch.randelshofer/quaqua" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/cglib/cglib-nodep" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/asm/asm-util" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/asm/asm-tree" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/asm/asm-analysis" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/asm/asm-all" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/asm/asm" />
+ <root url="file://$PROJECT_DIR$/lib_managed/bundles/log4j/log4j" />
</CLASSES>
<JAVADOC />
- <SOURCES />
- <jarDirectory url="file://$PROJECT_DIR$/lib" recursive="false" />
- <jarDirectory url="file://$PROJECT_DIR$/lib_managed/scala_2.9.2/compile" recursive="false" />
- <jarDirectory url="file://$PROJECT_DIR$/lib_managed/scala_2.9.2/test" recursive="false" />
- <jarDirectory url="file://$PROJECT_DIR$/project/boot/scala-2.9.2/lib" recursive="false" />
+ <SOURCES>
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/org.hamcrest/hamcrest-library" />
+ <root url="file://$PROJECT_DIR$/lib_managed/jars/org.hamcrest/hamcrest-core" />
+ </SOURCES>
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/bundles/log4j/log4j" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/asm/asm" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/asm/asm-all" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/asm/asm-analysis" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/asm/asm-tree" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/asm/asm-util" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/cglib/cglib-nodep" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/ch.randelshofer/quaqua" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/ch.randelshofer/swing-layout" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/javax.media/jmf" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/junit/junit-dep" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/org.gluegen-rt/gluegen-rt" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/org.hamcrest/hamcrest-core" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/org.hamcrest/hamcrest-library" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/org.jhotdraw/jhotdraw" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/org.jmock/jmock" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/org.jmock/jmock-junit4" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/org.jmock/jmock-legacy" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/org.jogl/jogl" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/org.objenesis/objenesis" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/org.parboiled/parboiled-core" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/org.parboiled/parboiled-java" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/org.pegdown/pegdown" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/org.picocontainer/picocontainer" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/org.scala-tools.testing/test-interface" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/org.scalacheck/scalacheck_2.9.2" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/org.scalatest/scalatest_2.9.2" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/steveroy/mrjadapter" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/org.hamcrest/hamcrest-core" recursive="false" type="SOURCES" />
+ <jarDirectory url="file://$PROJECT_DIR$/lib_managed/jars/org.hamcrest/hamcrest-library" recursive="false" type="SOURCES" />
</library>
</component>
View
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
+ <component name="IdProvider" IDEtalkID="646DA3A331C20A984697A72AC0836D89" />
<component name="JavadocGenerationManager">
<option name="OUTPUT_DIRECTORY" />
<option name="OPTION_SCOPE" value="protected" />
@@ -17,35 +18,13 @@
<option name="LOCALE" />
<option name="OPEN_IN_BROWSER" value="true" />
</component>
- <component name="NullableNotNullManager">
- <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
- <option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" />
- <option name="myNullables">
- <value>
- <list size="3">
- <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
- <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
- <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
- </list>
- </value>
- </option>
- <option name="myNotNulls">
- <value>
- <list size="3">
- <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
- <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
- <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
- </list>
- </value>
- </option>
- </component>
<component name="ProjectDetails">
<option name="projectName" value="NetLogo" />
</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_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6 (Oracle)" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
@@ -1,5 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="App 3D" type="Application" factoryName="Application">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="org.nlogo.app.App" />
<option name="VM_PARAMETERS" value="-Duser.language=en -Duser.region=US -Dorg.nlogo.is3d=true -Dorg.nlogo.noGenerator=true -Dfile.encoding=UTF-8" />
<option name="PROGRAM_PARAMETERS" value="" />
@@ -1,5 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="App English" type="Application" factoryName="Application">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="org.nlogo.app.App" />
<option name="VM_PARAMETERS" value="-Duser.language=en -Duser.region=US -Dorg.nlogo.noGenerator=true -Dfile.encoding=UTF-8" />
<option name="PROGRAM_PARAMETERS" value="" />
@@ -11,13 +12,19 @@
<option name="PASS_PARENT_ENVS" value="true" />
<module name="NetLogo" />
<envs />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="true" />
+ </RunnerSettings>
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="59252" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
+ <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
@@ -1,5 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="App Spanish" type="Application" factoryName="Application">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="org.nlogo.app.App" />
<option name="VM_PARAMETERS" value="-Duser.language=es -Duser.region=ES -Dfile.encoding=UTF-8" />
<option name="PROGRAM_PARAMETERS" value="" />
@@ -1,5 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="HubNet Client" type="Application" factoryName="Application">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="org.nlogo.hubnet.client.App" />
<option name="VM_PARAMETERS" value="-Dfile.encoding=UTF-8" />
<option name="PROGRAM_PARAMETERS" value="" />
View
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ScalacSettings">
- <option name="COMPILER_LIBRARY_NAME" value="all" />
- <option name="COMPILER_LIBRARY_LEVEL" value="Project" />
+ <option name="COMPILER_LIBRARY_NAME" value="Scala 2.9.2" />
+ <option name="COMPILER_LIBRARY_LEVEL" value="Global" />
</component>
</project>
View
@@ -3,14 +3,16 @@
<component name="FacetManager">
<facet type="scala" name="Scala">
<configuration>
- <option name="compilerLibraryLevel" value="Project" />
- <option name="compilerLibraryName" value="all" />
- <option name="compilerOptions" value="-unchecked -Xfatal-warnings -encoding us-ascii -Xcheckinit -deprecation" />
+ <option name="compilerLibraryLevel" value="Global" />
+ <option name="compilerLibraryName" value="Scala 2.9.2" />
+ <option name="compilerOptions" value="-deprecation -unchecked -Xfatal-warnings -Xcheckinit -encoding us-ascii" />
<option name="fsc" value="true" />
+ <option name="languageLevel" value="Scala 2.9" />
+ <option name="maximumHeapSize" value="1024" />
</configuration>
</facet>
</component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/out/production" />
<output-test url="file://$MODULE_DIR$/out/test" />
<exclude-output />
@@ -28,8 +30,27 @@
<excludeFolder url="file://$MODULE_DIR$/project/build/target" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
- <orderEntry type="inheritedJdk" />
+ <orderEntry type="jdk" jdkName="1.6 (Oracle)" jdkType="JavaSDK" />
+ <orderEntry type="library" name="Scala 2.9.2" level="application" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="file://$MODULE_DIR$/target/resource_managed" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="file://$MODULE_DIR$/dist/i18n" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>

0 comments on commit ae291da

Please sign in to comment.