From dc36aea0be6db18033ab086c77ff885aacb9a223 Mon Sep 17 00:00:00 2001 From: pb Date: Fri, 22 Dec 2017 10:42:39 +0000 Subject: [PATCH] Manually synchronized with 2.3.x & rebased ccm-cms to ensure all Modifications mady by Alexander Konermann are included. git-svn-id: https://svn.libreccm.org/ccm/trunk@5178 8810af33-2d31-482b-a856-94f89814c4df --- .../cms/RelationAttributeImportTool.java | 1 - .../ui/GenericContactAddressSheet.java | 18 +++++++++++++++++- .../ui/GenericPersonExtraXmlGenerator.java | 1 - .../ui/panels/CollectionSortField.java | 17 +++++++++++++++++ .../cms/contenttypes/ui/panels/Paginator.java | 18 +++++++++++++++++- .../arsdigita/cms/ui/IdSearchResultTable.java | 18 +++++++++++++++--- .../src/com/arsdigita/cms/ui/IdSearchTab.java | 1 - .../contentcenter/ContentSectionContainer.java | 1 - .../cms/ui/contentcenter/MainPage.java | 3 +-- .../cms/ui/contentcenter/TasksPanel.java | 1 - .../cms/ui/contentsection/MainPage.java | 1 - .../com/arsdigita/cms/ui/staff/PartyInfo.java | 1 - 12 files changed, 67 insertions(+), 14 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/RelationAttributeImportTool.java b/ccm-cms/src/com/arsdigita/cms/RelationAttributeImportTool.java index 41b82e219..e3539c0dd 100644 --- a/ccm-cms/src/com/arsdigita/cms/RelationAttributeImportTool.java +++ b/ccm-cms/src/com/arsdigita/cms/RelationAttributeImportTool.java @@ -61,7 +61,6 @@ import org.xml.sax.helpers.DefaultHandler; * an description element containing a description of the entry. * * @author Jens Pelzetter - * @version $Id$ */ public class RelationAttributeImportTool { diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactAddressSheet.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactAddressSheet.java index d82c2dc58..85d99199b 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactAddressSheet.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactAddressSheet.java @@ -1,3 +1,20 @@ +/* + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ package com.arsdigita.cms.contenttypes.ui; import com.arsdigita.bebop.Component; @@ -28,7 +45,6 @@ import java.math.BigDecimal; /** * * @author Jens Pelzetter - * @version $Id$ */ public class GenericContactAddressSheet extends Table implements TableActionListener { diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonExtraXmlGenerator.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonExtraXmlGenerator.java index 9d706ebf6..03067bbcd 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonExtraXmlGenerator.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonExtraXmlGenerator.java @@ -32,7 +32,6 @@ import com.arsdigita.xml.Element; /** * * @author Jens Pelzetter - * @version $Id$ */ public class GenericPersonExtraXmlGenerator implements ExtraXMLGenerator { diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/CollectionSortField.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/CollectionSortField.java index 2e0f0b864..ab66e67d5 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/CollectionSortField.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/CollectionSortField.java @@ -1,3 +1,20 @@ +/* + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ package com.arsdigita.cms.contenttypes.ui.panels; import com.arsdigita.xml.Element; diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java index 7667d0e15..d7e3d6c3d 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java @@ -1,3 +1,20 @@ +/* + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ package com.arsdigita.cms.contenttypes.ui.panels; import com.arsdigita.persistence.DataQuery; @@ -15,7 +32,6 @@ import org.apache.log4j.Logger; * {@link com.arsdigita.cms.contenttypes.ui.GenericOrgaUnitTab}. * * @author Jens Pelzetter - * @version $Id$ */ public class Paginator { diff --git a/ccm-cms/src/com/arsdigita/cms/ui/IdSearchResultTable.java b/ccm-cms/src/com/arsdigita/cms/ui/IdSearchResultTable.java index efe35d9ec..580cd3fde 100644 --- a/ccm-cms/src/com/arsdigita/cms/ui/IdSearchResultTable.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/IdSearchResultTable.java @@ -1,7 +1,19 @@ /* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * */ package com.arsdigita.cms.ui; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/IdSearchTab.java b/ccm-cms/src/com/arsdigita/cms/ui/IdSearchTab.java index 70f427eb9..d64166d37 100644 --- a/ccm-cms/src/com/arsdigita/cms/ui/IdSearchTab.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/IdSearchTab.java @@ -48,7 +48,6 @@ public class IdSearchTab extends LayoutPanel { filterform = new Form("IdSearchForm"); formHeader = new Label("Item-id:"); textField = new TextField("IdFeld"); -// textField.setHint("An ID has 4 digits"); textField.addValidationListener(new NotNullValidationListener()); filterform.add(textField); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/contentcenter/ContentSectionContainer.java b/ccm-cms/src/com/arsdigita/cms/ui/contentcenter/ContentSectionContainer.java index a553ed6ea..ae6f4a72e 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/contentcenter/ContentSectionContainer.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/contentcenter/ContentSectionContainer.java @@ -72,7 +72,6 @@ import com.arsdigita.web.Web; * reused in every row of the table. * * @author Michael Bryzek - * @version $Id: ContentSectionContainer.java 287 2005-02-22 00:29:02Z sskracic$ */ public class ContentSectionContainer extends CMSContainer { diff --git a/ccm-cms/src/com/arsdigita/cms/ui/contentcenter/MainPage.java b/ccm-cms/src/com/arsdigita/cms/ui/contentcenter/MainPage.java index 779487c27..c2fb92e20 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/contentcenter/MainPage.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/contentcenter/MainPage.java @@ -55,8 +55,7 @@ import org.apache.log4j.Logger; * * @author Jack Chung (flattop@arsdigita.com) * @author Michael Pih (pihman@arsdigita.com) - * @author Peter Boy (pboy@barkhof.uni-bremen.de) - * @version $Id: MainPage.java pboy $ + * @author Peter Boy (pboy@uni-bremen.de) */ public class MainPage extends CMSApplicationPage implements ActionListener { diff --git a/ccm-cms/src/com/arsdigita/cms/ui/contentcenter/TasksPanel.java b/ccm-cms/src/com/arsdigita/cms/ui/contentcenter/TasksPanel.java index 44f2f4a39..304295f9c 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/contentcenter/TasksPanel.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/contentcenter/TasksPanel.java @@ -83,7 +83,6 @@ import com.arsdigita.xml.Element; /** * - * @version $Id: TasksPanel.java 1280 2006-07-27 09:12:09Z cgyg9330 $ */ public class TasksPanel extends CMSContainer { diff --git a/ccm-cms/src/com/arsdigita/cms/ui/contentsection/MainPage.java b/ccm-cms/src/com/arsdigita/cms/ui/contentsection/MainPage.java index afa09108c..e3061f365 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/contentsection/MainPage.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/contentsection/MainPage.java @@ -72,7 +72,6 @@ import org.apache.log4j.Logger; * @author Xixi D'Moon <xdmoon@redhat.com> * @author Justin Ross <jross@redhat.com> * @author Peter Boy (pboy@barkhof.uni-bremen.de) - * @version $Id: ContentSectionPage.java 2224 2011-08-01 07:45:23Z pboy $ */ public class MainPage extends CMSApplicationPage implements ActionListener { diff --git a/ccm-cms/src/com/arsdigita/cms/ui/staff/PartyInfo.java b/ccm-cms/src/com/arsdigita/cms/ui/staff/PartyInfo.java index 4043fb9cd..3594c9d98 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/staff/PartyInfo.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/staff/PartyInfo.java @@ -51,7 +51,6 @@ import java.math.BigDecimal; * * @author Michael Pih (pihman@arsdigita.com) * @author Michael Bryzek (mbryzek@arsdigita.com) - * @version $Id: PartyInfo.java 287 2005-02-22 00:29:02Z sskracic $ */ public class PartyInfo extends SimpleContainer {