Author: lgiessmann Date: Tue Jul 26 12:19:25 2011 New Revision: 672

Log: gdl-frontend: Widgets: changed addToContainer => ButtonableObject

Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java

Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt Tue Jul 26 08:20:22 2011 (r671) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt Tue Jul 26 12:19:25 2011 (r672) @@ -1,3 +1,4 @@ +* Implement GdlInfo * Implement GdlButton(s) * Implement TopicMaps data consumption * Implement TopicMaps data generation

Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Tue Jul 26 08:20:22 2011 (r671) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Tue Jul 26 12:19:25 2011 (r672) @@ -93,13 +93,13 @@ // this method should be invoked if a new sub-element is added to this instance - protected void addToContainerPanel(Widget widget) throws ExecutionException, InvalidGdlSchemaException{ + protected ButtonableObject addToContainerPanel(Widget widget) throws ExecutionException, InvalidGdlSchemaException{ this.setContentOrientation(this.getContentOrientation()); - - - this.subElements.add(widget); - this.containerPanel.add(widget); + + ButtonableObject btn = new ButtonableObject(widget); + this.containerPanel.add(btn); + return btn; }

Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Tue Jul 26 08:20:22 2011 (r671) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Tue Jul 26 12:19:25 2011 (r672) @@ -2,7 +2,6 @@

import java.util.ArrayList; import java.util.List; - import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Locator; @@ -15,12 +14,10 @@ import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis.RoleType; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis.TMDM; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis.TopicType; -import us.isidor.gdl.anaToMia.Widgets.container.GdlUnit; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes; import com.google.gwt.core.client.JsArray; -import com.google.gwt.user.client.Window;

public class TmHelper {

Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Tue Jul 26 08:20:22 2011 (r671) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Tue Jul 26 12:19:25 2011 (r672) @@ -7,6 +7,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Name; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; +import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.GdlPosition; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; @@ -43,9 +44,10 @@ // instances ov GdlView does not organize their sub-elements in // tables, sub-elements are placed directly on the mainpanel @Override - protected void addToContainerPanel(Widget widget){ + protected ButtonableObject addToContainerPanel(Widget widget){ this.subElements.add(widget); this.mainPanel.add(widget); + return null; }