Loading ...
Sorry, an error occurred while loading the content.

PATCH for CODE-1855

Expand Messages
  • c_r0ss_eskridge
    I think I have fixed the bug for CODE-1855, it appears to be a simple logic bug. I looked at creating a unit test, but I think it would require fairly
    Message 1 of 2 , Nov 28, 2012
    • 0 Attachment
      I think I have fixed the bug for CODE-1855, it appears to be a simple logic bug.

      I looked at creating a unit test, but I think it would require fairly extensive restructuring of the existing tests.

      Index: code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java
      ===================================================================
      --- code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java (revision 18504)
      +++ code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java (working copy)
      @@ -469,8 +469,9 @@
      if (parent.equals(existing.getParent())
      && existing.getNodeType() == NodeType.EQUIPMENT)
      {
      + //Don't merge the items if they're in different slots
      EquipNodeImpl existingImpl = (EquipNodeImpl) existing;
      - if (equipSlot != null && equipSlot.equals(existingImpl.getSlot()))
      + if (equipSlot != null && !equipSlot.equals(existingImpl.getSlot()))
      {
      continue;
      }
    • James Dempsey
      Hi Ross, Thanks for the patch - I must have made that slip up when working on CODE-1644. It fixes the equipping tab but there is an extra step needed to ensure
      Message 2 of 2 , Dec 3, 2012
      • 0 Attachment
        Hi Ross,

        Thanks for the patch - I must have made that slip up when working on
        CODE-1644. It fixes the equipping tab but there is an extra step needed
        to ensure that two items show on equipment list on output sheets. I'm
        still looking at that one.

        Cheers,
        James.

        On 29/11/2012 12:54 PM c_r0ss_eskridge wrote
        > I think I have fixed the bug for CODE-1855, it appears to be a simple logic bug.
        >
        > I looked at creating a unit test, but I think it would require fairly extensive restructuring of the existing tests.
        >
        > Index: code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java
        > ===================================================================
        > --- code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java (revision 18504)
        > +++ code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java (working copy)
        > @@ -469,8 +469,9 @@
        > if (parent.equals(existing.getParent())
        > && existing.getNodeType() == NodeType.EQUIPMENT)
        > {
        > + //Don't merge the items if they're in different slots
        > EquipNodeImpl existingImpl = (EquipNodeImpl) existing;
        > - if (equipSlot != null&& equipSlot.equals(existingImpl.getSlot()))
        > + if (equipSlot != null&& !equipSlot.equals(existingImpl.getSlot()))
        > {
        > continue;
        > }
        >
        >
      Your message has been successfully submitted and would be delivered to recipients shortly.