.../swingui/widget/ListCellRendererFactory.java | 64 ++++++++++++-------- 1 files changed, 39 insertions(+), 25 deletions(-) diff --git a/src/net/sourceforge/kolmafia/swingui/widget/ListCellRendererFactory.java b/src/net/sourceforge/kolmafia/swingui/widget/ListCellRendererFactory.java index 54736c0..c8282f9 100644 --- a/src/net/sourceforge/kolmafia/swingui/widget/ListCellRendererFactory.java +++ b/src/net/sourceforge/kolmafia/swingui/widget/ListCellRendererFactory.java @@ -143,9 +143,11 @@ public class ListCellRendererFactory } } - stringForm.append( " (" ); - stringForm.append( KoLConstants.COMMA_FORMAT.format( ar.getCount() ) ); - stringForm.append( ")" ); + if ( ar.getCount() != 1 ) { + stringForm.append( " (" ); + stringForm.append( KoLConstants.COMMA_FORMAT.format( ar.getCount() ) ); + stringForm.append( ")" ); + } if ( Preferences.getBoolean( "mementoListActive" ) && KoLConstants.mementoList.contains( ar ) ) { @@ -185,16 +187,21 @@ public class ListCellRendererFactory } } - stringForm.append( " (" ); - stringForm.append( KoLConstants.COMMA_FORMAT.format( icr.getQuantityPossible() ) ); - if ( icr.getQuantityPullable() > 0 ) - { - stringForm.append( ", " ); - stringForm.append( KoLConstants.COMMA_FORMAT.format( - icr.getQuantityPullable() ) ); - stringForm.append( " pullable" ); + if ( icr.getQuantityPossible() != 1 || icr.getQuantityPullable() > 0) { + stringForm.append( " (" ); + if (icr.getQuantityPossible() != 1) { + stringForm.append( KoLConstants.COMMA_FORMAT.format( icr.getQuantityPossible() ) ); + if (icr.getQuantityPullable() > 0) + stringForm.append(", "); + } + + if (icr.getQuantityPullable() > 0) { + stringForm.append( KoLConstants.COMMA_FORMAT.format( + icr.getQuantityPullable() ) ); + stringForm.append( " pullable" ); + } + stringForm.append( ")" ); } - stringForm.append( ")" ); boolean isHTML = false; if ( icr.getQuantityPossible() == 0 && icr.getQuantityPullable() > 0 ) @@ -453,9 +460,11 @@ public class ListCellRendererFactory stringForm.append( ")" ); } - stringForm.append( " (" ); - stringForm.append( KoLConstants.COMMA_FORMAT.format( ar.getCount() ) ); - stringForm.append( ")" ); + if ( ar.getCount() != 1 ) { + stringForm.append( " (" ); + stringForm.append( KoLConstants.COMMA_FORMAT.format( ar.getCount() ) ); + stringForm.append( ")" ); + } if ( Preferences.getBoolean( "mementoListActive" ) && KoLConstants.mementoList.contains( ar ) ) { @@ -486,17 +495,22 @@ public class ListCellRendererFactory stringForm.append( ")" ); } - stringForm.append( " (" ); - stringForm.append( KoLConstants.COMMA_FORMAT.format( icr.getQuantityPossible() ) ); - if ( icr.getQuantityPullable() > 0 ) - { - stringForm.append( ", " ); - stringForm.append( KoLConstants.COMMA_FORMAT.format( - icr.getQuantityPullable() ) ); - stringForm.append( " pullable" ); + if ( icr.getQuantityPossible() != 1 || icr.getQuantityPullable() > 0) { + stringForm.append( " (" ); + if (icr.getQuantityPossible() != 1) { + stringForm.append( KoLConstants.COMMA_FORMAT.format( icr.getQuantityPossible() ) ); + if (icr.getQuantityPullable() > 0) + stringForm.append(", "); + } + + if (icr.getQuantityPullable() > 0) { + stringForm.append( KoLConstants.COMMA_FORMAT.format( + icr.getQuantityPullable() ) ); + stringForm.append( " pullable" ); + } + stringForm.append( ")" ); } - stringForm.append( ")" ); - + boolean isHTML = false; if ( icr.getQuantityPossible() == 0 && icr.getQuantityPullable() > 0 ) {