[seam-commits] [forge/core] 3f4089: FORGE-541

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/forge/core
  Commit: 3f4089cac71fbe5fdb880b0763b03eb790a29efc
      https://github.com/forge/core/commit/3f4089cac71fbe5fdb880b0763b03eb790a29efc
  Author: George Gastaldi <gegastaldi at gmail.com>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

  Changed paths:
    A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/BundleCompleter.java
    A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/I18nPlugin.java
    A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/LsBundlePlugin.java
    A dev-plugins/src/test/java/org/jboss/forge/dev/i18n/I18nPluginTest.java
    A shell-api/src/main/java/org/jboss/forge/resources/EntryResource.java
    A shell-api/src/main/java/org/jboss/forge/resources/PropertiesFileResource.java
    M shell-api/src/main/java/org/jboss/forge/shell/util/Streams.java
    M shell/src/main/java/org/jboss/forge/shell/completer/OptionAwareCompletionHandler.java
    M shell/src/main/java/org/jboss/forge/shell/console/jline/console/ConsoleReader.java
    A shell/src/main/resources/org/jboss/forge/shell/console/jline/console/completer/CandidateListCompletionHandler.properties
    R shell/src/main/resources/org/jboss/forge/shell/console/jline/console/completer/CandidateListCompletionHandlerBundle.properties

  Log Message:
  -----------
  FORGE-541


  Commit: 65aad7e1fdf3cf09b26cf3dabc47b66feef6d97b
      https://github.com/forge/core/commit/65aad7e1fdf3cf09b26cf3dabc47b66feef6d97b
  Author: George Gastaldi <gegastaldi at gmail.com>
  Date:   2012-04-19 (Thu, 19 Apr 2012)

  Changed paths:
    M shell/src/main/java/org/jboss/forge/shell/completer/OptionAwareCompletionHandler.java
    M shell/src/test/java/org/jboss/forge/shell/test/completer/OptionAwareCompletionHandlerTest.java

  Log Message:
  -----------
  Resolved conflict in pull request #145


  Commit: e3ee8ad79996426da71d5ac546b0a0b586dd5b44
      https://github.com/forge/core/commit/e3ee8ad79996426da71d5ac546b0a0b586dd5b44
  Author: Lincoln Baxter, III <lincolnbaxter at gmail.com>
  Date:   2012-04-19 (Thu, 19 Apr 2012)

  Changed paths:
    A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/BundleCompleter.java
    A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/I18nPlugin.java
    A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/LsBundlePlugin.java
    A dev-plugins/src/test/java/org/jboss/forge/dev/i18n/I18nPluginTest.java
    A shell-api/src/main/java/org/jboss/forge/resources/EntryResource.java
    A shell-api/src/main/java/org/jboss/forge/resources/PropertiesFileResource.java
    M shell-api/src/main/java/org/jboss/forge/shell/util/Streams.java
    M shell/src/main/java/org/jboss/forge/shell/completer/OptionAwareCompletionHandler.java
    M shell/src/main/java/org/jboss/forge/shell/console/jline/console/ConsoleReader.java
    A shell/src/main/resources/org/jboss/forge/shell/console/jline/console/completer/CandidateListCompletionHandler.properties
    R shell/src/main/resources/org/jboss/forge/shell/console/jline/console/completer/CandidateListCompletionHandlerBundle.properties

  Log Message:
  -----------
  Merge pull request #143 from gastaldi/feature/FORGE-541

FORGE-541


Compare: https://github.com/forge/core/compare/0713b50...e3ee8ad