|
From: Elmer G. <ega...@us...> - 2005-05-06 17:54:06
|
Update of /cvsroot/javaowl/JOWLEditor/src/org/javaowl/editor/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14758/src/org/javaowl/editor/swing Modified Files: BrowsePage.java EditPage.java Log Message: Changed reasoner to new pellet reasoner Index: BrowsePage.java =================================================================== RCS file: /cvsroot/javaowl/JOWLEditor/src/org/javaowl/editor/swing/BrowsePage.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** BrowsePage.java 6 Oct 2004 13:15:16 -0000 1.1.1.1 --- BrowsePage.java 6 May 2005 17:53:54 -0000 1.2 *************** *** 86,90 **** if (e.getClickCount() == 2) { int index = instancesList.locationToIndex(e.getPoint()); ! ResourceEditorBean resource = (ResourceEditorBean) instances.elementAt(index); notifyEditResource(resource); } --- 86,91 ---- if (e.getClickCount() == 2) { int index = instancesList.locationToIndex(e.getPoint()); ! ResourceEditorBean resource = ! (ResourceEditorBean) instances.elementAt(index); notifyEditResource(resource); } *************** *** 95,99 **** public void keyReleased(KeyEvent e) { if (KeyEvent.VK_DELETE == e.getKeyCode()) { ! ResourceEditorBean resource = (ResourceEditorBean) instancesList.getSelectedValue(); instances.removeElement(resource); notifyRemoveResource(resource); --- 96,101 ---- public void keyReleased(KeyEvent e) { if (KeyEvent.VK_DELETE == e.getKeyCode()) { ! ResourceEditorBean resource = ! (ResourceEditorBean) instancesList.getSelectedValue(); instances.removeElement(resource); notifyRemoveResource(resource); *************** *** 169,171 **** } ! } \ No newline at end of file --- 171,173 ---- } ! } Index: EditPage.java =================================================================== RCS file: /cvsroot/javaowl/JOWLEditor/src/org/javaowl/editor/swing/EditPage.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** EditPage.java 6 Oct 2004 13:15:16 -0000 1.1.1.1 --- EditPage.java 6 May 2005 17:53:54 -0000 1.2 *************** *** 30,33 **** --- 30,34 ---- import java.util.Iterator; import java.util.Map; + import java.util.Arrays; import javax.swing.BoxLayout; *************** *** 77,83 **** private Editor e; ! private ResourceEditorBean resource; ! public EditPage(ModelEditor editor, Map propertyEditors, Editor e, ResourceEditorBean resource) { this.editor = editor; this.e = e; --- 78,85 ---- private Editor e; ! private ResourceEditorBean resource; ! public EditPage(ModelEditor editor, Map propertyEditors, Editor e, ! ResourceEditorBean resource) { this.editor = editor; this.e = e; *************** *** 105,113 **** propertiesList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); MouseListener mouseListener = new MouseAdapter() { ! public void mouseClicked(MouseEvent e) { ! int index = propertiesList.locationToIndex(e.getPoint()); ! editProperty((OntProperty) properties.elementAt(index)); ! } ! }; propertiesList.addMouseListener(mouseListener); propertiesList.setCellRenderer(renderer); --- 107,115 ---- propertiesList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); MouseListener mouseListener = new MouseAdapter() { ! public void mouseClicked(MouseEvent e) { ! int index = propertiesList.locationToIndex(e.getPoint()); ! editProperty((OntProperty) properties.elementAt(index)); ! } ! }; propertiesList.addMouseListener(mouseListener); propertiesList.setCellRenderer(renderer); *************** *** 116,154 **** table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); mouseListener = new MouseAdapter() { ! public void mouseClicked(MouseEvent e) { ! int index = table.getSelectedRow(); ! StatementEditorBean stmt = values.getRow(index); ! editProperty(stmt); ! } ! }; ! table.addMouseListener(mouseListener); ! table.addKeyListener(new KeyAdapter() { ! public void keyReleased(KeyEvent e) { ! if (KeyEvent.VK_DELETE == e.getKeyCode()) { int index = table.getSelectedRow(); ! StatementEditorBean stmt = values.removeRow(index); ! removeStatement(stmt); } ! } ! }); table.setDefaultRenderer(Object.class, new DefaultTableCellRenderer() { ! public void setValue(Object value) { ! if (value instanceof Property) { ! Property p = (Property) value; ! setText(p.getLocalName()); ! setToolTipText(value.toString()); ! } else if (value instanceof ResourceEditorBean) { ! setText(((ResourceEditorBean) value).getLabel(true)); ! setToolTipText(((ResourceEditorBean) value).getComment(false)); ! } else if (value instanceof Literal) { ! Literal literal = (Literal) value; ! setText(literal.getString()); ! setToolTipText(literal.getDatatypeURI()); ! } else { ! setText(value.toString()); } ! } ! }); JTextArea comment = new JTextArea(); comment.setLineWrap(true); --- 118,156 ---- table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); mouseListener = new MouseAdapter() { ! public void mouseClicked(MouseEvent e) { int index = table.getSelectedRow(); ! StatementEditorBean stmt = values.getRow(index); ! editProperty(stmt); } + }; + table.addMouseListener(mouseListener); + table.addKeyListener(new KeyAdapter() { + public void keyReleased(KeyEvent e) { + if (KeyEvent.VK_DELETE == e.getKeyCode()) { + int index = table.getSelectedRow(); + StatementEditorBean stmt = values.removeRow(index); + removeStatement(stmt); + } ! } ! }); table.setDefaultRenderer(Object.class, new DefaultTableCellRenderer() { ! public void setValue(Object value) { ! if (value instanceof Property) { ! Property p = (Property) value; ! setText(p.getLocalName()); ! setToolTipText(value.toString()); ! } else if (value instanceof ResourceEditorBean) { ! setText(((ResourceEditorBean) value).getLabel(true)); ! setToolTipText(((ResourceEditorBean) value).getComment(false)); ! } else if (value instanceof Literal) { ! Literal literal = (Literal) value; ! setText(literal.getString()); ! setToolTipText(literal.getDatatypeURI()); ! } else { ! setText(value.toString()); ! } } ! }); JTextArea comment = new JTextArea(); comment.setLineWrap(true); *************** *** 173,178 **** left.setDividerLocation(200); left.setResizeWeight(0.5); ! JSplitPane right = new JSplitPane(JSplitPane.VERTICAL_SPLIT, new JScrollPane( ! propertiesList), commentPane); right.setDividerLocation(400); right.setResizeWeight(0.5); --- 175,180 ---- left.setDividerLocation(200); left.setResizeWeight(0.5); ! JSplitPane right = new JSplitPane(JSplitPane.VERTICAL_SPLIT, ! new JScrollPane(propertiesList), commentPane); right.setDividerLocation(400); right.setResizeWeight(0.5); *************** *** 194,201 **** currentStatement = null; currentProperty = property; ! propertyEditor = (PropertyEditorPagelet) propertyEditors.get(currentProperty.getURI()); if (propertyEditor == null) { propertyEditor = (PropertyEditorPagelet) propertyEditors.get(""); } propertyEditor.setRangeType(editor.getPropertyRange(currentProperty.getURI())); OntClass ontClass = editor.getValidLeafClass(currentProperty); --- 196,205 ---- currentStatement = null; currentProperty = property; ! propertyEditor = ! (PropertyEditorPagelet) propertyEditors.get(currentProperty.getURI()); if (propertyEditor == null) { propertyEditor = (PropertyEditorPagelet) propertyEditors.get(""); } + propertyEditor.setRangeType(editor.getPropertyRange(currentProperty.getURI())); OntClass ontClass = editor.getValidLeafClass(currentProperty); |