From 6bcc98c072317df55cb1a94f5e144b63adca8e5e Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 21 Jun 2006 22:42:12 +0400 Subject: [PATCH] fix repeated instrumentation --- .../src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java | 3 ++- .../com/intellij/uiDesigner/compiler/StringPropertyCodeGenerator.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java b/UIDesignerCore/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java index c52fec8d0e..9ba226a685 100644 --- a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java +++ b/UIDesignerCore/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java @@ -241,7 +241,8 @@ public class AsmCodeGenerator { final String signature, final String[] exceptions) { - if (name.equals(SETUP_METHOD_NAME) || name.equals(GET_ROOT_COMPONENT_METHOD_NAME)) { + if (name.equals(SETUP_METHOD_NAME) || name.equals(GET_ROOT_COMPONENT_METHOD_NAME) || + name.equals(LOAD_BUTTON_TEXT_METHOD) || name.equals(LOAD_LABEL_TEXT_METHOD)) { return null; } if (name.equals(CREATE_COMPONENTS_METHOD_NAME) && desc.equals("()V")) { diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/StringPropertyCodeGenerator.java b/UIDesignerCore/src/com/intellij/uiDesigner/compiler/StringPropertyCodeGenerator.java index 74930a36ca..ce7c0515ea 100644 --- a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/StringPropertyCodeGenerator.java +++ b/UIDesignerCore/src/com/intellij/uiDesigner/compiler/StringPropertyCodeGenerator.java @@ -126,10 +126,10 @@ public class StringPropertyCodeGenerator extends PropertyCodeGenerator implement public void generateClassEnd(ClassVisitor visitor) { if (myNeedLoadLabelText) { - generateLoadTextMethod(visitor, "$$$loadLabelText$$$", "javax/swing/JLabel", "setDisplayedMnemonic"); + generateLoadTextMethod(visitor, AsmCodeGenerator.LOAD_LABEL_TEXT_METHOD, "javax/swing/JLabel", "setDisplayedMnemonic"); } if (myNeedLoadButtonText) { - generateLoadTextMethod(visitor, "$$$loadButtonText$$$", "javax/swing/AbstractButton", "setMnemonic"); + generateLoadTextMethod(visitor, AsmCodeGenerator.LOAD_BUTTON_TEXT_METHOD, "javax/swing/AbstractButton", "setMnemonic"); } } -- 2.11.4.GIT