Menu
▾
▴
javaowl-commit
|
From: Elmer G. <ega...@us...> - 2004-08-23 20:02:22
|
Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17115/src/org/javaowl/editor/swing Modified Files: LabelListCellRenderer.java TableModel.java PropertyEditorPagelet.java EditPage.java Log Message: Finished refactoring Index: TableModel.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/TableModel.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TableModel.java 17 Jul 2004 05:39:11 -0000 1.9 --- TableModel.java 23 Aug 2004 20:02:11 -0000 1.10 *************** *** 24,28 **** import javax.swing.table.AbstractTableModel; ! import com.hp.hpl.jena.rdf.model.Property; import com.hp.hpl.jena.rdf.model.Statement; --- 24,29 ---- import javax.swing.table.AbstractTableModel; ! import org.javaowl.editor.StatementEditorBean; ! import com.hp.hpl.jena.rdf.model.Statement; *************** *** 31,36 **** private String[] names = new String[] { "Property", "Value" }; - private List[] data = new List[] { new ArrayList(), new ArrayList() }; - private List statements = new ArrayList(); --- 32,35 ---- *************** *** 44,64 **** public int getRowCount() { ! return data[0].size(); } public Object getValueAt(int row, int col) { ! return data[col].get(row); } ! private void add(Property property, Object value) { ! data[0].add(property); ! data[1].add(value); ! int rc = getRowCount(); ! fireTableRowsInserted(rc, rc); ! } ! public void add(Statement statement) { ! add(statement.getPredicate(), statement.getObject()); statements.add(statement); } --- 43,65 ---- public int getRowCount() { ! return statements.size(); } public Object getValueAt(int row, int col) { ! StatementEditorBean statement = (StatementEditorBean) statements.get(row); ! if(col == 0) { ! return statement.getPredicate(); ! } else if (col == 1) { ! return statement.getObject(); ! } ! throw new IndexOutOfBoundsException("column =" + col); } ! ! public void add(StatementEditorBean statement) { statements.add(statement); + int rc = getRowCount(); + fireTableRowsInserted(rc, rc); } *************** *** 67,84 **** if (old == 0) return; - data[0].clear(); - data[1].clear(); statements.clear(); fireTableRowsDeleted(0, old - 1); } ! public Statement getRow(int row) { ! return (Statement) statements.get(row); } ! public Statement removeRow(int row) { ! Statement stmt = (Statement) statements.remove(row); ! data[0].remove(row); ! data[1].remove(row); fireTableRowsDeleted(row, row); return stmt; --- 68,81 ---- if (old == 0) return; statements.clear(); fireTableRowsDeleted(0, old - 1); } ! public StatementEditorBean getRow(int row) { ! return (StatementEditorBean) statements.get(row); } ! public StatementEditorBean removeRow(int row) { ! StatementEditorBean stmt = (StatementEditorBean) statements.remove(row); fireTableRowsDeleted(row, row); return stmt; Index: EditPage.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/EditPage.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** EditPage.java 21 Aug 2004 00:22:48 -0000 1.9 --- EditPage.java 23 Aug 2004 20:02:11 -0000 1.10 *************** *** 47,52 **** import org.javaowl.editor.ModelEditor; import org.javaowl.editor.ResourceEditorBean; - import com.hp.hpl.jena.ontology.Individual; import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.ontology.OntProperty; --- 47,52 ---- import org.javaowl.editor.ModelEditor; import org.javaowl.editor.ResourceEditorBean; + import org.javaowl.editor.StatementEditorBean; import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.ontology.OntProperty; *************** *** 54,59 **** import com.hp.hpl.jena.rdf.model.Literal; import com.hp.hpl.jena.rdf.model.Property; - import com.hp.hpl.jena.rdf.model.Resource; - import com.hp.hpl.jena.rdf.model.Statement; public class EditPage implements Page { --- 54,57 ---- *************** *** 71,75 **** private JSplitPane center; ! private Statement currentStatement; private Property currentProperty; --- 69,73 ---- private JSplitPane center; ! private StatementEditorBean currentStatement; private Property currentProperty; *************** *** 120,124 **** public void mouseClicked(MouseEvent e) { int index = table.getSelectedRow(); ! Statement stmt = values.getRow(index); editProperty(stmt); } --- 118,122 ---- public void mouseClicked(MouseEvent e) { int index = table.getSelectedRow(); ! StatementEditorBean stmt = values.getRow(index); editProperty(stmt); } *************** *** 129,133 **** if (KeyEvent.VK_DELETE == e.getKeyCode()) { int index = table.getSelectedRow(); ! Statement stmt = values.removeRow(index); removeStatement(stmt); } --- 127,131 ---- if (KeyEvent.VK_DELETE == e.getKeyCode()) { int index = table.getSelectedRow(); ! StatementEditorBean stmt = values.removeRow(index); removeStatement(stmt); } *************** *** 185,189 **** } ! private void removeStatement(Statement statement) { editor.removeStatement(statement); currentStatement = null; --- 183,187 ---- } ! private void removeStatement(StatementEditorBean statement) { editor.removeStatement(statement); currentStatement = null; *************** *** 203,207 **** OntClass ontClass = editor.getValidLeafClass(currentProperty); if (ontClass != null) { ! Individual[] values = editor.getValidObjects(ontClass); propertyEditor.setValues(values, null, ontClass); } else { --- 201,205 ---- OntClass ontClass = editor.getValidLeafClass(currentProperty); if (ontClass != null) { ! ResourceEditorBean[] values = editor.getValidObjects(ontClass); propertyEditor.setValues(values, null, ontClass); } else { *************** *** 211,215 **** } ! private void editProperty(Statement stmt) { currentStatement = stmt; Object value = stmt.getObject(); --- 209,213 ---- } ! private void editProperty(StatementEditorBean stmt) { currentStatement = stmt; Object value = stmt.getObject(); *************** *** 220,231 **** } propertyEditor.setRangeType(editor.getOntProperty(currentProperty).getRange()); ! if (value instanceof Resource) { OntClass ontClass = editor.getValidLeafClass(currentProperty); if (ontClass != null) { ! Individual[] values = editor.getValidObjects(ontClass); ! propertyEditor.setValues(values, (Resource) value, ontClass); } else { ! propertyEditor.setValues(null, (Resource) value, ontClass); } } else { propertyEditor.setValue(value.toString()); --- 218,231 ---- } propertyEditor.setRangeType(editor.getOntProperty(currentProperty).getRange()); ! if (value instanceof ResourceEditorBean) { OntClass ontClass = editor.getValidLeafClass(currentProperty); if (ontClass != null) { ! ResourceEditorBean[] values = editor.getValidObjects(ontClass); ! propertyEditor.setValues(values, (ResourceEditorBean) value, ontClass); } else { ! propertyEditor.setValues(null, (ResourceEditorBean) value, ontClass); } + } else if (value instanceof Literal){ + propertyEditor.setValue(((Literal)value).getString()); } else { propertyEditor.setValue(value.toString()); *************** *** 255,259 **** Util.setList(properties, editor.getApplicableProperties(resource)); values.clear(); ! Statement[] stmts = editor.getDeclaredProperties(resource); for (int i = 0; i < stmts.length; i++) values.add(stmts[i]); --- 255,259 ---- Util.setList(properties, editor.getApplicableProperties(resource)); values.clear(); ! StatementEditorBean[] stmts = editor.getDeclaredProperties(resource); for (int i = 0; i < stmts.length; i++) values.add(stmts[i]); *************** *** 286,290 **** } ! public void setProperty(Resource value) { if (currentStatement != null) { editor.removeStatement(currentStatement); --- 286,290 ---- } ! public void setProperty(ResourceEditorBean value) { if (currentStatement != null) { editor.removeStatement(currentStatement); Index: PropertyEditorPagelet.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/PropertyEditorPagelet.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PropertyEditorPagelet.java 21 Aug 2004 00:22:48 -0000 1.5 --- PropertyEditorPagelet.java 23 Aug 2004 20:02:11 -0000 1.6 *************** *** 19,29 **** package org.javaowl.editor.swing; import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.ontology.OntResource; - import com.hp.hpl.jena.rdf.model.Resource; public interface PropertyEditorPagelet extends Pagelet { ! public void setValues(Resource[] o, Resource value, OntClass clazz); public void setValue(String o); --- 19,30 ---- package org.javaowl.editor.swing; + import org.javaowl.editor.ResourceEditorBean; + import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.ontology.OntResource; public interface PropertyEditorPagelet extends Pagelet { ! public void setValues(ResourceEditorBean[] o, ResourceEditorBean value, OntClass clazz); public void setValue(String o); Index: LabelListCellRenderer.java =================================================================== RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/swing/LabelListCellRenderer.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** LabelListCellRenderer.java 22 Aug 2004 17:41:00 -0000 1.5 --- LabelListCellRenderer.java 23 Aug 2004 20:02:11 -0000 1.6 *************** *** 26,30 **** import org.javaowl.editor.ResourceEditorBean; - import com.hp.hpl.jena.ontology.Individual; import com.hp.hpl.jena.rdf.model.Property; --- 26,29 ---- *************** *** 35,39 **** super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); if (value != null) { - System.out.println(value.getClass()); if (value instanceof Property) { Property p = (Property) value; --- 34,37 ---- *************** *** 43,49 **** setText(((ResourceEditorBean) value).getLabel(true)); setToolTipText(((ResourceEditorBean) value).getComment(false)); - } else if (value instanceof Individual) { - setText(((Individual) value).getLabel(null)); - setToolTipText(((Individual) value).getComment(null)); } else setText(value.toString()); --- 41,44 ---- |
