Changeset 16179 for release


Ignore:
Timestamp:
Aug 29, 2014, 4:25:18 PM (5 years ago)
Author:
rme
Message:

Merge from trunk.

Location:
release/1.10/cocoa-ide-contrib
Files:
9 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • release/1.10/cocoa-ide-contrib

  • release/1.10/cocoa-ide-contrib/krueger/InterfaceProjects/Cocoa Dev/lisp-app-doc.lisp

    r15808 r16179  
    964964               ;; It wouldn't hurt anything, but is a waste of time and would show up in UNDO.
    965965               (suspend-monitoring ip-path)
    966                (unless (#/writeToFile:atomically: (lisp-to-ns-dict (app-info-plist self))
     966               (unless (#/writeToFile:atomically: (lisp-to-ns-plist-dict (app-info-plist self))
    967967                                                  (lisp-to-temp-nsstring ip-path)
    968968                                                  #$YES)
  • release/1.10/cocoa-ide-contrib/krueger/InterfaceProjects/Utilities/date.lisp

    r16077 r16179  
    4242  ;; yy can be 2 or 4 digit year
    4343  ;; any dd greater than the end of the month is reduced to the last day of the month
     44  ;; To avoid complications associated with daylight savings time, we use 12 noon as
     45  ;; the time if not specified.
    4446  (let ((max-dd (if (and (eql mm 2)
    4547                         (not (logtest yy 3))
     
    9294
    9395(defun inc-months (dt num-mm)
    94   ;; this may not do what you expect if the day of the month within dt does not exist in the new month
    95   ;; e.g. 1 month prior to 7/31 is 7/01 hmmm...
    9696  (multiple-value-bind (sec min hr dd mm yr day dst zone)
    9797                       (decode-universal-time dt)
  • release/1.10/cocoa-ide-contrib/krueger/InterfaceProjects/Utilities/interface-packages.lisp

    r16077 r16179  
    353353   lisp-to-ns-object
    354354   lisp-to-ns-misc
     355   lisp-to-ns-plist-dict
    355356   lisp-to-ns-sym
    356357   ns-to-lisp-array
  • release/1.10/cocoa-ide-contrib/krueger/InterfaceProjects/Utilities/ns-object-utils.lisp

    r16077 r16179  
    660660                   assoc-lst)))))))
    661661
     662(defmethod lisp-to-ns-plist-dict ((ht hash-table))
     663  (let* ((count (hash-table-count ht))
     664         (new-dict (#/dictionaryWithCapacity: ns:ns-mutable-dictionary count)))
     665    (maphash #'(lambda (key val)
     666                 (#/setObject:forKey: new-dict
     667                                      (lisp-to-ns-object val)
     668                                      (lisp-to-ns-object key)))
     669             ht)
     670    new-dict))
     671
    662672(defmethod lisp-to-ns-dict ((alist list))
    663673  ;; alist must be in the form of an association list
Note: See TracChangeset for help on using the changeset viewer.