[Openjean-commits] ojserver/uk/co/mullsoft/ojserver OJAPI.java, 1.32, 1.33

[Mike C. <com...@us...>]

Update of /cvsroot/openjean/ojserver/uk/co/mullsoft/ojserver
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv481/uk/co/mullsoft/ojserver

Modified Files:
	OJAPI.java 
Log Message:
update 22/1//2014

Index: OJAPI.java
===================================================================
RCS file: /cvsroot/openjean/ojserver/uk/co/mullsoft/ojserver/OJAPI.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** OJAPI.java	27 Jan 2014 18:09:09 -0000	1.32
--- OJAPI.java	22 Nov 2014 13:38:55 -0000	1.33
***************
*** 50,56 ****
  import uk.co.mullsoft.components.attributes.ParameterCollectionProvider;
  import uk.co.mullsoft.components.attributes.ParameterType;
! import uk.co.mullsoft.components.attributes.Attribute;
  import uk.co.mullsoft.components.base.NamedLong;
! import uk.co.mullsoft.components.base.ObjectWithNameAndValueAndTags;
  import uk.co.mullsoft.components.base.TickedLong;
  import uk.co.mullsoft.components.entity.AttributeValueSetter;
--- 50,56 ----
  import uk.co.mullsoft.components.attributes.ParameterCollectionProvider;
  import uk.co.mullsoft.components.attributes.ParameterType;
! import uk.co.mullsoft.components.attributes.SwingAttribute;
  import uk.co.mullsoft.components.base.NamedLong;
! import uk.co.mullsoft.components.base.OJObject;
  import uk.co.mullsoft.components.base.TickedLong;
  import uk.co.mullsoft.components.entity.AttributeValueSetter;
***************
*** 81,85 ****
  import uk.co.mullsoft.ojdb.OJOptionDatabase;
  
! import uk.co.mullsoft.ojdb.attributes.OJAttribute;
  import uk.co.mullsoft.ojdb.attributes.OJAttributeSet;
  
--- 81,85 ----
  import uk.co.mullsoft.ojdb.OJOptionDatabase;
  
! import uk.co.mullsoft.ojdb.attributes.OJDbAttribute;
  import uk.co.mullsoft.ojdb.attributes.OJAttributeSet;
  
***************
*** 407,411 ****
  
     @Override
!    public Attribute getAttribute(long id, String attributeName)
     {
        return database.getOJAttribute(id, attributeName);
--- 407,411 ----
  
     @Override
!    public SwingAttribute getAttribute(long id, String attributeName)
     {
        return database.getOJAttribute(id, attributeName);
***************
*** 413,417 ****
  
     @Override
!    public Attribute[] getAttributesOnPage(long id, String pageName)
     {
        return database.getAttributesOnPage(id, pageName);
--- 413,417 ----
  
     @Override
!    public SwingAttribute[] getAttributesOnPage(long id, String pageName)
     {
        return database.getAttributesOnPage(id, pageName);
***************
*** 419,423 ****
  
     @Override
!    public Attribute[] getAllAttributes(long id)
     {
        return database.getAllAttributes(id);
--- 419,423 ----
  
     @Override
!    public SwingAttribute[] getAllAttributes(long id)
     {
        return database.getAllAttributes(id);
***************
*** 425,429 ****
  
     @Override
!    public Attribute getAttribute(EntityType etype, String attributeName)
     {
        return database.getOJAttribute(etype, attributeName);
--- 425,429 ----
  
     @Override
!    public SwingAttribute getAttribute(EntityType etype, String attributeName)
     {
        return database.getOJAttribute(etype, attributeName);
***************
*** 431,435 ****
  
     @Override
!    public Attribute[] getAttributesOnPage(EntityType etype, String pageName)
     {
        return database.getAttributesOnPage(etype, pageName);
--- 431,435 ----
  
     @Override
!    public SwingAttribute[] getAttributesOnPage(EntityType etype, String pageName)
     {
        return database.getAttributesOnPage(etype, pageName);
***************
*** 437,441 ****
  
     @Override
!    public Attribute[] getAllAttributes(EntityType etype)
     {
        return database.getAllAttributes(etype);
--- 437,441 ----
  
     @Override
!    public SwingAttribute[] getAllAttributes(EntityType etype)
     {
        return database.getAllAttributes(etype);
***************
*** 600,604 ****
     }
  
!    public void setAttributeValue(long id, ObjectWithNameAndValueAndTags nv)
     {
        if (nv != null)
--- 600,604 ----
     }
  
!    public void setAttributeValue(long id, OJObject nv)
     {
        if (nv != null)
***************
*** 608,612 ****
     }
  
!    public void setAttributeValues(long id, Collection<ObjectWithNameAndValueAndTags> nv)
     {
        if (nv != null)
--- 608,612 ----
     }
  
!    public void setAttributeValues(long id, Collection<OJObject> nv)
     {
        if (nv != null)
***************
*** 616,620 ****
     }
  
!    public void setAttributeValues(long id, ObjectWithNameAndValueAndTags[] nv)
     {
        if (nv != null)
--- 616,620 ----
     }
  
!    public void setAttributeValues(long id, OJObject[] nv)
     {
        if (nv != null)
***************
*** 646,650 ****
     }
  
!    public void setAttributeValue(long[] id, ObjectWithNameAndValueAndTags nv)
     {
        if (nv != null)
--- 646,650 ----
     }
  
!    public void setAttributeValue(long[] id, OJObject nv)
     {
        if (nv != null)
***************
*** 654,658 ****
     }
  
!    public void setAttributeValues(long[] id, Collection<ObjectWithNameAndValueAndTags> nv)
     {
        if (nv != null)
--- 654,658 ----
     }
  
!    public void setAttributeValues(long[] id, Collection<OJObject> nv)
     {
        if (nv != null)
***************
*** 665,669 ****
     }
  
!    public void setAttributeValues(long[] id, ObjectWithNameAndValueAndTags[] nv)
     {
        if (nv != null)
--- 665,669 ----
     }
  
!    public void setAttributeValues(long[] id, OJObject[] nv)
     {
        if (nv != null)
***************
*** 713,722 ****
           String pagename = attname.substring(0, dc);
           String aname = attname.substring(dc + 2);
!          OJAttribute ojatt = OJAttribute.newOJAttribute(database, aname, ParameterType.getTypeForValue(value), value);
           database.addOJAttribute(id, pagename, ojatt);
        }
     }
  
!    public long createEntity(long parent, EntityType ntype, String name, ObjectWithNameAndValueAndTags[] attributes)
     {
        long ret = Constants.NOSUCHENTITY;
--- 713,722 ----
           String pagename = attname.substring(0, dc);
           String aname = attname.substring(dc + 2);
!          OJDbAttribute ojatt = OJDbAttribute.newOJAttribute(database, aname, ParameterType.getTypeForValue(value), value);
           database.addOJAttribute(id, pagename, ojatt);
        }
     }
  
!    public long createEntity(long parent, EntityType ntype, String name, OJObject[] attributes)
     {
        long ret = Constants.NOSUCHENTITY;
***************
*** 728,732 ****
     }
  
!    public long createEntity(long parent, EntityType ntype, String name, Collection<ObjectWithNameAndValueAndTags> attributes)
     {
        long ret = Constants.NOSUCHENTITY;
--- 728,732 ----
     }
  
!    public long createEntity(long parent, EntityType ntype, String name, Collection<OJObject> attributes)
     {
        long ret = Constants.NOSUCHENTITY;
***************
*** 738,742 ****
     }
  
!    public long createHiddenEntity(long parent, EntityType ntype, String name, Collection<ObjectWithNameAndValueAndTags> attributes)
     {
        long ret = Constants.NOSUCHENTITY;
--- 738,742 ----
     }
  
!    public long createHiddenEntity(long parent, EntityType ntype, String name, Collection<OJObject> attributes)
     {
        long ret = Constants.NOSUCHENTITY;
***************
*** 748,752 ****
     }
  
!    public long createHiddenEntity(long parent, EntityType ntype, String name, ObjectWithNameAndValueAndTags[] attributes)
     {
        long ret = Constants.NOSUCHENTITY;
--- 748,752 ----
     }
  
!    public long createHiddenEntity(long parent, EntityType ntype, String name, OJObject[] attributes)
     {
        long ret = Constants.NOSUCHENTITY;
***************
*** 758,762 ****
     }
  
!    public EntityDescriptor createNewEntity(long parent, EntityType ntype, String name, ObjectWithNameAndValueAndTags[] attributes)
     {
        EntityDescriptor ret = null;
--- 758,762 ----
     }
  
!    public EntityDescriptor createNewEntity(long parent, EntityType ntype, String name, OJObject[] attributes)
     {
        EntityDescriptor ret = null;
***************
*** 768,772 ****
     }
  
!    public EntityDescriptor createNewEntity(long parent, EntityType ntype, String name, Collection<ObjectWithNameAndValueAndTags> attributes)
     {
        EntityDescriptor ret = null;
--- 768,772 ----
     }
  
!    public EntityDescriptor createNewEntity(long parent, EntityType ntype, String name, Collection<OJObject> attributes)
     {
        EntityDescriptor ret = null;
***************
*** 778,782 ****
     }
  
!    public EntityDescriptor createNewHiddenEntity(long parent, EntityType ntype, String name, Collection<ObjectWithNameAndValueAndTags> attributes)
     {
        EntityDescriptor ret = null;
--- 778,782 ----
     }
  
!    public EntityDescriptor createNewHiddenEntity(long parent, EntityType ntype, String name, Collection<OJObject> attributes)
     {
        EntityDescriptor ret = null;
***************
*** 788,792 ****
     }
  
!    public EntityDescriptor createNewHiddenEntity(long parent, EntityType ntype, String name, ObjectWithNameAndValueAndTags[] attributes)
     {
        EntityDescriptor ret = null;
--- 788,792 ----
     }
  
!    public EntityDescriptor createNewHiddenEntity(long parent, EntityType ntype, String name, OJObject[] attributes)
     {
        EntityDescriptor ret = null;
***************
*** 798,802 ****
     }
  
!    public long createEntity(long[] parent, EntityType ntype, String name, Collection<ObjectWithNameAndValueAndTags> attributes)
     {
        long ret = Constants.NOSUCHENTITY;
--- 798,802 ----
     }
  
!    public long createEntity(long[] parent, EntityType ntype, String name, Collection<OJObject> attributes)
     {
        long ret = Constants.NOSUCHENTITY;
***************
*** 808,812 ****
     }
  
!    public long createEntity(long[] parent, EntityType ntype, String name, ObjectWithNameAndValueAndTags[] attributes)
     {
        long ret = Constants.NOSUCHENTITY;
--- 808,812 ----
     }
  
!    public long createEntity(long[] parent, EntityType ntype, String name, OJObject[] attributes)
     {
        long ret = Constants.NOSUCHENTITY;
***************
*** 818,822 ****
     }
  
!    public EntityDescriptor createNewEntity(long[] parent, EntityType ntype, String name, ObjectWithNameAndValueAndTags[] attributes)
     {
        EntityDescriptor ret = null;
--- 818,822 ----
     }
  
!    public EntityDescriptor createNewEntity(long[] parent, EntityType ntype, String name, OJObject[] attributes)
     {
        EntityDescriptor ret = null;
***************
*** 1227,1241 ****
     }
  
!    public void setAttributeValue(long id, Attribute nptv)
     {
        database.setOJAttributeValue(id, nptv);
     }
  
!    public void setAttributeValues(long id, Attribute[] nptv)
     {
        database.setOJAttributeValues(id, nptv);
     }
  
!    public void setAttributeValue(long[] id, Attribute nptv)
     {
        for (int n = 0; n < id.length; n++)
--- 1227,1241 ----
     }
  
!    public void setAttributeValue(long id, SwingAttribute nptv)
     {
        database.setOJAttributeValue(id, nptv);
     }
  
!    public void setAttributeValues(long id, SwingAttribute[] nptv)
     {
        database.setOJAttributeValues(id, nptv);
     }
  
!    public void setAttributeValue(long[] id, SwingAttribute nptv)
     {
        for (int n = 0; n < id.length; n++)
***************
*** 1245,1249 ****
     }
  
!    public void setAttributeValues(long[] id, Attribute[] nptv)
     {
        for (int n = 0; n < id.length; n++)
--- 1245,1249 ----
     }
  
!    public void setAttributeValues(long[] id, SwingAttribute[] nptv)
     {
        for (int n = 0; n < id.length; n++)
***************
*** 1463,1475 ****
           {
              ReferenceValue refval = new ReferenceValue(toCatalog, toId, Constants.JEANNAME);
!             OJAttribute att = database.getOJAttribute(id, "default::xrefs");
              if (att == null)
              {
!                Attribute[] attval = new Attribute[] {new Attribute(name, ParameterType.REFERENCE, refval)};
!                att = OJAttribute.newOJAttribute(database, "default::xrefs", ParameterType.SET, attval);
              }
              else
              {
!                ((OJAttributeSet)att).add(OJAttribute.newOJAttribute(database, name, ParameterType.REFERENCE, refval));
              }
              database.setOJAttribute(id, att);
--- 1463,1475 ----
           {
              ReferenceValue refval = new ReferenceValue(toCatalog, toId, Constants.JEANNAME);
!             OJDbAttribute att = database.getOJAttribute(id, "default::xrefs");
              if (att == null)
              {
!                SwingAttribute[] attval = new SwingAttribute[] {new SwingAttribute(name, ParameterType.REFERENCE, refval)};
!                att = OJDbAttribute.newOJAttribute(database, "default::xrefs", ParameterType.SET, attval);
              }
              else
              {
!                ((OJAttributeSet)att).add(OJDbAttribute.newOJAttribute(database, name, ParameterType.REFERENCE, refval));
              }
              database.setOJAttribute(id, att);
***************
*** 2160,2164 ****
                       if ((n < path.length - 1) || !isLink)
                       {
!                         next1 = database.createEntity(ret, EntityType.INDEXENTRY, path[n], (ObjectWithNameAndValueAndTags[])null);
                       }
                       else
--- 2160,2164 ----
                       if ((n < path.length - 1) || !isLink)
                       {
!                         next1 = database.createEntity(ret, EntityType.INDEXENTRY, path[n], (OJObject[])null);
                       }
                       else