--- dl_class_1.9/java/DataArchiver.java	2012-04-23 11:43:54.000000000 +0100

+++ dl_class_1.9.old/java/DataArchiver.java	2012-04-20 10:17:59.000000000 +0100

@@ -18,7 +18,7 @@

     public static DataArchiver job;

     private static JButton select,store,fetch,info,close;

     private static JTextField dirold,dirnew;

-    private static JComboBox<String> test;

+    private static JComboBox test;

     private static String dname="DEFAULT";

     private static WarningBox danger;

@@ -62,7 +62,7 @@

         // Test case choice

-        test = new JComboBox<String>();

+        test = new JComboBox();

         test.setBackground(art.scrn);

         test.setForeground(art.scrf);

         test.addItem("TEST1");

Binary files dl_class_1.9/java/GUI.jar and dl_class_1.9.old/java/GUI.jar differ

--- dl_class_1.9/java/HyperDyn.java	2012-04-11 14:10:18.000000000 +0100

+++ dl_class_1.9.old/java/HyperDyn.java	2012-04-10 14:54:38.000000000 +0100

@@ -19,7 +19,7 @@

     private static JTextField tebias,tvmin,target,block,black,tdelt;

     private static JTextField ttlow,track,tcatch,spring,opttol,nnebs;

     private static JTextField basin1,basin2;

-    private static JComboBox<String> hypopt,tunits,optkey;

+    private static JComboBox hypopt,tunits,optkey;

     private static JCheckBox tgoneb,tpath;

     private static JButton close;

@@ -58,7 +58,7 @@

         // Hyperdynamics options

         fix(new JLabel("Hyperdynamics options:",JLabel.LEFT),grd,gbc,0,n,2,1);

-        hypopt = new JComboBox<String>();

+        hypopt = new JComboBox();

         hypopt.setForeground(art.scrf);

         hypopt.setBackground(art.scrn);

         hypopt.addItem("BPD");

@@ -72,7 +72,7 @@

         // Energy units

         fix(new JLabel("Energy Units:",JLabel.LEFT),grd,gbc,0,n,2,1);

-        tunits = new JComboBox<String>();

+        tunits = new JComboBox();

         tunits.setForeground(art.scrf);

         tunits.setBackground(art.scrn);

         tunits.addItem("DL_POLY");

@@ -93,7 +93,7 @@

         // Minimisation control option

         fix(new JLabel("Minimise Option:",JLabel.LEFT),grd,gbc,0,n,2,1);

-        optkey = new JComboBox<String>();

+        optkey = new JComboBox();

         optkey.setForeground(art.scrf);

         optkey.setBackground(art.scrn);

         optkey.addItem("Force");

--- dl_class_1.9/java/MakeCeramField.java	2012-04-11 14:10:18.000000000 +0100

+++ dl_class_1.9.old/java/MakeCeramField.java	2012-04-10 14:50:57.000000000 +0100

@@ -17,7 +17,7 @@

     public static MakeCeramField job;

     private static GUI home;

     private static String ffield;

-    private static JComboBox<String> cpot;

+    private static JComboBox cpot;

     private static JButton make,load,close;

     private static JCheckBox display,tetra;

     private static JLabel lab1,pad;

@@ -72,7 +72,7 @@

         lab1 = new JLabel("Force field :",JLabel.LEFT);

         fix(lab1,grd,gbc,0,2,1,1);

-        cpot = new JComboBox<String>();

+        cpot = new JComboBox();

         cpot.setBackground(art.scrn);

         cpot.setForeground(art.scrf);

         cpot.addItem("LC_a");

--- dl_class_1.9/java/MakeChain.java	2012-04-11 14:10:18.000000000 +0100

+++ dl_class_1.9.old/java/MakeChain.java	2012-04-10 14:50:57.000000000 +0100

@@ -22,7 +22,7 @@

     private static JLabel lab1,lab2,lab3,lab4,lab5,pass;

     private static JTextField nc,area,eon,gapz;

     private static JCheckBox chk1,chk2;

-    private static JComboBox<String> head;

+    private static JComboBox head;

     private static boolean flip,twin;

     private static String headgroup;

     private static int keyhed,ncarbons,nethos;

@@ -108,7 +108,7 @@

         // Head group choice

-        head = new JComboBox<String>();

+        head = new JComboBox();

         head.setBackground(art.scrn);

         head.setForeground(art.scrf);

         head.addItem("None");

--- dl_class_1.9/java/MakeDreiField.java	2012-04-11 14:10:19.000000000 +0100

+++ dl_class_1.9.old/java/MakeDreiField.java	2012-04-10 14:50:57.000000000 +0100

@@ -16,7 +16,7 @@

      */

     public static MakeDreiField job;

     private static GUI home;

-    private static JComboBox<String> bond,vdwt;

+    private static JComboBox bond,vdwt;

     private static JButton make,load,close;

     private static JCheckBox charges;

     private static JLabel lab1,lab2,pad1,pad2,pad3;

@@ -79,7 +79,7 @@

         lab1 = new JLabel("Bond type :",JLabel.LEFT);

         fix(lab1,grd,gbc,0,2,1,1);

-        bond = new JComboBox<String>();

+        bond = new JComboBox();

         bond.setBackground(art.scrn);

         bond.setForeground(art.scrf);

         bond.addItem("Harmonic");

@@ -91,7 +91,7 @@

         lab2 = new JLabel("VDW type :",JLabel.LEFT);

         fix(lab2,grd,gbc,0,3,1,1);

-        vdwt = new JComboBox<String>();

+        vdwt = new JComboBox();

         vdwt.setBackground(art.scrn);

         vdwt.setForeground(art.scrf);

         vdwt.addItem("Len-Jones");

--- dl_class_1.9/java/MakeTable.java	2012-04-11 14:10:19.000000000 +0100

+++ dl_class_1.9.old/java/MakeTable.java	2012-04-10 14:50:57.000000000 +0100

@@ -22,7 +22,7 @@

     static int npnts,numtab,ngrid,keytab,keyfit,mxpnts;

     static JTextField atom1,atom2,gridp,cutoff,xval,yval,points;

     static JButton make,load,close,enter,clear;

-    static JComboBox<String> units,fitopt,special;

+    static JComboBox units,fitopt,special;

     static String[] header;

     // Define the Graphical User Interface

@@ -147,7 +147,7 @@

         // Energy units required

-        units = new JComboBox<String>();

+        units = new JComboBox();

         units.setBackground(art.scrn);

         units.setForeground(art.scrf);

         units.addItem("DL_POLY");

@@ -164,7 +164,7 @@

         // Energy units required

-        fitopt = new JComboBox<String>();

+        fitopt = new JComboBox();

         fitopt.setBackground(art.scrn);

         fitopt.setForeground(art.scrf);

         fitopt.addItem("SPLINE");

@@ -178,7 +178,7 @@

         // Special potential functions

-        special = new JComboBox<String>();

+        special = new JComboBox();

         special.setBackground(art.scrn);

         special.setForeground(art.scrf);

         special.addItem("None");

--- dl_class_1.9/java/ProVar.java	2012-04-11 14:10:20.000000000 +0100

+++ dl_class_1.9.old/java/ProVar.java	2012-04-10 14:54:38.000000000 +0100

@@ -16,7 +16,7 @@

          */

     private static MakeControl home;

     private static ProVar job;

-    private static JComboBox<String> restopt,algorithm;

+    private static JComboBox restopt,algorithm;

     private static JTextField tnstrun,tnsteql,tmult,tnstbpo,tnstack,tintsta,tewltol,tshktol,tqtntol;

     private static JTextField tjobtim,ttclose;

     private static JButton close;

@@ -55,7 +55,7 @@

         // Restart option

         fix(new JLabel("Algorithm",JLabel.LEFT),grd,gbc,0,n,2,1);

-        algorithm = new JComboBox<String>();

+        algorithm = new JComboBox();

         algorithm.setBackground(art.scrn);

         algorithm.setForeground(art.scrf);

         algorithm.addItem("Leapfrog Verlet");

@@ -153,7 +153,7 @@

         // Restart option

         fix(new JLabel("Restart option",JLabel.LEFT),grd,gbc,0,n,2,1);

-        restopt = new JComboBox<String>();

+        restopt = new JComboBox();

         restopt.setBackground(art.scrn);

         restopt.setForeground(art.scrf);

         restopt.addItem("NONE");

--- dl_class_1.9/java/RadDam.java	2012-04-11 14:10:20.000000000 +0100

+++ dl_class_1.9.old/java/RadDam.java	2012-04-10 14:54:38.000000000 +0100

@@ -19,7 +19,7 @@

     private static JTextField tdstart,tdintval,tdefcut,tatom,timpstp,tenergy,tvect1;

     private static JTextField tvect2,tvect3,tvarstp,tmindis,tmaxdis,tnstmsdtmp;

     private static JTextField timsdtmp,tthick,tptemp;

-    private static JComboBox<String> pseudtyp;

+    private static JComboBox pseudtyp;

     private static JButton close;

     private static JCheckBox bldefects,blvarstp,blmsdtmp,blpseudo;

@@ -158,7 +158,7 @@

         blpseudo.setForeground(art.fore);

         blpseudo.setBackground(art.back);

         fix(blpseudo,grd,gbc,0,n++,2,1);

-        pseudtyp = new JComboBox<String>();

+        pseudtyp = new JComboBox();

         pseudtyp.setBackground(art.scrn);

         pseudtyp.setForeground(art.scrf);

         pseudtyp.addItem(" ");

--- dl_class_1.9/java/Solvat.java	2012-04-11 14:10:20.000000000 +0100

+++ dl_class_1.9.old/java/Solvat.java	2012-04-10 14:54:38.000000000 +0100

@@ -18,7 +18,7 @@

     private static JTextField tstart,tintvl,tlambda,tnonlin;

     private static JTextField systema,systemb,tswtch;

     private static JCheckBox remass;

-    private static JComboBox<String> solkey,mixkey;

+    private static JComboBox solkey,mixkey;

     private static JButton close;

@@ -56,7 +56,7 @@

         // Select solvation option

         fix(new JLabel("Choose solvation option:",JLabel.LEFT),grd,gbc,0,n,2,1);

-        solkey = new JComboBox<String>();

+        solkey = new JComboBox();

         solkey.setForeground(art.scrf);

         solkey.setBackground(art.scrn);

         solkey.addItem("Decompose");

@@ -100,7 +100,7 @@

         // Mixing function selction

         fix(new JLabel("Free Energy Mixing Function:",JLabel.LEFT),grd,gbc,0,n,2,1);

-        mixkey = new JComboBox<String>();

+        mixkey = new JComboBox();

         mixkey.setForeground(art.scrf);

         mixkey.setBackground(art.scrn);

         mixkey.addItem("Linear");

--- dl_class_1.9/java/StatProp.java	2012-04-11 14:10:20.000000000 +0100

+++ dl_class_1.9.old/java/StatProp.java	2012-04-10 14:50:57.000000000 +0100

@@ -17,7 +17,7 @@

     public static StatProp job;

     private static GUI home;

     private static String prop;

-    private static JComboBox<String> property;

+    private static JComboBox property;

     private static int npnts,keyprp,nstart;

     private static JTextField statis,start,selection;

     private static JButton run,close;

@@ -81,7 +81,7 @@

         // Choice of ensemble

         fix(new JLabel(" Property:   ",JLabel.RIGHT),grd,gbc,0,n,1,1);

-        property = new JComboBox<String>();

+        property = new JComboBox();

         property.setBackground(art.scrn);

         property.setForeground(art.scrf);

         property.addItem("E-TOT");

--- dl_class_1.9/java/SysVar.java	2012-04-11 14:10:20.000000000 +0100

+++ dl_class_1.9.old/java/SysVar.java	2012-04-10 14:54:38.000000000 +0100

@@ -16,7 +16,7 @@

          */

     private static MakeControl home=null;

     private static SysVar job=null;

-    private static JComboBox<String> ensemble,electro;

+    private static JComboBox ensemble,electro;

     private static JTextField ttemp,tpress,ttstep,trcut,tdelr,trvdw,trprim,tepsq,ttaut,ttaup,tgamt;

     private static JButton close;

@@ -142,7 +142,7 @@

         // Choice of ensemble

         fix(new JLabel("Ensemble.............",JLabel.LEFT),grd,gbc,0,n,1,1);

-        ensemble = new JComboBox<String>();

+        ensemble = new JComboBox();

         ensemble.setBackground(art.scrn);

         ensemble.setForeground(art.scrf);

         ensemble.addItem("NVE");

@@ -173,7 +173,7 @@

         // Choice of electrostatics

         fix(new JLabel("Electrostatics.......",JLabel.LEFT),grd,gbc,0,n,1,1);

-        electro = new JComboBox<String>();

+        electro = new JComboBox();

         electro.setBackground(art.scrn);

         electro.setForeground(art.scrf);

         electro.addItem("NONE");