From b12e44fe00403fc1b98eebec47a8c54d6e2a8a13 Mon Sep 17 00:00:00 2001
From: Philippe Charles <philippe.charles@nbb.be>
Date: Tue, 3 Jan 2017 14:43:17 +0100
Subject: [PATCH] Fix item selection in enum property editor.

---
 .../editor/EnumerationPropertyEditor.java     | 108 +++++++++---------
 1 file changed, 51 insertions(+), 57 deletions(-)

diff --git a/src/main/java/com/l2fprod/common/beans/editor/EnumerationPropertyEditor.java b/src/main/java/com/l2fprod/common/beans/editor/EnumerationPropertyEditor.java
index a8d9203..b6ac493 100644
--- a/src/main/java/com/l2fprod/common/beans/editor/EnumerationPropertyEditor.java
+++ b/src/main/java/com/l2fprod/common/beans/editor/EnumerationPropertyEditor.java
@@ -1,57 +1,51 @@
-/*
- * Copyright 2015 Matthew Aguirre
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.l2fprod.common.beans.editor;
-
-import com.l2fprod.common.annotations.EditorRegistry;
-import javax.swing.JComboBox;
-
-/**
- *
- * @author matta
- */
-@EditorRegistry(type = Enum.class)
-public class EnumerationPropertyEditor extends ComboBoxPropertyEditor {
-
-    private Class<?> baseType;
-
-    public EnumerationPropertyEditor() {
-        super();
-
-    }
-
-    @Override
-    public Object getValue() {
-        JComboBox e = (JComboBox) editor;
-        return e.getSelectedItem();
-    }
-
-    @Override
-    public void setValue(Object value) {
-        if (this.baseType == null) {
-            this.baseType = value.getClass();
-            setAvailableValues(baseType.getEnumConstants());
-        }
-
-        JComboBox e = (JComboBox) editor;
-
-        for (int ii = 0; ii < e.getItemCount(); ii++) {
-            if (value != null && e.getItemAt(ii).equals(value.getClass().getCanonicalName())) {
-                e.setSelectedIndex(ii);
-                break;
-            }
-        }
-    }
-}
+/*
+ * Copyright 2015 Matthew Aguirre
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.l2fprod.common.beans.editor;
+
+import com.l2fprod.common.annotations.EditorRegistry;
+import javax.swing.JComboBox;
+
+/**
+ *
+ * @author matta
+ */
+@EditorRegistry(type = Enum.class)
+public class EnumerationPropertyEditor extends ComboBoxPropertyEditor {
+
+    private Class<?> baseType;
+
+    public EnumerationPropertyEditor() {
+        super();
+
+    }
+
+    @Override
+    public Object getValue() {
+        JComboBox e = (JComboBox) editor;
+        return e.getSelectedItem();
+    }
+
+    @Override
+    public void setValue(Object value) {
+        if (this.baseType == null) {
+            this.baseType = value.getClass();
+            setAvailableValues(baseType.getEnumConstants());
+        }
+
+        JComboBox e = (JComboBox) editor;
+        e.getModel().setSelectedItem(value);
+    }
+}