Learn how easy it is to sync an existing GitHub or Google Code repo to a SourceForge project! See Demo

Close

#350 hasParameter() patch for RendererModel

Needs_Review
closed
nobody
cdk-1.4.x (181)
9
2012-10-28
2011-06-05
Egon Willighagen
No

Allowing to ask if a certain parameter has been registered with the model.

Discussion

  • This patch is needed to fix a bug in the renderbasic module.

     
  • Rajarshi Guha
    Rajarshi Guha
    2011-06-06

    Doesn't apply to the latest 1.4.x branch

    Applying: Added a convenience test to see if a parameter has been registered to the model
    /Users/rguha/src/java/cdk/.git/rebase-apply/patch:20: space before tab in indent.
    return renderingParameters.containsKey(param.getName());
    /Users/rguha/src/java/cdk/.git/rebase-apply/patch:37: trailing whitespace.
    IGeneratorParameter<Boolean> someParam = new SomeParam();
    error: src/main/org/openscience/cdk/renderer/RendererModel.java: does not match index
    error: src/test/org/openscience/cdk/renderer/RendererModelTest.java: does not match index
    Patch failed at 0001.

     
  • Huh? Works fine here:

    egonw@toxbank53:~/var/Projects/SourceForge/git/cdk$ git checkout cdk-1.4.x
    Switched to branch 'cdk-1.4.x'
    egonw@toxbank53:~/var/Projects/SourceForge/git/cdk$ git am -3 --ignore-whitespace 0115-Added-a-convenience-test-to-see-if-a-parameter-has-b.patch
    Applying: Added a convenience test to see if a parameter has been registered to the model

    no further messages... ??

    Sometimes git is driving me nuts... why doesn't it work for you??

     
  • Rajarshi Guha
    Rajarshi Guha
    2011-06-06

    I really don't know - I deleted my local tracking branch and did a fresh checkout of cdk-1.4.x and I get the same error

     
  • Rajarshi Guha
    Rajarshi Guha
    2011-06-07

    Got it from your branch. Applied and pushed