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

Yet another part adopting sci modules to setLabel attribute. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2742 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2014-07-08 09:15:01 +00:00
parent cde2e962a2
commit 6e85fa1b33
81 changed files with 517 additions and 512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java
View File

@ -486,7 +486,7 @@ public class ItemSearchFolderBrowser extends Table {
final GlobalisationUtil util = new GlobalisationUtil( final GlobalisationUtil util = new GlobalisationUtil(
"com.arsdigita.cms." "com.arsdigita.cms."
+ "ui.folder.CMSFolderResources"); + "ui.folder.CMSFolderResources");
return util.globalise(key); return util.globalize(key);
} }
} }

2
ccm-cms/src/com/arsdigita/cms/ui/folder/FolderBrowser.java
View File

@ -894,7 +894,7 @@ public class FolderBrowser extends Table {
//return FolderManipulator.globalize(key); //return FolderManipulator.globalize(key);
final GlobalisationUtil util = new GlobalisationUtil( final GlobalisationUtil util = new GlobalisationUtil(
"com.arsdigita.cms.ui.folder.CMSFolderResources"); "com.arsdigita.cms.ui.folder.CMSFolderResources");
return util.globalise(key); return util.globalize(key);
} }

38
ccm-cms/src/com/arsdigita/cms/ui/folder/FolderManipulator.java
View File

@ -516,7 +516,7 @@ public class FolderManipulator extends SimpleContainer implements
final FormData data = event.getFormData(); final FormData data = event.getFormData();
if (getSources(state).length <= 0) { if (getSources(state).length <= 0) {
data.addError(globalizationUtil.globalise("cms.ui.folder.must_select_item")); data.addError(globalizationUtil.globalize("cms.ui.folder.must_select_item"));
} }
} }
@ -540,21 +540,21 @@ public class FolderManipulator extends SimpleContainer implements
final Folder target = targetSelector.getTarget(state); final Folder target = targetSelector.getTarget(state);
final FormData data = event.getFormData(); final FormData data = event.getFormData();
if (target == null) { if (target == null) {
data.addError(globalizationUtil.globalise( data.addError(globalizationUtil.globalize(
"cms.ui.folder.need_select_target_folder")); "cms.ui.folder.need_select_target_folder"));
//If the target is null, we can skip the rest of the checks //If the target is null, we can skip the rest of the checks
return; return;
} }
if (target.equals(sourceFolderModel.getSelectedObject(state))) { if (target.equals(sourceFolderModel.getSelectedObject(state))) {
data.addError(globalizationUtil.globalise("cms.ui.folder.not_within_same_folder")); data.addError(globalizationUtil.globalize("cms.ui.folder.not_within_same_folder"));
} }
// check create item permission // check create item permission
final User user = Web.getWebContext().getUser(); final User user = Web.getWebContext().getUser();
final SecurityManager securityManager = CMS.getSecurityManager(state); final SecurityManager securityManager = CMS.getSecurityManager(state);
if (!securityManager.canAccess(user, SecurityManager.NEW_ITEM, target)) { if (!securityManager.canAccess(user, SecurityManager.NEW_ITEM, target)) {
data.addError(globalizationUtil.globalise("cms.ui.folder.no_permission_for_item")); data.addError(globalizationUtil.globalize("cms.ui.folder.no_permission_for_item"));
} }
for (BigDecimal source : getSources(state)) { for (BigDecimal source : getSources(state)) {
@ -600,7 +600,7 @@ public class FolderManipulator extends SimpleContainer implements
} }
private void addErrorMessage(final FormData data, final String message, final String itemName) { private void addErrorMessage(final FormData data, final String message, final String itemName) {
data.addError(globalizationUtil.globalise(message, new Object[]{itemName})); data.addError(globalizationUtil.globalize(message, new Object[]{itemName}));
} }
// @Override // @Override
@ -672,11 +672,11 @@ public class FolderManipulator extends SimpleContainer implements
final int numberOfItems = getSources(state).length; final int numberOfItems = getSources(state).length;
final Folder folder = (Folder) sourceFolderModel.getSelectedObject(state); final Folder folder = (Folder) sourceFolderModel.getSelectedObject(state);
if (isMove(state)) { if (isMove(state)) {
label.setLabel(globalizationUtil.globalise( label.setLabel(globalizationUtil.globalize(
"cms.ui.folder.move", new Object[]{numberOfItems, "cms.ui.folder.move", new Object[]{numberOfItems,
folder.getPathNoJsp()})); folder.getPathNoJsp()}));
} else if (isCopy(state)) { } else if (isCopy(state)) {
label.setLabel(globalizationUtil.globalise( label.setLabel(globalizationUtil.globalize(
"cms.ui.folder.copy", new Object[]{numberOfItems, "cms.ui.folder.copy", new Object[]{numberOfItems,
folder.getPathNoJsp()})); folder.getPathNoJsp()}));
} }
@ -747,12 +747,12 @@ public class FolderManipulator extends SimpleContainer implements
// final Folder folder = (Folder) sourceFolderModel.getSelectedObject(state); // final Folder folder = (Folder) sourceFolderModel.getSelectedObject(state);
// //
// if (isPublish(state)) { // if (isPublish(state)) {
// target.setLabel(globalizationUtil.globalise( // target.setLabel(globalizationUtil.globalize(
// "cms.ui.folder.publish", // "cms.ui.folder.publish",
// new Object[]{numberOfItems, // new Object[]{numberOfItems,
// folder.getPathNoJsp()})); // folder.getPathNoJsp()}));
// } else if (isUnPublish(state)) { // } else if (isUnPublish(state)) {
// target.setLabel(globalizationUtil.globalise( // target.setLabel(globalizationUtil.globalize(
// "cms.ui.folder.publish", // "cms.ui.folder.publish",
// new Object[]{numberOfItems, // new Object[]{numberOfItems,
// folder.getPathNoJsp()})); // folder.getPathNoJsp()}));
@ -813,25 +813,25 @@ public class FolderManipulator extends SimpleContainer implements
final Container container = new SimpleContainer(); final Container container = new SimpleContainer();
group.addAction(container); group.addAction(container);
container.add(new Label(globalizationUtil.globalise("cms.ui.folder.edit_selection"))); container.add(new Label(globalizationUtil.globalize("cms.ui.folder.edit_selection")));
actionSelect = new SingleSelect(actionParam); actionSelect = new SingleSelect(actionParam);
actionSelect.addOption(new Option(COPY, actionSelect.addOption(new Option(COPY,
new Label(globalizationUtil.globalise( new Label(globalizationUtil.globalize(
"cms.ui.folder.copy.action")))); "cms.ui.folder.copy.action"))));
actionSelect.addOption(new Option(MOVE, actionSelect.addOption(new Option(MOVE,
new Label(globalizationUtil.globalise( new Label(globalizationUtil.globalize(
"cms.ui.folder.move.action")))); "cms.ui.folder.move.action"))));
//Publishing in the folder browser only works if threaded publishing is active //Publishing in the folder browser only works if threaded publishing is active
// if (CMSConfig.getInstanceOf().getThreadedPublishing()) { // if (CMSConfig.getInstanceOf().getThreadedPublishing()) {
// actionSelect.addOption(new Option(PUBLISH, // actionSelect.addOption(new Option(PUBLISH,
// new Label(globalizationUtil.globalise( // new Label(globalizationUtil.globalize(
// "cms.ui.folder.publish.action")))); // "cms.ui.folder.publish.action"))));
// actionSelect.addOption(new Option(UNPUBLISH, // actionSelect.addOption(new Option(UNPUBLISH,
// new Label(globalizationUtil.globalise( // new Label(globalizationUtil.globalize(
// "cms.ui.folder.unpublish.action")))); // "cms.ui.folder.unpublish.action"))));
// } // }
container.add(actionSelect); container.add(actionSelect);
submit = new Submit("Go", globalizationUtil.globalise("cms.ui.folder.go")); submit = new Submit("Go", globalizationUtil.globalize("cms.ui.folder.go"));
container.add(submit); container.add(submit);
// Add a new first column to the table // Add a new first column to the table
@ -903,7 +903,7 @@ public class FolderManipulator extends SimpleContainer implements
panel = new BoxPanel(BoxPanel.HORIZONTAL); panel = new BoxPanel(BoxPanel.HORIZONTAL);
final ActionLink allLink = new ActionLink( final ActionLink allLink = new ActionLink(
globalizationUtil.globalise("cms.ui.folder.filter.all")); globalizationUtil.globalize("cms.ui.folder.filter.all"));
allLink.addActionListener(new ActionListener() { allLink.addActionListener(new ActionListener() {
@Override @Override
@ -928,11 +928,11 @@ public class FolderManipulator extends SimpleContainer implements
// }); // });
// panel.add(link); // panel.add(link);
// } // }
panel.add(new Label(globalizationUtil.globalise("cms.ui.folder.filter"))); panel.add(new Label(globalizationUtil.globalize("cms.ui.folder.filter")));
filterField = new TextField(filterParam); filterField = new TextField(filterParam);
panel.add(filterField); panel.add(filterField);
panel.add(new Submit("filterFolderSubmit", panel.add(new Submit("filterFolderSubmit",
globalizationUtil.globalise("cms.ui.folder.filter_do"))); globalizationUtil.globalize("cms.ui.folder.filter_do")));
add(panel); add(panel);
@ -981,7 +981,7 @@ public class FolderManipulator extends SimpleContainer implements
* *
* @param key The resource key. May not null. * @param key The resource key. May not null.
* *
* @return The globalised message * @return The globalized message
*/ */
// public static GlobalizedMessage globalize(final String key) { // public static GlobalizedMessage globalize(final String key) {
// return new GlobalizedMessage(key, RESOURCE_BUNDLE); // return new GlobalizedMessage(key, RESOURCE_BUNDLE);

14
ccm-core/src/com/arsdigita/toolbox/GlobalisationUtil.java
View File

@ -51,24 +51,24 @@ public class GlobalisationUtil {
} }
/** /**
* Lookup the globalised message identified by the provided key in the resource bundle. * Lookup the globalized message identified by the provided key in the resource bundle.
* *
* @param key Message key * @param key Message key
* @return The globalised message. * @return The globalized message.
*/ */
public GlobalizedMessage globalise(final String key) { public GlobalizedMessage globalize(final String key) {
return new GlobalizedMessage(key, bundleName); return new GlobalizedMessage(key, bundleName);
} }
/** /**
* Lookup the globalised message identified by the provided key in the resource bundle and * Lookup the globalized message identified by the provided key in the resource bundle and
* replace the placeholders in the message with the provided arguments. replace the placeholders in the message with the provided arguments.
* *
* @param key The key of the message to lookup. * @param key The key of the message to lookup.
* @param args Arguments for the placeholders in the message. * @param args Arguments for the placeholders in the message.
* @return The globalised message. * @return The globalized message.
*/ */
public GlobalizedMessage globalise(final String key, public GlobalizedMessage globalize(final String key,
final Object[] args) { final Object[] args) {
return new GlobalizedMessage(key, bundleName, args); return new GlobalizedMessage(key, bundleName, args);
} }

4
ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/SciPublicationsPersonsInitializer.java
View File

@ -106,9 +106,9 @@ public class SciPublicationsPersonsInitializer extends CompoundInitializer {
AuthoringKitWizard.registerAssetStep( AuthoringKitWizard.registerAssetStep(
Publication.BASE_DATA_OBJECT_TYPE, Publication.BASE_DATA_OBJECT_TYPE,
SciPublicationsPersonsStep.class, SciPublicationsPersonsStep.class,
globalisationUtil.globalise( globalisationUtil.globalize(
"com.arsdigita.cms.contentassets.publications_persons.related_persons.title"), "com.arsdigita.cms.contentassets.publications_persons.related_persons.title"),
globalisationUtil.globalise( globalisationUtil.globalize(
"com.arsdigita.cms.contentassets.publications_persons.related_persons.desc"), "com.arsdigita.cms.contentassets.publications_persons.related_persons.desc"),
50); 50);

17
ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsPersonForm.java
View File

@ -64,16 +64,19 @@ public class SciPublicationsPersonsPersonForm extends BasicItemForm {
public void addWidgets() { public void addWidgets() {
final GlobalisationUtil globalisationUtil = new SciPublicationsPersonsGlobalisationUtil(); final GlobalisationUtil globalisationUtil = new SciPublicationsPersonsGlobalisationUtil();
add(new Label(globalisationUtil.globalise(
"com.arsdigita.cms.contentassets.publicationspersons.select_person"))); // add(new Label(globalisationUtil.globalize(
// "com.arsdigita.cms.contentassets.publicationspersons.select_person")));
itemSearch = new ItemSearchWidget( itemSearch = new ItemSearchWidget(
ITEM_SEARCH, ITEM_SEARCH,
ContentType.findByAssociatedObjectType(GenericPerson.class.getName())); ContentType.findByAssociatedObjectType(GenericPerson.class.getName()));
itemSearch.setLabel(globalisationUtil.globalize(
"com.arsdigita.cms.contentassets.publicationspersons.select_person"));
itemSearch.setDisableCreatePane(true); itemSearch.setDisableCreatePane(true);
add(itemSearch); add(itemSearch);
add(new Label(globalisationUtil.globalise( // add(new Label(globalisationUtil.globalize(
"com.arsdigita.cms.contentassets.publicationspersons.select_person_relation"))); // "com.arsdigita.cms.contentassets.publicationspersons.select_person_relation")));
final ParameterModel relationParam = new StringParameter(RELATION); final ParameterModel relationParam = new StringParameter(RELATION);
final SingleSelect relationSelect = new SingleSelect(relationParam); final SingleSelect relationSelect = new SingleSelect(relationParam);
relationSelect.addValidationListener(new NotNullValidationListener()); relationSelect.addValidationListener(new NotNullValidationListener());
@ -87,6 +90,8 @@ public class SciPublicationsPersonsPersonForm extends BasicItemForm {
relation = relations.getRelationAttribute(); relation = relations.getRelationAttribute();
relationSelect.addOption(new Option(relation.getKey(), relation.getName())); relationSelect.addOption(new Option(relation.getKey(), relation.getName()));
} }
relationSelect.setLabel(globalisationUtil.globalize(
"com.arsdigita.cms.contentassets.publicationspersons.select_person_relation"));
add(relationSelect); add(relationSelect);
} }
@ -118,12 +123,12 @@ public class SciPublicationsPersonsPersonForm extends BasicItemForm {
final GlobalisationUtil globalisationUtil = new SciPublicationsPersonsGlobalisationUtil(); final GlobalisationUtil globalisationUtil = new SciPublicationsPersonsGlobalisationUtil();
if (data.get(ITEM_SEARCH) == null) { if (data.get(ITEM_SEARCH) == null) {
data.addError(globalisationUtil.globalise( data.addError(globalisationUtil.globalize(
"com.arsdigita.cms.contentasset.publications_persons.none_selected")); "com.arsdigita.cms.contentasset.publications_persons.none_selected"));
} }
if ((data.get(RELATION) == null) || ((String) data.get(RELATION)).isEmpty()) { if ((data.get(RELATION) == null) || ((String) data.get(RELATION)).isEmpty()) {
data.addError(globalisationUtil.globalise( data.addError(globalisationUtil.globalize(
"com.arsdigita.cms.contentasset.publications_persons.none_relation_selected")); "com.arsdigita.cms.contentasset.publications_persons.none_relation_selected"));
} }

13
ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsPersonTable.java
View File

@ -34,7 +34,6 @@ import com.arsdigita.bebop.table.TableModelBuilder;
import com.arsdigita.cms.CMS; import com.arsdigita.cms.CMS;
import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ContentSection;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.RelationAttribute;
import com.arsdigita.cms.RelationAttributeCollection; import com.arsdigita.cms.RelationAttributeCollection;
import com.arsdigita.cms.contentassets.SciPublicationsPersonsPersonCollection; import com.arsdigita.cms.contentassets.SciPublicationsPersonsPersonCollection;
import com.arsdigita.cms.contentassets.SciPublicationsPersonsService; import com.arsdigita.cms.contentassets.SciPublicationsPersonsService;
@ -65,21 +64,21 @@ public class SciPublicationsPersonsPersonTable extends Table implements TableAct
this.itemModel = itemModel; this.itemModel = itemModel;
setEmptyView(new Label(globalisationUtil.globalise( setEmptyView(new Label(globalisationUtil.globalize(
"com.arsdigita.cms.contentassets.publications_persons.persons.none"))); "com.arsdigita.cms.contentassets.publications_persons.persons.none")));
final TableColumnModel colModel = getColumnModel(); final TableColumnModel colModel = getColumnModel();
colModel.add(new TableColumn( colModel.add(new TableColumn(
0, 0,
globalisationUtil.globalise( globalisationUtil.globalize(
"com.arsdigita.cms.contentassets.publications_persons.person"))); "com.arsdigita.cms.contentassets.publications_persons.person")));
colModel.add(new TableColumn( colModel.add(new TableColumn(
1, 1,
globalisationUtil.globalise( globalisationUtil.globalize(
"com.arsdigita.cms.contentassets.publications_persons.person.relation"))); "com.arsdigita.cms.contentassets.publications_persons.person.relation")));
colModel.add(new TableColumn( colModel.add(new TableColumn(
2, 2,
globalisationUtil.globalise( globalisationUtil.globalize(
"com.arsdigita.cms.contentassets.publications_persons.person.remove"), "com.arsdigita.cms.contentassets.publications_persons.person.remove"),
TABLE_COL_DEL)); TABLE_COL_DEL));
@ -163,7 +162,7 @@ public class SciPublicationsPersonsPersonTable extends Table implements TableAct
case 1: case 1:
return relation; return relation;
case 2: case 2:
return globalisationUtil.globalise( return globalisationUtil.globalize(
"com.arsdigita.cms.contentassets.publication_persons.person.remove"); "com.arsdigita.cms.contentassets.publication_persons.person.remove");
default: default:
return null; return null;
@ -272,7 +271,7 @@ public class SciPublicationsPersonsPersonTable extends Table implements TableAct
if (canEdit) { if (canEdit) {
final ControlLink link = new ControlLink(new Label((GlobalizedMessage) value)); final ControlLink link = new ControlLink(new Label((GlobalizedMessage) value));
link.setConfirmation(globalisationUtil.globalise( link.setConfirmation(globalisationUtil.globalize(
"com.arsdigita.cms.contentassets.publications_persons.person.remove.confirm")); "com.arsdigita.cms.contentassets.publications_persons.person.remove.confirm"));
return link; return link;
} else { } else {

2
ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsStep.java
View File

@ -48,7 +48,7 @@ public class SciPublicationsPersonsStep extends SimpleEditStep {
final GlobalisationUtil globalisationUtil = new SciPublicationsPersonsGlobalisationUtil(); final GlobalisationUtil globalisationUtil = new SciPublicationsPersonsGlobalisationUtil();
final BasicItemForm addPersonsSheet = new SciPublicationsPersonsPersonForm(itemModel); final BasicItemForm addPersonsSheet = new SciPublicationsPersonsPersonForm(itemModel);
add(ADD_PUBLICATION_PERSON, add(ADD_PUBLICATION_PERSON,
globalisationUtil.globalise("com.arsdigita.cms.contentassets.publications_persons.person_add"), globalisationUtil.globalize("com.arsdigita.cms.contentassets.publications_persons.person_add"),
new WorkflowLockedComponentAccess(addPersonsSheet, itemModel), new WorkflowLockedComponentAccess(addPersonsSheet, itemModel),
addPersonsSheet.getSaveCancelSection().getCancelButton()); addPersonsSheet.getSaveCancelSection().getCancelButton());

22
ccm-sci-assets-publicationspublicationtype/src/com/arsdigita/cms/contentassets/ui/PublicationTypeAssetAddForm.java
View File

@ -60,8 +60,9 @@ public class PublicationTypeAssetAddForm extends BasicItemForm {
@Override @Override
public void addWidgets() { public void addWidgets() {
add(new Label(PublicationTypeAssetGlobalizationUtil.
globalize("scipublications.publication_type_asset.form.type"))); //add(new Label(PublicationTypeAssetGlobalizationUtil.
// globalize("scipublications.publication_type_asset.form.type")));
final SingleSelect type = new SingleSelect(PUB_TYPE); final SingleSelect type = new SingleSelect(PUB_TYPE);
type.addValidationListener(new NotNullValidationListener()); type.addValidationListener(new NotNullValidationListener());
type.addValidationListener(new NotEmptyValidationListener()); type.addValidationListener(new NotEmptyValidationListener());
@ -74,15 +75,22 @@ public class PublicationTypeAssetAddForm extends BasicItemForm {
final RelationAttribute value = values.getRelationAttribute(); final RelationAttribute value = values.getRelationAttribute();
type.addOption(new Option(value.getKey(), value.getName())); type.addOption(new Option(value.getKey(), value.getName()));
} }
type.setLabel(PublicationTypeAssetGlobalizationUtil.
globalize("scipublications.publication_type_asset.form.type"));
add(type); add(type);
add(new Label(PublicationTypeAssetGlobalizationUtil. //add(new Label(PublicationTypeAssetGlobalizationUtil.
globalize("scipublications.publication_type_asset.form.isbn"))); // globalize("scipublications.publication_type_asset.form.isbn")));
add(new TextField(ISBN)); final TextField isbn = new TextField(ISBN);
isbn.setLabel(PublicationTypeAssetGlobalizationUtil.
globalize("scipublications.publication_type_asset.form.isbn"));
add(isbn);
add(new Label(PublicationTypeAssetGlobalizationUtil. //add(new Label(PublicationTypeAssetGlobalizationUtil.
globalize("scipublications.publication_type_asset.form.misc"))); // globalize("scipublications.publication_type_asset.form.misc")));
final TextArea misc = new TextArea(MISC); final TextArea misc = new TextArea(MISC);
misc.setLabel(PublicationTypeAssetGlobalizationUtil.
globalize("scipublications.publication_type_asset.form.misc"));
misc.setRows(12); misc.setRows(12);
misc.setCols(60); misc.setCols(60);
add(misc); add(misc);

4
ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieDirectorForm.java
View File

@ -52,7 +52,7 @@ public class SciPublicationsMovieDirectorForm extends BasicItemForm implements F
public void addWidgets() { public void addWidgets() {
final SciPublicationsDramaticArtsGlobalisationUtil globalisationUtil final SciPublicationsDramaticArtsGlobalisationUtil globalisationUtil
= new SciPublicationsDramaticArtsGlobalisationUtil(); = new SciPublicationsDramaticArtsGlobalisationUtil();
add(new Label(globalisationUtil.globalise("publications.dramaticarts.ui.movie.director"))); add(new Label(globalisationUtil.globalize("publications.dramaticarts.ui.movie.director")));
itemSearch = new ItemSearchWidget( itemSearch = new ItemSearchWidget(
ITEM_SEARCH, ContentType.findByAssociatedObjectType( ITEM_SEARCH, ContentType.findByAssociatedObjectType(
GenericPerson.BASE_DATA_OBJECT_TYPE)); GenericPerson.BASE_DATA_OBJECT_TYPE));
@ -92,7 +92,7 @@ public class SciPublicationsMovieDirectorForm extends BasicItemForm implements F
= new SciPublicationsDramaticArtsGlobalisationUtil(); = new SciPublicationsDramaticArtsGlobalisationUtil();
if (data.get(ITEM_SEARCH) == null) { if (data.get(ITEM_SEARCH) == null) {
data.addError(globalisationUtil.globalise( data.addError(globalisationUtil.globalize(
"publications.dramaticarts.ui.movie.director.no_director_selected")); "publications.dramaticarts.ui.movie.director.no_director_selected"));
} }

10
ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieDirectorSheet.java
View File

@ -62,17 +62,17 @@ public class SciPublicationsMovieDirectorSheet
this.itemModel = itemModel; this.itemModel = itemModel;
setEmptyView(new Label(globalisationUtil.globalise( setEmptyView(new Label(globalisationUtil.globalize(
"publications.dramaticarts.ui.movie.director.none"))); "publications.dramaticarts.ui.movie.director.none")));
final TableColumnModel columnModel = getColumnModel(); final TableColumnModel columnModel = getColumnModel();
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
0, 0,
globalisationUtil.globalise("publications.dramaticarts.ui.movie.director"), globalisationUtil.globalize("publications.dramaticarts.ui.movie.director"),
TABLE_COL_EDIT)); TABLE_COL_EDIT));
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
1, 1,
globalisationUtil.globalise("publications.dramaticarts.ui.movie.director.remove"), globalisationUtil.globalize("publications.dramaticarts.ui.movie.director.remove"),
TABLE_COL_DEL)); TABLE_COL_DEL));
setModelBuilder(new ModelBuilder(itemModel)); setModelBuilder(new ModelBuilder(itemModel));
@ -147,7 +147,7 @@ public class SciPublicationsMovieDirectorSheet
case 0: case 0:
return director.getFullName(); return director.getFullName();
case 1: case 1:
return new Label(globalisationUtil.globalise( return new Label(globalisationUtil.globalize(
"publications.dramaticarts.ui.movie.director.remove")); "publications.dramaticarts.ui.movie.director.remove"));
default: default:
return null; return null;
@ -235,7 +235,7 @@ public class SciPublicationsMovieDirectorSheet
if (canEdit) { if (canEdit) {
final ControlLink link = new ControlLink((Label)value); final ControlLink link = new ControlLink((Label)value);
link.setConfirmation(globalisationUtil.globalise( link.setConfirmation(globalisationUtil.globalize(
"publications.dramaticarts.ui.movie.director.remove.confirm")); "publications.dramaticarts.ui.movie.director.remove.confirm"));
return link; return link;
} else { } else {

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

@ -48,7 +48,7 @@ public class SciPublicationsMovieDirectorStep extends SimpleEditStep {
= new SciPublicationsDramaticArtsGlobalisationUtil(); = new SciPublicationsDramaticArtsGlobalisationUtil();
final BasicItemForm setDirectorForm = new SciPublicationsMovieDirectorForm(itemModel); final BasicItemForm setDirectorForm = new SciPublicationsMovieDirectorForm(itemModel);
add(SET_MOVIE_DIRECTOR_STEP, add(SET_MOVIE_DIRECTOR_STEP,
globalisationUtil.globalise("publications.dramaticarts.ui.movie.director"), globalisationUtil.globalize("publications.dramaticarts.ui.movie.director"),
new WorkflowLockedComponentAccess(setDirectorForm, itemModel), new WorkflowLockedComponentAccess(setDirectorForm, itemModel),
setDirectorForm.getSaveCancelSection().getCancelButton()); setDirectorForm.getSaveCancelSection().getCancelButton());

4
ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieProductionCompanyForm.java
View File

@ -56,7 +56,7 @@ public class SciPublicationsMovieProductionCompanyForm
public void addWidgets() { public void addWidgets() {
final SciPublicationsDramaticArtsGlobalisationUtil globalisationUtil final SciPublicationsDramaticArtsGlobalisationUtil globalisationUtil
= new SciPublicationsDramaticArtsGlobalisationUtil(); = new SciPublicationsDramaticArtsGlobalisationUtil();
add(new Label(globalisationUtil.globalise( add(new Label(globalisationUtil.globalize(
"publications.dramaticarts.ui.movie.production_company"))); "publications.dramaticarts.ui.movie.production_company")));
itemSearch = new ItemSearchWidget( itemSearch = new ItemSearchWidget(
ITEM_SEARCH, ContentType.findByAssociatedObjectType( ITEM_SEARCH, ContentType.findByAssociatedObjectType(
@ -98,7 +98,7 @@ public class SciPublicationsMovieProductionCompanyForm
= new SciPublicationsDramaticArtsGlobalisationUtil(); = new SciPublicationsDramaticArtsGlobalisationUtil();
if (data.get(ITEM_SEARCH) == null) { if (data.get(ITEM_SEARCH) == null) {
data.addError(globalisationUtil.globalise( data.addError(globalisationUtil.globalize(
"publications.dramaticarts.ui.movie.production_company.no_company_selected")); "publications.dramaticarts.ui.movie.production_company.no_company_selected"));
} }

10
ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieProductionCompanySheet.java
View File

@ -62,17 +62,17 @@ public class SciPublicationsMovieProductionCompanySheet
this.itemModel = itemModel; this.itemModel = itemModel;
setEmptyView(new Label(globalisationUtil.globalise( setEmptyView(new Label(globalisationUtil.globalize(
"publications.dramaticarts.ui.movie.production_company.none"))); "publications.dramaticarts.ui.movie.production_company.none")));
final TableColumnModel columnModel = getColumnModel(); final TableColumnModel columnModel = getColumnModel();
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
0, 0,
globalisationUtil.globalise("publications.dramaticarts.ui.movie.production_company"), globalisationUtil.globalize("publications.dramaticarts.ui.movie.production_company"),
TABLE_COL_EDIT)); TABLE_COL_EDIT));
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
1, 1,
globalisationUtil.globalise( globalisationUtil.globalize(
"publications.dramaticarts.ui.movie.production_company.remove"), "publications.dramaticarts.ui.movie.production_company.remove"),
TABLE_COL_DEL)); TABLE_COL_DEL));
@ -146,7 +146,7 @@ public class SciPublicationsMovieProductionCompanySheet
case 0: case 0:
return productionCompany.getTitle(); return productionCompany.getTitle();
case 1: case 1:
return new Label(globalisationUtil.globalise( return new Label(globalisationUtil.globalize(
"publications.dramaticarts.ui.movie.production_company.remove")); "publications.dramaticarts.ui.movie.production_company.remove"));
default: default:
return null; return null;
@ -234,7 +234,7 @@ public class SciPublicationsMovieProductionCompanySheet
if (canEdit) { if (canEdit) {
final ControlLink link = new ControlLink((Label) value); final ControlLink link = new ControlLink((Label) value);
link.setConfirmation(globalisationUtil.globalise( link.setConfirmation(globalisationUtil.globalize(
"publications.dramaticarts.ui.movie.production_company.remove.confirm")); "publications.dramaticarts.ui.movie.production_company.remove.confirm"));
return link; return link;
} else { } else {

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

@ -49,7 +49,7 @@ public class SciPublicationsMovieProductionCompanyStep extends SimpleEditStep {
final BasicItemForm setProductionCompanyForm final BasicItemForm setProductionCompanyForm
= new SciPublicationsMovieProductionCompanyForm(itemModel); = new SciPublicationsMovieProductionCompanyForm(itemModel);
add(SET_PRODUCTION_COMPANY_STEP, add(SET_PRODUCTION_COMPANY_STEP,
globalisationUtil.globalise("publications.ui.dramaticarts.movie.productioncompany"), globalisationUtil.globalize("publications.ui.dramaticarts.movie.productioncompany"),
new WorkflowLockedComponentAccess(setProductionCompanyForm, itemModel), new WorkflowLockedComponentAccess(setProductionCompanyForm, itemModel),
setProductionCompanyForm.getSaveCancelSection().getCancelButton()); setProductionCompanyForm.getSaveCancelSection().getCancelButton());

4
ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMoviePropertiesStep.java
View File

@ -82,8 +82,8 @@ public class SciPublicationsMoviePropertiesStep extends PublicationPropertiesSte
final SciPublicationsDramaticArtsGlobalisationUtil globalisationUtil = new SciPublicationsDramaticArtsGlobalisationUtil(); final SciPublicationsDramaticArtsGlobalisationUtil globalisationUtil = new SciPublicationsDramaticArtsGlobalisationUtil();
addStep(new SciPublicationsMovieDirectorStep(itemModel, parent), addStep(new SciPublicationsMovieDirectorStep(itemModel, parent),
globalisationUtil.globalise("publications.dramaticarts.ui.movie.director")); globalisationUtil.globalize("publications.dramaticarts.ui.movie.director"));
addStep(new SciPublicationsMovieProductionCompanyStep(itemModel, parent), addStep(new SciPublicationsMovieProductionCompanyStep(itemModel, parent),
globalisationUtil.globalise("publications.dramaticarts.ui.movie.production_company")); globalisationUtil.globalize("publications.dramaticarts.ui.movie.production_company"));
} }
} }

4
ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayProductionTheaterForm.java
View File

@ -56,7 +56,7 @@ public class SciPublicationsPlayProductionTheaterForm
public void addWidgets() { public void addWidgets() {
final SciPublicationsDramaticArtsGlobalisationUtil globalisationUtil final SciPublicationsDramaticArtsGlobalisationUtil globalisationUtil
= new SciPublicationsDramaticArtsGlobalisationUtil(); = new SciPublicationsDramaticArtsGlobalisationUtil();
add(new Label(globalisationUtil.globalise( add(new Label(globalisationUtil.globalize(
"publications.dramaticarts.play.ui.productiontheater"))); "publications.dramaticarts.play.ui.productiontheater")));
itemSearch = new ItemSearchWidget( itemSearch = new ItemSearchWidget(
ITEM_SEARCH, ContentType.findByAssociatedObjectType( ITEM_SEARCH, ContentType.findByAssociatedObjectType(
@ -98,7 +98,7 @@ public class SciPublicationsPlayProductionTheaterForm
= new SciPublicationsDramaticArtsGlobalisationUtil(); = new SciPublicationsDramaticArtsGlobalisationUtil();
if (data.get(ITEM_SEARCH) == null) { if (data.get(ITEM_SEARCH) == null) {
data.addError(globalisationUtil.globalise( data.addError(globalisationUtil.globalize(
"publications.dramaticarts.ui.play.production_theater.no_theater_selected")); "publications.dramaticarts.ui.play.production_theater.no_theater_selected"));
} }

10
ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayProductionTheaterSheet.java
View File

@ -61,17 +61,17 @@ public class SciPublicationsPlayProductionTheaterSheet
super(); super();
this.itemModel = itemModel; this.itemModel = itemModel;
setEmptyView(new Label(globalisationUtil.globalise( setEmptyView(new Label(globalisationUtil.globalize(
"publications.dramaticarts.ui.play.production_theater.none"))); "publications.dramaticarts.ui.play.production_theater.none")));
final TableColumnModel columnModel = getColumnModel(); final TableColumnModel columnModel = getColumnModel();
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
0, 0,
globalisationUtil.globalise("publications.dramaticarts.ui.play.productiontheater"), globalisationUtil.globalize("publications.dramaticarts.ui.play.productiontheater"),
TABLE_COL_EDIT)); TABLE_COL_EDIT));
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
1, 1,
globalisationUtil.globalise( globalisationUtil.globalize(
"publications.dramaticarts.ui.play.production_theater.remove"), "publications.dramaticarts.ui.play.production_theater.remove"),
TABLE_COL_DEL)); TABLE_COL_DEL));
@ -145,7 +145,7 @@ public class SciPublicationsPlayProductionTheaterSheet
case 0: case 0:
return productionTheater.getTitle(); return productionTheater.getTitle();
case 1: case 1:
return new Label(globalisationUtil.globalise( return new Label(globalisationUtil.globalize(
"publications.dramaticarts.ui.play.production_theater.remove")); "publications.dramaticarts.ui.play.production_theater.remove"));
default: default:
return null; return null;
@ -234,7 +234,7 @@ public class SciPublicationsPlayProductionTheaterSheet
if (canEdit) { if (canEdit) {
final ControlLink link = new ControlLink((Label) value); final ControlLink link = new ControlLink((Label) value);
link.setConfirmation(globalisationUtil.globalise( link.setConfirmation(globalisationUtil.globalize(
"publications.dramaticarts.ui.play.production_theater.remove.confirm")); "publications.dramaticarts.ui.play.production_theater.remove.confirm"));
return link; return link;
} else { } else {

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

@ -49,7 +49,7 @@ public class SciPublicationsPlayProductionTheaterStep extends SimpleEditStep {
final BasicItemForm setProductionTheaterForm = new SciPublicationsPlayProductionTheaterForm( final BasicItemForm setProductionTheaterForm = new SciPublicationsPlayProductionTheaterForm(
itemModel); itemModel);
add(SET_PRODUCTION_THEATER_STEP, add(SET_PRODUCTION_THEATER_STEP,
globalisationUtil.globalise("publications.dramaticarts.play.ui.productiontheater"), globalisationUtil.globalize("publications.dramaticarts.play.ui.productiontheater"),
new WorkflowLockedComponentAccess(setProductionTheaterForm, itemModel), new WorkflowLockedComponentAccess(setProductionTheaterForm, itemModel),
setProductionTheaterForm.getSaveCancelSection().getCancelButton()); setProductionTheaterForm.getSaveCancelSection().getCancelButton());

5
ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayPropertiesStep.java
View File

@ -53,7 +53,7 @@ public class SciPublicationsPlayPropertiesStep extends PublicationWithPublisherP
final SciPublicationsDramaticArtsGlobalisationUtil globalisationUtil final SciPublicationsDramaticArtsGlobalisationUtil globalisationUtil
= new SciPublicationsDramaticArtsGlobalisationUtil(); = new SciPublicationsDramaticArtsGlobalisationUtil();
sheet.add(globalisationUtil.globalise( sheet.add(globalisationUtil.globalize(
"publications.dramaticarts.ui.play.first_production_year"), "publications.dramaticarts.ui.play.first_production_year"),
SciPublicationsPlay.FIRST_PRODUCTION_YEAR); SciPublicationsPlay.FIRST_PRODUCTION_YEAR);
@ -94,8 +94,7 @@ public class SciPublicationsPlayPropertiesStep extends PublicationWithPublisherP
final SciPublicationsDramaticArtsGlobalisationUtil globalisationUtil final SciPublicationsDramaticArtsGlobalisationUtil globalisationUtil
= new SciPublicationsDramaticArtsGlobalisationUtil(); = new SciPublicationsDramaticArtsGlobalisationUtil();
addStep(new SciPublicationsPlayProductionTheaterStep(itemModel, parent), addStep(new SciPublicationsPlayProductionTheaterStep(itemModel, parent),
globalisationUtil. globalisationUtil.globalize("publications.dramaticarts.ui.play.first_production_theater"));
globalise("publications.dramaticarts.ui.play.first_production_theater"));
} }

4
ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayPropertyForm.java
View File

@ -64,8 +64,8 @@ public class SciPublicationsPlayPropertyForm
final ParameterModel firstProdYearParam = new IntegerParameter(SciPublicationsPlay.FIRST_PRODUCTION_YEAR); final ParameterModel firstProdYearParam = new IntegerParameter(SciPublicationsPlay.FIRST_PRODUCTION_YEAR);
final TextField firstProdYear = new TextField(firstProdYearParam); final TextField firstProdYear = new TextField(firstProdYearParam);
firstProdYear.setMaxLength(4); firstProdYear.setMaxLength(4);
firstProdYear.setLabel(globalisationUtil.globalise("publications.dramaticarts.ui.play.first_production_year")); firstProdYear.setLabel(globalisationUtil.globalize("publications.dramaticarts.ui.play.first_production_year"));
add(new Label(globalisationUtil.globalise("publications.dramaticarts.ui.play.first_production_year"))); add(new Label(globalisationUtil.globalize("publications.dramaticarts.ui.play.first_production_year")));
add(firstProdYear); add(firstProdYear);
} }

11
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeForm.java
View File

@ -26,7 +26,6 @@ import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormSectionEvent;
import com.arsdigita.cms.ContentType; import com.arsdigita.cms.ContentType;
import com.arsdigita.cms.Folder;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.contenttypes.ArticleInCollectedVolume; import com.arsdigita.cms.contenttypes.ArticleInCollectedVolume;
import com.arsdigita.cms.contenttypes.CollectedVolume; import com.arsdigita.cms.contenttypes.CollectedVolume;
@ -34,7 +33,6 @@ import com.arsdigita.cms.contenttypes.PublicationsConfig;
import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.cms.ui.ItemSearchWidget;
import com.arsdigita.cms.ui.authoring.BasicItemForm; import com.arsdigita.cms.ui.authoring.BasicItemForm;
import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.Kernel;
import java.math.BigDecimal;
/** /**
* Form for adding an association between an ArticleInCollectedVolume and a * Form for adding an association between an ArticleInCollectedVolume and a
@ -63,13 +61,16 @@ public class ArticleInCollectedVolumeCollectedVolumeForm
@Override @Override
protected void addWidgets() { protected void addWidgets() {
add(new Label(
PublicationGlobalizationUtil.globalize( //add(new Label(
"publications.ui.articleInCollectedVolume.selectCollectedVolume"))); // PublicationGlobalizationUtil.globalize(
// "publications.ui.articleInCollectedVolume.selectCollectedVolume")));
itemSearch = new ItemSearchWidget(ITEM_SEARCH, itemSearch = new ItemSearchWidget(ITEM_SEARCH,
ContentType.findByAssociatedObjectType( ContentType.findByAssociatedObjectType(
CollectedVolume.class.getName())); CollectedVolume.class.getName()));
itemSearch.setDefaultCreationFolder(config.getDefaultCollectedVolumesFolder()); itemSearch.setDefaultCreationFolder(config.getDefaultCollectedVolumesFolder());
itemSearch.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.articleInCollectedVolume.selectCollectedVolume"));
add(itemSearch); add(itemSearch);
} }

16
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeSheet.java
View File

@ -68,15 +68,13 @@ public class ArticleInCollectedVolumeCollectedVolumeSheet
TableColumnModel colModel = getColumnModel(); TableColumnModel colModel = getColumnModel();
colModel.add(new TableColumn( colModel.add(new TableColumn(
0, 0,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.articleInCollectedVolume.collectedVolume"). "publications.ui.articleInCollectedVolume.collectedVolume")),
localize(),
TABLE_COL_EDIT)); TABLE_COL_EDIT));
colModel.add(new TableColumn( colModel.add(new TableColumn(
1, 1,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.articleInCollectedVolume.collectedVolume.remove"). "publications.ui.articleInCollectedVolume.collectedVolume.remove")),
localize(),
TABLE_COL_DEL)); TABLE_COL_DEL));
setModelBuilder( setModelBuilder(
@ -162,6 +160,7 @@ public class ArticleInCollectedVolumeCollectedVolumeSheet
} }
} }
@Override
public Object getKeyAt(int columnIndex) { public Object getKeyAt(int columnIndex) {
return collectedVolume.getID(); return collectedVolume.getID();
} }
@ -225,6 +224,7 @@ public class ArticleInCollectedVolumeCollectedVolumeSheet
extends LockableImpl extends LockableImpl
implements TableCellRenderer { implements TableCellRenderer {
@Override
public Component getComponent(Table table, public Component getComponent(Table table,
PageState state, PageState state,
Object value, Object value,
@ -246,9 +246,9 @@ public class ArticleInCollectedVolumeCollectedVolumeSheet
if (canEdit) { if (canEdit) {
ControlLink link = new ControlLink(value.toString()); ControlLink link = new ControlLink(value.toString());
link.setConfirmation( link.setConfirmation(
(String) PublicationGlobalizationUtil.globalize( PublicationGlobalizationUtil.globalize(
"publications.ui.articleInCollectedVolume.collectedVolume." "publications.ui.articleInCollectedVolume.collectedVolume."
+ "confirm_remove").localize()); + "confirm_remove"));
return link; return link;
} else { } else {
Label label = new Label(value.toString()); Label label = new Label(value.toString());

7
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeStep.java
View File

@ -50,15 +50,14 @@ public class ArticleInCollectedVolumeCollectedVolumeStep
BasicItemForm addCollectedVolumeForm = BasicItemForm addCollectedVolumeForm =
new ArticleInCollectedVolumeCollectedVolumeForm(itemModel); new ArticleInCollectedVolumeCollectedVolumeForm(itemModel);
add(ADD_COLLECTED_VOLUME_STEP, add(ADD_COLLECTED_VOLUME_STEP,
(String) PublicationGlobalizationUtil.globalize( PublicationGlobalizationUtil.globalize(
"publications.ui.collectedVolume.addCollectedVolume").localize(), "publications.ui.collectedVolume.addCollectedVolume"),
new WorkflowLockedComponentAccess(addCollectedVolumeForm, new WorkflowLockedComponentAccess(addCollectedVolumeForm,
itemModel), itemModel),
addCollectedVolumeForm.getSaveCancelSection().getCancelButton()); addCollectedVolumeForm.getSaveCancelSection().getCancelButton());
ArticleInCollectedVolumeCollectedVolumeSheet sheet = ArticleInCollectedVolumeCollectedVolumeSheet sheet =
new ArticleInCollectedVolumeCollectedVolumeSheet( new ArticleInCollectedVolumeCollectedVolumeSheet(itemModel);
itemModel);
setDisplayComponent(sheet); setDisplayComponent(sheet);
} }

1
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumePropertiesStep.java
View File

@ -115,6 +115,7 @@ public class ArticleInCollectedVolumePropertiesStep
super(); super();
} }
@Override
public String format(DomainObject obj, String attribute, PageState state) { public String format(DomainObject obj, String attribute, PageState state) {
if ((get(obj, attribute) != null) if ((get(obj, attribute) != null)
&& (get(obj, attribute) instanceof Boolean) && (get(obj, attribute) instanceof Boolean)

20
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumePropertyForm.java
View File

@ -63,36 +63,34 @@ public class ArticleInCollectedVolumePropertyForm
@Override @Override
protected void addWidgets() { protected void addWidgets() {
super.addWidgets(); super.addWidgets();
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.article_in_collected_volume.pages_from").
localize()));
ParameterModel fromParam = new IntegerParameter( ParameterModel fromParam = new IntegerParameter(
ArticleInCollectedVolume.PAGES_FROM); ArticleInCollectedVolume.PAGES_FROM);
TextField pagesFrom = new TextField(fromParam); TextField pagesFrom = new TextField(fromParam);
pagesFrom.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.article_in_collected_volume.pages_from"));
add(pagesFrom); add(pagesFrom);
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.article_in_collected_volume.pages_to").
localize()));
ParameterModel toParam = new IntegerParameter( ParameterModel toParam = new IntegerParameter(
ArticleInCollectedVolume.PAGES_TO); ArticleInCollectedVolume.PAGES_TO);
TextField pagesTo = new TextField(toParam); TextField pagesTo = new TextField(toParam);
pagesTo.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.article_in_collected_volume.pages_to"));
add(pagesTo); add(pagesTo);
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.article_in_collected_volume.chapter").
localize()));
ParameterModel chapterParam = new StringParameter( ParameterModel chapterParam = new StringParameter(
ArticleInCollectedVolume.CHAPTER); ArticleInCollectedVolume.CHAPTER);
TextField chapter = new TextField(chapterParam); TextField chapter = new TextField(chapterParam);
chapter.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.article_in_collected_volume.chapter"));
add(chapter); add(chapter);
add(new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.articleInCollectedVolume.reviewed")));
reviewed = new CheckboxGroup("reviewedGroup"); reviewed = new CheckboxGroup("reviewedGroup");
reviewed.addOption(new Option(REVIEWED, "")); reviewed.addOption(new Option(REVIEWED, ""));
reviewed.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.articleInCollectedVolume.reviewed"));
add(reviewed); add(reviewed);
} }

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

@ -35,6 +35,7 @@ import com.arsdigita.xml.Element;
*/ */
public class ArticleInJournalExtraXmlGenerator implements ExtraXMLGenerator { public class ArticleInJournalExtraXmlGenerator implements ExtraXMLGenerator {
@Override
public void generateXML(final ContentItem item, public void generateXML(final ContentItem item,
final Element element, final Element element,
final PageState state) { final PageState state) {
@ -62,6 +63,7 @@ public class ArticleInJournalExtraXmlGenerator implements ExtraXMLGenerator {
} }
} }
@Override
public void addGlobalStateParams(final Page p) { public void addGlobalStateParams(final Page p) {
//nothing //nothing
} }

4
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalForm.java
View File

@ -61,14 +61,14 @@ public class ArticleInJournalJournalForm
@Override @Override
protected void addWidgets() { protected void addWidgets() {
add(new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.articleInJournal.selectJournal")));
itemSearch = new ItemSearchWidget(ITEM_SEARCH, itemSearch = new ItemSearchWidget(ITEM_SEARCH,
ContentType.findByAssociatedObjectType( ContentType.findByAssociatedObjectType(
Journal.class.getName())); Journal.class.getName()));
itemSearch.setDefaultCreationFolder(config.getDefaultJournalsFolder()); itemSearch.setDefaultCreationFolder(config.getDefaultJournalsFolder());
itemSearch.setEditAfterCreate(false); itemSearch.setEditAfterCreate(false);
itemSearch.setQueryField("symbol"); itemSearch.setQueryField("symbol");
itemSearch.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.articleInJournal.selectJournal"));
add(itemSearch); add(itemSearch);
} }

8
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalSheet.java
View File

@ -66,13 +66,13 @@ public class ArticleInJournalJournalSheet
TableColumnModel columnModel = getColumnModel(); TableColumnModel columnModel = getColumnModel();
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
0, 0,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.articleInJournal.journal").localize(), "publications.ui.articleInJournal.journal")),
TABLE_COL_EDIT)); TABLE_COL_EDIT));
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
1, 1,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.articleInJournal.journal.remove").localize(), "publications.ui.articleInJournal.journal.remove")),
TABLE_COL_DEL)); TABLE_COL_DEL));
setModelBuilder(new ArticleInJournalJournalSheetModelBuilder(itemModel)); setModelBuilder(new ArticleInJournalJournalSheetModelBuilder(itemModel));

4
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalStep.java
View File

@ -46,8 +46,8 @@ public class ArticleInJournalJournalStep extends SimpleEditStep {
BasicItemForm addJournalForm = BasicItemForm addJournalForm =
new ArticleInJournalJournalForm(itemModel); new ArticleInJournalJournalForm(itemModel);
add(ADD_JOURNAL_STEP, add(ADD_JOURNAL_STEP,
(String) PublicationGlobalizationUtil.globalize( PublicationGlobalizationUtil.globalize(
"publications.ui.articleInJournal.addJournal").localize(), "publications.ui.articleInJournal.addJournal"),
new WorkflowLockedComponentAccess(addJournalForm, itemModel), new WorkflowLockedComponentAccess(addJournalForm, itemModel),
addJournalForm.getSaveCancelSection().getCancelButton()); addJournalForm.getSaveCancelSection().getCancelButton());

24
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertiesStep.java
View File

@ -103,21 +103,21 @@ public class ArticleInJournalPropertiesStep extends PublicationPropertiesStep {
BasicPageForm editBasicSheet = BasicPageForm editBasicSheet =
new ArticleInJournalPropertyForm(itemModel, this); new ArticleInJournalPropertyForm(itemModel, this);
basicProperties.add(EDIT_SHEET_NAME, basicProperties.add(
(String) PublicationGlobalizationUtil.globalize( EDIT_SHEET_NAME,
"publications.ui.articleinjournal.edit_basic_sheet"). PublicationGlobalizationUtil.globalize(
localize(), "publications.ui.articleinjournal.edit_basic_sheet"),
new WorkflowLockedComponentAccess(editBasicSheet, new WorkflowLockedComponentAccess(editBasicSheet,
itemModel), itemModel),
editBasicSheet.getSaveCancelSection(). editBasicSheet.getSaveCancelSection().getCancelButton()
getCancelButton()); );
basicProperties.setDisplayComponent( basicProperties.setDisplayComponent(
getArticleInJournalPropertySheet(itemModel)); getArticleInJournalPropertySheet(itemModel));
getSegmentedPanel().addSegment( getSegmentedPanel().addSegment(
new Label((String) PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.publication.basic_properties").localize()), "publications.ui.publication.basic_properties")),
basicProperties); basicProperties);
} }
@ -127,8 +127,8 @@ public class ArticleInJournalPropertiesStep extends PublicationPropertiesStep {
super.addSteps(itemModel, parent); super.addSteps(itemModel, parent);
addStep(new ArticleInJournalJournalStep(itemModel, parent), addStep(new ArticleInJournalJournalStep(itemModel, parent),
(String) PublicationGlobalizationUtil.globalize( PublicationGlobalizationUtil.globalize(
"publication.ui.articleInJournal.journal").localize()); "publication.ui.articleInJournal.journal"));
} }

26
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertyForm.java
View File

@ -69,54 +69,54 @@ public class ArticleInJournalPropertyForm
@Override @Override
protected void addWidgets() { protected void addWidgets() {
super.addWidgets(); super.addWidgets();
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.articleinjournal.volume").localize()));
ParameterModel volumeParam = ParameterModel volumeParam =
new IntegerParameter(ArticleInJournal.VOLUME); new IntegerParameter(ArticleInJournal.VOLUME);
TextField volume = new TextField(volumeParam); TextField volume = new TextField(volumeParam);
//volume.addValidationListener(new NotNullValidationListener()); //volume.addValidationListener(new NotNullValidationListener());
//volume.addValidationListener(new NotEmptyValidationListener()); //volume.addValidationListener(new NotEmptyValidationListener());
volume.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.articleinjournal.volume"));
add(volume); add(volume);
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.articleinjournal.issue").localize()));
ParameterModel issueParam = new StringParameter(ArticleInJournal.ISSUE); ParameterModel issueParam = new StringParameter(ArticleInJournal.ISSUE);
TextField issue = new TextField(issueParam); TextField issue = new TextField(issueParam);
issue.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.articleinjournal.issue"));
add(issue); add(issue);
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.articleinjournal.pages_from").localize()));
ParameterModel pagesFromParam = ParameterModel pagesFromParam =
new IntegerParameter(ArticleInJournal.PAGES_FROM); new IntegerParameter(ArticleInJournal.PAGES_FROM);
TextField pagesFrom = new TextField(pagesFromParam); TextField pagesFrom = new TextField(pagesFromParam);
pagesFrom.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.articleinjournal.pages_from"));
add(pagesFrom); add(pagesFrom);
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.articleinjournal.pages_to").localize()));
ParameterModel pagesToParam = ParameterModel pagesToParam =
new IntegerParameter(ArticleInJournal.PAGES_TO); new IntegerParameter(ArticleInJournal.PAGES_TO);
TextField pagesTo = new TextField(pagesToParam); TextField pagesTo = new TextField(pagesToParam);
pagesTo.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.articleinjournal.pages_to"));
add(pagesTo); add(pagesTo);
Calendar today = new GregorianCalendar(); Calendar today = new GregorianCalendar();
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.articleinjournal.publicationDate").
localize()));
ParameterModel pubDateParam = ParameterModel pubDateParam =
new DateParameter(ArticleInJournal.PUBLICATION_DATE); new DateParameter(ArticleInJournal.PUBLICATION_DATE);
com.arsdigita.bebop.form.Date pubDate = com.arsdigita.bebop.form.Date pubDate =
new com.arsdigita.bebop.form.Date( new com.arsdigita.bebop.form.Date(
pubDateParam); pubDateParam);
pubDate.setYearRange(1900, today.get(Calendar.YEAR) + 2); pubDate.setYearRange(1900, today.get(Calendar.YEAR) + 2);
pubDate.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.articleinjournal.publicationDate"));
add(pubDate); add(pubDate);
reviewedLabel = new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.articleinjournal.reviewed"));
add(reviewedLabel); add(reviewedLabel);
reviewed = new CheckboxGroup("reviewedGroup"); reviewed = new CheckboxGroup("reviewedGroup");
reviewed.addOption(new Option(REVIEWED, "")); reviewed.addOption(new Option(REVIEWED, ""));
reviewed.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.articleinjournal.reviewed"));
add(reviewed); add(reviewed);
} }

9
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeArticleAddForm.java
View File

@ -26,7 +26,6 @@ import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormSectionEvent;
import com.arsdigita.cms.ContentType; import com.arsdigita.cms.ContentType;
import com.arsdigita.cms.Folder;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.contenttypes.ArticleInCollectedVolume; import com.arsdigita.cms.contenttypes.ArticleInCollectedVolume;
import com.arsdigita.cms.contenttypes.ArticleInCollectedVolumeCollection; import com.arsdigita.cms.contenttypes.ArticleInCollectedVolumeCollection;
@ -35,7 +34,7 @@ import com.arsdigita.cms.contenttypes.PublicationsConfig;
import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.cms.ui.ItemSearchWidget;
import com.arsdigita.cms.ui.authoring.BasicItemForm; import com.arsdigita.cms.ui.authoring.BasicItemForm;
import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.Kernel;
import java.math.BigDecimal;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
@ -68,14 +67,14 @@ public class CollectedVolumeArticleAddForm
@Override @Override
protected void addWidgets() { protected void addWidgets() {
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.collected_volume.articles.select_article").
localize()));
m_itemSearch = new ItemSearchWidget( m_itemSearch = new ItemSearchWidget(
ITEM_SEARCH, ITEM_SEARCH,
ContentType.findByAssociatedObjectType( ContentType.findByAssociatedObjectType(
ArticleInCollectedVolume.class.getName())); ArticleInCollectedVolume.class.getName()));
m_itemSearch.setDefaultCreationFolder(config.getDefaultArticlesInCollectedVolumeFolder()); m_itemSearch.setDefaultCreationFolder(config.getDefaultArticlesInCollectedVolumeFolder());
m_itemSearch.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.collected_volume.articles.select_article"));
add(m_itemSearch); add(m_itemSearch);
} }

4
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeArticlesStep.java
View File

@ -45,8 +45,8 @@ public class CollectedVolumeArticlesStep extends SimpleEditStep {
BasicItemForm addArticleSheet = BasicItemForm addArticleSheet =
new CollectedVolumeArticleAddForm(itemModel); new CollectedVolumeArticleAddForm(itemModel);
add(ADD_ARTICLE_SHEET_NAME, add(ADD_ARTICLE_SHEET_NAME,
(String) PublicationGlobalizationUtil.globalize( PublicationGlobalizationUtil.globalize(
"publications.ui.collected_volume.add_article").localize(), "publications.ui.collected_volume.add_article"),
new WorkflowLockedComponentAccess(addArticleSheet, itemModel), new WorkflowLockedComponentAccess(addArticleSheet, itemModel),
addArticleSheet.getSaveCancelSection().getCancelButton()); addArticleSheet.getSaveCancelSection().getCancelButton());

27
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeArticlesTable.java
View File

@ -73,23 +73,23 @@ public class CollectedVolumeArticlesTable
TableColumnModel colModel = getColumnModel(); TableColumnModel colModel = getColumnModel();
colModel.add(new TableColumn( colModel.add(new TableColumn(
0, 0,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.collected_volume.article").localize(), "publications.ui.collected_volume.article")),
TABLE_COL_EDIT)); TABLE_COL_EDIT));
colModel.add(new TableColumn( colModel.add(new TableColumn(
1, 1,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.collected_volume.article.remove").localize(), "publications.ui.collected_volume.article.remove")),
TABLE_COL_DEL)); TABLE_COL_DEL));
colModel.add(new TableColumn( colModel.add(new TableColumn(
2, 2,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.collected_volume.article.up").localize(), "publications.ui.collected_volume.article.up")),
TABLE_COL_UP)); TABLE_COL_UP));
colModel.add(new TableColumn( colModel.add(new TableColumn(
3, 3,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.collected_volume.article.down").localize(), "publications.ui.collected_volume.article.down")),
TABLE_COL_DOWN)); TABLE_COL_DOWN));
setModelBuilder( setModelBuilder(
@ -264,11 +264,8 @@ public class CollectedVolumeArticlesTable
if (canEdit) { if (canEdit) {
ControlLink link = new ControlLink(value.toString()); ControlLink link = new ControlLink(value.toString());
link.setConfirmation((String) PublicationGlobalizationUtil. link.setConfirmation(PublicationGlobalizationUtil.globalize(
globalize( "publications.ui.collected_volume.articles.confirm_remove"));
"publications.ui.collected_volume."
+ "articles.confirm_remove").
localize());
return link; return link;
} else { } else {
Label label = new Label(value.toString()); Label label = new Label(value.toString());
@ -293,7 +290,7 @@ public class CollectedVolumeArticlesTable
if (0 == row) { if (0 == row) {
s_log.debug("Row is first row in table, don't show up link"); s_log.debug("Row is first row in table, don't show up link");
Label label = new Label(""); Label label = new Label();
return label; return label;
} else { } else {
ControlLink link = new ControlLink("up"); ControlLink link = new ControlLink("up");
@ -324,7 +321,7 @@ public class CollectedVolumeArticlesTable
if ((articles.size() - 1) == row) { if ((articles.size() - 1) == row) {
s_log.debug("Row is last row in table, don't show down link"); s_log.debug("Row is last row in table, don't show down link");
Label label = new Label(""); Label label = new Label();
return label; return label;
} else { } else {
ControlLink link = new ControlLink("down"); ControlLink link = new ControlLink("down");

1
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeExtraXmlGenerator.java
View File

@ -85,6 +85,7 @@ public class CollectedVolumeExtraXmlGenerator implements ExtraXMLGenerator {
generator.generateXML(state, articlesElem, ""); generator.generateXML(state, articlesElem, "");
} }
@Override
public void addGlobalStateParams(final Page page) { public void addGlobalStateParams(final Page page) {
//Nothing //Nothing
} }

20
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumePropertiesStep.java
View File

@ -67,22 +67,19 @@ public class CollectedVolumePropertiesStep
BasicPageForm editBasicSheet = BasicPageForm editBasicSheet =
new CollectedVolumePropertyForm(itemModel, this); new CollectedVolumePropertyForm(itemModel, this);
basicProperties.add(EDIT_SHEET_NAME, basicProperties.add(
(String) PublicationGlobalizationUtil.globalize( EDIT_SHEET_NAME,
"publications.ui.collected_volume.edit_basic_sheet"). PublicationGlobalizationUtil.globalize(
localize(), "publications.ui.collected_volume.edit_basic_sheet"),
new WorkflowLockedComponentAccess(editBasicSheet, new WorkflowLockedComponentAccess(editBasicSheet,itemModel),
itemModel), editBasicSheet.getSaveCancelSection().getCancelButton());
editBasicSheet.getSaveCancelSection().
getCancelButton());
basicProperties.setDisplayComponent( basicProperties.setDisplayComponent(
getCollectedVolumePropertySheet(itemModel)); getCollectedVolumePropertySheet(itemModel));
getSegmentedPanel().addSegment( getSegmentedPanel().addSegment(
new Label((String) PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.publication.basic_properties"). "publications.ui.publication.basic_properties")),
localize()),
basicProperties); basicProperties);
} }
@ -103,6 +100,7 @@ public class CollectedVolumePropertiesStep
super(); super();
} }
@Override
public String format(DomainObject obj, String attribute, PageState state) { public String format(DomainObject obj, String attribute, PageState state) {
if ((get(obj, attribute) != null) if ((get(obj, attribute) != null)
&& (get(obj, attribute) instanceof Boolean) && (get(obj, attribute) instanceof Boolean)

9
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumePropertyForm.java
View File

@ -41,9 +41,8 @@ public class CollectedVolumePropertyForm
FormInitListener, FormInitListener,
FormSubmissionListener { FormSubmissionListener {
private static final Logger s_log = private static final Logger s_log = Logger.getLogger(
Logger.getLogger( CollectedVolumePropertyForm.class);
CollectedVolumePropertyForm.class);
private static final String REVIEWED = "reviewed"; private static final String REVIEWED = "reviewed";
private CollectedVolumePropertiesStep m_step; private CollectedVolumePropertiesStep m_step;
public static final String ID = "CollectedVolumeEdit"; public static final String ID = "CollectedVolumeEdit";
@ -62,11 +61,13 @@ public class CollectedVolumePropertyForm
@Override @Override
protected void addWidgets() { protected void addWidgets() {
super.addWidgets(); super.addWidgets();
add(new Label(PublicationGlobalizationUtil.globalize("publications.ui.collectedVolume.reviewed")));
reviewed = new CheckboxGroup("reviewedGroup"); reviewed = new CheckboxGroup("reviewedGroup");
reviewed.addOption(new Option(REVIEWED, "")); reviewed.addOption(new Option(REVIEWED, ""));
reviewed.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.collectedVolume.reviewed"));
add(reviewed); add(reviewed);
} }

6
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererForm.java
View File

@ -26,7 +26,6 @@ import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormSectionEvent;
import com.arsdigita.cms.ContentType; import com.arsdigita.cms.ContentType;
import com.arsdigita.cms.Folder;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.contenttypes.Expertise; import com.arsdigita.cms.contenttypes.Expertise;
import com.arsdigita.cms.contenttypes.GenericOrganizationalUnit; import com.arsdigita.cms.contenttypes.GenericOrganizationalUnit;
@ -34,7 +33,6 @@ import com.arsdigita.cms.contenttypes.PublicationsConfig;
import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.cms.ui.ItemSearchWidget;
import com.arsdigita.cms.ui.authoring.BasicItemForm; import com.arsdigita.cms.ui.authoring.BasicItemForm;
import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.Kernel;
import java.math.BigDecimal;
/** /**
* *
@ -60,13 +58,13 @@ public class ExpertiseOrdererForm
@Override @Override
protected void addWidgets() { protected void addWidgets() {
add(new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.expertise.orderer")));
itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType. itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.
findByAssociatedObjectType(GenericOrganizationalUnit.class. findByAssociatedObjectType(GenericOrganizationalUnit.class.
getName())); getName()));
itemSearch.setDefaultCreationFolder(config.getDefaultOrganizationsFolder()); itemSearch.setDefaultCreationFolder(config.getDefaultOrganizationsFolder());
itemSearch.setEditAfterCreate(false); itemSearch.setEditAfterCreate(false);
itemSearch.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.expertise.orderer"));
add(itemSearch); add(itemSearch);
} }

14
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererSheet.java
View File

@ -64,13 +64,13 @@ public class ExpertiseOrdererSheet
TableColumnModel columnModel = getColumnModel(); TableColumnModel columnModel = getColumnModel();
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
0, 0,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.expertise.orderer").localize(), "publications.ui.expertise.orderer")),
TABLE_COL_EDIT)); TABLE_COL_EDIT));
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
1, 1,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.expertise.orderer.remove").localize(), "publications.ui.expertise.orderer.remove")),
TABLE_COL_DEL)); TABLE_COL_DEL));
setModelBuilder(new ExpertiseOrganizationSheetModelBuilder(itemModel)); setModelBuilder(new ExpertiseOrganizationSheetModelBuilder(itemModel));
@ -230,10 +230,8 @@ public class ExpertiseOrdererSheet
if (canEdit) { if (canEdit) {
ControlLink link = new ControlLink(value.toString()); ControlLink link = new ControlLink(value.toString());
link.setConfirmation((String) PublicationGlobalizationUtil. link.setConfirmation(PublicationGlobalizationUtil.globalize(
globalize( "publication.ui.expertise.orderer.remove.confirm"));
"publication.ui.expertise.orderer.remove.confirm").
localize());
return link; return link;
} else { } else {
Label label = new Label(value.toString()); Label label = new Label(value.toString());

4
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererStep.java
View File

@ -44,8 +44,8 @@ public class ExpertiseOrdererStep extends SimpleEditStep {
BasicItemForm setOrdererForm = new ExpertiseOrdererForm(itemModel); BasicItemForm setOrdererForm = new ExpertiseOrdererForm(itemModel);
add(SET_EXPERTISE_ORDERER_STEP, add(SET_EXPERTISE_ORDERER_STEP,
(String) PublicationGlobalizationUtil.globalize( PublicationGlobalizationUtil.globalize(
"publications.ui.expertise.setOrderer").localize(), "publications.ui.expertise.setOrderer"),
new WorkflowLockedComponentAccess(setOrdererForm, itemModel), new WorkflowLockedComponentAccess(setOrdererForm, itemModel),
setOrdererForm.getSaveCancelSection().getCancelButton()); setOrdererForm.getSaveCancelSection().getCancelButton());

7
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationForm.java
View File

@ -20,13 +20,11 @@ package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormSectionEvent;
import com.arsdigita.cms.ContentType; import com.arsdigita.cms.ContentType;
import com.arsdigita.cms.Folder;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.contenttypes.Expertise; import com.arsdigita.cms.contenttypes.Expertise;
import com.arsdigita.cms.contenttypes.GenericOrganizationalUnit; import com.arsdigita.cms.contenttypes.GenericOrganizationalUnit;
@ -34,7 +32,6 @@ import com.arsdigita.cms.contenttypes.PublicationsConfig;
import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.cms.ui.ItemSearchWidget;
import com.arsdigita.cms.ui.authoring.BasicItemForm; import com.arsdigita.cms.ui.authoring.BasicItemForm;
import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.Kernel;
import java.math.BigDecimal;
/** /**
* *
@ -60,13 +57,13 @@ public class ExpertiseOrganizationForm
@Override @Override
protected void addWidgets() { protected void addWidgets() {
add(new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.expertise.organization")));
itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType. itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.
findByAssociatedObjectType(GenericOrganizationalUnit.class. findByAssociatedObjectType(GenericOrganizationalUnit.class.
getName())); getName()));
itemSearch.setDefaultCreationFolder(config.getDefaultOrganizationsFolder()); itemSearch.setDefaultCreationFolder(config.getDefaultOrganizationsFolder());
itemSearch.setEditAfterCreate(false); itemSearch.setEditAfterCreate(false);
itemSearch.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.expertise.organization"));
add(itemSearch); add(itemSearch);
} }

14
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationSheet.java
View File

@ -64,13 +64,13 @@ public class ExpertiseOrganizationSheet
TableColumnModel columnModel = getColumnModel(); TableColumnModel columnModel = getColumnModel();
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
0, 0,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.expertise.organization").localize(), "publications.ui.expertise.organization")),
TABLE_COL_EDIT)); TABLE_COL_EDIT));
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
0, 0,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.expertise.organization.remove").localize(), "publications.ui.expertise.organization.remove")),
TABLE_COL_DEL)); TABLE_COL_DEL));
setModelBuilder(new ExpertiseOrganizationSheetModelBuilder(itemModel)); setModelBuilder(new ExpertiseOrganizationSheetModelBuilder(itemModel));
@ -231,10 +231,8 @@ public class ExpertiseOrganizationSheet
if (canEdit) { if (canEdit) {
ControlLink link = new ControlLink(value.toString()); ControlLink link = new ControlLink(value.toString());
link.setConfirmation((String) PublicationGlobalizationUtil. link.setConfirmation(PublicationGlobalizationUtil.globalize(
globalize( "publication.ui.expertise.organization.remove.confirm"));
"publication.ui.expertise.organization.remove.confirm").
localize());
return link; return link;
} else { } else {
Label label = new Label(value.toString()); Label label = new Label(value.toString());

4
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationStep.java
View File

@ -45,8 +45,8 @@ public class ExpertiseOrganizationStep extends SimpleEditStep {
BasicItemForm setOrgaForm = new ExpertiseOrganizationForm(itemModel); BasicItemForm setOrgaForm = new ExpertiseOrganizationForm(itemModel);
add(SET_EXPERTISE_ORGANIZATION_STEP, add(SET_EXPERTISE_ORGANIZATION_STEP,
(String) PublicationGlobalizationUtil.globalize( PublicationGlobalizationUtil.globalize(
"publications.ui.expertise.setOrganization").localize(), "publications.ui.expertise.setOrganization"),
new WorkflowLockedComponentAccess(setOrgaForm, itemModel), new WorkflowLockedComponentAccess(setOrgaForm, itemModel),
setOrgaForm.getSaveCancelSection().getCancelButton()); setOrgaForm.getSaveCancelSection().getCancelButton());

13
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertisePropertyForm.java
View File

@ -20,7 +20,6 @@ package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormSectionEvent;
@ -29,11 +28,8 @@ import com.arsdigita.bebop.form.TextField;
import com.arsdigita.bebop.parameters.IntegerParameter; import com.arsdigita.bebop.parameters.IntegerParameter;
import com.arsdigita.bebop.parameters.ParameterModel; import com.arsdigita.bebop.parameters.ParameterModel;
import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.cms.ContentType;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.contenttypes.Expertise; import com.arsdigita.cms.contenttypes.Expertise;
import com.arsdigita.cms.contenttypes.GenericOrganizationalUnit;
import com.arsdigita.cms.ui.ItemSearchWidget;
/** /**
* *
@ -61,19 +57,20 @@ public class ExpertisePropertyForm
@Override @Override
protected void addWidgets() { protected void addWidgets() {
super.addWidgets(); super.addWidgets();
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.expertise.place").localize()));
ParameterModel placeParam = new StringParameter(Expertise.PLACE); ParameterModel placeParam = new StringParameter(Expertise.PLACE);
TextField place = new TextField(placeParam); TextField place = new TextField(placeParam);
place.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.expertise.place"));
add(place); add(place);
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.expertise.number_of_pages").localize()));
ParameterModel numberOfPagesParam = ParameterModel numberOfPagesParam =
new IntegerParameter(Expertise.NUMBER_OF_PAGES); new IntegerParameter(Expertise.NUMBER_OF_PAGES);
TextField numberOfPages = new TextField(numberOfPagesParam); TextField numberOfPages = new TextField(numberOfPagesParam);
numberOfPages.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.expertise.number_of_pages"));
add(numberOfPages); add(numberOfPages);
} }

4
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationAddForm.java
View File

@ -54,12 +54,12 @@ public class GenericOrganizationalUnitPublicationAddForm
@Override @Override
public void addWidgets() { public void addWidgets() {
add(new Label((String) PublicationGlobalizationUtil.globalize(
"genericorganizationalunit.ui.publication.select").localize()));
itemSearch = new ItemSearchWidget(ITEM_SEARCH, itemSearch = new ItemSearchWidget(ITEM_SEARCH,
ContentType.findByAssociatedObjectType(Publication.class. ContentType.findByAssociatedObjectType(Publication.class.
getName())); getName()));
itemSearch.setDisableCreatePane(true); itemSearch.setDisableCreatePane(true);
itemSearch.setLabel(PublicationGlobalizationUtil.globalize(
"genericorganizationalunit.ui.publication.select"));
add(itemSearch); add(itemSearch);
} }

4
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsStep.java
View File

@ -49,8 +49,8 @@ public class GenericOrganizationalUnitPublicationsStep extends SimpleEditStep {
final BasicItemForm addPublicationSheet = final BasicItemForm addPublicationSheet =
new GenericOrganizationalUnitPublicationAddForm(itemModel); new GenericOrganizationalUnitPublicationAddForm(itemModel);
add(ADD_PUBLICATION_SHEET_NAME, add(ADD_PUBLICATION_SHEET_NAME,
(String) PublicationGlobalizationUtil.globalize( PublicationGlobalizationUtil.globalize(
"genericorganizationalunit.ui.add_publication").localize(), "genericorganizationalunit.ui.add_publication"),
new WorkflowLockedComponentAccess(addPublicationSheet, itemModel), new WorkflowLockedComponentAccess(addPublicationSheet, itemModel),
addPublicationSheet.getSaveCancelSection().getCancelButton()); addPublicationSheet.getSaveCancelSection().getCancelButton());

21
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsTable.java
View File

@ -38,7 +38,6 @@ import com.arsdigita.cms.contenttypes.GenericOrganizationalUnit;
import com.arsdigita.cms.contenttypes.GenericOrganizationalUnitPublicationsCollection; import com.arsdigita.cms.contenttypes.GenericOrganizationalUnitPublicationsCollection;
import com.arsdigita.cms.contenttypes.Publication; import com.arsdigita.cms.contenttypes.Publication;
import com.arsdigita.cms.dispatcher.ItemResolver; import com.arsdigita.cms.dispatcher.ItemResolver;
import com.arsdigita.cms.dispatcher.Utilities;
import com.arsdigita.util.LockableImpl; import com.arsdigita.util.LockableImpl;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -67,15 +66,13 @@ public class GenericOrganizationalUnitPublicationsTable
final TableColumnModel columnModel = getColumnModel(); final TableColumnModel columnModel = getColumnModel();
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
0, 0,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"genericorganizationalunit.ui.publications.columns.name"). "genericorganizationalunit.ui.publications.columns.name")),
localize(),
TABLE_COL_EDIT)); TABLE_COL_EDIT));
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
1, 1,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"genericorganizationalunit.ui.publications.columns.remove"). "genericorganizationalunit.ui.publications.columns.remove")),
localize(),
TABLE_COL_DEL)); TABLE_COL_DEL));
setModelBuilder(new ModelBuilder(itemModel)); setModelBuilder(new ModelBuilder(itemModel));
@ -97,6 +94,7 @@ public class GenericOrganizationalUnitPublicationsTable
this.itemModel = itemModel; this.itemModel = itemModel;
} }
@Override
public TableModel makeModel(final Table table, public TableModel makeModel(final Table table,
final PageState state) { final PageState state) {
table.getRowSelectionModel().clearSelection(state); table.getRowSelectionModel().clearSelection(state);
@ -201,6 +199,7 @@ public class GenericOrganizationalUnitPublicationsTable
extends LockableImpl extends LockableImpl
implements TableCellRenderer { implements TableCellRenderer {
@Override
public Component getComponent(final Table table, public Component getComponent(final Table table,
final PageState state, final PageState state,
final Object value, final Object value,
@ -221,10 +220,8 @@ public class GenericOrganizationalUnitPublicationsTable
if (canEdit) { if (canEdit) {
final ControlLink link = new ControlLink(value.toString()); final ControlLink link = new ControlLink(value.toString());
link.setConfirmation((String) PublicationGlobalizationUtil. link.setConfirmation(PublicationGlobalizationUtil.globalize(
globalize( "genericorganizationalunit.ui.publications.remove.confirm"));
"genericorganizationalunit.ui.publications.remove.confirm").
localize());
return link; return link;
} else { } else {
final Label label = new Label(value.toString()); final Label label = new Label(value.toString());
@ -236,6 +233,7 @@ public class GenericOrganizationalUnitPublicationsTable
private class ActionListener implements TableActionListener { private class ActionListener implements TableActionListener {
@Override
public void cellSelected(final TableActionEvent event) { public void cellSelected(final TableActionEvent event) {
final PageState state = event.getPageState(); final PageState state = event.getPageState();
@ -256,6 +254,7 @@ public class GenericOrganizationalUnitPublicationsTable
} }
@Override
public void headSelected(final TableActionEvent event) { public void headSelected(final TableActionEvent event) {
//Nothing //Nothing
} }

13
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GreyLiteraturePropertyForm.java
View File

@ -20,7 +20,6 @@ package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormSectionEvent;
@ -28,7 +27,6 @@ import com.arsdigita.bebop.event.FormSubmissionListener;
import com.arsdigita.bebop.form.TextField; import com.arsdigita.bebop.form.TextField;
import com.arsdigita.bebop.parameters.IntegerParameter; import com.arsdigita.bebop.parameters.IntegerParameter;
import com.arsdigita.bebop.parameters.ParameterModel; import com.arsdigita.bebop.parameters.ParameterModel;
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.contenttypes.GreyLiterature; import com.arsdigita.cms.contenttypes.GreyLiterature;
@ -58,22 +56,21 @@ public class GreyLiteraturePropertyForm
@Override @Override
protected void addWidgets() { protected void addWidgets() {
super.addWidgets(); super.addWidgets();
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.greyliterature.pages_from").
localize()));
ParameterModel fromParam = new IntegerParameter( ParameterModel fromParam = new IntegerParameter(
GreyLiterature.PAGES_FROM); GreyLiterature.PAGES_FROM);
TextField pagesFrom = new TextField(fromParam); TextField pagesFrom = new TextField(fromParam);
pagesFrom.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.greyliterature.pages_from"));
add(pagesFrom); add(pagesFrom);
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.greyliterature.pages_to").
localize()));
ParameterModel toParam = new IntegerParameter( ParameterModel toParam = new IntegerParameter(
GreyLiterature.PAGES_TO); GreyLiterature.PAGES_TO);
TextField pagesTo = new TextField(toParam); TextField pagesTo = new TextField(toParam);
pagesTo.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.greyliterature.pages_to"));
add(pagesTo); add(pagesTo);
} }

8
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsProceedingsForm.java
View File

@ -37,7 +37,8 @@ import com.arsdigita.kernel.Kernel;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
* Form for adding an association between a InProceedings publication and a proceedings publication. * Form for adding an association between a InProceedings publication and a
* proceedings publication.
* *
* @author Jens Pelzetter * @author Jens Pelzetter
* @version $Id$ * @version $Id$
@ -61,13 +62,12 @@ public class InProceedingsProceedingsForm
@Override @Override
protected void addWidgets() { protected void addWidgets() {
add(new Label(
PublicationGlobalizationUtil.globalize(
"publications.ui.inProceedings.selectProceedings")));
itemSearch = new ItemSearchWidget(ITEM_SEARCH, itemSearch = new ItemSearchWidget(ITEM_SEARCH,
ContentType.findByAssociatedObjectType( ContentType.findByAssociatedObjectType(
Proceedings.class.getName())); Proceedings.class.getName()));
itemSearch.setDefaultCreationFolder(config.getDefaultProceedingsFolder()); itemSearch.setDefaultCreationFolder(config.getDefaultProceedingsFolder());
itemSearch.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.inProceedings.selectProceedings"));
add(itemSearch); add(itemSearch);
} }

20
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsProceedingsSheet.java
View File

@ -67,13 +67,13 @@ public class InProceedingsProceedingsSheet
TableColumnModel columnModel = getColumnModel(); TableColumnModel columnModel = getColumnModel();
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
0, 0,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.inProceedings.proceedings").localize(), "publications.ui.inProceedings.proceedings")),
TABLE_COL_EDIT)); TABLE_COL_EDIT));
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
1, 1,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.inProceedings.proceedings.remove").localize(), "publications.ui.inProceedings.proceedings.remove")),
TABLE_COL_DEL)); TABLE_COL_DEL));
setModelBuilder(new InProceedingsProceedingsSheetModelBuilder( setModelBuilder(new InProceedingsProceedingsSheetModelBuilder(
@ -149,9 +149,8 @@ public class InProceedingsProceedingsSheet
case 0: case 0:
return proceedings.getTitle(); return proceedings.getTitle();
case 1: case 1:
return PublicationGlobalizationUtil.globalize( return new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.inProceedings.proceedings.remove"). "publications.ui.inProceedings.proceedings.remove"));
localize();
default: default:
return null; return null;
} }
@ -224,6 +223,7 @@ public class InProceedingsProceedingsSheet
extends LockableImpl extends LockableImpl
implements TableCellRenderer { implements TableCellRenderer {
@Override
public Component getComponent(Table table, public Component getComponent(Table table,
PageState state, PageState state,
Object value, Object value,
@ -243,10 +243,8 @@ public class InProceedingsProceedingsSheet
if (canEdit) { if (canEdit) {
ControlLink link = new ControlLink(value.toString()); ControlLink link = new ControlLink(value.toString());
link.setConfirmation( link.setConfirmation(PublicationGlobalizationUtil.globalize(
(String) PublicationGlobalizationUtil.globalize( "publications.ui.inProceedings.proceedings.confirm_remove"));
"publications.ui.inProceedings.proceedings."
+ "confirm_remove").localize());
return link; return link;
} else { } else {
Label label = new Label(value.toString()); Label label = new Label(value.toString());

4
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsProceedingsStep.java
View File

@ -47,8 +47,8 @@ public class InProceedingsProceedingsStep extends SimpleEditStep {
BasicItemForm addProceedingsForm = new InProceedingsProceedingsForm( BasicItemForm addProceedingsForm = new InProceedingsProceedingsForm(
itemModel); itemModel);
add(ADD_PROCEEDINGS_STEP, add(ADD_PROCEEDINGS_STEP,
(String) PublicationGlobalizationUtil.globalize( PublicationGlobalizationUtil.globalize(
"publications.ui.inProceedings.addProceedings").localize(), "publications.ui.inProceedings.addProceedings"),
new WorkflowLockedComponentAccess(addProceedingsForm, new WorkflowLockedComponentAccess(addProceedingsForm,
itemModel), itemModel),
addProceedingsForm.getSaveCancelSection().getCancelButton()); addProceedingsForm.getSaveCancelSection().getCancelButton());

22
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsPropertiesStep.java
View File

@ -66,20 +66,20 @@ public class InProceedingsPropertiesStep
BasicPageForm editBasicSheet = new InProceedingsPropertyForm(itemModel, BasicPageForm editBasicSheet = new InProceedingsPropertyForm(itemModel,
this); this);
basicProperties.add(EDIT_SHEET_NAME, basicProperties.add(
(String) PublicationGlobalizationUtil.globalize( EDIT_SHEET_NAME,
"publications.ui.inproceedings.edit_basic_sheet").localize(), PublicationGlobalizationUtil.globalize(
new WorkflowLockedComponentAccess(editBasicSheet, "publications.ui.inproceedings.edit_basic_sheet"),
itemModel), new WorkflowLockedComponentAccess(editBasicSheet,
editBasicSheet.getSaveCancelSection(). itemModel),
getCancelButton()); editBasicSheet.getSaveCancelSection().getCancelButton());
basicProperties.setDisplayComponent( basicProperties.setDisplayComponent(
getInProceedingsPropertySheet(itemModel)); getInProceedingsPropertySheet(itemModel));
getSegmentedPanel().addSegment( getSegmentedPanel().addSegment(
new Label((String) PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.publications.basic_properties").localize()), "publications.ui.publications.basic_properties")),
basicProperties); basicProperties);
} }
@ -89,7 +89,7 @@ public class InProceedingsPropertiesStep
super.addSteps(itemModel, parent); super.addSteps(itemModel, parent);
addStep(new InProceedingsProceedingsStep(itemModel, parent), addStep(new InProceedingsProceedingsStep(itemModel, parent),
(String) PublicationGlobalizationUtil.globalize( PublicationGlobalizationUtil.globalize(
"publications.ui.inProceedings.proceedings").localize()); "publications.ui.inProceedings.proceedings"));
} }
} }

10
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsPropertyForm.java
View File

@ -20,7 +20,6 @@ package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormSectionEvent;
@ -57,20 +56,21 @@ public class InProceedingsPropertyForm
@Override @Override
protected void addWidgets() { protected void addWidgets() {
super.addWidgets(); super.addWidgets();
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.inproceedings.pages_from").localize()));
ParameterModel pagesFromParam = ParameterModel pagesFromParam =
new IntegerParameter(InProceedings.PAGES_FROM); new IntegerParameter(InProceedings.PAGES_FROM);
TextField pagesFrom = new TextField(pagesFromParam); TextField pagesFrom = new TextField(pagesFromParam);
pagesFrom.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.inproceedings.pages_from"));
add(pagesFrom); add(pagesFrom);
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.inproceedings.pages_to").localize()));
ParameterModel pagesToParam = ParameterModel pagesToParam =
new IntegerParameter(InProceedings.PAGES_TO); new IntegerParameter(InProceedings.PAGES_TO);
TextField pagesTo = new TextField(pagesToParam); TextField pagesTo = new TextField(pagesToParam);
pagesTo.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.inproceedings.pages_to"));
add(pagesTo); add(pagesTo);
} }

4
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationForm.java
View File

@ -60,13 +60,13 @@ public class InternetArticleOrganizationForm
@Override @Override
public void addWidgets() { public void addWidgets() {
add(new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.select_organization")));
itemSearch = new ItemSearchWidget(ITEM_SEARCH, itemSearch = new ItemSearchWidget(ITEM_SEARCH,
ContentType.findByAssociatedObjectType( ContentType.findByAssociatedObjectType(
GenericOrganizationalUnit.class.getName())); GenericOrganizationalUnit.class.getName()));
itemSearch.setDefaultCreationFolder(config.getDefaultOrganizationsFolder()); itemSearch.setDefaultCreationFolder(config.getDefaultOrganizationsFolder());
itemSearch.setEditAfterCreate(false); itemSearch.setEditAfterCreate(false);
itemSearch.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.select_organization"));
add(itemSearch); add(itemSearch);
} }

23
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationSheet.java
View File

@ -64,13 +64,13 @@ public class InternetArticleOrganizationSheet
TableColumnModel columnModel = getColumnModel(); TableColumnModel columnModel = getColumnModel();
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
0, 0,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.organization").localize(), "publications.ui.internetarticle.organization")),
TABLE_COL_EDIT)); TABLE_COL_EDIT));
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
1, 1,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.organization.remove").localize(), "publications.ui.internetarticle.organization.remove")),
TABLE_COL_DEL)); TABLE_COL_DEL));
setModelBuilder(new InternetArticleOrganizationSheetModelBuilder( setModelBuilder(new InternetArticleOrganizationSheetModelBuilder(
@ -122,10 +122,12 @@ public class InternetArticleOrganizationSheet
} }
} }
@Override
public int getColumnCount() { public int getColumnCount() {
return table.getColumnModel().size(); return table.getColumnModel().size();
} }
@Override
public boolean nextRow() { public boolean nextRow() {
boolean ret; boolean ret;
@ -139,19 +141,20 @@ public class InternetArticleOrganizationSheet
return ret; return ret;
} }
@Override
public Object getElementAt(final int columnIndex) { public Object getElementAt(final int columnIndex) {
switch (columnIndex) { switch (columnIndex) {
case 0: case 0:
return orga.getTitle(); return orga.getTitle();
case 1: case 1:
return PublicationGlobalizationUtil.globalize( return new Label(PublicationGlobalizationUtil.globalize(
"publication.ui.internetarticle.organization.remove"). "publication.ui.internetarticle.organization.remove"));
localize();
default: default:
return null; return null;
} }
} }
@Override
public Object getKeyAt(final int columnIndex) { public Object getKeyAt(final int columnIndex) {
return orga.getID(); return orga.getID();
} }
@ -240,10 +243,8 @@ public class InternetArticleOrganizationSheet
if (canEdit) { if (canEdit) {
ControlLink link = new ControlLink(value.toString()); ControlLink link = new ControlLink(value.toString());
link.setConfirmation((String) PublicationGlobalizationUtil. link.setConfirmation(PublicationGlobalizationUtil.globalize(
globalize( "publications.ui.internetarticle.organization.remove.confirm"));
"publications.ui.internetarticle.organization.remove.confirm").
localize());
return link; return link;
} else { } else {
Label label = new Label(value.toString()); Label label = new Label(value.toString());

8
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationStep.java
View File

@ -46,10 +46,10 @@ public class InternetArticleOrganizationStep extends SimpleEditStep {
BasicItemForm setOrgaForm = new InternetArticleOrganizationForm( BasicItemForm setOrgaForm = new InternetArticleOrganizationForm(
itemModel); itemModel);
add(SET_INTERNET_ARTICLE_ORGANIZATION_STEP, add(SET_INTERNET_ARTICLE_ORGANIZATION_STEP,
(String) PublicationGlobalizationUtil.globalize( PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.setOrganization").localize(), "publications.ui.internetarticle.setOrganization"),
new WorkflowLockedComponentAccess(setOrgaForm, itemModel), new WorkflowLockedComponentAccess(setOrgaForm, itemModel),
setOrgaForm.getSaveCancelSection().getCancelButton()); setOrgaForm.getSaveCancelSection().getCancelButton());
InternetArticleOrganizationSheet sheet = new InternetArticleOrganizationSheet( InternetArticleOrganizationSheet sheet = new InternetArticleOrganizationSheet(
itemModel); itemModel);

18
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticlePropertiesStep.java
View File

@ -94,21 +94,19 @@ public class InternetArticlePropertiesStep extends PublicationPropertiesStep {
BasicPageForm editBasicSheet = BasicPageForm editBasicSheet =
new InternetArticlePropertyForm(itemModel, this); new InternetArticlePropertyForm(itemModel, this);
basicProperties.add(EDIT_SHEET_NAME, basicProperties.add(
(String) PublicationGlobalizationUtil.globalize( EDIT_SHEET_NAME,
"publications.ui.internetarticle.edit_basic_sheet"). PublicationGlobalizationUtil.globalize(
localize(), "publications.ui.internetarticle.edit_basic_sheet"),
new WorkflowLockedComponentAccess(editBasicSheet, new WorkflowLockedComponentAccess(editBasicSheet,itemModel),
itemModel), editBasicSheet.getSaveCancelSection().getCancelButton());
editBasicSheet.getSaveCancelSection().
getCancelButton());
basicProperties.setDisplayComponent( basicProperties.setDisplayComponent(
getInternetArticlePropertySheet(itemModel)); getInternetArticlePropertySheet(itemModel));
getSegmentedPanel().addSegment( getSegmentedPanel().addSegment(
new Label((String) PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.publication.basic_properties").localize()), "publications.ui.publication.basic_properties")),
basicProperties); basicProperties);
} }

45
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticlePropertyForm.java
View File

@ -20,7 +20,6 @@ package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormSectionEvent;
@ -67,42 +66,43 @@ public class InternetArticlePropertyForm
protected void addWidgets() { protected void addWidgets() {
super.addWidgets(); super.addWidgets();
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.place").localize()));
ParameterModel placeParam = ParameterModel placeParam =
new StringParameter(InternetArticle.PLACE); new StringParameter(InternetArticle.PLACE);
TextField place = new TextField(placeParam); TextField place = new TextField(placeParam);
place.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.place"));
add(place); add(place);
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.number").localize()));
ParameterModel numberParam = ParameterModel numberParam =
new StringParameter(InternetArticle.NUMBER); new StringParameter(InternetArticle.NUMBER);
TextField number = new TextField(numberParam); TextField number = new TextField(numberParam);
number.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.number"));
add(number); add(number);
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.number_of_pages").localize()));
ParameterModel numberOfPagesParam = ParameterModel numberOfPagesParam =
new IntegerParameter(InternetArticle.NUMBER_OF_PAGES); new IntegerParameter(InternetArticle.NUMBER_OF_PAGES);
TextField numberOfPages = new TextField(numberOfPagesParam); TextField numberOfPages = new TextField(numberOfPagesParam);
numberOfPages.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.number_of_pages"));
add(numberOfPages); add(numberOfPages);
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.edition").localize()));
ParameterModel editionParam = ParameterModel editionParam =
new StringParameter(InternetArticle.EDITION); new StringParameter(InternetArticle.EDITION);
TextField edition = new TextField(editionParam); TextField edition = new TextField(editionParam);
edition.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.edition"));
add(edition); add(edition);
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.issn").localize()));
ParameterModel issnParam = ParameterModel issnParam =
new StringParameter(InternetArticle.ISSN); new StringParameter(InternetArticle.ISSN);
TextField issn = new TextField(issnParam); TextField issn = new TextField(issnParam);
issn.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.issn"));
issn.setMaxLength(9); issn.setMaxLength(9);
issn.addValidationListener(new ParameterListener() { issn.addValidationListener(new ParameterListener() {
@Override
public void validate(ParameterEvent event) throws public void validate(ParameterEvent event) throws
FormProcessException { FormProcessException {
ParameterData data = event.getParameterData(); ParameterData data = event.getParameterData();
@ -132,33 +132,34 @@ public class InternetArticlePropertyForm
add(issn); add(issn);
Calendar today = new GregorianCalendar(); Calendar today = new GregorianCalendar();
add(new Label((String) PublicationGlobalizationUtil.globalize( //add(new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.lastAccessed"). // "publications.ui.internetarticle.lastAccessed")));
localize())); ParameterModel pubDateParam = new DateParameter(
ParameterModel pubDateParam = InternetArticle.LAST_ACCESSED);
new DateParameter(InternetArticle.LAST_ACCESSED);
com.arsdigita.bebop.form.Date pubDate = com.arsdigita.bebop.form.Date pubDate =
new com.arsdigita.bebop.form.Date( new com.arsdigita.bebop.form.Date(
pubDateParam); pubDateParam);
pubDate.setYearRange(1900, today.get(Calendar.YEAR) + 2); pubDate.setYearRange(1900, today.get(Calendar.YEAR) + 2);
pubDate.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.lastAccessed"));
add(pubDate); add(pubDate);
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.url").localize()));
ParameterModel urlModel = new StringParameter(InternetArticle.URL); ParameterModel urlModel = new StringParameter(InternetArticle.URL);
TextField url = new TextField(urlModel); TextField url = new TextField(urlModel);
url.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.url"));
add(url); add(url);
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.urn").localize()));
ParameterModel urnModel = new StringParameter(InternetArticle.URN); ParameterModel urnModel = new StringParameter(InternetArticle.URN);
TextField urn = new TextField(urnModel); TextField urn = new TextField(urnModel);
urn.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.urn"));
add(urn); add(urn);
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.doi").localize()));
ParameterModel doiModel = new StringParameter(InternetArticle.DOI); ParameterModel doiModel = new StringParameter(InternetArticle.DOI);
TextField doi = new TextField(doiModel); TextField doi = new TextField(doiModel);
doi.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.doi"));
add(doi); add(doi);
} }

5
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticleAddForm.java
View File

@ -66,14 +66,13 @@ public class JournalArticleAddForm
@Override @Override
public void addWidgets() { public void addWidgets() {
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.journal.articles.select_article").
localize()));
m_itemSearch = new ItemSearchWidget( m_itemSearch = new ItemSearchWidget(
ITEM_SEARCH, ITEM_SEARCH,
ContentType.findByAssociatedObjectType( ContentType.findByAssociatedObjectType(
ArticleInJournal.class.getName())); ArticleInJournal.class.getName()));
m_itemSearch.setDefaultCreationFolder(config.getDefaultArticlesInJournalFolder()); m_itemSearch.setDefaultCreationFolder(config.getDefaultArticlesInJournalFolder());
m_itemSearch.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.journal.articles.select_article"));
add(m_itemSearch); add(m_itemSearch);
} }

7
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticlesStep.java
View File

@ -45,9 +45,10 @@ public class JournalArticlesStep extends SimpleEditStep {
BasicItemForm addArticleSheet = BasicItemForm addArticleSheet =
new JournalArticleAddForm(itemModel); new JournalArticleAddForm(itemModel);
add(ADD_ARTICLE_SHEET_NAME, add(ADD_ARTICLE_SHEET_NAME,
(String) PublicationGlobalizationUtil.globalize("publications.ui.journal.add_article").localize(), PublicationGlobalizationUtil.globalize(
new WorkflowLockedComponentAccess(addArticleSheet, itemModel), "publications.ui.journal.add_article"),
addArticleSheet.getSaveCancelSection().getCancelButton()); new WorkflowLockedComponentAccess(addArticleSheet, itemModel),
addArticleSheet.getSaveCancelSection().getCancelButton());
JournalArticlesTable articlesTable = JournalArticlesTable articlesTable =
new JournalArticlesTable(itemModel); new JournalArticlesTable(itemModel);

47
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticlesTable.java
View File

@ -69,23 +69,23 @@ public class JournalArticlesTable
TableColumnModel columnModel = getColumnModel(); TableColumnModel columnModel = getColumnModel();
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
0, 0,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.journal.article").localize(), "publications.ui.journal.article")),
TABLE_COL_EDIT)); TABLE_COL_EDIT));
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
1, 1,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.journal.article.remove").localize(), "publications.ui.journal.article.remove")),
TABLE_COL_DEL)); TABLE_COL_DEL));
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
2, 2,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.journal.article.up").localize(), "publications.ui.journal.article.up")),
TABLE_COL_UP)); TABLE_COL_UP));
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
3, 3,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.journal.article.down").localize(), "publications.ui.journal.article.down")),
TABLE_COL_DOWN)); TABLE_COL_DOWN));
setModelBuilder(new JournalArticlesTableModelBuilder(itemModel)); setModelBuilder(new JournalArticlesTableModelBuilder(itemModel));
@ -159,9 +159,8 @@ public class JournalArticlesTable
case 0: case 0:
return m_article.getTitle(); return m_article.getTitle();
case 1: case 1:
return PublicationGlobalizationUtil.globalize( return new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.journal.article.remove"). "publications.ui.journal.article.remove"));
localize();
default: default:
return null; return null;
} }
@ -237,6 +236,7 @@ public class JournalArticlesTable
private class DeleteCellRenderer extends LockableImpl implements private class DeleteCellRenderer extends LockableImpl implements
TableCellRenderer { TableCellRenderer {
@Override
public Component getComponent( public Component getComponent(
Table table, Table table,
PageState state, PageState state,
@ -250,15 +250,14 @@ public class JournalArticlesTable
Journal journal = (Journal) m_itemModel.getSelectedObject( Journal journal = (Journal) m_itemModel.getSelectedObject(
state); state);
boolean canEdit = securityManager.canAccess(state.getRequest(), boolean canEdit = securityManager.canAccess(
com.arsdigita.cms.SecurityManager.DELETE_ITEM, state.getRequest(),
journal); com.arsdigita.cms.SecurityManager.DELETE_ITEM,
journal);
if (canEdit) { if (canEdit) {
ControlLink link = new ControlLink(value.toString()); ControlLink link = new ControlLink(value.toString());
link.setConfirmation((String) PublicationGlobalizationUtil. link.setConfirmation(PublicationGlobalizationUtil.globalize(
globalize( "cms.contenttypes.ui.journal.articles.confirm_delete"));
"cms.contenttypes.ui.journal.articles.confirm_delete").
localize());
return link; return link;
} else { } else {
return new Label(value.toString()); return new Label(value.toString());
@ -281,13 +280,12 @@ public class JournalArticlesTable
int col) { int col) {
if (0 == row) { if (0 == row) {
Label label = new Label(""); Label label = new Label();
return label; return label;
} else { } else {
ControlLink link = new ControlLink( ControlLink link = new ControlLink(
(String) PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"cms.contenttypes.ui.journal.articles.up"). "cms.contenttypes.ui.journal.articles.up")));
localize());
return link; return link;
} }
} }
@ -315,9 +313,8 @@ public class JournalArticlesTable
return label; return label;
} else { } else {
ControlLink link = new ControlLink( ControlLink link = new ControlLink(
(String) PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"cms.contenttypes.ui.journal.articles.down"). "cms.contenttypes.ui.journal.articles.down")));
localize());
return link; return link;
} }
} }

25
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalPropertiesStep.java
View File

@ -85,7 +85,9 @@ public class JournalPropertiesStep extends SimpleEditStep {
"publications.ui.journal.abstract"), "publications.ui.journal.abstract"),
Journal.ABSTRACT); Journal.ABSTRACT);
sheet.add(PublicationGlobalizationUtil.globalize("publications.ui.journal.symbol"), Journal.SYMBOL); sheet.add(PublicationGlobalizationUtil.globalize(
"publications.ui.journal.symbol"),
Journal.SYMBOL);
if (!ContentSection.getConfig().getHideLaunchDate()) { if (!ContentSection.getConfig().getHideLaunchDate()) {
@ -121,20 +123,18 @@ public class JournalPropertiesStep extends SimpleEditStep {
BasicPageForm editBasicSheet = new JournalPropertyForm(itemModel, BasicPageForm editBasicSheet = new JournalPropertyForm(itemModel,
this); this);
basicProperties.add(EDIT_SHEET_NAME, basicProperties.add(
(String) PublicationGlobalizationUtil.globalize( EDIT_SHEET_NAME,
"publications.ui.journal.edit_basic_sheet").localize(), PublicationGlobalizationUtil.globalize(
new WorkflowLockedComponentAccess(editBasicSheet, "publications.ui.journal.edit_basic_sheet"),
itemModel), new WorkflowLockedComponentAccess(editBasicSheet,itemModel),
editBasicSheet.getSaveCancelSection(). editBasicSheet.getSaveCancelSection().getCancelButton());
getCancelButton());
basicProperties.setDisplayComponent(getJournalPropertySheet(itemModel)); basicProperties.setDisplayComponent(getJournalPropertySheet(itemModel));
getSegmentedPanel().addSegment( getSegmentedPanel().addSegment(
new Label((String) PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.publication.basic_properties"). "publications.ui.publication.basic_properties")),
localize()),
basicProperties); basicProperties);
} }
@ -150,8 +150,7 @@ public class JournalPropertiesStep extends SimpleEditStep {
protected void addStep(SimpleEditStep step, String labelKey) { protected void addStep(SimpleEditStep step, String labelKey) {
segmentedPanel.addSegment( segmentedPanel.addSegment(
new Label((String) PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(labelKey)),
labelKey).localize()),
step); step);
} }
} }

20
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalPropertyForm.java
View File

@ -68,16 +68,16 @@ public class JournalPropertyForm
protected void addWidgets() { protected void addWidgets() {
super.addWidgets(); super.addWidgets();
add(new Label((String) PublicationGlobalizationUtil.globalize("publications.ui.journal.symbol").localize()));
final ParameterModel symbolModel = new StringParameter(Journal.SYMBOL); final ParameterModel symbolModel = new StringParameter(Journal.SYMBOL);
final TextField symbol = new TextField(symbolModel); final TextField symbol = new TextField(symbolModel);
symbol.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.journal.symbol"));
add(symbol); add(symbol);
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.journal.issn").localize()));
final ParameterModel issnParam = new StringParameter(Journal.ISSN); final ParameterModel issnParam = new StringParameter(Journal.ISSN);
final TextField issn = new TextField(issnParam); final TextField issn = new TextField(issnParam);
issn.addValidationListener(new ParameterListener() { issn.addValidationListener(new ParameterListener() {
@Override
public void validate(final ParameterEvent event) throws FormProcessException { public void validate(final ParameterEvent event) throws FormProcessException {
final ParameterData data = event.getParameterData(); final ParameterData data = event.getParameterData();
String value = (String) data.getValue(); String value = (String) data.getValue();
@ -102,24 +102,26 @@ public class JournalPropertyForm
} }
}); });
issn.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.journal.issn"));
add(issn); add(issn);
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.journal.firstYearOfPublication").localize()));
final ParameterModel firstYearParam = new IntegerParameter(Journal.FIRST_YEAR); final ParameterModel firstYearParam = new IntegerParameter(Journal.FIRST_YEAR);
final TextField firstYear = new TextField(firstYearParam); final TextField firstYear = new TextField(firstYearParam);
firstYear.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.journal.firstYearOfPublication"));
add(firstYear); add(firstYear);
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.journal.lastYearOfPublication").localize()));
final ParameterModel lastYearParam = new IntegerParameter(Journal.LAST_YEAR); final ParameterModel lastYearParam = new IntegerParameter(Journal.LAST_YEAR);
final TextField lastYear = new TextField(lastYearParam); final TextField lastYear = new TextField(lastYearParam);
lastYear.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.journal.lastYearOfPublication"));
add(lastYear); add(lastYear);
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.journal.abstract").localize()));
final ParameterModel abstractParam = new StringParameter(Journal.ABSTRACT); final ParameterModel abstractParam = new StringParameter(Journal.ABSTRACT);
final TextArea abstractArea = new TextArea(abstractParam); final TextArea abstractArea = new TextArea(abstractParam);
abstractArea.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.journal.abstract"));
abstractArea.setCols(60); abstractArea.setCols(60);
abstractArea.setRows(18); abstractArea.setRows(18);
add(abstractArea); add(abstractArea);

41
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/MonographPropertiesStep.java
View File

@ -39,46 +39,47 @@ public class MonographPropertiesStep
extends PublicationWithPublisherPropertiesStep { extends PublicationWithPublisherPropertiesStep {
public MonographPropertiesStep(ItemSelectionModel itemModel, public MonographPropertiesStep(ItemSelectionModel itemModel,
AuthoringKitWizard parent) { AuthoringKitWizard parent) {
super(itemModel, parent); super(itemModel, parent);
} }
public static Component getMonographPropertySheet( public static Component getMonographPropertySheet(
ItemSelectionModel itemModel) { ItemSelectionModel itemModel) {
DomainObjectPropertySheet sheet = (DomainObjectPropertySheet) PublicationWithPublisherPropertiesStep. DomainObjectPropertySheet sheet = (DomainObjectPropertySheet)
getPublicationWithPublisherPropertySheet(itemModel); PublicationWithPublisherPropertiesStep
.getPublicationWithPublisherPropertySheet(itemModel);
sheet.add(PublicationGlobalizationUtil.globalize( sheet.add(PublicationGlobalizationUtil.globalize(
"publications.ui.monograph.reviewed"), "publications.ui.monograph.reviewed"),
Monograph.REVIEWED, new ReviewedFormatter()); Monograph.REVIEWED,
new ReviewedFormatter());
return sheet; return sheet;
} }
@Override @Override
protected void addBasicProperties(ItemSelectionModel itemModel, protected void addBasicProperties(ItemSelectionModel itemModel,
AuthoringKitWizard parent) { AuthoringKitWizard parent) {
SimpleEditStep basicProperties = new SimpleEditStep(itemModel, SimpleEditStep basicProperties = new SimpleEditStep(itemModel,
parent, parent,
EDIT_SHEET_NAME); EDIT_SHEET_NAME);
BasicPageForm editBasicSheet = BasicPageForm editBasicSheet
new MonographPropertyForm(itemModel, this); = new MonographPropertyForm(itemModel, this);
basicProperties.add(EDIT_SHEET_NAME, basicProperties.add(
(String) PublicationGlobalizationUtil.globalize( EDIT_SHEET_NAME,
"publications.ui.monograph.edit_basic_sheet").localize(), PublicationGlobalizationUtil.globalize(
new WorkflowLockedComponentAccess(editBasicSheet, "publications.ui.monograph.edit_basic_sheet"),
itemModel), new WorkflowLockedComponentAccess(editBasicSheet,itemModel),
editBasicSheet.getSaveCancelSection(). editBasicSheet.getSaveCancelSection().getCancelButton());
getCancelButton());
basicProperties.setDisplayComponent( basicProperties.setDisplayComponent(
getMonographPropertySheet(itemModel)); getMonographPropertySheet(itemModel));
getSegmentedPanel().addSegment( getSegmentedPanel().addSegment(
new Label((String) PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.publication.basic_properties").localize()), "publications.ui.publication.basic_properties")),
basicProperties); basicProperties);
} }
@ -92,8 +93,8 @@ public class MonographPropertiesStep
public String format(DomainObject obj, String attribute, PageState state) { public String format(DomainObject obj, String attribute, PageState state) {
if ((get(obj, attribute) != null) if ((get(obj, attribute) != null)
&& (get(obj, attribute) instanceof Boolean) && (get(obj, attribute) instanceof Boolean)
&& ((Boolean) get(obj, attribute) == true)) { && ((Boolean) get(obj, attribute) == true)) {
return (String) PublicationGlobalizationUtil.globalize( return (String) PublicationGlobalizationUtil.globalize(
"publications.ui.monograph.reviewed.yes").localize(); "publications.ui.monograph.reviewed.yes").localize();
} else { } else {

6
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/MonographPropertyForm.java
View File

@ -20,7 +20,6 @@ package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormSectionEvent;
@ -58,12 +57,13 @@ public class MonographPropertyForm
@Override @Override
protected void addWidgets() { protected void addWidgets() {
super.addWidgets(); super.addWidgets();
add(new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.monograph.reviewed")));
reviewed = new CheckboxGroup("reviewedGroup"); reviewed = new CheckboxGroup("reviewedGroup");
reviewed.addOption(new Option(REVIEWED, "")); reviewed.addOption(new Option(REVIEWED, ""));
reviewed.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.monograph.reviewed"));
add(reviewed); add(reviewed);
} }

34
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/OrganizationPublicationsTable.java
View File

@ -57,20 +57,24 @@ public class OrganizationPublicationsTable extends Table {
this.itemModel = itemModel; this.itemModel = itemModel;
setEmptyView(new Label(PublicationGlobalizationUtil.globalize("organization.ui.publications.none"))); setEmptyView(new Label(PublicationGlobalizationUtil
.globalize("organization.ui.publications.none")));
final TableColumnModel columnModel = getColumnModel(); final TableColumnModel columnModel = getColumnModel();
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
0, 0,
PublicationGlobalizationUtil.globalize("organization.ui.publications.columns.name").localize(), new Label(PublicationGlobalizationUtil.globalize(
"organization.ui.publications.columns.name")),
TABLE_COL_EDIT)); TABLE_COL_EDIT));
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
1, 1,
PublicationGlobalizationUtil.globalize("organization.ui.publications.columns.year").localize(), new Label(PublicationGlobalizationUtil.globalize(
"organization.ui.publications.columns.year")),
TABLE_COL_YEAR)); TABLE_COL_YEAR));
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
2, 2,
PublicationGlobalizationUtil.globalize("organization.ui.publications.columns.type").localize(), new Label(PublicationGlobalizationUtil.globalize(
"organization.ui.publications.columns.type")),
TABLE_COL_TYPE)); TABLE_COL_TYPE));
setModelBuilder(new ModelBuilder(itemModel)); setModelBuilder(new ModelBuilder(itemModel));
@ -86,10 +90,12 @@ public class OrganizationPublicationsTable extends Table {
this.itemModel = itemModel; this.itemModel = itemModel;
} }
@Override
public TableModel makeModel(final Table table, final PageState state) { public TableModel makeModel(final Table table, final PageState state) {
table.getRowSelectionModel().clearSelection(state); table.getRowSelectionModel().clearSelection(state);
final GenericOrganizationalUnit orga = (GenericOrganizationalUnit) itemModel.getSelectedItem(state); final GenericOrganizationalUnit orga = (GenericOrganizationalUnit)
itemModel.getSelectedItem(state);
return new Model(table, state, orga); return new Model(table, state, orga);
} }
@ -98,13 +104,16 @@ public class OrganizationPublicationsTable extends Table {
private class Model implements TableModel { private class Model implements TableModel {
private Table table; private final Table table;
private PublicationBundleCollection publications; private final PublicationBundleCollection publications;
public Model(final Table table, final PageState state, final GenericOrganizationalUnit orga) { public Model(final Table table,
final PageState state,
final GenericOrganizationalUnit orga) {
this.table = table; this.table = table;
publications = new PublicationBundleCollection((DataCollection) orga.getGenericOrganizationalUnitBundle(). publications = new PublicationBundleCollection((DataCollection)
get("unPublished")); orga.getGenericOrganizationalUnitBundle()
.get("unPublished"));
} }
@Override @Override
@ -112,6 +121,7 @@ public class OrganizationPublicationsTable extends Table {
return table.getColumnModel().size(); return table.getColumnModel().size();
} }
@Override
public boolean nextRow() { public boolean nextRow() {
boolean ret; boolean ret;
@ -132,7 +142,8 @@ public class OrganizationPublicationsTable extends Table {
case 1: case 1:
return publications.getPublication().getYearOfPublication(); return publications.getPublication().getYearOfPublication();
case 2: case 2:
return ((DataObject) publications.getPublication().get("type")).get("label"); return ((DataObject) publications.getPublication()
.get("type")).get("label");
default: default:
return null; return null;
} }
@ -147,6 +158,7 @@ public class OrganizationPublicationsTable extends Table {
private class EditCellRenderer extends LockableImpl implements TableCellRenderer { private class EditCellRenderer extends LockableImpl implements TableCellRenderer {
@Override
public Component getComponent(final Table table, public Component getComponent(final Table table,
final PageState state, final PageState state,
final Object value, final Object value,

13
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PersonPublicationsStep.java
View File

@ -78,8 +78,9 @@ public class PersonPublicationsStep extends SimpleEditStep {
if (alias == null) { if (alias == null) {
target.setLabel(""); target.setLabel("");
} else { } else {
target.setLabel(PublicationGlobalizationUtil.globalize("person.ui.publications.header", target.setLabel(PublicationGlobalizationUtil.globalize(
new String[]{alias.getFullName()})); "person.ui.publications.header",
new String[]{alias.getFullName()}));
} }
} }
}); });
@ -96,8 +97,9 @@ public class PersonPublicationsStep extends SimpleEditStep {
if (alias == null) { if (alias == null) {
target.setLabel(""); target.setLabel("");
} else { } else {
target.setLabel(PublicationGlobalizationUtil.globalize("person.ui.publications.header.alias_of", target.setLabel(PublicationGlobalizationUtil.globalize(
new String[]{person.getFullName()})); "person.ui.publications.header.alias_of",
new String[]{person.getFullName()}));
} }
} }
@ -107,7 +109,8 @@ public class PersonPublicationsStep extends SimpleEditStep {
aliasHeader.add(personAliasPubsHeader); aliasHeader.add(personAliasPubsHeader);
aliasHeader.add(personAliasOfHeader); aliasHeader.add(personAliasOfHeader);
final PersonPublicationsTable aliasPublicationsTable = new PersonPublicationsTable(itemModel, true); final PersonPublicationsTable aliasPublicationsTable = new
PersonPublicationsTable(itemModel, true);
panel.addSegment(aliasHeader, aliasPublicationsTable); panel.addSegment(aliasHeader, aliasPublicationsTable);

9
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PersonPublicationsTable.java
View File

@ -91,15 +91,18 @@ public class PersonPublicationsTable extends Table {
final TableColumnModel columnModel = getColumnModel(); final TableColumnModel columnModel = getColumnModel();
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
0, 0,
PublicationGlobalizationUtil.globalize("person.ui.publications.columns.name").localize(), new Label(PublicationGlobalizationUtil.globalize(
"person.ui.publications.columns.name")),
TABLE_COL_EDIT)); TABLE_COL_EDIT));
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
1, 1,
PublicationGlobalizationUtil.globalize("person.ui.publications.columns.year").localize(), new Label(PublicationGlobalizationUtil.globalize(
"person.ui.publications.columns.year")),
TABLE_COL_YEAR)); TABLE_COL_YEAR));
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
2, 2,
PublicationGlobalizationUtil.globalize("person.ui.publications.columns.type").localize(), new Label(PublicationGlobalizationUtil.globalize(
"person.ui.publications.columns.type")),
TABLE_COL_TYPE)); TABLE_COL_TYPE));
setModelBuilder(new ModelBuilder(itemModel, useAlias)); setModelBuilder(new ModelBuilder(itemModel, useAlias));

5
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerForm.java
View File

@ -60,13 +60,14 @@ public class ProceedingsOrganizerForm
@Override @Override
protected void addWidgets() { protected void addWidgets() {
add(new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.organizer")));
itemSearch = new ItemSearchWidget(ITEM_SEARCH, itemSearch = new ItemSearchWidget(ITEM_SEARCH,
ContentType.findByAssociatedObjectType( ContentType.findByAssociatedObjectType(
GenericOrganizationalUnit.class.getName())); GenericOrganizationalUnit.class.getName()));
itemSearch.setDefaultCreationFolder(config.getDefaultOrganizationsFolder()); itemSearch.setDefaultCreationFolder(config.getDefaultOrganizationsFolder());
itemSearch.setEditAfterCreate(false); itemSearch.setEditAfterCreate(false);
itemSearch.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.organizer"));
add(itemSearch); add(itemSearch);
} }

23
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerSheet.java
View File

@ -65,13 +65,13 @@ public class ProceedingsOrganizerSheet
TableColumnModel columnModel = getColumnModel(); TableColumnModel columnModel = getColumnModel();
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
0, 0,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.organizer").localize(), "publications.ui.proceedings.organizer")),
TABLE_COL_EDIT)); TABLE_COL_EDIT));
columnModel.add(new TableColumn( columnModel.add(new TableColumn(
1, 1,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.organizer.remove").localize(), "publications.ui.proceedings.organizer.remove")),
TABLE_COL_DEL)); TABLE_COL_DEL));
setModelBuilder(new ProceedingsOrganizerSheetModelBuilder(itemModel)); setModelBuilder(new ProceedingsOrganizerSheetModelBuilder(itemModel));
@ -119,10 +119,12 @@ public class ProceedingsOrganizerSheet
} }
} }
@Override
public int getColumnCount() { public int getColumnCount() {
return table.getColumnModel().size(); return table.getColumnModel().size();
} }
@Override
public boolean nextRow() { public boolean nextRow() {
boolean ret; boolean ret;
@ -136,19 +138,20 @@ public class ProceedingsOrganizerSheet
return ret; return ret;
} }
@Override
public Object getElementAt(final int columnIndex) { public Object getElementAt(final int columnIndex) {
switch (columnIndex) { switch (columnIndex) {
case 0: case 0:
return organizer.getTitle(); return organizer.getTitle();
case 1: case 1:
return PublicationGlobalizationUtil.globalize( return new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.organizer.remove"). "publications.ui.proceedings.organizer.remove"));
localize();
default: default:
return null; return null;
} }
} }
@Override
public Object getKeyAt(final int columnIndex) { public Object getKeyAt(final int columnIndex) {
return organizer.getID(); return organizer.getID();
} }
@ -232,10 +235,8 @@ public class ProceedingsOrganizerSheet
if (canEdit) { if (canEdit) {
ControlLink link = new ControlLink(value.toString()); ControlLink link = new ControlLink(value.toString());
link.setConfirmation((String) PublicationGlobalizationUtil. link.setConfirmation(PublicationGlobalizationUtil.globalize(
globalize( "publications.ui.proceedings.organizer.remove.confirm"));
"publications.ui.proceedings.organizer.remove.confirm").
localize());
return link; return link;
} else { } else {
Label label = new Label(value.toString()); Label label = new Label(value.toString());

7
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerStep.java
View File

@ -44,9 +44,10 @@ public class ProceedingsOrganizerStep extends SimpleEditStep {
BasicItemForm setOrganizerForm = new ProceedingsOrganizerForm(itemModel); BasicItemForm setOrganizerForm = new ProceedingsOrganizerForm(itemModel);
add(SET_PROCEEDINGS_ORGANIZER_STEP, add(SET_PROCEEDINGS_ORGANIZER_STEP,
(String) PublicationGlobalizationUtil.globalize("publications.ui.proceedings.setOrganizer").localize(), PublicationGlobalizationUtil.globalize(
new WorkflowLockedComponentAccess(setOrganizerForm, itemModel), "publications.ui.proceedings.setOrganizer"),
setOrganizerForm.getSaveCancelSection().getCancelButton()); new WorkflowLockedComponentAccess(setOrganizerForm, itemModel),
setOrganizerForm.getSaveCancelSection().getCancelButton());
ProceedingsOrganizerSheet sheet = new ProceedingsOrganizerSheet( ProceedingsOrganizerSheet sheet = new ProceedingsOrganizerSheet(
itemModel); itemModel);

4
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPapersAddForm.java
View File

@ -63,13 +63,13 @@ public class ProceedingsPapersAddForm
@Override @Override
protected void addWidgets() { protected void addWidgets() {
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.select_paper").localize()));
m_itemSearch = new ItemSearchWidget( m_itemSearch = new ItemSearchWidget(
ITEM_SEARCH, ITEM_SEARCH,
ContentType.findByAssociatedObjectType( ContentType.findByAssociatedObjectType(
InProceedings.class.getName())); InProceedings.class.getName()));
m_itemSearch.setDefaultCreationFolder(config.getDefaultInProceedingsFolder()); m_itemSearch.setDefaultCreationFolder(config.getDefaultInProceedingsFolder());
m_itemSearch.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.select_paper"));
add(m_itemSearch); add(m_itemSearch);
} }

8
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPapersStep.java
View File

@ -45,10 +45,10 @@ public class ProceedingsPapersStep extends SimpleEditStep {
BasicItemForm addPaperSheet = BasicItemForm addPaperSheet =
new ProceedingsPapersAddForm(itemModel); new ProceedingsPapersAddForm(itemModel);
add(ADD_PAPER_SHEET_NAME, add(ADD_PAPER_SHEET_NAME,
(String) PublicationGlobalizationUtil.globalize( PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.add_paper").localize(), "publications.ui.proceedings.add_paper"),
new WorkflowLockedComponentAccess(addPaperSheet, itemModel), new WorkflowLockedComponentAccess(addPaperSheet, itemModel),
addPaperSheet.getSaveCancelSection().getCancelButton()); addPaperSheet.getSaveCancelSection().getCancelButton());
ProceedingsPapersTable papersTable = new ProceedingsPapersTable( ProceedingsPapersTable papersTable = new ProceedingsPapersTable(
itemModel); itemModel);

45
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPapersTable.java
View File

@ -71,23 +71,23 @@ public class ProceedingsPapersTable
TableColumnModel colModel = getColumnModel(); TableColumnModel colModel = getColumnModel();
colModel.add(new TableColumn( colModel.add(new TableColumn(
0, 0,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.paper").localize(), "publications.ui.proceedings.paper")),
TABLE_COL_EDIT)); TABLE_COL_EDIT));
colModel.add(new TableColumn( colModel.add(new TableColumn(
1, 1,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.paper.remove").localize(), "publications.ui.proceedings.paper.remove")),
TABLE_COL_DEL)); TABLE_COL_DEL));
colModel.add(new TableColumn( colModel.add(new TableColumn(
2, 2,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.procedings.paper.up").localize(), "publications.ui.procedings.paper.up")),
TABLE_COL_UP)); TABLE_COL_UP));
colModel.add(new TableColumn( colModel.add(new TableColumn(
3, 3,
PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.paper.down").localize(), "publications.ui.proceedings.paper.down")),
TABLE_COL_DOWN)); TABLE_COL_DOWN));
setModelBuilder( setModelBuilder(
@ -115,8 +115,8 @@ public class ProceedingsPapersTable
@Override @Override
public TableModel makeModel(Table table, PageState state) { public TableModel makeModel(Table table, PageState state) {
table.getRowSelectionModel().clearSelection(state); table.getRowSelectionModel().clearSelection(state);
Proceedings proceedings = Proceedings proceedings = (Proceedings) m_itemModel
(Proceedings) m_itemModel.getSelectedObject(state); .getSelectedObject(state);
return new ProceedingsPapersTableModel(table, return new ProceedingsPapersTableModel(table,
state, state,
proceedings); proceedings);
@ -161,17 +161,14 @@ public class ProceedingsPapersTable
case 0: case 0:
return m_paper.getTitle(); return m_paper.getTitle();
case 1: case 1:
return PublicationGlobalizationUtil.globalize( return new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.paper.remove"). "publications.ui.proceedings.paper.remove"));
localize();
case 2: case 2:
return PublicationGlobalizationUtil.globalize( return new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.paper.up"). "publications.ui.proceedings.paper.up"));
localize();
case 3: case 3:
return PublicationGlobalizationUtil.globalize( return new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.paper.down"). "publications.ui.proceedings.paper.down"));
localize();
default: default:
return null; return null;
} }
@ -273,10 +270,8 @@ public class ProceedingsPapersTable
if (canEdit) { if (canEdit) {
ControlLink link = new ControlLink(value.toString()); ControlLink link = new ControlLink(value.toString());
link.setConfirmation((String) PublicationGlobalizationUtil. link.setConfirmation(PublicationGlobalizationUtil.globalize(
globalize( "publications.ui.proceedings.paper.confirm_remove"));
"publications.ui.proceedings.paper.confirm_remove").
localize());
return link; return link;
} else { } else {
Label label = new Label(value.toString()); Label label = new Label(value.toString());
@ -299,7 +294,7 @@ public class ProceedingsPapersTable
int col) { int col) {
if (0 == row) { if (0 == row) {
s_log.debug("Row is first row in table, don't show up link"); s_log.debug("Row is first row in table, don't show up link");
Label label = new Label(""); Label label = new Label();
return label; return label;
} else { } else {
ControlLink link = new ControlLink(value.toString()); ControlLink link = new ControlLink(value.toString());
@ -331,7 +326,7 @@ public class ProceedingsPapersTable
if ((papers.size() - 1) if ((papers.size() - 1)
== row) { == row) {
s_log.debug("Row is last row in table, don't show down link"); s_log.debug("Row is last row in table, don't show down link");
Label label = new Label(""); Label label = new Label();
return label; return label;
} else { } else {
ControlLink link = new ControlLink(value.toString()); ControlLink link = new ControlLink(value.toString());

17
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPropertiesStep.java
View File

@ -110,20 +110,19 @@ public class ProceedingsPropertiesStep
BasicPageForm editBasicSheet = BasicPageForm editBasicSheet =
new ProceedingsPropertyForm(itemModel, this); new ProceedingsPropertyForm(itemModel, this);
basicProperties.add(EDIT_SHEET_NAME, basicProperties.add(
(String) PublicationGlobalizationUtil.globalize( EDIT_SHEET_NAME,
"publications.ui.proceedings.edit_basic_sheet").localize(), PublicationGlobalizationUtil.globalize(
new WorkflowLockedComponentAccess(editBasicSheet, "publications.ui.proceedings.edit_basic_sheet"),
itemModel), new WorkflowLockedComponentAccess(editBasicSheet,itemModel),
editBasicSheet.getSaveCancelSection(). editBasicSheet.getSaveCancelSection().getCancelButton());
getCancelButton());
basicProperties.setDisplayComponent( basicProperties.setDisplayComponent(
getProceedingsPropertySheet(itemModel)); getProceedingsPropertySheet(itemModel));
getSegmentedPanel().addSegment( getSegmentedPanel().addSegment(
new Label((String) PublicationGlobalizationUtil.globalize( new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.basic_properties").localize()), "publications.ui.proceedings.basic_properties")),
basicProperties); basicProperties);
} }

19
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPropertyForm.java
View File

@ -20,7 +20,6 @@ package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormSectionEvent;
@ -35,7 +34,6 @@ import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.contenttypes.Proceedings; import com.arsdigita.cms.contenttypes.Proceedings;
import com.arsdigita.cms.contenttypes.ProceedingsConfig; import com.arsdigita.cms.contenttypes.ProceedingsConfig;
import com.arsdigita.cms.contenttypes.Publication;
import java.util.Calendar; import java.util.Calendar;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
@ -66,21 +64,20 @@ public class ProceedingsPropertyForm
@Override @Override
protected void addWidgets() { protected void addWidgets() {
super.addWidgets(); super.addWidgets();
final ProceedingsConfig proceedingsConfig = Proceedings.getProceedingsConfig(); final ProceedingsConfig proceedingsConfig = Proceedings.getProceedingsConfig();
add(new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.name_of_conference")));
final ParameterModel nameOfConfParam = new StringParameter( final ParameterModel nameOfConfParam = new StringParameter(
Proceedings.NAME_OF_CONFERENCE); Proceedings.NAME_OF_CONFERENCE);
final TextField nameOfConf = new TextField(nameOfConfParam); final TextField nameOfConf = new TextField(nameOfConfParam);
nameOfConf.addValidationListener(new NotNullValidationListener()); nameOfConf.addValidationListener(new NotNullValidationListener());
nameOfConf.addValidationListener(new NotEmptyValidationListener()); nameOfConf.addValidationListener(new NotEmptyValidationListener());
nameOfConf.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.name_of_conference"));
add(nameOfConf); add(nameOfConf);
add(new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.place_of_conference")));
final ParameterModel placeOfConfParam = new StringParameter( final ParameterModel placeOfConfParam = new StringParameter(
Proceedings.PLACE_OF_CONFERENCE); Proceedings.PLACE_OF_CONFERENCE);
final TextField placeOfConf = new TextField(placeOfConfParam); final TextField placeOfConf = new TextField(placeOfConfParam);
@ -88,11 +85,11 @@ public class ProceedingsPropertyForm
placeOfConf.addValidationListener(new NotNullValidationListener()); placeOfConf.addValidationListener(new NotNullValidationListener());
placeOfConf.addValidationListener(new NotEmptyValidationListener()); placeOfConf.addValidationListener(new NotEmptyValidationListener());
} }
placeOfConf.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.place_of_conference"));
add(placeOfConf); add(placeOfConf);
final Calendar today = new GregorianCalendar(); final Calendar today = new GregorianCalendar();
add(new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.date_from_of_conference")));
final ParameterModel dateFromParam = new DateParameter( final ParameterModel dateFromParam = new DateParameter(
Proceedings.DATE_FROM_OF_CONFERENCE); Proceedings.DATE_FROM_OF_CONFERENCE);
final Date dateFrom = new Date(dateFromParam); final Date dateFrom = new Date(dateFromParam);
@ -101,10 +98,10 @@ public class ProceedingsPropertyForm
dateFrom.addValidationListener(new NotNullValidationListener()); dateFrom.addValidationListener(new NotNullValidationListener());
dateFrom.addValidationListener(new NotEmptyValidationListener()); dateFrom.addValidationListener(new NotEmptyValidationListener());
} }
dateFrom.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.date_from_of_conference"));
add(dateFrom); add(dateFrom);
add(new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.date_to_of_conference")));
final ParameterModel dateToParam = new DateParameter( final ParameterModel dateToParam = new DateParameter(
Proceedings.DATE_TO_OF_CONFERENCE); Proceedings.DATE_TO_OF_CONFERENCE);
final Date dateTo = new Date(dateToParam); final Date dateTo = new Date(dateToParam);
@ -113,6 +110,8 @@ public class ProceedingsPropertyForm
dateTo.addValidationListener(new NotNullValidationListener()); dateTo.addValidationListener(new NotNullValidationListener());
dateTo.addValidationListener(new NotEmptyValidationListener()); dateTo.addValidationListener(new NotEmptyValidationListener());
} }
dateTo.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.proceedings.date_to_of_conference"));
add(dateTo); add(dateTo);
} }

11
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorAddForm.java
View File

@ -75,22 +75,23 @@ public class PublicationAuthorAddForm
@Override @Override
protected void addWidgets() { protected void addWidgets() {
add(new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.authors.selectAuthor")));
m_itemSearch = new ItemSearchWidget( m_itemSearch = new ItemSearchWidget(
ITEM_SEARCH, ITEM_SEARCH,
ContentType.findByAssociatedObjectType(GenericPerson.class.getName())); ContentType.findByAssociatedObjectType(GenericPerson.class.getName()));
m_itemSearch.setDefaultCreationFolder(config.getDefaultAuthorsFolder()); m_itemSearch.setDefaultCreationFolder(config.getDefaultAuthorsFolder());
m_itemSearch.setEditAfterCreate(false); m_itemSearch.setEditAfterCreate(false);
m_itemSearch.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.authors.selectAuthor"));
add(m_itemSearch); add(m_itemSearch);
selectedAuthorLabel = new Label(""); selectedAuthorLabel = new Label();
add(selectedAuthorLabel); add(selectedAuthorLabel);
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.authors.author.is_editor").localize()));
isEditor = new CheckboxGroup("isEditorGroup"); isEditor = new CheckboxGroup("isEditorGroup");
isEditor.addOption(new Option(ISEDITOR, "")); isEditor.addOption(new Option(ISEDITOR, ""));
isEditor.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.authors.author.is_editor"));
add(isEditor); add(isEditor);
} }

4
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsPropertyStep.java
View File

@ -50,8 +50,8 @@ public class PublicationAuthorsPropertyStep extends SimpleEditStep {
BasicItemForm addAuthorSheet = BasicItemForm addAuthorSheet =
new PublicationAuthorAddForm(itemModel, this); new PublicationAuthorAddForm(itemModel, this);
add(ADD_AUTHOR_SHEET_NAME, add(ADD_AUTHOR_SHEET_NAME,
(String) PublicationGlobalizationUtil.globalize( PublicationGlobalizationUtil.globalize(
"publications.ui.authors.add_author").localize(), "publications.ui.authors.add_author"),
new WorkflowLockedComponentAccess(addAuthorSheet, itemModel), new WorkflowLockedComponentAccess(addAuthorSheet, itemModel),
addAuthorSheet.getSaveCancelSection().getCancelButton()); addAuthorSheet.getSaveCancelSection().getCancelButton());

27
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsTable.java
View File

@ -183,21 +183,18 @@ public class PublicationAuthorsTable
return m_author.getFullName(); return m_author.getFullName();
case 1: case 1:
if (m_authorshipCollection.isEditor()) { if (m_authorshipCollection.isEditor()) {
return (String) PublicationGlobalizationUtil.globalize( return new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.authors.author.is_editor_true"). "publications.ui.authors.author.is_editor_true"));
localize();
} else { } else {
return PublicationGlobalizationUtil.globalize( return new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.authors.author.is_not_editor"). "publications.ui.authors.author.is_not_editor"));
localize();
} }
case 2: case 2:
return PublicationGlobalizationUtil.globalize( return new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.authors.edit_assoc").localize(); "publications.ui.authors.edit_assoc"));
case 3: case 3:
return PublicationGlobalizationUtil.globalize( return new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.authors.author.remove"). "publications.ui.authors.author.remove"));
localize();
default: default:
return null; return null;
} }
@ -332,10 +329,8 @@ public class PublicationAuthorsTable
if (canDelete) { if (canDelete) {
ControlLink link = new ControlLink(value.toString()); ControlLink link = new ControlLink(value.toString());
link.setConfirmation((String) PublicationGlobalizationUtil. link.setConfirmation(PublicationGlobalizationUtil.globalize(
globalize( "publications.ui.authors.author.confirm_remove"));
"publications.ui.authors.author.confirm_remove").
localize());
return link; return link;
} else { } else {
Label label = new Label(value.toString()); Label label = new Label(value.toString());
@ -392,7 +387,7 @@ public class PublicationAuthorsTable
if ((authors.size() - 1) if ((authors.size() - 1)
== row) { == row) {
s_log.debug("Row is last row in table, don't show down link"); s_log.debug("Row is last row in table, don't show down link");
Label label = new Label(""); Label label = new Label();
return label; return label;
} else { } else {
ControlLink link = new ControlLink("down"); ControlLink link = new ControlLink("down");

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

@ -131,12 +131,12 @@ public class PublicationPropertiesStep extends SimpleEditStep {
BasicPageForm editBasicSheet = new PublicationPropertyForm(itemModel, BasicPageForm editBasicSheet = new PublicationPropertyForm(itemModel,
this); this);
basicProperties.add(EDIT_SHEET_NAME, (String) PublicationGlobalizationUtil. basicProperties.add(
globalize("publications.ui.publication.edit_basic_sheet"). EDIT_SHEET_NAME,
localize(), new WorkflowLockedComponentAccess(editBasicSheet, PublicationGlobalizationUtil.
itemModel), globalize("publications.ui.publication.edit_basic_sheet"),
editBasicSheet. new WorkflowLockedComponentAccess(editBasicSheet,itemModel),
getSaveCancelSection().getCancelButton()); editBasicSheet.getSaveCancelSection().getCancelButton());
basicProperties.setDisplayComponent(getPublicationPropertySheet( basicProperties.setDisplayComponent(getPublicationPropertySheet(
itemModel)); itemModel));
@ -156,6 +156,12 @@ public class PublicationPropertiesStep extends SimpleEditStep {
} }
} }
/**
*
* @param step
* @param labelKey
* @deprecated use addStep(step, GlobalizedMessage) instead
*/
protected void addStep(SimpleEditStep step, String labelKey) { protected void addStep(SimpleEditStep step, String labelKey) {
addStep(step, PublicationGlobalizationUtil.globalize(labelKey)); addStep(step, PublicationGlobalizationUtil.globalize(labelKey));
// segmentedPanel.addSegment( // segmentedPanel.addSegment(