You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/06/09 22:37:45 UTC
incubator-geode git commit: GEODE-1516: update Eclipse and IntelliJ
handling of imports
Repository: incubator-geode
Updated Branches:
refs/heads/develop 4bb9baee6 -> 94a4b4a52
GEODE-1516: update Eclipse and IntelliJ handling of imports
* add etc/eclipseOrganizeImports.importorder because Eclipse uses two different config files
** eclipseFormatterProfile.xml is used for Java | Code Style | Formatter
** eclipseOrganizeImports.importorder is used for Java | Code Style | Organize Imports
* update intellijIdeaCodeStyle.xml to match the best common denominator between IntelliJ and Eclipse so that both import organizers will produce exact same results
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/94a4b4a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/94a4b4a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/94a4b4a5
Branch: refs/heads/develop
Commit: 94a4b4a52ee5a762f1fe22773f67be09eea43950
Parents: 4bb9bae
Author: Kirk Lund <kl...@pivotal.io>
Authored: Thu Jun 9 15:33:44 2016 -0700
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Thu Jun 9 15:37:51 2016 -0700
----------------------------------------------------------------------
etc/eclipseOrganizeImports.importorder | 7 +++++++
etc/intellijIdeaCodeStyle.xml | 9 +--------
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/94a4b4a5/etc/eclipseOrganizeImports.importorder
----------------------------------------------------------------------
diff --git a/etc/eclipseOrganizeImports.importorder b/etc/eclipseOrganizeImports.importorder
new file mode 100644
index 0000000..01999e8
--- /dev/null
+++ b/etc/eclipseOrganizeImports.importorder
@@ -0,0 +1,7 @@
+#Organize Import Order
+#Thu Jun 09 15:31:09 PDT 2016
+4=com.gemstone
+3=
+2=javax
+1=java
+0=\#
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/94a4b4a5/etc/intellijIdeaCodeStyle.xml
----------------------------------------------------------------------
diff --git a/etc/intellijIdeaCodeStyle.xml b/etc/intellijIdeaCodeStyle.xml
index a6d1f25..0c3a6d70 100755
--- a/etc/intellijIdeaCodeStyle.xml
+++ b/etc/intellijIdeaCodeStyle.xml
@@ -25,19 +25,12 @@
<package name="" withSubpackages="true" static="true" />
<emptyLine />
<package name="java" withSubpackages="true" static="false" />
+ <emptyLine />
<package name="javax" withSubpackages="true" static="false" />
<emptyLine />
<package name="" withSubpackages="true" static="false" />
<emptyLine />
- <package name="batterytest" withSubpackages="true" static="false" />
- <package name="cacheRunner" withSubpackages="true" static="false" />
- <package name="hydra" withSubpackages="true" static="false" />
- <package name="parReg" withSubpackages="true" static="false" />
- <package name="perffmwk" withSubpackages="true" static="false" />
- <emptyLine />
<package name="com.gemstone" withSubpackages="true" static="false" />
- <package name="com.vmware.gemfire" withSubpackages="true" static="false" />
- <package name="io.pivotal.geode" withSubpackages="true" static="false" />
</value>
</option>
<option name="JD_ALIGN_PARAM_COMMENTS" value="false" />