Revision: 14982
http://gate.svn.sourceforge.net/gate/?rev=14982&view=rev
Author: valyt
Date: 2012-01-10 13:54:49 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
Changed the features editor to use the default colours for the editing fields
(and warning colours for wrong entries).
Modified Paths:
--------------
gate/trunk/src/gate/gui/FeaturesSchemaEditor.java
Modified: gate/trunk/src/gate/gui/FeaturesSchemaEditor.java
===================================================================
--- gate/trunk/src/gate/gui/FeaturesSchemaEditor.java 2012-01-10 13:45:27 UTC
(rev 14981)
+++ gate/trunk/src/gate/gui/FeaturesSchemaEditor.java 2012-01-10 13:54:49 UTC
(rev 14982)
@@ -22,6 +22,7 @@
import java.util.*;
import java.util.List;
import javax.swing.*;
+import javax.swing.border.Border;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableCellRenderer;
import gate.*;
@@ -121,12 +122,12 @@
getColumnModel().getColumn(DELETE_COL).
setCellEditor(featureEditorRenderer);
- //the background colour seems to change somewhere when using the GTK+
- //look and feel on Linux, so we copy the value now and set it
- Color tableBG = getBackground();
- //make a copy of the value (as the reference gets changed somewhere)
- tableBG = new Color(tableBG.getRGB());
- setBackground(tableBG);
+// //the background colour seems to change somewhere when using the GTK+
+// //look and feel on Linux, so we copy the value now and set it
+// Color tableBG = getBackground();
+// //make a copy of the value (as the reference gets changed somewhere)
+// tableBG = new Color(tableBG.getRGB());
+// setBackground(tableBG);
// allow Tab key to select the next cell in the table
setSurrendersFocusOnKeystroke(true);
@@ -346,13 +347,14 @@
defaultComparator = new ObjectComparator();
editorCombo = (JComboBox)editorComponent;
editorCombo.setModel(new DefaultComboBoxModel());
- editorCombo.setBackground(FeaturesSchemaEditor.this.getBackground());
editorCombo.setEditable(true);
editorCombo.addActionListener(new ActionListener(){
public void actionPerformed(ActionEvent evt){
stopCellEditing();
}
});
+ defaultBackground = editorCombo.getEditor().getEditorComponent()
+ .getBackground();
rendererCombo = new JComboBox(){
@Override
@@ -365,10 +367,8 @@
}
};
rendererCombo.setModel(new DefaultComboBoxModel());
- rendererCombo.setBackground(FeaturesSchemaEditor.this.getBackground());
rendererCombo.setEditable(true);
rendererCombo.setOpaque(false);
-
requiredIconLabel = new JLabel(){
public void repaint(long tm, int x, int y, int width, int height){}
@@ -434,9 +434,6 @@
deleteButton = new JButton(MainFrame.getIcon("delete"));
deleteButton.setMargin(new Insets(0,0,0,0));
-// deleteButton.setBorderPainted(false);
-// deleteButton.setContentAreaFilled(false);
-// deleteButton.setOpaque(false);
deleteButton.setToolTipText("Delete");
deleteButton.addActionListener(new ActionListener(){
public void actionPerformed(ActionEvent evt){
@@ -466,11 +463,8 @@
optionalIconLabel) :
nonSchemaIconLabel;
case NAME_COL:
-
prepareCombo(rendererCombo, row, column);
rendererCombo.getPreferredSize();
-// Dimension dim = rendererCombo.getPreferredSize();
-// rendererCombo.setPreferredSize(new Dimension(dim.width + 5,
dim.height));
return rendererCombo;
case VALUE_COL:
prepareCombo(rendererCombo, row, column);
@@ -512,7 +506,7 @@
for(Iterator nameIter = fNames.iterator();
nameIter.hasNext();
comboModel.addElement(nameIter.next()));
-
combo.getEditor().getEditorComponent().setBackground(FeaturesSchemaEditor.this.getBackground());
+
combo.getEditor().getEditorComponent().setBackground(defaultBackground);
combo.setSelectedItem(feature.name);
break;
case VALUE_COL:
@@ -528,8 +522,8 @@
valIter.hasNext();
comboModel.addElement(valIter.next()));
combo.getEditor().getEditorComponent().setBackground(feature.isCorrect() ?
- FeaturesSchemaEditor.this.getBackground() :
- (feature.isRequired() ? REQUIRED_WRONG : OPTIONAL_WRONG));
+ defaultBackground :
+ (feature.isRequired() ? REQUIRED_WRONG : OPTIONAL_WRONG));
combo.setSelectedItem(feature.value);
break;
default: ;
@@ -544,6 +538,7 @@
JComboBox rendererCombo;
JButton deleteButton;
ObjectComparator defaultComparator;
+ Color defaultBackground;
}
/*
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Write once. Port to many.
Get the SDK and tools to simplify cross-platform app development. Create
new or port existing apps to sell to consumers worldwide. Explore the
Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join
http://p.sf.net/sfu/intel-appdev
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
