diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationBundle.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationBundle.java index d9d7601d0..2ecf7868b 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationBundle.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationBundle.java @@ -234,7 +234,7 @@ public class PublicationBundle extends ContentBundle { public void removeAuthor(final GenericPerson author) { Assert.exists(author, GenericPerson.class); - remove(AUTHORS, author); + remove(AUTHORS, author.getContentBundle()); updateAuthorsStr(); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsTable.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsTable.java index 858e2b853..766512459 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsTable.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsTable.java @@ -140,6 +140,7 @@ public class PublicationAuthorsTable (Publication) m_itemModel.getSelectedObject(state); return new PublicationAuthorsTableModel(table, state, publication); } + } private class PublicationAuthorsTableModel implements TableModel { @@ -207,6 +208,7 @@ public class PublicationAuthorsTable public Object getKeyAt(int columnIndex) { return m_author.getID(); } + } private class EditCellRenderer @@ -267,6 +269,7 @@ public class PublicationAuthorsTable return label; } } + } private class EditAssocCellRenderer @@ -282,7 +285,7 @@ public class PublicationAuthorsTable int row, int col) { SecurityManager securityManager = - CMS.getSecurityManager(state); + CMS.getSecurityManager(state); Publication publication = (Publication) m_itemModel. getSelectedObject(state); @@ -299,6 +302,7 @@ public class PublicationAuthorsTable return label; } } + } private class DeleteCellRenderer @@ -335,6 +339,7 @@ public class PublicationAuthorsTable return label; } } + } private class UpCellRenderer @@ -360,6 +365,7 @@ public class PublicationAuthorsTable return link; } } + } private class DownCellRenderer @@ -390,6 +396,7 @@ public class PublicationAuthorsTable return link; } } + } @Override @@ -398,20 +405,17 @@ public class PublicationAuthorsTable s_log.info("cellSelected!"); - GenericPerson author = - new GenericPerson(new BigDecimal(event.getRowKey(). - toString())); + GenericPerson author = new GenericPerson(new BigDecimal(event.getRowKey().toString())); - Publication publication = (Publication) m_itemModel.getSelectedObject( - state); + Publication publication = (Publication) m_itemModel.getSelectedObject(state); AuthorshipCollection authors = publication.getAuthors(); TableColumn column = getColumnModel().get(event.getColumn().intValue()); if (column.getHeaderKey().toString().equals(TABLE_COL_EDIT)) { - } else if (column.getHeaderKey().toString().equals( - TABLE_COL_EDIT_ASSOC)) { + //Nothing + } else if (column.getHeaderKey().toString().equals(TABLE_COL_EDIT_ASSOC)) { while (authors.next()) { if (authors.getAuthor().equals(author)) { @@ -442,4 +446,5 @@ public class PublicationAuthorsTable public void headSelected(TableActionEvent event) { //Nothing to do here. } + }