Changeset 5679

Timestamp:

Jun 29, 2011, 1:47:33 PM (12 years ago)

Author:

Nicklas Nordborg

Message:

References #1589: Delete deprecated classes and methods

Removed deprecated options from raw data types and extended properties dtd:s

Location:

trunk/src/core/net/sf/basedb/core

Files:

• ExtendedProperties.java (modified) (2 diffs)
• RawDataTypes.java (modified) (4 diffs)
• dtd/extended-properties.dtd (modified) (1 diff)
• dtd/raw-data-types.dtd (modified) (2 diffs)

trunk/src/core/net/sf/basedb/core/ExtendedProperties.java

@@ -264 +264 @@
       boolean insertable = XMLUtil.getBooleanAttribute(property, "insert", true);
       boolean updateable = XMLUtil.getBooleanAttribute(property, "update", true);
-      boolean averagable = XMLUtil.getBooleanAttribute(property, "averagable", type.isNumerical());
       String avgMethod = property.getAttributeValue("averagemethod");
       Formula.AverageMethod averageMethod = null;
@@ -271 +270 @@
         averageMethod = Formula.AverageMethod.valueOf(avgMethod.toUpperCase());
       }
-      else if (averagable) 
+      else if (type.isNumerical()) 
       {
         averageMethod = Formula.AverageMethod.ARITHMETIC_MEAN;

trunk/src/core/net/sf/basedb/core/RawDataTypes.java

@@ -335 +335 @@
       String name = Values.getStringOrNull(el.getAttributeValue("name"));
       String description = Values.getStringOrNull(el.getAttributeValue("description"));
-      String storage = el.getAttributeValue("storage");
       String table = Values.getStringOrNull(el.getAttributeValue("table"));
       int channels = XMLUtil.getIntAttribute(el, "channels", 2);
@@ -356 +355 @@
       usedNames.add("id:" + id);
       usedNames.add("name:" + name);
-      if ("database".equals(storage))
-      {
-        if (!engine.isValidTableName(table))
-        {
-          throw new InvalidDataException("Invalid table for raw data type '" + 
-              id +"' in file '" + xmlFile + "': table=" + table);
-        }
-        if (usedNames.contains("table:" + table))
-        {
-          throw new InvalidDataException("Duplicate table for raw data type '" + 
-              id +"' in file '" + xmlFile + "': table=" + table);
-        }
-        usedNames.add("table:" + table);
-      }
-      else
-      {
-        throw new ConfigurationException("Attribute storage='" + storage + 
-          "' is no longer supported. Please remove declaration for <rawdatatype id='" + id + 
-          "'> from file '" + xmlFile + "'");
-      }
+
+      if (!engine.isValidTableName(table))
+      {
+        throw new InvalidDataException("Invalid table for raw data type '" + 
+            id +"' in file '" + xmlFile + "': table=" + table);
+      }
+      if (usedNames.contains("table:" + table))
+      {
+        throw new InvalidDataException("Duplicate table for raw data type '" + 
+            id +"' in file '" + xmlFile + "': table=" + table);
+      }
+      usedNames.add("table:" + table);
+
       if (channels <= 0)
       {
@@ -435 +427 @@
       if (type == Type.STRING && length > 255) type = Type.TEXT;
       boolean nullable = XMLUtil.getBooleanAttribute(property, "null", true);
-      boolean averagable = XMLUtil.getBooleanAttribute(property, "averagable", type.isNumerical());
       String avgMethod = property.getAttributeValue("averagemethod");
       Formula.AverageMethod averageMethod = null;
@@ -442 +433 @@
         averageMethod = Formula.AverageMethod.valueOf(avgMethod.toUpperCase());
       }
-      else if (averagable) 
+      else if (type.isNumerical()) 
       {
         averageMethod = Formula.AverageMethod.ARITHMETIC_MEAN;

trunk/src/core/net/sf/basedb/core/dtd/extended-properties.dtd

@@ -41 +41 @@
   insert (true|false) "true"
   update (true|false) "true"
-  averagable (true|false) #IMPLIED
   averagemethod (none|arithmetic_mean|geometric_mean|quadratic_mean|min|max) #IMPLIED
 >

trunk/src/core/net/sf/basedb/core/dtd/raw-data-types.dtd

@@ -28 +28 @@
   name CDATA #REQUIRED
   channels CDATA #REQUIRED
-  storage (file|database) "database"
   table CDATA #IMPLIED
   description CDATA #IMPLIED
@@ -43 +42 @@
   length CDATA #IMPLIED
   null (true|false) "true"
-  averagable (true|false) #IMPLIED
   averagemethod (none|arithmetic_mean|geometric_mean|quadratic_mean|min|max) #IMPLIED
   channel CDATA #IMPLIED