Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Intellij Community
Commits
c4034efe
Commit
c4034efe
authored
7 years ago
by
Gregory.Shrago
1
Browse files
Options
Download
Email Patches
Plain Diff
PlatformUtils.isDatabaseIDE renamed to isDataGrip
parent
444908e4
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
platform/core-api/src/com/intellij/util/PlatformUtils.java
+1
-1
platform/core-api/src/com/intellij/util/PlatformUtils.java
platform/lang-impl/src/com/intellij/find/impl/FindSettingsImpl.java
+1
-1
...ang-impl/src/com/intellij/find/impl/FindSettingsImpl.java
platform/lang-impl/src/com/intellij/ide/scratch/ScratchProjectViewPane.java
+1
-1
.../src/com/intellij/ide/scratch/ScratchProjectViewPane.java
platform/platform-api/src/com/intellij/ide/GeneralSettings.java
+1
-1
...rm/platform-api/src/com/intellij/ide/GeneralSettings.java
platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java
+1
-1
...mpl/src/com/intellij/ide/GeneralSettingsConfigurable.java
platform/platform-impl/src/com/intellij/idea/SocketLock.java
+5
-2
platform/platform-impl/src/com/intellij/idea/SocketLock.java
platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java
+1
-1
.../intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java
with
11 additions
and
8 deletions
+11
-8
platform/core-api/src/com/intellij/util/PlatformUtils.java
+
1
-
1
View file @
c4034efe
...
...
@@ -109,7 +109,7 @@ public class PlatformUtils {
return
is
(
WEB_PREFIX
);
}
public
static
boolean
isData
baseIDE
()
{
public
static
boolean
isData
Grip
()
{
return
is
(
DBE_PREFIX
);
}
...
...
This diff is collapsed.
Click to expand it.
platform/lang-impl/src/com/intellij/find/impl/FindSettingsImpl.java
+
1
-
1
View file @
c4034efe
...
...
@@ -55,7 +55,7 @@ public class FindSettingsImpl extends FindSettings implements PersistentStateCom
else
if
(
PlatformUtils
.
isPhpStorm
())
{
recentFileMasks
.
add
(
"*.php"
);
}
else
if
(
PlatformUtils
.
isData
baseIDE
())
{
else
if
(
PlatformUtils
.
isData
Grip
())
{
recentFileMasks
.
add
(
"*.sql"
);
}
}
...
...
This diff is collapsed.
Click to expand it.
platform/lang-impl/src/com/intellij/ide/scratch/ScratchProjectViewPane.java
+
1
-
1
View file @
c4034efe
...
...
@@ -62,7 +62,7 @@ public class ScratchProjectViewPane extends ProjectViewPane {
public
static
final
String
ID
=
"Scratches"
;
public
static
boolean
isScratchesMergedIntoProjectTab
()
{
return
(
Registry
.
is
(
"ide.scratch.in.project.view"
)
||
PlatformUtils
.
isData
baseIDE
())
&&
return
(
Registry
.
is
(
"ide.scratch.in.project.view"
)
||
PlatformUtils
.
isData
Grip
())
&&
!
ApplicationManager
.
getApplication
().
isUnitTestMode
();
}
...
...
This diff is collapsed.
Click to expand it.
platform/platform-api/src/com/intellij/ide/GeneralSettings.java
+
1
-
1
View file @
c4034efe
...
...
@@ -48,7 +48,7 @@ public class GeneralSettings implements PersistentStateComponent<GeneralSettings
private
boolean
myUseDefaultBrowser
=
true
;
private
boolean
mySearchInBackground
;
private
boolean
myConfirmExit
=
true
;
private
boolean
myShowWelcomeScreen
=
!
PlatformUtils
.
isData
baseIDE
();
private
boolean
myShowWelcomeScreen
=
!
PlatformUtils
.
isData
Grip
();
private
int
myConfirmOpenNewProject
=
OPEN_PROJECT_ASK
;
private
ProcessCloseConfirmation
myProcessCloseConfirmation
=
ProcessCloseConfirmation
.
ASK
;
private
String
myDefaultProjectDirectory
=
""
;
...
...
This diff is collapsed.
Click to expand it.
platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java
+
1
-
1
View file @
c4034efe
...
...
@@ -125,7 +125,7 @@ public class GeneralSettingsConfigurable extends CompositeConfigurable<Searchabl
if
(
myComponent
==
null
)
{
myComponent
=
new
MyComponent
();
}
myComponent
.
myShowWelcomeScreen
.
setVisible
(
PlatformUtils
.
isData
baseIDE
());
myComponent
.
myShowWelcomeScreen
.
setVisible
(
PlatformUtils
.
isData
Grip
());
myComponent
.
myChkAutoSaveIfInactive
.
addChangeListener
(
e
->
myComponent
.
myTfInactiveTimeout
.
setEditable
(
myComponent
.
myChkAutoSaveIfInactive
.
isSelected
()));
...
...
This diff is collapsed.
Click to expand it.
platform/platform-impl/src/com/intellij/idea/SocketLock.java
+
5
-
2
View file @
c4034efe
...
...
@@ -27,7 +27,10 @@ import org.jetbrains.annotations.Nullable;
import
org.jetbrains.io.BuiltInServer
;
import
org.jetbrains.io.MessageDecoder
;
import
java.io.*
;
import
java.io.DataInputStream
;
import
java.io.DataOutputStream
;
import
java.io.File
;
import
java.io.IOException
;
import
java.lang.management.ManagementFactory
;
import
java.net.ConnectException
;
import
java.net.InetAddress
;
...
...
@@ -142,7 +145,7 @@ public final class SocketLock {
myToken
=
UUID
.
randomUUID
().
toString
();
String
[]
lockedPaths
=
{
myConfigPath
,
mySystemPath
};
int
workerCount
=
PlatformUtils
.
isIdeaCommunity
()
||
PlatformUtils
.
isData
baseIDE
()
||
PlatformUtils
.
isCidr
()
?
1
:
2
;
int
workerCount
=
PlatformUtils
.
isIdeaCommunity
()
||
PlatformUtils
.
isData
Grip
()
||
PlatformUtils
.
isCidr
()
?
1
:
2
;
NotNullProducer
<
ChannelHandler
>
handler
=
()
->
new
MyChannelInboundHandler
(
lockedPaths
,
myActivateListener
,
myToken
);
myServer
=
BuiltInServer
.
startNioOrOio
(
workerCount
,
6942
,
50
,
false
,
handler
);
...
...
This diff is collapsed.
Click to expand it.
platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java
+
1
-
1
View file @
c4034efe
...
...
@@ -303,7 +303,7 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements Persistent
registerFileTypeWithoutNotification
(
pair
.
fileType
,
pair
.
matchers
,
true
);
}
if
(
PlatformUtils
.
isData
baseIDE
()
||
PlatformUtils
.
isCidr
())
{
if
(
PlatformUtils
.
isData
Grip
()
||
PlatformUtils
.
isCidr
())
{
// build scripts are correct, but it is required to run from sources
return
;
}
...
...
This diff is collapsed.
Click to expand it.
小 白蛋
@baidan
mentioned in commit
d512b82d
·
2 years ago
mentioned in commit
d512b82d
mentioned in commit d512b82d785ba2abf26fbbbf4a2350c9d23e6d97
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help