svn commit: r821403 - in /ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model: ModelEntity.java ModelInfo.java

[do...@apache.org]

Author: doogie
Date: Sat Oct  3 19:53:20 2009
New Revision: 821403

URL: http://svn.apache.org/viewvc?rev=821403&view=rev
Log:
Allow <default-resource-name> globally.

Modified:
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java?rev=821403&r1=821402&r2=821403&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java Sat Oct  3 19:53:20 2009
@@ -78,9 +78,6 @@
     /** The package-name of the Entity */
     protected String packageName = "";
 
-    /** The default-resource-name of the Entity, used with the getResource call to check for a value in a resource bundle */
-    protected String defaultResourceName = "";
-
     /** The entity-name of the Entity that this Entity is dependent on, if empty then no dependency */
     protected String dependentOn = "";
 
@@ -238,7 +235,6 @@
         this.entityName = UtilXml.checkEmpty(entityElement.getAttribute("entity-name")).intern();
         this.tableName = UtilXml.checkEmpty(entityElement.getAttribute("table-name"), ModelUtil.javaNameToDbName(this.entityName)).intern();
         this.packageName = UtilXml.checkEmpty(entityElement.getAttribute("package-name")).intern();
-        this.defaultResourceName = UtilXml.checkEmpty(entityElement.getAttribute("default-resource-name")).intern();
         this.dependentOn = UtilXml.checkEmpty(entityElement.getAttribute("dependent-on")).intern();
         this.doLock = UtilXml.checkBoolean(entityElement.getAttribute("enable-lock"), false);
         this.noAutoStamp = UtilXml.checkBoolean(entityElement.getAttribute("no-auto-stamp"), false);
@@ -351,15 +347,6 @@
         this.packageName = packageName;
     }
 
-    /** The default-resource-name of the Entity */
-    public String getDefaultResourceName() {
-        return this.defaultResourceName;
-    }
-
-    public void setDefaultResourceName(String defaultResourceName) {
-        this.defaultResourceName = defaultResourceName;
-    }
-
     /** The entity-name of the Entity that this Entity is dependent on, if empty then no dependency */
     public String getDependentOn() {
         return this.dependentOn;

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java?rev=821403&r1=821402&r2=821403&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java Sat Oct  3 19:53:20 2009
@@ -46,6 +46,9 @@
     /** The version for documentation purposes */
     protected String version = "";
 
+    /** The default-resource-name of the Entity, used with the getResource call to check for a value in a resource bundle */
+    protected String defaultResourceName = "";
+
     // ===== CONSTRUCTORS =====
 
     public ModelInfo() {
@@ -58,15 +61,17 @@
 
     public static final ModelInfo DEFAULT = new ModelInfo() {
         @Override
-        public String getTitle()        { return "None"; }
+        public String getTitle()                { return "None"; }
+        @Override
+        public String getAuthor()               { return "None"; }
         @Override
-        public String getAuthor()       { return "None"; }
+        public String getCopyright()            { return "Copyright 2001-2009 The Apache Software Foundation"; }
         @Override
-        public String getCopyright()    { return "Copyright 2001-2009 The Apache Software Foundation"; }
+        public String getVersion()              { return "1.0"; }
         @Override
-        public String getVersion()      { return "1.0"; }
+        public String getDescription()          { return "None"; }
         @Override
-        public String getDescription()  { return "None"; }
+        public String getDefaultResourceName()  { return ""; }
     };
 
     public void populateFromAttributes(Element element) {
@@ -75,6 +80,7 @@
         description = StringUtil.internString(UtilXml.childElementValue(element, "description"));
         title = element.getAttribute("title").intern();
         version = element.getAttribute("version").intern();
+        defaultResourceName = StringUtil.internString(element.getAttribute("default-resource-name"));
     }
 
     public void populateFromElements(Element element) {
@@ -83,6 +89,7 @@
         description = StringUtil.internString(UtilXml.childElementValue(element, "description"));
         title = StringUtil.internString(UtilXml.childElementValue(element, "title"));
         version = StringUtil.internString(UtilXml.childElementValue(element, "version"));
+        defaultResourceName = StringUtil.internString(UtilXml.childElementValue(element, "default-resource-name"));
     }
 
     // Strings to go in the comment header.
@@ -130,4 +137,13 @@
     public void setVersion(String version) {
         this.version = version;
     }
+
+    /** The default-resource-name of the Entity */
+    public String getDefaultResourceName() {
+        return this.defaultResourceName != null ? this.defaultResourceName : def.getDefaultResourceName();
+    }
+
+    public void setDefaultResourceName(String defaultResourceName) {
+        this.defaultResourceName = defaultResourceName;
+    }
 }