July 2011 - isidorus-cvs@common-lisp.net - mailman3.common-lisp.net

[isidorus-cvs] r686 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base complexData text view
by lgiessmann＠common-lisp.net 28 Jul '11

28 Jul '11

Author: lgiessmann Date: Thu Jul 28 02:20:26 2011 New Revision: 686 Log: gdl-frontend: Widgets: removed the interface IGdlHasValue (the interface IgdlHasValueGroup will used instead) Deleted: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/IGdlHasValue.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDatePicker.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultCreatorTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultEditorTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialCreatorTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialEditorTopicView.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/base/GdlPanel.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Thu Jul 28 02:20:26 2011 (r686) @@ -11,7 +11,6 @@ import us.isidor.gdl.anaToMia.Widgets.environment.IDeleteCallback; import us.isidor.gdl.anaToMia.Widgets.environment.IOnErrorCallback; import us.isidor.gdl.anaToMia.Widgets.environment.ILoadSchemaCallback; -import us.isidor.gdl.anaToMia.Widgets.environment.InvalidContentException; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes; import us.isidor.gdl.anaToMia.Widgets.view.GdlDefaultTopicView; @@ -225,21 +224,18 @@ // onValidateHandlers are executed public void doValidate() { try{ - if(tmEngine == null || requestedSchemaTm == null){ + if(tmEngine == null || requestedSchemaTm == null) throw new ExecutionException("No Topic Maps engine was set yet"); - } - if(!this.view.validate()){ - throw new InvalidContentException("The topic map content is not valid:\n" + tmEngine.exportTm(view.getContent())); - } - }catch(InvalidContentException e){ - for (IOnErrorCallback handler : localOnErrorContainer) { - handler.onError(GdlErrorTypes.ValidateError, e); - } + // TODO: validate + // throw new InvalidContentException("The topic map content is not valid:\n" + tmEngine.exportTm(view.getContent())); + + //}catch(InvalidContentException e){ + // for (IOnErrorCallback handler : localOnErrorContainer) + // handler.onError(GdlErrorTypes.ValidateError, e); } catch(Exception e){ - for (IOnErrorCallback handler : localOnErrorContainer) { + for (IOnErrorCallback handler : localOnErrorContainer) handler.onError(GdlErrorTypes.ExecutionError, e); - } } } @@ -249,17 +245,16 @@ // onDeleteHandlers are executed and the panel's content is removed public void doDelete() { try{ - if(tmEngine == null || requestedSchemaTm == null){ + if(tmEngine == null || requestedSchemaTm == null) throw new ExecutionException("No Topic Maps engine was set yet"); - } - if(this.deleteCallback == null){ + + if(this.deleteCallback == null) throw new ExecutionException("No DeleteCallback was set yet"); - } + this.deleteCallback.deleteTmConstruct(requestedSchemaTm, TopicMapsTypes.TopicMap); }catch(Exception e){ - for (IOnErrorCallback handler : localOnErrorContainer) { + for (IOnErrorCallback handler : localOnErrorContainer) handler.onError(GdlErrorTypes.DeleteError, e); - } } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDatePicker.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDatePicker.java Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDatePicker.java Thu Jul 28 02:20:26 2011 (r686) @@ -1,6 +1,5 @@ package us.isidor.gdl.anaToMia.Widgets.complexData; -import java.util.ArrayList; import com.google.gwt.event.dom.client.BlurEvent; import com.google.gwt.event.dom.client.BlurHandler; @@ -24,19 +23,16 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.datepicker.client.DatePicker; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; -import us.isidor.gdl.anaToMia.Widgets.base.IGdlHasValue; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.FocusStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.HoverStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair; -public class GdlDatePicker extends GdlComplexData implements IGdlHasValue { +public class GdlDatePicker extends GdlComplexData { // some constructors protected GdlDatePicker(){ @@ -77,29 +73,7 @@ public ButtonableObject removeDatePicker(DateWidget elem) throws InvalidGdlSchemaException, ExecutionException{ return this.removeFromContainer(elem); - } - - - @Override - public ArrayList<String> getStringValue() { - // TODO: implement - return null; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public boolean validate() { - // TODO Auto-generated method stub - return false; - } - + } protected class DateWidget extends DatePicker implements HasFocusHandlers, HasBlurHandlers, HasMouseDownHandlers, HasMouseOutHandlers, HasMouseOverHandlers, HasMouseUpHandlers { Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Thu Jul 28 02:20:26 2011 (r686) @@ -6,13 +6,9 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.ListBox; import com.google.gwt.user.client.ui.Widget; - import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; -import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; -import us.isidor.gdl.anaToMia.Widgets.base.IGdlHasValue; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.FocusStyleHandler; @@ -20,7 +16,7 @@ import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; -public class GdlListBox extends GdlTextObject implements IGdlHasValue{ +public class GdlListBox extends GdlTextObject { // some constructors protected GdlListBox() throws InvalidGdlSchemaException, ExecutionException { super(); @@ -153,30 +149,4 @@ this.setSize(widget, this.getSize()); this.setOnePerGroup(widget, this.getOnePerGroup()); } - - - // returns an ArrayList of string that contains all selected values - @Override - public ArrayList<String> getStringValue() { - ArrayList<String> results = new ArrayList<String>(); - for (Widget elem : super.subElements) { - ListBox lb = (ListBox)((ButtonableObject)elem).getMainObject(); - if(lb.getSelectedIndex() != -1) results.add(lb.getValue(lb.getSelectedIndex())); - } - return results; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public boolean validate() { - // TODO Auto-generated method stub - return false; - } } \ No newline at end of file Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Thu Jul 28 02:20:26 2011 (r686) @@ -1,7 +1,5 @@ package us.isidor.gdl.anaToMia.Widgets.text; -import java.util.ArrayList; - import com.google.gwt.event.dom.client.BlurEvent; import com.google.gwt.event.dom.client.BlurHandler; import com.google.gwt.event.dom.client.ClickEvent; @@ -14,25 +12,20 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.Widget; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; -import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; -import us.isidor.gdl.anaToMia.Widgets.base.IGdlHasValue; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.FocusStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.HoverStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; import us.isidor.gdl.anaToMia.Widgets.value.CursorValue; import us.isidor.gdl.anaToMia.Widgets.value.TextDecorationValue; -public class GdlReference extends GdlTextObject implements IGdlHasValue{ +public class GdlReference extends GdlTextObject{ // some constructors protected GdlReference() throws InvalidGdlSchemaException, ExecutionException { super(); @@ -150,30 +143,6 @@ } - @Override - public ArrayList<String> getStringValue() { - ArrayList<String> result = new ArrayList<String>(); - for (Widget widget : this.subElements) { - result.add(((ReferenceWidget)((ButtonableObject)widget).getMainObject()).getText()); - } - return result; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public boolean validate() { - // TODO Auto-generated method stub - return false; - } - - // this class is responsible for the default click behavior of a GdlReference instance protected class ReferenceClickHandler implements ClickHandler { @Override Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Thu Jul 28 02:20:26 2011 (r686) @@ -12,14 +12,11 @@ import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.TextArea; import com.google.gwt.user.client.ui.Widget; - import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; -import us.isidor.gdl.anaToMia.Widgets.base.IGdlHasValue; import us.isidor.gdl.anaToMia.Widgets.base.IGdlHasValueGroup; import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; @@ -37,7 +34,7 @@ -public class GdlText extends GdlTextObject implements IGdlHasValue, IGdlHasValueGroup { +public class GdlText extends GdlTextObject implements IGdlHasValueGroup { protected ArrayList<PasswordKeyPressHandler> passwordKeyPressHandler = null; protected ArrayList<HandlerRegistration> passwordKeyPressRegistrations = null; protected Topic valueGroupTopic = null; @@ -584,30 +581,6 @@ } } - // returns the results of all text area elements - @Override - public ArrayList<String> getStringValue() { - ArrayList<String> results = new ArrayList<String>(); - for (Widget item : this.subElements) { - results.add(((TextArea)((ButtonableObject)item).getMainObject()).getValue()); - } - return results; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public boolean validate(){ - // TODO: implement - return false; - } - // sets the css properties, by calling the super class's method and the local // method, which sets some specific properties for the GdlText instance Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Thu Jul 28 02:20:26 2011 (r686) @@ -3,10 +3,7 @@ import java.util.ArrayList; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; -import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; -import us.isidor.gdl.anaToMia.Widgets.base.IGdlHasValue; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.FocusStyleHandler; @@ -48,7 +45,7 @@ import com.google.gwt.user.client.ui.Widget; -public class GdlTitle extends GdlTextObject implements IGdlHasValue{ +public class GdlTitle extends GdlTextObject { protected ArrayList<Pair<String, String>> titleActiveCssNamesAndStyles = new ArrayList<Pair<String,String>>(); protected ArrayList<Pair<String, String>> titleFocusCssNamesAndStyles = new ArrayList<Pair<String,String>>(); protected ArrayList<Pair<String, String>> titleHoverCssNamesAndStyles = new ArrayList<Pair<String,String>>(); @@ -426,30 +423,6 @@ } } } - - - @Override - public ArrayList<String> getStringValue() { - ArrayList<String> result = new ArrayList<String>(); - for (Widget title : this.subElements) { - result.add(((TitleWidget)((ButtonableObject)title).getMainObject()).titleElement.getInnerText()); - } - return result; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public boolean validate() { - // TODO Auto-generated method stub - return false; - } // this class represents the acutal content of this widget, i.e. Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java Thu Jul 28 02:20:26 2011 (r686) @@ -18,26 +18,8 @@ @Override - public boolean validate() { - // TODO Auto-generated method stub - return false; - } - - @Override public TopicMap getContent() { // TODO Auto-generated method stub return null; } - - @Override - public ArrayList<String> getStringValue() { - // TODO Auto-generated method stub - return null; - } - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // TODO Auto-generated method stub - return null; - } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultCreatorTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultCreatorTopicView.java Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultCreatorTopicView.java Thu Jul 28 02:20:26 2011 (r686) @@ -1,12 +1,10 @@ package us.isidor.gdl.anaToMia.Widgets.view; -import java.util.ArrayList; + import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair; public class GdlDefaultCreatorTopicView extends GdlDefaultTopicView{ @@ -18,27 +16,6 @@ } - @Override - public ArrayList<String> getStringValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public boolean validate() { - // TODO Auto-generated method stub - return false; - } - - @Override public TopicMap getContent() { // TODO Auto-generated method stub Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultEditorTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultEditorTopicView.java Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultEditorTopicView.java Thu Jul 28 02:20:26 2011 (r686) @@ -1,12 +1,9 @@ package us.isidor.gdl.anaToMia.Widgets.view; -import java.util.ArrayList; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair; public class GdlDefaultEditorTopicView extends GdlDefaultTopicView { @@ -16,32 +13,9 @@ // TODO Auto-generated constructor stub } - - @Override - public boolean validate() { - // TODO Auto-generated method stub - return false; - } - @Override public TopicMap getContent() { // TODO Auto-generated method stub return null; } - - - @Override - public ArrayList<String> getStringValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // TODO Auto-generated method stub - return null; - } - - } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java Thu Jul 28 02:20:26 2011 (r686) @@ -1,12 +1,10 @@ package us.isidor.gdl.anaToMia.Widgets.view; -import java.util.ArrayList; + import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair; public class GdlEditorAssociationView extends GdlAssociationView { @@ -22,30 +20,10 @@ // TODO Auto-generated method stub return null; } - - - @Override - public boolean validate() { - // TODO Auto-generated method stub - return false; - } - - @Override - public TopicMap getContent() { - // TODO Auto-generated method stub - return null; - } @Override - public ArrayList<String> getStringValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { + public TopicMap getContent() { // TODO Auto-generated method stub return null; } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialCreatorTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialCreatorTopicView.java Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialCreatorTopicView.java Thu Jul 28 02:20:26 2011 (r686) @@ -1,12 +1,10 @@ package us.isidor.gdl.anaToMia.Widgets.view; -import java.util.ArrayList; + import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair; public class GdlSpecialCreatorTopicView extends GdlSpecialTopicView{ // TODO: implement @@ -18,28 +16,8 @@ @Override - public boolean validate() { - // TODO Auto-generated method stub - return false; - } - - @Override public TopicMap getContent() { // TODO Auto-generated method stub return null; } - - - @Override - public ArrayList<String> getStringValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // TODO Auto-generated method stub - return null; - } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialEditorTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialEditorTopicView.java Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialEditorTopicView.java Thu Jul 28 02:20:26 2011 (r686) @@ -1,12 +1,9 @@ package us.isidor.gdl.anaToMia.Widgets.view; -import java.util.ArrayList; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair; public class GdlSpecialEditorTopicView extends GdlSpecialTopicView{ @@ -18,32 +15,9 @@ // TODO Auto-generated constructor stub } - - - @Override - public boolean validate() { - // TODO Auto-generated method stub - return false; - } - @Override public TopicMap getContent() { // TODO Auto-generated method stub return null; } - - - - @Override - public ArrayList<String> getStringValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // TODO Auto-generated method stub - return null; - } } 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 Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Thu Jul 28 02:20:26 2011 (r686) @@ -11,7 +11,6 @@ import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.IGdlContainer; -import us.isidor.gdl.anaToMia.Widgets.base.IGdlHasValue; import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.GdlInstantiator; @@ -19,7 +18,7 @@ import us.isidor.gdl.anaToMia.Widgets.value.ContentOrientationValue; -public abstract class GdlView extends GdlVisibleObject implements IGdlContainer, IGdlHasValue { +public abstract class GdlView extends GdlVisibleObject implements IGdlContainer { protected GdlView(){ super(); }

1 0

[isidorus-cvs] r685 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets: src/us/isidor/gdl/anaToMia/Widgets/base src/us/isidor/gdl/anaToMia/Widgets/text war/gdl_widgets
by lgiessmann＠common-lisp.net 28 Jul '11

28 Jul '11

Author: lgiessmann Date: Thu Jul 28 02:10:24 2011 New Revision: 685 Log: gdl-frontend: Widgets: implemented the static method TmHelper.getValueGroupOf(Topic visibleElement) that can be used by all visible elements to retrieve the bound gdl:Value-Group instance. Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.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/text/GdlText.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java Wed Jul 27 23:55:37 2011 (r684) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java Thu Jul 28 02:10:24 2011 (r685) @@ -186,6 +186,7 @@ public final static String gdlNthPosition = gdl + "nth-position"; public final static String gdlButtonPosition = gdl + "button-position"; public final static String gdlTmBinding = gdl + "tm-binding"; + public final static String gdlViewBinding = gdl + "view-binding"; public final static String gdlTopicViewBinding = gdl + "topic-view-binding"; } 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 Wed Jul 27 23:55:37 2011 (r684) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Thu Jul 28 02:10:24 2011 (r685) @@ -584,4 +584,30 @@ } } } + + + // returns binary associations that corresponds to the given parameters + public static ArrayList<Association> getBinaryAssociations(Topic topic, Topic roleType, Topic assocType, ArrayList<Topic> scope, Topic otherPlayerType, Topic otherRoleType){ + ArrayList<Pair<Topic, Topic>> rolePlayertypesAndTypes = new ArrayList<Pair<Topic,Topic>>(); + rolePlayertypesAndTypes.add(new Pair<Topic, Topic>(otherPlayerType, otherRoleType)); + return getAssociationsOfTopic(topic, roleType, assocType, scope, rolePlayertypesAndTypes); + } + + + // returns the topic that represents the value group that is bound to the passed + // topic via a gdl:view-binding association + public static Topic getValueGroupOf(Topic visibleElement) throws InvalidGdlSchemaException{ + if(visibleElement == null) throw null; + + TopicMap tm = visibleElement.getTopicMap(); + Topic descriptorRoleType = getTopicByPsi(GdlPsis.RoleType.gdlDescriptor, tm); + Topic viewBindingAssocType = getTopicByPsi(GdlPsis.AssociationType.gdlViewBinding, tm); + Topic valueGroupType = getTopicByPsi(GdlPsis.TopicType.gdlValueGroup, tm); + Topic valueGroupRoleType = getTopicByPsi(GdlPsis.RoleType.gdlValueGroup, tm); + ArrayList<Topic> valueGroups = getOtherPlayerOfBinaryAssociation(visibleElement, descriptorRoleType, viewBindingAssocType, null, valueGroupType, valueGroupRoleType); + + if(valueGroups.size() == 1) return valueGroups.get(0); + else if(valueGroups.size() == 0) return null; + else throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(visibleElement) + " must be bound none or once to a value group, but is: " + valueGroups.size()); + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Wed Jul 27 23:55:37 2011 (r684) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Thu Jul 28 02:10:24 2011 (r685) @@ -12,12 +12,16 @@ import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.TextArea; import com.google.gwt.user.client.ui.Widget; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; import us.isidor.gdl.anaToMia.Widgets.base.IGdlHasValue; +import us.isidor.gdl.anaToMia.Widgets.base.IGdlHasValueGroup; +import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.FocusStyleHandler; @@ -33,10 +37,11 @@ -public class GdlText extends GdlTextObject implements IGdlHasValue{ +public class GdlText extends GdlTextObject implements IGdlHasValue, IGdlHasValueGroup { protected ArrayList<PasswordKeyPressHandler> passwordKeyPressHandler = null; protected ArrayList<HandlerRegistration> passwordKeyPressRegistrations = null; - + protected Topic valueGroupTopic = null; + protected boolean valueGroupTopicSet = false; // some constructors protected GdlText() throws InvalidGdlSchemaException, ExecutionException { @@ -831,4 +836,62 @@ super.setCssProperty(styleClass, cssProperty, cssValue); } } + + + @Override + public Topic getValueGroup() throws InvalidGdlSchemaException { + if(!this.valueGroupTopicSet) this.valueGroupTopic = TmHelper.getValueGroupOf(this.tmRepresentative); + return this.valueGroupTopic; + } + + + @Override + public Topic getConstraint() throws InvalidGdlSchemaException { + // TODO Auto-generated method stub + return null; + } + + + @Override + public ArrayList<Topic> getDefaultTmValues() + throws InvalidGdlSchemaException { + // TODO Auto-generated method stub + return null; + } + + + @Override + public String getDefaultLiteralValue() throws InvalidGdlSchemaException { + // TODO Auto-generated method stub + return null; + } + + + @Override + public ArrayList<Topic> getTmValues() throws InvalidGdlSchemaException { + // TODO Auto-generated method stub + return null; + } + + + @Override + public ArrayList<String> getLiteralValues() + throws InvalidGdlSchemaException { + // TODO Auto-generated method stub + return null; + } + + + @Override + public String getSetLiteralValue() throws InvalidGdlSchemaException { + // TODO Auto-generated method stub + return null; + } + + + @Override + public Construct getSetTmValue() throws InvalidGdlSchemaException { + // TODO Auto-generated method stub + return null; + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Wed Jul 27 23:55:37 2011 (r684) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Thu Jul 28 02:10:24 2011 (r685) @@ -19,6 +19,8 @@ {"subject_identifiers":["[gdl:containee]"], "instance_of":["si:[tmcl:role-type]"]}, {"subject_identifiers":["[gdl:ancestor]"], "instance_of":["si:[tmcl:role-type]"]}, {"subject_identifiers":["[gdl:descendant]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:view-binding]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:value-group]"], "instance_of":["si:[tmcl:role-type]"]}, {"subject_identifiers":["[gdl:Schema]"], "instance_of":["si:[tmcl:topic-type]"]}, {"subject_identifiers":["[gdl:schema-name]"], "instance_of":["si:[tmcl:name-type]"]}, {"subject_identifiers":["[gdl:view-name]"], "instance_of":["si:[tmcl:name-type]"]}, @@ -26,9 +28,11 @@ {"subject_identifiers":["[gdl:border-width]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[doc:test-schema]"], "instance_of":["si:[gdl:Schema]"], "names":[{"value": "Test GDL Schema", "type":"si:[gdl:schema-name]"}]}, {"subject_identifiers":["[gdl:Visible-Object]"]}, + {"subject_identifiers":["[gdl:Value-Group]"]}, {"subject_identifiers":["[gdl:Text-Object]"]}, {"subject_identifiers":["[gdl:Position]"]}, {"subject_identifiers":["[gdl:position]"], "instance_of":["si:[tmcl:association-type]"]}, + {"subject_identifiers":["[doc:value-group-person-name]"], "instance_of":["si:[gdl:Value-Group]"]}, {"subject_identifiers":["[gdl:margin-left]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:border-style]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:margin-top]"], "instance_of":["si:[tmcl:occurrence-type]"]}, @@ -165,6 +169,7 @@ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Button]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Action-Button]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Action-Button]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Delete-Button]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Action-Button]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Create-Button]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Value-Group]"}]}, {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:test-schema]"},{"type":"si:[gdl:containee]", "player":"si:[doc:default-creator-topic-view-1]"}]}, {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:test-schema]"},{"type":"si:[gdl:containee]", "player":"si:[doc:default-creator-topic-view-2]"}]}, {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:test-schema]"},{"type":"si:[gdl:containee]", "player":"si:[doc:default-editor-topic-view]"}]}, @@ -213,5 +218,6 @@ {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:unit-1-text]"},{"type":"si:[gdl:containee]", "player":"si:[doc:unit-1-text-delete-button]"}]}, {"type":"si:[gdl:button-position]", "roles":[{"type":"si:[gdl:nth-element]", "player":"si:[doc:nth-elem-crt-btn]"},{"type":"si:[gdl:action-button]", "player":"si:[doc:unit-1-text-create-button]"}]}, {"type":"si:[gdl:button-position]", "roles":[{"type":"si:[gdl:nth-element]", "player":"si:[doc:nth-elem-del-btn]"},{"type":"si:[gdl:action-button]", "player":"si:[doc:unit-1-text-delete-button]"}]}, - {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:unit-1-reference]"},{"type":"si:[gdl:containee]", "player":"si:[doc:info-1]"}]} + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:unit-1-reference]"},{"type":"si:[gdl:containee]", "player":"si:[doc:info-1]"}]}, + {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[doc:value-group-person-name]"},{"type":"si:[gdl:descriptor]", "player":"si:[doc:text-1]"}]} ]} \ No newline at end of file

1 0

[isidorus-cvs] r684 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base
by lgiessmann＠common-lisp.net 28 Jul '11

28 Jul '11

Author: lgiessmann Date: Wed Jul 27 23:55:37 2011 New Revision: 684 Log: gdl-frontend: Widgets: finalized the implementation of the interface IGdlHasValueGroup Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/IGdlHasValueGroup.java - copied, changed from r683, branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/IHasValueGroup.java Deleted: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/IHasValueGroup.java Copied and modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/IGdlHasValueGroup.java (from r683, branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/IHasValueGroup.java) ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/IHasValueGroup.java Wed Jul 27 13:33:01 2011 (r683, copy source) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/IGdlHasValueGroup.java Wed Jul 27 23:55:37 2011 (r684) @@ -1,11 +1,12 @@ package us.isidor.gdl.anaToMia.Widgets.base; 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.environment.InvalidGdlSchemaException; -public interface IHasValueGroup { + +public interface IGdlHasValueGroup { // returns the topic that represents a value group topic public Topic getValueGroup() throws InvalidGdlSchemaException; @@ -23,4 +24,10 @@ // returns all possible literals that can be used as values for this value group public ArrayList<String> getLiteralValues() throws InvalidGdlSchemaException; + + // returns the literal value that is set on an item + public String getSetLiteralValue() throws InvalidGdlSchemaException; + + // returns the topic map construct that is set on an item + public Construct getSetTmValue() throws InvalidGdlSchemaException; }

1 0

[isidorus-cvs] r683 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: . base
by lgiessmann＠common-lisp.net 27 Jul '11

27 Jul '11

Author: lgiessmann Date: Wed Jul 27 13:33:01 2011 New Revision: 683 Log: gdl-frontend: Widgets: started to implement IHasValueGroup Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/IHasValueGroup.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt 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 Wed Jul 27 11:27:16 2011 (r682) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt Wed Jul 27 13:33:01 2011 (r683) @@ -1,3 +1,11 @@ +* Implement all IHasValueGroup to: + * GdlText + * GdlInfo + * GdlTitle + * GdlReference + * GdlButton + * GdlComplexData + * GdlListBox * Implement TopicMaps data consumption * Implement TopicMaps data generation * Fix css-pseudo-class-handlers (=> Buttons) \ No newline at end of file Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/IHasValueGroup.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/IHasValueGroup.java Wed Jul 27 13:33:01 2011 (r683) @@ -0,0 +1,26 @@ +package us.isidor.gdl.anaToMia.Widgets.base; + +import java.util.ArrayList; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + +public interface IHasValueGroup { + // returns the topic that represents a value group topic + public Topic getValueGroup() throws InvalidGdlSchemaException; + + // returns the constraint that is bound to the value group topic + public Topic getConstraint() throws InvalidGdlSchemaException; + + // returns all topics that are set as default values for this value group + public ArrayList<Topic> getDefaultTmValues() throws InvalidGdlSchemaException; + + // returns the literal default value for this value group + public String getDefaultLiteralValue() throws InvalidGdlSchemaException; + + // returns all possible topics that can be used as values for this value group + public ArrayList<Topic> getTmValues() throws InvalidGdlSchemaException; + + // returns all possible literals that can be used as values for this value group + public ArrayList<String> getLiteralValues() throws InvalidGdlSchemaException; +}

1 0

[isidorus-cvs] r682 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text
by lgiessmann＠common-lisp.net 27 Jul '11

27 Jul '11

Author: lgiessmann Date: Wed Jul 27 11:27:16 2011 New Revision: 682 Log: gdl-frontend: Widgets: removed some unnecessary references Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java Wed Jul 27 11:26:24 2011 (r681) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java Wed Jul 27 11:27:16 2011 (r682) @@ -5,10 +5,8 @@ import com.google.gwt.event.dom.client.MouseOverEvent; import com.google.gwt.event.dom.client.MouseOverHandler; import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.RootPanel; -import com.google.gwt.user.client.ui.Widget; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException;

1 0

[isidorus-cvs] r681 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: . base text
by lgiessmann＠common-lisp.net 27 Jul '11

27 Jul '11

Author: lgiessmann Date: Wed Jul 27 11:26:24 2011 New Revision: 681 Log: gdl-frontend: Widgets: implementd the setting metods for parent's of GdlInfo, i.e. an info element is hown if the mouse is hovered over the parent - if the mouse leaves the parent's area, the GdlInfo element will be hidden 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/text/GdlInfo.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 Wed Jul 27 11:11:28 2011 (r680) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt Wed Jul 27 11:26:24 2011 (r681) @@ -1,4 +1,3 @@ -* Implement GdlInfo * Implement TopicMaps data consumption * Implement TopicMaps data generation * Fix css-pseudo-class-handlers (=> Buttons) \ No newline at end of file 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 Wed Jul 27 11:11:28 2011 (r680) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Wed Jul 27 11:26:24 2011 (r681) @@ -104,7 +104,7 @@ for (Topic info : infos){ GdlInfo elem = (GdlInfo)GdlInstantiator.instantiate(info); this.infoElements.add(elem); - elem.setPosition(this.mainPanel); + elem.setPosition(this); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java Wed Jul 27 11:11:28 2011 (r680) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java Wed Jul 27 11:26:24 2011 (r681) @@ -1,15 +1,24 @@ package us.isidor.gdl.anaToMia.Widgets.text; +import com.google.gwt.event.dom.client.MouseOutEvent; +import com.google.gwt.event.dom.client.MouseOutHandler; +import com.google.gwt.event.dom.client.MouseOverEvent; +import com.google.gwt.event.dom.client.MouseOverHandler; import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.Widget; - import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + public class GdlInfo extends GdlTextObject { + GdlVisibleObject parent = null; + boolean parentListenerSet = false; + // some constructors protected GdlInfo(){ super(); @@ -36,16 +45,36 @@ private void setParentListener(){ - // TODO: implement + if(this.parent != null && !this.parentListenerSet){ + parent.addMouseOverHandler(new MouseOverHandler() { + @Override + public void onMouseOver(MouseOverEvent event) { + try { + GdlInfo.this.show(); + } catch (InvalidGdlSchemaException e) { + e.printStackTrace(); + } + } + }); + parent.addMouseOutHandler(new MouseOutHandler() { + @Override + public void onMouseOut(MouseOutEvent event) { + GdlInfo.this.hide(); + } + }); + this.parentListenerSet = true; + } } - public void setPosition(Widget parent) throws InvalidGdlSchemaException{ - int left = parent.getAbsoluteLeft(); - int top = parent.getAbsoluteTop() + parent.getOffsetHeight(); + public void setPosition(GdlVisibleObject parent) throws InvalidGdlSchemaException{ + this.parent = parent; + int left = parent.getAbsoluteLeft() + 5; + int top = parent.getAbsoluteTop() + parent.getOffsetHeight() + 1; DOM.setStyleAttribute(this.mainPanel.getElement(), "position", "absolute"); DOM.setStyleAttribute(this.mainPanel.getElement(), "top", top + "px"); DOM.setStyleAttribute(this.mainPanel.getElement(), "left", left + "px"); + this.setParentListener(); this.hide(); }

1 0

[isidorus-cvs] r680 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets: src/us/isidor/gdl/anaToMia/Widgets src/us/isidor/gdl/anaToMia/Widgets/base src/us/isidor/gdl/anaToMia/Widgets/environment src/us/isidor/gdl/anaToMia/Widgets/text war/gdl_widgets
by lgiessmann＠common-lisp.net 27 Jul '11

27 Jul '11

Author: lgiessmann Date: Wed Jul 27 11:11:28 2011 New Revision: 680 Log: gdl-frontend: Widgets: implementd GdlInfo Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.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/base/GdlPsis.java 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/TestClass.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/environment/GdlInstantiator.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm 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 Wed Jul 27 08:46:22 2011 (r679) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt Wed Jul 27 11:11:28 2011 (r680) @@ -1,3 +1,4 @@ +* Implement GdlInfo * Implement TopicMaps data consumption * Implement TopicMaps data generation * Fix css-pseudo-class-handlers (=> Buttons) \ No newline at end of file Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java Wed Jul 27 08:46:22 2011 (r679) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java Wed Jul 27 11:11:28 2011 (r680) @@ -57,6 +57,7 @@ public final static String gdlDefaultTmInstanceValue = gdl + "Default-TM-Instance-Value"; public final static String gdlDatatype = gdl + "Datatype"; public final static String gdlType = gdl + "Type"; + public final static String gdlInfo = gdl + "Info"; public final static String gdlVariantNameScope = gdl + "Variant-Name-Scope"; public final static String gdlVariantNameReifier = gdl + "Variant-Name-Reifier"; public final static String gdlVariantNameIdentifiers = gdl + "Variant-Name-Identifiers"; 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 Wed Jul 27 08:46:22 2011 (r679) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Wed Jul 27 11:11:28 2011 (r680) @@ -13,6 +13,7 @@ import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.environment.MultipleHandlerRegistration; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; +import us.isidor.gdl.anaToMia.Widgets.text.GdlInfo; import us.isidor.gdl.anaToMia.Widgets.value.AbsoluteNumValue; import us.isidor.gdl.anaToMia.Widgets.value.AutoNumUnitValue; import us.isidor.gdl.anaToMia.Widgets.value.AutoNumValue; @@ -70,6 +71,7 @@ protected ArrayList<Widget> subElements = new ArrayList<Widget>(); protected ArrayList<Pair<Widget, ArrayList<EventHandler>>> eventHandlers = new ArrayList<Pair<Widget, ArrayList<EventHandler>>>(); protected ArrayList<Pair<Topic, Integer>> actionButtonsAndPositions = null; + protected ArrayList<GdlInfo> infoElements = new ArrayList<GdlInfo>(); // some constructors @@ -94,6 +96,18 @@ return this.tmRepresentative; } + + // sets all info elements as defined in the GDL + public void setInfoElements() throws InvalidGdlSchemaException, ExecutionException{ + ArrayList<Topic> infos = TmHelper.topicContainsInfo(this.tmRepresentative); + + for (Topic info : infos){ + GdlInfo elem = (GdlInfo)GdlInstantiator.instantiate(info); + this.infoElements.add(elem); + elem.setPosition(this.mainPanel); + } + } + // this method should be invoked if a new sub-element is added to this instance protected ButtonableObject addToContainerPanel(Widget widget) throws ExecutionException, InvalidGdlSchemaException{ @@ -1785,4 +1799,23 @@ Window.alert("could not apply the default CSS style >> " + e.getClass() + " >> " + e.getMessage()); } } + + + // removes all GdlInfo elements. They must be remove explicitly, since they are + // bound to the root panel/body + public void clear(){ + for (GdlInfo elem : this.infoElements) + elem.removeFromParent(); + } + + + @Override + public void onAttach(){ + super.onAttach(); + try{ + this.setInfoElements(); + }catch(Exception e){ + e.printStackTrace(); + } + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Wed Jul 27 08:46:22 2011 (r679) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Wed Jul 27 11:11:28 2011 (r680) @@ -51,10 +51,7 @@ } }); - mainPanel.add(requestButton); - - - + mainPanel.add(requestButton); /* // only for testing 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 Wed Jul 27 08:46:22 2011 (r679) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Wed Jul 27 11:11:28 2011 (r680) @@ -329,6 +329,19 @@ } + // returns all instances of gdl:Info that are related to the passed topic via a contains association + public static ArrayList<Topic> topicContainsInfo(Topic container) { + if(container == null) return new ArrayList<Topic>(); + TopicMap tm = container.getTopicMap(); + Topic containsAssocType = getTopicByPsi(GdlPsis.AssociationType.gdlContains, tm); + Topic containerRoleType = getTopicByPsi(GdlPsis.RoleType.gdlContainer, tm); + Topic info = getTopicByPsi(GdlPsis.TopicType.gdlInfo, tm); + Topic containeeRoleType = getTopicByPsi(GdlPsis.RoleType.gdlContainee, tm); + + return getOtherPlayerOfBinaryAssociation(container, containerRoleType, containsAssocType, null, info, containeeRoleType); + } + + // Returns all pairs of topics and string that are of type gdl:Action-Button and are // bound to the passed topic via a gdl:contains and via a gdl:button-position association. // The topic is the gdl:Action-Button instance, whereas the string is the value of the Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java Wed Jul 27 08:46:22 2011 (r679) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java Wed Jul 27 11:11:28 2011 (r680) @@ -24,6 +24,7 @@ import us.isidor.gdl.anaToMia.Widgets.complexData.GdlVideo; import us.isidor.gdl.anaToMia.Widgets.container.GdlList; import us.isidor.gdl.anaToMia.Widgets.container.GdlUnit; +import us.isidor.gdl.anaToMia.Widgets.text.GdlInfo; import us.isidor.gdl.anaToMia.Widgets.text.GdlListBox; import us.isidor.gdl.anaToMia.Widgets.text.GdlReference; import us.isidor.gdl.anaToMia.Widgets.text.GdlText; @@ -44,6 +45,8 @@ return new GdlSpace(tmRepresentative); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlTitle)){ return new GdlTitle(tmRepresentative); + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlInfo)){ + return new GdlInfo(tmRepresentative); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlReference)){ return new GdlReference(tmRepresentative); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlRadioButton)){ Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java Wed Jul 27 11:11:28 2011 (r680) @@ -0,0 +1,61 @@ +package us.isidor.gdl.anaToMia.Widgets.text; + +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.RootPanel; +import com.google.gwt.user.client.ui.Widget; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + +public class GdlInfo extends GdlTextObject { + // some constructors + protected GdlInfo(){ + super(); + } + + + public GdlInfo(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative); + RootPanel.get().add(this); + super.setGdlStyle(); + // TODO: create an info element for each tm construct + this.createNewInfo().setText("Info"); + this.hide(); + this.setParentListener(); + } + + + private Label createNewInfo() throws ExecutionException, InvalidGdlSchemaException{ + Label lbl = new Label(); + this.addToContainerPanel(lbl); + this.setGdlStyle(lbl); + return lbl; + } + + + private void setParentListener(){ + // TODO: implement + } + + + public void setPosition(Widget parent) throws InvalidGdlSchemaException{ + int left = parent.getAbsoluteLeft(); + int top = parent.getAbsoluteTop() + parent.getOffsetHeight(); + DOM.setStyleAttribute(this.mainPanel.getElement(), "position", "absolute"); + DOM.setStyleAttribute(this.mainPanel.getElement(), "top", top + "px"); + DOM.setStyleAttribute(this.mainPanel.getElement(), "left", left + "px"); + this.hide(); + } + + + public void show() throws InvalidGdlSchemaException{ + DOM.setStyleAttribute(this.mainPanel.getElement(), "display", this.getDisplay().getCssName()); + } + + + public void hide(){ + DOM.setStyleAttribute(this.mainPanel.getElement(), "display", "none"); + } +} Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Wed Jul 27 08:46:22 2011 (r679) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Wed Jul 27 11:11:28 2011 (r680) @@ -74,6 +74,8 @@ {"subject_identifiers":["[doc:unit-1]"], "instance_of":["si:[gdl:Unit]"], "occurrences":[{"type":"si:[gdl:id]", "value":"unit_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:unit-name]", "value":"unit 1"}, {"type":"si:[gdl:width]", "value":"400px"}, {"type":"si:[gdl:height]", "value":"200px"}, {"type":"si:[gdl:border-style]", "value":"dashed"}, {"type":"si:[gdl:border-width]", "value":"1px"}, {"type":"si:[gdl:text-decoration]", "value":"line-through"},{"type":"si:[gdl:background-color]", "value":"lime"}]}, {"subject_identifiers":["[doc:title-1]"], "instance_of":["si:[gdl:Title]"], "occurrences":[{"type":"si:[gdl:id]", "value":"title_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:text-decoration]", "value":"underline"}, {"type":"si:[gdl:background-color]", "value":"#ccc"}, {"type":"si:[gdl:font-weight]", "value":"bold"}]}, {"subject_identifiers":["[doc:unit-1-reference]"], "instance_of":["si:[gdl:Reference]"], "occurrences":[{"type":"si:[gdl:id]", "value":"unit_1_reference_id"},{"type":"si:[gdl:float]", "value":"left"}]}, + {"subject_identifiers":["[gdl:Info]"]}, + {"subject_identifiers":["[doc:info-1]"], "instance_of":["si:[gdl:Info]"], "occurrences":[{"type":"si:[gdl:id]", "value":"info_1_id"}]}, {"subject_identifiers":["[doc:unit-1-text]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"unit_1_text_id"}, {"type":"si:[gdl:clear]","value":"right"}]}, {"subject_identifiers":["[doc:unit-1-text-delete-button]"], "instance_of":["si:[gdl:Delete-Button]"], "occurrences":[{"type":"si:[gdl:id]","value":"unit_1_text_delete_button_id"}, {"type":"si:[gdl:font-size]", "value":"8px"}]}, {"subject_identifiers":["[doc:unit-1-text-create-button]"], "instance_of":["si:[gdl:Create-Button]"], "occurrences":[{"type":"si:[gdl:id]","value":"unit_1_text_create_button_id"}, {"type":"si:[gdl:font-size]", "value":"8px"}]}, @@ -210,5 +212,6 @@ {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:unit-1-text]"},{"type":"si:[gdl:containee]", "player":"si:[doc:unit-1-text-create-button]"}]}, {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:unit-1-text]"},{"type":"si:[gdl:containee]", "player":"si:[doc:unit-1-text-delete-button]"}]}, {"type":"si:[gdl:button-position]", "roles":[{"type":"si:[gdl:nth-element]", "player":"si:[doc:nth-elem-crt-btn]"},{"type":"si:[gdl:action-button]", "player":"si:[doc:unit-1-text-create-button]"}]}, - {"type":"si:[gdl:button-position]", "roles":[{"type":"si:[gdl:nth-element]", "player":"si:[doc:nth-elem-del-btn]"},{"type":"si:[gdl:action-button]", "player":"si:[doc:unit-1-text-delete-button]"}]} + {"type":"si:[gdl:button-position]", "roles":[{"type":"si:[gdl:nth-element]", "player":"si:[doc:nth-elem-del-btn]"},{"type":"si:[gdl:action-button]", "player":"si:[doc:unit-1-text-delete-button]"}]}, + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:unit-1-reference]"},{"type":"si:[gdl:containee]", "player":"si:[doc:info-1]"}]} ]} \ No newline at end of file

1 0

[isidorus-cvs] r679 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: . base environment text
by lgiessmann＠common-lisp.net 27 Jul '11

27 Jul '11

Author: lgiessmann Date: Wed Jul 27 08:46:22 2011 New Revision: 679 Log: gdl-frontend: Widgets: removed GdlInfo Deleted: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.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/base/GdlPsis.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.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 Wed Jul 27 08:02:34 2011 (r678) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt Wed Jul 27 08:46:22 2011 (r679) @@ -1,4 +1,3 @@ -* Implement GdlInfo * Implement TopicMaps data consumption * Implement TopicMaps data generation * Fix css-pseudo-class-handlers (=> Buttons) \ No newline at end of file Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java Wed Jul 27 08:02:34 2011 (r678) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java Wed Jul 27 08:46:22 2011 (r679) @@ -38,7 +38,6 @@ public final static String gdlStyleClass = gdl + "Style-Class"; public final static String gdlDescriptor = gdl + "Descriptor"; public final static String gdlSpace = gdl + "Space"; - public final static String gdlInfo = gdl + "Info"; public final static String gdlList = gdl + "List"; public final static String gdlPosition = gdl + "Position"; public final static String gdlNthElement = gdl + "Nth-Element"; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java Wed Jul 27 08:02:34 2011 (r678) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java Wed Jul 27 08:46:22 2011 (r679) @@ -24,7 +24,6 @@ import us.isidor.gdl.anaToMia.Widgets.complexData.GdlVideo; import us.isidor.gdl.anaToMia.Widgets.container.GdlList; import us.isidor.gdl.anaToMia.Widgets.container.GdlUnit; -import us.isidor.gdl.anaToMia.Widgets.text.GdlInfo; import us.isidor.gdl.anaToMia.Widgets.text.GdlListBox; import us.isidor.gdl.anaToMia.Widgets.text.GdlReference; import us.isidor.gdl.anaToMia.Widgets.text.GdlText; @@ -43,8 +42,6 @@ public static GdlVisibleObject instantiate(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlSpace)){ return new GdlSpace(tmRepresentative); - }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlInfo)){ - return new GdlInfo(tmRepresentative); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlTitle)){ return new GdlTitle(tmRepresentative); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlReference)){

1 0

[isidorus-cvs] r678 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base complexData container text
by lgiessmann＠common-lisp.net 27 Jul '11

27 Jul '11

Author: lgiessmann Date: Wed Jul 27 08:02:34 2011 New Revision: 678 Log: gdl-frontend: Widgets: implementd a remove function, so a sub-element of each GdlWidget can be removed, additionally the gdl:Action-Buttons placed with gdl:button-position are reset 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/complexData/GdlDatePicker.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java 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 Wed Jul 27 05:56:40 2011 (r677) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Wed Jul 27 08:02:34 2011 (r678) @@ -105,6 +105,21 @@ } + // removes the passed widget, it's parent, and returns the parent + protected ButtonableObject removeFromContainer(Widget widget) throws InvalidGdlSchemaException, ExecutionException { + for (Widget elem : this.subElements) { + if(((ButtonableObject)elem).getMainObject().equals(widget)){ + elem.removeFromParent(); + this.subElements.remove(elem); + return (ButtonableObject)elem; + } + } + this.setNthButtons(); + + return null; + } + + // sets all buttons in the sub-elements that are specified by a // gdl:button-position association protected void setNthButtons() throws InvalidGdlSchemaException, ExecutionException { Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDatePicker.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDatePicker.java Wed Jul 27 05:56:40 2011 (r677) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDatePicker.java Wed Jul 27 08:02:34 2011 (r678) @@ -25,6 +25,7 @@ import com.google.gwt.user.datepicker.client.DatePicker; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; +import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.IGdlHasValue; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; @@ -74,6 +75,9 @@ } + public ButtonableObject removeDatePicker(DateWidget elem) throws InvalidGdlSchemaException, ExecutionException{ + return this.removeFromContainer(elem); + } @Override Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Wed Jul 27 05:56:40 2011 (r677) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Wed Jul 27 08:02:34 2011 (r678) @@ -28,6 +28,7 @@ import com.google.gwt.user.client.ui.Widget; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +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; @@ -91,6 +92,11 @@ } + public ButtonableObject removeUnit(UnitWidget elem) throws InvalidGdlSchemaException, ExecutionException{ + return this.removeFromContainer(elem); + } + + // returns a String instance that represents the literal value of this elements name. public String getUnitName() throws InvalidGdlSchemaException { Occurrence nameOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitName); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Wed Jul 27 05:56:40 2011 (r677) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Wed Jul 27 08:02:34 2011 (r678) @@ -56,7 +56,7 @@ // removes the passed element and all its handlers from the outer element - protected void removeListbox(ListBox elem) throws InvalidGdlSchemaException, ExecutionException{ + protected void removeListBox(ListBox elem) throws InvalidGdlSchemaException, ExecutionException{ for (Pair<Widget, ArrayList<EventHandler>> item : this.eventHandlers) { if(item.getFirst().equals(elem)){ this.eventHandlers.remove(item); @@ -64,15 +64,7 @@ } } - ButtonableObject toRemove = null; - for (Widget widget: this.subElements){ - if(((ButtonableObject)widget).getMainObject().equals(widget)){ - toRemove = (ButtonableObject)widget; - } - } - - this.subElements.remove(toRemove); - elem.removeFromParent(); + this.removeFromContainer(elem); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Wed Jul 27 05:56:40 2011 (r677) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Wed Jul 27 08:02:34 2011 (r678) @@ -41,15 +41,15 @@ public GdlReference(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative); // TODO: create a Reference element for each TM-elem - Reference ref = this.createReference(); // TODO: remove + ReferenceWidget ref = this.createReference(); // TODO: remove ref.setText("Reference"); // TODO: remove ref.setHref("http://www.google.de"); // TODO: remove this.setNthButtons(); } - private Reference createReference() throws InvalidGdlSchemaException, ExecutionException { - Reference reference = new Reference(); + private ReferenceWidget createReference() throws InvalidGdlSchemaException, ExecutionException { + ReferenceWidget reference = new ReferenceWidget(); DOM.setElementAttribute(reference.getElement(), "id", this.getId() + "__GDL_" + this.subElements.size()); super.addToContainerPanel(reference); ActiveStyleHandler asHandler = new ActiveStyleHandler(this); @@ -67,6 +67,12 @@ } + // removes the passed element + public void removeReference(ReferenceWidget elem) throws InvalidGdlSchemaException, ExecutionException { + this.removeFromContainer(elem); + } + + // returns a ColorValue instance that represents the text color of this element. // If a styleClass is set, only the corresponding value of the scoped occurrence is returned // or null. @@ -148,7 +154,7 @@ public ArrayList<String> getStringValue() { ArrayList<String> result = new ArrayList<String>(); for (Widget widget : this.subElements) { - result.add(((Reference)((ButtonableObject)widget).getMainObject()).getText()); + result.add(((ReferenceWidget)((ButtonableObject)widget).getMainObject()).getText()); } return result; } @@ -172,7 +178,7 @@ protected class ReferenceClickHandler implements ClickHandler { @Override public void onClick(ClickEvent event) { - Reference ref = (Reference)event.getSource(); + ReferenceWidget ref = (ReferenceWidget)event.getSource(); Window.open(ref.getHref(), "new_window", ""); /* TODO: implement @@ -192,96 +198,16 @@ } - /* - protected class Reference extends Composite implements HasFocusHandlers, HasBlurHandlers, HasMouseDownHandlers, HasMouseUpHandlers, HasMouseOutHandlers, HasMouseOverHandlers { - Hyperlink link = new Hyperlink(); - - - public Reference(){ - initWidget(link); - } - - - public Reference(String text){ - this(); - this.link.setText(text); - } - - - public Reference(String text, String href){ - this(text); - this.link.setTargetHistoryToken(href); - } - - - public String getText(){ - return this.link.getText(); - } - - - public void setText(String text){ - this.link.setText(text); - } - - - public String getHref(){ - return this.link.getTargetHistoryToken(); - } - - - public void setHref(String text){ - this.link.setTargetHistoryToken(text); - } - - - @Override - public HandlerRegistration addBlurHandler(BlurHandler handler) { - return this.addDomHandler(handler, BlurEvent.getType()); - } - - - @Override - public HandlerRegistration addFocusHandler(FocusHandler handler) { - return this.addDomHandler(handler, FocusEvent.getType()); - } - - - @Override - public HandlerRegistration addMouseOverHandler(MouseOverHandler handler) { - return this.addDomHandler(handler, MouseOverEvent.getType()); - } - - - @Override - public HandlerRegistration addMouseOutHandler(MouseOutHandler handler) { - return this.addDomHandler(handler, MouseOutEvent.getType()); - } - - - @Override - public HandlerRegistration addMouseUpHandler(MouseUpHandler handler) { - return this.addDomHandler(handler, MouseUpEvent.getType()); - } - - - @Override - public HandlerRegistration addMouseDownHandler(MouseDownHandler handler) { - return this.addDomHandler(handler, MouseDownEvent.getType()); - } - } - */ - - // this class wraps a Label that is used as - protected class Reference extends Label implements HasFocusHandlers, HasBlurHandlers { + protected class ReferenceWidget extends Label implements HasFocusHandlers, HasBlurHandlers { private String href = ""; - public Reference(){ + public ReferenceWidget(){ super(); } - public Reference(String text, String href) { + public ReferenceWidget(String text, String href) { super(text); if(href != null) this.href = href; } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Wed Jul 27 05:56:40 2011 (r677) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Wed Jul 27 08:02:34 2011 (r678) @@ -73,7 +73,7 @@ // removes the passed element and all its handlers from the outer element - protected void removeTextArea(TextArea elem) throws InvalidGdlSchemaException, ExecutionException{ + public void removeTextArea(TextArea elem) throws InvalidGdlSchemaException, ExecutionException{ for (Pair<Widget, ArrayList<EventHandler>> item : this.eventHandlers) { if(item.getFirst().equals(elem)){ this.eventHandlers.remove(item); @@ -81,16 +81,7 @@ } } - ButtonableObject toRemove = null; - for (Widget elemIter : this.subElements){ - if(((ButtonableObject)elemIter).getMainObject().equals(elem)){ - toRemove = (ButtonableObject)elemIter; - break; - } - } - - this.subElements.remove(toRemove); - toRemove.removeFromParent(); + this.removeFromContainer(elem); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Wed Jul 27 05:56:40 2011 (r677) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Wed Jul 27 08:02:34 2011 (r678) @@ -87,6 +87,13 @@ return title; } + + // removes the passed element and all its handlers from the outer element + public void removeTitle(TitleWidget elem) throws InvalidGdlSchemaException, ExecutionException { + this.removeFromContainer(elem); + } + + // returns a PositiveNumUnitValue instance that represents the text font-size of this element. // If a styleClass is set, only the corresponding value of the scoped occurrence is returned // or null. The default values of gdl:Title differ to gdl:Text-Object

1 0

[isidorus-cvs] r677 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets: src/us/isidor/gdl/anaToMia/Widgets src/us/isidor/gdl/anaToMia/Widgets/base src/us/isidor/gdl/anaToMia/Widgets/button war/gdl_widgets
by lgiessmann＠common-lisp.net 27 Jul '11

27 Jul '11

Author: lgiessmann Date: Wed Jul 27 05:56:40 2011 New Revision: 677 Log: gdl-frontend: Widgets: implemented the registration of ClickHandlers for buttons 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/GdlPanel.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.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/button/GdlActionButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCommitButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCreateButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlDeleteButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlValidateButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm 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 Wed Jul 27 04:07:48 2011 (r676) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt Wed Jul 27 05:56:40 2011 (r677) @@ -1,7 +1,4 @@ -* Fix GdlActionButton => Text-Attributes * Implement GdlInfo -* Implement GdlButton(s) * Implement TopicMaps data consumption * Implement TopicMaps data generation -* ImplementGdlVisibleObject => (de)registerButtonCallback -* Fix css-pseudo-class-handlers \ No newline at end of file +* Fix css-pseudo-class-handlers (=> Buttons) \ No newline at end of file Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Wed Jul 27 04:07:48 2011 (r676) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Wed Jul 27 05:56:40 2011 (r677) @@ -15,7 +15,6 @@ import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes; import us.isidor.gdl.anaToMia.Widgets.view.GdlDefaultTopicView; - import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.AbsolutePanel; @@ -55,7 +54,7 @@ // contains all callbacks that are used as click handlers and the corresponding // html element id of the button element - private ArrayList<Pair<String, ClickHandler>> buttonCallbacks = new ArrayList<Pair<String, ClickHandler>>(); + private static ArrayList<Pair<String, ArrayList<ClickHandler>>> buttonCallbacks = new ArrayList<Pair<String,ArrayList<ClickHandler>>>(); // some constructors @@ -64,39 +63,48 @@ } - protected GdlPanel(Pair<String, TopicIdentifierTypes> topicToEdit, ArrayList<Pair<String, TopicIdentifierTypes>> topicToCreate, ArrayList<Pair<String, ClickHandler>> buttonCallbacks) throws ExecutionException{ + protected GdlPanel(Pair<String, TopicIdentifierTypes> topicToEdit, ArrayList<Pair<String, TopicIdentifierTypes>> topicToCreate) throws ExecutionException{ this(); if(topicToEdit != null)this.requestedTopicToEdit = topicToEdit; if(topicToCreate != null && topicToCreate.size() != 0)this.requestedTopicsToCreate = topicToCreate; if(this.requestedTopicsToCreate.size() != 0 && this.requestedTopicToEdit != null) throw new ExecutionException("only one container can be set, i.e. either topics to create or a topic to edit"); - - if(buttonCallbacks != null){ - this.buttonCallbacks = buttonCallbacks; - } } - public GdlPanel(Pair<String, TopicIdentifierTypes> topicToEdit, ArrayList<Pair<String, TopicIdentifierTypes>> topicToCreate, ArrayList<Pair<String, ClickHandler>> buttonCallbacks, int width, int height) throws ExecutionException{ - this(topicToEdit, topicToCreate, buttonCallbacks); + public GdlPanel(Pair<String, TopicIdentifierTypes> topicToEdit, ArrayList<Pair<String, TopicIdentifierTypes>> topicToCreate, int width, int height) throws ExecutionException{ + this(topicToEdit, topicToCreate); this.setPixelSize(width, height); } - public GdlPanel(Pair<String, TopicIdentifierTypes> topicToEdit, ArrayList<Pair<String, TopicIdentifierTypes>> topicToCreate, ArrayList<Pair<String, ClickHandler>> buttonCallbacks, String width, String height) throws ExecutionException{ - this(topicToEdit, topicToCreate, buttonCallbacks); + public GdlPanel(Pair<String, TopicIdentifierTypes> topicToEdit, ArrayList<Pair<String, TopicIdentifierTypes>> topicToCreate, String width, String height) throws ExecutionException{ + this(topicToEdit, topicToCreate); this.setSize(width, height); } - public ClickHandler getclickHandler(String id){ - if(id == null) return null; - - for (Pair<String, ClickHandler> pair : this.buttonCallbacks) - if(pair.getFirst().equals(id)) return pair.getSecond(); + public static ArrayList<ClickHandler> getClickHandlers(String id){ + for (Pair<String, ArrayList<ClickHandler>> item : GdlPanel.buttonCallbacks) + if(item.getFirst().equals(id)) return item.getSecond(); + + return new ArrayList<ClickHandler>(); + } + + + public static void addClickHandler(String id, ClickHandler handler) throws ExecutionException { + if(id == null && handler == null) return; + if(id == null || handler == null) throw new ExecutionException("id and handler must be set, but are: " + id + ", " + handler); - return null; + ArrayList<ClickHandler> item = GdlPanel.getClickHandlers(id); + if(item.size() == 0){ + ArrayList<ClickHandler> handlers = new ArrayList<ClickHandler>(); + handlers.add(handler); + GdlPanel.buttonCallbacks.add(new Pair<String, ArrayList<ClickHandler>>(id, handlers)); + } else{ + item.add(handler); + } } @@ -292,6 +300,5 @@ // remove all content from the main panel public void clear(){ this.mainPanel.clear(); - this.buttonCallbacks = new ArrayList<Pair<String,ClickHandler>>(); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Wed Jul 27 04:07:48 2011 (r676) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Wed Jul 27 05:56:40 2011 (r677) @@ -30,7 +30,13 @@ ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>(); requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Poet", TopicIdentifierTypes.SubjectIdentifier)); requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Musician", TopicIdentifierTypes.SubjectIdentifier)); - gdlPanel = new GdlPanel(null, requestedTopicsToCreate, null); + GdlPanel.addClickHandler("unit_1_text_create_button_id", new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + Window.alert("you clicked " + ((Button)event.getSource()).getText()); + } + }); + gdlPanel = new GdlPanel(null, requestedTopicsToCreate); mainPanel.add(gdlPanel); gdlPanel.setTmEngine(new JtmsTmEngine()); gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback()); 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 Wed Jul 27 04:07:48 2011 (r676) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Wed Jul 27 05:56:40 2011 (r677) @@ -18,7 +18,6 @@ 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/button/GdlActionButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java Wed Jul 27 04:07:48 2011 (r676) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java Wed Jul 27 05:56:40 2011 (r677) @@ -1,9 +1,12 @@ package us.isidor.gdl.anaToMia.Widgets.button; +import java.util.ArrayList; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.Button; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.base.GdlPanel; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; @@ -24,8 +27,10 @@ public GdlActionButton(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative); + // TODO: set all tm values this.createButton().setText("Action-Button"); // TODO: remove set text + this.setClickHandlers(); } @@ -41,12 +46,19 @@ } + protected void setClickHandlers() throws InvalidGdlSchemaException{ + ArrayList<ClickHandler> handlers = GdlPanel.getClickHandlers(this.getId()); + if(handlers == null || this.subElements.size() == 0) return; + + for (ClickHandler handler : handlers) + ((Button)this.subElements.get(0)).addClickHandler(handler); + } + // sets the id property of this element by using the GWT DOM class @Override public void setId(String id){ - if(id != null && this.subElements.size() != 0){ + if(id != null && this.subElements.size() != 0) DOM.setElementProperty(this.subElements.get(0).getElement(), "id", id); - } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCommitButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCommitButton.java Wed Jul 27 04:07:48 2011 (r676) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCommitButton.java Wed Jul 27 05:56:40 2011 (r677) @@ -3,6 +3,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; +import com.google.gwt.user.client.ui.Button; public class GdlCommitButton extends GdlActionButton { // TODO: implement @@ -14,7 +15,6 @@ public GdlCommitButton(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative); - // TODO: set all tm values - this.createButton().setText("commit"); + ((Button)this.subElements.get(0)).setText("commit"); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCreateButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCreateButton.java Wed Jul 27 04:07:48 2011 (r676) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCreateButton.java Wed Jul 27 05:56:40 2011 (r677) @@ -3,6 +3,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; +import com.google.gwt.user.client.ui.Button; public class GdlCreateButton extends GdlActionButton { // TODO: implement @@ -14,7 +15,6 @@ public GdlCreateButton(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative); - // TODO: set all tm values - this.createButton().setText("create"); + ((Button)this.subElements.get(0)).setText("create"); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlDeleteButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlDeleteButton.java Wed Jul 27 04:07:48 2011 (r676) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlDeleteButton.java Wed Jul 27 05:56:40 2011 (r677) @@ -1,6 +1,8 @@ package us.isidor.gdl.anaToMia.Widgets.button; +import com.google.gwt.user.client.ui.Button; + import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; @@ -15,7 +17,6 @@ public GdlDeleteButton(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative); - // TODO: set all tm values - this.createButton().setText("delete"); + ((Button)this.subElements.get(0)).setText("delete"); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlValidateButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlValidateButton.java Wed Jul 27 04:07:48 2011 (r676) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlValidateButton.java Wed Jul 27 05:56:40 2011 (r677) @@ -1,5 +1,7 @@ package us.isidor.gdl.anaToMia.Widgets.button; +import com.google.gwt.user.client.ui.Button; + import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; @@ -14,7 +16,6 @@ public GdlValidateButton(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative); - // TODO: set all tm values - this.createButton().setText("validate"); + ((Button)this.subElements.get(0)).setText("validate"); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Wed Jul 27 04:07:48 2011 (r676) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Wed Jul 27 05:56:40 2011 (r677) @@ -75,8 +75,8 @@ {"subject_identifiers":["[doc:title-1]"], "instance_of":["si:[gdl:Title]"], "occurrences":[{"type":"si:[gdl:id]", "value":"title_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:text-decoration]", "value":"underline"}, {"type":"si:[gdl:background-color]", "value":"#ccc"}, {"type":"si:[gdl:font-weight]", "value":"bold"}]}, {"subject_identifiers":["[doc:unit-1-reference]"], "instance_of":["si:[gdl:Reference]"], "occurrences":[{"type":"si:[gdl:id]", "value":"unit_1_reference_id"},{"type":"si:[gdl:float]", "value":"left"}]}, {"subject_identifiers":["[doc:unit-1-text]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"unit_1_text_id"}, {"type":"si:[gdl:clear]","value":"right"}]}, - {"subject_identifiers":["[doc:unit-1-text-delete-button]"], "instance_of":["si:[gdl:Delete-Button]"], "occurrences":[{"type":"si:[gdl:id]","value":"unit_1_text_delete_button"}, {"type":"si:[gdl:font-size]", "value":"8px"}]}, - {"subject_identifiers":["[doc:unit-1-text-create-button]"], "instance_of":["si:[gdl:Create-Button]"], "occurrences":[{"type":"si:[gdl:id]","value":"unit_1_text_create_button"}, {"type":"si:[gdl:font-size]", "value":"8px"}]}, + {"subject_identifiers":["[doc:unit-1-text-delete-button]"], "instance_of":["si:[gdl:Delete-Button]"], "occurrences":[{"type":"si:[gdl:id]","value":"unit_1_text_delete_button_id"}, {"type":"si:[gdl:font-size]", "value":"8px"}]}, + {"subject_identifiers":["[doc:unit-1-text-create-button]"], "instance_of":["si:[gdl:Create-Button]"], "occurrences":[{"type":"si:[gdl:id]","value":"unit_1_text_create_button_id"}, {"type":"si:[gdl:font-size]", "value":"8px"}]}, {"subject_identifiers":["[doc:pos-of-unit-1-reference]"], "instance_of":["si:[gdl:Position]"]}, {"subject_identifiers":["[doc:pos-of-unit-1-radio-button]"], "instance_of":["si:[gdl:Position]"]}, {"subject_identifiers":["[doc:pos-of-unit-1-check-box]"], "instance_of":["si:[gdl:Position]"]},

1 0