diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
| commit | b5fb31ef6a38f19404859755dbd2e345215b97bf (patch) | |
| tree | e8787c45e494dfcc558faf0f75956f8785c39b94 /plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditor.java | |
| parent | e222a9e1e66670a56e926a6b0f3e10231eeeb1fb (diff) | |
| parent | e782c57d74000722f9db4c9426317410520670c6 (diff) | |
| download | idea-b5fb31ef6a38f19404859755dbd2e345215b97bf.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/libraries/asm_tools.xml
.idea/libraries/bouncy_castle.xml
.idea/libraries/builder_model.xml
.idea/libraries/commons_compress.xml
.idea/libraries/easymock_tools.xml
.idea/libraries/freemarker_2_3_20.xml
.idea/libraries/guava_tools.xml
.idea/libraries/kxml2.xml
.idea/libraries/lombok_ast.xml
.idea/libraries/mockito.xml
.idea/modules.xml
.idea/vcs.xml
build/scripts/layouts.gant
updater/src/com/intellij/updater/Runner.java
Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12
Diffstat (limited to 'plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditor.java')
| -rw-r--r-- | plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditor.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditor.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditor.java index 99a6bbc82fcf..2f22910f08af 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditor.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditor.java @@ -26,9 +26,9 @@ import com.intellij.ui.DocumentAdapter; import com.intellij.uiDesigner.UIDesignerBundle; import com.intellij.uiDesigner.designSurface.GuiEditor; import com.intellij.uiDesigner.lw.StringDescriptor; -import com.intellij.uiDesigner.propertyInspector.PropertyEditor; -import com.intellij.uiDesigner.propertyInspector.UIDesignerToolWindowManager; +import com.intellij.uiDesigner.propertyInspector.DesignerToolWindowManager; import com.intellij.uiDesigner.propertyInspector.InplaceContext; +import com.intellij.uiDesigner.propertyInspector.PropertyEditor; import com.intellij.uiDesigner.propertyInspector.properties.IntroStringProperty; import com.intellij.uiDesigner.radComponents.RadComponent; import com.intellij.util.ui.UIUtil; @@ -170,7 +170,7 @@ public final class StringEditor extends PropertyEditor<StringDescriptor> { public void actionPerformed(final ActionEvent e) { // 1. Show editor dialog - final GuiEditor guiEditor = UIDesignerToolWindowManager.getInstance(myProject).getActiveFormEditor(); + final GuiEditor guiEditor = DesignerToolWindowManager.getInstance(myProject).getActiveFormEditor(); LOG.assertTrue(guiEditor != null); final StringEditorDialog dialog = new StringEditorDialog( |