[sword-svn] r94 - in trunk: . .settings app/src/org/crosswire/common/swing app/src/org/crosswire/flashcards app/src/org/crosswire/modedit
Apache
apache at www.crosswire.org
Sun Nov 26 05:47:47 MST 2006
Author:
Date: 2006-11-26 05:47:47 -0700 (Sun, 26 Nov 2006)
New Revision: 94
Modified:
trunk/.classpath
trunk/.settings/org.eclipse.jdt.core.prefs
trunk/app/src/org/crosswire/common/swing/RowTable.java
trunk/app/src/org/crosswire/common/swing/RowTableModel.java
trunk/app/src/org/crosswire/common/swing/SortRenderer.java
trunk/app/src/org/crosswire/flashcards/EditPane.java
trunk/app/src/org/crosswire/flashcards/EditorFrame.java
trunk/app/src/org/crosswire/flashcards/EditorFrame_AboutBox.java
trunk/app/src/org/crosswire/flashcards/FlashCardColumns.java
trunk/app/src/org/crosswire/flashcards/FlashCardEditor.java
trunk/app/src/org/crosswire/flashcards/FlashCardEvent.java
trunk/app/src/org/crosswire/flashcards/FlashCardPane.java
trunk/app/src/org/crosswire/flashcards/LessonChangeEvent.java
trunk/app/src/org/crosswire/flashcards/LessonManager.java
trunk/app/src/org/crosswire/flashcards/LessonPane.java
trunk/app/src/org/crosswire/flashcards/LessonSet.java
trunk/app/src/org/crosswire/flashcards/LessonSetPane.java
trunk/app/src/org/crosswire/flashcards/MainFrame.java
trunk/app/src/org/crosswire/flashcards/MainFrame_AboutBox.java
trunk/app/src/org/crosswire/flashcards/MainMenu.java
trunk/app/src/org/crosswire/flashcards/OpenFile.java
trunk/app/src/org/crosswire/flashcards/QuizPane.java
trunk/app/src/org/crosswire/flashcards/SetupPane.java
trunk/app/src/org/crosswire/modedit/UniTextEdit.java
Log:
Updated Eclipse preferences
Added missing serialVersionUID to quite the compiler
Made some fields protected to eliminate synthetic accessors.
Did better null checking.
Removed unnecessary imports and casts.
Modified: trunk/.classpath
===================================================================
--- trunk/.classpath 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/.classpath 2006-11-26 12:47:47 UTC (rev 94)
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="app/src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="D:/Java/jars/icu4j/icu4j_3_0.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="app/src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/.settings/org.eclipse.jdt.core.prefs 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/.settings/org.eclipse.jdt.core.prefs 2006-11-26 12:47:47 UTC (rev 94)
@@ -1,61 +1,338 @@
-#Mon Sep 20 16:46:35 EDT 2004
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.source=1.4
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=default
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=default
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+#Sun Nov 26 07:18:49 EST 2006
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=default
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=default
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=
+org.eclipse.jdt.core.compiler.taskTags=
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=true
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=18
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=18
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=18
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=18
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=18
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=18
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=50
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=18
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=18
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=18
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=18
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=18
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=80
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=0
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines=true
+org.eclipse.jdt.core.formatter.comment.format_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=4
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=4
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=160
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
Modified: trunk/app/src/org/crosswire/common/swing/RowTable.java
===================================================================
--- trunk/app/src/org/crosswire/common/swing/RowTable.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/common/swing/RowTable.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -42,6 +42,10 @@
*/
public class RowTable extends JTable
{
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 4343292788655616441L;
/**
* Field ONE_STANDARD_CHARACTER
*/
Modified: trunk/app/src/org/crosswire/common/swing/RowTableModel.java
===================================================================
--- trunk/app/src/org/crosswire/common/swing/RowTableModel.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/common/swing/RowTableModel.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -33,6 +33,11 @@
public class RowTableModel extends AbstractTableModel
{
/**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 4243175203443082117L;
+
+ /**
* Field list contains the objects that can be worked upon
*/
private List list;
Modified: trunk/app/src/org/crosswire/common/swing/SortRenderer.java
===================================================================
--- trunk/app/src/org/crosswire/common/swing/SortRenderer.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/common/swing/SortRenderer.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -37,7 +37,11 @@
*/
public class SortRenderer extends DefaultTableCellRenderer {
- /**
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 7280299308536170406L;
+ /**
* Field pressedColumn
*/
private TableColumn pressedColumn;
Modified: trunk/app/src/org/crosswire/flashcards/EditPane.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/EditPane.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/flashcards/EditPane.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -43,6 +43,11 @@
*/
public class EditPane extends JPanel
{
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 8637424690635575114L;
+
//Construct the frame
public EditPane()
{
Modified: trunk/app/src/org/crosswire/flashcards/EditorFrame.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/EditorFrame.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/flashcards/EditorFrame.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -106,6 +106,11 @@
UniTextEdit wordText = new UniTextEdit();
private boolean standAlone;
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = -1544644199693526132L;
+
static class WordEntry {
public WordEntry(String word) { this.word = word; }
public WordEntry(String word, String answers) { this(word); this.answers = answers; }
Modified: trunk/app/src/org/crosswire/flashcards/EditorFrame_AboutBox.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/EditorFrame_AboutBox.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/flashcards/EditorFrame_AboutBox.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -62,6 +62,12 @@
String version = "1.0";
String copyright = "Copyright (c) 2003";
String comments = "";
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = -374098587942625556L;
+
public EditorFrame_AboutBox(Frame parent) {
super(parent);
enableEvents(AWTEvent.WINDOW_EVENT_MASK);
Modified: trunk/app/src/org/crosswire/flashcards/FlashCardColumns.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/FlashCardColumns.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/flashcards/FlashCardColumns.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -29,6 +29,11 @@
public class FlashCardColumns extends RowColumns
{
/**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = -6175919819882232731L;
+
+ /**
* Field HEADERS
* The names of the table column headers.
*/
Modified: trunk/app/src/org/crosswire/flashcards/FlashCardEditor.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/FlashCardEditor.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/flashcards/FlashCardEditor.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -46,6 +46,11 @@
// Attributes
//
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = -4278635534357530483L;
+
private JPanel answerPanel = new JPanel();
private JTextField answers = new JTextField();
private UniTextEdit wordText = new UniTextEdit();
@@ -133,9 +138,10 @@
public void setFlashCard(FlashCard newFlashCard)
{
- boolean selected = newFlashCard != null;
- if (selected)
+ boolean selected = false;
+ if (newFlashCard != null)
{
+ selected = true;
try
{
flashCard = (FlashCard) newFlashCard.clone();
Modified: trunk/app/src/org/crosswire/flashcards/FlashCardEvent.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/FlashCardEvent.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/flashcards/FlashCardEvent.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -34,6 +34,11 @@
public static final int MODIFIED = 1;
public static final int DELETED = 2;
/**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = -5013093593239579380L;
+
+ /**
* @param source
*/
public FlashCardEvent(Object source, FlashCard aFlashCard, int anAction)
Modified: trunk/app/src/org/crosswire/flashcards/FlashCardPane.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/FlashCardPane.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/flashcards/FlashCardPane.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -21,21 +21,13 @@
package org.crosswire.flashcards;
import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.Iterator;
-import javax.swing.BorderFactory;
-import javax.swing.JList;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.ListSelectionModel;
import javax.swing.event.EventListenerList;
-import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import org.crosswire.common.swing.RowTable;
@@ -48,6 +40,10 @@
*/
public class FlashCardPane extends JPanel implements FlashCardEventListener
{
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 5685660811196521485L;
private RowTable wordList = new RowTable(new ArrayList(), new FlashCardColumns());
private Lesson lesson;
Modified: trunk/app/src/org/crosswire/flashcards/LessonChangeEvent.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/LessonChangeEvent.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/flashcards/LessonChangeEvent.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -32,6 +32,11 @@
{
/**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 6186012752083856266L;
+
+ /**
* @param source
*/
public LessonChangeEvent(Object source)
Modified: trunk/app/src/org/crosswire/flashcards/LessonManager.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/LessonManager.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/flashcards/LessonManager.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -20,6 +20,10 @@
package org.crosswire.flashcards;
import java.io.File;
+import java.io.FilenameFilter;
+import java.net.JarURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.Iterator;
@@ -27,11 +31,6 @@
import java.util.TreeSet;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
-import java.io.FilenameFilter;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.JarURLConnection;
-import javax.swing.JOptionPane;
/**
@@ -174,9 +173,9 @@
* Load lesson sets from the jar file
*/
private void loadLessonSetsFromJarDir(String path) {
- File dir = new File(path);
- if (dir.isDirectory()) {
- File[] files = dir.listFiles(new FilenameFilter() {
+ File lessonDir = new File(path);
+ if (lessonDir.isDirectory()) {
+ File[] files = lessonDir.listFiles(new FilenameFilter() {
public boolean accept(File dir, String name) {
return name.toUpperCase().endsWith(".JAR");
}
Modified: trunk/app/src/org/crosswire/flashcards/LessonPane.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/LessonPane.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/flashcards/LessonPane.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -35,7 +35,6 @@
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.event.EventListenerList;
-import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
/**
@@ -45,6 +44,10 @@
*/
public class LessonPane extends JPanel
{
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = -4950398737983745837L;
private JList lessonList = new JList(new DefaultListModel());
private LessonSet lessonSet;
Modified: trunk/app/src/org/crosswire/flashcards/LessonSet.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/LessonSet.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/flashcards/LessonSet.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -20,7 +20,7 @@
package org.crosswire.flashcards;
import java.io.File;
-import java.io.IOException;
+import java.io.FilenameFilter;
import java.net.JarURLConnection;
import java.net.URL;
import java.net.URLConnection;
@@ -28,12 +28,10 @@
import java.util.Arrays;
import java.util.Enumeration;
import java.util.Iterator;
-import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
-import java.io.FilenameFilter;
/**
@@ -99,9 +97,6 @@
URLConnection connection = null;
try {
lessonsURL = new URL(url);
- if (lessonsURL == null) {
- return;
- }
connection = lessonsURL.openConnection();
}
catch (Exception e1) {
@@ -112,7 +107,9 @@
loadJarLessonSet(jarConnection);
}
else {
- loadDirectoryLessonSet(new File(lessonsURL.getFile()));
+ if (lessonsURL != null) {
+ loadDirectoryLessonSet(new File(lessonsURL.getFile()));
+ }
}
}
@@ -285,11 +282,11 @@
}
- public Lesson getLesson(String description) {
+ public Lesson getLesson(String desc) {
Iterator i = iterator();
while (i.hasNext()) {
Lesson ls = (Lesson) i.next();
- if (description.equals(ls.getDescription())) {
+ if (desc.equals(ls.getDescription())) {
return ls;
}
}
Modified: trunk/app/src/org/crosswire/flashcards/LessonSetPane.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/LessonSetPane.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/flashcards/LessonSetPane.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -46,6 +46,10 @@
*/
public class LessonSetPane extends JPanel
{
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = -5348157756345036495L;
private JList lessonSetList = new JList(new DefaultListModel());
private boolean editable;
Modified: trunk/app/src/org/crosswire/flashcards/MainFrame.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/MainFrame.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/flashcards/MainFrame.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -39,6 +39,11 @@
*/
public class MainFrame extends JFrame
{
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 8755537121252831657L;
+
private SetupPane setupPane;
private QuizPane testPane;
private EditPane editPane;
Modified: trunk/app/src/org/crosswire/flashcards/MainFrame_AboutBox.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/MainFrame_AboutBox.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/flashcards/MainFrame_AboutBox.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -58,6 +58,12 @@
String version = "1.0";
String copyright = "Copyright (c) 2003";
String comments = "";
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = -1881423157232194440L;
+
public MainFrame_AboutBox(Frame parent) {
super(parent);
enableEvents(AWTEvent.WINDOW_EVENT_MASK);
Modified: trunk/app/src/org/crosswire/flashcards/MainMenu.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/MainMenu.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/flashcards/MainMenu.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -46,8 +46,12 @@
// Attributes
//
- private JFrame frame;
- private JRadioButtonMenuItem trace, inform, warn, error;
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 8985550639988241474L;
+ protected JFrame frame;
+ protected JRadioButtonMenuItem trace, inform, warn, error;
//
// Methods
@@ -122,6 +126,11 @@
// ---------------
class DebugAction extends AbstractAction {
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3017480579590120226L;
+
public void actionPerformed( ActionEvent event ) {
Debug.trace( this.toString( ), "Beginning\n" );
@@ -159,6 +168,11 @@
// ---------------
class ExitAction extends AbstractAction {
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = -4617551302933053860L;
+
public ExitAction( ) { super( ); }
public void actionPerformed( ActionEvent event ) {
@@ -174,6 +188,11 @@
// ---------------
class AboutAction extends AbstractAction {
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 2317132982826962267L;
+
public void actionPerformed( ActionEvent event ) {
String aboutString = new String( "FlashCards\n" +
Modified: trunk/app/src/org/crosswire/flashcards/OpenFile.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/OpenFile.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/flashcards/OpenFile.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -28,9 +28,14 @@
import javax.swing.JPanel;
public class OpenFile extends JDialog {
+
JPanel panel1 = new JPanel();
BorderLayout borderLayout1 = new BorderLayout();
JFileChooser jFileChooser1 = new JFileChooser();
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 8979475366924598387L;
public OpenFile(Frame frame, String title, boolean modal) {
super(frame, title, modal);
Modified: trunk/app/src/org/crosswire/flashcards/QuizPane.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/QuizPane.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/flashcards/QuizPane.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -51,6 +51,10 @@
private static final int NUM_COLUMNS = 2;
// NUM_ANSWERS should be a multiple of NUM_COLUMNS.
private static final int NUM_ANSWERS = 10;
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 8613458092624929167L;
SetupPane setupPane;
Vector words = new Vector();
@@ -75,7 +79,7 @@
static class WordEntry {
public String back;
- private FlashCard flashCard;
+ protected FlashCard flashCard;
public int attempts;
@@ -320,7 +324,7 @@
void updateStats() {
int percent = 100;
if (totalAsked > 0) {
- percent = (int) ( ( ( (float) (totalAsked - totalWrong)) / (float) totalAsked) * (float) 100);
+ percent = (int) ( ( ( (float) (totalAsked - totalWrong)) / (float) totalAsked) * 100);
}
wCount.setText(Integer.toString(notLearned.size()) + " | " + Integer.toString(totalAsked - totalWrong) + "/" +
Integer.toString(totalAsked) + " (" + Integer.toString(percent) + "%)");
Modified: trunk/app/src/org/crosswire/flashcards/SetupPane.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/SetupPane.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/flashcards/SetupPane.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -41,7 +41,11 @@
*/
public class SetupPane extends JPanel
{
- private LessonPane lessonPanel = new LessonPane();
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 1L;
+ protected LessonPane lessonPanel = new LessonPane();
private LessonSetPane lessonSetPanel = new LessonSetPane();
private JCheckBox flipped = new JCheckBox("Flip the Flash Cards");
private JCheckBox noMultipleChoice = new JCheckBox("No Multiple Choice");
Modified: trunk/app/src/org/crosswire/modedit/UniTextEdit.java
===================================================================
--- trunk/app/src/org/crosswire/modedit/UniTextEdit.java 2006-11-26 11:56:45 UTC (rev 93)
+++ trunk/app/src/org/crosswire/modedit/UniTextEdit.java 2006-11-26 12:47:47 UTC (rev 94)
@@ -81,6 +81,10 @@
JMenuItem jMenuItem4 = new JMenuItem();
JMenuItem jMenuItem5 = new JMenuItem();
BorderLayout borderLayout6 = new BorderLayout();
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 8632340739785278662L;
/**Construct the frame*/
public UniTextEdit() {
@@ -255,7 +259,7 @@
}
void fontSizer_stateChanged(ChangeEvent e) {
- setFontSize((float)fontSizer.getValue());
+ setFontSize(fontSizer.getValue());
}
void imComboBox_itemStateChanged(ItemEvent e) {
More information about the sword-cvs
mailing list