From 6b789ad0f8708ca248fa7142e4ba9f777413a1af Mon Sep 17 00:00:00 2001 From: tosmers Date: Sun, 15 Feb 2015 19:05:31 +0000 Subject: [PATCH] =?UTF-8?q?[UPDATE]=201.=20Auf=20Grund=20des=20Features=20?= =?UTF-8?q?der=20GlobalizationUtil=20waren=20nun=20mehrere=20Konstanten=20?= =?UTF-8?q?in=20der=20Klasse=20ccm-portlet-bookmarks/src/com/arsdigita/por?= =?UTF-8?q?tlet/bookmarks/BookmarkConstants.java=20=C3=BCberfl=C3=BCssig?= =?UTF-8?q?=20und=20wurden=20entfernt.=20Der=20Zugang=20zu=20der=20Bookmar?= =?UTF-8?q?kRessources.properties=20ist=20ab=20jetzt=20ebenfalls=20=C3=BCb?= =?UTF-8?q?er=20GlobalizationUtil.globalize()=20m=C3=B6glich.=202.=20?= =?UTF-8?q?Einige=20Zeilenumbr=C3=BCche=20in=20der=20Klasse=20ccm-portlet-?= =?UTF-8?q?bookmarks/src/com/arsdigita/portlet/bookmarks/ui/BookmarksPortl?= =?UTF-8?q?etEditor.java=20angepasst?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@3208 8810af33-2d31-482b-a856-94f89814c4df --- .../portlet/bookmarks/BookmarkConstants.java | 28 +------------------ .../bookmarks/ui/BookmarksPortletEditor.java | 12 +++++--- 2 files changed, 9 insertions(+), 31 deletions(-) diff --git a/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/BookmarkConstants.java b/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/BookmarkConstants.java index 46f03cf60..c0cf470ad 100644 --- a/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/BookmarkConstants.java +++ b/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/BookmarkConstants.java @@ -6,10 +6,6 @@ */ package com.arsdigita.portlet.bookmarks; -import com.arsdigita.bebop.Label; -import com.arsdigita.globalization.GlobalizedMessage; -import com.arsdigita.portlet.bookmarks.util.GlobalizationUtil; - /** * @author cgyg9330 * @@ -17,10 +13,7 @@ import com.arsdigita.portlet.bookmarks.util.GlobalizationUtil; * */ -public interface BookmarkConstants { - - public static final String BUNDLE_NAME = "com.arsdigita.portlet.bookmarks.ui.BookmarkResources"; - +public interface BookmarkConstants { // bookmark portlet attributes public static final String BOOKMARKS = "bookmarks"; @@ -42,23 +35,4 @@ public interface BookmarkConstants { public static final String URL_ATTRIBUTE = "url"; public static final String WINDOW_ATTRIBUTE = "target-window"; - - // editing - - public static final GlobalizedMessage NO_BOOKMARKS_YET = GlobalizationUtil.globalize("bookmarks.header.no-bookmarks"); - public static final GlobalizedMessage EXISTING_BOOKMARKS = GlobalizationUtil.globalize("bookmarks.header.existing-bookmarks"); - public static final GlobalizedMessage NEW_WINDOW = GlobalizationUtil.globalize("bookmarks.new-window"); - public static final Label ADD_NEW_BOOKMARK_LABEL = new Label(GlobalizationUtil.globalize("bookmarks.add"), Label.BOLD); - public static final Label TITLE_LABEL = new Label(GlobalizationUtil.globalize("bookmarks.title"), Label.BOLD); - public static final Label DESCRIPTION_LABEL = new Label(GlobalizationUtil.globalize("bookmarks.description"), Label.BOLD); - public static final Label URL_LABEL = new Label(GlobalizationUtil.globalize("bookmarks.url"), Label.BOLD); - - // errors - - public static final String NO_URL = (String)new GlobalizedMessage("bookmarks.error.no-url", BUNDLE_NAME).localize(); - public static final String NO_TITLE = (String)new GlobalizedMessage("bookmarks.error.no-title", BUNDLE_NAME).localize(); - public static final String CONTENT_ITEM_NOT_FOUND = (String)new GlobalizedMessage("bookmarks.error.content-item-not-found", BUNDLE_NAME).localize(); - public static final String CONTENT_ITEM_NOT_AVAILABLE = (String)new GlobalizedMessage("bookmarks.warning.item-not-available", BUNDLE_NAME).localize(); - - } diff --git a/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/ui/BookmarksPortletEditor.java b/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/ui/BookmarksPortletEditor.java index 35aedc0d4..a952a88de 100644 --- a/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/ui/BookmarksPortletEditor.java +++ b/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/ui/BookmarksPortletEditor.java @@ -248,14 +248,18 @@ public class BookmarksPortletEditor add(m_existingBookmarks, ColumnPanel.FULL_WIDTH); add(new HorizontalLine(), ColumnPanel.FULL_WIDTH); - add(new Label(GlobalizationUtil.globalize("bookmarks.add"), Label.BOLD), ColumnPanel.FULL_WIDTH); - add(new Label(GlobalizationUtil.globalize("bookmarks.title"), Label.BOLD), ColumnPanel.RIGHT); + add(new Label(GlobalizationUtil.globalize("bookmarks.add"), Label.BOLD), + ColumnPanel.FULL_WIDTH); + add(new Label(GlobalizationUtil.globalize("bookmarks.title"), Label.BOLD), + ColumnPanel.RIGHT); add(m_title); - add(new Label(GlobalizationUtil.globalize("bookmarks.description"), Label.BOLD), ColumnPanel.RIGHT); + add(new Label(GlobalizationUtil.globalize("bookmarks.description"), Label.BOLD), + ColumnPanel.RIGHT); add(m_description); - add(new Label(GlobalizationUtil.globalize("bookmarks.url"), Label.BOLD), ColumnPanel.RIGHT); + add(new Label(GlobalizationUtil.globalize("bookmarks.url"), Label.BOLD), + ColumnPanel.RIGHT); add(m_url); add(new Label("")); // fill up the left hand column add(m_newWindow);