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

[UPDATE] 

1. Auf Grund des Features der GlobalizationUtil waren nun mehrere Konstanten in der Klasse ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/BookmarkConstants.java überflüssig und wurden entfernt. Der Zugang zu der BookmarkRessources.properties ist ab jetzt ebenfalls über GlobalizationUtil.globalize(<key>) möglich.
2. Einige Zeilenumbrüche in der Klasse ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/ui/BookmarksPortletEditor.java angepasst

git-svn-id: https://svn.libreccm.org/ccm/trunk@3208 8810af33-2d31-482b-a856-94f89814c4df
master
tosmers 2015-02-15 19:05:31 +00:00
parent 4cb8de6f26
commit 6b789ad0f8
2 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/BookmarkConstants.java
View File

@ -6,10 +6,6 @@
*/ */
package com.arsdigita.portlet.bookmarks; package com.arsdigita.portlet.bookmarks;
import com.arsdigita.bebop.Label;
import com.arsdigita.globalization.GlobalizedMessage;
import com.arsdigita.portlet.bookmarks.util.GlobalizationUtil;
/** /**
* @author cgyg9330 * @author cgyg9330
* *
@ -19,9 +15,6 @@ import com.arsdigita.portlet.bookmarks.util.GlobalizationUtil;
public interface BookmarkConstants { public interface BookmarkConstants {
public static final String BUNDLE_NAME = "com.arsdigita.portlet.bookmarks.ui.BookmarkResources";
// bookmark portlet attributes // bookmark portlet attributes
public static final String BOOKMARKS = "bookmarks"; public static final String BOOKMARKS = "bookmarks";
public static final String PORTLET = "portlet"; public static final String PORTLET = "portlet";
@ -42,23 +35,4 @@ public interface BookmarkConstants {
public static final String URL_ATTRIBUTE = "url"; public static final String URL_ATTRIBUTE = "url";
public static final String WINDOW_ATTRIBUTE = "target-window"; 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();
} }

12
ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/ui/BookmarksPortletEditor.java
View File

@ -248,14 +248,18 @@ public class BookmarksPortletEditor
add(m_existingBookmarks, ColumnPanel.FULL_WIDTH); add(m_existingBookmarks, ColumnPanel.FULL_WIDTH);
add(new HorizontalLine(), 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.add"), Label.BOLD),
add(new Label(GlobalizationUtil.globalize("bookmarks.title"), Label.BOLD), ColumnPanel.RIGHT); ColumnPanel.FULL_WIDTH);
add(new Label(GlobalizationUtil.globalize("bookmarks.title"), Label.BOLD),
ColumnPanel.RIGHT);
add(m_title); 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(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(m_url);
add(new Label("")); // fill up the left hand column add(new Label("")); // fill up the left hand column
add(m_newWindow); add(m_newWindow);