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

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

Revision: 381
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=381&view=rev
Author:   tonytacker
Date:     2008-01-16 07:39:43 -0800 (Wed, 16 Jan 2008)

Log Message:
-----------
improved handling for URI

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

Modified: trunk/src/dl-learner/org/dllearner/gui/Config.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/Config.java	2008-01-16 12:42:45 UTC (rev 380)
+++ trunk/src/dl-learner/org/dllearner/gui/Config.java	2008-01-16 15:39:43 UTC (rev 381)
@@ -20,9 +20,9 @@
  *
  */
 
-import java.io.File;
 import java.util.HashSet;
 import java.util.Set;
+//import java.io.File;
 
 import org.dllearner.core.ComponentManager;
 import org.dllearner.core.KnowledgeSource;

Modified: trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java	2008-01-16 12:42:45 UTC (rev 380)
+++ trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java	2008-01-16 15:39:43 UTC (rev 381)
@@ -24,6 +24,7 @@
 import java.util.List;
 
 import javax.swing.*;
+import javax.swing.event.*;
 
 import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
@@ -47,21 +48,21 @@
 	private JFileChooser fc;
 	private JButton openButton, initButton;
 	private JTextField fileDisplay;
-    private String[] kbBoxItems = {"Pleae select a type"};
-	private JComboBox cb = new JComboBox(kbBoxItems);	
+    private String[] kbBoxItems = {};
+    private JComboBox cb = new JComboBox(kbBoxItems);	
 	private JPanel openPanel;
 	private Config config;
 	private int choosenClassIndex;
 	private List<Class<? extends KnowledgeSource>> sources;
 	
-	KnowledgeSourcePanel(Config config) {
+	KnowledgeSourcePanel(final Config config) {
 		super(new BorderLayout());
 	
 		this.config = config;
 		sources = config.getComponentManager().getKnowledgeSources();
 		
 		fc = new JFileChooser(new File("examples/"));
-		openButton = new JButton("Open local file otherwise type URL + ENTER");
+		openButton = new JButton("Open local file or type URL");
 		openButton.addActionListener(this);
 		
 		initButton = new JButton("Init KnowledgeSource");
@@ -69,8 +70,21 @@
 		
 		fileDisplay = new JTextField(35);
 		fileDisplay.setEditable(true);
-		fileDisplay.addActionListener(this);
 		
+		// update config if textfield changed
+		fileDisplay.getDocument().addDocumentListener(new DocumentListener() {
+			public void insertUpdate(DocumentEvent e) {
+				config.setURI(fileDisplay.getText());
+			}
+			public void removeUpdate(DocumentEvent e) {
+				config.setURI(fileDisplay.getText());
+			}
+			public void changedUpdate(DocumentEvent e) {
+				config.setURI(fileDisplay.getText());
+			}
+		});
+		
+		// parse 
 		for (int i=0; i<sources.size(); i++) {
 			String ksClass = sources.get(i).toString().substring(23).concat(".class");
 			cb.addItem(ksClass); 
@@ -85,20 +99,21 @@
 
 		JPanel initPanel = new JPanel();
 		initPanel.add(initButton);
+
+		openPanel.add(fileDisplay);
+		openPanel.add(openButton);
 		
 		add(choosePanel, BorderLayout.PAGE_START);
 		add(openPanel, BorderLayout.CENTER);
 		add(initPanel, BorderLayout.PAGE_END);
+		
+		choosenClassIndex = cb.getSelectedIndex();
 	}
 	
 	public void actionPerformed(ActionEvent e) {
-		// change URI
-		if (e.getSource() == fileDisplay) {
-			System.out.println(fileDisplay.getText());
-			config.setURI(fileDisplay.getText());
-		}
+		// read selected KnowledgeSourceClass
+        choosenClassIndex = cb.getSelectedIndex();
 		
-		
 		// open File
 		if (e.getSource() == openButton) {
 			int returnVal = fc.showOpenDialog(KnowledgeSourcePanel.this);
@@ -110,35 +125,14 @@
 			}
 			return;
 		}
-
-		
-		// something changes in cb
-		if (cb.isEnabled()) {
-	        System.out.println("Item: " + cb.getSelectedItem());
-	        System.out.println("Item: " + cb.getSelectedIndex());
-	        
-	        choosenClassIndex = cb.getSelectedIndex() -1;
-	        
-	        makeCenterClean();
-			openPanel.add(fileDisplay);
-			openPanel.add(openButton);
-	        
-		}
-
+	
 		// init
 		if (e.getSource() == initButton) {
-			//String testURI = config.getURI(); 
 			config.setKnowledgeSource(config.getComponentManager().knowledgeSource(sources.get(choosenClassIndex)));
 			config.getComponentManager().applyConfigEntry(config.getKnowledgeSource(), "url", config.getURI());				
 			config.getKnowledgeSource().init();
-			System.out.println("init KnowledgeSource with " + sources.get(choosenClassIndex) + " and ...");
+			System.out.println("init KnowledgeSource with \n" + sources.get(choosenClassIndex) + " and \n" + config.getURI() + "\n");
 		}
 	}
-	
-	private void makeCenterClean() {
-        openPanel.remove(fileDisplay);
-        openPanel.remove(openButton);
-        openPanel.repaint();
-        StartGUI.myrun.renew();
-    }
+  
 }


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