Repository: incubator-systemml Updated Branches: refs/heads/gh-pages 8b4c2b7a8 -> c067a5858
[SYSTEMML-1629] Code format for IntelliJ Add code style file for IntelliJ so that annotation formatting can be handled in a similar fashion for both Eclipse and IntelliJ. Closes #515. Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/b31ebbfd Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/b31ebbfd Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/b31ebbfd Branch: refs/heads/gh-pages Commit: b31ebbfdf9d727304a240c99c4566397a2edfaa6 Parents: 8b4c2b7 Author: Deron Eriksson <de...@us.ibm.com> Authored: Thu May 25 22:09:21 2017 -0700 Committer: Deron Eriksson <de...@us.ibm.com> Committed: Thu May 25 22:09:21 2017 -0700 ---------------------------------------------------------------------- contributing-to-systemml.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b31ebbfd/contributing-to-systemml.md ---------------------------------------------------------------------- diff --git a/contributing-to-systemml.md b/contributing-to-systemml.md index 5e36267..b7d1d98 100644 --- a/contributing-to-systemml.md +++ b/contributing-to-systemml.md @@ -209,8 +209,9 @@ branch and perform the `subtree` command again. ### Java Code Format Java in SystemML should be formatted using a standard format. The "SystemML Format" at -`dev/code-style/systemml-style.xml` can be imported into Eclipse and IntelliJ for this -purpose. +`dev/code-style/systemml-style-eclipse.xml` can be imported into Eclipse and +`dev/code-style/systemml-style-intellij.xml` can be imported into IntelliJ +for this purpose. No trailing whitespace is preferred. IDEs such as Eclipse and IntelliJ can be configured for this option.
