Revision: 17877
http://sourceforge.net/p/gate/code/17877
Author: markagreenwood
Date: 2014-04-18 16:24:45 +0000 (Fri, 18 Apr 2014)
Log Message:
-----------
more cleanup
Modified Paths:
--------------
gate/trunk/.settings/org.eclipse.jdt.core.prefs
gate/trunk/src/main/gate/creole/annic/lucene/LuceneDocument.java
gate/trunk/src/main/gate/gui/ResourceRenderer.java
gate/trunk/src/main/gate/gui/SerialControllerEditor.java
Modified: gate/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- gate/trunk/.settings/org.eclipse.jdt.core.prefs 2014-04-18 15:50:54 UTC
(rev 17876)
+++ gate/trunk/.settings/org.eclipse.jdt.core.prefs 2014-04-18 16:24:45 UTC
(rev 17877)
@@ -1,14 +1,4 @@
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
Modified: gate/trunk/src/main/gate/creole/annic/lucene/LuceneDocument.java
===================================================================
--- gate/trunk/src/main/gate/creole/annic/lucene/LuceneDocument.java
2014-04-18 15:50:54 UTC (rev 17876)
+++ gate/trunk/src/main/gate/creole/annic/lucene/LuceneDocument.java
2014-04-18 16:24:45 UTC (rev 17877)
@@ -7,31 +7,34 @@
*/
package gate.creole.annic.lucene;
-import java.io.*;
-import java.lang.reflect.Array;
-
+import gate.Annotation;
+import gate.AnnotationSet;
+import gate.FeatureMap;
import gate.annotation.AnnotationSetImpl;
import gate.creole.annic.Constants;
+import gate.creole.annic.apache.lucene.analysis.Token;
import gate.creole.annic.apache.lucene.document.Document;
import gate.creole.annic.apache.lucene.document.Field;
-import java.util.ArrayList;
-import gate.AnnotationSet;
import gate.util.Err;
import gate.util.GateRuntimeException;
import gate.util.InvalidOffsetException;
import gate.util.OffsetComparator;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import gate.Annotation;
-import gate.FeatureMap;
-import gate.creole.annic.apache.lucene.analysis.Token;
-import java.util.Iterator;
-
/**
* Given an instance of Gate Document, this class provides a method to convert
* it into the format that lucene can understand and can store in its indexes.
Modified: gate/trunk/src/main/gate/gui/ResourceRenderer.java
===================================================================
--- gate/trunk/src/main/gate/gui/ResourceRenderer.java 2014-04-18 15:50:54 UTC
(rev 17876)
+++ gate/trunk/src/main/gate/gui/ResourceRenderer.java 2014-04-18 16:24:45 UTC
(rev 17877)
@@ -32,8 +32,8 @@
* the icon info from the creole register, the name of the resource as
* the rendered string and the type of the resource as the tooltip.
*/
-@SuppressWarnings("serial")
-public class ResourceRenderer extends JLabel implements
ListCellRenderer<Resource>,
+@SuppressWarnings({"serial", "rawtypes"})
+public class ResourceRenderer extends JLabel implements ListCellRenderer,
TableCellRenderer,
TreeCellRenderer {
public ResourceRenderer() {
@@ -41,7 +41,7 @@
}
@Override
- public Component getListCellRendererComponent(JList<? extends Resource>
list, Resource value,
+ public Component getListCellRendererComponent(JList list, Object value,
int index, boolean isSelected, boolean cellHasFocus) {
prepareRendererList(list, value, isSelected, hasFocus());
return this;
@@ -100,7 +100,7 @@
prepareRendererCommon(table, value, isSelected, hasFocus);
}
- private void prepareRendererList(JList<? extends Resource> list, Resource
value,
+ private void prepareRendererList(JList list, Object value,
boolean isSelected, boolean hasFocus) {
if(isSelected) {
setForeground(list.getSelectionForeground());
Modified: gate/trunk/src/main/gate/gui/SerialControllerEditor.java
===================================================================
--- gate/trunk/src/main/gate/gui/SerialControllerEditor.java 2014-04-18
15:50:54 UTC (rev 17876)
+++ gate/trunk/src/main/gate/gui/SerialControllerEditor.java 2014-04-18
16:24:45 UTC (rev 17877)
@@ -173,6 +173,7 @@
removePRAction = new RemovePRAction();
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
protected void initGuiComponents() {
//we use a JSplitPane for most of the content, and add the Run button to
//the South area
@@ -405,7 +406,7 @@
if(corpusControllerMode){
//we need to add the corpus combo
- corpusCombo = new JComboBox<Resource>(corpusComboModel = new
CorporaComboModel());
+ corpusCombo = new JComboBox(corpusComboModel = new CorporaComboModel());
corpusCombo.setRenderer(new ResourceRenderer());
corpusCombo.setMaximumSize(new Dimension(Integer.MAX_VALUE,
corpusCombo.getPreferredSize().
@@ -1335,6 +1336,7 @@
/**
* A model for a combobox containing the loaded corpora in the system
*/
+ @SuppressWarnings("rawtypes")
protected class CorporaComboModel extends AbstractListModel
implements ComboBoxModel{
@Override
@@ -1878,6 +1880,7 @@
* A combobox that allows selection of a corpus from the list of loaded
* corpora.
*/
+ @SuppressWarnings("rawtypes")
protected JComboBox corpusCombo;
protected CorporaComboModel corpusComboModel;
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
