LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor formatting / documentation / removal of unused code. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2080 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2013-03-12 12:22:44 +00:00
parent c806629e1e
commit d9ee3f77a8
27 changed files with 57 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/util/AgendaResourceBundle.java
View File

@ -20,7 +20,7 @@ package com.arsdigita.cms.contenttypes.util;
import java.util.PropertyResourceBundle; import java.util.PropertyResourceBundle;
import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.globalization.ChainedResourceBundle;
import com.arsdigita.cms.CMSGlobalized; import com.arsdigita.cms.util.CMSGlobalized;
/** /**
* Form to edit the basic properties of an event. This form can be extended to * Form to edit the basic properties of an event. This form can be extended to

2
ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/util/EventResourceBundle.java
View File

@ -18,7 +18,7 @@
*/ */
package com.arsdigita.cms.contenttypes.util; package com.arsdigita.cms.contenttypes.util;
import com.arsdigita.cms.CMSGlobalized; import com.arsdigita.cms.util.CMSGlobalized;
import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.globalization.ChainedResourceBundle;
import java.util.PropertyResourceBundle; import java.util.PropertyResourceBundle;

2
ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/util/FAQResourceBundle.java
View File

@ -20,7 +20,7 @@ package com.arsdigita.cms.contenttypes.util;
import java.util.PropertyResourceBundle; import java.util.PropertyResourceBundle;
import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.globalization.ChainedResourceBundle;
import com.arsdigita.cms.CMSGlobalized; import com.arsdigita.cms.util.CMSGlobalized;
/** /**
* Form to edit the basic properties of an event. This form can be extended to * Form to edit the basic properties of an event. This form can be extended to

2
ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/util/GlossaryResourceBundle.java
View File

@ -20,7 +20,7 @@ package com.arsdigita.cms.contenttypes.util;
import java.util.PropertyResourceBundle; import java.util.PropertyResourceBundle;
import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.globalization.ChainedResourceBundle;
import com.arsdigita.cms.CMSGlobalized; import com.arsdigita.cms.util.CMSGlobalized;
/** /**
* Form to edit the basic properties of an event. This form can be extended to * Form to edit the basic properties of an event. This form can be extended to

2
ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/util/HealthCareFacilityResourceBundle.java
View File

@ -20,7 +20,7 @@ package com.arsdigita.cms.contenttypes.util;
import java.util.PropertyResourceBundle; import java.util.PropertyResourceBundle;
import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.globalization.ChainedResourceBundle;
import com.arsdigita.cms.CMSGlobalized; import com.arsdigita.cms.util.CMSGlobalized;
/** /**
* Form to edit the basic properties of an event. This form can be extended to * Form to edit the basic properties of an event. This form can be extended to

2
ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/util/ImageResourceBundle.java
View File

@ -20,7 +20,7 @@ package com.arsdigita.cms.contenttypes.util;
import java.util.PropertyResourceBundle; import java.util.PropertyResourceBundle;
import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.globalization.ChainedResourceBundle;
import com.arsdigita.cms.CMSGlobalized; import com.arsdigita.cms.util.CMSGlobalized;
/** /**
* Resource Bundle used in UI for Image ContentType. * Resource Bundle used in UI for Image ContentType.

2
ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/util/MemberResourceBundle.java
View File

@ -21,7 +21,7 @@ package com.arsdigita.cms.contenttypes.util;
import java.util.PropertyResourceBundle; import java.util.PropertyResourceBundle;
import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.globalization.ChainedResourceBundle;
import com.arsdigita.cms.CMSGlobalized; import com.arsdigita.cms.util.CMSGlobalized;
public class MemberResourceBundle extends ChainedResourceBundle implements CMSGlobalized { public class MemberResourceBundle extends ChainedResourceBundle implements CMSGlobalized {
public static final String MEMBER_BUNDLE_NAME = public static final String MEMBER_BUNDLE_NAME =

2
ccm-cms-types-motditem/src/com/arsdigita/cms/contenttypes/util/MOTDResourceBundle.java
View File

@ -20,7 +20,7 @@ package com.arsdigita.cms.contenttypes.util;
import java.util.PropertyResourceBundle; import java.util.PropertyResourceBundle;
import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.globalization.ChainedResourceBundle;
import com.arsdigita.cms.CMSGlobalized; import com.arsdigita.cms.util.CMSGlobalized;
/** /**
* Form to edit the basic properties of an motd. This form can be extended to * Form to edit the basic properties of an motd. This form can be extended to

2
ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/util/MultiPartArticleResourceBundle.java
View File

@ -20,7 +20,7 @@ package com.arsdigita.cms.contenttypes.util;
import java.util.PropertyResourceBundle; import java.util.PropertyResourceBundle;
import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.globalization.ChainedResourceBundle;
import com.arsdigita.cms.CMSGlobalized; import com.arsdigita.cms.util.CMSGlobalized;
/** /**
* Form to edit the basic properties of an event. This form can be extended to * Form to edit the basic properties of an event. This form can be extended to

2
ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/util/NewsItemResourceBundle.java
View File

@ -20,7 +20,7 @@ package com.arsdigita.cms.contenttypes.util;
import java.util.PropertyResourceBundle; import java.util.PropertyResourceBundle;
import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.globalization.ChainedResourceBundle;
import com.arsdigita.cms.CMSGlobalized; import com.arsdigita.cms.util.CMSGlobalized;
/** /**
* Resource Bundle used in UI for Newsitem ContentType. * Resource Bundle used in UI for Newsitem ContentType.

2
ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/util/OrganizationResourceBundle.java
View File

@ -20,7 +20,7 @@ package com.arsdigita.cms.contenttypes.util;
import java.util.PropertyResourceBundle; import java.util.PropertyResourceBundle;
import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.globalization.ChainedResourceBundle;
import com.arsdigita.cms.CMSGlobalized; import com.arsdigita.cms.util.CMSGlobalized;
/** /**
* Form to edit the basic properties of an event. This form can be extended to * Form to edit the basic properties of an event. This form can be extended to

2
ccm-cms-types-person/src/com/arsdigita/cms/contenttypes/util/PersonResourceBundle.java
View File

@ -21,7 +21,7 @@ package com.arsdigita.cms.contenttypes.util;
import java.util.PropertyResourceBundle; import java.util.PropertyResourceBundle;
import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.globalization.ChainedResourceBundle;
import com.arsdigita.cms.CMSGlobalized; import com.arsdigita.cms.util.CMSGlobalized;
public class PersonResourceBundle extends ChainedResourceBundle implements CMSGlobalized { public class PersonResourceBundle extends ChainedResourceBundle implements CMSGlobalized {
public static final String PERSON_BUNDLE_NAME = public static final String PERSON_BUNDLE_NAME =

2
ccm-cms-types-researchnetwork/src/com/arsdigita/cms/contenttypes/ResearchNetworkResourceBundle.java
View File

@ -1,6 +1,6 @@
package com.arsdigita.cms.contenttypes; package com.arsdigita.cms.contenttypes;
import com.arsdigita.cms.CMSGlobalized; import com.arsdigita.cms.util.CMSGlobalized;
import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.globalization.ChainedResourceBundle;
import java.util.PropertyResourceBundle; import java.util.PropertyResourceBundle;

2
ccm-cms-types-simpleaddress/src/com/arsdigita/cms/contenttypes/util/SimpleAddressResourceBundle.java
View File

@ -20,7 +20,7 @@ package com.arsdigita.cms.contenttypes.util;
import java.util.PropertyResourceBundle; import java.util.PropertyResourceBundle;
import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.globalization.ChainedResourceBundle;
import com.arsdigita.cms.CMSGlobalized; import com.arsdigita.cms.util.CMSGlobalized;
/** /**
* Resource Bundle used in UI for Address ContentType. * Resource Bundle used in UI for Address ContentType.

2
ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/util/SiteProxyResourceBundle.java
View File

@ -22,7 +22,7 @@ import java.util.PropertyResourceBundle;
import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.globalization.ChainedResourceBundle;
import com.arsdigita.cms.CMSGlobalized; import com.arsdigita.cms.util.CMSGlobalized;
/** /**
* *

2
ccm-cms-types-survey/src/com/arsdigita/cms/contenttypes/util/SurveyResourceBundle.java
View File

@ -2,7 +2,7 @@ package com.arsdigita.cms.contenttypes.util;
import java.util.PropertyResourceBundle; import java.util.PropertyResourceBundle;
import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.globalization.ChainedResourceBundle;
import com.arsdigita.cms.CMSGlobalized; import com.arsdigita.cms.util.CMSGlobalized;
public class SurveyResourceBundle extends ChainedResourceBundle implements CMSGlobalized { public class SurveyResourceBundle extends ChainedResourceBundle implements CMSGlobalized {

2
ccm-cms/src/com/arsdigita/cms/contenttypes/util/ContenttypesResourceBundle.java
View File

@ -21,7 +21,7 @@ package com.arsdigita.cms.contenttypes.util;
import java.util.PropertyResourceBundle; import java.util.PropertyResourceBundle;
import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.globalization.ChainedResourceBundle;
import com.arsdigita.cms.CMSGlobalized; import com.arsdigita.cms.util.CMSGlobalized;
public class ContenttypesResourceBundle extends ChainedResourceBundle implements CMSGlobalized { public class ContenttypesResourceBundle extends ChainedResourceBundle implements CMSGlobalized {
public static final String MEMBER_BUNDLE_NAME = public static final String MEMBER_BUNDLE_NAME =

11
ccm-cms/src/com/arsdigita/cms/ui/AccessDenied.java → ccm-cms/src/com/arsdigita/cms/ui/AccessDenied.java.nolongerInUse
View File

@ -23,6 +23,14 @@ import com.arsdigita.bebop.Label;
import com.arsdigita.cms.dispatcher.CMSPage; import com.arsdigita.cms.dispatcher.CMSPage;
import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.cms.util.GlobalizationUtil;
//
// As of version 6.6.8 no longer used anywhere in code.
// Nevertheless, access privilegies are to be handled by kernel in a central
// manner for all modules in the same way.
//
/** /**
* <p>Access Denied page</p> * <p>Access Denied page</p>
* *
@ -35,7 +43,8 @@ public class AccessDenied extends CMSPage {
super("Access Denied"); super("Access Denied");
setClassAttr("AccessDenied"); setClassAttr("AccessDenied");
add(new Label(GlobalizationUtil.globalize("cms.ui.you_do_not_have_sufficient_privileges_to_access_this_page"))); add(new Label(GlobalizationUtil.globalize(
"cms.ui.you_do_not_have_sufficient_privileges_to_access_this_page")));
init(); init();
} }
} }

5
ccm-cms/src/com/arsdigita/cms/ui/BackButton.java → ccm-cms/src/com/arsdigita/cms/ui/BackButton.java.nolongerInUse
View File

@ -29,12 +29,17 @@ import com.arsdigita.cms.dispatcher.Utilities;
import javax.servlet.ServletException; import javax.servlet.ServletException;
// As of version 6.6.8 not used anywhere in CMS. By design deprecated! E.g. an
// image is part of the theme and should not be hardcoded in java.
/** /**
* Sticks a back button in the upper right hand corner of the component. * Sticks a back button in the upper right hand corner of the component.
* Just override the back(PageState s) method to use. * Just override the back(PageState s) method to use.
* *
* @author Michael Pih (pihman@arsdigita.com) * @author Michael Pih (pihman@arsdigita.com)
* @version $Id: BackButton.java 287 2005-02-22 00:29:02Z sskracic $ * @version $Id: BackButton.java 287 2005-02-22 00:29:02Z sskracic $
* @deprecated without replacement
*/ */
public class BackButton extends ColumnPanel { public class BackButton extends ColumnPanel {

1
ccm-cms/src/com/arsdigita/cms/ui/BaseDeleteForm.java
View File

@ -53,6 +53,7 @@ public abstract class BaseDeleteForm extends BaseForm
this(new Label(message)); this(new Label(message));
} }
@Override
public final boolean isCancelled(final PageState state) { public final boolean isCancelled(final PageState state) {
return m_cancel.isSelected(state); return m_cancel.isSelected(state);
} }

17
ccm-cms/src/com/arsdigita/cms/CMSGlobalized.java → ccm-cms/src/com/arsdigita/cms/util/CMSGlobalized.java
View File

@ -16,24 +16,25 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
package com.arsdigita.cms; package com.arsdigita.cms.util;
import com.arsdigita.globalization.Globalized; import com.arsdigita.globalization.Globalized;
/** /**
* <p> * Modules which depend on CMS should implement this interface instead of
* . * com.arsdigita.globalization.Globalized to gain access to CMS globalization
* Mark a class as being globalized. * resource file (specifically important for content type packages).
* </p>
* *
* @author <a href="mailto:yon@arsdigita.com">yon@arsdigita.com</a> * @author <a href="mailto:yon@arsdigita.com">yon@arsdigita.com</a>
* @version $Revision: #5 $ $Date: 2004/08/17 $ * @version $Revision: #5 $ $Date: 2004/08/17 $
*/ */
public interface CMSGlobalized extends Globalized { public interface CMSGlobalized extends Globalized {
/* /*
* We use one central resource file per language for all of CMS: * The central CMS resource file (per language) which may be used by
*/ * all of CMS specific modules.
* It overwrites the file provided by globalization package as a generic
* default/fall back!
*/
public static final String BUNDLE_NAME = "com.arsdigita.cms.CMSResources"; public static final String BUNDLE_NAME = "com.arsdigita.cms.CMSResources";
} }

9
ccm-cms/src/com/arsdigita/cms/util/CMSResourceBundle.java
View File

@ -18,9 +18,9 @@
*/ */
package com.arsdigita.cms.util; package com.arsdigita.cms.util;
import java.util.PropertyResourceBundle;
import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.globalization.ChainedResourceBundle;
import com.arsdigita.cms.CMSGlobalized;
import java.util.PropertyResourceBundle;
/** /**
* Main ResourceBundle for CMS UI. * Main ResourceBundle for CMS UI.
@ -28,8 +28,9 @@ import com.arsdigita.cms.CMSGlobalized;
* - addBundle - to add new keys * - addBundle - to add new keys
* - putBundle - to override keys already in CMSResources e.g. to customize * - putBundle - to override keys already in CMSResources e.g. to customize
* notification email text * notification email text
**/ */
public class CMSResourceBundle extends ChainedResourceBundle implements CMSGlobalized { public class CMSResourceBundle extends ChainedResourceBundle
implements CMSGlobalized {
public CMSResourceBundle() { public CMSResourceBundle() {
super(); super();

13
ccm-cms/src/com/arsdigita/cms/util/GlobalizationUtil.java
View File

@ -29,10 +29,11 @@ import com.arsdigita.globalization.GlobalizedMessage;
* @author <a href="mailto:yon@arsdigita.com">yon@arsdigita.com</a> * @author <a href="mailto:yon@arsdigita.com">yon@arsdigita.com</a>
* @version $Revision: #7 $ $Date: 2004/08/17 $ * @version $Revision: #7 $ $Date: 2004/08/17 $
*/ */
public class GlobalizationUtil { public class GlobalizationUtil {
public static String s_bundleName = "com.arsdigita.cms.util.CMSResourceBundle"; /** */
public static String s_bundleName =
"com.arsdigita.cms.util.CMSResourceBundle";
public static GlobalizedMessage globalize(String key) { public static GlobalizedMessage globalize(String key) {
return new GlobalizedMessage(key, getBundleName()); return new GlobalizedMessage(key, getBundleName());
@ -41,6 +42,10 @@ public class GlobalizationUtil {
public static GlobalizedMessage globalize(String key, Object[] args) { public static GlobalizedMessage globalize(String key, Object[] args) {
return new GlobalizedMessage(key, getBundleName(), args); return new GlobalizedMessage(key, getBundleName(), args);
} }
public static String getBundleName() {
return s_bundleName;
}
/* /*
* Not a part of API. Otherwise it would need to be properly synchronized. * Not a part of API. Otherwise it would need to be properly synchronized.
@ -51,8 +56,4 @@ public class GlobalizationUtil {
s_bundleName = bundleName; s_bundleName = bundleName;
} }
public static String getBundleName() {
return s_bundleName;
}
} }

1
ccm-core/src/com/arsdigita/ui/util/GlobalizationUtil.java
View File

@ -29,7 +29,6 @@ import com.arsdigita.globalization.GlobalizedMessage;
* *
* @version $Revision: #6 $ $Date: 2004/08/16 $ * @version $Revision: #6 $ $Date: 2004/08/16 $
*/ */
public class GlobalizationUtil implements Globalized { public class GlobalizationUtil implements Globalized {
private static final String BUNDLE_NAME = "com.arsdigita.ui.UIResources"; private static final String BUNDLE_NAME = "com.arsdigita.ui.UIResources";

2
ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/util/ContactResourceBundle.java
View File

@ -22,7 +22,7 @@ import java.util.PropertyResourceBundle;
import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.globalization.ChainedResourceBundle;
import com.arsdigita.cms.CMSGlobalized; import com.arsdigita.cms.util.CMSGlobalized;
/** /**
* Resource Bundle used in UI for Contact ContentType. * Resource Bundle used in UI for Contact ContentType.

2
ccm-ldn-types-esdservice/src/com/arsdigita/london/contenttypes/util/ESDServiceResourceBundle.java
View File

@ -17,7 +17,7 @@
*/ */
package com.arsdigita.london.contenttypes.util; package com.arsdigita.london.contenttypes.util;
import com.arsdigita.cms.CMSGlobalized; import com.arsdigita.cms.util.CMSGlobalized;
import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.globalization.ChainedResourceBundle;
import java.util.PropertyResourceBundle; import java.util.PropertyResourceBundle;

2
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertiesStep.java
View File

@ -23,7 +23,7 @@ import com.arsdigita.bebop.Component;
import com.arsdigita.bebop.Label; import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.SegmentedPanel; import com.arsdigita.bebop.SegmentedPanel;
import com.arsdigita.cms.CMSGlobalized; import com.arsdigita.cms.util.CMSGlobalized;
import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.ContentPage;
import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ContentSection;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;