Permalink
Browse files

Some checkstyle rule changes and changes due to checkstyle.

  • Loading branch information...
birchb
birchb committed Mar 16, 2011
1 parent 7716040 commit 0b1f673cae19bce31fb64811ff31da6aa0921cd9
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<fileset-config file-format-version="1.2.0" simple-config="true">
<fileset name="all" enabled="true" check-config-name="Sun Checks" local="false">
<file-match-pattern match-pattern="." include-pattern="true"/>
</fileset>
<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
<fileset name="all" enabled="true" check-config-name="Bill" local="false">
<file-match-pattern match-pattern="." include-pattern="true"/>
</fileset>
<filter name="FilesFromPackage" enabled="true">
<filter-data value="src/com/ostermiller"/>
</filter>
</fileset-config>
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.python.pydev.PyDevBuilder"/>
<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
</launchConfiguration>
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>genyris</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>genyris</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,4 +1,58 @@
#Mon Mar 02 21:56:42 EST 2009
eclipse.preferences.version=1
internal.default.compliance=default
org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
#Wed Mar 16 15:45:18 EST 2011
cleanup.add_default_serial_version_id=true
cleanup.add_generated_serial_version_id=false
cleanup.add_missing_annotations=true
cleanup.add_missing_deprecated_annotations=true
cleanup.add_missing_methods=false
cleanup.add_missing_nls_tags=false
cleanup.add_missing_override_annotations=true
cleanup.add_serial_version_id=false
cleanup.always_use_blocks=true
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
cleanup.convert_to_enhanced_for_loop=false
cleanup.correct_indentation=false
cleanup.format_source_code=false
cleanup.format_source_code_changes_only=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
cleanup.make_type_abstract_if_missing_method=false
cleanup.make_variable_declarations_final=false
cleanup.never_use_blocks=false
cleanup.never_use_parentheses_in_expressions=true
cleanup.organize_imports=true
cleanup.qualify_static_field_accesses_with_declaring_class=false
cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
cleanup.remove_trailing_whitespaces=false
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
cleanup.remove_unnecessary_casts=true
cleanup.remove_unnecessary_nls_tags=true
cleanup.remove_unused_imports=true
cleanup.remove_unused_local_variables=false
cleanup.remove_unused_private_fields=true
cleanup.remove_unused_private_members=false
cleanup.remove_unused_private_methods=true
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
cleanup.use_parentheses_in_expressions=false
cleanup.use_this_for_non_static_field_access=false
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=false
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
cleanup_profile=_eclipse-cs genyris
cleanup_settings_version=2
eclipse.preferences.version=1
formatter_profile=_eclipse-cs genyris
formatter_settings_version=11
internal.default.compliance=default
org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
@@ -1,4 +1,4 @@
<project name="Genyris" default="build-latest" basedir=".">
<project name="Genyris" default="build-workspace" basedir=".">
<!-- -->
<buildnumber/>
<property name="build.id" value="b${build.number}"/>
@@ -12,6 +12,8 @@
<property name="src.dir" value="src" />
<property name="version.dir" value="${src.dir}/org/genyris/load/boot" />
<property file="secrets.properties" />
<taskdef resource="checkstyletask.properties" classpath="${needed.lib.dir}/checkstyle-5.3-all.jar" />
<tstamp>
<format property="TODAY" pattern="dd/MM/yyyy HH:mm:ss" />
@@ -22,7 +24,8 @@
<target name="compile" depends="only-clean, only-init, only-compile" description="Compile the Java" />
<target name="binary" depends="version-default,compile, only-make-jar, only-compile-docs, only-binary" description="create jar and documentation" />
<target name="make-jar" depends="version-default,compile, only-make-jar" description="compile and create jar" />
<target name="build-latest" depends="version-default, binary, test, reports" description="Build current workspace contents."/>
<target name="build-workspace" depends="version-default, binary, test, reports"
description="Build and test current workspace contents."/>
<target name="release" depends="tagged-version, binary, test, reports" description="Build a formal tagged release using the latest tag."/>
@@ -340,7 +343,15 @@
</exec>
</target>
<target name="checkstyle" description="Check Java code Style.">
<mkdir dir="reports" />
<checkstyle config="conf/BillBirchCheck.xml">
<fileset dir="${src.dir}" includes="**/*.java" />
<formatter type="plain"/>
<formatter type="xml" toFile="dist/checkstyle_errors.xml" />
</checkstyle>
</target>
</project>
@@ -1,107 +1,107 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
This configuration file was written by the eclipse-cs plugin configuration editor
-->
<!--
Checkstyle-Configuration: Bill Birch Checks
Description:
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
<!--
This configuration file was written by the eclipse-cs plugin configuration editor
-->
<!--
Checkstyle-Configuration: Bill
Description: none
-->
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
<module name="Checker">
<property name="severity" value="warning"/>
<module name="TreeWalker">
<module name="ConstantName"/>
<module name="LocalFinalVariableName"/>
<module name="LocalVariableName"/>
<module name="MemberName">
<property name="format" value="^_?[a-zA-Z0-9]*$"/>
</module>
<module name="MethodName"/>
<module name="PackageName"/>
<module name="ParameterName"/>
<module name="StaticVariableName"/>
<module name="TypeName"/>
<module name="AvoidStarImport"/>
<module name="IllegalImport"/>
<module name="RedundantImport"/>
<module name="UnusedImports"/>
<module name="ExecutableStatementCount">
<property name="max" value="40"/>
</module>
<module name="FileLength">
<property name="max" value="300"/>
</module>
<module name="MethodLength">
<property name="max" value="50"/>
<property name="countEmpty" value="false"/>
</module>
<module name="AnonInnerLength">
<property name="max" value="10"/>
</module>
<module name="ParameterNumber">
<property name="max" value="10"/>
<property name="tokens" value="CTOR_DEF"/>
</module>
<module name="ParameterNumber">
<property name="tokens" value="METHOD_DEF"/>
</module>
<module name="TabCharacter"/>
<module name="ModifierOrder"/>
<module name="RedundantModifier"/>
<module name="EmptyBlock">
<property name="option" value="text"/>
</module>
<module name="LeftCurly"/>
<module name="NeedBraces"/>
<module name="RightCurly"/>
<module name="AvoidNestedBlocks"/>
<module name="CovariantEquals"/>
<module name="DoubleCheckedLocking"/>
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
<module name="HiddenField">
<property name="ignoreConstructorParameter" value="true"/>
<property name="ignoreSetter" value="true"/>
</module>
<module name="IllegalInstantiation"/>
<module name="MissingSwitchDefault"/>
<module name="ModifiedControlVariable"/>
<module name="RedundantThrows"/>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
<module name="StringLiteralEquality"/>
<module name="NestedIfDepth"/>
<module name="NestedTryDepth"/>
<module name="SuperClone"/>
<module name="IllegalCatch"/>
<module name="IllegalThrows"/>
<module name="JUnitTestCase"/>
<module name="ReturnCount">
<property name="max" value="3"/>
</module>
<module name="ParameterAssignment"/>
<module name="DefaultComesLast"/>
<module name="FallThrough"/>
<module name="VisibilityModifier"/>
<module name="FinalClass"/>
<module name="InterfaceIsType"/>
<module name="HideUtilityClassConstructor"/>
<module name="ClassDataAbstractionCoupling">
<property name="max" value="15"/>
</module>
<module name="ClassFanOutComplexity">
<property name="max" value="30"/>
</module>
<module name="CyclomaticComplexity"/>
<module name="NPathComplexity"/>
<module name="GenericIllegalRegexp">
<property name="format" value="System\.out\.print"/>
</module>
<module name="GenericIllegalRegexp">
<property name="format" value="To change this generated comment edit the template"/>
</module>
<module name="ArrayTypeStyle"/>
<property name="severity" value="warning"/>
<module name="TreeWalker">
<module name="ConstantName"/>
<module name="LocalFinalVariableName"/>
<module name="LocalVariableName"/>
<module name="MemberName">
<property name="format" value="^_?[a-zA-Z0-9]*$"/>
</module>
<module name="MethodName">
<property name="format" value="^[a-zA-Z0-9]*$"/>
</module>
<module name="PackageName"/>
<module name="ParameterName"/>
<module name="StaticVariableName"/>
<module name="TypeName"/>
<module name="AvoidStarImport"/>
<module name="IllegalImport"/>
<module name="RedundantImport"/>
<module name="UnusedImports"/>
<module name="ExecutableStatementCount">
<property name="max" value="40"/>
</module>
<module name="MethodLength">
<property name="max" value="50"/>
<property name="countEmpty" value="false"/>
</module>
<module name="AnonInnerLength">
<property name="max" value="10"/>
</module>
<module name="ParameterNumber">
<property name="max" value="10"/>
<property name="tokens" value="CTOR_DEF"/>
</module>
<module name="ParameterNumber">
<property name="tokens" value="METHOD_DEF"/>
</module>
<module name="ModifierOrder"/>
<module name="RedundantModifier"/>
<module name="EmptyBlock">
<property name="option" value="text"/>
</module>
<module name="LeftCurly"/>
<module name="NeedBraces"/>
<module name="RightCurly"/>
<module name="AvoidNestedBlocks"/>
<module name="CovariantEquals"/>
<module name="DoubleCheckedLocking"/>
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
<module name="HiddenField">
<property name="ignoreConstructorParameter" value="true"/>
<property name="ignoreSetter" value="true"/>
</module>
<module name="IllegalInstantiation"/>
<module name="MissingSwitchDefault"/>
<module name="ModifiedControlVariable"/>
<module name="RedundantThrows"/>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
<module name="StringLiteralEquality"/>
<module name="NestedIfDepth"/>
<module name="NestedTryDepth"/>
<module name="SuperClone"/>
<module name="IllegalCatch"/>
<module name="IllegalThrows"/>
<module name="JUnitTestCase"/>
<module name="ReturnCount">
<property name="max" value="3"/>
</module>
<module name="ParameterAssignment">
<property name="severity" value="ignore"/>
<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
</module>
<module name="DefaultComesLast"/>
<module name="FallThrough"/>
<module name="VisibilityModifier"/>
<module name="FinalClass"/>
<module name="InterfaceIsType"/>
<module name="HideUtilityClassConstructor"/>
<module name="ClassDataAbstractionCoupling">
<property name="max" value="15"/>
</module>
<module name="ClassFanOutComplexity">
<property name="max" value="30"/>
</module>
<module name="CyclomaticComplexity"/>
<module name="NPathComplexity"/>
<module name="ArrayTypeStyle"/>
<module name="MultipleStringLiterals">
<property name="ignoreStringsRegexp" value="^&quot; &quot;$"/>
</module>
<module name="Translation"/>
</module>
<module name="Translation"/>
<module name="FileTabCharacter"/>
<module name="StrictDuplicateCode"/>
</module>
@@ -4,6 +4,10 @@
@prefix sys "http://www.genyris.org/lang/system#"
@prefix u "http://www.genyris.org/lang/utilities#"
def sys:procedure-missing(&rest args)
left
apply System!exec (append ^(cmd /c) args)
# basic version with no error handling
def sys:procedure-missing(&rest args)
left
@@ -27,3 +31,4 @@ def sys:procedure-missing(&rest args)
u:format "%a\n" line
raise (right errors)
Binary file not shown.
@@ -8,7 +8,9 @@
import org.genyris.exception.GenyrisException;
import org.genyris.interp.Environment;
public class GlobalDescriptions {
public final class GlobalDescriptions {
private GlobalDescriptions() {}
public static void updateClassSingleSuper(Environment env, Internable table, Symbol klassname, Symbol superclass) throws GenyrisException {
Graph globalDescriptions = (Graph)env.lookupVariableValue(table.DESCRIPTIONS());
Graph result = globalDescriptions.difference(globalDescriptions.select(klassname, table.TYPE(), null, null, env));
Oops, something went wrong.

0 comments on commit 0b1f673

Please sign in to comment.