PLANNER-423 Fix Combobox selection rollover effect

kiegroup · Oct 23, 2015 · df1587a · df1587a
1 parent f08a5b1
commit df1587a
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 24 deletions.
diff --git a/...es/src/main/java/org/optaplanner/examples/cloudbalancing/swingui/CloudBalancingPanel.java b/...es/src/main/java/org/optaplanner/examples/cloudbalancing/swingui/CloudBalancingPanel.java
@@ -358,7 +358,7 @@ public void actionPerformed(ActionEvent e) {
             // Add 1 to array size to add null, which makes the entity unassigned
             JComboBox computerListField = new JComboBox(
                     computerList.toArray(new Object[computerList.size() + 1]));
-            computerListField.setRenderer(new LabeledComboBoxRenderer());
+            LabeledComboBoxRenderer.applyToComboBox(computerListField);
             computerListField.setSelectedItem(process.getComputer());
             listFieldsPanel.add(computerListField);
             int result = JOptionPane.showConfirmDialog(CloudBalancingPanel.this.getRootPane(), listFieldsPanel,

diff --git a/...main/java/org/optaplanner/examples/common/swingui/components/LabeledComboBoxRenderer.java b/...main/java/org/optaplanner/examples/common/swingui/components/LabeledComboBoxRenderer.java
@@ -17,29 +17,33 @@
 package org.optaplanner.examples.common.swingui.components;
 
 import java.awt.Component;
+import javax.swing.DefaultListCellRenderer;
 import javax.swing.Icon;
+import javax.swing.JComboBox;
 import javax.swing.JList;
+import javax.swing.ListCellRenderer;
 import javax.swing.plaf.basic.BasicComboBoxRenderer;
 
 /**
  * Display the user-friendly {@link Labeled#getLabel()} instead of the developer-friendly {@link Object#toString()}.
  */
-public class LabeledComboBoxRenderer extends BasicComboBoxRenderer {
+public class LabeledComboBoxRenderer implements ListCellRenderer {
+
+    public static void applyToComboBox(JComboBox comboBox) {
+        comboBox.setRenderer(new LabeledComboBoxRenderer(comboBox.getRenderer()));
+    }
+
+    private final ListCellRenderer originalListCellRenderer;
+
+    public LabeledComboBoxRenderer(ListCellRenderer originalListCellRenderer) {
+        this.originalListCellRenderer = originalListCellRenderer;
+    }
 
     @Override
     public Component getListCellRendererComponent(JList list, Object value, int index,
             boolean isSelected, boolean cellHasFocus) {
-        if (isSelected) {
-            setBackground(list.getSelectionBackground());
-            setForeground(list.getSelectionForeground());
-        } else {
-            setBackground(list.getBackground());
-            setForeground(list.getForeground());
-        }
-        setFont(list.getFont());
-
-        setText((value == null) ? "" : ((Labeled) value).getLabel());
-        return this;
+        String label = (value == null) ? "" : ((Labeled) value).getLabel();
+        return originalListCellRenderer.getListCellRendererComponent(list, label, index, isSelected, cellHasFocus);
     }
 
 }
diff --git a/...rc/main/java/org/optaplanner/examples/curriculumcourse/swingui/CurriculumCoursePanel.java b/...rc/main/java/org/optaplanner/examples/curriculumcourse/swingui/CurriculumCoursePanel.java
@@ -245,15 +245,15 @@ public void actionPerformed(ActionEvent e) {
             // Add 1 to array size to add null, which makes the entity unassigned
             JComboBox periodListField = new JComboBox(
                     periodList.toArray(new Object[periodList.size() + 1]));
-            periodListField.setRenderer(new LabeledComboBoxRenderer());
+            LabeledComboBoxRenderer.applyToComboBox(periodListField);
             periodListField.setSelectedItem(lecture.getPeriod());
             listFieldsPanel.add(periodListField);
             listFieldsPanel.add(new JLabel("Room:"));
             List<Room> roomList = getCourseSchedule().getRoomList();
             // Add 1 to array size to add null, which makes the entity unassigned
             JComboBox roomListField = new JComboBox(
                     roomList.toArray(new Object[roomList.size() + 1]));
-            roomListField.setRenderer(new LabeledComboBoxRenderer());
+            LabeledComboBoxRenderer.applyToComboBox(roomListField);
             roomListField.setSelectedItem(lecture.getRoom());
             listFieldsPanel.add(roomListField);
             listFieldsPanel.add(new JLabel("Locked:"));

diff --git a/...examples/src/main/java/org/optaplanner/examples/dinnerparty/swingui/DinnerPartyPanel.java b/...examples/src/main/java/org/optaplanner/examples/dinnerparty/swingui/DinnerPartyPanel.java
@@ -232,7 +232,7 @@ public void actionPerformed(ActionEvent e) {
             // Add 1 to array size to add null, which makes the entity unassigned
             JComboBox seatDesignationListField = new JComboBox(
                     seatDesignationList.toArray(new Object[seatDesignationList.size() + 1]));
-            seatDesignationListField.setRenderer(new LabeledComboBoxRenderer());
+            LabeledComboBoxRenderer.applyToComboBox(seatDesignationListField);
             seatDesignationListField.setSelectedItem(seatDesignation);
             int result = JOptionPane.showConfirmDialog(DinnerPartyPanel.this.getRootPane(), seatDesignationListField,
                     "Select seat designation to switch with", JOptionPane.OK_CANCEL_OPTION);

diff --git a/...examples/src/main/java/org/optaplanner/examples/examination/swingui/ExaminationPanel.java b/...examples/src/main/java/org/optaplanner/examples/examination/swingui/ExaminationPanel.java
@@ -239,15 +239,15 @@ public void actionPerformed(ActionEvent e) {
             // Add 1 to array size to add null, which makes the entity unassigned
             JComboBox periodListField = new JComboBox(
                     periodList.toArray(new Object[periodList.size() + 1]));
-            periodListField.setRenderer(new LabeledComboBoxRenderer());
+            LabeledComboBoxRenderer.applyToComboBox(periodListField);
             periodListField.setSelectedItem(exam.getPeriod());
             listFieldsPanel.add(periodListField);
             listFieldsPanel.add(new JLabel("Room:"));
             List<Room> roomList = getExamination().getRoomList();
             // Add 1 to array size to add null, which makes the entity unassigned
             JComboBox roomListField = new JComboBox(
                     roomList.toArray(new Object[roomList.size() + 1]));
-            roomListField.setRenderer(new LabeledComboBoxRenderer());
+            LabeledComboBoxRenderer.applyToComboBox(roomListField);
             roomListField.setSelectedItem(exam.getRoom());
             listFieldsPanel.add(roomListField);
             int result = JOptionPane.showConfirmDialog(ExaminationPanel.this.getRootPane(), listFieldsPanel,

diff --git a/...n/java/org/optaplanner/examples/machinereassignment/swingui/MachineReassignmentPanel.java b/...n/java/org/optaplanner/examples/machinereassignment/swingui/MachineReassignmentPanel.java
@@ -186,7 +186,7 @@ public void actionPerformed(ActionEvent e) {
             // Add 1 to array size to add null, which makes the entity unassigned
             JComboBox machineListField = new JComboBox(
                     machineList.toArray(new Object[machineList.size() + 1]));
-            machineListField.setRenderer(new LabeledComboBoxRenderer());
+            LabeledComboBoxRenderer.applyToComboBox(machineListField);
             machineListField.setSelectedItem(processAssignment.getMachine());
             int result = JOptionPane.showConfirmDialog(MachineReassignmentPanel.this.getRootPane(), machineListField,
                     "Select machine", JOptionPane.OK_CANCEL_OPTION);

diff --git a/...planner-examples/src/main/java/org/optaplanner/examples/nqueens/swingui/NQueensPanel.java b/...planner-examples/src/main/java/org/optaplanner/examples/nqueens/swingui/NQueensPanel.java
@@ -113,7 +113,7 @@ public void actionPerformed(ActionEvent e) {
             // Add 1 to array size to add null, which makes the entity unassigned
             JComboBox rowListField = new JComboBox(
                     rowList.toArray(new Object[rowList.size() + 1]));
-            rowListField.setRenderer(new LabeledComboBoxRenderer());
+            LabeledComboBoxRenderer.applyToComboBox(rowListField);
             rowListField.setSelectedItem(queen.getRow());
             messagePanel.add(rowListField, BorderLayout.CENTER);
             int result = JOptionPane.showConfirmDialog(NQueensPanel.this.getRootPane(), messagePanel,

diff --git a/...examples/src/main/java/org/optaplanner/examples/nurserostering/swingui/EmployeePanel.java b/...examples/src/main/java/org/optaplanner/examples/nurserostering/swingui/EmployeePanel.java
@@ -238,7 +238,7 @@ public void actionPerformed(ActionEvent e) {
             // Add 1 to array size to add null, which makes the entity unassigned
             JComboBox employeeListField = new JComboBox(
                     employeeList.toArray(new Object[employeeList.size() + 1]));
-            employeeListField.setRenderer(new LabeledComboBoxRenderer());
+            LabeledComboBoxRenderer.applyToComboBox(employeeListField);
             employeeListField.setSelectedItem(shiftAssignment.getEmployee());
             int result = JOptionPane.showConfirmDialog(EmployeePanel.this.getRootPane(), employeeListField,
                     "Select employee", JOptionPane.OK_CANCEL_OPTION);

diff --git a/...les/src/main/java/org/optaplanner/examples/pas/swingui/PatientAdmissionSchedulePanel.java b/...les/src/main/java/org/optaplanner/examples/pas/swingui/PatientAdmissionSchedulePanel.java
@@ -196,7 +196,7 @@ public void actionPerformed(ActionEvent e) {
             // Add 1 to array size to add null, which makes the entity unassigned
             JComboBox bedListField = new JComboBox(
                     bedList.toArray(new Object[bedList.size() + 1]));
-            bedListField.setRenderer(new LabeledComboBoxRenderer());
+            LabeledComboBoxRenderer.applyToComboBox(bedListField);
             bedListField.setSelectedItem(bedDesignation.getBed());
             listFieldsPanel.add(bedListField);
             int result = JOptionPane.showConfirmDialog(PatientAdmissionSchedulePanel.this.getRootPane(),

diff --git a/optaplanner-examples/src/main/java/org/optaplanner/examples/tennis/swingui/TennisPanel.java b/optaplanner-examples/src/main/java/org/optaplanner/examples/tennis/swingui/TennisPanel.java
@@ -268,7 +268,7 @@ public void actionPerformed(ActionEvent e) {
             // Add 1 to array size to add null, which makes the entity unassigned
             JComboBox teamListField = new JComboBox(
                     teamList.toArray(new Object[teamList.size() + 1]));
-            teamListField.setRenderer(new LabeledComboBoxRenderer());
+            LabeledComboBoxRenderer.applyToComboBox(teamListField);
             teamListField.setSelectedItem(teamAssignment.getTeam());
             listFieldsPanel.add(teamListField);
             listFieldsPanel.add(new JLabel("Locked:"));

diff --git a/...n/java/org/optaplanner/examples/travelingtournament/swingui/TravelingTournamentPanel.java b/...n/java/org/optaplanner/examples/travelingtournament/swingui/TravelingTournamentPanel.java
@@ -169,7 +169,7 @@ public void actionPerformed(ActionEvent e) {
             // Add 1 to array size to add null, which makes the entity unassigned
             JComboBox dayListField = new JComboBox(
                     dayList.toArray(new Object[dayList.size() + 1]));
-            dayListField.setRenderer(new LabeledComboBoxRenderer());
+            LabeledComboBoxRenderer.applyToComboBox(dayListField);
             dayListField.setSelectedItem(match.getDay());
             int result = JOptionPane.showConfirmDialog(TravelingTournamentPanel.this.getRootPane(), dayListField,
                     "Select day", JOptionPane.OK_CANCEL_OPTION);