svn commit: r1074293 - /incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java

[rm...@apache.org]

Author: rmatthews
Date: Thu Feb 24 21:17:32 2011
New Revision: 1074293

URL: http://svn.apache.org/viewvc?rev=1074293&view=rev
Log:
Change specification so it looks up name/description/help details each time it is asks. This allow for localization for different users in a multi-user system.

Modified:
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java?rev=1074293&r1=1074292&r2=1074293&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java Thu Feb 24 21:17:32 2011
@@ -101,9 +101,6 @@ public abstract class ObjectSpecificatio
             return !classes.isEmpty();
         }
 
-        /**
-         * @return
-         */
         public List<ObjectSpecification> toList() {
             return Collections.unmodifiableList(classes);
         }
@@ -132,20 +129,6 @@ public abstract class ObjectSpecificatio
 
     private ObjectSpecification superclassSpec;
 
-    /**
-     * Expect to be populated using {@link #setSingularName(String)}, but has default name as well.
-     */
-    private String singularName = "(no name)";
-    /**
-     * Expect to be populated using {@link #setPluralName(String)} but has default name as well.
-     */
-    private String pluralName = "(no name)";
-    /**
-     * Expect to be populated using {@link #setDescribedAs(String)} but has default name as well.
-     */
-    private String describedAs = "(no description)";
-    private String help = null; /* help is typically a reference (eg a URL) and so should not default to a textual value if not set up */ 
-
     private Persistability persistability = Persistability.USER_PERSISTABLE;
 
     private MarkDirtyObjectFacet markDirtyObjectFacet;
@@ -312,18 +295,6 @@ public abstract class ObjectSpecificatio
         titleFacet = getFacet(TitleFacet.class);
         iconFacet = getFacet(IconFacet.class);
 
-        NamedFacet namedFacet = getFacet(NamedFacet.class);
-        singularName = namedFacet.value();
-
-        PluralFacet pluralFacet = getFacet(PluralFacet.class);
-        pluralName = pluralFacet.value();
-
-        final DescribedAsFacet describedAsFacet = getFacet(DescribedAsFacet.class);
-        describedAs = describedAsFacet.value();
-        
-        final HelpFacet helpFacet = getFacet(HelpFacet.class);
-        help = helpFacet == null ? null : helpFacet.value();
-
         Persistability persistability = determinePersistability();
         this.persistability = persistability;
     }
@@ -429,23 +400,38 @@ public abstract class ObjectSpecificatio
     // Name, Description, Persistability
     // //////////////////////////////////////////////////////////////////////
 
+    /**
+     * Expect to be populated using {@link #setSingularName(String)}, but has default name as well.
+     */
     @Override
     public String getSingularName() {
-        return singularName;
+        NamedFacet namedFacet = getFacet(NamedFacet.class);
+        return namedFacet.value();
     }
 
+    /**
+     * Expect to be populated using {@link #setPluralName(String)} but has default name as well.
+     */
     @Override
     public String getPluralName() {
-        return pluralName;
+        PluralFacet pluralFacet = getFacet(PluralFacet.class);
+        return pluralFacet.value();
     }
 
+    /**
+     * Expect to be populated using {@link #setDescribedAs(String)} but has default name as well.
+     */
     @Override
     public String getDescription() {
+        final DescribedAsFacet describedAsFacet = getFacet(DescribedAsFacet.class);
+        String describedAs = describedAsFacet.value();
         return describedAs == null ? "" : describedAs;
     }
     
+    /* help is typically a reference (eg a URL) and so should not default to a textual value if not set up */ 
     public String getHelp() {
-        return help;
+        final HelpFacet helpFacet = getFacet(HelpFacet.class);
+        return helpFacet == null ? null : helpFacet.value();
     }
 
     @Override