From 4635433f20f1a8bb7e9e4face2813c6d23fdde07 Mon Sep 17 00:00:00 2001 From: pb Date: Sat, 17 Apr 2010 08:24:52 +0000 Subject: [PATCH] Verschiedene deprecated Klassen und Methoden entfernt. git-svn-id: https://svn.libreccm.org/ccm/trunk@373 8810af33-2d31-482b-a856-94f89814c4df --- .../london/navigation/Initializer.java | 2 +- .../arsdigita/london/navigation/Loader.java | 2 +- .../navigation/portlet/ItemListPortlet.java | 2 +- .../navigation/portlet/ObjectListPortlet.java | 2 +- .../navigation/ui/AbstractObjectList.java | 2 +- .../london/navigation/ui/ContentList.java | 18 ++++++++---------- .../navigation/ui/NavigationRootIndexItem.java | 2 +- .../london/navigation/ui/RelatedItems.java | 2 +- .../navigation/ui/admin/CategoryTree.java | 2 +- 9 files changed, 16 insertions(+), 18 deletions(-) diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Initializer.java b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Initializer.java index 5a9189c48..7d9a8c4c1 100755 --- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Initializer.java +++ b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Initializer.java @@ -82,7 +82,7 @@ import com.arsdigita.xml.XML; * Executes recursivly at each system startup. * * @author Justin Ross <jross@redhat.com> - * @version $Id: Initializer.java 755 2005-09-02 13:42:47Z sskracic $ + * @version $Id: Initializer.java 2070 2010-01-28 08:47:41Z pboy $ */ public class Initializer extends CompoundInitializer { diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Loader.java b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Loader.java index f8e2c54b3..6eb479911 100755 --- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Loader.java +++ b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Loader.java @@ -52,7 +52,7 @@ import org.apache.log4j.Logger; * Loader. * * @author Justin Ross <jross@redhat.com> - * @version $Id: Loader.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: Loader.java 2070 2010-01-28 08:47:41Z pboy $ */ public class Loader extends PackageLoader { diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/portlet/ItemListPortlet.java b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/portlet/ItemListPortlet.java index 9bdc66062..05284e74f 100755 --- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/portlet/ItemListPortlet.java +++ b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/portlet/ItemListPortlet.java @@ -30,7 +30,7 @@ import com.arsdigita.london.navigation.ui.portlet.ItemListPortletRenderer; * The items can be selected / restricted by base type and filtered by a * category or category tree. Ordering and length of the list can be configured. * - * @version $Id: $ + * @version $Id: ItemListPortlet.java 2070 2010-01-28 08:47:41Z pboy $ */ public class ItemListPortlet extends ObjectListPortlet { diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/portlet/ObjectListPortlet.java b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/portlet/ObjectListPortlet.java index 5b8b23ea7..9146fe04e 100755 --- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/portlet/ObjectListPortlet.java +++ b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/portlet/ObjectListPortlet.java @@ -49,7 +49,7 @@ import org.apache.log4j.Logger; * The objects can be selected / restricted by object type and filtered by a * category or category tree. Ordering and length of the list can be configured. * - * @version $Id: $ + * @version $Id: ObjectListPortlet.java 2070 2010-01-28 08:47:41Z pboy $ */ public class ObjectListPortlet extends Portlet { private static final Logger s_log = diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/AbstractObjectList.java b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/AbstractObjectList.java index aa9094fc0..71739f06a 100755 --- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/AbstractObjectList.java +++ b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/AbstractObjectList.java @@ -63,7 +63,7 @@ public abstract class AbstractObjectList // attribute so that it can decide whether to order by date for // a date order category m_definition.setDateAttribute(m_renderer); - + return m_definition.getDataCollection(getModel()); } diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ContentList.java b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ContentList.java index e913b5737..480b09a9a 100755 --- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ContentList.java +++ b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ContentList.java @@ -67,32 +67,30 @@ import org.apache.log4j.Logger; * <xsl:include href="../../navigation/xsl/content-lists.xsl" /> * * - * @version $Revision: $ $Date: $ + * @version $Id: ContentList.java 1173 2006-06-14 13:54:39Z fabrice $ */ public class ContentList extends AbstractComponent { // extends SimpleComponent - - public static final String versionId = "$Id: ContentList.java 1173 2006-06-14 13:54:39Z fabrice $"; - - private static Logger log = Logger.getLogger(ContentList.class);; + + private static Logger log = Logger.getLogger(ContentList.class); private static final String TAG_ITEMLISTS = "cms:contentLists"; - + private static final String TAG_ITEMLIST = "cms:contentList"; private static final String TAG_ITEMLIST_TYPE = "type"; - + private static final String TAG_ITEM = "cms:item"; private static final String TAG_ITEM_ISINDEX = "name"; private static final String TAG_ITEM_ISINDEX_VALUE = "index"; - + private static final String NAVIGATION_ROOT_NAME = "Navigation"; private static final String CATEGORYID_PARAM = "categoryID"; private static final String CONTENTITEM_CLASS_NAME = ContentItem.class.getName(); - + public ContentList() { super(); } - + /** * Generates the XML. * diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/NavigationRootIndexItem.java b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/NavigationRootIndexItem.java index fee8b9f28..bcc40aa1f 100755 --- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/NavigationRootIndexItem.java +++ b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/NavigationRootIndexItem.java @@ -41,7 +41,7 @@ import org.apache.log4j.Logger; * @version $Id: $ */ public class NavigationRootIndexItem extends AbstractComponent { - + private static Logger log = Logger.getLogger(NavigationRootIndexItem.class);; private static final String TAG_PARENT = "navrootindex"; diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/RelatedItems.java b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/RelatedItems.java index 54d971619..c9c4dce00 100755 --- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/RelatedItems.java +++ b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/RelatedItems.java @@ -38,7 +38,7 @@ import org.apache.log4j.Logger; * model generates a component that contains related items. * * @author Tzu-Mainn Chen - * @version $Id: RelatedItems.java 755 2005-09-02 13:42:47Z sskracic $ + * @version $Id: RelatedItems.java 2011 2009-10-04 01:03:56Z pboy $ * */ diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategoryTree.java b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategoryTree.java index 99d61da59..42d33a746 100755 --- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategoryTree.java +++ b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategoryTree.java @@ -35,7 +35,7 @@ import com.arsdigita.london.navigation.Navigation; * Lists category tree. * * @author Tri Tran (tri@arsdigita.com) - * @version $Id: CategoryTree.java 1695 2008-03-18 11:47:59Z terry $ + * @version $Id: CategoryTree.java 2070 2010-01-28 08:47:41Z pboy $ */ public class CategoryTree extends Tree {