From ae2d4faad36d74fc63d1a1f83f7e8da3b5ef4845 Mon Sep 17 00:00:00 2001 From: jensp Date: Sat, 9 Nov 2013 14:55:05 +0000 Subject: [PATCH] Verschiedener Kleinkram, unter anderem Tippfehler und Formatierung git-svn-id: https://svn.libreccm.org/ccm/trunk@2433 8810af33-2d31-482b-a856-94f89814c4df --- .../ContenttypesResources_de.properties | 2 +- .../categorization/CategoryTreeModelLite.java | 23 +++++++++++-------- .../ui/SciDepartmentSummaryTab.java | 2 +- .../ui/SciInstituteSummaryTab.java | 2 +- .../contenttypes/ui/SciProjectSummaryTab.java | 2 +- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources_de.properties b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources_de.properties index cb9ab703b..041000cd9 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources_de.properties +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources_de.properties @@ -51,7 +51,7 @@ cms.contenttypes.ui.contact.attach_person=Person verkn\u00fcpfen cms.contenttypes.ui.contact.edit_person=Person bearbeiten cms.contenttypes.ui.contact.reattach_person=Person neu verkn\u00fcpfen cms.contenttypes.ui.genericcontact.delete_person=Person l\u00f6schen -cms.contenttypes.ui.genericcontact.emptyPerson=Zur Zeit ist keine Person verkn\u00fcft +cms.contenttypes.ui.genericcontact.emptyPerson=Zur Zeit ist keine Person verkn\u00fcpft cms.contenttypes.ui.contact.select_person=Bitte w\u00e4hlen Sie einen Content-Item vom Typ Person cms.contenttypes.ui.contact.select_person.add=Verkn\u00fcpfen cms.contenttypes.ui.contact.select_person.change=Ver\u00e4ndern diff --git a/ccm-core/src/com/arsdigita/categorization/CategoryTreeModelLite.java b/ccm-core/src/com/arsdigita/categorization/CategoryTreeModelLite.java index 519a5900f..015bb96c2 100755 --- a/ccm-core/src/com/arsdigita/categorization/CategoryTreeModelLite.java +++ b/ccm-core/src/com/arsdigita/categorization/CategoryTreeModelLite.java @@ -31,9 +31,9 @@ import org.apache.log4j.Logger; * @version $Revision: #17 $ $DateTime: 2004/08/16 18:10:38 $ */ public class CategoryTreeModelLite extends DataQueryTreeModel { - private static final Logger s_log = - Logger.getLogger(CategoryTreeModelLite.class); + private static final Logger s_log = + Logger.getLogger(CategoryTreeModelLite.class); String m_order = null; /** @@ -42,8 +42,9 @@ public class CategoryTreeModelLite extends DataQueryTreeModel { * @param root the root category for this TreeModel */ public CategoryTreeModelLite(Category root) { - this(root,null); + this(root, null); } + /** * Initializes with the passed in the root Category. * @@ -58,25 +59,27 @@ public class CategoryTreeModelLite extends DataQueryTreeModel { } @Override - protected DataQueryTreeIterator getDataQueryTreeIterator - (DataQueryTreeNode node, String getSubCategories) { + protected DataQueryTreeIterator getDataQueryTreeIterator(DataQueryTreeNode node, + String getSubCategories) { return new CategoryTreeIterator(node, getSubCategories, m_order); } private static class CategoryTreeIterator extends DataQueryTreeIterator { + public CategoryTreeIterator(DataQueryTreeNode node, String getSubCategories, String order) { - super(node,getSubCategories); + super(node, getSubCategories); if (order != null) { addOrder(order); } } + @Override public Object next() { - DataQueryTreeNode node = (DataQueryTreeNode)super.next(); - + DataQueryTreeNode node = (DataQueryTreeNode) super.next(); + // m_nodes.getLink - node.setValue( Category.IS_ABSTRACT, - (Boolean)m_nodes.get(Category.IS_ABSTRACT)); + node.setValue(Category.IS_ABSTRACT, + (Boolean) m_nodes.get(Category.IS_ABSTRACT)); return node; } diff --git a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentSummaryTab.java b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentSummaryTab.java index 529d7b99c..5149e5e4b 100644 --- a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentSummaryTab.java +++ b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentSummaryTab.java @@ -281,7 +281,7 @@ public class SciDepartmentSummaryTab implements GenericOrgaUnitTab { private String getContactTypeName(final String contactTypeKey) { final RelationAttributeCollection relAttrs = new RelationAttributeCollection(); relAttrs.addFilter(String.format("attribute = '%s'", - "GenericContactTypes")); + "GenericOrganizationContactTypes")); relAttrs.addFilter(String.format("attr_key = '%s'", contactTypeKey)); relAttrs.addFilter(String.format("lang = '%s'", GlobalizationHelper. getNegotiatedLocale().getLanguage())); diff --git a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTab.java b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTab.java index 621157e49..abb88604b 100644 --- a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTab.java +++ b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTab.java @@ -346,7 +346,7 @@ public class SciInstituteSummaryTab implements GenericOrgaUnitTab { private String getContactTypeName(final String contactTypeKey) { final RelationAttributeCollection relAttrs = new RelationAttributeCollection(); relAttrs.addFilter(String.format("attribute = '%s'", - "GenericContactTypes")); + "GenericOrganizationContactTypes")); relAttrs.addFilter(String.format("attr_key = '%s'", contactTypeKey)); relAttrs.addFilter(String.format("lang = '%s'", GlobalizationHelper.getNegotiatedLocale(). getLanguage())); diff --git a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSummaryTab.java b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSummaryTab.java index 9f6cd5276..89175f569 100644 --- a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSummaryTab.java +++ b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSummaryTab.java @@ -335,7 +335,7 @@ public class SciProjectSummaryTab implements GenericOrgaUnitTab { final RelationAttributeCollection relAttrs = new RelationAttributeCollection(); relAttrs.addFilter(String.format("attribute = '%s'", - "GenericContactTypes")); + "GenericOrganizationContactTypes")); relAttrs.addFilter(String.format("attr_key = '%s'", contactTypeKey)); relAttrs.addFilter(String.format("lang = '%s'", GlobalizationHelper. getNegotiatedLocale().getLanguage()));