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
a3b6c590
Commit
a3b6c590
authored
7 years ago
by
Denis Fokin
Browse files
Options
Download
Email Patches
Plain Diff
testDontHideFloatingAndWindowedToolWindows test fix
parent
35df44f4
Branches unavailable
Tags unavailable
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
platform/platform-impl/src/com/intellij/internal/validation/MacMessagesTest.java
+3
-2
...src/com/intellij/internal/validation/MacMessagesTest.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java
+2
-2
...pl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java
with
5 additions
and
4 deletions
+5
-4
platform/platform-impl/src/com/intellij/internal/validation/MacMessagesTest.java
+
3
-
2
View file @
a3b6c590
...
...
@@ -26,6 +26,7 @@ import com.intellij.openapi.project.Project;
import
com.intellij.openapi.ui.DialogWrapper
;
import
com.intellij.openapi.ui.Messages
;
import
com.intellij.openapi.wm.impl.FocusManagerImpl
;
import
com.intellij.openapi.wm.impl.IdeFocusManagerImpl
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.annotations.Nullable
;
...
...
@@ -81,7 +82,7 @@ public class MacMessagesTest extends AnAction {
JButton
showDialogWrapperButton
=
new
JButton
(
"Show a dialog wrapper"
);
showDialogWrapperButton
.
setFocusable
(
false
);
FocusManagerImpl
fmi
=
FocusManagerImpl
.
getInstance
();
FocusManagerImpl
fmi
=
(
FocusManagerImpl
)
FocusManagerImpl
.
getInstance
();
final
Project
p
=
fmi
.
getLastFocusedFrame
().
getProject
();
showDialogWrapperButton
.
addActionListener
(
new
ActionListener
()
{
...
...
@@ -112,7 +113,7 @@ public class MacMessagesTest extends AnAction {
final
Task
task
=
new
Task
.
Modal
(
null
,
"Test task"
,
true
)
{
public
void
run
(
@NotNull
final
ProgressIndicator
indicator
)
{
ApplicationManager
.
getApplication
().
invokeAndWait
(()
->
{
FocusManagerImpl
fmi1
=
FocusManagerImpl
.
getInstance
();
FocusManagerImpl
fmi1
=
(
FocusManagerImpl
)
FocusManagerImpl
.
getInstance
();
final
Project
p1
=
fmi1
.
getLastFocusedFrame
().
getProject
();
showTestMessage
(
p1
);
},
ModalityState
.
any
());
...
...
This diff is collapsed.
Click to expand it.
platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java
+
2
-
2
View file @
a3b6c590
...
...
@@ -165,8 +165,8 @@ public class FocusManagerImpl extends IdeFocusManager implements Disposable {
}
}
public
static
FocusManager
Impl
getInstance
()
{
return
(
FocusManagerImpl
)
ApplicationManager
.
getApplication
().
getComponent
(
IdeFocusManager
.
class
);
public
static
Ide
FocusManager
getInstance
()
{
return
ApplicationManager
.
getApplication
().
getComponent
(
IdeFocusManager
.
class
);
}
@Override
...
...
This diff is collapsed.
Click to expand it.
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