You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ko...@apache.org on 2022/10/28 05:43:42 UTC
[ignite-3] branch main updated: IGNITE-18002 Revert accident changes to project files (#1264)
This is an automated email from the ASF dual-hosted git repository.
korlov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 8277b1ad4c IGNITE-18002 Revert accident changes to project files (#1264)
8277b1ad4c is described below
commit 8277b1ad4c67b8244179fb73ee0c6a37cc488a9b
Author: korlov42 <ko...@gridgain.com>
AuthorDate: Fri Oct 28 08:43:36 2022 +0300
IGNITE-18002 Revert accident changes to project files (#1264)
---
.idea/codeStyles/Project.xml | 12 ++++++++++++
.idea/codeStyles/codeStyleConfig.xml | 1 -
.idea/inspectionProfiles/Project_Default.xml | 2 --
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 29cbc39498..1350e743fd 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -5,6 +5,11 @@
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="4" />
<option name="TAB_SIZE" value="2" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
</value>
</option>
<option name="RIGHT_MARGIN" value="140" />
@@ -29,6 +34,11 @@
<option name="DOWHILE_BRACE_FORCE" value="3" />
<option name="WHILE_BRACE_FORCE" value="3" />
<option name="FOR_BRACE_FORCE" value="3" />
+ <option name="DO_NOT_FORMAT">
+ <list>
+ <fileSet type="globPattern" pattern="modules/raft/src/main/java/org/apache/ignite/raft/jraft/**" />
+ </list>
+ </option>
<AndroidXmlCodeStyleSettings>
<option name="USE_CUSTOM_SETTINGS" value="true" />
<option name="LAYOUT_SETTINGS">
@@ -223,8 +233,10 @@
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="Python">
+ <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
<option name="RIGHT_MARGIN" value="80" />
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+ <option name="PARENT_SETTINGS_INSTALLED" value="true" />
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="4" />
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index 3c617fb8f5..79ee123c2b 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,6 +1,5 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
- <option name="PREFERRED_PROJECT_CODE_STYLE" value="GoogleStyle" />
</state>
</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 9a0567f2cc..a77fb48328 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -12,8 +12,6 @@
<inspection_tool class="AccessToStaticFieldLockedOnInstance" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoredClasses">
<set>
- <option value="java.util.function.Supplier" />
- <option value="org.apache.ignite.internal.logger.IgniteLogger" />
<option value="org.apache.ignite.lang.ByteArray" />
<option value="org.apache.ignite.internal.logger.IgniteLogger" />
</set>