From: <ton...@us...> - 2008-01-06 18:47:25
|
Revision: 345 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=345&view=rev Author: tonytacker Date: 2008-01-06 10:47:12 -0800 (Sun, 06 Jan 2008) Log Message: ----------- you can choose owl and load a file at first tab (knowledgesource) - control over last tab (output) - by choosing dig (tab 2) it crash, don't know why - init doesn't work Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/gui/Config.java trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java trunk/src/dl-learner/org/dllearner/gui/OutputPanel.java trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java trunk/src/dl-learner/org/dllearner/gui/StartGUI.java Modified: trunk/src/dl-learner/org/dllearner/gui/Config.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-01-06 15:14:35 UTC (rev 344) +++ trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-01-06 18:47:12 UTC (rev 345) @@ -45,7 +45,7 @@ protected static ReasonerComponent reasoner; protected static ReasoningService rs; protected static List<Individual> individuals; - protected static String[] kbBoxItems = {"Pleae select a type", "KBFile", "OWLFile", "SparqleEndpoint"}; + protected String[] kbBoxItems = {"Pleae select a type", "KBFile", "OWLFile", "SparqleEndpoint"}; /** * status should show witch variables are set Modified: trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-01-06 15:14:35 UTC (rev 344) +++ trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-01-06 18:47:12 UTC (rev 345) @@ -21,7 +21,7 @@ */ import java.io.File; -//import java.util.List; +import java.util.List; import javax.swing.*; @@ -32,6 +32,7 @@ import org.dllearner.kb.OWLFile; import org.dllearner.kb.KBFile; +import org.dllearner.core.KnowledgeSource; /** @@ -48,10 +49,10 @@ private JFileChooser fc; private JButton openButton; private JTextField fileDisplay; - private String[] kbBoxItems = StartGUI.config.getKBBoxItems(); + private String[] kbBoxItems = StartGUI.myconfig.getKBBoxItems(); private JComboBox cb = new JComboBox(kbBoxItems); private JPanel openPanel = new JPanel(); - + KnowledgeSourcePanel() { super(new BorderLayout()); @@ -62,8 +63,8 @@ fileDisplay.setEditable(false); // test output - //List<Class<? extends KnowledgeSource>> sources = config.getComponentManager().getKnowledgeSources(); - //for (int i=0; i<sources.size(); i++) cb.addItem(sources.get(i)); + List<Class<? extends KnowledgeSource>> sources = StartGUI.myconfig.getComponentManager().getKnowledgeSources(); + for (int i=0; i<sources.size(); i++) cb.addItem(sources.get(i)); cb.addActionListener(this); JPanel choosePanel = new JPanel(); @@ -78,12 +79,14 @@ if (e.getSource() == openButton) { int returnVal = fc.showOpenDialog(KnowledgeSourcePanel.this); if (returnVal == JFileChooser.APPROVE_OPTION) { - StartGUI.config.setFile(fc.getSelectedFile()); //save variable - fileDisplay.setText(StartGUI.config.getFile().toString()); - StartGUI.config.getComponentManager().applyConfigEntry(StartGUI.config.getKnowledgeSource(), "url", StartGUI.config.getFile().toURI().toString()); - StartGUI.config.getKnowledgeSource().init(); + StartGUI.myconfig.setFile(fc.getSelectedFile()); //save variable + fileDisplay.setText(StartGUI.myconfig.getFile().toString()); + System.out.println("Init KnowledgeSource after loading file ... show over output"); + StartGUI.myconfig.getComponentManager().applyConfigEntry(StartGUI.myconfig.getKnowledgeSource(), "url", StartGUI.myconfig.getFile().toURI().toString()); + StartGUI.myconfig.getKnowledgeSource().init(); } } + // choose none if (cb.getSelectedItem().toString() == kbBoxItems[0]) { System.out.println("Item: " + cb.getSelectedItem()); @@ -92,19 +95,16 @@ // choose KB class if (cb.getSelectedItem().toString() == kbBoxItems[1]) { System.out.println("Item: " + cb.getSelectedItem()); - makeCenterClean(); - openPanel.add(fileDisplay); - openPanel.add(openButton); - openPanel.repaint(); - StartGUI.config.setKnowledgeSource(StartGUI.config.getComponentManager().knowledgeSource(KBFile.class)); + makeCenterClean(); } // choose OWL class if (cb.getSelectedItem().toString() == kbBoxItems[2]) { - makeCenterClean(); + System.out.println("Item: " + cb.getSelectedItem()); + makeCenterClean(); openPanel.add(fileDisplay); openPanel.add(openButton); openPanel.repaint(); - StartGUI.config.setKnowledgeSource(StartGUI.config.getComponentManager().knowledgeSource(OWLFile.class)); + StartGUI.myconfig.setKnowledgeSource(StartGUI.myconfig.getComponentManager().knowledgeSource(OWLFile.class)); } // choose SPARCLE class if (cb.getSelectedItem().toString() == kbBoxItems[3]) { @@ -117,6 +117,6 @@ openPanel.remove(fileDisplay); openPanel.remove(openButton); openPanel.repaint(); - StartGUI.renew(); - } + StartGUI.myrun.renew(); + } } Modified: trunk/src/dl-learner/org/dllearner/gui/OutputPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/OutputPanel.java 2008-01-06 15:14:35 UTC (rev 344) +++ trunk/src/dl-learner/org/dllearner/gui/OutputPanel.java 2008-01-06 18:47:12 UTC (rev 345) @@ -58,11 +58,11 @@ public void actionPerformed(ActionEvent e) { if (e.getSource() == showButton) { - if (StartGUI.config.getStatus(1)) { // file is selected and exist? - infoArea.append("SourceClass: " + StartGUI.config.getKnowledgeSource().toString() + "\n"); - infoArea.append("FILE: " + StartGUI.config.getFile().toString() + "\n"); + if (StartGUI.myconfig.getStatus(1)) { // file is selected and exist? + infoArea.append("SourceClass: " + StartGUI.myconfig.getKnowledgeSource().toString() + "\n"); + infoArea.append("FILE: " + StartGUI.myconfig.getFile().toString() + "\n"); } - if (StartGUI.config.getStatus(2)) { + if (StartGUI.myconfig.getStatus(2)) { } Modified: trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-01-06 15:14:35 UTC (rev 344) +++ trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-01-06 18:47:12 UTC (rev 345) @@ -74,8 +74,8 @@ public void actionPerformed(ActionEvent e) { if (e.getSource() == digButton) { // DIG - StartGUI.config.setReasoner(StartGUI.config.getComponentManager().reasoner(DIGReasoner.class, StartGUI.config.getKnowledgeSource())); - //StartGUI.config.getReasoner().init(); //error + StartGUI.myconfig.setReasoner(StartGUI.myconfig.getComponentManager().reasoner(DIGReasoner.class, StartGUI.myconfig.getKnowledgeSource())); + StartGUI.myconfig.getReasoner().init(); //error System.out.println("test"); //config.setReasoningService(config.getComponentManager().reasoningService(config.getReasoner())); Modified: trunk/src/dl-learner/org/dllearner/gui/StartGUI.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/StartGUI.java 2008-01-06 15:14:35 UTC (rev 344) +++ trunk/src/dl-learner/org/dllearner/gui/StartGUI.java 2008-01-06 18:47:12 UTC (rev 345) @@ -33,15 +33,18 @@ private static final long serialVersionUID = -739265982906533775L; - public static Config config = new Config(); + protected static StartGUI myrun; - private static final JTabbedPane tabPane = new JTabbedPane(); + protected static Config myconfig = new Config(); + + public JTabbedPane tabPane = new JTabbedPane(); + private JPanel tab1 = new JPanel(); private JPanel tab2 = new JPanel(); private JPanel tab3 = new JPanel(); private JPanel tab4 = new JPanel(); private JPanel tab5 = new JPanel(); - + public StartGUI() { this.setTitle("DL-Learner GUI"); this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); @@ -55,17 +58,22 @@ tabPane.addTab("Knowledge Source", tab1); tabPane.addTab("Reasoner", tab2); tabPane.addTab("Learning Problem", tab3); - tabPane.addTab("Learning Algortihm", tab4); + tabPane.addTab("Learning Algorithm", tab4); tabPane.addTab("Output", tab5); this.add(tabPane); this.setVisible(true); } - + public static void main(String[] args) { - new StartGUI(); + myrun = new StartGUI(); } - protected static void renew() { - tabPane.repaint(); + protected void renew() { + myrun.tabPane.repaint(); } + + protected StartGUI getStartGUI() { + return myrun; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |