Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [401] trunk/src/dl-learner/org/dllearner/gui
|
From: <ton...@us...> - 2008-01-19 16:04:45
|
Revision: 401
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=401&view=rev
Author: tonytacker
Date: 2008-01-19 08:04:43 -0800 (Sat, 19 Jan 2008)
Log Message:
-----------
- improved button for local file or URL @ KnowledgeSourcePanel
- deleted myrun-variable @ StartGUI
- add ComponentManager.getName($class) for class-names
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java
trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java
trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.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/KnowledgeSourcePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-01-19 14:32:48 UTC (rev 400)
+++ trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-01-19 16:04:43 UTC (rev 401)
@@ -27,10 +27,11 @@
import javax.swing.event.*;
import java.awt.BorderLayout;
+import java.awt.GridBagConstraints;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.GridBagLayout;
-//import org.dllearner.kb.*;
import org.dllearner.core.KnowledgeSource;
@@ -50,10 +51,11 @@
private JTextField fileDisplay;
private String[] kbBoxItems = {};
private JComboBox cb = new JComboBox(kbBoxItems);
- private JPanel openPanel;
+ private JPanel centerPanel, choosePanel, initPanel;
private Config config;
private int choosenClassIndex;
private List<Class<? extends KnowledgeSource>> sources;
+ private JLabel infoLabel = new JLabel("choose lokal file or type URL");
KnowledgeSourcePanel(final Config config) {
super(new BorderLayout());
@@ -62,7 +64,7 @@
sources = config.getComponentManager().getKnowledgeSources();
fc = new JFileChooser(new File("examples/"));
- openButton = new JButton("Open local file or type URL");
+ openButton = new JButton("choose local file");
openButton.addActionListener(this);
initButton = new JButton("Init KnowledgeSource");
@@ -86,24 +88,41 @@
// add to comboBox
for (int i=0; i<sources.size(); i++) {
- cb.addItem(sources.get(i).getSimpleName());
+ // cb.addItem(sources.get(i).getSimpleName());
+ cb.addItem(config.getComponentManager().getComponentName(sources.get(i)));
}
cb.addActionListener(this);
- openPanel = new JPanel();
-
- JPanel choosePanel = new JPanel();
+ choosePanel = new JPanel();
choosePanel.add(cb);
- JPanel initPanel = new JPanel();
+ initPanel = new JPanel();
initPanel.add(initButton);
- openPanel.add(fileDisplay);
- openPanel.add(openButton);
+ centerPanel = new JPanel();
+ // define GridBag
+ GridBagLayout gridbag = new GridBagLayout();
+ centerPanel.setLayout(gridbag);
+ GridBagConstraints constraints = new GridBagConstraints();
+ constraints.fill = GridBagConstraints.BOTH;
+ constraints.anchor = GridBagConstraints.CENTER;
+
+ buildConstraints(constraints, 0, 0, 1, 1, 100, 100);
+ gridbag.setConstraints(infoLabel, constraints);
+ centerPanel.add(infoLabel);
+
+ buildConstraints(constraints, 0, 1, 1, 1, 100, 100);
+ gridbag.setConstraints(fileDisplay, constraints);
+ centerPanel.add(fileDisplay);
+
+ buildConstraints(constraints, 1, 1, 1, 1, 100, 100);
+ gridbag.setConstraints(openButton, constraints);
+ centerPanel.add(openButton);
+
add(choosePanel, BorderLayout.PAGE_START);
- add(openPanel, BorderLayout.CENTER);
+ add(centerPanel, BorderLayout.CENTER);
add(initPanel, BorderLayout.PAGE_END);
choosenClassIndex = cb.getSelectedIndex();
@@ -112,6 +131,7 @@
public void actionPerformed(ActionEvent e) {
// read selected KnowledgeSourceClass
choosenClassIndex = cb.getSelectedIndex();
+ checkIfSparcle();
// open File
if (e.getSource() == openButton) {
@@ -133,5 +153,26 @@
System.out.println("init KnowledgeSource with \n" + sources.get(choosenClassIndex) + " and \n" + config.getURI() + "\n");
}
}
+
+ /*
+ * Define GridBagConstraints
+ */
+ private void buildConstraints(GridBagConstraints gbc, int gx, int gy, int gw, int gh, int wx, int wy) {
+ gbc.gridx = gx;
+ gbc.gridy = gy;
+ gbc.gridwidth = gw;
+ gbc.gridheight = gh;
+ gbc.weightx = wx;
+ gbc.weighty = wy;
+ }
+
+ private void checkIfSparcle() {
+ if (sources.get(choosenClassIndex).toString().contains("Sparql")) {
+ openButton.setEnabled(false);
+ }
+ else {
+ openButton.setEnabled(true);
+ }
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java 2008-01-19 14:32:48 UTC (rev 400)
+++ trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java 2008-01-19 16:04:43 UTC (rev 401)
@@ -67,7 +67,9 @@
// add into comboBox
learners = config.getComponentManager().getLearningAlgorithms();
for (int i=0; i<learners.size(); i++) {
- cb.addItem(learners.get(i).getSimpleName());
+ //cb.addItem(learners.get(i).getSimpleName());
+ //System.out.println(learners.get(i).getSimpleName());
+ cb.addItem(config.getComponentManager().getComponentName(learners.get(i)));
}
}
@@ -80,7 +82,7 @@
config.setLearningAlgorithm(config.getComponentManager().learningAlgorithm(learners.get(choosenClassIndex), config.getLearningProblem(), config.getReasoningService()));
config.getLearningAlgorithm().init();
}
- if (config.getStatus(5)) { // exemples are set
+ if (config.getStatus(5)) { // examples are set
System.out.println("LearningAlgorithm: " + config.getLearningAlgorithm() + "\n");
}
}
Modified: trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-01-19 14:32:48 UTC (rev 400)
+++ trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-01-19 16:04:43 UTC (rev 401)
@@ -88,7 +88,8 @@
// add into comboBox
for (int i=0; i<problems.size(); i++) {
- cb.addItem(problems.get(i).getSimpleName());
+ //cb.addItem(problems.get(i).getSimpleName());
+ cb.addItem(config.getComponentManager().getComponentName(problems.get(i)));
}
// read choosen LearningProblem
Modified: trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-01-19 14:32:48 UTC (rev 400)
+++ trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-01-19 16:04:43 UTC (rev 401)
@@ -66,7 +66,8 @@
// add into comboBox
reasoners = config.getComponentManager().getReasonerComponents();
for (int i=0; i<reasoners.size(); i++) {
- cb.addItem(reasoners.get(i).getSimpleName());
+ //cb.addItem(reasoners.get(i).getSimpleName());
+ cb.addItem(config.getComponentManager().getComponentName(reasoners.get(i)));
}
}
Modified: trunk/src/dl-learner/org/dllearner/gui/StartGUI.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/StartGUI.java 2008-01-19 14:32:48 UTC (rev 400)
+++ trunk/src/dl-learner/org/dllearner/gui/StartGUI.java 2008-01-19 16:04:43 UTC (rev 401)
@@ -38,8 +38,6 @@
private static final long serialVersionUID = -739265982906533775L;
- protected static StartGUI myrun;
-
public JTabbedPane tabPane = new JTabbedPane();
private JPanel tab1 = new JPanel();
@@ -77,15 +75,12 @@
logger.addAppender(consoleAppender);
logger.setLevel(Level.INFO);
- myrun = new StartGUI();
+ new StartGUI();
}
protected void renew() {
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.
|
