Author: lgiessmann Date: Mon Nov 28 08:25:06 2011 New Revision: 1040 Log: gdl-frontend: Widgets: refactored GdlCheckBox, GdlRadioButton and GdlInputButton Modified: trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlInputButton.java trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java Modified: trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java ============================================================================== --- trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java Mon Nov 28 08:22:07 2011 (r1039) +++ trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java Mon Nov 28 08:25:06 2011 (r1040) @@ -51,15 +51,6 @@ @Override - protected void setReceivedData() throws InvalidGdlSchemaException, ExecutionException { - super.setReceivedData(); - ArrayList<String> options = this.tmService.getAllPossibleValues(); - - for (String opt : options) this.addUncheckedSubItem(opt); - } - - - @Override public ArrayList<String> getSelectedValues(){ ArrayList<String> result = new ArrayList<String>(); Modified: trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlInputButton.java ============================================================================== --- trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlInputButton.java Mon Nov 28 08:22:07 2011 (r1039) +++ trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlInputButton.java Mon Nov 28 08:25:06 2011 (r1040) @@ -1,5 +1,7 @@ package us.isidor.gdl.anaToMia.Widgets.button; +import java.util.ArrayList; + import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; @@ -20,4 +22,16 @@ public String getGroupName() throws InvalidGdlSchemaException{ return this.getId() + "__RB__GROUP"; } + + + public abstract void addUncheckedSubItem(String value) throws InvalidGdlSchemaException, ExecutionException; + + + @Override + protected void setReceivedData() throws InvalidGdlSchemaException, ExecutionException { + super.setReceivedData(); + ArrayList<String> options = this.tmService.getAllPossibleValues(); + + for (String opt : options) this.addUncheckedSubItem(opt); + } } Modified: trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java ============================================================================== --- trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java Mon Nov 28 08:22:07 2011 (r1039) +++ trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java Mon Nov 28 08:25:06 2011 (r1040) @@ -49,15 +49,6 @@ @Override - protected void setReceivedData() throws InvalidGdlSchemaException, ExecutionException { - super.setReceivedData(); - ArrayList<String> options = this.tmService.getAllPossibleValues(); - - for (String opt : options) this.addUncheckedSubItem(opt); - } - - - @Override public ArrayList<String> getSelectedValues(){ ArrayList<String> result = new ArrayList<String>();