summaryrefslogtreecommitdiff
path: root/source/com/c2kernel/lifecycle
diff options
context:
space:
mode:
authorabranson <andrew.branson@cern.ch>2011-09-07 15:41:24 +0200
committerabranson <andrew.branson@cern.ch>2011-09-07 15:41:24 +0200
commit53a7566dcb7c0dd18cd17f84a3ba845bcd4216a1 (patch)
treebeac3c6e0d13f8224872eb612aeda02c79cb546a /source/com/c2kernel/lifecycle
parent379ed8a0e133bee650e0acb24f6b743f657a50d0 (diff)
Rollback to Java 1.6 compliance
Diffstat (limited to 'source/com/c2kernel/lifecycle')
-rw-r--r--source/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java2
-rw-r--r--source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/source/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java b/source/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java
index d86c0a0..d21f6d5 100644
--- a/source/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java
+++ b/source/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java
@@ -15,7 +15,7 @@ import com.c2kernel.lookup.DomainPath;
import com.c2kernel.process.Gateway;
import com.c2kernel.utils.Logger;
-public class LDAPEntryChooser extends JComboBox<String>
+public class LDAPEntryChooser extends JComboBox
{
DomainPath mDomainPath = null;
diff --git a/source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java b/source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java
index 32b234e..094f900 100644
--- a/source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java
+++ b/source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java
@@ -39,8 +39,8 @@ public class TransitionPanel extends SelectedVertexPanel implements ActionListen
protected GridBagLayout gridbag;
protected GridBagConstraints c;
protected Box transBox;
- protected JComboBox<?> executors;
- protected JComboBox<String> states = new JComboBox<String>(States.states);
+ protected JComboBox executors;
+ protected JComboBox states = new JComboBox(States.states);
protected JCheckBox active = new JCheckBox();
protected JLabel status = new JLabel();
protected ItemProxy mItem;