Changeset 1371

Timestamp:

07/25/08 11:51:07 (4 years ago)

Author:

eitan

Message:

adding support for natural primary keys (see demo-app Sympster entity Talk for illustration of its usage

Files:

• jmatter-complet/branches/TRY-JPA/JMatter.iws (modified) (3 diffs)
• jmatter-complet/branches/TRY-JPA/demo-apps/Sympster/src/com/u2d/sympster/Talk.java (modified) (1 diff)
• jmatter-complet/branches/TRY-JPA/jmatter/src/com/u2d/element/Field.java (modified) (1 diff)
• jmatter-complet/branches/TRY-JPA/jmatter/src/com/u2d/model/AbstractComplexEObject.java (modified) (2 diffs)
• jmatter-complet/branches/TRY-JPA/jmatter/src/com/u2d/model/ComplexType.java (modified) (1 diff)
• jmatter-complet/branches/TRY-JPA/jmatter/src/com/u2d/persist/HBMMaker.java (modified) (2 diffs)
• jmatter-complet/branches/TRY-JPA/jmatter/src/com/u2d/persist/PKField.java (added)
• jmatter-complet/branches/TRY-JPA/jmatter/src/com/u2d/persist/PKGen.java (added)
• jmatter-complet/branches/TRY-JPA/jmatter/src/com/u2d/persist/PKGenStrategy.java (added)

jmatter-complet/branches/TRY-JPA/JMatter.iws

@@ -17 +17 @@
-  <component name="ChangeListManager">
-    <list default="true" name="Default" comment="">
-
-
-
-
-
-
-
-
+
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/PKGen.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/PKField.java" />
-
-
-
-
-
-
-
-
+
+
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/HBMMaker.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/HBMMaker.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/City.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/City.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/element/Field.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/element/Field.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Room.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Room.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/JMatter.ipr" afterPath="$PROJECT_DIR$/JMatter.ipr" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/model/AbstractComplexEObject.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/model/AbstractComplexEObject.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/JMatter.iws" afterPath="$PROJECT_DIR$/JMatter.iws" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test-app/src/com/u2d/domain/Painting.java" afterPath="$PROJECT_DIR$/test-app/src/com/u2d/domain/Painting.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/IssueMgr/src/com/u2d/issuemgr/Issue.java" afterPath="$PROJECT_DIR$/demo-apps/IssueMgr/src/com/u2d/issuemgr/Issue.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/interaction/Instruction.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/interaction/Instruction.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/MyTunes/src/com/u2d/mytunes/Album.java" afterPath="$PROJECT_DIR$/demo-apps/MyTunes/src/com/u2d/mytunes/Album.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Hotel.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Hotel.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/ConferenceCenter.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/ConferenceCenter.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test-app/src/com/u2d/domain/OrderItem.java" afterPath="$PROJECT_DIR$/test-app/src/com/u2d/domain/OrderItem.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test-app/src/com/u2d/domain/TestVisit.java" afterPath="$PROJECT_DIR$/test-app/src/com/u2d/domain/TestVisit.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test-app/src/com/u2d/domain/Order.java" afterPath="$PROJECT_DIR$/test-app/src/com/u2d/domain/Order.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/tools/IDEA/ACO.java" afterPath="$PROJECT_DIR$/jmatter/tools/IDEA/ACO.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Session.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Session.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Self/src/com/u2d/self/Space.java" afterPath="$PROJECT_DIR$/demo-apps/Self/src/com/u2d/self/Space.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/PKGenStrategy.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Event.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Event.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Symposium.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Symposium.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Talk.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Talk.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Venue.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Venue.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AppBrowser/AppBrowser.iml" afterPath="$PROJECT_DIR$/AppBrowser/AppBrowser.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/ReverseEngineer.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/ReverseEngineer.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/MyTunes/MyTunes.iml" afterPath="$PROJECT_DIR$/demo-apps/MyTunes/MyTunes.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/MyTunes/src/com/u2d/mytunes/Artist.java" afterPath="$PROJECT_DIR$/demo-apps/MyTunes/src/com/u2d/mytunes/Artist.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/Core.iml" afterPath="$PROJECT_DIR$/jmatter/Core.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/MyTunes/src/com/u2d/mytunes/Song.java" afterPath="$PROJECT_DIR$/demo-apps/MyTunes/src/com/u2d/mytunes/Song.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AppBrowser/src/com/u2d/appbrowser/AppBookmark.java" afterPath="$PROJECT_DIR$/AppBrowser/src/com/u2d/appbrowser/AppBookmark.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test-app/src/com/u2d/domain/Shipment.java" afterPath="$PROJECT_DIR$/test-app/src/com/u2d/domain/Shipment.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/jmatter-tools/src/com/u2d/tools/AntPersistClassesMaker.java" afterPath="$PROJECT_DIR$/modules/jmatter-tools/src/com/u2d/tools/AntPersistClassesMaker.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/model/ComplexType.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/model/ComplexType.java" />
-    </list>
@@ -155 +111 @@
-  </component>
-  <component name="FileEditorManager">
-
-
-
-
-
-
-
-
-
-
-
+
-  </component>
-  <component name="FindManager">
@@ -1243 +1189 @@
-    <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/persist/HBMMaker.java">
-      <provider selected="true" editor-type-id="text-editor">
-658" column="3" selection-start="21624" selection-end="21624" vertical-scroll-proportion="0.3109843
+109" column="6" selection-start="3158" selection-end="3158" vertical-scroll-proportion="0.33238232
-          <folding />
-        </state>

jmatter-complet/branches/TRY-JPA/demo-apps/Sympster/src/com/u2d/sympster/Talk.java

@@ -6 +6 @@
-import com.u2d.type.atom.TextEO;
-import com.u2d.reflection.Fld;
+import com.u2d.persist.PKField;
+import com.u2d.persist.PKGen;
+import com.u2d.persist.PKGenStrategy;
-import javax.persistence.Entity;
-import java.awt.Color;
-
+/*
+Implemented in this way to illustrate how to allow for a table with a natural primary key (legacy)
+ in a JMatter application.
+ */
-@Entity
+@PKField("title")
+@PKGen(strategy= PKGenStrategy.ASSIGNED)
-public class Talk extends AbstractComplexEObject implements Event
-{

jmatter-complet/branches/TRY-JPA/jmatter/src/com/u2d/element/Field.java

@@ -480 +480 @@
-   public boolean isTabView() { return _tabView; }
-   public void setTabView(boolean isTabView) { _tabView = isTabView; }
-
+
+
+
+
+
-   public void applyMetadata()
-   {

jmatter-complet/branches/TRY-JPA/jmatter/src/com/u2d/model/AbstractComplexEObject.java

@@ -28 +28 @@
-import com.u2d.list.CompositeList;
-import com.u2d.app.Tracing;
+import org.hibernate.NonUniqueObjectException;
-
-/**
@@ -662 +663 @@
-                   "Created new " + type() + " object - " + title());
-            return null;
+         }
+         catch (NonUniqueObjectException ex)
+         {
+            log(LoggedEvent.ERROR, cmdInfo.getCommand(), DUPLICATE_KEY_CONSTRAINT_ERROR_MSG);
+            fireValidationException(DUPLICATE_KEY_CONSTRAINT_ERROR_MSG);
+            return DUPLICATE_KEY_CONSTRAINT_ERROR_MSG;
-         }
-         catch (org.hibernate.exception.ConstraintViolationException ex)

jmatter-complet/branches/TRY-JPA/jmatter/src/com/u2d/model/ComplexType.java

@@ -180 +180 @@
-      }
-   }
+   public boolean specifiesPKField()
+   {
+      return (_clazz.isAnnotationPresent(PKField.class));
+   }
+   public String pkFieldname()
+   {
+      PKField annotation = (PKField) _clazz.getAnnotation(PKField.class);
+      return annotation.value();
+   }
+   public boolean specifiesPKGenStrategy()
+   {
+      return (_clazz.isAnnotationPresent(PKGen.class));
+   }
+   public PKGenStrategy pkGenStrategy()
+   {
+      PKGen annotation = (PKGen) _clazz.getAnnotation(PKGen.class);
+      return annotation.strategy();
+   }
-
-   private void harvest()

jmatter-complet/branches/TRY-JPA/jmatter/src/com/u2d/persist/HBMMaker.java

@@ -135 +135 @@
-         else if (field.isAtomic())
-         {
-
+
+
+
+
-         }
-         else if (field.isInterfaceType() && !field.isIndexed())
@@ -657 +660 @@
-      return false;
-   }
-
+
-   private Element produceIDProperty(Element parentElem)
+   {
+      if (_type.specifiesPKField())
+      {
+         String pkfieldname = _type.pkFieldname();
+         Field pkfield = _type.field(pkfieldname);
+         pkfield.setPK(true);
+         Element idElem = parentElem.addElement("id");
+         idElem.addAttribute("name", pkfield.name());
+
+         Class typeClass = getUserType(pkfield);
+         idElem.addAttribute("type", typeClass.getName());
+         addAccessAttribute(idElem);
+
+         Element idGenElem = idElem.addElement("generator");
+         if (_type.specifiesPKGenStrategy())
+         {
+            idGenElem.addAttribute("class", _type.pkGenStrategy().strategyName());
+            // TODO: handle argument type for strategy.  e.g. sequence name.
+         }
+         else
+         {
+            idGenElem.addAttribute("class", "native");
+         }
+         return idElem;
+      }
+      else
+      {
+         return produceDefaultIDProperty(parentElem);
+      }
+   }
+   private Element produceDefaultIDProperty(Element parentElem)
-   {
-      Element idElem = parentElem.addElement("id");