diff --git a/designer_base/src/com/fr/design/hyperlink/AbstractHyperlinkPane.java b/designer_base/src/com/fr/design/hyperlink/AbstractHyperlinkPane.java index 6a236a4e3..8a2773f58 100644 --- a/designer_base/src/com/fr/design/hyperlink/AbstractHyperlinkPane.java +++ b/designer_base/src/com/fr/design/hyperlink/AbstractHyperlinkPane.java @@ -127,7 +127,7 @@ public abstract class AbstractHyperlinkPane extends BasicBe public void updateBean(T link) { updateSubHyperlinkBean(link); - link.setTargetFrame(HyperlinkTargetFrame.getName(targetFrameComboBox.getSelectedIndex())); + link.setTargetFrame(HyperlinkTargetFrame.parse(targetFrameComboBox.getSelectedIndex()).getName()); link.setHeight(Utils.objectToNumber(heightTextFiled.getText(), false).intValue()); link.setWidth(Utils.objectToNumber(widthTextFiled.getText(), false).intValue()); } diff --git a/designer_base/src/com/fr/design/hyperlink/HyperlinkTargetFrame.java b/designer_base/src/com/fr/design/hyperlink/HyperlinkTargetFrame.java index 56d590f03..80e9f21a0 100644 --- a/designer_base/src/com/fr/design/hyperlink/HyperlinkTargetFrame.java +++ b/designer_base/src/com/fr/design/hyperlink/HyperlinkTargetFrame.java @@ -8,22 +8,26 @@ public enum HyperlinkTargetFrame { private String name; private int index; - + private static HyperlinkTargetFrame[] arrayOfValues; HyperlinkTargetFrame(String name, int index) { this.name = name; this.index = index; } - public static String getName(int index) { + public static HyperlinkTargetFrame parse(int index) { + if (arrayOfValues == null) { + arrayOfValues = HyperlinkTargetFrame.values(); + } for (HyperlinkTargetFrame hyperlinkTargetFrame : HyperlinkTargetFrame.values()) { if (hyperlinkTargetFrame.getIndex() == index) { - return hyperlinkTargetFrame.name; + return hyperlinkTargetFrame; } } - return null; + return BLANK_FRAME; } + public int getIndex() { return index; }