[Openjean-commits] ojfacebook/uk/co/mullsoft/facebook OJfacebookUtilities.java, 1.7, 1.8

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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

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

Index: OJfacebookUtilities.java
===================================================================
RCS file: /cvsroot/openjean/ojfacebook/uk/co/mullsoft/facebook/OJfacebookUtilities.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OJfacebookUtilities.java	2 Jan 2014 13:22:58 -0000	1.7
--- OJfacebookUtilities.java	22 Nov 2014 13:38:48 -0000	1.8
***************
*** 7,10 ****
--- 7,12 ----
  import java.util.Date;
  import java.util.HashMap;
+ import java.util.Map;
+ import java.util.Set;
  import java.util.TreeSet;
  
***************
*** 22,30 ****
  import uk.co.mullsoft.components.ThreadManager;
  import uk.co.mullsoft.components.Utilities;
! import uk.co.mullsoft.components.attributes.Attribute;
  import uk.co.mullsoft.components.attributes.ParameterCollection;
  import uk.co.mullsoft.components.attributes.ParameterType;
! import uk.co.mullsoft.components.base.IndexedLValue;
! import uk.co.mullsoft.components.base.ObjectWithNameAndValueAndTags;
  import uk.co.mullsoft.components.base.TickedLong;
  import uk.co.mullsoft.components.base.TickedValue;
--- 24,32 ----
  import uk.co.mullsoft.components.ThreadManager;
  import uk.co.mullsoft.components.Utilities;
! import uk.co.mullsoft.components.attributes.SwingAttribute;
  import uk.co.mullsoft.components.attributes.ParameterCollection;
  import uk.co.mullsoft.components.attributes.ParameterType;
! import uk.co.mullsoft.components.base.IdObject;
! import uk.co.mullsoft.components.base.OJObject;
  import uk.co.mullsoft.components.base.TickedLong;
  import uk.co.mullsoft.components.base.TickedValue;
***************
*** 164,168 ****
                 accounts.put(cat.id, ta);
                 EntityDescriptor[] grps = api.getDescendantDetails(cat.id, EntityType.GROUP);
!                HashMap<String, IndexedLValue> entities = new HashMap<String, IndexedLValue>();
                 for (EntityDescriptor grp : grps)
                 {
--- 166,170 ----
                 accounts.put(cat.id, ta);
                 EntityDescriptor[] grps = api.getDescendantDetails(cat.id, EntityType.GROUP);
!                HashMap<String, IdObject> entities = new HashMap<String, IdObject>();
                 for (EntityDescriptor grp : grps)
                 {
***************
*** 171,178 ****
                    if ((uid != null) && (sname != null))
                    {
!                      entities.put(sname, new IndexedLValue(uid, grp));
                    }
                 }
!                long[] uids = IndexedLValue.getIndices(entities.values().toArray(new IndexedLValue[entities.size()]));
  //               ArrayList<User> friends = ta.getFriends(uids);
  //               for (User fr : friends)
--- 173,180 ----
                    if ((uid != null) && (sname != null))
                    {
!                      entities.put(sname, new IdObject(uid, grp));
                    }
                 }
!                long[] uids = IdObject.getIndices(entities.values().toArray(new IdObject[entities.size()]));
  //               ArrayList<User> friends = ta.getFriends(uids);
  //               for (User fr : friends)
***************
*** 247,252 ****
           if (id < 0)
           {
!             id = api.createEntity(cat, EntityType.CATEGORY, '@' + credentials.username, new ObjectWithNameAndValueAndTags[]
!             { new ObjectWithNameAndValueAndTags(CATEGORY_USERNAME_ATTRIBUTE, credentials.username) });
           }
           EntityDescriptor entity = api.getEntityDescriptor(id);
--- 249,254 ----
           if (id < 0)
           {
!             id = api.createEntity(cat, EntityType.CATEGORY, '@' + credentials.username, new OJObject[]
!             { new OJObject(CATEGORY_USERNAME_ATTRIBUTE, credentials.username) });
           }
           EntityDescriptor entity = api.getEntityDescriptor(id);
***************
*** 422,427 ****
        {
           id = paths[0].lastId();
!          long saved = this.getOrCreateChild(0L, EntityType.CATEGORY, "saved", new ObjectWithNameAndValueAndTags[]
!          { new ObjectWithNameAndValueAndTags(CATEGORY_STATUS_ATTRIBUTE, "has read") }, true, false);
           if ((saved > 0L) && (id > 0L))
           {
--- 424,429 ----
        {
           id = paths[0].lastId();
!          long saved = this.getOrCreateChild(0L, EntityType.CATEGORY, "saved", new OJObject[]
!          { new OJObject(CATEGORY_STATUS_ATTRIBUTE, "has read") }, true, false);
           if ((saved > 0L) && (id > 0L))
           {
***************
*** 448,455 ****
           {
              final TickedInputPanel tip = new TickedInputPanel();
!             final Attribute[] atts = new Attribute[savedItems.length];
              for (int n = 0; n < atts.length; n++)
              {
!                atts[n] = new Attribute("", ParameterType.TEXT, (String[]) api.getAttributeValue(savedItems[n], ITEM_CONTENTS_ATTRIBUTE));
              }
              tip.setInputSpecification(atts);
--- 450,457 ----
           {
              final TickedInputPanel tip = new TickedInputPanel();
!             final SwingAttribute[] atts = new SwingAttribute[savedItems.length];
              for (int n = 0; n < atts.length; n++)
              {
!                atts[n] = new SwingAttribute("", ParameterType.TEXT, (String[]) api.getAttributeValue(savedItems[n], ITEM_CONTENTS_ATTRIBUTE));
              }
              tip.setInputSpecification(atts);
***************
*** 600,605 ****
              }
           }
!          api.setAttributeValues(category, new ObjectWithNameAndValueAndTags[]
!          { new ObjectWithNameAndValueAndTags(CATEGORY_CONTENTS_ATTRIBUTE, buff.toArray(new String[buff.size()])), new ObjectWithNameAndValueAndTags(CATEGORY_STATUS_ATTRIBUTE, status) });
        }
     }
--- 602,607 ----
              }
           }
!          api.setAttributeValues(category, new OJObject[]
!          { new OJObject(CATEGORY_CONTENTS_ATTRIBUTE, buff.toArray(new String[buff.size()])), new OJObject(CATEGORY_STATUS_ATTRIBUTE, status) });
        }
     }
***************
*** 726,730 ****
  
     @Override
!    public boolean[] actionRequired(String catalog, MonitorType type, ObjectWithNameAndValueAndTags[] monitorObjects)
     {
        boolean[] ret = null;
--- 728,732 ----
  
     @Override
!    public boolean[] actionRequired(String catalog, MonitorType type, OJObject[] monitorObjects)
     {
        boolean[] ret = null;
***************
*** 760,768 ****
                    String[] old1s = (String[]) ArrayUtilities.inAAndNotInB(currentContents, bareContents);
                    Date now = new Date();
!                   ObjectWithNameAndValueAndTags[] attributes = new ObjectWithNameAndValueAndTags[]
!                   { new ObjectWithNameAndValueAndTags(ITEM_CONTENTS_ATTRIBUTE, new String[]
!                   { "" }), new ObjectWithNameAndValueAndTags(ITEM_ID_ATTRIBUTE, 0L), new ObjectWithNameAndValueAndTags(ITEM_BARE_ATTRIBUTE, ""),
!                         new ObjectWithNameAndValueAndTags(ITEM_STATUS_ATTRIBUTE, isCurrentlyVisible ? STATUSREAD : STATUSNEW),
!                         new ObjectWithNameAndValueAndTags(ITEM_PUBDATE_ATTRIBUTE, now) };
                    for (int m = 0; m < new1s.length; m++)
                    {
--- 762,770 ----
                    String[] old1s = (String[]) ArrayUtilities.inAAndNotInB(currentContents, bareContents);
                    Date now = new Date();
!                   OJObject[] attributes = new OJObject[]
!                   { new OJObject(ITEM_CONTENTS_ATTRIBUTE, new String[]
!                   { "" }), new OJObject(ITEM_ID_ATTRIBUTE, 0L), new OJObject(ITEM_BARE_ATTRIBUTE, ""),
!                         new OJObject(ITEM_STATUS_ATTRIBUTE, isCurrentlyVisible ? STATUSREAD : STATUSNEW),
!                         new OJObject(ITEM_PUBDATE_ATTRIBUTE, now) };
                    for (int m = 0; m < new1s.length; m++)
                    {
***************
*** 834,838 ****
        {
           Logger.getLogger().log(catalog, Logger.TRACE, "checking facebook monitors");
!          ArrayList<ObjectWithNameAndValueAndTags> nv = new ArrayList<ObjectWithNameAndValueAndTags>();
           for (FacebookUser tu : usersByFacebookId.values())
           {
--- 836,840 ----
        {
           Logger.getLogger().log(catalog, Logger.TRACE, "checking facebook monitors");
!          ArrayList<OJObject> nv = new ArrayList<OJObject>();
           for (FacebookUser tu : usersByFacebookId.values())
           {
***************
*** 847,851 ****
           if (nv.size() > 0)
           {
!             addMonitorObjects(nv.toArray(new ObjectWithNameAndValueAndTags[nv.size()]), MonitorType.RUNNABLEOUTPUTCHANGED, DEFAULTUPDATEEVERY);
              someAdded = true;
           }
--- 849,853 ----
           if (nv.size() > 0)
           {
!             addMonitorObjects(nv.toArray(new OJObject[nv.size()]), MonitorType.RUNNABLEOUTPUTCHANGED, DEFAULTUPDATEEVERY);
              someAdded = true;
           }
***************
*** 863,867 ****
  
     @Override
!    public void checkAndSetItems(Channel channel, Item[] newItems)
     {
        // TODO Auto-generated method stub
--- 865,869 ----
  
     @Override
!    public void checkAndSetItems(Channel channel, Map<String, Item> newItems)
     {
        // TODO Auto-generated method stub
***************
*** 996,1004 ****
                       {
                          lc.add(children);
!                         api.setAttributeValue(entities[n].id, new ObjectWithNameAndValueAndTags(GROUP_STATUS_ATTRIBUTE, STATUSHASREAD));
                       }
                       else
                       {
!                         api.setAttributeValue(entities[n].id, new ObjectWithNameAndValueAndTags(GROUP_STATUS_ATTRIBUTE, STATUSEMPTY));
                       }
                    }
--- 998,1006 ----
                       {
                          lc.add(children);
!                         api.setAttributeValue(entities[n].id, new OJObject(GROUP_STATUS_ATTRIBUTE, STATUSHASREAD));
                       }
                       else
                       {
!                         api.setAttributeValue(entities[n].id, new OJObject(GROUP_STATUS_ATTRIBUTE, STATUSEMPTY));
                       }
                    }
***************
*** 1016,1035 ****
                                has1 = true;
                                lc.add(children);
!                               api.setAttributeValue(grpChildren[m], new ObjectWithNameAndValueAndTags(GROUP_STATUS_ATTRIBUTE, STATUSHASREAD));
                             }
                             else
                             {
!                               api.setAttributeValue(grpChildren[m], new ObjectWithNameAndValueAndTags(GROUP_STATUS_ATTRIBUTE, STATUSEMPTY));
                             }
                          }
!                         api.setAttributeValue(entities[n].id, new ObjectWithNameAndValueAndTags(CATEGORY_STATUS_ATTRIBUTE, has1 ? STATUSHASREAD : STATUSEMPTY));
                       }
                       else
                       {
!                         api.setAttributeValue(entities[n].id, new ObjectWithNameAndValueAndTags(CATEGORY_STATUS_ATTRIBUTE, STATUSEMPTY));
                       }
                    }
                 }
!                api.setAttributeValue(lc.toArray(), new ObjectWithNameAndValueAndTags(ITEM_STATUS_ATTRIBUTE, STATUSREAD));
              }
           }
--- 1018,1037 ----
                                has1 = true;
                                lc.add(children);
!                               api.setAttributeValue(grpChildren[m], new OJObject(GROUP_STATUS_ATTRIBUTE, STATUSHASREAD));
                             }
                             else
                             {
!                               api.setAttributeValue(grpChildren[m], new OJObject(GROUP_STATUS_ATTRIBUTE, STATUSEMPTY));
                             }
                          }
!                         api.setAttributeValue(entities[n].id, new OJObject(CATEGORY_STATUS_ATTRIBUTE, has1 ? STATUSHASREAD : STATUSEMPTY));
                       }
                       else
                       {
!                         api.setAttributeValue(entities[n].id, new OJObject(CATEGORY_STATUS_ATTRIBUTE, STATUSEMPTY));
                       }
                    }
                 }
!                api.setAttributeValue(lc.toArray(), new OJObject(ITEM_STATUS_ATTRIBUTE, STATUSREAD));
              }
           }