MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix after merge

Browse Source
This commit is contained in:
Vladimir Krivosheev
2016-09-07 08:06:57 +02:00
parent aebe2fdfc5
commit 6df5ba3fcb
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/codeStyleSettings.xml
Generated
+9
View File
@@ -32,6 +32,15 @@
<option name="FORMATTER_TAGS_ENABLED" value="true" />
<option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
<option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
<JetCodeStyleSettings>
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
<value>
<package name="java.util" withSubpackages="false" static="false" />
<package name="com.intellij.ui.layout" withSubpackages="true" static="false" />
<package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
</value>
</option>
</JetCodeStyleSettings>
<XML>
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
</XML>
platform/platform-impl/src/com/intellij/diagnostic/JetBrainsAccountDialog.kt
+2 -2
View File
@@ -19,14 +19,14 @@ import com.intellij.credentialStore.CredentialAttributes
import com.intellij.credentialStore.Credentials
import com.intellij.ide.BrowserUtil
import com.intellij.ide.passwordSafe.PasswordSafe
import com.intellij.layout.*
import com.intellij.layout.LCFlags.*
import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.DialogBuilder
import com.intellij.openapi.ui.DialogWrapper
import com.intellij.openapi.ui.dialog
import com.intellij.openapi.util.text.StringUtil
import com.intellij.ui.ClickListener
import com.intellij.ui.layout.*
import com.intellij.ui.layout.LCFlags.*
import com.intellij.util.net.HttpConfigurable
import java.awt.Component
import java.awt.Cursor