From 5856cc0ce5befa39c1227ad19d9b79d687eb4042 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 25 Feb 2013 13:24:11 +0000
Subject: [PATCH] =?UTF-8?q?Some=20extensisons=20for=20publications:=20-=20?=
 =?UTF-8?q?Symbol=20(K=C3=BCrzel)=20for=20Journal=20(Ticket=20#1523)=20-?=
 =?UTF-8?q?=20Language=20of=20publication=20(Ticket=20#1552)=20-=20Date=20?=
 =?UTF-8?q?of=20first=20publication=20(Ticket=20#1536)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@2078 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-sci-publications/application.xml          |   2 +-
 .../com/arsdigita/content-types/Journal.pdl   |   3 +-
 .../arsdigita/content-types/Publication.pdl   |   4 +
 .../src/ccm-sci-publications.upgrade          |   3 +
 .../arsdigita/cms/contenttypes/Journal.java   |  50 +++++---
 .../cms/contenttypes/Publication.java         |  28 +++++
 .../cms/contenttypes/PublicationsConfig.java  |  22 ++++
 .../PublicationsConfig_parameter.properties   |  12 +-
 .../ui/ArticleInJournalJournalForm.java       |   1 +
 .../ui/JournalPropertiesStep.java             |   8 +-
 .../contenttypes/ui/JournalPropertyForm.java  | 109 ++++++++++++------
 .../ui/PublicationPropertiesStep.java         |  13 ++-
 .../ui/PublicationPropertyForm.java           |  56 ++++++---
 .../ui/PublicationResources.properties        |   3 +
 .../ui/PublicationResources_de.properties     |   3 +
 15 files changed, 237 insertions(+), 80 deletions(-)

diff --git a/ccm-sci-publications/application.xml b/ccm-sci-publications/application.xml
index ce659ccfc..d5bafdea8 100644
--- a/ccm-sci-publications/application.xml
+++ b/ccm-sci-publications/application.xml
@@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-sci-publications"
   prettyName="OpenCCM Content Types"
-  version="6.6.3"
+  version="6.6.4"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
diff --git a/ccm-sci-publications/pdl/com/arsdigita/content-types/Journal.pdl b/ccm-sci-publications/pdl/com/arsdigita/content-types/Journal.pdl
index 922c4de52..e433f71c0 100644
--- a/ccm-sci-publications/pdl/com/arsdigita/content-types/Journal.pdl
+++ b/ccm-sci-publications/pdl/com/arsdigita/content-types/Journal.pdl
@@ -28,7 +28,8 @@ object type Journal extends ContentPage {
   Integer[0..1] firstYear = ct_journal.firstyear INTEGER;
   Integer[0..1] lastYear = ct_journal.lastyear INTEGER;
   String[0..1] issn = ct_journal.issn VARCHAR(9);     
-  String[0..1] abstract = ct_journal.abstract VARCHAR(4096);
+  String[0..1] abstract = ct_journal.abstract VARCHAR(4096);  
+  String[0..1] symbol = ct_journal.symbol VARCHAR(128);
 
   reference key (ct_journal.journal_id);
 }
diff --git a/ccm-sci-publications/pdl/com/arsdigita/content-types/Publication.pdl b/ccm-sci-publications/pdl/com/arsdigita/content-types/Publication.pdl
index 065393ae7..74e00c158 100644
--- a/ccm-sci-publications/pdl/com/arsdigita/content-types/Publication.pdl
+++ b/ccm-sci-publications/pdl/com/arsdigita/content-types/Publication.pdl
@@ -41,6 +41,10 @@ object type Publication extends ContentPage {
        //(ordering by publications by their authors requires joins or subqueries
        //without this field)
        String[0..1] authorsStr = ct_publications.authors VARCHAR(2048);
+       //Year on which the publication was first published 
+       Integer[0..1] yearFirstPublished = ct_publications.firstPublished INTEGER;
+       //The language of the publication 
+       String[0..1] languageOfPublication = ct_publications.lang VARCHAR(128);
 
        reference key (ct_publications.publication_id);
 }
diff --git a/ccm-sci-publications/src/ccm-sci-publications.upgrade b/ccm-sci-publications/src/ccm-sci-publications.upgrade
index 8d3ebcd73..aba4aa798 100644
--- a/ccm-sci-publications/src/ccm-sci-publications.upgrade
+++ b/ccm-sci-publications/src/ccm-sci-publications.upgrade
@@ -8,4 +8,7 @@
     <version from="6.6.2" to="6.6.3">
         <script class="com.arsdigita.cms.contenttypes.upgrades.SciPublicationsUpgrade662to663"/>       
     </version>
+    <version from="6.6.3" to="6.6.4">
+        <script sql="ccm-sci-publications/upgrade/::database::-6.6.3-6.6.4.sql" />       
+    </version>
 </upgrade>
\ No newline at end of file
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/Journal.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/Journal.java
index ce1b1c2b0..2ab68a3fe 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/Journal.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/Journal.java
@@ -40,9 +40,9 @@ public class Journal extends ContentPage {
     public static final String LAST_YEAR = "lastYear";
     public static final String ABSTRACT = "abstract";
     public static final String ARTICLES = "articles";
-    public static final String ARTICLE_ORDER = "articleOrder";
-    public static final String BASE_DATA_OBJECT_TYPE =
-                               "com.arsdigita.cms.contenttypes.Journal";
+    public static final String ARTICLE_ORDER = "articleOrder";   
+    public static final String SYMBOL = "symbol";
+    public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.contenttypes.Journal";
 
     public Journal() {
         this(BASE_DATA_OBJECT_TYPE);
@@ -63,11 +63,11 @@ public class Journal extends ContentPage {
     public Journal(final String type) {
         super(type);
     }
-    
+
     public JournalBundle getJournalBundle() {
         return (JournalBundle) getContentBundle();
-    }
-      
+    }       
+    
     public String getISSN() {
         return (String) get(ISSN);
     }
@@ -75,11 +75,11 @@ public class Journal extends ContentPage {
     public void setISSN(final String issn) {
         set(ISSN, issn);
     }
-    
+
     public Integer getFirstYear() {
         return (Integer) get(FIRST_YEAR);
     }
-    
+
     public void setFirstYear(final Integer firstYear) {
         set(FIRST_YEAR, firstYear);
     }
@@ -88,18 +88,18 @@ public class Journal extends ContentPage {
         return (Integer) get(LAST_YEAR);
     }
 
-    public void setLastYear(final Integer lastYear)  {
+    public void setLastYear(final Integer lastYear) {
         set(LAST_YEAR, lastYear);
     }
 
     public String getAbstract() {
         return (String) get(ABSTRACT);
     }
-    
+
     public void setAbstract(final String abstractStr) {
         set(ABSTRACT, abstractStr);
     }
-    
+
     public ArticleInJournalCollection getArticles() {
         //return new ArticleInJournalCollection((DataCollection) get(ARTICLES));
         return getJournalBundle().getArticles();
@@ -111,32 +111,46 @@ public class Journal extends ContentPage {
         //DataObject link = add(ARTICLES, article);
 
         //link.set(ARTICLE_ORDER, Integer.valueOf((int) getArticles().size()));
-        
+
         getJournalBundle().addArticle(article);
     }
 
-    public void removeArticle(ArticleInJournal article) {
+    public void removeArticle(final ArticleInJournal article) {
         //Assert.exists(article, ArticleInCollectedVolume.class);
         //remove(ARTICLES, article);
-        
-        getJournalBundle().removeArticle(article);        
+
+        getJournalBundle().removeArticle(article);
     }
 
     public boolean hasArticles() {
         return !this.getArticles().isEmpty();
     }
-    
+
+    /**
+     * The symbol used commonly used for referencing the journal (german: Kürzel).
+     * 
+     * @return 
+     */
+    public String getSymbol() {
+        return (String) get(SYMBOL);
+    }
+
+    public void setSymbol(final String symbol) {
+        set(SYMBOL, symbol);        
+    }
+
     @Override
     public List<ExtraXMLGenerator> getExtraXMLGenerators() {
         final List<ExtraXMLGenerator> generators = super.getExtraXMLGenerators();
         generators.add(new JournalExtraXmlGenerator());
         return generators;
     }
-    
-     @Override
+
+    @Override
     public List<ExtraXMLGenerator> getExtraListXMLGenerators() {
         final List<ExtraXMLGenerator> generators = super.getExtraListXMLGenerators();
         generators.add(new JournalExtraXmlGenerator());
         return generators;
     }
+
 }
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/Publication.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/Publication.java
index 92797b7d3..cc6d8d8fd 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/Publication.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/Publication.java
@@ -75,6 +75,8 @@ public class Publication extends ContentPage {
     public final static String ORGAUNITS = "orgaunits";
     public final static String ORGAUNIT_PUBLICATIONS = "publications";
     public static final String REVIEWED = "reviewed";
+    public static final String FIRST_PUBLISHED = "yearFirstPublished";
+    public static final String LANG = "languageOfPublication";
     public final static String BASE_DATA_OBJECT_TYPE =
                                "com.arsdigita.cms.contenttypes.Publication";
     private final static PublicationsConfig config = new PublicationsConfig();
@@ -334,6 +336,32 @@ public class Publication extends ContentPage {
         //orgaunit.remove(ORGAUNIT_PUBLICATIONS, publication);
         PublicationBundle.removePublication(orgaunit, publication);
     }
+    
+    /**
+     * The year when the first edition of the publication was published.
+     * 
+     * @return 
+     */
+    public Integer getYearFirstPublished() {
+        return (Integer) get(FIRST_PUBLISHED);
+    }
+        
+    public void setYearFirstPublished(final Integer value) {
+        set(FIRST_PUBLISHED, value);
+    }
+    
+    /**
+     * The language the publication is written in.
+     * 
+     * @return 
+     */
+    public String getLanguageOfPublication() {
+        return (String) get(LANG);
+    }
+    
+    public void setLanguageOfPublication(final String value) {
+        set(LANG, value);
+    }
 
     @Override
     public List<ExtraXMLGenerator> getExtraXMLGenerators() {
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig.java
index 831b0ed77..a43d395f2 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig.java
@@ -31,6 +31,8 @@ public class PublicationsConfig extends AbstractConfig {
     private final Parameter defaultPublicationsFolder;
     private final Parameter orgaType;
     private final Parameter orgaBundleType;
+    private final Parameter enableFirstPublishedProperty;
+    private final Parameter enableLanguageProperty;
 
     public PublicationsConfig() {
         attachOrgaUnitsStep =
@@ -127,6 +129,16 @@ public class PublicationsConfig extends AbstractConfig {
                 Parameter.OPTIONAL,
                 PublisherBundle.BASE_DATA_OBJECT_TYPE);
 
+        enableFirstPublishedProperty = new BooleanParameter(
+                "com.arsdigita.cms.contenttypes.publications.enable_first_published_property",
+                                                            Parameter.REQUIRED,
+                                                            true);
+        
+        enableLanguageProperty = new BooleanParameter(
+                "com.arsdigita.cms.contenttypes.publications.enable_language_property",
+                                                            Parameter.REQUIRED,
+                                                            true);
+
         register(attachOrgaUnitsStep);
         register(attachOrganizationPublicationsStepTo);
         register(attachPersonPublicationsStep);
@@ -145,6 +157,8 @@ public class PublicationsConfig extends AbstractConfig {
         register(defaultPublicationsFolder);
         register(orgaType);
         register(orgaBundleType);
+        register(enableFirstPublishedProperty);
+        register(enableLanguageProperty);
 
         loadInfo();
     }
@@ -264,5 +278,13 @@ public class PublicationsConfig extends AbstractConfig {
     public String getOrganizationBundleType() {
         return (String) get(orgaBundleType);
     }
+    
+    public Boolean getEnableFirstPublishedProperty() {
+        return (Boolean) get(enableFirstPublishedProperty);
+    }
+    
+    public Boolean getEnableLanguageProperty() {
+        return (Boolean) get(enableLanguageProperty);
+    }
 
 }
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig_parameter.properties b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig_parameter.properties
index ecbd9ae0e..5e2202b45 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig_parameter.properties
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig_parameter.properties
@@ -86,4 +86,14 @@ com.arsdigita.cms.contenttypes.publications.organization_type.format = String
 com.arsdigita.cms.contenttypes.publications.organization_bundle_type.title = Type of the content bundle sub class used for imported organizations
 com.arsdigita.cms.contenttypes.publications.organization_bundle_type.purpose = Sets the type of the bundle used for imported organization. Must be a subtype of com.arsdigita.cms.contenttypes.GenericOrganizationalUnitBundle
 com.arsdigita.cms.contenttypes.publications.organization_bundle_type.example = com.arsdigita.cms.contenttypes.PublisherBundle
-com.arsdigita.cms.contenttypes.publications.organization_bundle_type = String
\ No newline at end of file
+com.arsdigita.cms.contenttypes.publications.organization_bundle_type.format = String
+
+com.arsdigita.cms.contenttypes.publications.enable_first_published_property.title = Enable first published property
+com.arsdigita.cms.contenttypes.publications.enable_first_published_property.purpose = Enable first published property
+com.arsdigita.cms.contenttypes.publications.enable_first_published_property.example = true
+com.arsdigita.cms.contenttypes.publications.enable_first_published_property.format = Boolean
+
+com.arsdigita.cms.contenttypes.publications.enable_language_property.title = Enable language property
+com.arsdigita.cms.contenttypes.publications.enable_language_property.purpose = Enable language property
+com.arsdigita.cms.contenttypes.publications.enable_language_property.example = true
+com.arsdigita.cms.contenttypes.publications.enable_language_property.format = Boolean
\ No newline at end of file
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalForm.java
index f496f7633..7824fbefb 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalForm.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalForm.java
@@ -71,6 +71,7 @@ public class ArticleInJournalJournalForm
             itemSearch.setDefaultCreationFolder(new Folder(new BigDecimal(config.getDefaultJournalsFolder())));
         }
         itemSearch.setEditAfterCreate(false);
+        itemSearch.setQueryField("symbol");
         add(itemSearch);
     }
 
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalPropertiesStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalPropertiesStep.java
index 1a1a6eb21..586e1c9f0 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalPropertiesStep.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalPropertiesStep.java
@@ -68,10 +68,7 @@ public class JournalPropertiesStep extends SimpleEditStep {
 
         sheet.add(PublicationGlobalizationUtil.globalize(
                 "publications.ui.journal.name"),
-                  Publication.NAME);
-        sheet.add(PublicationGlobalizationUtil.globalize(
-                "publications.ui.journal.title"),
-                  Publication.TITLE);
+                  Publication.NAME);        
 
         sheet.add(PublicationGlobalizationUtil.globalize(
                 "publications.ui.journal.issn"),
@@ -89,6 +86,9 @@ public class JournalPropertiesStep extends SimpleEditStep {
                 "publications.ui.journal.abstract"),
                   Journal.ABSTRACT);
 
+        sheet.add(PublicationGlobalizationUtil.globalize("publications.ui.journal.symbol"), Journal.SYMBOL);
+        
+        
         if (!ContentSection.getConfig().getHideLaunchDate()) {
             sheet.add(ContenttypesGlobalizationUtil.globalize(
                     "cms.ui.authoring.page_launch_date"),
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalPropertyForm.java
index b5dfd128c..e8368d144 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalPropertyForm.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalPropertyForm.java
@@ -34,9 +34,11 @@ import com.arsdigita.bebop.parameters.IntegerParameter;
 import com.arsdigita.bebop.parameters.ParameterData;
 import com.arsdigita.bebop.parameters.ParameterModel;
 import com.arsdigita.bebop.parameters.StringParameter;
+import com.arsdigita.cms.ContentSection;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.contenttypes.Journal;
 import com.arsdigita.cms.ui.authoring.BasicPageForm;
+import java.util.Date;
 import org.apache.log4j.Logger;
 
 /**
@@ -49,17 +51,15 @@ public class JournalPropertyForm
                    FormInitListener,
                    FormSubmissionListener {
 
-    private static final Logger s_log =
-                                Logger.getLogger(JournalPropertyForm.class);
-    private JournalPropertiesStep m_step;
+    private static final Logger s_log = Logger.getLogger(JournalPropertyForm.class);
+    private final JournalPropertiesStep m_step;
     public static final String ID = "JournalEdit";
 
-    public JournalPropertyForm(ItemSelectionModel itemModel) {
+    public JournalPropertyForm(final ItemSelectionModel itemModel) {
         this(itemModel, null);
     }
 
-    public JournalPropertyForm(ItemSelectionModel itemModel,
-                               JournalPropertiesStep step) {
+    public JournalPropertyForm(final ItemSelectionModel itemModel, final JournalPropertiesStep step) {
         super(ID, itemModel);
         m_step = step;
         addSubmissionListener(this);
@@ -69,15 +69,18 @@ public class JournalPropertyForm
     protected void addWidgets() {
         super.addWidgets();
 
+        add(new Label((String) PublicationGlobalizationUtil.globalize("publications.ui.journal.symbol").localize()));
+        final ParameterModel symbolModel = new StringParameter(Journal.SYMBOL);
+        final TextField symbol = new TextField(symbolModel);
+        add(symbol);
+
         add(new Label((String) PublicationGlobalizationUtil.globalize(
                 "publications.ui.journal.issn").localize()));
-        ParameterModel issnParam = new StringParameter(Journal.ISSN);
-        TextField issn = new TextField(issnParam);
+        final ParameterModel issnParam = new StringParameter(Journal.ISSN);
+        final TextField issn = new TextField(issnParam);
         issn.addValidationListener(new ParameterListener() {
-
-            public void validate(ParameterEvent event) throws
-                    FormProcessException {
-                ParameterData data = event.getParameterData();
+            public void validate(final ParameterEvent event) throws FormProcessException {
+                final ParameterData data = event.getParameterData();
                 String value = (String) data.getValue();
 
                 if (value.isEmpty()) {
@@ -88,83 +91,113 @@ public class JournalPropertyForm
 
                 if (value.length() != 8) {
                     data.invalidate();
-                    data.addError(PublicationGlobalizationUtil.globalize(
-                            "publications.ui.invalid_issn"));
+                    data.addError(PublicationGlobalizationUtil.globalize("publications.ui.invalid_issn"));
                 }
 
                 try {
-                    Long num = Long.parseLong(value);
+                    final Long num = Long.parseLong(value);
                 } catch (NumberFormatException ex) {
                     data.invalidate();
-                    data.addError(PublicationGlobalizationUtil.globalize(
-                            "publications.ui.invalid_issn"));
+                    data.addError(PublicationGlobalizationUtil.globalize("publications.ui.invalid_issn"));
                 }
             }
+
         });
         add(issn);
 
         add(new Label((String) PublicationGlobalizationUtil.globalize(
                 "publications.ui.journal.firstYearOfPublication").localize()));
-        ParameterModel firstYearParam = new IntegerParameter(Journal.FIRST_YEAR);
-        TextField firstYear = new TextField(firstYearParam);
+        final ParameterModel firstYearParam = new IntegerParameter(Journal.FIRST_YEAR);
+        final TextField firstYear = new TextField(firstYearParam);
         add(firstYear);
 
         add(new Label((String) PublicationGlobalizationUtil.globalize(
                 "publications.ui.journal.lastYearOfPublication").localize()));
-        ParameterModel lastYearParam = new IntegerParameter(Journal.LAST_YEAR);
-        TextField lastYear = new TextField(lastYearParam);
+        final ParameterModel lastYearParam = new IntegerParameter(Journal.LAST_YEAR);
+        final TextField lastYear = new TextField(lastYearParam);
         add(lastYear);
 
         add(new Label((String) PublicationGlobalizationUtil.globalize(
                 "publications.ui.journal.abstract").localize()));
-        ParameterModel abstractParam = new StringParameter(Journal.ABSTRACT);
-        TextArea abstractArea = new TextArea(abstractParam);
+        final ParameterModel abstractParam = new StringParameter(Journal.ABSTRACT);
+        final TextArea abstractArea = new TextArea(abstractParam);
         abstractArea.setCols(60);
         abstractArea.setRows(18);
         add(abstractArea);
     }
 
     @Override
-    public void init(FormSectionEvent fse) throws FormProcessException {
-        FormData data = fse.getFormData();
-        Journal journal = (Journal) super.initBasicWidgets(fse);
+    public void init(final FormSectionEvent fse) throws FormProcessException {
+        final FormData data = fse.getFormData();
 
+        //Can' use basic initBasicWidgets for journal because we are doing some magic with the title to make it possible
+        //to filter for the symbol of the journal
+        //final Journal journal = (Journal) super.initBasicWidgets(fse);
+
+        final Journal journal = (Journal) getItemSelectionModel().getSelectedObject(fse.getPageState());
+
+        data.put(CONTENT_ITEM_ID, journal.getID().toString());
+        data.put(NAME, journal.getName());
+        data.put(TITLE, journal.getTitle());
+        data.put(Journal.SYMBOL, journal.getSymbol());
         data.put(Journal.ISSN, journal.getISSN());
         data.put(Journal.FIRST_YEAR, journal.getFirstYear());
         data.put(Journal.LAST_YEAR, journal.getLastYear());
         data.put(Journal.ABSTRACT, journal.getAbstract());
+
+        if (!ContentSection.getConfig().getHideLaunchDate()) {
+            data.put(LAUNCH_DATE, journal.getLaunchDate());
+            // if launch date is required, help user by suggesting today's date
+            if (ContentSection.getConfig().getRequireLaunchDate() && journal.getLaunchDate() == null) {
+                data.put(LAUNCH_DATE, new Date());
+            }
+        }
     }
 
     @Override
-    public void process(FormSectionEvent fse) throws FormProcessException {
-        FormData data = fse.getFormData();
-        Journal journal = (Journal) super.processBasicWidgets(fse);
+    public void process(final FormSectionEvent fse) throws FormProcessException {
+        final FormData data = fse.getFormData();
+        //final Journal journal = (Journal) super.processBasicWidgets(fse);
 
-        if ((journal != null) && getSaveCancelSection().getSaveButton().
-                isSelected(fse.getPageState())) {
+        final Journal journal = (Journal) getItemSelectionModel().getSelectedObject(fse.getPageState());
+
+        if ((journal != null) && getSaveCancelSection().getSaveButton().isSelected(fse.getPageState())) {
+
+            final String name = (String) data.get(NAME);
+            journal.setName(name);
+
+            final String title = (String) data.get(TITLE);
+            journal.setTitle(title);
+
+            final String symbol = (String) data.get(Journal.SYMBOL);
+            journal.setSymbol(symbol);
 
             String issn = (String) data.get(Journal.ISSN);
             issn = issn.replace("-", "");
             journal.setISSN(issn);
 
-            Integer firstYear = (Integer) data.get(Journal.FIRST_YEAR);
+            final Integer firstYear = (Integer) data.get(Journal.FIRST_YEAR);
             journal.setFirstYear(firstYear);
 
-            Integer lastYear = (Integer) data.get(Journal.LAST_YEAR);
+            final Integer lastYear = (Integer) data.get(Journal.LAST_YEAR);
             journal.setLastYear(lastYear);
-            
-            String abstractStr = (String) data.get(Journal.ABSTRACT);
+
+            final String abstractStr = (String) data.get(Journal.ABSTRACT);
             journal.setAbstract(abstractStr);
 
+            if (!ContentSection.getConfig().getHideLaunchDate()) {
+                journal.setLaunchDate((Date) data.get(LAUNCH_DATE));
+            }
+
             journal.save();
         }
     }
 
     @Override
-    public void submitted(FormSectionEvent fse) throws FormProcessException {
-        if ((m_step != null) && getSaveCancelSection().getCancelButton().
-                isSelected(fse.getPageState())) {
+    public void submitted(final FormSectionEvent fse) throws FormProcessException {
+        if ((m_step != null) && getSaveCancelSection().getCancelButton().isSelected(fse.getPageState())) {
             m_step.cancelStreamlinedCreation(fse.getPageState());
         }
     }
+
 }
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertiesStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertiesStep.java
index 77d74f3b2..232c2ac5d 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertiesStep.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertiesStep.java
@@ -83,12 +83,21 @@ public class PublicationPropertiesStep extends SimpleEditStep {
                 "publications.ui.publication.misc"),
                   Publication.MISC);
 
+        if (Publication.getConfig().getEnableFirstPublishedProperty()) {
+            sheet.add(PublicationGlobalizationUtil.globalize("publications.ui.publication.first_published"),
+                                                             Publication.FIRST_PUBLISHED);
+        }
+
+        if (Publication.getConfig().getEnableLanguageProperty()) {
+            sheet.add(PublicationGlobalizationUtil.globalize("publications.ui.publication.language"),
+                                                             Publication.LANG);
+        }
+
         if (!ContentSection.getConfig().getHideLaunchDate()) {
             sheet.add(ContenttypesGlobalizationUtil.globalize(
                     "cms.ui.authoring.page_launch_date"),
                       ContentPage.LAUNCH_DATE,
                       new DomainObjectPropertySheet.AttributeFormatter() {
-
                 public String format(DomainObject item,
                                      String attribute,
                                      PageState state) {
@@ -101,6 +110,7 @@ public class PublicationPropertiesStep extends SimpleEditStep {
                                 "cms.ui.unknown").localize();
                     }
                 }
+
             });
         }
 
@@ -165,5 +175,6 @@ public class PublicationPropertiesStep extends SimpleEditStep {
                 return String.format("<pre>%s</pre>", str);
             }
         }
+
     }
 }
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertyForm.java
index a70d4319e..a0fd2b27f 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertyForm.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertyForm.java
@@ -26,6 +26,8 @@ import com.arsdigita.bebop.event.FormInitListener;
 import com.arsdigita.bebop.event.FormProcessListener;
 import com.arsdigita.bebop.event.FormSectionEvent;
 import com.arsdigita.bebop.event.FormSubmissionListener;
+import com.arsdigita.bebop.form.Option;
+import com.arsdigita.bebop.form.SingleSelect;
 import com.arsdigita.bebop.form.TextArea;
 import com.arsdigita.bebop.form.TextField;
 import com.arsdigita.bebop.parameters.IntegerParameter;
@@ -34,6 +36,9 @@ import com.arsdigita.bebop.parameters.StringParameter;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.contenttypes.Publication;
 import com.arsdigita.cms.ui.authoring.BasicPageForm;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Locale;
 import org.apache.log4j.Logger;
 
 /**
@@ -48,7 +53,7 @@ public class PublicationPropertyForm
 
     private static final Logger s_log = Logger.getLogger(
             PublicationPropertyForm.class);
-    private PublicationPropertiesStep m_step;    
+    private PublicationPropertiesStep m_step;
     public static final String ID = "Publication_edit";
 
     public PublicationPropertyForm(ItemSelectionModel itemModel) {
@@ -66,22 +71,38 @@ public class PublicationPropertyForm
     protected void addWidgets() {
         super.addWidgets();
 
-        /*add(new Label((String) PublicationGlobalizationUtil.globalize(
-        "publications.ui.publication.title").localize()));
-        ParameterModel titleParam = new StringParameter(Publication.TITLE);
-        TextField title = new TextField(titleParam);
-        add(title);*/
-
         add(new Label((String) PublicationGlobalizationUtil.globalize(
                 "publications.ui.publication.year_of_publication").localize()));
-        ParameterModel yearOfPublicationParam = new IntegerParameter(
-                Publication.YEAR_OF_PUBLICATION);
-        TextField yearOfPublication = new TextField(yearOfPublicationParam);
+        final ParameterModel yearOfPublicationParam = new IntegerParameter(Publication.YEAR_OF_PUBLICATION);
+        final TextField yearOfPublication = new TextField(yearOfPublicationParam);
         yearOfPublication.setMaxLength(4);
         //yearOfPublication.addValidationListener(new NotNullValidationListener());
         //yearOfPublication.addValidationListener(new NotEmptyValidationListener());
         add(yearOfPublication);
 
+        add(new Label((String) PublicationGlobalizationUtil.globalize("publications.ui.publication.first_published").localize()));
+        final ParameterModel firstPublishedParam = new IntegerParameter(Publication.FIRST_PUBLISHED);
+        final TextField firstPublished = new TextField(firstPublishedParam);
+        add(firstPublished);
+
+        add(new Label((String) PublicationGlobalizationUtil.globalize("publications.ui.publication.language").localize()));
+        final ParameterModel langParam = new StringParameter(Publication.LANG);
+        //final TextField lang = new TextField(langParam);
+        final SingleSelect lang = new SingleSelect(langParam);
+        final Locale[] locales = Locale.getAvailableLocales();
+        lang.addOption(new Option("", ""));
+        Arrays.sort(locales, new Comparator<Locale>() {
+
+            public int compare(final Locale locale1, final Locale locale2) {
+                return locale1.getDisplayName().compareTo(locale2.getDisplayName());
+            }
+            
+        });
+        for(Locale locale : locales) {
+            lang.addOption(new Option(locale.toString(), locale.getDisplayName()));
+        }
+        add(lang);
+
         add(new Label((String) PublicationGlobalizationUtil.globalize(
                 "publications.ui.publication.abstract").localize()));
         ParameterModel abstractParam = new StringParameter(Publication.ABSTRACT);
@@ -105,8 +126,9 @@ public class PublicationPropertyForm
         Publication publication = (Publication) super.initBasicWidgets(fse);
 
         //data.put(Publication.TITLE, publication.getTitle());
-        data.put(Publication.YEAR_OF_PUBLICATION, publication.
-                getYearOfPublication());
+        data.put(Publication.YEAR_OF_PUBLICATION, publication.getYearOfPublication());
+        data.put(Publication.FIRST_PUBLISHED, publication.getYearFirstPublished());
+        data.put(Publication.LANG, publication.getLanguageOfPublication());
         data.put(Publication.ABSTRACT, publication.getAbstract());
         data.put(Publication.MISC, publication.getMisc());
     }
@@ -119,12 +141,13 @@ public class PublicationPropertyForm
         if ((publication != null) && getSaveCancelSection().getSaveButton().
                 isSelected(fse.getPageState())) {
             //publication.setTitle((String) data.get(Publication.TITLE));
-            publication.setYearOfPublication((Integer) data.get(
-                    Publication.YEAR_OF_PUBLICATION));
+            publication.setYearOfPublication((Integer) data.get(Publication.YEAR_OF_PUBLICATION));
+            publication.setYearFirstPublished((Integer) data.get(Publication.FIRST_PUBLISHED));
+            publication.setLanguageOfPublication((String) data.get(Publication.LANG));
             publication.setAbstract((String) data.get(Publication.ABSTRACT));
             publication.setMisc((String) data.get(Publication.MISC));
 
-            publication.save();            
+            publication.save();
         }
     }
 
@@ -140,5 +163,6 @@ public class PublicationPropertyForm
     protected String getTitleLabel() {
         return (String) PublicationGlobalizationUtil.globalize(
                 "publications.ui.publication.title").localize();
-    }    
+    }
+
 }
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources.properties b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources.properties
index 2f7f58fe2..978ba8192 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources.properties
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources.properties
@@ -411,3 +411,6 @@ organization.ui.publications.description=Edited publications
 organization.ui.publications.columns.name=Title
 organization.ui.publications.columns.year=Year
 organization.ui.publications.columns.type=Type
+publications.ui.journal.symbol=Symbol of the journal
+publications.ui.publication.first_published=First published
+publications.ui.publication.language=Language of publication
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties
index c41f72181..1be5e9369 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties
@@ -410,3 +410,6 @@ organization.ui.publications.description=Herausgegebene Publikationen
 organization.ui.publications.columns.name=Titel
 organization.ui.publications.columns.year=Jahr
 organization.ui.publications.columns.type=Typ
+publications.ui.journal.symbol=K\u00fcrzel der Zeitschrift
+publications.ui.publication.first_published=Erste Ver\u00f6ffentlichung
+publications.ui.publication.language=Sprache der Publikation