diff options
author | Jerome Gaillard <jgaillard@google.com> | 2015-08-03 17:54:48 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-08-03 17:54:48 +0000 |
commit | 60784273497a9e9a7f2817fcf527ef878eda129c (patch) | |
tree | df98962a59cc7b5a067e4d0cf1213c48607b62d6 /android | |
parent | 7eb0a9661a0ba96f44b096d9d8dc96f4d92ad6bc (diff) | |
parent | 7e373bbbe1c40faf3004dfa88442f535efaaaf1b (diff) | |
download | idea-60784273497a9e9a7f2817fcf527ef878eda129c.tar.gz |
Merge "Comments about invokeLater and code cleaning" into studio-1.4-dev automerge: 405f653
automerge: 7e373bb
* commit '7e373bbbe1c40faf3004dfa88442f535efaaaf1b':
Comments about invokeLater and code cleaning
Diffstat (limited to 'android')
-rw-r--r-- | android/src/com/android/tools/idea/editors/theme/ThemeEditorComponent.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/android/src/com/android/tools/idea/editors/theme/ThemeEditorComponent.java b/android/src/com/android/tools/idea/editors/theme/ThemeEditorComponent.java index 053c3a6a6a2..d62a724e42e 100644 --- a/android/src/com/android/tools/idea/editors/theme/ThemeEditorComponent.java +++ b/android/src/com/android/tools/idea/editors/theme/ThemeEditorComponent.java @@ -166,7 +166,6 @@ public class ThemeEditorComponent extends Splitter { private final ResourceChangeListener myResourceChangeListener; private boolean myIsSubscribedResourceNotification; - private final GoToListener myGoToListener; private MutableCollectionComboBoxModel<Module> myModuleComboModel; /** Next pending search. The {@link ScheduledFuture} allows us to cancel the next search before it runs. */ @@ -224,7 +223,7 @@ public class ThemeEditorComponent extends Splitter { myPreviewPanel.setMaximumSize(new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE)); ResourcesCompletionProvider completionProvider = new ResourcesCompletionProvider(myThemeEditorContext); - myGoToListener = new GoToListener() { + GoToListener goToListener = new GoToListener() { @Override public void goTo(@NotNull EditedStyleItem value) { ResourceResolver resolver = myThemeEditorContext.getResourceResolver(); @@ -251,7 +250,7 @@ public class ThemeEditorComponent extends Splitter { ThemeEditorComponent.this.goToParent(); } }; - myAttributesTable.setGoToListener(myGoToListener); + myAttributesTable.setGoToListener(goToListener); final AttributeReferenceRendererEditor styleEditor = new AttributeReferenceRendererEditor(project, completionProvider); final JScrollPane scroll = myPanel.getAttributesScrollPane(); @@ -582,9 +581,8 @@ public class ThemeEditorComponent extends Splitter { renameDialog.show(); if (renameDialog.isOK()) { String newName = renameDialog.getNewName(); - String newQualifiedName = selectedTheme.getQualifiedName().replace(selectedTheme.getName(), newName); // We don't need to call reload here, because myResourceChangeListener will take care of it - myThemeName = newQualifiedName; + myThemeName = selectedTheme.getQualifiedName().replace(selectedTheme.getName(), newName); mySubStyleName = null; return true; } @@ -675,6 +673,7 @@ public class ThemeEditorComponent extends Splitter { return; } + // Need invokeLater to wait for the theme resolver to be aware of the newly created style through the resource change listener ApplicationManager.getApplication().invokeLater(new Runnable() { @Override public void run() { @@ -719,6 +718,8 @@ public class ThemeEditorComponent extends Splitter { // We don't need to call reload, because myResourceChangeListener will take care of it myThemeName = newThemeName; mySubStyleName = newStyleName; + + // Need invokeLater to wait for the theme resolver to be aware of the newly created theme through the resource change listener ApplicationManager.getApplication().invokeLater(new Runnable() { @Override public void run() { |