[DL-Learner SVN] SF.net SVN: dl-learner: [484] trunk/src/dl-learner/org/dllearner/gui

[<ton...@us...>]

Revision: 484
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=484&view=rev
Author:   tonytacker
Date:     2008-02-01 18:49:37 -0800 (Fri, 01 Feb 2008)

Log Message:
-----------
better ReasonerPanel

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java
    trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java

Modified: trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java	2008-02-02 02:17:19 UTC (rev 483)
+++ trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java	2008-02-02 02:49:37 UTC (rev 484)
@@ -67,9 +67,9 @@
 
 	choosePanel.add(cb);
 	choosePanel.add(getInstancesButton);
-	initPanel.add(initButton);
 	optionPanel = new OptionPanel(config, config.getKnowledgeSource(),
 		sources.get(choosenClassIndex));
+	initPanel.add(initButton);
 
 	add(choosePanel, BorderLayout.PAGE_START);
 	add(optionPanel, BorderLayout.CENTER);

Modified: trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java	2008-02-02 02:17:19 UTC (rev 483)
+++ trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java	2008-02-02 02:49:37 UTC (rev 484)
@@ -43,7 +43,7 @@
     private JPanel choosePanel = new JPanel();
     private JPanel initPanel = new JPanel();
     private OptionPanel optionPanel;
-    private JButton initButton;
+    private JButton initButton, getInstancesButton;
     private Config config;
     private String[] cbItems = {};
     private JComboBox cb = new JComboBox(cbItems);
@@ -53,15 +53,17 @@
 	super(new BorderLayout());
 
 	this.config = config;
+	reasoners = config.getComponentManager().getReasonerComponents();
 
 	initButton = new JButton("Init Reasoner");
 	initButton.addActionListener(this);
 	initPanel.add(initButton);
+	getInstancesButton = new JButton("Get Instances");
+	getInstancesButton.addActionListener(this);
 
 	choosePanel.add(cb);
 
 	// add into comboBox
-	reasoners = config.getComponentManager().getReasonerComponents();
 	for (int i = 0; i < reasoners.size(); i++) {
 	    cb.addItem(config.getComponentManager().getComponentName(
 		    reasoners.get(i)));
@@ -70,11 +72,13 @@
 	optionPanel = new OptionPanel(config, config.getReasoner(), reasoners
 		.get(choosenClassIndex));
 
+	choosePanel.add(getInstancesButton);
+
 	cb.addActionListener(this);
 
 	add(choosePanel, BorderLayout.PAGE_START);
-	add(initPanel, BorderLayout.CENTER);
-	add(optionPanel, BorderLayout.PAGE_END);
+	add(optionPanel, BorderLayout.CENTER);
+	add(initPanel, BorderLayout.PAGE_END);
 
     }
 
@@ -82,24 +86,40 @@
 	// read selected Class
 	choosenClassIndex = cb.getSelectedIndex();
 
-	if (e.getSource() == initButton && config.getKnowledgeSource() != null) {
-	    // set reasoner
-	    config.setReasoner(config.getComponentManager().reasoner(
-		    reasoners.get(choosenClassIndex),
-		    config.getKnowledgeSource()));
-	    config.getReasoner().init();
+	if (e.getSource() == getInstancesButton)
+	    getInstances();
 
-	    // set ReasoningService
-	    config.setReasoningService(config.getComponentManager()
-		    .reasoningService(config.getReasoner()));
+	if (e.getSource() == initButton && config.getKnowledgeSource() != null)
+	    init();
+    }
 
-	    System.out.println("init Reasoner");
-	    updateOptionPanel();
-	}
+    /*
+     * after this, you can change widgets
+     */
+    public void getInstances() {
+	config.setReasoner(config.getComponentManager().reasoner(
+		reasoners.get(choosenClassIndex), config.getKnowledgeSource()));
+	updateOptionPanel();
     }
 
+    /*
+     * after this, next tab can be used
+     */
+    public void init() {
+	config.getReasoner().init();
+	System.out.println("init Reasoner");
+	// set ReasoningService
+	config.setReasoningService(config.getComponentManager()
+		.reasoningService(config.getReasoner()));
+	System.out.println("init ReasoningService");
+    }
+
+    /*
+     * update OptionPanel with new selection
+     */
     public void updateOptionPanel() {
-	// update OptionPanel
-	optionPanel.update(config.getReasoner(), reasoners.get(choosenClassIndex));
+	optionPanel.update(config.getReasoner(), reasoners
+		.get(choosenClassIndex));
     }
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.