Revision: 17858
http://sourceforge.net/p/gate/code/17858
Author: markagreenwood
Date: 2014-04-17 14:10:55 +0000 (Thu, 17 Apr 2014)
Log Message:
-----------
and a few more warnings squished
Modified Paths:
--------------
gate/trunk/src/main/gate/gui/CreateIndexDialog.java
gate/trunk/src/main/gate/gui/CreateIndexGUI.java
gate/trunk/src/main/gate/gui/OptionsDialog.java
Modified: gate/trunk/src/main/gate/gui/CreateIndexDialog.java
===================================================================
--- gate/trunk/src/main/gate/gui/CreateIndexDialog.java 2014-04-17 14:03:17 UTC
(rev 17857)
+++ gate/trunk/src/main/gate/gui/CreateIndexDialog.java 2014-04-17 14:10:55 UTC
(rev 17858)
@@ -50,13 +50,13 @@
protected JPanel panel1 = new JPanel();
protected JLabel indexTypeLabel = new JLabel();
- protected JComboBox jComboIType = new JComboBox();
+ protected JComboBox<String> jComboIType = new JComboBox<String>();
protected JLabel locationLabel = new JLabel();
protected JTextField locationTextField = new JTextField();
protected JButton browse = new JButton();
protected JLabel featureLable = new JLabel();
protected JTextField featureTextField = new JTextField();
- protected JList jList1 = null;
+ protected JList<String> jList1 = null;
protected JScrollPane scrollPane = new JScrollPane();
protected JButton addButton = new JButton();
protected JCheckBox content = new JCheckBox();
@@ -96,7 +96,7 @@
jComboIType.setSelectedItem("Lucene");
- jList1 = new JList(fields);
+ jList1 = new JList<String>(fields);
scrollPane.getViewport().setView(jList1);
this.getContentPane().add(panel1, BorderLayout.NORTH);
Modified: gate/trunk/src/main/gate/gui/CreateIndexGUI.java
===================================================================
--- gate/trunk/src/main/gate/gui/CreateIndexGUI.java 2014-04-17 14:03:17 UTC
(rev 17857)
+++ gate/trunk/src/main/gate/gui/CreateIndexGUI.java 2014-04-17 14:10:55 UTC
(rev 17858)
@@ -68,7 +68,7 @@
add(new JLabel("IR Engine type:"), constraints);
constraints.gridwidth = 4;
- irEngineCombo = new JComboBox();
+ irEngineCombo = new JComboBox<String>();
add(irEngineCombo, constraints);
//second line
@@ -122,7 +122,7 @@
while(namesIter.hasNext()){
names[i++] = namesIter.next();
}
- irEngineCombo.setModel(new DefaultComboBoxModel(names));
+ irEngineCombo.setModel(new DefaultComboBoxModel<String>(names));
if(oldIREngineName != null && engineByName.containsKey(oldIREngineName)){
irEngineCombo.setSelectedItem(oldIREngineName);
}else if(engineByName.size() > 0) irEngineCombo.setSelectedIndex(0);
@@ -199,7 +199,7 @@
/**
* Combobox for selecting IR engine.
*/
- JComboBox irEngineCombo;
+ JComboBox<String> irEngineCombo;
/**
* Text field for the location of the index.
Modified: gate/trunk/src/main/gate/gui/OptionsDialog.java
===================================================================
--- gate/trunk/src/main/gate/gui/OptionsDialog.java 2014-04-17 14:03:17 UTC
(rev 17857)
+++ gate/trunk/src/main/gate/gui/OptionsDialog.java 2014-04-17 14:10:55 UTC
(rev 17858)
@@ -106,7 +106,7 @@
e.printStackTrace();
}
}
- lnfCombo = new JComboBox(supportedLNFs.toArray());
+ lnfCombo = new JComboBox<LNFData>(supportedLNFs.toArray(new
LNFData[supportedLNFs.size()]));
lnfCombo.setSelectedItem(currentLNF);
lnfCombo.setToolTipText("Be aware that only 'Metal' is fully tested.");
@@ -191,7 +191,7 @@
.DOCUMENT_ADD_SPACE_ON_UNPACK_FEATURE_NAME) )
addSpaceOnMarkupUnpackChk.setSelected(false);
- browserComboBox = new JComboBox(new String[] {
+ browserComboBox = new JComboBox<String>(new String[] {
"Default browser", "Java", "Custom"});
browserComboBox.setPrototypeDisplayValue("Default browser");
browserComboBox.setToolTipText(
@@ -692,12 +692,12 @@
/**
* The combobox for the look and feel selection
*/
- protected JComboBox lnfCombo;
+ protected JComboBox<LNFData> lnfCombo;
/**
* List of browsers. Update the browserCommandLineTextField.
*/
- protected JComboBox browserComboBox;
+ protected JComboBox<String> browserComboBox;
/**
* Browser command line.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
