Enhancements for localisation in several authoring step

git-svn-id: https://svn.libreccm.org/ccm/trunk@2763 8810af33-2d31-482b-a856-94f89814c4df

ccm-cms/src/com/arsdigita/cms/ImageAsset.java

@@ -39,9 +39,9 @@ import javax.imageio.ImageIO;
 import org.apache.log4j.Logger;
 
 /**
- * <p>An {@link com.arsdigita.cms.Asset asset} representing an image. An
+ * <p>
- * ImageAsset is deleted when its parent content item is deleted and is not
+ * An {@link com.arsdigita.cms.Asset asset} representing an image. An ImageAsset is deleted when its
- * intended to be reused between content items..</p>
+ * parent content item is deleted and is not intended to be reused between content items..</p>
  *
  * @see com.arsdigita.cms.ReusableImageAsset
  * @see com.arsdigita.cms.BinaryAsset
@@ -54,8 +54,7 @@ import org.apache.log4j.Logger;
  */
 public class ImageAsset extends BinaryAsset {
 
-	public static final String BASE_DATA_OBJECT_TYPE =
+    public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.ImageAsset";
-			"com.arsdigita.cms.ImageAsset";
     public static final String CONTENT = "content";
     public static final String HEIGHT = "height";
     public static final String WIDTH = "width";
@@ -71,23 +70,18 @@ public class ImageAsset extends BinaryAsset {
     }
 
     /**
-	 * Constructor. The contained
+     * Constructor. The contained <code>DataObject</code> is retrieved from the persistent storage
-	 * <code>DataObject</code> is retrieved from the persistent storage
+     * mechanism with an <code>OID</code> specified by <i>oid</i>.
-	 * mechanism with an
-	 * <code>OID</code> specified by <i>oid</i>.
      *
-	 * @param oid The <code>OID</code> for the retrieved
+     * @param oid The <code>OID</code> for the retrieved <code>DataObject</code>.
-	 * <code>DataObject</code>.
      */
     public ImageAsset(OID oid) throws DataObjectNotFoundException {
         super(oid);
     }
 
     /**
-	 * Constructor. The contained
+     * Constructor. The contained <code>DataObject</code> is retrieved from the persistent storage
-	 * <code>DataObject</code> is retrieved from the persistent storage
+     * mechanism with an <code>OID</code> specified by <i>id</i> and
-	 * mechanism with an
-	 * <code>OID</code> specified by <i>id</i> and
      * <code>ImageAsset.BASE_DATA_OBJECT_TYPE</code>.
      *
      * @param id The <code>id</code> for the retrieved <code>DataObject</code>.
@@ -106,8 +100,8 @@ public class ImageAsset extends BinaryAsset {
     }
 
     /**
-	 * @return the base PDL object type for this item. Child classes should
+     * @return the base PDL object type for this item. Child classes should override this method to
-	 * override this method to return the correct value
+     *         return the correct value
      */
     @Override
     public String getBaseDataObjectType() {
@@ -149,9 +143,8 @@ public class ImageAsset extends BinaryAsset {
     }
 
     /**
-	 * Load the image asset from the specified file. Automatically guesses the
+     * Load the image asset from the specified file. Automatically guesses the mime type of the
-	 * mime type of the file. If the file is a jpeg, tries to automatically
+     * file. If the file is a jpeg, tries to automatically determine width and height, as well.
-	 * determine width and height, as well.
      *
      * @param fileName        The original name of the file
      * @param file            The actual file on the server
@@ -226,8 +219,9 @@ public class ImageAsset extends BinaryAsset {
      * Find all images whose name matches the specified keyword
      *
      * @param keyword a String keyword
-	 * @param context the context for the retrieved items. Should be
+     * @param context the context for the retrieved items. Should be {@link ContentItem#DRAFT} or
-	 * {@link ContentItem#DRAFT} or {@link ContentItem#LIVE}
+     *                {@link ContentItem#LIVE}
+     *
      * @return a collection of images whose name matches the keyword
      */
     public static ImageAssetCollection getImagesByKeyword(
@@ -246,6 +240,7 @@ public class ImageAsset extends BinaryAsset {
      * Find all images whose name matches the specified keyword
      *
      * @param keyword a String keyword
+     *
      * @return a collection of images whose name matches the keyword
      */
     public static ImageAssetCollection getImagesByKeyword(String keyword) {
@@ -253,11 +248,11 @@ public class ImageAsset extends BinaryAsset {
     }
 
     /**
-	 * Resize this ImageAsset proportional to maxThumbnailWidth, if this
+     * Resize this ImageAsset proportional to maxThumbnailWidth, if this ImageAsset is wider then
-	 * ImageAsset is wider then maxThumbnailWidth. Else just return this
+     * maxThumbnailWidth. Else just return this ImageAsset.
-	 * ImageAsset.
      *
      * @param maxThumbnailWidth max image width
+     *
      * @return
      */
     public ImageAsset proportionalResizeToWidth(int maxThumbnailWidth) {
@@ -278,12 +273,16 @@ public class ImageAsset extends BinaryAsset {
 
                 ByteArrayOutputStream scaledImageBuffer = new ByteArrayOutputStream();
 
-				java.awt.Image scaledImage = origImage.getScaledInstance(maxThumbnailWidth, -1, java.awt.Image.SCALE_SMOOTH);
+                java.awt.Image scaledImage = origImage.getScaledInstance(maxThumbnailWidth, -1,
+                                                                         java.awt.Image.SCALE_SMOOTH);
 
-				BufferedImage scaledBufImage = new BufferedImage(scaledImage.getWidth(null), scaledImage.getHeight(null), origImage.getType());
+                BufferedImage scaledBufImage = new BufferedImage(scaledImage.getWidth(null),
+                                                                 scaledImage.getHeight(null),
+                                                                 origImage.getType());
                 scaledBufImage.getGraphics().drawImage(scaledImage, 0, 0, null);
 
-				ImageIO.write(scaledBufImage, this.getMimeType().getFileExtension(), scaledImageBuffer);
+                ImageIO.write(scaledBufImage, this.getMimeType().getFileExtension(),
+                              scaledImageBuffer);
 
                 imageAsset.setContent(scaledImageBuffer.toByteArray());
                 imageAsset.setWidth(new BigDecimal(scaledImage.getWidth(null)));
@@ -303,6 +302,7 @@ public class ImageAsset extends BinaryAsset {
      * Extract filename from path
      *
      * @param fileName
+     *
      * @return filename
      */
     protected String extractFilename(String fileName) {
@@ -326,4 +326,5 @@ public class ImageAsset extends BinaryAsset {
         setWidth(new BigDecimal(image.getWidth()));
         setHeight(new BigDecimal(image.getHeight()));
     }
+
 }

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactAddressSheet.java

@@ -128,8 +128,8 @@ public class GenericContactAddressSheet extends Table implements TableActionList
                 case 0:
                     return address.getTitle();
                 case 1:
-                    return ContenttypesGlobalizationUtil.globalize(
+                    return new Label(ContenttypesGlobalizationUtil.globalize(
-                        "cms.contenttypes.ui.contact.delete_address.button_label");
+                        "cms.contenttypes.ui.contact.delete_address.button_label"));
                 default:
                     return null;
             }
@@ -208,7 +208,7 @@ public class GenericContactAddressSheet extends Table implements TableActionList
                 contact);
 
             if (canEdit) {
-                final ControlLink link = new ControlLink(new Label((GlobalizedMessage) value));
+                final ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(ContenttypesGlobalizationUtil.globalize(
                     "cms.contenttypes.ui.contact.person.confirm_remove"));
                 return link;

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactPersonSheet.java

@@ -156,8 +156,8 @@ public class GenericContactPersonSheet extends Table implements TableActionListe
                 case 0:
                     return m_person.getFullName();
                 case 1:
-                    return ContenttypesGlobalizationUtil.globalize(
+                    return new Label(ContenttypesGlobalizationUtil.globalize(
-                        "cms.contenttypes.ui.genericcontact.delete_person").localize();
+                        "cms.contenttypes.ui.genericcontact.delete_person"));
                 default:
                     return null;
             }
@@ -238,14 +238,13 @@ public class GenericContactPersonSheet extends Table implements TableActionListe
                 contact);
 
             if (canEdit) {
-                ControlLink link = new ControlLink(value.toString());
+                ControlLink link = new ControlLink((Label)value);
                 link.setConfirmation(ContenttypesGlobalizationUtil.globalize(
                     "cms.contenttypes.ui.contact.person"
                     + ".confirm_remove"));
                 return link;
             } else {
-                Label label = new Label(value.toString());
+                return (Label) value;
-                return label;
             }
         }
 

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactTypeTable.java

@@ -109,6 +109,7 @@ public class GenericContactTypeTable extends Table implements TableActionListene
                 .getSelectedObject(state);
             return new GenericContactTypeTableModel(table, state, contacttype);
         }
+
     }
 
     /**
@@ -120,8 +121,8 @@ public class GenericContactTypeTable extends Table implements TableActionListene
         final private int MAX_DESC_LENGTH = 25;
         private Table m_table;
         private RelationAttribute m_contacttype;
-        private GenericContactTypeCollection m_contacttypeCollection = new 
+        private GenericContactTypeCollection m_contacttypeCollection
-                GenericContactTypeCollection();
+                                             = new GenericContactTypeCollection();
 
         private GenericContactTypeTableModel(Table t,
                                              PageState ps,
@@ -139,8 +140,8 @@ public class GenericContactTypeTable extends Table implements TableActionListene
         /**
          * Check collection for the existence of another row.
          *
-         * If exists, fetch the value of current GenericPersonEntryCollection object
+         * If exists, fetch the value of current GenericPersonEntryCollection object into m_comntact
-         * into m_comntact class variable.
+         * class variable.
          */
         public boolean nextRow() {
 
@@ -157,6 +158,7 @@ public class GenericContactTypeTable extends Table implements TableActionListene
 
         /**
          * Return the
+         *
          * @see com.arsdigita.bebop.table.TableModel#getElementAt(int)
          */
         public Object getElementAt(int columnIndex) {
@@ -166,8 +168,7 @@ public class GenericContactTypeTable extends Table implements TableActionListene
                 case 1:
                     return m_contacttypeCollection.getName();
                 case 2:
-                    return new Label(GlobalizationUtil.globalize("cms.ui.delete")
+                    return new Label(GlobalizationUtil.globalize("cms.ui.delete"));
-                                    );
                 default:
                     return null;
             }
@@ -180,11 +181,11 @@ public class GenericContactTypeTable extends Table implements TableActionListene
         public Object getKeyAt(int columnIndex) {
             return m_contacttype.getKey();
         }
+
     }
 
     /**
-     * Check for the permissions to edit item and put either a Label or
+     * Check for the permissions to edit item and put either a Label or a ControlLink accordingly.
-     * a ControlLink accordingly.
      */
     private class EditCellRenderer extends LockableImpl implements TableCellRenderer {
 
@@ -193,8 +194,7 @@ public class GenericContactTypeTable extends Table implements TableActionListene
                                       int row, int column) {
 
             SecurityManager sm = Utilities.getSecurityManager(state);
-            RelationAttribute contacttype = (RelationAttribute) 
+            RelationAttribute contacttype = (RelationAttribute) m_itemModel.getSelectedObject(state);
-                                             m_itemModel.getSelectedObject(state);
 
 //            boolean canEdit = sm.canAccess(state.getRequest(),
 //                    SecurityManager.EDIT_ITEM,
@@ -206,11 +206,11 @@ public class GenericContactTypeTable extends Table implements TableActionListene
 //                return new Label(value.toString());
 //            }
         }
+
     }
 
     /**
-     * Check for the permissions to delete item and put either a Label or
+     * Check for the permissions to delete item and put either a Label or a ControlLink accordingly.
-     * a ControlLink accordingly.
      */
     private class DeleteCellRenderer extends LockableImpl implements TableCellRenderer {
 
@@ -219,14 +219,13 @@ public class GenericContactTypeTable extends Table implements TableActionListene
                                       int row, int column) {
 
             SecurityManager sm = Utilities.getSecurityManager(state);
-            RelationAttribute contacttype = (RelationAttribute) 
+            RelationAttribute contacttype = (RelationAttribute) m_itemModel.getSelectedObject(state);
-                                            m_itemModel.getSelectedObject(state);
 
 //            boolean canDelete = sm.canAccess(state.getRequest(),
 //                    SecurityManager.DELETE_ITEM,
 //                    contacttype);
 //            if (canDelete) {
-            ControlLink link = new ControlLink(value.toString());
+            ControlLink link = new ControlLink((Label)value);
             link.setConfirmation(ContenttypesGlobalizationUtil
                 .globalize(
                     "cms.contenttypes.ui.contacttype.confirm_delete")
@@ -236,20 +235,20 @@ public class GenericContactTypeTable extends Table implements TableActionListene
 //                return new Label(value.toString());
 //            }
         }
+
     }
 
     /**
-     * Provide implementation to TableActionListener method.
+     * Provide implementation to TableActionListener method. Code that comes into picture when a
-     * Code that comes into picture when a link on the table is clicked.
+     * link on the table is clicked. Handles edit and delete event.
-     * Handles edit and delete event.
      */
     public void cellSelected(TableActionEvent evt) {
 
         PageState state = evt.getPageState();
 
         // Get selected GenericContactType
-        RelationAttribute contacttype = new RelationAttribute(new 
+        RelationAttribute contacttype = new RelationAttribute(new BigDecimal(evt.getRowKey()
-                                        BigDecimal(evt.getRowKey().toString()));
+            .toString()));
 
         // Get selected column
         TableColumn col = getColumnModel().get(evt.getColumn().intValue());
@@ -266,10 +265,10 @@ public class GenericContactTypeTable extends Table implements TableActionListene
     }
 
     /**
-     * provide Implementation to TableActionListener method.
+     * provide Implementation to TableActionListener method. Does nothing in our case.
-     * Does nothing in our case.
      */
     public void headSelected(TableActionEvent e) {
         throw new UnsupportedOperationException("Not Implemented");
     }
+
 }

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitContactTable.java

@@ -313,10 +313,10 @@ public class GenericOrganizationalUnitContactTable extends Table implements
                                                         SecurityManager.EDIT_ITEM,
                                                         orgaunit);
             if (canEdit) {
-                ControlLink link = new ControlLink(value.toString());
+                ControlLink link = new ControlLink((Label) value);
                 return link;
             } else {
-                return new Label(value.toString());
+                return new Label("");
             }
         }
     }
@@ -344,14 +344,14 @@ public class GenericOrganizationalUnitContactTable extends Table implements
                     SecurityManager.DELETE_ITEM,
                     orgaunit);
             if (canDelete) {
-                ControlLink link = new ControlLink(value.toString());
+                ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(ContenttypesGlobalizationUtil.
                         globalize(
                         "cms.contenttypes.ui.genericorgaunit.confirm_delete")
                         );
                 return link;
             } else {
-                return new Label(value.toString());
+                return new Label("");
             }
         }
     }

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitSubordinateOrgaUnitsTable.java

@@ -174,7 +174,7 @@ public class GenericOrganizationalUnitSubordinateOrgaUnitsTable
                             GlobalizationHelper.getNegotiatedLocale().
                             getLanguage()).getTitle();
                 case 1:
-                    return customizer.getDeleteLabel();
+                    return new Label(customizer.getDeleteLabel());
                 case 2:
                     return customizer.getUpLabel();
                 case 3:
@@ -254,7 +254,7 @@ public class GenericOrganizationalUnitSubordinateOrgaUnitsTable
                     orgaunit);
 
             if (canEdit) {
-                final ControlLink link = new ControlLink(value.toString());
+                final ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(customizer.getConfirmRemoveLabel());
                 return link;
             } else {

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitSuperiorOrgaUnitsTable.java

@@ -160,7 +160,7 @@ public class GenericOrganizationalUnitSuperiorOrgaUnitsTable extends Table {
                 case 0:
                     return superiorOrgaUnits.getTitle();
                 case 1:
-                    return customizer.getDeleteLabel();
+                    return new Label(customizer.getDeleteLabel());
                 case 2:
                     return customizer.getUpLabel();
                 case 3:
@@ -236,12 +236,11 @@ public class GenericOrganizationalUnitSuperiorOrgaUnitsTable extends Table {
                     orgaunit);
 
             if (canEdit) {
-                final ControlLink link = new ControlLink(value.toString());
+                final ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(customizer.getConfirmRemoveLabel());
                 return link;
             } else {
-                final Label label = new Label("");
+                return new Label("");
-                return label;
             }
         }
 

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactTable.java

@@ -314,12 +314,12 @@ public class GenericPersonContactTable extends Table implements
                                              SecurityManager.DELETE_ITEM,
                                              person);
             if (canDelete) {
-                ControlLink link = new ControlLink(value.toString());
+                ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(ContenttypesGlobalizationUtil.
                         globalize("cms.contenttypes.ui.person.confirm_delete"));
                 return link;
             } else {
-                return new Label((GlobalizedMessage) value);
+                return new Label("");
             }
         }
     }

ccm-sci-assets-publicationsabout/src/com/arsdigita/cms/contentassets/ui/SciPublicationsAboutDiscussesTable.java

@@ -141,8 +141,8 @@ public class SciPublicationsAboutDiscussesTable extends Table implements TableAc
                 case 0:
                     return discussed.getTitle();
                 case 1:
-                    return SciPublicationsAboutGlobalizationUtil.globalize(
+                    return new Label(SciPublicationsAboutGlobalizationUtil.globalize(
-                        "com.arsdigita.cms.contentassets.about.discusses.publication.remove");
+                        "com.arsdigita.cms.contentassets.about.discusses.publication.remove"));
                 default:
                     return null;
             }
@@ -215,12 +215,12 @@ public class SciPublicationsAboutDiscussesTable extends Table implements TableAc
                 discussing);
             
             if (canEdit) {
-                final ControlLink link = new ControlLink(new Label((GlobalizedMessage) value));
+                final ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(SciPublicationsAboutGlobalizationUtil.globalize(
                     "com.arsdigita.cms.contentassets.about.discusses.publication.remove.confirm"));
                 return link;
             } else {
-                return new Label(value.toString());
+                return new Label("");
             }
         }
 

ccm-sci-assets-publicationsabout/src/com/arsdigita/cms/contentassets/ui/SciPublicationsAboutDiscussingTable.java

@@ -141,8 +141,8 @@ public class SciPublicationsAboutDiscussingTable extends Table implements TableA
                 case 0:
                     return discussing.getTitle();
                 case 1:
-                    return SciPublicationsAboutGlobalizationUtil.globalize(
+                    return new Label(SciPublicationsAboutGlobalizationUtil.globalize(
-                        "com.arsdigita.cms.contentassets.about.discussing.publication.remove");
+                        "com.arsdigita.cms.contentassets.about.discussing.publication.remove"));
                 default:
                     return null;
             }
@@ -152,6 +152,7 @@ public class SciPublicationsAboutDiscussingTable extends Table implements TableA
         public Object getKeyAt(final int columnIndex) {
             return discussing.getID();
         }
+
     }
 
     private class PublicationCellRenderer extends LockableImpl implements TableCellRenderer {
@@ -214,12 +215,12 @@ public class SciPublicationsAboutDiscussingTable extends Table implements TableA
                 discussed);
 
             if (canEdit) {
-                final ControlLink link = new ControlLink(new Label((GlobalizedMessage) value));
+                final ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(SciPublicationsAboutGlobalizationUtil.globalize(
                     "com.arsdigita.cms.contentassets.about.discussing.publication.remove.confirm"));
                 return link;
             } else {
-                return new Label(value.toString());
+                return new Label("");
             }
         }
 

ccm-sci-assets-publicationslibrarysignatures/src/com/arsdigita/cms/contentassets/ui/LibrarySignaturesTable.java

@@ -156,9 +156,9 @@ public class LibrarySignaturesTable extends Table {
                 case 2:
                     return librarySignatures.get(LibrarySignature.LIBRARY_LINK);
                 case 3:
-                    return LibrarySignaturesGlobalizationUtil.globalize("scipublications.librarysignatures.edit");
+                    return new Label(LibrarySignaturesGlobalizationUtil.globalize("scipublications.librarysignatures.edit"));
                 case 4:
-                    return LibrarySignaturesGlobalizationUtil.globalize("scipublications.librarysignatures.delete");
+                    return new Label(LibrarySignaturesGlobalizationUtil.globalize("scipublications.librarysignatures.delete"));
                 default:
                     return null;
             }
@@ -193,25 +193,10 @@ public class LibrarySignaturesTable extends Table {
                                                               publication);
 
             if (canEdit) {
-                final ControlLink link;
+                final ControlLink link= new ControlLink((Label) value);
-                if (value instanceof GlobalizedMessage) {
-                    link = new ControlLink(new Label((GlobalizedMessage) value));
-                } else if (value == null) {
-                    return new Label("???");
-                } else {
-                    link = new ControlLink(value.toString());
-                }
                 return link;
             } else {
-                final Label label;
+                return new Label("");
-                if (value instanceof GlobalizedMessage) {
-                    label = new Label((GlobalizedMessage) value);
-                } else if (value == null) {
-                    return new Label("???");
-                } else {
-                    label = new Label(value.toString());
-                }
-                return label;
             }
         }
 
@@ -239,23 +224,12 @@ public class LibrarySignaturesTable extends Table {
                                                               publication);
 
             if (canEdit) {
-                final ControlLink link;
+                final ControlLink link = new ControlLink((Label) value);
-                if (value instanceof GlobalizedMessage) {
-                    link = new ControlLink(new Label((GlobalizedMessage) value));
-                } else {
-                    link = new ControlLink(value.toString());
-                }
                 link.setConfirmation(LibrarySignaturesGlobalizationUtil.globalize(
                         "scipublications.librarysignatures.delete.confirm"));
                 return link;
             } else {
-                final Label label;
+                return new Label("");
-                if (value instanceof GlobalizedMessage) {
-                    label = new Label((GlobalizedMessage) value);
-                } else {
-                    label = new Label(value.toString());
-                }
-                return label;
             }
         }
 

ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsPersonTable.java

@@ -161,8 +161,8 @@ public class SciPublicationsPersonsPersonTable extends Table implements TableAct
                 case 1:
                     return relation;
                 case 2:
-                    return globalisationUtil.globalize(
+                    return new Label(globalisationUtil.globalize(
-                        "com.arsdigita.cms.contentassets.publication_persons.person.remove");
+                        "com.arsdigita.cms.contentassets.publication_persons.person.remove"));
                 default:
                     return null;
             }
@@ -230,28 +230,12 @@ public class SciPublicationsPersonsPersonTable extends Table implements TableAct
                                       final int row,
                                       final int column) {
 
-            final GlobalizedMessage relation = new GlobalizedMessage((String) value, 
+            final GlobalizedMessage relation = new GlobalizedMessage(
+                (String) value,
                 SciPublicationsPersonsService.RELATION_ATTRIBUTE,
                 new RelationAttributeResourceBundleControl());
 
             return new Label(relation);
-            
-//            final String relation = (String) value;
-//
-//            final RelationAttributeCollection relations = new RelationAttributeCollection(
-//                SciPublicationsPersonsService.RELATION_ATTRIBUTE,
-//                relation);
-//            relations.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale().getLanguage());
-//            if (relations.isEmpty()) {
-//                return new Label(relation);
-//            } else {
-//                relations.next();
-//                final String label = relations.getName();
-//                relations.close();
-//                return new Label(label);
-//            }
-
-            //return new Label(value.toString());
         }
 
     }
@@ -275,12 +259,12 @@ public class SciPublicationsPersonsPersonTable extends Table implements TableAct
                 publication);
 
             if (canEdit) {
-                final ControlLink link = new ControlLink(new Label((GlobalizedMessage) value));
+                final ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(globalisationUtil.globalize(
                     "com.arsdigita.cms.contentassets.publications_persons.person.remove.confirm"));
                 return link;
             } else {
-                return new Label((GlobalizedMessage) value);
+                return new Label("");
             }
         }
 

ccm-sci-assets-publicationspublicationtype/src/com/arsdigita/cms/contentassets/ui/PublicationTypeAssetTable.java

@@ -73,23 +73,28 @@ public class PublicationTypeAssetTable extends Table {
 
         columnModel.add(new TableColumn(
             0,
-                PublicationTypeAssetGlobalizationUtil.globalize("scipublications.publication_type_asset.type"),
+            PublicationTypeAssetGlobalizationUtil.globalize(
+                "scipublications.publication_type_asset.type"),
             TABLE_COL_TYPE));
         columnModel.add(new TableColumn(
             1,
-                PublicationTypeAssetGlobalizationUtil.globalize("scipublications.publication_type_asset.isbn"),
+            PublicationTypeAssetGlobalizationUtil.globalize(
+                "scipublications.publication_type_asset.isbn"),
             TABLE_COL_ISBN));
         columnModel.add(new TableColumn(
             2,
-                PublicationTypeAssetGlobalizationUtil.globalize("scipublications.publication_type_asset.misc"),
+            PublicationTypeAssetGlobalizationUtil.globalize(
+                "scipublications.publication_type_asset.misc"),
             TABLE_COL_MISC));
         columnModel.add(new TableColumn(
             3,
-                PublicationTypeAssetGlobalizationUtil.globalize("scipublications.publication_type_asset.edit"),
+            PublicationTypeAssetGlobalizationUtil.globalize(
+                "scipublications.publication_type_asset.edit"),
             TABLE_COL_EDIT));
         columnModel.add(new TableColumn(
             4,
-                PublicationTypeAssetGlobalizationUtil.globalize("scipublications.publication_type_asset.delete"),
+            PublicationTypeAssetGlobalizationUtil.globalize(
+                "scipublications.publication_type_asset.delete"),
             TABLE_COL_DEL));
 
         setModelBuilder(new ModelBuilder(itemModel));
@@ -150,11 +155,11 @@ public class PublicationTypeAssetTable extends Table {
                 case 2:
                     return typeAssets.get(PublicationTypeAsset.MISC);
                 case 3:
-                    return PublicationTypeAssetGlobalizationUtil.globalize(
+                    return new Label(PublicationTypeAssetGlobalizationUtil.globalize(
-                            "scipublications.publication_type_asset.edit");
+                        "scipublications.publication_type_asset.edit"));
                 case 4:
-                    return PublicationTypeAssetGlobalizationUtil.globalize(
+                    return new Label(PublicationTypeAssetGlobalizationUtil.globalize(
-                            "scipublications.publication_type_asset.delete");
+                        "scipublications.publication_type_asset.delete"));
                 default:
                     return null;
             }
@@ -189,25 +194,11 @@ public class PublicationTypeAssetTable extends Table {
                                                               publication);
 
             if (canEdit) {
-                final ControlLink link;
+                final ControlLink link = new ControlLink((Label) value);
-                if (value instanceof GlobalizedMessage) {
-                    link = new ControlLink(new Label((GlobalizedMessage) value));
-                } else if (value == null) {
-                    return new Label("???");
-                } else {
-                    link = new ControlLink(value.toString());
-                }
                 return link;
             } else {
                 final Label label;
-                if (value instanceof GlobalizedMessage) {
+                return new Label("");
-                    label = new Label((GlobalizedMessage) value);
-                } else if (value == null) {
-                    return new Label("???");
-                } else {
-                    label = new Label(value.toString());
-                }
-                return label;
             }
         }
 
@@ -235,23 +226,12 @@ public class PublicationTypeAssetTable extends Table {
                                                               publication);
 
             if (canEdit) {
-                final ControlLink link;
+                final ControlLink link = new ControlLink((Label) value);
-                if (value instanceof GlobalizedMessage) {
-                    link = new ControlLink(new Label((GlobalizedMessage) value));
-                } else {
-                    link = new ControlLink(value.toString());
-                }
                 link.setConfirmation(PublicationTypeAssetGlobalizationUtil.globalize(
                     "scipublications.publication_type_asset.delete.confirm"));
                 return link;
             } else {
-                final Label label;
+                return new Label("");
-                if (value instanceof GlobalizedMessage) {
-                    label = new Label((GlobalizedMessage) value);
-                } else {
-                    label = new Label(value.toString());
-                }
-                return label;
             }
 
         }
@@ -268,7 +248,8 @@ public class PublicationTypeAssetTable extends Table {
         public void cellSelected(final TableActionEvent event) {
             final PageState state = event.getPageState();
 
-            final PublicationTypeAsset asset = new PublicationTypeAsset(new BigDecimal(event.getRowKey().toString()));
+            final PublicationTypeAsset asset = new PublicationTypeAsset(new BigDecimal(event
+                .getRowKey().toString()));
 
             final TableColumn column = getColumnModel().get(event.getColumn().intValue());
 
@@ -286,4 +267,5 @@ public class PublicationTypeAssetTable extends Table {
         }
 
     }
+
 }

ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieDirectorSheet.java

@@ -234,7 +234,7 @@ public class SciPublicationsMovieDirectorSheet
                 movie);
 
             if (canEdit) {
-                final ControlLink link = new ControlLink((Label)value);
+                final ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(globalisationUtil.globalize(
                     "publications.dramaticarts.ui.movie.director.remove.confirm"));
                 return link;

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeSheet.java

@@ -152,9 +152,8 @@ public class ArticleInCollectedVolumeCollectedVolumeSheet
                 case 0:
                     return collectedVolume.getTitle();
                 case 1:
-                    return PublicationGlobalizationUtil.globalize(
+                    return new Label(PublicationGlobalizationUtil.globalize(
-                            "publications.ui.articleInCollectedVolume.collectedVolume.remove").
+                            "publications.ui.articleInCollectedVolume.collectedVolume.remove"));
-                            localize();
                 default:
                     return null;
             }
@@ -244,15 +243,14 @@ public class ArticleInCollectedVolumeCollectedVolumeSheet
                     article);
 
             if (canEdit) {
-                ControlLink link = new ControlLink(value.toString());
+                ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(
                         PublicationGlobalizationUtil.globalize(
                         "publications.ui.articleInCollectedVolume.collectedVolume."
                         + "confirm_remove"));
                 return link;
             } else {
-                Label label = new Label(value.toString());
+                return new Label("");
-                return label;
             }
         }
 

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalSheet.java

@@ -142,9 +142,8 @@ public class ArticleInJournalJournalSheet
                 case 0:
                     return journal.getTitle();
                 case 1:
-                    return PublicationGlobalizationUtil.globalize(
+                    return new Label(PublicationGlobalizationUtil.globalize(
-                            "publications.ui.articleInCollectedVolume.collectedVolume.remove").
+                            "publications.ui.articleInCollectedVolume.collectedVolume.remove"));
-                            localize();
                 default:
                     return null;
             }
@@ -227,15 +226,13 @@ public class ArticleInJournalJournalSheet
                                                         article);
 
             if (canEdit) {
-                ControlLink link = new ControlLink(value.toString());
+                ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(
-                        (String) PublicationGlobalizationUtil.globalize(
+                        PublicationGlobalizationUtil.globalize(
-                        "publication.ui.articleInJournal.journal.confirm_remove").
+                        "publication.ui.articleInJournal.journal.confirm_remove"));
-                        localize());
                 return link;
             } else {
-                Label label = new Label(value.toString());
+                return new Label("");
-                return label;
             }
         }
     }

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeArticlesTable.java

@@ -53,8 +53,7 @@ public class CollectedVolumeArticlesTable
     extends Table
     implements TableActionListener {
 
-    private static final Logger s_log =
+    private static final Logger s_log = Logger.getLogger(
-                                Logger.getLogger(
         CollectedVolumeArticlesTable.class);
     private final String TABLE_COL_EDIT = "table_col_edit";
     private final String TABLE_COL_DEL = "table_col_del";
@@ -117,13 +116,13 @@ public class CollectedVolumeArticlesTable
         @Override
         public TableModel makeModel(Table table, PageState state) {
             table.getRowSelectionModel().clearSelection(state);
-            CollectedVolume collectedVolume =
+            CollectedVolume collectedVolume = (CollectedVolume) m_itemModel.getSelectedObject(
-                            (CollectedVolume) m_itemModel.getSelectedObject(
                 state);
             return new CollectedVolumeArticlesTableModel(table,
                                                          state,
                                                          collectedVolume);
         }
+
     }
 
     private class CollectedVolumeArticlesTableModel implements TableModel {
@@ -176,6 +175,7 @@ public class CollectedVolumeArticlesTable
         public Object getKeyAt(int columnIndex) {
             return m_article.getID();
         }
+
     }
 
     private class EditCellRenderer
@@ -190,8 +190,7 @@ public class CollectedVolumeArticlesTable
                                       Object key,
                                       int row,
                                       int col) {
-            SecurityManager securityManager =
+            SecurityManager securityManager = Utilities.getSecurityManager(state);
-                            Utilities.getSecurityManager(state);
             CollectedVolume collectedVolume = (CollectedVolume) m_itemModel.
                 getSelectedObject(state);
 
@@ -213,8 +212,7 @@ public class CollectedVolumeArticlesTable
 
                 ContentSection section = article.getContentSection();//CMS.getContext().getContentSection();
                 ItemResolver resolver = section.getItemResolver();
-                Link link =
+                Link link = new Link(value.toString(),
-                     new Link(value.toString(),
                                      resolver.generateItemURL(state,
                                                               article,
                                                               section,
@@ -236,6 +234,7 @@ public class CollectedVolumeArticlesTable
                 return label;
             }
         }
+
     }
 
     private class DeleteCellRenderer
@@ -250,10 +249,8 @@ public class CollectedVolumeArticlesTable
                                       Object key,
                                       int row,
                                       int col) {
-            SecurityManager securityManager =
+            SecurityManager securityManager = Utilities.getSecurityManager(state);
-                            Utilities.getSecurityManager(state);
+            CollectedVolume collectedVolume = (CollectedVolume) m_itemModel.getSelectedObject(
-            CollectedVolume collectedVolume =
-                            (CollectedVolume) m_itemModel.getSelectedObject(
                 state);
 
             boolean canEdit = securityManager.canAccess(
@@ -262,15 +259,15 @@ public class CollectedVolumeArticlesTable
                 collectedVolume);
 
             if (canEdit) {
-                ControlLink link = new ControlLink(value.toString());
+                ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(PublicationGlobalizationUtil.globalize(
                     "publications.ui.collected_volume.articles.confirm_remove"));
                 return link;
             } else {
-                Label label = new Label(value.toString());
+                return new Label("");
-                return label;
             }
         }
+
     }
 
     private class UpCellRenderer
@@ -296,6 +293,7 @@ public class CollectedVolumeArticlesTable
                 return link;
             }
         }
+
     }
 
     private class DownCellRenderer
@@ -312,11 +310,9 @@ public class CollectedVolumeArticlesTable
             int row,
             int col) {
 
-            CollectedVolume collectedVolume =
+            CollectedVolume collectedVolume = (CollectedVolume) m_itemModel.getSelectedObject(
-                            (CollectedVolume) m_itemModel.getSelectedObject(
                 state);
-            ArticleInCollectedVolumeCollection articles =
+            ArticleInCollectedVolumeCollection articles = collectedVolume.getArticles();
-                                               collectedVolume.getArticles();
 
             if ((articles.size() - 1) == row) {
                 s_log.debug("Row is last row in table, don't show down link");
@@ -327,21 +323,19 @@ public class CollectedVolumeArticlesTable
                 return link;
             }
         }
+
     }
 
     @Override
     public void cellSelected(TableActionEvent event) {
         PageState state = event.getPageState();
 
-        ArticleInCollectedVolume article =
+        ArticleInCollectedVolume article = new ArticleInCollectedVolume(
-                                 new ArticleInCollectedVolume(
             new BigDecimal(event.getRowKey().toString()));
 
-        CollectedVolume collectedVolume =
+        CollectedVolume collectedVolume = (CollectedVolume) m_itemModel.getSelectedObject(state);
-                        (CollectedVolume) m_itemModel.getSelectedObject(state);
 
-        ArticleInCollectedVolumeCollection articles =
+        ArticleInCollectedVolumeCollection articles = collectedVolume.getArticles();
-                                           collectedVolume.getArticles();
 
         TableColumn column = getColumnModel().get(event.getColumn().intValue());
 
@@ -359,4 +353,5 @@ public class CollectedVolumeArticlesTable
     public void headSelected(TableActionEvent event) {
         //Nothing to do.
     }
+
 }

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererSheet.java

@@ -231,13 +231,12 @@ public class ExpertiseOrdererSheet
                     expertise);
 
             if (canEdit) {
-                ControlLink link = new ControlLink(value.toString());
+                ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(PublicationGlobalizationUtil.globalize(
                         "publication.ui.expertise.orderer.remove.confirm"));
                 return link;
             } else {
-                Label label = new Label(value.toString());
+                return new Label("");
-                return label;
             }
         }
     }

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationSheet.java

@@ -231,13 +231,12 @@ public class ExpertiseOrganizationSheet
                     expertise);
 
             if (canEdit) {
-                ControlLink link = new ControlLink(value.toString());
+                ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(PublicationGlobalizationUtil.globalize(
                         "publication.ui.expertise.organization.remove.confirm"));
                 return link;
             } else {
-                Label label = new Label(value.toString());
+                return new Label("");
-                return label;
             }
         }
     }

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsTable.java

@@ -142,9 +142,8 @@ public class GenericOrganizationalUnitPublicationsTable
                 case 0:
                     return publications.getPublication().getTitle();
                 case 1:
-                    return PublicationGlobalizationUtil.globalize(
+                    return new Label(PublicationGlobalizationUtil.globalize(
-                            "genericorganizationalunit.ui.publications.remove").
+                            "genericorganizationalunit.ui.publications.remove"));
-                            localize();
                 default:
                     return null;
             }
@@ -219,13 +218,12 @@ public class GenericOrganizationalUnitPublicationsTable
                     orgaunit);
 
             if (canEdit) {
-                final ControlLink link = new ControlLink(value.toString());
+                final ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(PublicationGlobalizationUtil.globalize(
                      "genericorganizationalunit.ui.publications.remove.confirm"));
                 return link;
             } else {
-                final Label label = new Label(value.toString());
+                return new Label("");
-                return label;
             }
         }
 

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsProceedingsSheet.java

@@ -242,13 +242,12 @@ public class InProceedingsProceedingsSheet
                     inProceedings);
 
             if (canEdit) {
-                ControlLink link = new ControlLink(value.toString());
+                ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(PublicationGlobalizationUtil.globalize(
                      "publications.ui.inProceedings.proceedings.confirm_remove"));
                 return link;
             } else {
-                Label label = new Label(value.toString());
+                return new Label("");
-                return label;
             }
         }
     }

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationSheet.java

@@ -242,13 +242,12 @@ public class InternetArticleOrganizationSheet
                     article);
 
             if (canEdit) {
-                ControlLink link = new ControlLink(value.toString());
+                ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(PublicationGlobalizationUtil.globalize(
                      "publications.ui.internetarticle.organization.remove.confirm"));
                 return link;
             } else {
-                Label label = new Label(value.toString());
+                return new Label("");
-                return label;
             }
         }
     }

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticlesTable.java

@@ -112,13 +112,13 @@ public class JournalArticlesTable
         @Override
         public TableModel makeModel(Table table, PageState state) {
             table.getRowSelectionModel().clearSelection(state);
-            Journal collectedVolume =
+            Journal collectedVolume = (Journal) m_itemModel.getSelectedObject(
-                    (Journal) m_itemModel.getSelectedObject(
                 state);
             return new JournalArticlesTableModel(table,
                                                  state,
                                                  collectedVolume);
         }
+
     }
 
     private class JournalArticlesTableModel implements TableModel {
@@ -170,6 +170,7 @@ public class JournalArticlesTable
         public Object getKeyAt(int columnIndex) {
             return m_article.getID();
         }
+
     }
 
     private class EditCellRenderer
@@ -184,8 +185,7 @@ public class JournalArticlesTable
                                       Object key,
                                       int row,
                                       int col) {
-            com.arsdigita.cms.SecurityManager securityManager =
+            com.arsdigita.cms.SecurityManager securityManager = Utilities.getSecurityManager(state);
-                                              Utilities.getSecurityManager(state);
             Journal journal = (Journal) m_itemModel.getSelectedObject(state);
 
             boolean canEdit = securityManager.canAccess(
@@ -205,8 +205,7 @@ public class JournalArticlesTable
                 }
                 ContentSection section = article.getContentSection();//CMS.getContext().getContentSection();
                 ItemResolver resolver = section.getItemResolver();
-                Link link =
+                Link link = new Link(String.format("%s (%s)",
-                     new Link(String.format("%s (%s)",
                                                    value.toString(),
                                                    article.getLanguage()),
                                      resolver.generateItemURL(state,
@@ -231,6 +230,7 @@ public class JournalArticlesTable
                 return label;
             }
         }
+
     }
 
     private class DeleteCellRenderer extends LockableImpl implements
@@ -255,14 +255,15 @@ public class JournalArticlesTable
                 com.arsdigita.cms.SecurityManager.DELETE_ITEM,
                 journal);
             if (canEdit) {
-                ControlLink link = new ControlLink(value.toString());
+                ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(PublicationGlobalizationUtil.globalize(
                     "cms.contenttypes.ui.journal.articles.confirm_delete"));
                 return link;
             } else {
-                return new Label(value.toString());
+                return new Label("");
             }
         }
+
     }
 
     private class UpCellRenderer
@@ -289,6 +290,7 @@ public class JournalArticlesTable
                 return link;
             }
         }
+
     }
 
     private class DownCellRenderer
@@ -318,6 +320,7 @@ public class JournalArticlesTable
                 return link;
             }
         }
+
     }
 
     @Override
@@ -353,4 +356,5 @@ public class JournalArticlesTable
     public void headSelected(TableActionEvent event) {
         //Nothing to do
     }
+
 }

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerSheet.java

@@ -234,13 +234,12 @@ public class ProceedingsOrganizerSheet
                     proceedings);
 
             if (canEdit) {
-                ControlLink link = new ControlLink(value.toString());
+                ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(PublicationGlobalizationUtil.globalize(
                         "publications.ui.proceedings.organizer.remove.confirm"));
                 return link;
             } else {
-                Label label = new Label(value.toString());
+                return new Label("");
-                return label;
             }
         }
     }

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPapersTable.java

@@ -269,13 +269,12 @@ public class ProceedingsPapersTable
                     proceedings);
 
             if (canEdit) {
-                ControlLink link = new ControlLink(value.toString());
+                ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(PublicationGlobalizationUtil.globalize(
                         "publications.ui.proceedings.paper.confirm_remove"));
                 return link;
             } else {
-                Label label = new Label(value.toString());
+                return new Label("");
-                return label;
             }
         }
     }

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsTable.java

@@ -309,7 +309,7 @@ public class PublicationAuthorsTable
                 ControlLink link = new ControlLink((Label) value);
                 return link;
             } else {
-                return (Label) value;
+                return new Label("");
             }
         }
 
@@ -342,7 +342,7 @@ public class PublicationAuthorsTable
                     "publications.ui.authors.author.confirm_remove"));
                 return link;
             } else {
-                return (Label) value;
+                return new Label("");
             }
         }
 

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationGenericOrganizationalUnitsTable.java

@@ -167,8 +167,7 @@ public class PublicationGenericOrganizationalUnitsTable extends Table {
                                       final int row,
                                       final int column) {
             final com.arsdigita.cms.SecurityManager securityManager = CMS.getSecurityManager(state);
-            final GenericOrganizationalUnit orgaunit =
+            final GenericOrganizationalUnit orgaunit = new GenericOrganizationalUnit(
-                                            new GenericOrganizationalUnit(
                 (BigDecimal) key);
 
             final boolean canEdit = securityManager.canAccess(
@@ -211,9 +210,7 @@ public class PublicationGenericOrganizationalUnitsTable extends Table {
                                       final int row,
                                       final int column) {
             final com.arsdigita.cms.SecurityManager securityManager = CMS.getSecurityManager(state);
-            final Publication publication =
+            final Publication publication = (Publication) itemModel.getSelectedObject(state);
-                              (Publication) itemModel.getSelectedObject(state);
-
 
             boolean canEdit = securityManager.canAccess(
                 state.getRequest(),
@@ -221,13 +218,12 @@ public class PublicationGenericOrganizationalUnitsTable extends Table {
                 publication);
 
             if (canEdit) {
-                final ControlLink link = new ControlLink(value.toString());
+                final ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(PublicationGlobalizationUtil.globalize(
                     "publications.ui.orgaunits.remove.confirm"));
                 return link;
             } else {
-                final Label label = new Label("");
+                return new Label("");
-                return label;
             }
         }
 
@@ -239,8 +235,7 @@ public class PublicationGenericOrganizationalUnitsTable extends Table {
         public void cellSelected(final TableActionEvent event) {
             final PageState state = event.getPageState();
 
-            final GenericOrganizationalUnit orgaunit =
+            final GenericOrganizationalUnit orgaunit = new GenericOrganizationalUnit(
-                                            new GenericOrganizationalUnit(
                 new BigDecimal(event.getRowKey().toString()));
             final Publication publication = (Publication) itemModel.
                 getSelectedObject(state);
@@ -264,4 +259,5 @@ public class PublicationGenericOrganizationalUnitsTable extends Table {
         }
 
     }
+
 }

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationWithPublisherSetPublisherSheet.java

@@ -95,13 +95,13 @@ public class PublicationWithPublisherSetPublisherSheet
         @Override
         public TableModel makeModel(final Table table, final PageState state) {
             table.getRowSelectionModel().clearSelection(state);
-            PublicationWithPublisher publication =
+            PublicationWithPublisher publication = (PublicationWithPublisher) itemModel.
-                                     (PublicationWithPublisher) itemModel.
                 getSelectedObject(state);
             return new PublicationWithPublisherSetPublisherSheetModel(table,
                                                                       state,
                                                                       publication);
         }
+
     }
 
     private class PublicationWithPublisherSetPublisherSheetModel
@@ -159,6 +159,7 @@ public class PublicationWithPublisherSetPublisherSheet
         public Object getKeyAt(final int columnIndex) {
             return publisher.getID();
         }
+
     }
 
     private class EditCellRenderer
@@ -173,10 +174,8 @@ public class PublicationWithPublisherSetPublisherSheet
                                       Object key,
                                       int row,
                                       int column) {
-            com.arsdigita.cms.SecurityManager securityManager =
+            com.arsdigita.cms.SecurityManager securityManager = CMS.getSecurityManager(state);
-                                              CMS.getSecurityManager(state);
+            PublicationWithPublisher publication = (PublicationWithPublisher) itemModel.
-            PublicationWithPublisher publication =
-                                     (PublicationWithPublisher) itemModel.
                 getSelectedObject(state);
 
             boolean canEdit = securityManager.canAccess(state.getRequest(),
@@ -193,8 +192,7 @@ public class PublicationWithPublisherSetPublisherSheet
 
                 ContentSection section = publisher.getContentSection();//CMS.getContext().getContentSection();
                 ItemResolver resolver = section.getItemResolver();
-                Link link =
+                Link link = new Link(value.toString(),
-                     new Link(value.toString(),
                                      resolver.generateItemURL(state,
                                                               publisher,
                                                               section,
@@ -214,6 +212,7 @@ public class PublicationWithPublisherSetPublisherSheet
                 return label;
             }
         }
+
     }
 
     private class DeleteCellRenderer
@@ -228,10 +227,8 @@ public class PublicationWithPublisherSetPublisherSheet
                                       Object key,
                                       int row,
                                       int col) {
-            com.arsdigita.cms.SecurityManager securityManager =
+            com.arsdigita.cms.SecurityManager securityManager = CMS.getSecurityManager(state);
-                                              CMS.getSecurityManager(state);
+            PublicationWithPublisher publication = (PublicationWithPublisher) itemModel.
-            PublicationWithPublisher publication =
-                                     (PublicationWithPublisher) itemModel.
                 getSelectedObject(
                     state);
 
@@ -241,23 +238,22 @@ public class PublicationWithPublisherSetPublisherSheet
                 publication);
 
             if (canEdit) {
-                ControlLink link = new ControlLink(value.toString());
+                ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(PublicationGlobalizationUtil.globalize(
                     "publications.ui.with_publisher.publisher.remove.confirm"));
                 return link;
             } else {
-                Label label = new Label(value.toString());
+                return new Label("");
-                return label;
             }
         }
+
     }
 
     @Override
     public void cellSelected(final TableActionEvent event) {
         PageState state = event.getPageState();
 
-        PublicationWithPublisher publication =
+        PublicationWithPublisher publication = (PublicationWithPublisher) itemModel.
-                                 (PublicationWithPublisher) itemModel.
             getSelectedObject(state);
 
         TableColumn column = getColumnModel().get(event.getColumn().intValue());
@@ -273,4 +269,5 @@ public class PublicationWithPublisherSetPublisherSheet
     public void headSelected(final TableActionEvent event) {
         //Nothing to do
     }
+
 }

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesEditshipTable.java

@@ -52,10 +52,11 @@ import org.apache.log4j.Logger;
  *
  * @author Jens Pelzetter
  */
+
+
 public class SeriesEditshipTable extends Table implements TableActionListener {
 
-    private static final Logger s_log =
+    private static final Logger s_log = Logger.getLogger(SeriesEditshipTable.class);
-                                Logger.getLogger(SeriesEditshipTable.class);
     private final String TABLE_COL_EDIT = "table_col_edit";
     private final String TABLE_COL_EDIT_EDITSHIP = "table_col_edit_editship";
     private final String TABLE_COL_DEL = "table_col_del";
@@ -134,10 +135,10 @@ public class SeriesEditshipTable extends Table implements TableActionListener {
 
         public TableModel makeModel(Table table, PageState state) {
             table.getRowSelectionModel().clearSelection(state);
-            Series series =
+            Series series = (Series) m_itemModel.getSelectedObject(state);
-                   (Series) m_itemModel.getSelectedObject(state);
             return new SeriesEditshipTableModel(table, state, series);
         }
+
     }
 
     private class SeriesEditshipTableModel implements TableModel {
@@ -211,6 +212,7 @@ public class SeriesEditshipTable extends Table implements TableActionListener {
         public Object getKeyAt(int columnIndex) {
             return m_editor.getID();
         }
+
     }
 
     private class EditCellRenderer
@@ -226,8 +228,7 @@ public class SeriesEditshipTable extends Table implements TableActionListener {
             Object key,
             int row,
             int col) {
-            SecurityManager securityManager =
+            SecurityManager securityManager = CMS.getSecurityManager(state);
-                            CMS.getSecurityManager(state);
             Series series = (Series) m_itemModel.getSelectedObject(state);
 
             boolean canEdit = securityManager.canAccess(
@@ -247,8 +248,7 @@ public class SeriesEditshipTable extends Table implements TableActionListener {
                 }
                 ContentSection section = editor.getContentSection();//CMS.getContext().getContentSection();
                 ItemResolver resolver = section.getItemResolver();
-                Link link =
+                Link link = new Link(String.format("%s",
-                     new Link(String.format("%s",
                                                    value.toString(),
                                                    editor.getLanguage()),
                                      resolver.generateItemURL(state,
@@ -273,6 +273,7 @@ public class SeriesEditshipTable extends Table implements TableActionListener {
                 return label;
             }
         }
+
     }
 
     private class EditEditshipCellRenderer
@@ -287,8 +288,7 @@ public class SeriesEditshipTable extends Table implements TableActionListener {
                                       Object key,
                                       int row,
                                       int col) {
-            SecurityManager securityManager =
+            SecurityManager securityManager = CMS.getSecurityManager(state);
-                            CMS.getSecurityManager(state);
             Series series = (Series) m_itemModel.getSelectedObject(state);
 
             boolean canEdit = securityManager.canAccess(
@@ -297,13 +297,13 @@ public class SeriesEditshipTable extends Table implements TableActionListener {
                 series);
 
             if (canEdit) {
-                ControlLink link = new ControlLink(value.toString());
+                ControlLink link = new ControlLink((Label) value);
                 return link;
             } else {
-                Label label = new Label(value.toString());
+                return new Label("");
-                return label;
             }
         }
+
     }
 
     private class DeleteCellRenderer
@@ -319,8 +319,7 @@ public class SeriesEditshipTable extends Table implements TableActionListener {
             Object key,
             int row,
             int col) {
-            SecurityManager securityManager =
+            SecurityManager securityManager = Utilities.getSecurityManager(state);
-                            Utilities.getSecurityManager(state);
             Series series = (Series) m_itemModel.getSelectedObject(state);
 
             boolean canDelete = securityManager.canAccess(
@@ -329,15 +328,15 @@ public class SeriesEditshipTable extends Table implements TableActionListener {
                 series);
 
             if (canDelete) {
-                ControlLink link = new ControlLink(value.toString());
+                ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(PublicationGlobalizationUtil.globalize(
                     "publications.ui.series.editship.remove.confirm"));
                 return link;
             } else {
-                Label label = new Label(value.toString());
+                return new Label("");
-                return label;
             }
         }
+
     }
 
     /*
@@ -400,8 +399,7 @@ public class SeriesEditshipTable extends Table implements TableActionListener {
     public void cellSelected(TableActionEvent event) {
         PageState state = event.getPageState();
 
-        GenericPerson editor =
+        GenericPerson editor = new GenericPerson(new BigDecimal(event.getRowKey().
-                      new GenericPerson(new BigDecimal(event.getRowKey().
             toString()));
 
         Series series = (Series) m_itemModel.getSelectedObject(state);
@@ -443,4 +441,5 @@ public class SeriesEditshipTable extends Table implements TableActionListener {
     public void headSelected(TableActionEvent event) {
         //Nothing to do here.
     }
+
 }

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesVolumesTable.java

@@ -257,9 +257,9 @@ public class SeriesVolumesTable extends Table {
                     series);
 
             if (canEdit) {
-                return new ControlLink(value.toString());
+                return new ControlLink((Label)value);
             } else {
-                return new Label(value.toString());
+                return new Label("");
             }
         }
 
@@ -284,13 +284,12 @@ public class SeriesVolumesTable extends Table {
                     series);
 
             if (canDelete) {
-                final ControlLink link = new ControlLink(value.toString());
+                final ControlLink link = new ControlLink((Label) value);
                 link.setConfirmation(PublicationGlobalizationUtil.globalize(
                         "publications.ui.series.volumes.remove.confirm"));
                 return link;
             } else {
-                final Label label = new Label(value.toString());
+                return new Label("");
-                return label;
             }
         }
 

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/UnPublishedOrganizationSheet.java

@@ -234,13 +234,12 @@ public class UnPublishedOrganizationSheet
                                                         unPublished);
 
             if (canEdit) {
-                ControlLink link = new ControlLink(value.toString());
+                ControlLink link = new ControlLink((Label)value);
                 link.setConfirmation(PublicationGlobalizationUtil.globalize(
                      "publications.ui.unpublished.organization.confirm_remove"));
                 return link;
             } else {
-                Label label = new Label(value.toString());
+                return new Label("");
-                return label;
             }
         }
     }

ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSponsorSheet.java

@@ -171,8 +171,8 @@ public class SciProjectSponsorSheet extends Table {
                                       final int row,
                                       final int column) {
             final com.arsdigita.cms.SecurityManager securityManager = CMS.getSecurityManager(state);
-            final GenericOrganizationalUnit sponsor =
+            final GenericOrganizationalUnit sponsor
-                                            new GenericOrganizationalUnit((BigDecimal) key);
+                                            = new GenericOrganizationalUnit((BigDecimal) key);
 
             final boolean canEdit = securityManager.canAccess(
                 state.getRequest(),
@@ -220,11 +220,10 @@ public class SciProjectSponsorSheet extends Table {
                 project);
 
             if (canEdit) {
-                final ControlLink link = new ControlLink(value.toString());
+                final ControlLink link = new ControlLink((Label) value);
                 return link;
             } else {
-                final Label label = new Label(value.toString());
+                return (Label) value;
-                return label;
             }
 
         }
@@ -242,15 +241,15 @@ public class SciProjectSponsorSheet extends Table {
                                       final int row,
                                       final int column) {
             final com.arsdigita.cms.SecurityManager securityManager = CMS.getSecurityManager(state);
-            final GenericOrganizationalUnit sponsor =
+            final GenericOrganizationalUnit sponsor
-                                            new GenericOrganizationalUnit((BigDecimal) key);
+                                            = new GenericOrganizationalUnit((BigDecimal) key);
 
             final boolean canEdit = securityManager.canAccess(
                 state.getRequest(),
                 com.arsdigita.cms.SecurityManager.EDIT_ITEM,
                 sponsor);
             if (canEdit) {
-                final ControlLink link = new ControlLink(value.toString());
+                final ControlLink link = new ControlLink((Label)value);
                 link.setConfirmation(SciProjectGlobalizationUtil.globalize(
                     "sciproject.ui.sponsor.remove.confirm"));
                 return link;
@@ -360,4 +359,5 @@ public class SciProjectSponsorSheet extends Table {
         }
 
     }
+
 }