From 44c60018da2e1e14ec6b2d0b0f2b01a71df104fc Mon Sep 17 00:00:00 2001 From: Mike Rennie Date: Tue, 16 Jul 2013 11:57:17 -0500 Subject: Bug 413095 - Clean up deprecation and code warnings --- .../.settings/org.eclipse.jdt.core.prefs | 532 ++++++++++++++++----- .../.settings/org.eclipse.jdt.ui.prefs | 109 +++++ .../META-INF/MANIFEST.MF | 2 +- .../debug/examples/pdavm/PDAVirtualMachine.java | 417 ++++++++-------- org.eclipse.debug.examples.core/pom.xml | 2 +- .../examples/core/midi/launcher/ClockControl.java | 6 +- .../examples/core/midi/launcher/LengthControl.java | 4 +- .../core/midi/launcher/MidiLaunchDelegate.java | 53 +- .../examples/core/midi/launcher/TempoControl.java | 6 +- .../debug/examples/core/pda/DebugCorePlugin.java | 14 +- .../core/pda/breakpoints/PDALineBreakpoint.java | 8 +- .../pda/breakpoints/PDARunToLineBreakpoint.java | 4 +- .../core/pda/breakpoints/PDAWatchpoint.java | 20 +- .../core/pda/launcher/PDALaunchDelegate.java | 28 +- .../debug/examples/core/pda/model/PDAArray.java | 4 +- .../examples/core/pda/model/PDAArrayEntry.java | 6 +- .../examples/core/pda/model/PDADebugTarget.java | 33 +- .../debug/examples/core/pda/model/PDAThread.java | 20 +- .../debug/examples/core/pda/model/PDAValue.java | 8 +- .../debug/examples/core/pda/model/PDAVariable.java | 4 +- .../core/pda/model/WordStructureDelegate.java | 4 +- .../core/pda/protocol/PDABitFieldData.java | 5 +- .../core/pda/protocol/PDAChildrenCommand.java | 5 +- .../pda/protocol/PDAClearBreakpointCommand.java | 5 +- .../examples/core/pda/protocol/PDADataCommand.java | 5 +- .../core/pda/protocol/PDADropFrameCommand.java | 5 +- .../examples/core/pda/protocol/PDAEvalCommand.java | 5 +- .../core/pda/protocol/PDAEvalResultEvent.java | 5 +- .../core/pda/protocol/PDAEventStopCommand.java | 9 +- .../examples/core/pda/protocol/PDAExitedEvent.java | 5 +- .../core/pda/protocol/PDAFrameCommand.java | 5 +- .../examples/core/pda/protocol/PDAFrameData.java | 5 +- .../core/pda/protocol/PDAGroupsCommand.java | 5 +- .../examples/core/pda/protocol/PDAListResult.java | 5 +- .../core/pda/protocol/PDANoSuchLabelEvent.java | 9 +- .../core/pda/protocol/PDAPopDataCommand.java | 5 +- .../core/pda/protocol/PDAPushDataCommand.java | 5 +- .../core/pda/protocol/PDARegisterData.java | 6 +- .../core/pda/protocol/PDARegistersCommand.java | 5 +- .../pda/protocol/PDARegistersCommandResult.java | 5 +- .../core/pda/protocol/PDARegistersEvent.java | 5 +- .../core/pda/protocol/PDARestartCommand.java | 5 +- .../core/pda/protocol/PDAResumeCommand.java | 5 +- .../core/pda/protocol/PDAResumedEvent.java | 5 +- .../core/pda/protocol/PDARunControlEvent.java | 9 +- .../core/pda/protocol/PDASetBreakpointCommand.java | 9 +- .../core/pda/protocol/PDASetDataCommand.java | 5 +- .../core/pda/protocol/PDASetVarCommand.java | 5 +- .../core/pda/protocol/PDAStackCommand.java | 5 +- .../core/pda/protocol/PDAStackCommandResult.java | 5 +- .../core/pda/protocol/PDAStackDepthCommand.java | 5 +- .../core/pda/protocol/PDAStartedEvent.java | 5 +- .../examples/core/pda/protocol/PDAStepCommand.java | 5 +- .../core/pda/protocol/PDAStepReturnCommand.java | 5 +- .../core/pda/protocol/PDASuspendCommand.java | 5 +- .../core/pda/protocol/PDASuspendedEvent.java | 5 +- .../core/pda/protocol/PDATerminateCommand.java | 5 +- .../core/pda/protocol/PDATerminatedEvent.java | 5 +- .../protocol/PDAUnimplementedInstructionEvent.java | 9 +- .../core/pda/protocol/PDAVMResumeCommand.java | 5 +- .../core/pda/protocol/PDAVMResumedEvent.java | 5 +- .../core/pda/protocol/PDAVMStartedEvent.java | 5 +- .../core/pda/protocol/PDAVMSuspendCommand.java | 5 +- .../core/pda/protocol/PDAVMSuspendedEvent.java | 5 +- .../core/pda/protocol/PDAVMTerminatedEvent.java | 4 +- .../examples/core/pda/protocol/PDAVarCommand.java | 5 +- .../core/pda/protocol/PDAWatchCommand.java | 5 +- .../debug/examples/ant/tasks/PreProcessor.java | 193 ++++---- 68 files changed, 1108 insertions(+), 619 deletions(-) create mode 100644 org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.ui.prefs (limited to 'org.eclipse.debug.examples.core') diff --git a/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.core.prefs index e3662aa86..5d7a22fe3 100644 --- a/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.core.prefs @@ -1,123 +1,409 @@ -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.recreateModifiedClassFileInOutputFolder=ignore -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.classpath.outputOverlappingAnotherSource=error -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -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=warning -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=warning -org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled -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.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -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.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=error -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=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=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=error -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 -org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled -org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH -org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error +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.recreateModifiedClassFileInOutputFolder=ignore +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.classpath.outputOverlappingAnotherSource=error +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +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=warning +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=warning +org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled +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.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=error +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=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=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=error +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=warning +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled +org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH +org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=0 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=32 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=0 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=0 +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=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_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_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=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.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +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=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not 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=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_try=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=do not 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_semicolon_in_try_resources=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=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_try=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_try=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_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not 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_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not 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=do not 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.join_lines_in_comments=true +org.eclipse.jdt.core.formatter.join_wrapped_lines=true +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +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=80 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +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=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true +org.eclipse.jdt.core.incompatibleJDKLevel=ignore +org.eclipse.jdt.core.incompleteClasspath=error diff --git a/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 000000000..13d5dca2c --- /dev/null +++ b/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,109 @@ +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_missing_override_annotations_interface_methods=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=true +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=true +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=_Platform Debug Cleanups +cleanup_settings_version=2 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_Platform Debug Formatting +formatter_settings_version=12 +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=true +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=true +sp_cleanup.make_local_variable_final=false +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=true +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=true +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=false +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=true +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_blocks=true +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF b/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF index dab713cae..d6aa25d24 100644 --- a/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF +++ b/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.debug.examples.core;singleton:=true -Bundle-Version: 1.3.200.qualifier +Bundle-Version: 1.3.300.qualifier Bundle-Activator: org.eclipse.debug.examples.core.pda.DebugCorePlugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, diff --git a/org.eclipse.debug.examples.core/pdavm/src/org/eclipse/debug/examples/pdavm/PDAVirtualMachine.java b/org.eclipse.debug.examples.core/pdavm/src/org/eclipse/debug/examples/pdavm/PDAVirtualMachine.java index 11b4c24c8..06e9d2f36 100644 --- a/org.eclipse.debug.examples.core/pdavm/src/org/eclipse/debug/examples/pdavm/PDAVirtualMachine.java +++ b/org.eclipse.debug.examples.core/pdavm/src/org/eclipse/debug/examples/pdavm/PDAVirtualMachine.java @@ -8,6 +8,7 @@ * Contributors: * Bjorn Freeman-Benson - initial API and implementation * Pawel Piech (Wind River) - ported PDA Virtual Machine to Java (Bug 261400) + * IBM Coporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.pdavm; @@ -56,7 +57,7 @@ public class PDAVirtualMachine { fName = name; } String fName; - String fGroup = ""; + String fGroup = ""; //$NON-NLS-1$ boolean fIsWriteable = true; Map fBitFields = new LinkedHashMap(0); int fValue; @@ -91,7 +92,7 @@ public class PDAVirtualMachine { if (fArgs.length > next) { return fArgs[next++]; } - return ""; + return ""; //$NON-NLS-1$ } int getNextIntArg() { @@ -207,7 +208,7 @@ public class PDAVirtualMachine { } void set(String name, Object value) { - if (name.startsWith("$")) { + if (name.startsWith("$")) { //$NON-NLS-1$ setRegisterValue(name, value); } else { fLocalVariables.put(name, value); @@ -215,7 +216,7 @@ public class PDAVirtualMachine { } Object get(String name) { - if (name.startsWith("$")) { + if (name.startsWith("$")) { //$NON-NLS-1$ return getRegisterValue(name); } else { return fLocalVariables.get(name); @@ -314,8 +315,8 @@ public class PDAVirtualMachine { /** The eventstops table holds which events cause suspends and which do not. */ final Map fEventStops = new HashMap(); { - fEventStops.put("unimpinstr", Boolean.FALSE); - fEventStops.put("nosuchlabel", Boolean.FALSE); + fEventStops.put("unimpinstr", Boolean.FALSE); //$NON-NLS-1$ + fEventStops.put("nosuchlabel", Boolean.FALSE); //$NON-NLS-1$ } /** @@ -333,29 +334,29 @@ public class PDAVirtualMachine { public static void main(String[] args) { String programFile = args.length >= 1 ? args[0] : null; if (programFile == null) { - System.err.println("Error: No program specified"); + System.err.println("Error: No program specified"); //$NON-NLS-1$ return; } - String debugFlag = args.length >= 2 ? args[1] : ""; - boolean debug = "-debug".equals(debugFlag); + String debugFlag = args.length >= 2 ? args[1] : ""; //$NON-NLS-1$ + boolean debug = "-debug".equals(debugFlag); //$NON-NLS-1$ int commandPort = 0; int eventPort = 0; if (debug) { - String commandPortStr = args.length >= 3 ? args[2] : ""; + String commandPortStr = args.length >= 3 ? args[2] : ""; //$NON-NLS-1$ try { commandPort = Integer.parseInt(commandPortStr); } catch (NumberFormatException e) { - System.err.println("Error: Invalid command port"); + System.err.println("Error: Invalid command port"); //$NON-NLS-1$ return; } - String eventPortStr = args.length >= 4 ? args[3] : ""; + String eventPortStr = args.length >= 4 ? args[3] : ""; //$NON-NLS-1$ try { eventPort = Integer.parseInt(eventPortStr); } catch (NumberFormatException e) { - System.err.println("Error: Invalid event port"); + System.err.println("Error: Invalid event port"); //$NON-NLS-1$ return; } } @@ -365,7 +366,7 @@ public class PDAVirtualMachine { pdaVM = new PDAVirtualMachine(programFile, debug, commandPort, eventPort); pdaVM.startDebugger(); } catch (IOException e) { - System.err.println("Error: " + e.toString()); + System.err.println("Error: " + e.toString()); //$NON-NLS-1$ return; } pdaVM.run(); @@ -431,17 +432,17 @@ public class PDAVirtualMachine { fEventStream.write('\n'); fEventStream.flush(); } catch (IOException e) { - System.err.println("Error: " + e); + System.err.println("Error: " + e); //$NON-NLS-1$ System.exit(1); } } else if (error) { - System.err.println("Error: " + event); + System.err.println("Error: " + event); //$NON-NLS-1$ } } void startDebugger() throws IOException { if (fDebug) { - System.out.println("-debug " + fCommandPort + " " + fEventPort); + System.out.println("-debug " + fCommandPort + " " + fEventPort); //$NON-NLS-1$ //$NON-NLS-2$ } ServerSocket commandServerSocket = new ServerSocket(fCommandPort); @@ -455,17 +456,17 @@ public class PDAVirtualMachine { fEventStream = new PrintStream(fEventSocket.getOutputStream()); eventServerSocket.close(); - System.out.println("debug connection accepted"); + System.out.println("debug connection accepted"); //$NON-NLS-1$ - fSuspendVM = "client"; + fSuspendVM = "client"; //$NON-NLS-1$ } void run() { int id = fNextThreadId++; - sendDebugEvent("vmstarted", false); - fThreads.put(new Integer(id), new PDAThread(id, "main", 0)); + sendDebugEvent("vmstarted", false); //$NON-NLS-1$ + fThreads.put(new Integer(id), new PDAThread(id, "main", 0)); //$NON-NLS-1$ if (fDebug) { - sendDebugEvent("started " + id, false); + sendDebugEvent("started " + id, false); //$NON-NLS-1$ } boolean allThreadsSuspended = false; @@ -499,21 +500,21 @@ public class PDAVirtualMachine { // If this thread is in a step-return operation, check // if we've returned from a call. instruction = thread.fThreadCode[thread.fCurrentFrame.fPC]; - if ("return".equals(instruction)) { + if ("return".equals(instruction)) { //$NON-NLS-1$ // Note: this will only be triggered if the current // thread also has the fStepReturn flag set. if (fStepReturnVM) { - fSuspendVM = thread.fID + " step"; + fSuspendVM = thread.fID + " step"; //$NON-NLS-1$ } else { - thread.fSuspend = "step"; + thread.fSuspend = "step"; //$NON-NLS-1$ } } } if (!thread.fRun) { - sendDebugEvent("exited " + thread.fID, false); + sendDebugEvent("exited " + thread.fID, false); //$NON-NLS-1$ fThreads.remove(new Integer(thread.fID)); } else if (thread.fSuspend != null) { - sendDebugEvent("suspended " + thread.fID + " " + thread.fSuspend, false); + sendDebugEvent("suspended " + thread.fID + " " + thread.fSuspend, false); //$NON-NLS-1$ //$NON-NLS-2$ thread.fStep = thread.fStepReturn = thread.fPerformingEval = false; } } @@ -524,7 +525,7 @@ public class PDAVirtualMachine { Thread.yield(); } - sendDebugEvent("vmterminated", false); + sendDebugEvent("vmterminated", false); //$NON-NLS-1$ if (fDebug) { try { fCommandReceiveStream.close(); @@ -533,7 +534,7 @@ public class PDAVirtualMachine { fEventStream.close(); fEventSocket.close(); } catch (IOException e) { - System.out.println("Error: " + e); + System.out.println("Error: " + e); //$NON-NLS-1$ } } @@ -549,38 +550,38 @@ public class PDAVirtualMachine { Args args = new Args( (String[])tokens.toArray(new String[tokens.size()]) ); boolean opValid = true; - if (op.equals("add")) iAdd(thread, args); - else if (op.equals("branch_not_zero")) iBranchNotZero(thread, args); - else if (op.equals("call")) iCall(thread, args); - else if (op.equals("dec")) iDec(thread, args); - else if (op.equals("def")) iDef(thread, args); - else if (op.equals("dup")) iDup(thread, args); - else if (op.equals("exec")) iExec(thread, args); - else if (op.equals("halt")) iHalt(thread, args); - else if (op.equals("output")) iOutput(thread, args); - else if (op.equals("pop")) iPop(thread, args); - else if (op.equals("push")) iPush(thread, args); - else if (op.equals("return")) iReturn(thread, args); - else if (op.equals("var")) iVar(thread, args); - else if (op.equals("xyzzy")) iInternalEndEval(thread, args); - else if (op.startsWith(":")) {} // label - else if (op.startsWith("#")) {} // comment + if (op.equals("add")) iAdd(thread, args); //$NON-NLS-1$ + else if (op.equals("branch_not_zero")) iBranchNotZero(thread, args); //$NON-NLS-1$ + else if (op.equals("call")) iCall(thread, args); //$NON-NLS-1$ + else if (op.equals("dec")) iDec(thread, args); //$NON-NLS-1$ + else if (op.equals("def")) iDef(thread, args); //$NON-NLS-1$ + else if (op.equals("dup")) iDup(thread, args); //$NON-NLS-1$ + else if (op.equals("exec")) iExec(thread, args); //$NON-NLS-1$ + else if (op.equals("halt")) iHalt(thread, args); //$NON-NLS-1$ + else if (op.equals("output")) iOutput(thread, args); //$NON-NLS-1$ + else if (op.equals("pop")) iPop(thread, args); //$NON-NLS-1$ + else if (op.equals("push")) iPush(thread, args); //$NON-NLS-1$ + else if (op.equals("return")) iReturn(thread, args); //$NON-NLS-1$ + else if (op.equals("var")) iVar(thread, args); //$NON-NLS-1$ + else if (op.equals("xyzzy")) iInternalEndEval(thread, args); //$NON-NLS-1$ + else if (op.startsWith(":")) {} // label //$NON-NLS-1$ + else if (op.startsWith("#")) {} // comment //$NON-NLS-1$ else { opValid = false; } if (!opValid) { - sendDebugEvent("unimplemented instruction " + op, true); - if ( ((Boolean)fEventStops.get("unimpinstr")).booleanValue() ) { - fSuspendVM = thread.fID + " event unimpinstr"; + sendDebugEvent("unimplemented instruction " + op, true); //$NON-NLS-1$ + if ( ((Boolean)fEventStops.get("unimpinstr")).booleanValue() ) { //$NON-NLS-1$ + fSuspendVM = thread.fID + " event unimpinstr"; //$NON-NLS-1$ thread.fCurrentFrame.fPC--; } } else if (thread.fStep) { if (fStepVM) { - fSuspendVM = thread.fID + " step"; + fSuspendVM = thread.fID + " step"; //$NON-NLS-1$ fStepVM = false; } else { - thread.fSuspend = "step"; + thread.fSuspend = "step"; //$NON-NLS-1$ } thread.fStep = false; } @@ -600,11 +601,11 @@ public class PDAVirtualMachine { fBreakpoints.containsKey(pc)) { if ( ((Boolean)fBreakpoints.get(pc)).booleanValue() ) { - fSuspendVM = thread.fID + " breakpoint " + pc; + fSuspendVM = thread.fID + " breakpoint " + pc; //$NON-NLS-1$ } else { - thread.fSuspend = "breakpoint " + pc; + thread.fSuspend = "breakpoint " + pc; //$NON-NLS-1$ thread.fStep = thread.fStepReturn = false; - sendDebugEvent("suspended " + thread.fID + " " + thread.fSuspend, false); + sendDebugEvent("suspended " + thread.fID + " " + thread.fSuspend, false); //$NON-NLS-1$ //$NON-NLS-2$ } } } @@ -617,14 +618,14 @@ public class PDAVirtualMachine { */ void yieldToDebug(boolean allThreadsSuspended) { if (fDebug) { - String line = ""; + String line = ""; //$NON-NLS-1$ try { if (allThreadsSuspended || fCommandReceiveStream.ready()) { line = fCommandReceiveStream.readLine(); processDebugCommand(line); } } catch (IOException e) { - System.err.println("Error: " + e); + System.err.println("Error: " + e); //$NON-NLS-1$ System.exit(1); } } @@ -635,7 +636,7 @@ public class PDAVirtualMachine { */ void debugUI() { if (!fStarted) { - sendDebugEvent("vmsuspended " + fSuspendVM, false); + sendDebugEvent("vmsuspended " + fSuspendVM, false); //$NON-NLS-1$ } else { fStarted = false; } @@ -650,11 +651,11 @@ public class PDAVirtualMachine { } while (fSuspendVM != null) { - String line = ""; + String line = ""; //$NON-NLS-1$ try { line = fCommandReceiveStream.readLine(); } catch (IOException e) { - System.err.println("Error: " + e); + System.err.println("Error: " + e); //$NON-NLS-1$ System.exit(1); return; } @@ -662,9 +663,9 @@ public class PDAVirtualMachine { } if (fStepVM || fStepReturnVM) { - sendDebugEvent("vmresumed step", false); + sendDebugEvent("vmresumed step", false); //$NON-NLS-1$ } else { - sendDebugEvent("vmresumed client", false); + sendDebugEvent("vmresumed client", false); //$NON-NLS-1$ } } @@ -681,43 +682,43 @@ public class PDAVirtualMachine { } Args args = new Args( (String[])tokens.toArray(new String[tokens.size()])); - if ("children".equals(command)) debugChildren(args); - else if ("clear".equals(command)) debugClearBreakpoint(args); - else if ("data".equals(command)) debugData(args); - else if ("drop".equals(command)) debugDropFrame(args); - else if ("eval".equals(command)) debugEval(args); - else if ("eventstop".equals(command)) debugEventStop(args); - else if ("frame".equals(command)) debugFrame(args); - else if ("groups".equals(command)) debugGroups(args); - else if ("popdata".equals(command)) debugPopData(args); - else if ("pushdata".equals(command)) debugPushData(args); - else if ("registers".equals(command)) debugRegisters(args); - else if ("restart".equals(command)) debugRestart(args); - else if ("resume".equals(command)) debugResume(args); - else if ("set".equals(command)) debugSetBreakpoint(args); - else if ("setdata".equals(command)) debugSetData(args); - else if ("setvar".equals(command)) debugSetVariable(args); - else if ("stack".equals(command)) debugStack(args); - else if ("stackdepth".equals(command)) debugStackDepth(args); - else if ("state".equals(command)) debugState(args); - else if ("step".equals(command)) debugStep(args); - else if ("stepreturn".equals(command)) debugStepReturn(args); - else if ("suspend".equals(command)) debugSuspend(args); - else if ("terminate".equals(command)) debugTerminate(); - else if ("threads".equals(command)) debugThreads(); - else if ("var".equals(command)) debugVar(args); - else if ("vmresume".equals(command)) debugVMResume(); - else if ("vmsuspend".equals(command)) debugVMSuspend(); - else if ("watch".equals(command)) debugWatch(args); + if ("children".equals(command)) debugChildren(args); //$NON-NLS-1$ + else if ("clear".equals(command)) debugClearBreakpoint(args); //$NON-NLS-1$ + else if ("data".equals(command)) debugData(args); //$NON-NLS-1$ + else if ("drop".equals(command)) debugDropFrame(args); //$NON-NLS-1$ + else if ("eval".equals(command)) debugEval(args); //$NON-NLS-1$ + else if ("eventstop".equals(command)) debugEventStop(args); //$NON-NLS-1$ + else if ("frame".equals(command)) debugFrame(args); //$NON-NLS-1$ + else if ("groups".equals(command)) debugGroups(args); //$NON-NLS-1$ + else if ("popdata".equals(command)) debugPopData(args); //$NON-NLS-1$ + else if ("pushdata".equals(command)) debugPushData(args); //$NON-NLS-1$ + else if ("registers".equals(command)) debugRegisters(args); //$NON-NLS-1$ + else if ("restart".equals(command)) debugRestart(args); //$NON-NLS-1$ + else if ("resume".equals(command)) debugResume(args); //$NON-NLS-1$ + else if ("set".equals(command)) debugSetBreakpoint(args); //$NON-NLS-1$ + else if ("setdata".equals(command)) debugSetData(args); //$NON-NLS-1$ + else if ("setvar".equals(command)) debugSetVariable(args); //$NON-NLS-1$ + else if ("stack".equals(command)) debugStack(args); //$NON-NLS-1$ + else if ("stackdepth".equals(command)) debugStackDepth(args); //$NON-NLS-1$ + else if ("state".equals(command)) debugState(args); //$NON-NLS-1$ + else if ("step".equals(command)) debugStep(args); //$NON-NLS-1$ + else if ("stepreturn".equals(command)) debugStepReturn(args); //$NON-NLS-1$ + else if ("suspend".equals(command)) debugSuspend(args); //$NON-NLS-1$ + else if ("terminate".equals(command)) debugTerminate(); //$NON-NLS-1$ + else if ("threads".equals(command)) debugThreads(); //$NON-NLS-1$ + else if ("var".equals(command)) debugVar(args); //$NON-NLS-1$ + else if ("vmresume".equals(command)) debugVMResume(); //$NON-NLS-1$ + else if ("vmsuspend".equals(command)) debugVMSuspend(); //$NON-NLS-1$ + else if ("watch".equals(command)) debugWatch(args); //$NON-NLS-1$ else { - sendCommandResponse("error: invalid command\n"); + sendCommandResponse("error: invalid command\n"); //$NON-NLS-1$ } } void debugChildren(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } @@ -727,7 +728,7 @@ public class PDAVirtualMachine { Frame frame = sfnumber >= thread.fFrames.size() ? thread.fCurrentFrame : (Frame)thread.fFrames.get(sfnumber); - String varDot = var + "."; + String varDot = var + "."; //$NON-NLS-1$ List children = new ArrayList(); for (Iterator itr = frame.fLocalVariables.keySet().iterator(); itr.hasNext();) { String localVar = (String)itr.next(); @@ -750,15 +751,15 @@ public class PDAVirtualMachine { int line = args.getNextIntArg(); fBreakpoints.remove( new Integer(line) ); - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } - private static Pattern fPackPattern = Pattern.compile("%([a-fA-F0-9][a-fA-F0-9])"); + private static Pattern fPackPattern = Pattern.compile("%([a-fA-F0-9][a-fA-F0-9])"); //$NON-NLS-1$ void debugData(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } @@ -774,7 +775,7 @@ public class PDAVirtualMachine { void debugDropFrame(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } @@ -782,34 +783,34 @@ public class PDAVirtualMachine { thread.fCurrentFrame = (Frame)thread.fFrames.remove(thread.fFrames.size() - 1); } thread.fCurrentFrame.fPC--; - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ if (fSuspendVM != null) { - sendDebugEvent("vmresumed drop", false); - sendDebugEvent("vmsuspended " + thread.fID + " drop", false); + sendDebugEvent("vmresumed drop", false); //$NON-NLS-1$ + sendDebugEvent("vmsuspended " + thread.fID + " drop", false); //$NON-NLS-1$ //$NON-NLS-2$ } else { - sendDebugEvent("resumed " + thread.fID + " drop", false); - sendDebugEvent("suspended " + thread.fID + " drop", false); + sendDebugEvent("resumed " + thread.fID + " drop", false); //$NON-NLS-1$ //$NON-NLS-2$ + sendDebugEvent("suspended " + thread.fID + " drop", false); //$NON-NLS-1$ //$NON-NLS-2$ } } void debugEval(Args args) { if (fSuspendVM != null) { - sendCommandResponse("error: cannot evaluate while vm is suspended\n"); + sendCommandResponse("error: cannot evaluate while vm is suspended\n"); //$NON-NLS-1$ return; } PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } if (thread.fSuspend == null) { - sendCommandResponse("error: thread running\n"); + sendCommandResponse("error: thread running\n"); //$NON-NLS-1$ return; } - StringTokenizer tokenizer = new StringTokenizer(args.getNextStringArg(), "|"); + StringTokenizer tokenizer = new StringTokenizer(args.getNextStringArg(), "|"); //$NON-NLS-1$ tokenizer.countTokens(); int numEvalLines = tokenizer.countTokens(); @@ -834,7 +835,7 @@ public class PDAVirtualMachine { } thread.fThreadCode[fCode.length + i] = lineBuf.toString(); } - thread.fThreadCode[fCode.length + numEvalLines] = "xyzzy"; + thread.fThreadCode[fCode.length + numEvalLines] = "xyzzy"; //$NON-NLS-1$ thread.fThreadLabels = mapLabels(fCode); thread.fSavedPC = thread.fCurrentFrame.fPC; @@ -843,28 +844,28 @@ public class PDAVirtualMachine { thread.fSuspend = null; - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ - sendDebugEvent("resumed " + thread.fID + " eval", false); + sendDebugEvent("resumed " + thread.fID + " eval", false); //$NON-NLS-1$ //$NON-NLS-2$ } void debugEventStop(Args args) { String event = args.getNextStringArg(); int stop = args.getNextIntArg(); fEventStops.put(event, new Boolean(stop > 0)); - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugTerminate() { - sendCommandResponse("ok\n"); - sendDebugEvent("vmterminated", false); + sendCommandResponse("ok\n"); //$NON-NLS-1$ + sendDebugEvent("vmterminated", false); //$NON-NLS-1$ System.exit(0); } void debugFrame(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } @@ -875,9 +876,12 @@ public class PDAVirtualMachine { } else { frame = (Frame)thread.fFrames.get(sfnumber); } - sendCommandResponse(printFrame(frame) + "\n"); + sendCommandResponse(printFrame(frame) + "\n"); //$NON-NLS-1$ } + /** + * @param args + */ void debugGroups(Args args) { TreeSet groups = new TreeSet(); for (Iterator itr = fRegisters.values().iterator(); itr.hasNext();) { @@ -896,24 +900,24 @@ public class PDAVirtualMachine { void debugPopData(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } thread.fStack.pop(); - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugPushData(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } Object val = args.getNextIntOrStringArg(); thread.fStack.push(val); - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugRegisters(Args args) { @@ -951,43 +955,46 @@ public class PDAVirtualMachine { sendCommandResponse(response.toString()); } + /** + * @param args + */ void debugRestart(Args args) { - fSuspendVM = "restart"; + fSuspendVM = "restart"; //$NON-NLS-1$ for (Iterator itr = fThreads.keySet().iterator(); itr.hasNext();) { Integer id = (Integer)itr.next(); - sendDebugEvent("exited " + id, false); + sendDebugEvent("exited " + id, false); //$NON-NLS-1$ } fThreads.clear(); int id = fNextThreadId++; - fThreads.put(new Integer(id), new PDAThread(id, "main", 0)); - sendDebugEvent("started " + id, false); + fThreads.put(new Integer(id), new PDAThread(id, "main", 0)); //$NON-NLS-1$ + sendDebugEvent("started " + id, false); //$NON-NLS-1$ fRegisters.clear(); - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugResume(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } if (fSuspendVM != null) { - sendCommandResponse("error: cannot resume thread when vm is suspended\n"); + sendCommandResponse("error: cannot resume thread when vm is suspended\n"); //$NON-NLS-1$ return; } if (thread.fSuspend == null) { - sendCommandResponse("error: thread already running\n"); + sendCommandResponse("error: thread already running\n"); //$NON-NLS-1$ return; } thread.fSuspend = null; - sendDebugEvent("resumed " + thread.fID + " client", false); + sendDebugEvent("resumed " + thread.fID + " client", false); //$NON-NLS-1$ //$NON-NLS-2$ - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugSetBreakpoint(Args args) { @@ -995,13 +1002,13 @@ public class PDAVirtualMachine { int stopVM = args.getNextIntArg(); fBreakpoints.put(new Integer(line), new Boolean(stopVM != 0)); - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugSetData(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } @@ -1013,13 +1020,13 @@ public class PDAVirtualMachine { } else { thread.fStack.add(0, val); } - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugSetVariable(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } @@ -1027,7 +1034,7 @@ public class PDAVirtualMachine { String var = args.getNextStringArg(); Object val = args.getNextIntOrStringArg(); while (args.hasNextArg()) { - val = val.toString() + " " + args.getNextStringArg(); + val = val.toString() + " " + args.getNextStringArg(); //$NON-NLS-1$ } if (sfnumber >= thread.fFrames.size()) { @@ -1035,13 +1042,13 @@ public class PDAVirtualMachine { } else { ((Frame)thread.fFrames.get(sfnumber)).set(var, val); } - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugStack(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } @@ -1060,10 +1067,10 @@ public class PDAVirtualMachine { void debugStackDepth(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } - sendCommandResponse( Integer.toString(thread.fFrames.size() + 1) + "\n" ); + sendCommandResponse( Integer.toString(thread.fFrames.size() + 1) + "\n" ); //$NON-NLS-1$ } @@ -1092,19 +1099,19 @@ public class PDAVirtualMachine { PDAThread thread = args.getThreadArg(); String response = null; if (thread == null) { - response = fSuspendVM == null ? "running" : fSuspendVM; + response = fSuspendVM == null ? "running" : fSuspendVM; //$NON-NLS-1$ } else if (fSuspendVM != null) { - response = "vm"; + response = "vm"; //$NON-NLS-1$ } else { - response = thread.fSuspend == null ? "running" : thread.fSuspend; + response = thread.fSuspend == null ? "running" : thread.fSuspend; //$NON-NLS-1$ } - sendCommandResponse(response + "\n"); + sendCommandResponse(response + "\n"); //$NON-NLS-1$ } void debugStep(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } @@ -1123,20 +1130,20 @@ public class PDAVirtualMachine { thread.fStep = true; } else { if (thread.fSuspend == null) { - sendCommandResponse("error: thread already running\n"); + sendCommandResponse("error: thread already running\n"); //$NON-NLS-1$ return; } thread.fSuspend = null; thread.fStep = true; - sendDebugEvent("resumed " + thread.fID + " step", false); + sendDebugEvent("resumed " + thread.fID + " step", false); //$NON-NLS-1$ //$NON-NLS-2$ } - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugStepReturn(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } @@ -1146,34 +1153,34 @@ public class PDAVirtualMachine { thread.fStepReturn = true; } else { if (thread.fSuspend == null) { - sendCommandResponse("error: thread running\n"); + sendCommandResponse("error: thread running\n"); //$NON-NLS-1$ return; } thread.fSuspend = null; thread.fStepReturn = true; - sendDebugEvent("resumed " + thread.fID + " step", false); + sendDebugEvent("resumed " + thread.fID + " step", false); //$NON-NLS-1$ //$NON-NLS-2$ } - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugSuspend(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } if (fSuspendVM != null) { - sendCommandResponse("error: vm already suspended\n"); + sendCommandResponse("error: vm already suspended\n"); //$NON-NLS-1$ return; } if (thread.fSuspend != null) { - sendCommandResponse("error: thread already suspended\n"); + sendCommandResponse("error: thread already suspended\n"); //$NON-NLS-1$ return; } - thread.fSuspend = "client"; - sendDebugEvent("suspended " + thread.fID + " client", false); - sendCommandResponse("ok\n"); + thread.fSuspend = "client"; //$NON-NLS-1$ + sendDebugEvent("suspended " + thread.fID + " client", false); //$NON-NLS-1$ //$NON-NLS-2$ + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugThreads() { @@ -1182,13 +1189,13 @@ public class PDAVirtualMachine { response.append(itr.next()); response.append(' '); } - sendCommandResponse(response.toString().trim() + "\n"); + sendCommandResponse(response.toString().trim() + "\n"); //$NON-NLS-1$ } void debugVar(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } @@ -1200,39 +1207,43 @@ public class PDAVirtualMachine { Object val = frame.get(var); if (val == null) { - sendCommandResponse("error: variable undefined\n"); + sendCommandResponse("error: variable undefined\n"); //$NON-NLS-1$ } else { - sendCommandResponse(val.toString() + "\n"); + sendCommandResponse(val.toString() + "\n"); //$NON-NLS-1$ } } void debugVMResume() { if (fSuspendVM == null) { - sendCommandResponse("error: vm already running\n"); + sendCommandResponse("error: vm already running\n"); //$NON-NLS-1$ return; } fSuspendVM = null; - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugVMSuspend() { if (fSuspendVM != null) { - sendCommandResponse("error: vm already suspended\n"); + sendCommandResponse("error: vm already suspended\n"); //$NON-NLS-1$ return; } - fSuspendVM = "client"; - sendCommandResponse("ok\n"); + fSuspendVM = "client"; //$NON-NLS-1$ + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugWatch(Args args) { String funcAndVar = args.getNextStringArg(); int flags = args.getNextIntArg(); fWatchpoints.put(funcAndVar, new Integer(flags)); - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } + /** + * @param thread + * @param args + */ void iAdd(PDAThread thread, Args args) { Object val1 = thread.fStack.pop(); Object val2 = thread.fStack.pop(); @@ -1252,9 +1263,9 @@ public class PDAVirtualMachine { if (thread.fThreadLabels.containsKey(label)) { thread.fCurrentFrame.fPC = ((Integer)thread.fThreadLabels.get(label)).intValue(); } else { - sendDebugEvent("no such label " + label, true); - if ( ((Boolean)fEventStops.get("nosuchlabel")).booleanValue() ) { - fSuspendVM = thread.fID + " event nosuchlabel"; + sendDebugEvent("no such label " + label, true); //$NON-NLS-1$ + if ( ((Boolean)fEventStops.get("nosuchlabel")).booleanValue() ) { //$NON-NLS-1$ + fSuspendVM = thread.fID + " event nosuchlabel"; //$NON-NLS-1$ thread.fStack.push(val); thread.fCurrentFrame.fPC--; } @@ -1268,14 +1279,18 @@ public class PDAVirtualMachine { thread.fFrames.add(thread.fCurrentFrame); thread.fCurrentFrame = new Frame(label, ((Integer)thread.fThreadLabels.get(label)).intValue()); } else { - sendDebugEvent("no such label " + label, true); - if ( ((Boolean)fEventStops.get("nosuchlabel")).booleanValue() ) { - fSuspendVM = thread.fID + " event nosuchlabel"; + sendDebugEvent("no such label " + label, true); //$NON-NLS-1$ + if ( ((Boolean)fEventStops.get("nosuchlabel")).booleanValue() ) { //$NON-NLS-1$ + fSuspendVM = thread.fID + " event nosuchlabel"; //$NON-NLS-1$ thread.fCurrentFrame.fPC--; } } } + /** + * @param thread + * @param args + */ void iDec(PDAThread thread, Args args) { Object val = thread.fStack.pop(); if (val instanceof Integer) { @@ -1284,6 +1299,10 @@ public class PDAVirtualMachine { thread.fStack.push(val); } + /** + * @param thread + * @param args + */ void iDef(PDAThread thread, Args args) { String type = args.getNextStringArg(); @@ -1291,30 +1310,30 @@ public class PDAVirtualMachine { String regName = getRegisterPartOfName(name); String bitFieldName = getBitFieldPartOfName(name); - if ("register".equals(type)) { + if ("register".equals(type)) { //$NON-NLS-1$ Register reg = new Register(regName); reg.fGroup = args.getNextStringArg(); fRegisters.put(regName, reg); reg.fIsWriteable = args.getNextBooleanArg(); - } else if ("bitfield".equals(type)) { + } else if ("bitfield".equals(type)) { //$NON-NLS-1$ Register reg = (Register)fRegisters.get(regName); if (reg == null) return; BitField bitField = new BitField(bitFieldName); bitField.fBitOffset = args.getNextIntArg(); bitField.fBitCount = args.getNextIntArg(); reg.fBitFields.put(bitFieldName, bitField); - } else if ("mnemonic".equals(type)) { + } else if ("mnemonic".equals(type)) { //$NON-NLS-1$ Register reg = (Register)fRegisters.get(regName); if (reg == null) return; BitField bitField = (BitField)reg.fBitFields.get(bitFieldName); if (bitField == null) return; bitField.fMnemonics.put(args.getNextStringArg(), new Integer(args.getNextIntArg())); } - sendDebugEvent("registers", false); + sendDebugEvent("registers", false); //$NON-NLS-1$ } private String getRegisterPartOfName(String name) { - if (name.startsWith("$")) { + if (name.startsWith("$")) { //$NON-NLS-1$ int end = name.indexOf('.'); end = end != -1 ? end : name.length(); return name.substring(1, end); @@ -1324,12 +1343,16 @@ public class PDAVirtualMachine { private String getBitFieldPartOfName(String name) { int start = name.indexOf('.'); - if (name.startsWith("$") && start != -1) { + if (name.startsWith("$") && start != -1) { //$NON-NLS-1$ return name.substring(start + 1, name.length()); } return null; } + /** + * @param thread + * @param args + */ void iDup(PDAThread thread, Args args) { Object val = thread.fStack.pop(); thread.fStack.push(val); @@ -1341,32 +1364,40 @@ public class PDAVirtualMachine { if (fLabels.containsKey(label)) { int id = fNextThreadId++; fThreads.put( new Integer(id), new PDAThread(id, label, ((Integer)fLabels.get(label)).intValue()) ); - sendDebugEvent("started " + id, false); + sendDebugEvent("started " + id, false); //$NON-NLS-1$ } else { - sendDebugEvent("no such label " + label, true); - if ( ((Boolean)fEventStops.get("nosuchlabel")).booleanValue() ) { - thread.fSuspend = "event nosuchlabel"; + sendDebugEvent("no such label " + label, true); //$NON-NLS-1$ + if ( ((Boolean)fEventStops.get("nosuchlabel")).booleanValue() ) { //$NON-NLS-1$ + thread.fSuspend = "event nosuchlabel"; //$NON-NLS-1$ thread.fCurrentFrame.fPC--; } } } + /** + * @param thread + * @param args + */ void iHalt(PDAThread thread, Args args) { thread.fRun = false; } + /** + * @param thread + * @param args + */ void iOutput(PDAThread thread, Args args) { System.out.println(thread.fStack.pop()); } void iPop(PDAThread thread, Args args) { String arg = args.getNextStringArg(); - if (arg.startsWith("$")) { + if (arg.startsWith("$")) { //$NON-NLS-1$ String var = arg.substring(1); thread.fCurrentFrame.set(var, thread.fStack.pop()); - String key = thread.fCurrentFrame.fFunction + "::" + var; + String key = thread.fCurrentFrame.fFunction + "::" + var; //$NON-NLS-1$ if ( fWatchpoints.containsKey(key) && (((Integer)fWatchpoints.get(key)).intValue() & 2) != 0 ) { - fSuspendVM = thread.fID + " watch write " + key; + fSuspendVM = thread.fID + " watch write " + key; //$NON-NLS-1$ } } else { thread.fStack.pop(); @@ -1376,20 +1407,20 @@ public class PDAVirtualMachine { void iPush(PDAThread thread, Args args) { String arg = args.getNextStringArg(); while (arg.length() != 0) { - if (arg.startsWith("$")) { + if (arg.startsWith("$")) { //$NON-NLS-1$ String var = arg.substring(1); Object val = thread.fCurrentFrame.get(var); - if (val == null) val = ""; + if (val == null) val = ""; //$NON-NLS-1$ thread.fStack.push(val); - String key = thread.fCurrentFrame.fFunction + "::" + var; + String key = thread.fCurrentFrame.fFunction + "::" + var; //$NON-NLS-1$ if (fWatchpoints.containsKey(key) && (((Integer)fWatchpoints.get(key)).intValue() & 1) != 0) { - fSuspendVM = thread.fID + " watch read " + key; + fSuspendVM = thread.fID + " watch read " + key; //$NON-NLS-1$ } } else { Object val = arg; if (args.hasNextArg()) { while (args.hasNextArg()) { - val = val.toString() + " " + args.getNextStringArg(); + val = val.toString() + " " + args.getNextStringArg(); //$NON-NLS-1$ } } else { try { @@ -1404,6 +1435,10 @@ public class PDAVirtualMachine { } } + /** + * @param thread + * @param args + */ void iReturn(PDAThread thread, Args args) { if (!thread.fFrames.isEmpty()) { thread.fCurrentFrame = (Frame)thread.fFrames.remove(thread.fFrames.size() - 1); @@ -1419,13 +1454,17 @@ public class PDAVirtualMachine { thread.fCurrentFrame.set(var, new Integer(0)); } + /** + * @param thread + * @param args + */ void iInternalEndEval(PDAThread thread, Args args) { Object result = thread.fStack.pop(); thread.fThreadCode = fCode; thread.fThreadLabels = fLabels; thread.fCurrentFrame.fPC = thread.fSavedPC; - sendDebugEvent("evalresult " + result, false); - thread.fSuspend = "eval"; + sendDebugEvent("evalresult " + result, false); //$NON-NLS-1$ + thread.fSuspend = "eval"; //$NON-NLS-1$ thread.fPerformingEval = false; } diff --git a/org.eclipse.debug.examples.core/pom.xml b/org.eclipse.debug.examples.core/pom.xml index 04c89dada..16a8c4b5f 100644 --- a/org.eclipse.debug.examples.core/pom.xml +++ b/org.eclipse.debug.examples.core/pom.xml @@ -18,6 +18,6 @@ org.eclipse.debug org.eclipse.debug.examples.core - 1.3.200-SNAPSHOT + 1.3.300-SNAPSHOT eclipse-plugin diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/ClockControl.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/ClockControl.java index 639f1acf5..f972867d8 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/ClockControl.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/ClockControl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -27,7 +27,7 @@ public class ClockControl extends TimeControl { * @param launch */ public ClockControl(MidiLaunch launch) { - super("Time" , launch); + super("Time" , launch); //$NON-NLS-1$ } /* (non-Javadoc) @@ -84,7 +84,7 @@ public class ClockControl extends TimeControl { return secs * 1000000; } } catch (NumberFormatException e) { - throw new CoreException(new Status(IStatus.ERROR, DebugCorePlugin.PLUGIN_ID, "Time must be an integer (seconds) or 00:00 (minutes:seconds) format", e)); + throw new CoreException(new Status(IStatus.ERROR, DebugCorePlugin.PLUGIN_ID, "Time must be an integer (seconds) or 00:00 (minutes:seconds) format", e)); //$NON-NLS-1$ } return 0L; } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/LengthControl.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/LengthControl.java index 3a754c91a..01e63a6b9 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/LengthControl.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/LengthControl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ public class LengthControl extends TimeControl { * @param launch */ public LengthControl(MidiLaunch launch) { - super("Duration" , launch); + super("Duration" , launch); //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/MidiLaunchDelegate.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/MidiLaunchDelegate.java index 59e3131e8..fbd531236 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/MidiLaunchDelegate.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/MidiLaunchDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2010 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -44,25 +44,25 @@ public class MidiLaunchDelegate extends LaunchConfigurationDelegate { * Identifier for the MIDI launch configuration type * (value midi.launchType) */ - public static final String ID_MIDI_LAUNCH_CONFIGURATION_TYPE = "midi.launchType"; + public static final String ID_MIDI_LAUNCH_CONFIGURATION_TYPE = "midi.launchType"; //$NON-NLS-1$ /** * Launch configuration attribute for the MIDI file to play * (value midi.file) */ - public static final String ATTR_MIDI_FILE = "midi.file"; + public static final String ATTR_MIDI_FILE = "midi.file"; //$NON-NLS-1$ /** * Launch configuration attribute for the MIDI launcher. Specifies whether to throw * an exception when present. Value is one of HANDLED or UNHANDLED. */ - public static final String ATTR_THROW_EXCEPTION = "throw.exception"; + public static final String ATTR_THROW_EXCEPTION = "throw.exception"; //$NON-NLS-1$ /** * Possible values for the ATTR_THROW_EXCEPTION. */ - public static final String HANDLED = "HANDLED"; - public static final String UNHANDLED = "UNHANDLED"; + public static final String HANDLED = "HANDLED"; //$NON-NLS-1$ + public static final String UNHANDLED = "UNHANDLED"; //$NON-NLS-1$ /* (non-Javadoc) * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor) @@ -71,19 +71,19 @@ public class MidiLaunchDelegate extends LaunchConfigurationDelegate { String excep = configuration.getAttribute(ATTR_THROW_EXCEPTION, (String)null); if (excep != null) { if (HANDLED.equals(excep)) { - throw new CoreException(new Status(IStatus.ERROR, DebugCorePlugin.PLUGIN_ID, 303, "Test handled exception during launch", null)); + throw new CoreException(new Status(IStatus.ERROR, DebugCorePlugin.PLUGIN_ID, 303, "Test handled exception during launch", null)); //$NON-NLS-1$ } else { - throw new CoreException(new Status(IStatus.ERROR, DebugCorePlugin.PLUGIN_ID, "Test unhandled exception during launch", new Error("Test unhandled exception during launch"))); + throw new CoreException(new Status(IStatus.ERROR, DebugCorePlugin.PLUGIN_ID, "Test unhandled exception during launch", new Error("Test unhandled exception during launch"))); //$NON-NLS-1$ //$NON-NLS-2$ } } String fileName = configuration.getAttribute(ATTR_MIDI_FILE, (String)null); if (fileName == null) { - abort("MIDI file not specified.", null); + abort("MIDI file not specified.", null); //$NON-NLS-1$ } IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); IFile file = root.getFile(new Path(fileName)); if (!file.exists()) { - abort("MIDI file does not exist.", null); + abort("MIDI file does not exist.", null); //$NON-NLS-1$ } Sequencer sequencer = null; MidiFileFormat fileFormat = null; @@ -95,24 +95,29 @@ public class MidiLaunchDelegate extends LaunchConfigurationDelegate { fileFormat = MidiSystem.getMidiFileFormat(location.toFile()); } } catch (MidiUnavailableException e) { - abort("Cannot initialize sequencer.", e); + abort("Cannot initialize sequencer.", e); //$NON-NLS-1$ } catch (InvalidMidiDataException e) { - abort("Invalid MIDI file.", e); + abort("Invalid MIDI file.", e); //$NON-NLS-1$ } catch (IOException e) { - abort("Error reading MIDI file.", e); + abort("Error reading MIDI file.", e); //$NON-NLS-1$ } - BufferedInputStream stream = new BufferedInputStream(file.getContents()); - try { - sequencer.setSequence(stream); - } catch (IOException e) { - abort("Error reading MIDI file", e); - } catch (InvalidMidiDataException e) { - abort("Inavlid MIDI file.", e); + if(sequencer != null) { + BufferedInputStream stream = new BufferedInputStream(file.getContents()); + try { + sequencer.setSequence(stream); + } catch (IOException e) { + abort("Error reading MIDI file", e); //$NON-NLS-1$ + } catch (InvalidMidiDataException e) { + abort("Inavlid MIDI file.", e); //$NON-NLS-1$ + } + MidiLaunch midiLaunch = (MidiLaunch)launch; + midiLaunch.setSequencer(sequencer); + midiLaunch.setFormat(fileFormat); + sequencer.start(); + } + else { + abort("Could not create the sequencer", null); //$NON-NLS-1$ } - MidiLaunch midiLaunch = (MidiLaunch)launch; - midiLaunch.setSequencer(sequencer); - midiLaunch.setFormat(fileFormat); - sequencer.start(); } /** diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/TempoControl.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/TempoControl.java index feb3b32e4..28def4594 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/TempoControl.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/TempoControl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -27,7 +27,7 @@ public class TempoControl extends SequencerControl { * Constructs a tempo control for the given launch. */ public TempoControl(MidiLaunch launch) { - super("Tempo (BPM)", launch); + super("Tempo (BPM)", launch); //$NON-NLS-1$ } /* (non-Javadoc) @@ -82,7 +82,7 @@ public class TempoControl extends SequencerControl { try { return Float.parseFloat(value); } catch (NumberFormatException e) { - throw new CoreException(new Status(IStatus.ERROR, DebugCorePlugin.PLUGIN_ID, "Tempo must be a number", e)); + throw new CoreException(new Status(IStatus.ERROR, DebugCorePlugin.PLUGIN_ID, "Tempo must be a number", e)); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java index 2fe236a43..dbdb1fc85 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -35,30 +35,30 @@ public class DebugCorePlugin extends Plugin { * Unique identifier for the PDA debug model (value * pda.debugModel). */ - public static final String ID_PDA_DEBUG_MODEL = "pda.debugModel"; + public static final String ID_PDA_DEBUG_MODEL = "pda.debugModel"; //$NON-NLS-1$ /** * Name of the string substitution variable that resolves to the * location of a local Perl executable (value perlExecutable). */ - public static final String VARIALBE_PERL_EXECUTABLE = "perlExecutable"; + public static final String VARIALBE_PERL_EXECUTABLE = "perlExecutable"; //$NON-NLS-1$ /** * Launch configuration attribute key. Value is a path to a Perl * program. The path is a string representing a full path * to a Perl program in the workspace. */ - public static final String ATTR_PDA_PROGRAM = ID_PDA_DEBUG_MODEL + ".ATTR_PDA_PROGRAM"; + public static final String ATTR_PDA_PROGRAM = ID_PDA_DEBUG_MODEL + ".ATTR_PDA_PROGRAM"; //$NON-NLS-1$ /** * Identifier for the PDA launch configuration type * (value pda.launchType) */ - public static final String ID_PDA_LAUNCH_CONFIGURATION_TYPE = "pda.launchType"; + public static final String ID_PDA_LAUNCH_CONFIGURATION_TYPE = "pda.launchType"; //$NON-NLS-1$ /** * Plug-in identifier. */ - public static final String PLUGIN_ID = "org.eclipse.debug.examples.core"; + public static final String PLUGIN_ID = "org.eclipse.debug.examples.core"; //$NON-NLS-1$ /** * The constructor. @@ -110,7 +110,7 @@ public class DebugCorePlugin extends Plugin { public ResourceBundle getResourceBundle() { try { if (resourceBundle == null) - resourceBundle = ResourceBundle.getBundle("org.eclipse.debug.examples.core.pda.DebugCorePluginResources"); + resourceBundle = ResourceBundle.getBundle("org.eclipse.debug.examples.core.pda.DebugCorePluginResources"); //$NON-NLS-1$ } catch (MissingResourceException x) { resourceBundle = null; } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDALineBreakpoint.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDALineBreakpoint.java index 45f2a06b4..41d3a9074 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDALineBreakpoint.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDALineBreakpoint.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2009 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -61,12 +61,12 @@ public class PDALineBreakpoint extends LineBreakpoint implements IPDAEventListen public PDALineBreakpoint(final IResource resource, final int lineNumber) throws CoreException { IWorkspaceRunnable runnable = new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException { - IMarker marker = resource.createMarker("org.eclipse.debug.examples.core.pda.markerType.lineBreakpoint"); + IMarker marker = resource.createMarker("org.eclipse.debug.examples.core.pda.markerType.lineBreakpoint"); //$NON-NLS-1$ setMarker(marker); marker.setAttribute(IBreakpoint.ENABLED, Boolean.TRUE); marker.setAttribute(IMarker.LINE_NUMBER, lineNumber); marker.setAttribute(IBreakpoint.ID, getModelIdentifier()); - marker.setAttribute(IMarker.MESSAGE, "Line Breakpoint: " + resource.getName() + " [line: " + lineNumber + "]"); + marker.setAttribute(IMarker.MESSAGE, "Line Breakpoint: " + resource.getName() + " [line: " + lineNumber + "]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } }; run(getMarkerRule(resource), runnable); @@ -177,7 +177,7 @@ public class PDALineBreakpoint extends LineBreakpoint implements IPDAEventListen public void handleEvent(PDAEvent event) { if (event instanceof PDASuspendedEvent || event instanceof PDAVMSuspendedEvent) { PDARunControlEvent rcEvent = (PDARunControlEvent)event; - if (rcEvent.fReason.equals("breakpoint")) { + if (rcEvent.fReason.equals("breakpoint")) { //$NON-NLS-1$ handleHit(rcEvent); } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDARunToLineBreakpoint.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDARunToLineBreakpoint.java index b861fff20..42705dd62 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDARunToLineBreakpoint.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDARunToLineBreakpoint.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -38,7 +38,7 @@ public class PDARunToLineBreakpoint extends PDALineBreakpoint { IWorkspaceRunnable runnable = new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException { // associate with workspace root to avoid drawing in editor ruler - IMarker marker = ResourcesPlugin.getWorkspace().getRoot().createMarker("org.eclipse.debug.examples.core.pda.markerType.lineBreakpoint"); + IMarker marker = ResourcesPlugin.getWorkspace().getRoot().createMarker("org.eclipse.debug.examples.core.pda.markerType.lineBreakpoint"); //$NON-NLS-1$ setMarker(marker); marker.setAttribute(IBreakpoint.ENABLED, Boolean.TRUE); marker.setAttribute(IMarker.LINE_NUMBER, lineNumber); diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDAWatchpoint.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDAWatchpoint.java index f013f8327..d3f7dc593 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDAWatchpoint.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDAWatchpoint.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2009 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -36,10 +36,10 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint { private String fLastSuspendType; // marker attributes - public static final String ACCESS = "ACCESS"; - public static final String MODIFICATION = "MODIFICATION"; - public static final String FUNCTION_NAME = "FUNCTION_NAME"; - public static final String VAR_NAME = "VAR_NAME"; + public static final String ACCESS = "ACCESS"; //$NON-NLS-1$ + public static final String MODIFICATION = "MODIFICATION"; //$NON-NLS-1$ + public static final String FUNCTION_NAME = "FUNCTION_NAME"; //$NON-NLS-1$ + public static final String VAR_NAME = "VAR_NAME"; //$NON-NLS-1$ /** * Default constructor is required for the breakpoint manager @@ -66,7 +66,7 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint { public PDAWatchpoint(final IResource resource, final int lineNumber, final String functionName, final String varName, final boolean access, final boolean modification) throws CoreException { IWorkspaceRunnable runnable = new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException { - IMarker marker = resource.createMarker("org.eclipse.debug.examples.core.pda.markerType.watchpoint"); + IMarker marker = resource.createMarker("org.eclipse.debug.examples.core.pda.markerType.watchpoint"); //$NON-NLS-1$ setMarker(marker); setEnabled(true); ensureMarker().setAttribute(IMarker.LINE_NUMBER, lineNumber); @@ -74,7 +74,7 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint { setAccess(access); setModification(modification); setVariable(functionName, varName); - marker.setAttribute(IMarker.MESSAGE, "Watchpoint: " + resource.getName() + " [line: " + lineNumber + "]"); + marker.setAttribute(IMarker.MESSAGE, "Watchpoint: " + resource.getName() + " [line: " + lineNumber + "]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } }; run(getMarkerRule(resource), runnable); @@ -199,7 +199,7 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint { public void handleEvent(PDAEvent event) { if (event instanceof PDASuspendedEvent || event instanceof PDAVMSuspendedEvent) { PDARunControlEvent rcEvent = (PDARunControlEvent)event; - if (rcEvent.fReason.equals("watch")) { + if (rcEvent.fReason.equals("watch")) { //$NON-NLS-1$ handleHit(rcEvent); } } @@ -211,10 +211,10 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint { * @param event breakpoint event */ private void handleHit(PDARunControlEvent event) { - String[] strings = event.fMessage.split(" "); + String[] strings = event.fMessage.split(" "); //$NON-NLS-1$ if (strings.length == 4) { String fv = strings[3]; - int j = fv.indexOf("::"); + int j = fv.indexOf("::"); //$NON-NLS-1$ if (j > 0) { String fcn = fv.substring(0, j); String var = fv.substring(j + 2); diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/launcher/PDALaunchDelegate.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/launcher/PDALaunchDelegate.java index 7d43a1848..95c4c34d6 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/launcher/PDALaunchDelegate.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/launcher/PDALaunchDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -55,31 +55,31 @@ public class PDALaunchDelegate extends LaunchConfigurationDelegate { List commandList = new ArrayList(); // Get Java VM path - String javaVMHome = System.getProperty("java.home"); - String javaVMExec = javaVMHome + File.separatorChar + "bin" + File.separatorChar + "java"; + String javaVMHome = System.getProperty("java.home"); //$NON-NLS-1$ + String javaVMExec = javaVMHome + File.separatorChar + "bin" + File.separatorChar + "java"; //$NON-NLS-1$ //$NON-NLS-2$ if (File.separatorChar == '\\') { - javaVMExec += ".exe"; + javaVMExec += ".exe"; //$NON-NLS-1$ } File exe = new File(javaVMExec); if (!exe.exists()) { - abort(MessageFormat.format("Specified java VM executable {0} does not exist.", new Object[]{javaVMExec}), null); + abort(MessageFormat.format("Specified java VM executable {0} does not exist.", new Object[]{javaVMExec}), null); //$NON-NLS-1$ } commandList.add(javaVMExec); - commandList.add("-cp"); - commandList.add(File.pathSeparator + DebugCorePlugin.getFileInPlugin(new Path("bin"))); + commandList.add("-cp"); //$NON-NLS-1$ + commandList.add(File.pathSeparator + DebugCorePlugin.getFileInPlugin(new Path("bin"))); //$NON-NLS-1$ - commandList.add("org.eclipse.debug.examples.pdavm.PDAVirtualMachine"); + commandList.add("org.eclipse.debug.examples.pdavm.PDAVirtualMachine"); //$NON-NLS-1$ // program name String program = configuration.getAttribute(DebugCorePlugin.ATTR_PDA_PROGRAM, (String)null); if (program == null) { - abort("Perl program unspecified.", null); + abort("Perl program unspecified.", null); //$NON-NLS-1$ } IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(program)); if (!file.exists()) { - abort(MessageFormat.format("Perl program {0} does not exist.", new String[] {file.getFullPath().toString()}), null); + abort(MessageFormat.format("Perl program {0} does not exist.", new String[] {file.getFullPath().toString()}), null); //$NON-NLS-1$ } commandList.add(file.getLocation().toOSString()); @@ -91,11 +91,11 @@ public class PDALaunchDelegate extends LaunchConfigurationDelegate { requestPort = findFreePort(); eventPort = findFreePort(); if (requestPort == -1 || eventPort == -1) { - abort("Unable to find free port", null); + abort("Unable to find free port", null); //$NON-NLS-1$ } - commandList.add("-debug"); - commandList.add("" + requestPort); - commandList.add("" + eventPort); + commandList.add("-debug"); //$NON-NLS-1$ + commandList.add("" + requestPort); //$NON-NLS-1$ + commandList.add("" + eventPort); //$NON-NLS-1$ } String[] commandLine = (String[]) commandList.toArray(new String[commandList.size()]); diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArray.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArray.java index bcc07ba35..5107b2695 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArray.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArray.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2009 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -39,7 +39,7 @@ public class PDAArray extends PDAValue { */ public IVariable[] getVariables() throws DebugException { String string = getValueString(); - String[] words = string.split("\\W+"); + String[] words = string.split("\\W+"); //$NON-NLS-1$ IVariable[] variables = new IVariable[words.length]; for (int i = 0; i < words.length; i++) { String word = words[i]; diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArrayEntry.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArrayEntry.java index 9ff3ca74e..834198ebe 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArrayEntry.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArrayEntry.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -45,14 +45,14 @@ public class PDAArrayEntry extends PDADebugElement implements IVariable { * @see org.eclipse.debug.core.model.IVariable#getName() */ public String getName() throws DebugException { - return "[" + fIndex + "]"; + return "[" + fIndex + "]"; //$NON-NLS-1$ //$NON-NLS-2$ } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IVariable#getReferenceTypeName() */ public String getReferenceTypeName() throws DebugException { - return "String"; + return "String"; //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java index 180c528d7..b5e4a0607 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2010 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -103,7 +103,7 @@ public class PDADebugTarget extends PDADebugElement implements IDebugTarget, IBr class EventDispatchJob extends Job { public EventDispatchJob() { - super("PDA Event Dispatch"); + super("PDA Event Dispatch"); //$NON-NLS-1$ setSystem(true); } @@ -111,7 +111,7 @@ public class PDADebugTarget extends PDADebugElement implements IDebugTarget, IBr * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ protected IStatus run(IProgressMonitor monitor) { - String message = ""; + String message = ""; //$NON-NLS-1$ while (!isTerminated() && message != null) { try { message = fEventReader.readLine(); @@ -122,7 +122,7 @@ public class PDADebugTarget extends PDADebugElement implements IDebugTarget, IBr } catch (IllegalArgumentException e) { DebugCorePlugin.getDefault().getLog().log( - new Status (IStatus.ERROR, "org.eclipse.debug.examples.core", "Error parsing PDA event", e)); + new Status (IStatus.ERROR, "org.eclipse.debug.examples.core", "Error parsing PDA event", e)); //$NON-NLS-1$ //$NON-NLS-2$ continue; } Object[] listeners = fEventListeners.toArray(); @@ -185,7 +185,7 @@ public class PDADebugTarget extends PDADebugElement implements IDebugTarget, IBr Thread.sleep(1000); } catch (InterruptedException e) { } - fRequestSocket = new Socket("localhost", requestPort); + fRequestSocket = new Socket("localhost", requestPort); //$NON-NLS-1$ fRequestWriter = new PrintWriter(fRequestSocket.getOutputStream()); fRequestReader = new BufferedReader(new InputStreamReader(fRequestSocket.getInputStream())); // give interpreter a chance to open next socket @@ -193,12 +193,12 @@ public class PDADebugTarget extends PDADebugElement implements IDebugTarget, IBr Thread.sleep(1000); } catch (InterruptedException e) { } - fEventSocket = new Socket("localhost", eventPort); + fEventSocket = new Socket("localhost", eventPort); //$NON-NLS-1$ fEventReader = new BufferedReader(new InputStreamReader(fEventSocket.getInputStream())); } catch (UnknownHostException e) { - requestFailed("Unable to connect to PDA VM", e); + requestFailed("Unable to connect to PDA VM", e); //$NON-NLS-1$ } catch (IOException e) { - requestFailed("Unable to connect to PDA VM", e); + requestFailed("Unable to connect to PDA VM", e); //$NON-NLS-1$ } fEventDispatch = new EventDispatchJob(); fEventDispatch.schedule(); @@ -235,7 +235,7 @@ public class PDADebugTarget extends PDADebugElement implements IDebugTarget, IBr * @see org.eclipse.debug.core.model.IDebugTarget#getName() */ public String getName() throws DebugException { - return "PDA"; + return "PDA"; //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IDebugTarget#supportsBreakpoint(org.eclipse.debug.core.model.IBreakpoint) @@ -406,6 +406,7 @@ public class PDADebugTarget extends PDADebugElement implements IDebugTarget, IBr /** * Notification we have connected to the VM and it has started. * Resume the VM. + * @param event */ private void vmStarted(PDAVMStartedEvent event) { fireCreationEvent(); @@ -451,15 +452,15 @@ public class PDADebugTarget extends PDADebugElement implements IDebugTarget, IBr } private int calcDetail(String reason) { - if (reason.equals("breakpoint") || reason.equals("watch")) { + if (reason.equals("breakpoint") || reason.equals("watch")) { //$NON-NLS-1$ //$NON-NLS-2$ return DebugEvent.BREAKPOINT; - } else if (reason.equals("step")) { + } else if (reason.equals("step")) { //$NON-NLS-1$ return DebugEvent.STEP_OVER; - } else if (reason.equals("drop")) { + } else if (reason.equals("drop")) { //$NON-NLS-1$ return DebugEvent.STEP_RETURN; - } else if (reason.equals("client")) { + } else if (reason.equals("client")) { //$NON-NLS-1$ return DebugEvent.CLIENT_REQUEST; - } else if (reason.equals("event")) { + } else if (reason.equals("event")) { //$NON-NLS-1$ return DebugEvent.BREAKPOINT; } else { return DebugEvent.UNSPECIFIED; @@ -498,11 +499,11 @@ public class PDADebugTarget extends PDADebugElement implements IDebugTarget, IBr // wait for reply String retVal = fRequestReader.readLine(); if (retVal == null) { - requestFailed("Request failed: " + request + ". Debugger connection closed.", null); + requestFailed("Request failed: " + request + ". Debugger connection closed.", null); //$NON-NLS-1$ //$NON-NLS-2$ } return retVal; } catch (IOException e) { - requestFailed("Request failed: " + request, e); + requestFailed("Request failed: " + request, e); //$NON-NLS-1$ } } // Should never reach this satement. diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAThread.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAThread.java index 8d92f129c..409746bc3 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAThread.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAThread.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2009 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -149,7 +149,7 @@ public class PDAThread extends PDADebugElement implements IThread, IPDAEventList * @see org.eclipse.debug.core.model.IThread#getName() */ public String getName() { - return "Main thread"; + return "Main thread"; //$NON-NLS-1$ } /* (non-Javadoc) @@ -329,21 +329,21 @@ public class PDAThread extends PDADebugElement implements IThread, IPDAEventList // handle events if (event instanceof PDAResumedEvent || event instanceof PDAVMResumedEvent) { setSuspended(false); - if ("step".equals(event.fReason)) { + if ("step".equals(event.fReason)) { //$NON-NLS-1$ setStepping(true); resumed(DebugEvent.STEP_OVER); //#ifdef ex2 //# } //# // TODO: Exercise 2 - handle/fire "client" resume event //#else - } else if ("client".equals(event.fReason)) { + } else if ("client".equals(event.fReason)) { //$NON-NLS-1$ resumed(DebugEvent.CLIENT_REQUEST); } //#endif //#ifdef ex5 //# // TODO: Exercise 5 - handle start of drop event //#else - else if ("drop".equals(event.fReason)) { + else if ("drop".equals(event.fReason)) { //$NON-NLS-1$ resumed(DebugEvent.STEP_RETURN); } //#endif @@ -357,18 +357,18 @@ public class PDAThread extends PDADebugElement implements IThread, IPDAEventList //# exceptionHit(); //# } //#else - if ("client".equals(event.fReason)) { + if ("client".equals(event.fReason)) { //$NON-NLS-1$ suspended(DebugEvent.CLIENT_REQUEST); - } else if ("step".equals(event.fReason)) { + } else if ("step".equals(event.fReason)) { //$NON-NLS-1$ suspended(DebugEvent.STEP_END); - } else if ("event".equals(event.fReason) && getError() != null) { + } else if ("event".equals(event.fReason) && getError() != null) { //$NON-NLS-1$ exceptionHit(); } //#endif //#ifdef ex5 //# // TODO: Exercise 5 - handle end of drop event //#else - else if ("drop".equals(event.fReason)) { + else if ("drop".equals(event.fReason)) { //$NON-NLS-1$ suspended(DebugEvent.STEP_END); } //#endif @@ -523,7 +523,7 @@ public class PDAThread extends PDADebugElement implements IThread, IPDAEventList sendCommand(new PDAPopDataCommand(fThreadId)); return dataStack[0]; } - requestFailed("Empty stack", null); + requestFailed("Empty stack", null); //$NON-NLS-1$ return null; } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAValue.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAValue.java index a4c6cc7e2..81a92db29 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAValue.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAValue.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2009 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -39,9 +39,9 @@ public class PDAValue extends PDADebugElement implements IValue { try { Integer.parseInt(fValue); } catch (NumberFormatException e) { - return "text"; + return "text"; //$NON-NLS-1$ } - return "integer"; + return "integer"; //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValue#getValueString() @@ -79,7 +79,7 @@ public class PDAValue extends PDADebugElement implements IValue { // Value with multiple words can be show as an array using logical // structures. If the value has multiple words, it needs to indicate // that it has children even if logical structures are not turned on. - return fValue.split("\\W+").length > 1; + return fValue.split("\\W+").length > 1; //$NON-NLS-1$ } /* * (non-Javadoc) diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAVariable.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAVariable.java index 2329b584d..08ca276be 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAVariable.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAVariable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2009 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -62,7 +62,7 @@ public class PDAVariable extends PDADebugElement implements IVariable { * @see org.eclipse.debug.core.model.IVariable#getReferenceTypeName() */ public String getReferenceTypeName() throws DebugException { - return "Thing"; + return "Thing"; //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IVariable#hasValueChanged() diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/WordStructureDelegate.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/WordStructureDelegate.java index dbb06cb22..ccc6b2647 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/WordStructureDelegate.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/WordStructureDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -30,7 +30,7 @@ public class WordStructureDelegate implements ILogicalStructureTypeDelegate { //#else try { String string = value.getValueString(); - String[] words = string.split("\\W+"); + String[] words = string.split("\\W+"); //$NON-NLS-1$ return words.length > 1; } catch (DebugException e) { } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDABitFieldData.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDABitFieldData.java index a1cf5e3de..6a8caaa19 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDABitFieldData.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDABitFieldData.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -27,7 +28,7 @@ public class PDABitFieldData { final public Map fMnemonics; PDABitFieldData(String bitFieldString) { - StringTokenizer st = new StringTokenizer(bitFieldString, " "); + StringTokenizer st = new StringTokenizer(bitFieldString, " "); //$NON-NLS-1$ fName = st.nextToken(); fOffset = Integer.parseInt(st.nextToken()); diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAChildrenCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAChildrenCommand.java index f9a3f001e..9886a920a 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAChildrenCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAChildrenCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -25,7 +26,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAChildrenCommand extends PDACommand { public PDAChildrenCommand(int threadId, int frameId, String name ) { - super("children " + threadId + " " + frameId + " " + name); + super("children " + threadId + " " + frameId + " " + name); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } public PDACommandResult createResult(String resultText) { diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAClearBreakpointCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAClearBreakpointCommand.java index 07dba5b96..76f688bf4 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAClearBreakpointCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAClearBreakpointCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -22,7 +23,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAClearBreakpointCommand extends PDACommand { public PDAClearBreakpointCommand(int line) { - super("clear " + line); + super("clear " + line); //$NON-NLS-1$ } public PDACommandResult createResult(String resultText) { diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADataCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADataCommand.java index 66ba35a35..61cc412e1 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADataCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADataCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -26,7 +27,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDADataCommand extends PDACommand { public PDADataCommand(int threadId) { - super("data " + threadId); + super("data " + threadId); //$NON-NLS-1$ } public PDACommandResult createResult(String resultText) { diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADropFrameCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADropFrameCommand.java index 2204fa177..1d77bbe79 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADropFrameCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADropFrameCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -35,7 +36,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDADropFrameCommand extends PDACommand { public PDADropFrameCommand(int threadId) { - super("drop " + threadId); + super("drop " + threadId); //$NON-NLS-1$ } public PDACommandResult createResult(String resultText) { diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalCommand.java index bb0bdc6b9..50f79cf26 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -34,7 +35,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAEvalCommand extends PDACommand { public PDAEvalCommand(int threadId, String operation) { - super("eval " + threadId + " " + operation); + super("eval " + threadId + " " + operation); //$NON-NLS-1$ //$NON-NLS-2$ } public PDACommandResult createResult(String resultText) { diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalResultEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalResultEvent.java index 720147697..d8dc61ef5 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalResultEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalResultEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -27,6 +28,6 @@ public class PDAEvalResultEvent extends PDAEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("evalresult"); + return message.startsWith("evalresult"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEventStopCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEventStopCommand.java index f538c0d65..713723eea 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEventStopCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEventStopCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -36,9 +37,9 @@ public class PDAEventStopCommand extends PDACommand { public static final int NOSUCHLABEL = 1; public PDAEventStopCommand(int event, boolean enable) { - super("eventstop " + - (event == UNIMPINSTR ? "unimpinstr " : "nosuchlabel ") + - (enable ? "1" : "0")); + super("eventstop " + //$NON-NLS-1$ + (event == UNIMPINSTR ? "unimpinstr " : "nosuchlabel ") + //$NON-NLS-1$ //$NON-NLS-2$ + (enable ? "1" : "0")); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAExitedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAExitedEvent.java index f452e8138..22c65c103 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAExitedEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAExitedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -24,6 +25,6 @@ public class PDAExitedEvent extends PDARunControlEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("exited"); + return message.startsWith("exited"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameCommand.java index c2a83af3c..3c30b3bfb 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -26,7 +27,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAFrameCommand extends PDACommand { public PDAFrameCommand(int threadId, int frameNum) { - super("frame " + threadId + " " + frameNum); + super("frame " + threadId + " " + frameNum); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameData.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameData.java index 5bd1b5e00..01cfbf4cd 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameData.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameData.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -31,7 +32,7 @@ public class PDAFrameData { final public String[] fVariables; PDAFrameData(String frameString) { - StringTokenizer st = new StringTokenizer(frameString, "|"); + StringTokenizer st = new StringTokenizer(frameString, "|"); //$NON-NLS-1$ fFilePath = new Path(st.nextToken()); fPC = Integer.parseInt(st.nextToken()); diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAGroupsCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAGroupsCommand.java index 4e6f1eb5b..bf503d461 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAGroupsCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAGroupsCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -23,7 +24,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAGroupsCommand extends PDACommand { public PDAGroupsCommand() { - super("groups"); + super("groups"); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAListResult.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAListResult.java index 4ac17b284..99199a5e9 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAListResult.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAListResult.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -25,7 +26,7 @@ public class PDAListResult extends PDACommandResult { PDAListResult(String response) { super(response); - StringTokenizer st = new StringTokenizer(response, "|"); + StringTokenizer st = new StringTokenizer(response, "|"); //$NON-NLS-1$ List valuesList = new ArrayList(); while (st.hasMoreTokens()) { diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDANoSuchLabelEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDANoSuchLabelEvent.java index b85ca868e..c90b0b600 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDANoSuchLabelEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDANoSuchLabelEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -28,13 +29,13 @@ public class PDANoSuchLabelEvent extends PDAEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("no such label"); + return message.startsWith("no such label"); //$NON-NLS-1$ } protected String getName(String message) { if (isEventMessage(message)) { - return "no such label"; + return "no such label"; //$NON-NLS-1$ } - throw new IllegalArgumentException("Invalid event: " + message); + throw new IllegalArgumentException("Invalid event: " + message); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPopDataCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPopDataCommand.java index be04801e2..c181a2971 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPopDataCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPopDataCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -25,7 +26,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAPopDataCommand extends PDACommand { public PDAPopDataCommand(int threadId) { - super("popdata " + threadId); + super("popdata " + threadId); //$NON-NLS-1$ } public PDACommandResult createResult(String resultText) { diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPushDataCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPushDataCommand.java index 10837ea16..c6ff895c6 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPushDataCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPushDataCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -26,7 +27,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAPushDataCommand extends PDACommand { public PDAPushDataCommand(int threadId, String value) { - super("pushdata " + threadId + " " + value); + super("pushdata " + threadId + " " + value); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegisterData.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegisterData.java index 52b883bf4..05a12cd5e 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegisterData.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegisterData.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -27,10 +27,10 @@ public class PDARegisterData { final public PDABitFieldData[] fBitFields; PDARegisterData(String regString) { - StringTokenizer st = new StringTokenizer(regString, "|"); + StringTokenizer st = new StringTokenizer(regString, "|"); //$NON-NLS-1$ String regInfo = st.nextToken(); - StringTokenizer regSt = new StringTokenizer(regInfo, " "); + StringTokenizer regSt = new StringTokenizer(regInfo, " "); //$NON-NLS-1$ fName = regSt.nextToken(); fWritable = Boolean.getBoolean(regSt.nextToken()); diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommand.java index 2e766ca1d..0592d6b56 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -23,7 +24,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDARegistersCommand extends PDACommand { public PDARegistersCommand(String group) { - super("registers " + group); + super("registers " + group); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommandResult.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommandResult.java index f5d4cd983..a53bac5e2 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommandResult.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommandResult.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -28,7 +29,7 @@ public class PDARegistersCommandResult extends PDACommandResult { PDARegistersCommandResult(String response) { super(response); - StringTokenizer st = new StringTokenizer(response, "#"); + StringTokenizer st = new StringTokenizer(response, "#"); //$NON-NLS-1$ List regList = new ArrayList(); while (st.hasMoreTokens()) { diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersEvent.java index 9212273b5..1abada3a8 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -25,6 +26,6 @@ public class PDARegistersEvent extends PDAEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("registers"); + return message.startsWith("registers"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARestartCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARestartCommand.java index 21e58c430..6f518e9fe 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARestartCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARestartCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -25,7 +26,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDARestartCommand extends PDACommand { public PDARestartCommand() { - super("restart"); + super("restart"); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumeCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumeCommand.java index bf65d40e5..657860137 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumeCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumeCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -30,7 +31,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAResumeCommand extends PDACommand { public PDAResumeCommand(int threadId) { - super("resume " + threadId); + super("resume " + threadId); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumedEvent.java index 36f89ed0d..e8ee71750 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumedEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -24,6 +25,6 @@ public class PDAResumedEvent extends PDARunControlEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("resumed"); + return message.startsWith("resumed"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARunControlEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARunControlEvent.java index e3af4eb5e..3f507d1e4 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARunControlEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARunControlEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -33,7 +34,7 @@ public class PDARunControlEvent extends PDAEvent { try { return Integer.parseInt(message.substring(nameEnd + 1, threadIdEnd)); } catch (NumberFormatException e) { - throw new IllegalArgumentException("Invalid event: " + message); + throw new IllegalArgumentException("Invalid event: " + message); //$NON-NLS-1$ } } else { return -1; @@ -49,7 +50,7 @@ public class PDARunControlEvent extends PDAEvent { idx++; } if (idx >= message.length()) { - return ""; + return ""; //$NON-NLS-1$ } int endIdx = message.indexOf(' ', idx); @@ -64,6 +65,6 @@ public class PDARunControlEvent extends PDAEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("started"); + return message.startsWith("started"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetBreakpointCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetBreakpointCommand.java index 1abb7fa8c..a5223a916 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetBreakpointCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetBreakpointCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -34,9 +35,9 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDASetBreakpointCommand extends PDACommand { public PDASetBreakpointCommand(int line, boolean stopVM) { - super("set " + - line + " " + - (stopVM ? "1" : "0")); + super("set " + //$NON-NLS-1$ + line + " " + //$NON-NLS-1$ + (stopVM ? "1" : "0")); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetDataCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetDataCommand.java index e0c22db45..85ed35ae4 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetDataCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetDataCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -26,7 +27,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDASetDataCommand extends PDACommand { public PDASetDataCommand(int threadId, int index, String value) { - super("setdata " + threadId + " " + index + " " + value); + super("setdata " + threadId + " " + index + " " + value); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetVarCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetVarCommand.java index c5f6b090f..ac7dde342 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetVarCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetVarCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -28,7 +29,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDASetVarCommand extends PDACommand { public PDASetVarCommand(int threadId, int frame, String variable, String value) { - super("setvar " + threadId + " " + frame + " " + variable + " " + value); + super("setvar " + threadId + " " + frame + " " + variable + " " + value); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommand.java index 84545feb1..92cd55bbc 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -29,7 +30,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAStackCommand extends PDACommand { public PDAStackCommand(int threadId) { - super("stack " + threadId); + super("stack " + threadId); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommandResult.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommandResult.java index e22aa12b0..b98bcba70 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommandResult.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommandResult.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -29,7 +30,7 @@ public class PDAStackCommandResult extends PDACommandResult { PDAStackCommandResult(String response) { super(response); - StringTokenizer st = new StringTokenizer(response, "#"); + StringTokenizer st = new StringTokenizer(response, "#"); //$NON-NLS-1$ List framesList = new ArrayList(); while (st.hasMoreTokens()) { diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackDepthCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackDepthCommand.java index 6c04530c2..3b6abfa82 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackDepthCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackDepthCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -26,7 +27,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAStackDepthCommand extends PDACommand { public PDAStackDepthCommand(int threadId) { - super("stackdepth " + threadId); + super("stackdepth " + threadId); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStartedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStartedEvent.java index 6b980e105..39b21876a 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStartedEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStartedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -25,6 +26,6 @@ public class PDAStartedEvent extends PDARunControlEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("started"); + return message.startsWith("started"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepCommand.java index 3a21492ad..5a5124ef1 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -35,7 +36,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAStepCommand extends PDACommand { public PDAStepCommand(int threadId) { - super("step " + threadId); + super("step " + threadId); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepReturnCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepReturnCommand.java index 2a7fd9505..973c93e53 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepReturnCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepReturnCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -36,7 +37,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAStepReturnCommand extends PDACommand { public PDAStepReturnCommand(int threadId) { - super("stepreturn " + threadId); + super("stepreturn " + threadId); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendCommand.java index fb124d3e0..cba45439d 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -30,7 +31,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDASuspendCommand extends PDACommand { public PDASuspendCommand(int threadId) { - super("suspend " + threadId); + super("suspend " + threadId); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendedEvent.java index b226347c3..de6363391 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendedEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -38,6 +39,6 @@ public class PDASuspendedEvent extends PDARunControlEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("suspended"); + return message.startsWith("suspended"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminateCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminateCommand.java index 3e91596f1..55db441ec 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminateCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminateCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -24,7 +25,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDATerminateCommand extends PDACommand { public PDATerminateCommand() { - super("terminate"); + super("terminate"); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminatedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminatedEvent.java index 648e838ab..d3aa4a2a0 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminatedEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminatedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -24,6 +25,6 @@ public class PDATerminatedEvent extends PDAEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("terminated"); + return message.startsWith("terminated"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAUnimplementedInstructionEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAUnimplementedInstructionEvent.java index 7a0ce54ba..c6a593322 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAUnimplementedInstructionEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAUnimplementedInstructionEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -29,13 +30,13 @@ public class PDAUnimplementedInstructionEvent extends PDAEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("unimplemented instruction"); + return message.startsWith("unimplemented instruction"); //$NON-NLS-1$ } protected String getName(String message) { if (isEventMessage(message)) { - return "unimplemented instruction"; + return "unimplemented instruction"; //$NON-NLS-1$ } - throw new IllegalArgumentException("Invalid event: " + message); + throw new IllegalArgumentException("Invalid event: " + message); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumeCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumeCommand.java index 85ca473ab..83bb95d6e 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumeCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumeCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -27,7 +28,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAVMResumeCommand extends PDACommand { public PDAVMResumeCommand() { - super("vmresume"); + super("vmresume"); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumedEvent.java index 74801c6c5..056270d61 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumedEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -31,6 +32,6 @@ public class PDAVMResumedEvent extends PDARunControlEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("vmresumed"); + return message.startsWith("vmresumed"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMStartedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMStartedEvent.java index ff5f1dc0f..27d519105 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMStartedEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMStartedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -25,6 +26,6 @@ public class PDAVMStartedEvent extends PDAEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("vmstarted"); + return message.startsWith("vmstarted"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendCommand.java index ad62d3321..88f7d5dd8 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -27,7 +28,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAVMSuspendCommand extends PDACommand { public PDAVMSuspendCommand() { - super("vmsuspend"); + super("vmsuspend"); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendedEvent.java index 0e36297ec..eac42a107 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendedEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -39,6 +40,6 @@ public class PDAVMSuspendedEvent extends PDARunControlEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("vmsuspended"); + return message.startsWith("vmsuspended"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMTerminatedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMTerminatedEvent.java index 348778625..b73884746 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMTerminatedEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMTerminatedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -24,6 +24,6 @@ public class PDAVMTerminatedEvent extends PDAEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("vmterminated"); + return message.startsWith("vmterminated"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVarCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVarCommand.java index 5e2f34c03..b81302b79 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVarCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVarCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -29,7 +30,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAVarCommand extends PDACommand { public PDAVarCommand(int threadId, int frameId, String name) { - super("var " + threadId + " " + frameId + " " + name); + super("var " + threadId + " " + frameId + " " + name); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAWatchCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAWatchCommand.java index 4bd8af72c..c3b88cf64 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAWatchCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAWatchCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -33,7 +34,7 @@ public class PDAWatchCommand extends PDACommand { public static final int NONE = 0; public PDAWatchCommand(String function, String variable, int operation) { - super("watch " + function+ "::" + variable + " " + operation); + super("watch " + function+ "::" + variable + " " + operation); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } diff --git a/org.eclipse.debug.examples.core/src_ant/org/eclipse/debug/examples/ant/tasks/PreProcessor.java b/org.eclipse.debug.examples.core/src_ant/org/eclipse/debug/examples/ant/tasks/PreProcessor.java index 59baccb85..dc19387ac 100644 --- a/org.eclipse.debug.examples.core/src_ant/org/eclipse/debug/examples/ant/tasks/PreProcessor.java +++ b/org.eclipse.debug.examples.core/src_ant/org/eclipse/debug/examples/ant/tasks/PreProcessor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2008 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -59,10 +59,10 @@ public class PreProcessor extends Task { private static final int STATE_POST_TRUE_CONDITION = 3; // matchers - private Matcher IF_DEF_MATCHER = Pattern.compile("#ifdef\\s+\\w+").matcher(""); - private Matcher ELSE_IF_MATCHER = Pattern.compile("#elseif\\s+\\w+").matcher(""); - private Matcher ELSE_MATCHER = Pattern.compile("#else$|#else\\W+").matcher(""); - private Matcher END_MATCHER = Pattern.compile("#endif").matcher(""); + private Matcher IF_DEF_MATCHER = Pattern.compile("#ifdef\\s+\\w+").matcher(""); //$NON-NLS-1$ //$NON-NLS-2$ + private Matcher ELSE_IF_MATCHER = Pattern.compile("#elseif\\s+\\w+").matcher(""); //$NON-NLS-1$ //$NON-NLS-2$ + private Matcher ELSE_MATCHER = Pattern.compile("#else$|#else\\W+").matcher(""); //$NON-NLS-1$ //$NON-NLS-2$ + private Matcher END_MATCHER = Pattern.compile("#endif").matcher(""); //$NON-NLS-1$ //$NON-NLS-2$ /** @@ -95,7 +95,7 @@ public class PreProcessor extends Task { * @param symbols symbols that are "on" for the preprocessing */ public void setSymbols(String symbols) { - String[] strings = symbols.split(","); + String[] strings = symbols.split(","); //$NON-NLS-1$ for (int i = 0; i < strings.length; i++) { String string = strings[i].trim(); if (string.length() > 0) { @@ -106,21 +106,21 @@ public class PreProcessor extends Task { public void execute() throws BuildException { if (fSymbols.size() == 0) { - throw new BuildException("No symbols specified for preprocessor"); + throw new BuildException("No symbols specified for preprocessor"); //$NON-NLS-1$ } if (fFileSets.isEmpty()) { - throw new BuildException("No filesets specified for processing"); + throw new BuildException("No filesets specified for processing"); //$NON-NLS-1$ } if (!fDestDir.exists()) { - throw new BuildException("destdir does not exist: " + fDestDir.getAbsolutePath()); + throw new BuildException("destdir does not exist: " + fDestDir.getAbsolutePath()); //$NON-NLS-1$ } - StringBuffer buf = new StringBuffer("Symbols: "); + StringBuffer buf = new StringBuffer("Symbols: "); //$NON-NLS-1$ String[] symbols = (String[]) fSymbols.toArray(new String[fSymbols.size()]); for (int i = 0; i < symbols.length; i++) { String symbol = symbols[i]; buf.append(symbol); if(i < (symbols.length -1)) { - buf.append(", "); + buf.append(", "); //$NON-NLS-1$ } } log(buf.toString()); @@ -153,9 +153,9 @@ public class PreProcessor extends Task { dir.mkdirs(); } String contents = null; - if (fileName.endsWith(".java")) { - contents = preProcessFile(srcFile, "//#"); - } else if (fileName.equals("plugin.xml")) { + if (fileName.endsWith(".java")) { //$NON-NLS-1$ + contents = preProcessFile(srcFile, "//#"); //$NON-NLS-1$ + } else if (fileName.equals("plugin.xml")) { //$NON-NLS-1$ contents = preProcessFile(srcFile, null); } if (contents == null) { @@ -180,101 +180,106 @@ public class PreProcessor extends Task { } /** - * Preprocesses a file + * Pre-processes a file * * @param srcFile the file to process - * @param strip chars to stip off lines in a true condition, or null + * @param strip chars to strip off lines in a true condition, or null * @return */ public String preProcessFile(File srcFile, String strip) { try { FileReader fileReader = new FileReader(srcFile); BufferedReader reader = new BufferedReader(fileReader); - StringBuffer buffer = new StringBuffer(); - String line = reader.readLine(); - String activeSymbol = null; - int state = STATE_OUTSIDE_CONDITION; boolean changed = false; - while (line != null) { - boolean ifdef = IF_DEF_MATCHER.reset(line).find(); - boolean elseif = ELSE_IF_MATCHER.reset(line).find(); - boolean elze = ELSE_MATCHER.reset(line).find(); - boolean endif = END_MATCHER.reset(line).find(); - boolean commandLine = ifdef || elseif || elze || endif; - boolean written = false; - switch (state) { - case STATE_OUTSIDE_CONDITION: - if (ifdef) { - String condition = line.substring(IF_DEF_MATCHER.start(), IF_DEF_MATCHER.end()); - String[] strings = condition.split("\\s+"); - activeSymbol = strings[1].trim(); - if (fSymbols.contains(activeSymbol)) { - state = STATE_TRUE_CONDITION; - } else { - state = STATE_FALSE_CONDITION; - } - } else if (elseif) { - throw new BuildException("#elseif encountered without corresponding #ifdef"); - } else if (elze) { - throw new BuildException("#else encountered without corresponding #ifdef (" + srcFile.getPath() + ")"); - } else if (endif) { - throw new BuildException("#endif encountered without corresponding #ifdef"); - } - break; - case STATE_TRUE_CONDITION: - if (elze || elseif) { - state = STATE_POST_TRUE_CONDITION; + StringBuffer buffer = new StringBuffer(); + try { + String line = reader.readLine(); + String activeSymbol = null; + int state = STATE_OUTSIDE_CONDITION; + while (line != null) { + boolean ifdef = IF_DEF_MATCHER.reset(line).find(); + boolean elseif = ELSE_IF_MATCHER.reset(line).find(); + boolean elze = ELSE_MATCHER.reset(line).find(); + boolean endif = END_MATCHER.reset(line).find(); + boolean commandLine = ifdef || elseif || elze || endif; + boolean written = false; + switch (state) { + case STATE_OUTSIDE_CONDITION: + if (ifdef) { + String condition = line.substring(IF_DEF_MATCHER.start(), IF_DEF_MATCHER.end()); + String[] strings = condition.split("\\s+"); //$NON-NLS-1$ + activeSymbol = strings[1].trim(); + if (fSymbols.contains(activeSymbol)) { + state = STATE_TRUE_CONDITION; + } else { + state = STATE_FALSE_CONDITION; + } + } else if (elseif) { + throw new BuildException("#elseif encountered without corresponding #ifdef"); //$NON-NLS-1$ + } else if (elze) { + throw new BuildException("#else encountered without corresponding #ifdef (" + srcFile.getPath() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ + } else if (endif) { + throw new BuildException("#endif encountered without corresponding #ifdef"); //$NON-NLS-1$ + } break; - } else if (endif) { - state = STATE_OUTSIDE_CONDITION; + case STATE_TRUE_CONDITION: + if (elze || elseif) { + state = STATE_POST_TRUE_CONDITION; + break; + } else if (endif) { + state = STATE_OUTSIDE_CONDITION; + break; + } else if (ifdef) { + throw new BuildException("illegal nested #ifdef"); //$NON-NLS-1$ + } break; - } else if (ifdef) { - throw new BuildException("illegal nested #ifdef"); - } - break; - case STATE_FALSE_CONDITION: - if (elseif) { - String condition = line.substring(ELSE_IF_MATCHER.start(), ELSE_IF_MATCHER.end()); - String[] strings = condition.split("\\s+"); - activeSymbol = strings[1].trim(); - if (fSymbols.contains(activeSymbol)) { + case STATE_FALSE_CONDITION: + if (elseif) { + String condition = line.substring(ELSE_IF_MATCHER.start(), ELSE_IF_MATCHER.end()); + String[] strings = condition.split("\\s+"); //$NON-NLS-1$ + activeSymbol = strings[1].trim(); + if (fSymbols.contains(activeSymbol)) { + state = STATE_TRUE_CONDITION; + } else { + state = STATE_FALSE_CONDITION; + } + } else if (elze) { state = STATE_TRUE_CONDITION; - } else { - state = STATE_FALSE_CONDITION; + break; + } else if (endif) { + state = STATE_OUTSIDE_CONDITION; + break; + } else if (ifdef) { + throw new BuildException("illegal nested #ifdef"); //$NON-NLS-1$ } - } else if (elze) { - state = STATE_TRUE_CONDITION; - break; - } else if (endif) { - state = STATE_OUTSIDE_CONDITION; break; - } else if (ifdef) { - throw new BuildException("illegal nested #ifdef"); - } - break; - case STATE_POST_TRUE_CONDITION: - if (endif) { - state = STATE_OUTSIDE_CONDITION; + case STATE_POST_TRUE_CONDITION: + if (endif) { + state = STATE_OUTSIDE_CONDITION; + break; + } else if (ifdef) { + throw new BuildException("illegal nested #ifdef"); //$NON-NLS-1$ + } break; - } else if (ifdef) { - throw new BuildException("illegal nested #ifdef"); - } - break; - } - if (!commandLine) { - if (state == STATE_OUTSIDE_CONDITION || state == STATE_TRUE_CONDITION) { - if (state == STATE_TRUE_CONDITION && strip != null) { - if (line.startsWith(strip)) { - line = line.substring(strip.length()); + } + if (!commandLine) { + if (state == STATE_OUTSIDE_CONDITION || state == STATE_TRUE_CONDITION) { + if (state == STATE_TRUE_CONDITION && strip != null) { + if (line.startsWith(strip)) { + line = line.substring(strip.length()); + } } + buffer.append(line); + buffer.append("\n"); //$NON-NLS-1$ + written = true; } - buffer.append(line); - buffer.append("\n"); - written = true; - } - } - changed = changed || !written; - line = reader.readLine(); + } + changed = changed || !written; + line = reader.readLine(); + } + } + finally { + reader.close(); } if (!changed) { return null; @@ -287,8 +292,8 @@ public class PreProcessor extends Task { public static void main(String[] args) { PreProcessor processor = new PreProcessor(); - processor.setSymbols("ex2"); - String string = processor.preProcessFile(new File("c:\\eclipse3.1\\dev\\example.debug.core\\src\\example\\debug\\core\\launcher\\PDALaunchDelegate.java"), "//#"); + processor.setSymbols("ex2"); //$NON-NLS-1$ + String string = processor.preProcessFile(new File("c:\\eclipse3.1\\dev\\example.debug.core\\src\\example\\debug\\core\\launcher\\PDALaunchDelegate.java"), "//#"); //$NON-NLS-1$ //$NON-NLS-2$ //String string = processor.preProcessFile(new File("c:\\eclipse3.1\\dev\\example.debug.core\\plugin.xml"), null); System.out.println(string); } -- cgit v1.2.3