[DL-Learner SVN] SF.net SVN: dl-learner:[1885] trunk/src/dl-learner/org/dllearner/tools/ protege

[<hee...@us...>]

Revision: 1885
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1885&view=rev
Author:   heeroyuy
Date:     2009-10-08 11:51:27 +0000 (Thu, 08 Oct 2009)

Log Message:
-----------
-small change in OptionPanel class

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
    trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java
    trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java	2009-10-08 11:04:20 UTC (rev 1884)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java	2009-10-08 11:51:27 UTC (rev 1885)
@@ -300,13 +300,13 @@
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		cm.applyConfigEntry(la, "useAllConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getAllBox().isSelected());
-		cm.applyConfigEntry(la, "useExistsConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getSomeBox().isSelected());
-		cm.applyConfigEntry(la, "useHasValueConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getValueBox().isSelected());
-		cm.applyConfigEntry(la, "useNegation", view.getPosAndNegSelectPanel().getOptionPanel().getNotBox().isSelected());
-		cm.applyConfigEntry(la, "useCardinalityRestrictions", view.getPosAndNegSelectPanel().getOptionPanel().getMoreBox().isSelected());
-		if(view.getPosAndNegSelectPanel().getOptionPanel().getMoreBox().isSelected()) {
-			cm.applyConfigEntry(la, "cardinalityLimit", view.getPosAndNegSelectPanel().getOptionPanel().getCountMoreBox().getSelectedItem());
+		cm.applyConfigEntry(la, "useAllConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getAllBox());
+		cm.applyConfigEntry(la, "useExistsConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getSomeBox());
+		cm.applyConfigEntry(la, "useHasValueConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getValueBox());
+		cm.applyConfigEntry(la, "useNegation", view.getPosAndNegSelectPanel().getOptionPanel().getNotBox());
+		cm.applyConfigEntry(la, "useCardinalityRestrictions", view.getPosAndNegSelectPanel().getOptionPanel().getMoreBox());
+		if(view.getPosAndNegSelectPanel().getOptionPanel().getMoreBox()) {
+			cm.applyConfigEntry(la, "cardinalityLimit", view.getPosAndNegSelectPanel().getOptionPanel().getCountMoreBox());
 		}
 		
 		cm.applyConfigEntry(la, "noisePercentage", view.getPosAndNegSelectPanel().getOptionPanel().getMinAccuracy());

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java	2009-10-08 11:04:20 UTC (rev 1884)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java	2009-10-08 11:51:27 UTC (rev 1885)
@@ -199,20 +199,20 @@
 		return elProfileButton;
 	}
 
-	public JCheckBox getAllBox() {
-		return allBox;
+	public boolean getAllBox() {
+		return allBox.isSelected();
 	}
 
-	public JCheckBox getSomeBox() {
-		return someBox;
+	public boolean getSomeBox() {
+		return someBox.isSelected();
 	}
 
-	public JCheckBox getNotBox() {
-		return notBox;
+	public boolean getNotBox() {
+		return notBox.isSelected();
 	}
 
-	public JCheckBox getValueBox() {
-		return valueBox;
+	public boolean getValueBox() {
+		return valueBox.isSelected();
 	}
 
 	public JPanel getProfilePanel() {
@@ -220,12 +220,12 @@
 	}
 
 
-	public JComboBox getCountMoreBox() {
-		return countMoreBox;
+	public int getCountMoreBox() {
+		return Integer.parseInt(countMoreBox.getSelectedItem().toString());
 	}
 
-	public JCheckBox getMoreBox() {
-		return moreBox;
+	public boolean getMoreBox() {
+		return moreBox.isSelected();
 	}
 	
 	public JPanel getRadioBoxPanel() {
@@ -236,4 +236,26 @@
 		return checkBoxPanel;
 	}
 	
+	public void setToOWLProfile() {
+		allBox.setSelected(true);
+		someBox.setSelected(true);
+		notBox.setSelected(true);
+		valueBox.setSelected(true);
+		moreBox.setSelected(true);
+		this.setCountMoreBoxEnabled(true);
+	}
+	
+	public void setToELProfile() {
+		allBox.setSelected(false);
+		someBox.setSelected(true);
+		notBox.setSelected(false);
+		valueBox.setSelected(false);
+		moreBox.setSelected(false);
+		this.setCountMoreBoxEnabled(false);
+	}
+	
+	public void setCountMoreBoxEnabled(boolean isEnabled) {
+		countMoreBox.setEnabled(isEnabled);
+	}
+	
 }

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java	2009-10-08 11:04:20 UTC (rev 1884)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java	2009-10-08 11:51:27 UTC (rev 1885)
@@ -33,10 +33,10 @@
 			}
 
 		} else if(e.toString().contains(VALUE_STRING)) {
-			if(option.getMoreBox().isSelected()) {
-				option.getCountMoreBox().setEnabled(true);
+			if(option.getMoreBox()) {
+				option.setCountMoreBoxEnabled(true);
 			} else {
-				option.getCountMoreBox().setEnabled(false);
+				option.setCountMoreBoxEnabled(false);
 			}
 		}
 	}
@@ -44,23 +44,15 @@
 	private void setToOWLProfile() {
 		option.getOwlRadioButton().setSelected(true);
 		option.getElProfileButton().setSelected(false);
-		option.getAllBox().setSelected(true);
-		option.getSomeBox().setSelected(true);
-		option.getNotBox().setSelected(true);
-		option.getValueBox().setSelected(true);
-		option.getMoreBox().setSelected(true);
-		option.getCountMoreBox().setEnabled(true);
+		option.setToOWLProfile();
+
 	}
 
 	private void setToELProfile() {
 		option.getOwlRadioButton().setSelected(false);
 		option.getElProfileButton().setSelected(true);
-		option.getAllBox().setSelected(false);
-		option.getSomeBox().setSelected(true);
-		option.getNotBox().setSelected(false);
-		option.getValueBox().setSelected(false);
-		option.getMoreBox().setSelected(false);
-		option.getCountMoreBox().setEnabled(false);
+		option.setToELProfile();
+
 	}
 
 }


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