merged CVS and Subversion versions

This commit is contained in:
Eugene Zhuravlev
2005-01-13 15:55:28 +03:00
parent 8fc6ab5219
commit b4bbaca0b4
4 changed files with 836 additions and 243 deletions
+10 -38
View File
@@ -1,51 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4" relativePaths="true" type="JAVA_MODULE">
<module version="4" relativePaths="true" type="PLUGIN_MODULE">
<component name="DevKit.ModuleBuildProperties">
<option name="myJarPlugin" value="false" />
<option name="myPluginXMLPath" value="$MODULE_DIR$" />
</component>
<component name="DevKit.ModuleSandboxManager">
<option name="SANDBOX_NAME" value="3117-2" />
</component>
<component name="ModuleRootManager" />
<component name="NewModuleRootManager">
<output url="file://$MODULE_DIR$/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$APPLICATION_HOME_DIR$/lib/jdom.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$APPLICATION_HOME_DIR$/lib/idea.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$APPLICATION_HOME_DIR$/lib/openapi.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="3117-2" level="IDEA_LIB_LAYER" />
<orderEntryProperties />
</component>
</module>
@@ -18,8 +18,17 @@
</component>
<component name="BattleSpaces" />
<component name="CodeStyleSettingsManager">
<option name="PER_PROJECT_SETTINGS" />
<option name="USE_PER_PROJECT_SETTINGS" value="false" />
<option name="PER_PROJECT_SETTINGS">
<value>
<option name="GENERATE_FINAL_LOCALS" value="true" />
<option name="USE_FQ_CLASS_NAMES_IN_JAVADOC" value="false" />
<option name="IF_BRACE_FORCE" value="3" />
<option name="DOWHILE_BRACE_FORCE" value="3" />
<option name="WHILE_BRACE_FORCE" value="3" />
<option name="FOR_BRACE_FORCE" value="3" />
</value>
</option>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</component>
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
@@ -27,6 +36,7 @@
<option name="DEPLOY_AFTER_MAKE" value="0" />
<excludeFromCompile>
<directory url="file://$PROJECT_DIR$/test" includeSubdirectories="true" />
<file url="file://$PROJECT_DIR$/src/com/siyeh/ig/confusing/Iterator.java" />
</excludeFromCompile>
<resourceExtensions>
<entry name=".+\.(properties|xml|html|dtd|tld)" />
@@ -197,7 +207,7 @@
<module fileurl="file://$PROJECT_DIR$/InspectionGadgets.iml" filepath="$PROJECT_DIR$/InspectionGadgets.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="java version &quot;1.5.0-beta2&quot;" />
<component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA 3144" />
<component name="RmicSettings">
<option name="IS_EANABLED" value="false" />
<option name="DEBUGGING_INFO" value="true" />
@@ -206,16 +216,17 @@
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
</component>
<component name="com.siyeh.metrics.MetricsReloaded">
<option name="selectedProfile" value="Default" />
<option name="selectedProfile" value="TODOs" />
<option name="autoscroll" value="false" />
<option name="includeTestClasses" value="false" />
<option name="flattenInnerClasses" value="false" />
<option name="cycleTableSpecificationString" value="" />
<option name="cycleTableSpecificationString" value="120,341,82,81,83,83,83,83" />
</component>
<component name="libraryTable" />
<component name="uidesigner-configuration">
<option name="INSTRUMENT_CLASSES" value="true" />
<option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
</component>
<UsedPathMacros />
</project>
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -3,8 +3,8 @@
<project name="InspectionGadgets" default="compile">
<taskdef name="javac2" classname="com.intellij.uiDesigner.ant.Javac2" classpathref="project.class.path"/>
<property name="src.dir" value="src"/>
<property name="idea.dir" value="c:/IntelliJ-IDEA-3075"/>
<property name="idea.plugin.dir" value="${idea.dir}/plugins"/>
<property name="idea.dir" value="c:/IntelliJ-IDEA-3144"/>
<property name="idea.plugin.dir" value="C:\Documents and Settings\dgriffith\.IntelliJIdea\config\plugins"/>
<property name="debug" value="true"/>
<property name="optimize" value="off"/>
<property name="deprecation" value="off"/>