Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

2.1 local #2

Open
wants to merge 71 commits into
base: 2.1
Choose a base branch
from
Open

2.1 local #2

wants to merge 71 commits into from

Commits on Jan 3, 2014

  1. Initial Commit

    Bradley J Clement authored and Bradley J Clement committed Jan 3, 2014
    Configuration menu
    Copy the full SHA
    be30f8c View commit details
    Browse the repository at this point in the history

  2. eclipse java project files

    Bradley J Clement authored and Bradley J Clement committed Jan 3, 2014
    Configuration menu
    Copy the full SHA
    2fb7927 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2014

  1. copy of utils from bae; changed ClassUtils.evaluate() to look inside 

    a Collection with a single item
    Bradley J Clement authored and Bradley J Clement committed Jan 6, 2014
    Configuration menu
    Copy the full SHA
    79f363e View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2014

  1. added coerceList()

    Bradley J Clement authored and Bradley J Clement committed Jan 7, 2014
    Configuration menu
    Copy the full SHA
    ee9709a View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2014

  1. pulled MethodCall out of sysml.SystemModel; added utility functions

    Bradley J Clement authored and Bradley J Clement committed Jan 14, 2014
    Configuration menu
    Copy the full SHA
    a2ec6c5 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2014

  1. MethdCall nesting; more container utils

    Bradley J Clement authored and Bradley J Clement committed Jan 15, 2014
    Configuration menu
    Copy the full SHA
    022038d View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2014

  1. fix to filter() and more utilities

    Bradley J Clement authored and Bradley J Clement committed Jan 16, 2014
    Configuration menu
    Copy the full SHA
    022987f View commit details
    Browse the repository at this point in the history

  2. MethodCall.closure() and other utils

    Bradley J Clement authored and Bradley J Clement committed Jan 16, 2014
    Configuration menu
    Copy the full SHA
    56737b7 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2014

  1. fixed filter bug

    bclement authored and bclement committed Jan 17, 2014
    Configuration menu
    Copy the full SHA
    a251f5c View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2014

  1. minor change to debug output

    Bradley J Clement authored and Bradley J Clement committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    a806c68 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2014

  1. added intersect() util

    Bradley J Clement authored and Bradley J Clement committed Jan 28, 2014
    Configuration menu
    Copy the full SHA
    0732b2c View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2014

  1. functional programming and HasId, which I forgot to commit

    Bradley J Clement authored and Bradley J Clement committed Mar 3, 2014
    Configuration menu
    Copy the full SHA
    2d9297c View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2014

  1. jrebel config, asList(Object, Class)

    Bradley J Clement authored and Bradley J Clement committed Mar 6, 2014
    Configuration menu
    Copy the full SHA
    4fccf16 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2014

  1. improved toCamelCase() utility function

    bclement authored and bclement committed Mar 11, 2014
    Configuration menu
    Copy the full SHA
    e3cf2d3 View commit details
    Browse the repository at this point in the history

  2. removed junit packaging from build

    cinyoung committed Mar 11, 2014
    Configuration menu
    Copy the full SHA
    aca804c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://[email protected]/stash/scm… 

    …/mbee/util.git
    bclement authored and bclement committed Mar 11, 2014
    Configuration menu
    Copy the full SHA
    c6c70d9 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2014

  1. minor, commenting sub method

    Bradley J Clement authored and Bradley J Clement committed Mar 14, 2014
    Configuration menu
    Copy the full SHA
    9c01227 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://[email protected]/stash/scm… 

    …/mbee/util.git
    Bradley J Clement authored and Bradley J Clement committed Mar 14, 2014
    Configuration menu
    Copy the full SHA
    05282d6 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2014

  1. edits to number casting and added toMap()

    Bradley J Clement authored and Bradley J Clement committed Mar 28, 2014
    Configuration menu
    Copy the full SHA
    3b9bdad View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2014

  1. .gitignore file added

    @bradNASA
    bradNASA committed Apr 1, 2014
    Configuration menu
    Copy the full SHA
    31e75aa View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2014

  1. Added dominantTypeClass() method and moved dominantType() to this class.

    @gcgandhi
    gcgandhi committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    1922b1f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://[email protected]/stash/scm… 

    …/mbee/util.git
    @gcgandhi
    gcgandhi committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    2762679 View commit details
    Browse the repository at this point in the history

  3. Fixed dominantTypeClass()

    @gcgandhi
    gcgandhi committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    d3551e5 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2014

  1. minor, null checks; added jar to .gitignore

    @bradNASA
    bradNASA committed Apr 16, 2014
    Configuration menu
    Copy the full SHA
    a508e41 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2014

  1. changing target directory for copying jars to /src/main/amp/web/WEB-INF

    @bradNASA
    bradNASA committed Apr 23, 2014
    Configuration menu
    Copy the full SHA
    23386e4 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2014

  1. Added pom file for Maven builds on Jenkins

    cinyoung committed Apr 24, 2014
    Configuration menu
    Copy the full SHA
    e8a53eb View commit details
    Browse the repository at this point in the history

  2. handle case where toString() returns null

    @bradNASA
    bradNASA committed Apr 24, 2014
    Configuration menu
    Copy the full SHA
    7b36d1a View commit details
    Browse the repository at this point in the history

  3. Added the artifactory repository for distribution

    cinyoung committed Apr 24, 2014
    Configuration menu
    Copy the full SHA
    22768f5 View commit details
    Browse the repository at this point in the history

  4. fixed the groupid

    cinyoung committed Apr 24, 2014
    Configuration menu
    Copy the full SHA
    92da0c8 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2014

  1. added failonerror false to copy targets

    cinyoung committed Apr 25, 2014
    Configuration menu
    Copy the full SHA
    779c99f View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2014

  1. More updates for the demo.

    @gcgandhi
    gcgandhi committed Apr 29, 2014
    Configuration menu
    Copy the full SHA
    94ef328 View commit details
    Browse the repository at this point in the history

  2. adding string join for String array

    @bradNASA
    bradNASA committed Apr 29, 2014
    Configuration menu
    Copy the full SHA
    c7a56c6 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2014

  1. Merge branch 'master' of https://mbse.jpl.nasa.gov/stash/scm/mbee/util

    @bradNASA
    bradNASA committed Apr 30, 2014
    Configuration menu
    Copy the full SHA
    5890d0c View commit details
    Browse the repository at this point in the history

Commits on May 5, 2014

  1. Minor bug in whether to print errors for getField().

    @bradNASA
    bradNASA committed May 5, 2014
    Configuration menu
    Copy the full SHA
    4d4cc2a View commit details
    Browse the repository at this point in the history

Commits on May 6, 2014

  1. Merge pull request Open-MBEE#2 in MBEE/util from jenkins to master 

    # By cinyoung
# Via cinyoung
* commit '779c99f8c5092a9af190b1968efe4f4762b3e4c0':
  added failonerror false to copy targets
  fixed the groupid
  Added the artifactory repository for distribution
  Added pom file for Maven builds on Jenkins
    Bradley J Clement authored and Bradley J Clement committed May 6, 2014
    Configuration menu
    Copy the full SHA
    7d11ce2 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2014

  1. Updated version in pom.xml

    @gcgandhi
    gcgandhi committed May 7, 2014
    Configuration menu
    Copy the full SHA
    1f8bbb0 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2014

  1. Moving time utility code from bae project to util.TimeUtils

    @bradNASA
    bradNASA committed May 21, 2014
    Configuration menu
    Copy the full SHA
    76016b2 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2014

  1. adding toTimestamp(Date)

    @bradNASA
    bradNASA committed Jun 3, 2014
    Configuration menu
    Copy the full SHA
    9113580 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2014

  1. some new utility methods

    @bradNASA
    bradNASA committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    e90f883 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2014

  1. incrementing version in pom.xml

    @bradNASA
    bradNASA committed Jul 4, 2014
    Configuration menu
    Copy the full SHA
    eb6ec09 View commit details
    Browse the repository at this point in the history

  2. Merge pull request Open-MBEE#1 from mbee-dev/fix 

    Fix
    Bradley J Clement authored and Bradley J Clement committed Jul 4, 2014
    Configuration menu
    Copy the full SHA
    1bd069b View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2014

  1. minor fix in determining dominant type for binary operations

    @bradNASA
    bradNASA committed Jul 10, 2014
    Configuration menu
    Copy the full SHA
    7e4f7ab View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2014

  1. added set diff utility

    Bradley J Clement authored and Bradley J Clement committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    ed28964 View commit details
    Browse the repository at this point in the history

  2. fixed artifactory server

    @bradNASA
    bradNASA committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    da5a002 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2014

  1. added diff utilities

    Bradley J Clement authored and Bradley J Clement committed Aug 5, 2014
    Configuration menu
    Copy the full SHA
    9000a96 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2014

  1. more diff utilities

    Bradley J Clement authored and Bradley J Clement committed Aug 7, 2014
    Configuration menu
    Copy the full SHA
    6cc0c5c View commit details
    Browse the repository at this point in the history

  2. incrementing pom version

    Bradley J Clement authored and Bradley J Clement committed Aug 7, 2014
    Configuration menu
    Copy the full SHA
    2fc7cf6 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2014

  1. incrementing pom version to see if it fixes artifactory somehow

    Bradley J Clement authored and Bradley J Clement committed Aug 8, 2014
    Configuration menu
    Copy the full SHA
    351ffe4 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2014

  1. diff bug fixes

    Bradley J Clement authored and Bradley J Clement committed Aug 13, 2014
    Configuration menu
    Copy the full SHA
    2477a76 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2014

  1. adding option to ignore specified properties in diff

    Bradley J Clement authored and Bradley J Clement committed Aug 14, 2014
    Configuration menu
    Copy the full SHA
    64657fb View commit details
    Browse the repository at this point in the history

  2. incrementing pom version

    Bradley J Clement authored and Bradley J Clement committed Aug 14, 2014
    Configuration menu
    Copy the full SHA
    965329d View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2014

  1. fix to AsbtractDiff

    Bradley J Clement authored and Bradley J Clement committed Aug 18, 2014
    Configuration menu
    Copy the full SHA
    8268327 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2014

  1. including comparator for names of noderefs instead of noderefs which are 

    different for different versions
    Bradley J Clement authored and Bradley J Clement committed Aug 19, 2014
    Configuration menu
    Copy the full SHA
    4d79c86 View commit details
    Browse the repository at this point in the history

  2. adding object comparator to constructors in AbstractDiff

    Bradley J Clement authored and Bradley J Clement committed Aug 19, 2014
    Configuration menu
    Copy the full SHA
    7db2ec8 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2014

  1. minor bug fix

    @bradNASA
    bradNASA committed Sep 3, 2014
    Configuration menu
    Copy the full SHA
    4e9f7fd View commit details
    Browse the repository at this point in the history

  2. added more nested map get() and put() methods, also made them 

    LinkedHashMaps so that they need not be Comparable
    @bradNASA
    bradNASA committed Sep 3, 2014
    Configuration menu
    Copy the full SHA
    6cf5bfa View commit details
    Browse the repository at this point in the history

  3. Updates to Timer to add new methods and bug fix by Brad. Updated 

    versions in pom.xml.
    @gcgandhi
    gcgandhi committed Sep 3, 2014
    Configuration menu
    Copy the full SHA
    4cc7619 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2014

  1. Merge branch 'master' of 

    https://[email protected]/mbee-dev/util.git

Conflicts:
	src/gov/nasa/jpl/mbee/util/Timer.java
    @bradNASA
    bradNASA committed Sep 4, 2014
    Configuration menu
    Copy the full SHA
    fbc76b4 View commit details
    Browse the repository at this point in the history

  2. update version

    @bradNASA
    bradNASA committed Sep 4, 2014
    Configuration menu
    Copy the full SHA
    674e7d8 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2014

  1. new util fcn

    @bradNASA
    bradNASA committed Sep 9, 2014
    Configuration menu
    Copy the full SHA
    17aabfa View commit details
    Browse the repository at this point in the history

  2. incrementing pom version

    @bradNASA
    bradNASA committed Sep 9, 2014
    Configuration menu
    Copy the full SHA
    b7aa0ad View commit details
    Browse the repository at this point in the history

  3. removing debug print

    @bradNASA
    bradNASA committed Sep 9, 2014
    Configuration menu
    Copy the full SHA
    0452c45 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2014

  1. pom updated with SNAPSHOTs

    cinyoung committed Sep 15, 2014
    Configuration menu
    Copy the full SHA
    341d908 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2014

  1. Merge pull request Open-MBEE#2 from mbee-dev/pomUpdate 

    pom updated with SNAPSHOTs
    Cin-Young Lee committed Sep 16, 2014
    Configuration menu
    Copy the full SHA
    35db552 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2014

  1. added reset() to random number generator to support deterministic 

    results
    @bradNASA
    bradNASA committed Oct 10, 2014
    Configuration menu
    Copy the full SHA
    164ce8f View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2014

  1. just changing file to try and fix build

    @bradNASA
    bradNASA committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    bebd58a View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2014

  1. adding source to jars

    @bradNASA
    bradNASA committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    b43bfcc View commit details
    Browse the repository at this point in the history

  2. adding source to jars (fix)

    @bradNASA
    bradNASA committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    97cbdf9 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2015

  1. Merge branch '2.1' of https://github.com/Open-MBEE/util into 2.1 

    Conflicts:
	build.xml
	src/gov/nasa/jpl/mbee/util/AbstractDiff.java
	src/gov/nasa/jpl/mbee/util/ClassUtils.java
	src/gov/nasa/jpl/mbee/util/Debug.java
	src/gov/nasa/jpl/mbee/util/HasId.java
	src/gov/nasa/jpl/mbee/util/Utils.java
    Greg Green committed May 14, 2015
    Configuration menu
    Copy the full SHA
    d262d98 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2015

  1. Added source and target java version, added packaging type

    Greg Green committed May 18, 2015
    Configuration menu
    Copy the full SHA
    d46358f View commit details
    Browse the repository at this point in the history

Commits on May 20, 2015

  1. Changed verbose compilation to false

    Greg Green committed May 20, 2015
    Configuration menu
    Copy the full SHA
    c316ea5 View commit details
    Browse the repository at this point in the history