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

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

22 Jul '11

Author: lgiessmann Date: Fri Jul 22 02:30:54 2011 New Revision: 659 Log: gdl-frontend: Widgets: fixed a bug when applying the css property "vertical-align" 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/text/GdlText.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.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 Fri Jul 22 02:15:04 2011 (r658) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Fri Jul 22 02:30:54 2011 (r659) @@ -1170,7 +1170,6 @@ // sets the vertical-align style property of this element and all it's sub-elements by using the GWT DOM class public void setVerticalAlign(Widget widget, VerticalAlign value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - this.setCssProperty(widget, styleClass, "verticalAlign", value.getCssName()); this.setCssProperty(styleClass, "verticalAlign", value.getCssName()); } } 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 Fri Jul 22 02:15:04 2011 (r658) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Fri Jul 22 02:30:54 2011 (r659) @@ -48,12 +48,6 @@ super(tmRepresentative); // TODO: create a text element for each TM-elem this.createNewTextArea().setText("Text"); // TODO: remove only for debugging - //NumUnitValue val = this.getPaddingBottom(null); // TODO: remove - //String str = "null"; - //if(val != null) str = val.getCssValue(); - //if(val != null) DOM.setStyleAttribute(this.subElements.get(0).getElement(), "paddingBottom", str); - //DOM.setStyleAttribute(this.subElements.get(0).getElement(), "paddingBottom", "20px"); - //Window.alert(">> " + str); } @@ -649,10 +643,6 @@ ResizeValue resize = this.getResize(); // GdlVisibleObject - this.setContentOrientation(source, this.getContentOrientation()); - - this.setVerticalAlign(source, this.getVerticalAlign(null), null); - this.setMargin(source, this.getMargin(null), null); this.setMarginTop(source, this.getMarginTop(null), null); this.setMarginRight(source, this.getMarginRight(null), null); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java Fri Jul 22 02:15:04 2011 (r658) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java Fri Jul 22 02:30:54 2011 (r659) @@ -1,6 +1,7 @@ package us.isidor.gdl.anaToMia.Widgets.text; import com.google.gwt.dom.client.Style.FontStyle; +import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.Widget; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; @@ -28,6 +29,7 @@ public GdlTextObject(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative); super.setGdlStyle(); + DOM.setStyleAttribute(this.mainPanel.getElement(), "float", "left"); // TODO: remove }

1 0

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

22 Jul '11

Author: lgiessmann Date: Fri Jul 22 02:15:04 2011 New Revision: 658 Log: gdl-frontend: Widgets: fixed a bug when applying the css properties for clear, displayan z-index 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/GdlTextObject.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 Fri Jul 22 01:31:07 2011 (r657) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt Fri Jul 22 02:15:04 2011 (r658) @@ -1,8 +1,8 @@ -1. Use a Hyperlink element in GdlReference instead of the inner class Reference + 2. Implement GdlLineBreak => placeholder 3. Implement TopicMaps data consumption 4. Implement TopicMaps data generation 3. Implement GdlButton(s) 4. Implement GdlButton(s) positioning 6. ImplementGdlVisibleObject => (de)registerButtonCallback -7. Fix css-handlers \ No newline at end of file +7. Fix css-pseudo-class-handlers \ 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 Fri Jul 22 01:31:07 2011 (r657) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Fri Jul 22 02:15:04 2011 (r658) @@ -221,7 +221,7 @@ // this property if no gdl:float occurrence is available public Float getFloat() throws InvalidGdlSchemaException { Occurrence floatOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlFloat); - + if(floatOcc != null){ String value = floatOcc.getValue().toLowerCase(); if(value.equals("none")){ @@ -1121,7 +1121,7 @@ // sets the id property of this element by using the GWT DOM class public void setId(String id){ if(id != null){ - DOM.setElementProperty(this.getElement(), "id", id); + DOM.setElementProperty(this.mainPanel.getElement(), "id", id); } } @@ -1129,7 +1129,7 @@ // sets the display style property of this element by using the GWT DOM class public void setDisplay(Display display){ if(display != null){ - DOM.setStyleAttribute(this.getElement(), "display", display.getCssName()); + DOM.setStyleAttribute(this.mainPanel.getElement(), "display", display.getCssName()); } } @@ -1137,7 +1137,7 @@ // sets the z-index style property of this element by using the GWT DOM class public void setZindex(AutoNumValue value){ if(value != null){ - DOM.setStyleAttribute(this.getElement(), "zIndex", value.getCssValue()); + DOM.setStyleAttribute(this.mainPanel.getElement(), "zIndex", value.getCssValue()); } } @@ -1145,7 +1145,7 @@ // sets the float style property of this element by using the GWT DOM class public void setFloat(Float value){ if(value != null){ - DOM.setStyleAttribute(this.getElement(), "float", value.getCssName()); + DOM.setStyleAttribute(this.mainPanel.getElement(), "float", value.getCssName()); } } @@ -1162,7 +1162,7 @@ // sets the clear style property of this element by using the GWT DOM class public void setClear(ClearValue value){ if(value != null){ - DOM.setStyleAttribute(this.getElement(), "clear", value.getCssValue()); + DOM.setStyleAttribute(this.mainPanel.getElement(), "clear", value.getCssValue()); } } @@ -1170,7 +1170,7 @@ // sets the vertical-align style property of this element and all it's sub-elements by using the GWT DOM class public void setVerticalAlign(Widget widget, VerticalAlign value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - this.setCssProperty( widget, styleClass, "verticalAlign", value.getCssName()); + this.setCssProperty(widget, styleClass, "verticalAlign", value.getCssName()); this.setCssProperty(styleClass, "verticalAlign", value.getCssName()); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java Fri Jul 22 01:31:07 2011 (r657) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java Fri Jul 22 02:15:04 2011 (r658) @@ -27,6 +27,7 @@ public GdlTextObject(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative); + super.setGdlStyle(); }

1 0

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

22 Jul '11

Author: lgiessmann Date: Fri Jul 22 01:31:07 2011 New Revision: 657 Log: gdl-frontend: Widgets: fixed a bug when searching for the first containee of a container; extended the test gdl file 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/container/GdlUnit.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/TmHelper.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Thu Jul 21 02:55:39 2011 (r656) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Fri Jul 22 01:31:07 2011 (r657) @@ -239,7 +239,7 @@ JsArray<Role> selection = assoc.getRoles(pair.getSecond()); int i = 0; for(; i != selection.length(); ++i) - if(isInstanceOf(selection.get(i).getPlayer(), pair.getFirst())) break; + if(pair.getFirst() == null || isInstanceOf(selection.get(i).getPlayer(), pair.getFirst())) break; if(i == selection.length()) return false; } @@ -250,7 +250,7 @@ Role currentRole = roles.get(i); int j = 0; for(; j != rolePlayertypesAndTypes.size(); ++j) - if(currentRole.getType().equals(rolePlayertypesAndTypes.get(j).getSecond()) && isInstanceOf(currentRole.getPlayer(), rolePlayertypesAndTypes.get(j).getFirst())) break; + if(currentRole.getType().equals(rolePlayertypesAndTypes.get(j).getSecond()) && (isInstanceOf(currentRole.getPlayer(), rolePlayertypesAndTypes.get(j).getFirst()) || rolePlayertypesAndTypes.get(j).getFirst() == null)) break; if(j == rolePlayertypesAndTypes.size()) return false; } @@ -310,22 +310,11 @@ localRolePlayertypesAndTypes.add(new Pair<Topic, Topic>(typeOfTopic, roleType)); for (Association assoc : allPotentialAssocs){ - if(getAnyIdOfTopic(topic).equals("http://psi.test.org/gdl-test/unit-1")){ // TODO: remove - String str = ""; - for (Pair<Topic, Topic> pair : localRolePlayertypesAndTypes) - str += ", [" + getAnyIdOfTopic(pair.getFirst()) + ", " + getAnyIdOfTopic(pair.getSecond()) + "]"; - - Window.alert(str); - } - if(hasRoles(assoc, localRolePlayertypesAndTypes)) assocsWoScope.add(assoc); } for (Association assoc : assocsWoScope) if(hasThemes(assoc, scope)) result.add(assoc); - - - return result; } @@ -424,15 +413,7 @@ rolePlayertypesAndTypes.add(new Pair<Topic, Topic>(visibleObject, descendantRoleType)); rolePlayertypesAndTypes.add(new Pair<Topic, Topic>(position, descriptorRoleType)); ArrayList<Association> descendantAssocsOfContainer = TmHelper.getAssociationsOfTopic(container, ancestorRoleType, positionAssocType, null, rolePlayertypesAndTypes); - - if(getAnyIdOfTopic(container).equals("http://psi.test.org/gdl-test/unit-1")){ // TODO: remove - Association assoc = container.getRolesPlayed(ancestorRoleType, positionAssocType).get(0).getParent(); - String str = ""; - for(int i = 0; i != assoc.getRoles().length(); ++i) - str += ", [" + getAnyIdOfTopic(assoc.getRoles().get(i).getType()) + ", " + getAnyIdOfTopic(assoc.getRoles().get(i).getPlayer()) + "]"; - Window.alert(getAnyIdOfTopic(container) + " >> " + descendantAssocsOfContainer.size() + " >> " + str); - } - + ArrayList<Topic> validDescendants = new ArrayList<Topic>(); for (Association descendantAssociation : descendantAssocsOfContainer) { JsArray<Role> descendantRoles = descendantAssociation.getRoles(descendantRoleType); @@ -448,7 +429,7 @@ for (Topic topic : validDescendants) bindings += ", " + getAnyIdOfTopic(topic); if(bindings.length() == 0) bindings = "[]"; else bindings = bindings.substring(2); - throw new InvalidGdlSchemaException("the topic " + top + " must be bound to exaclty one ancestor element, but found " + bindings); + throw new InvalidGdlSchemaException("the topic " + top + " must be bound to exaclty one descendant element, but found " + bindings); }else { return validDescendants.get(0); } 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 Thu Jul 21 02:55:39 2011 (r656) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Fri Jul 22 01:31:07 2011 (r657) @@ -2,6 +2,7 @@ import java.util.ArrayList; import com.google.gwt.user.client.Element; +import com.google.gwt.user.client.Window; import com.google.gwt.event.dom.client.BlurEvent; import com.google.gwt.event.dom.client.BlurHandler; import com.google.gwt.event.dom.client.FocusEvent; @@ -22,6 +23,7 @@ import com.google.gwt.event.dom.client.MouseUpHandler; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.ui.AbsolutePanel; import com.google.gwt.user.client.ui.CaptionPanel; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; @@ -40,6 +42,7 @@ import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.text.GdlTextObject; import us.isidor.gdl.anaToMia.Widgets.value.BorderStyleValue; +import us.isidor.gdl.anaToMia.Widgets.value.TextDecorationValue; public class GdlUnit extends GdlTextObject implements IGdlContainer { @@ -60,7 +63,7 @@ // creates a unit element or returns the one, if there is a unit element // in the subElements array private void createUnit() throws InvalidGdlSchemaException, ExecutionException{ - UnitWidget unit = new UnitWidget(); + UnitWidget unit = new UnitWidget(this.getTmRepresentative()); ActiveStyleHandler asHandler = new ActiveStyleHandler(this); FocusStyleHandler fsHandler = new FocusStyleHandler(this); HoverStyleHandler hsHandler = new HoverStyleHandler(this); @@ -133,12 +136,11 @@ } } - + // sets all GDL styles that are defined by the topic map representative to tha passed widget @Override public void setGdlStyle(Widget widget) throws InvalidGdlSchemaException, ExecutionException { super.setGdlStyle(widget); - this.setUnitName(widget, this.getUnitName()); } @@ -170,12 +172,14 @@ protected class UnitWidget extends Composite implements HasFocusHandlers, HasBlurHandlers, HasMouseOutHandlers, HasMouseOverHandlers, HasMouseDownHandlers, HasMouseUpHandlers{ private CaptionPanel basePanel = new CaptionPanel(); + private AbsolutePanel containerPanel = new AbsolutePanel(); private Topic tmRepresentative = null; private ArrayList<Widget> subElements = new ArrayList<Widget>(); private UnitWidget(){ initWidget(this.basePanel); + this.basePanel.add(this.containerPanel); } @@ -207,15 +211,15 @@ this.subElements.add(newObj); if(this.getTmRepresentative().equals(ancestor)){ - this.basePanel.add(newObj); + this.containerPanel.add(newObj); } else{ Element elemBefore = oldObj.getElement(); Element elemAfter = DOM.getNextSibling(elemBefore); // insert before seems to be a more accepted and stable // way of inserting new child elements than insertAfter - if(elemAfter == null) this.basePanel.add(newObj); - else this.basePanel.getElement().insertBefore(newObj.getElement(), elemAfter); + if(elemAfter == null) this.containerPanel.add(newObj); + else this.containerPanel.getElement().insertBefore(newObj.getElement(), elemAfter); } position.setAttributes(newObj); return newObj; 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 Thu Jul 21 02:55:39 2011 (r656) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Fri Jul 22 01:31:07 2011 (r657) @@ -43,6 +43,8 @@ {"subject_identifiers":["[gdl:unit-name]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:height]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:font-weight]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:float]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:clear]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[doc:default-creator-topic-view-1]"], "instance_of":["si:[gdl:Default-Creator-Topic-View]"], "names":[{"value": "Def. Creator View 1", "type":"si:[gdl:view-name]"}], "occurrences":[{"type":"si:[gdl:id]", "value":"default_creator_topic_view_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:background-color]", "value":"#ccc"}, {"type":"si:[gdl:width]", "value":"500px"}, {"type":"si:[gdl:height]", "value":"600px"}]}, {"subject_identifiers":["[gdl:View]"]}, {"subject_identifiers":["[gdl:Text]"]}, @@ -56,8 +58,10 @@ {"subject_identifiers":["[doc:text-1]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"text_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:readonly]", "value":"false", "datatype":"[xsd:boolean]"}]}, {"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]"]}, - {"subject_identifiers":["[doc:pos-of-unit-1-reference]"], "instance_of":["si:[gdl:Reference]"]}, + {"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:pos-of-unit-1-reference]"], "instance_of":["si:[gdl:Position]"]}, + {"subject_identifiers":["[doc:pos-of-unit-1-text]"], "instance_of":["si:[gdl:Position]"]}, {"subject_identifiers":["[doc:reference-1]"], "instance_of":["si:[gdl:Reference]"], "occurrences":[{"type":"si:[gdl:id]", "value":"reference_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:margin-left]", "value":"200px"}, {"type":"si:[gdl:background-color]", "value":"yellow"}]}, {"subject_identifiers":["[doc:list-box-1]"], "instance_of":["si:[gdl:List-Box]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_box_1_id", "datatype":"[xsd:ID]"}]}, {"subject_identifiers":["[gdl:Value]"], "instance_of":["si:[tmcl:topic-type]"]}, @@ -159,5 +163,7 @@ {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:person-list]"},{"type":"si:[gdl:containee]", "player":"si:[doc:list-item-2]"}, {"type":"si:[gdl:nth-element]", "player":"si:[doc:nth-elem-2]"}]}, {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:person-list]"},{"type":"si:[gdl:containee]", "player":"si:[doc:list-item-3]"}, {"type":"si:[gdl:nth-element]", "player":"si:[doc:nth-elem-3]"}]}, {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:unit-1]"},{"type":"si:[gdl:containee]", "player":"si:[doc:unit-1-reference]"}]}, - {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:pos-of-unit-1-reference]"},{"type":"si:[gdl:ancestor]", "player":"si:[doc:unit-1]"}, {"type":"si:[gdl:descendant]", "player":"si:[doc:unit-1-reference]"}]} + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:unit-1]"},{"type":"si:[gdl:containee]", "player":"si:[doc:unit-1-text]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:pos-of-unit-1-reference]"},{"type":"si:[gdl:ancestor]", "player":"si:[doc:unit-1]"}, {"type":"si:[gdl:descendant]", "player":"si:[doc:unit-1-reference]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:pos-of-unit-1-reference]"},{"type":"si:[gdl:ancestor]", "player":"si:[doc:unit-1-reference]"}, {"type":"si:[gdl:descendant]", "player":"si:[doc:unit-1-text]"}]} ]} \ No newline at end of file

1 0

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

21 Jul '11

Author: lgiessmann Date: Thu Jul 21 02:55:39 2011 New Revision: 656 Log: 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/TmHelper.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 Thu Jul 21 01:31:07 2011 (r655) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt Thu Jul 21 02:55:39 2011 (r656) @@ -1,5 +1,5 @@ 1. Use a Hyperlink element in GdlReference instead of the inner class Reference -2. Implement GdlLineBreak +2. Implement GdlLineBreak => placeholder 3. Implement TopicMaps data consumption 4. Implement TopicMaps data generation 3. Implement GdlButton(s) 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 Thu Jul 21 01:31:07 2011 (r655) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Thu Jul 21 02:55:39 2011 (r656) @@ -15,6 +15,7 @@ import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis.RoleType; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis.TMDM; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis.TopicType; +import us.isidor.gdl.anaToMia.Widgets.container.GdlUnit; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes; @@ -308,10 +309,23 @@ Topic typeOfTopic = topic.getTypes().length() != 0 ? topic.getTypes().get(0) : null; localRolePlayertypesAndTypes.add(new Pair<Topic, Topic>(typeOfTopic, roleType)); - for (Association assoc : allPotentialAssocs) if(hasRoles(assoc, localRolePlayertypesAndTypes)) assocsWoScope.add(assoc); + for (Association assoc : allPotentialAssocs){ + if(getAnyIdOfTopic(topic).equals("http://psi.test.org/gdl-test/unit-1")){ // TODO: remove + String str = ""; + for (Pair<Topic, Topic> pair : localRolePlayertypesAndTypes) + str += ", [" + getAnyIdOfTopic(pair.getFirst()) + ", " + getAnyIdOfTopic(pair.getSecond()) + "]"; + + Window.alert(str); + } + + if(hasRoles(assoc, localRolePlayertypesAndTypes)) assocsWoScope.add(assoc); + } for (Association assoc : assocsWoScope) if(hasThemes(assoc, scope)) result.add(assoc); + + + return result; } @@ -411,6 +425,14 @@ rolePlayertypesAndTypes.add(new Pair<Topic, Topic>(position, descriptorRoleType)); ArrayList<Association> descendantAssocsOfContainer = TmHelper.getAssociationsOfTopic(container, ancestorRoleType, positionAssocType, null, rolePlayertypesAndTypes); + if(getAnyIdOfTopic(container).equals("http://psi.test.org/gdl-test/unit-1")){ // TODO: remove + Association assoc = container.getRolesPlayed(ancestorRoleType, positionAssocType).get(0).getParent(); + String str = ""; + for(int i = 0; i != assoc.getRoles().length(); ++i) + str += ", [" + getAnyIdOfTopic(assoc.getRoles().get(i).getType()) + ", " + getAnyIdOfTopic(assoc.getRoles().get(i).getPlayer()) + "]"; + Window.alert(getAnyIdOfTopic(container) + " >> " + descendantAssocsOfContainer.size() + " >> " + str); + } + ArrayList<Topic> validDescendants = new ArrayList<Topic>(); for (Association descendantAssociation : descendantAssocsOfContainer) { JsArray<Role> descendantRoles = descendantAssociation.getRoles(descendantRoleType); 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 Thu Jul 21 01:31:07 2011 (r655) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Thu Jul 21 02:55:39 2011 (r656) @@ -54,8 +54,10 @@ {"subject_identifiers":["[doc:list-item-2]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_item_2_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:padding]", "value":"5px"}, {"type":"si:[gdl:margin-top]", "value":"5px"}]}, {"subject_identifiers":["[gdl:List-Box]"]}, {"subject_identifiers":["[doc:text-1]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"text_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:readonly]", "value":"false", "datatype":"[xsd:boolean]"}]}, - {"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":"100px"}, {"type":"si:[gdl:height]", "value":"100px"}, {"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":"yellow"}]}, + {"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]"]}, + {"subject_identifiers":["[doc:pos-of-unit-1-reference]"], "instance_of":["si:[gdl:Reference]"]}, {"subject_identifiers":["[doc:reference-1]"], "instance_of":["si:[gdl:Reference]"], "occurrences":[{"type":"si:[gdl:id]", "value":"reference_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:margin-left]", "value":"200px"}, {"type":"si:[gdl:background-color]", "value":"yellow"}]}, {"subject_identifiers":["[doc:list-box-1]"], "instance_of":["si:[gdl:List-Box]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_box_1_id", "datatype":"[xsd:ID]"}]}, {"subject_identifiers":["[gdl:Value]"], "instance_of":["si:[tmcl:topic-type]"]}, @@ -155,5 +157,7 @@ {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:pos-of-unit]"},{"type":"si:[gdl:ancestor]", "player":"si:[doc:person-list]"}, {"type":"si:[gdl:descendant]", "player":"si:[doc:unit-1]"}]}, {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:person-list]"},{"type":"si:[gdl:containee]", "player":"si:[doc:list-item-1]"}, {"type":"si:[gdl:nth-element]", "player":"si:[doc:nth-elem-1]"}]}, {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:person-list]"},{"type":"si:[gdl:containee]", "player":"si:[doc:list-item-2]"}, {"type":"si:[gdl:nth-element]", "player":"si:[doc:nth-elem-2]"}]}, - {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:person-list]"},{"type":"si:[gdl:containee]", "player":"si:[doc:list-item-3]"}, {"type":"si:[gdl:nth-element]", "player":"si:[doc:nth-elem-3]"}]} + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:person-list]"},{"type":"si:[gdl:containee]", "player":"si:[doc:list-item-3]"}, {"type":"si:[gdl:nth-element]", "player":"si:[doc:nth-elem-3]"}]}, + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:unit-1]"},{"type":"si:[gdl:containee]", "player":"si:[doc:unit-1-reference]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:pos-of-unit-1-reference]"},{"type":"si:[gdl:ancestor]", "player":"si:[doc:unit-1]"}, {"type":"si:[gdl:descendant]", "player":"si:[doc:unit-1-reference]"}]} ]} \ No newline at end of file

1 0

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

21 Jul '11

Author: lgiessmann Date: Thu Jul 21 01:31:07 2011 New Revision: 655 Log: gdl-frontend: Widgets: fixed a bug in GdlVisibleObject.getBorderColor when getting the default border color Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.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 Thu Jul 21 01:26:39 2011 (r654) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Thu Jul 21 01:31:07 2011 (r655) @@ -424,8 +424,10 @@ colorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderColor); } - if(colorOcc == null ){ + if(colorOcc == null && styleClass != null){ return null; + } else if(colorOcc == null) { + return new ColorValue(); } else { return new ColorValue(colorOcc.getValue()); }

1 0

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

21 Jul '11

Author: lgiessmann Date: Thu Jul 21 01:26:39 2011 New Revision: 654 Log: gdl-frontend: Widgets: changed the style properties of GdlUnit => unit-border styles are removed, i.e. the unit-border is used also as the element border 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/container/GdlUnit.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 20 11:21:32 2011 (r653) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java Thu Jul 21 01:26:39 2011 (r654) @@ -175,36 +175,6 @@ public final static String gdlResize = gdl + "resize"; public final static String gdlTitleOrder = gdl + "title-order"; public final static String gdlUnitName = gdl + "unit-name"; - public final static String gdlUnitBorderWidth = gdl + "unit-border-width"; - public final static String gdlUnitBorderTopWidth = gdl + "unit-border-top-width"; - public final static String gdlUnitBorderRightWidth = gdl + "unit-border-right-width"; - public final static String gdlUnitBorderBottomWidth = gdl + "unit-border-bottom-width"; - public final static String gdlUnitBorderLeftWidth = gdl + "unit-border-left-width"; - public final static String gdlUnitBorderColor = gdl + "unit-border-color"; - public final static String gdlUnitBorderTopColor = gdl + "unit-border-top-color"; - public final static String gdlUnitBorderRightColor = gdl + "unit-border-right-color"; - public final static String gdlUnitBorderBottomColor = gdl + "unit-border-bottom-color"; - public final static String gdlUnitBorderLeftColor = gdl + "unit-border-left-color"; - public final static String gdlUnitBorderStyle = gdl + "unit-border-style"; - public final static String gdlUnitBorderTopStyle = gdl + "unit-border-top-style"; - public final static String gdlUnitBorderRightStyle = gdl + "unit-border-right-style"; - public final static String gdlUnitBorderBottomStyle = gdl + "unit-border-bottom-style"; - public final static String gdlUnitBorderLeftStyle = gdl + "unit-border-left-style"; - public final static String gdlUnitBorderPadding = gdl + "unit-border-padding"; - public final static String gdlUnitBorderTopPadding = gdl + "unit-border-top-padding"; - public final static String gdlUnitBorderRightPadding = gdl + "unit-border-right-padding"; - public final static String gdlUnitBorderBottomPadding = gdl + "unit-border-bottom-padding"; - public final static String gdlUnitBorderLeftPadding = gdl + "unit-border-left-padding"; - public final static String gdlUnitBorderMargin = gdl + "unit-border-margin"; - public final static String gdlUnitBorderTopMargin = gdl + "unit-border-top-margin"; - public final static String gdlUnitBorderRightMargin = gdl + "unit-border-right-margin"; - public final static String gdlUnitBorderBottomMargin = gdl + "unit-border-bottom-margin"; - public final static String gdlUnitBorderLeftMargin = gdl + "unit-border-left-margin"; - public final static String gdlUnitBorderRadius = gdl + "unit-border-radius"; - public final static String gdlUnitborderTopRightRadius = gdl + "unit-border-top-right-radius"; - public final static String gdlUnitBorderBottomRightRadius = gdl + "unit-border-bottom-right-radius"; - public final static String gdlUnitBorderBottomLeftRadius = gdl + "unit-border-bottom-left-radius"; - public final static String gdlUnitBorderTopLeftRadius = gdl + "unit-border-top-left-radius"; public final static String gdlContentOrientation = gdl + "content-orientation"; } 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 20 11:21:32 2011 (r653) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Thu Jul 21 01:26:39 2011 (r654) @@ -22,10 +22,8 @@ import com.google.gwt.event.dom.client.MouseUpHandler; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.ui.AbsolutePanel; import com.google.gwt.user.client.ui.CaptionPanel; import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; @@ -40,22 +38,11 @@ import us.isidor.gdl.anaToMia.Widgets.environment.GdlInstantiator; 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.text.GdlTextObject; -import us.isidor.gdl.anaToMia.Widgets.value.AbsoluteNumValue; -import us.isidor.gdl.anaToMia.Widgets.value.AutoNumUnitValue; import us.isidor.gdl.anaToMia.Widgets.value.BorderStyleValue; -import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; -import us.isidor.gdl.anaToMia.Widgets.value.NumUnitValue; -import us.isidor.gdl.anaToMia.Widgets.value.TextDecorationValue; -public class GdlUnit extends GdlTextObject implements IGdlContainer { - protected ArrayList<Pair<String, String>> unitActiveCssNamesAndStyles = new ArrayList<Pair<String,String>>(); - protected ArrayList<Pair<String, String>> unitFocusCssNamesAndStyles = new ArrayList<Pair<String,String>>(); - protected ArrayList<Pair<String, String>> unitHoverCssNamesAndStyles = new ArrayList<Pair<String,String>>(); - - +public class GdlUnit extends GdlTextObject implements IGdlContainer { // some constructors protected GdlUnit() throws InvalidGdlSchemaException, ExecutionException { super(); @@ -101,1813 +88,187 @@ } - // returns a AbsoluteNumValue instance that represents the width of this element's group border. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public AbsoluteNumValue getUnitBorderWidth(String styleClass) throws InvalidGdlSchemaException { - Occurrence widthOcc = null; - if(styleClass != null){ - widthOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderWidth, styleClass); - } else { - widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderWidth); - } + // returns a String instance that represents the literal value of this elements name. + public String getUnitName() throws InvalidGdlSchemaException { + Occurrence nameOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitName); - if(widthOcc == null && styleClass != null){ - return null; - } else if(widthOcc == null) { - return new AbsoluteNumValue("2px"); + if(nameOcc == null){ + return ""; } else { - return new AbsoluteNumValue(widthOcc.getValue()); + return nameOcc.getValue(); } } + + + // sets the passed string a caption/unit-name of the group item + public void setUnitName(Widget widget, String value){ + ((UnitWidget)widget).setCaption(value); + } - // returns a AbsoluteNumValue instance that represents the width of this element's border-top. + // returns a ColorValue instance that represents the style of this element's border. // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. - public AbsoluteNumValue getUnitBorderTopWidth(String styleClass) throws InvalidGdlSchemaException { - Occurrence widthOcc = null; + // null, null otherwise. If the styleClass is null and no occurrence was found, the default value for this + // property is returned. + @Override + public BorderStyleValue getBorderStyle(String styleClass) throws InvalidGdlSchemaException { + Occurrence styleOcc = null; if(styleClass != null){ - widthOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderTopWidth, styleClass); + styleOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlBorderStyle, styleClass); } else { - widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderTopWidth); + styleOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderStyle); } - if(widthOcc == null){ + if(styleOcc == null && styleClass != null){ return null; + } else if(styleOcc == null) { + return BorderStyleValue.GROOVE; } else { - return new AbsoluteNumValue(widthOcc.getValue()); + try{ + return BorderStyleValue.valueOf(styleOcc.getValue().toUpperCase()); + }catch(IllegalArgumentException e){ + String values = "none, hidden, dotted, dashed, solid, double, groove, ridge, inset, outset"; + throw new InvalidGdlSchemaException("border-style must be set to one of " + values + ", but is " + styleOcc.getValue()); + } } } - - // returns a AbsoluteNumValue instance that represents the width of this element's border-right. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. - public AbsoluteNumValue getUnitBorderRightWidth(String styleClass) throws InvalidGdlSchemaException { - Occurrence widthOcc = null; - if(styleClass != null){ - widthOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderRightWidth, styleClass); - } else { - widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderRightWidth); - } - - if(widthOcc == null){ - return null; - } else { - return new AbsoluteNumValue(widthOcc.getValue()); - } + + // sets all GDL styles that are defined by the topic map representative to tha passed widget + @Override + public void setGdlStyle(Widget widget) throws InvalidGdlSchemaException, ExecutionException { + super.setGdlStyle(widget); + + this.setUnitName(widget, this.getUnitName()); } - - // returns a AbsoluteNumValue instance that represents the width of this element's border-bottom. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. - public AbsoluteNumValue getUnitBorderBottomWidth(String styleClass) throws InvalidGdlSchemaException { - Occurrence widthOcc = null; - if(styleClass != null){ - widthOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderBottomWidth, styleClass); - } else { - widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderBottomWidth); - } - - if(widthOcc == null){ - return null; - } else { - return new AbsoluteNumValue(widthOcc.getValue()); - } + + @Override + @Deprecated + public GdlVisibleObject append(Topic ancestor, Topic current) throws InvalidGdlSchemaException, ExecutionException { + // do nothing this method has no effect on the mainpanle + return null; } - - - // returns a AbsoluteNumValue instance that represents the width of this element's border-left. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. - public AbsoluteNumValue getUnitBorderLeftWidth(String styleClass) throws InvalidGdlSchemaException { - Occurrence widthOcc = null; - if(styleClass != null){ - widthOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderLeftWidth, styleClass); - } else { - widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderLeftWidth); - } - - if(widthOcc == null){ - return null; - } else { - return new AbsoluteNumValue(widthOcc.getValue()); - } + + + // returns all topics that are bound to this tm representative topic via a + // contains association + @Override + public ArrayList<Topic> contains() throws InvalidGdlSchemaException { + return TmHelper.topicContains(this.tmRepresentative); } - // returns a ColorValue instance that represents the color of this element's group border. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public ColorValue getUnitBorderColor(String styleClass) throws InvalidGdlSchemaException { - Occurrence colorOcc = null; - if(styleClass != null){ - colorOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderColor, styleClass); - } else { - colorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderColor); - } - - if(colorOcc == null && styleClass != null){ - return null; - } else if(colorOcc == null) { - return new ColorValue(); - } else { - return new ColorValue(colorOcc.getValue()); - } + // Searches the topic that represents the first item that is placed within this view instance + // i.e. such an item must not have an association that is bound to it via a role of the type + // gdl:ancestor. + protected Topic getStartElement(ArrayList<Topic> containees) throws InvalidGdlSchemaException { + return TmHelper.getFirstContainee(super.getTmRepresentative(), containees); } - // returns a ColorValue instance that represents the color of this element's group border. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public ColorValue getUnitBorderTopColor(String styleClass) throws InvalidGdlSchemaException { - Occurrence colorOcc = null; - if(styleClass != null){ - colorOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderTopColor, styleClass); - } else { - colorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderTopColor); - } - - if(colorOcc == null ){ - return null; - } else { - return new ColorValue(colorOcc.getValue()); + + protected class UnitWidget extends Composite implements HasFocusHandlers, HasBlurHandlers, HasMouseOutHandlers, HasMouseOverHandlers, HasMouseDownHandlers, HasMouseUpHandlers{ + private CaptionPanel basePanel = new CaptionPanel(); + private Topic tmRepresentative = null; + private ArrayList<Widget> subElements = new ArrayList<Widget>(); + + + private UnitWidget(){ + initWidget(this.basePanel); } - } - - - // returns a ColorValue instance that represents the color of this element's group border. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public ColorValue getUnitBorderRightColor(String styleClass) throws InvalidGdlSchemaException { - Occurrence colorOcc = null; - if(styleClass != null){ - colorOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderRightColor, styleClass); - } else { - colorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderRightColor); + + + public UnitWidget(Topic tmRepresentative){ + this(); + this.tmRepresentative = tmRepresentative; } - - if(colorOcc == null ){ - return null; - } else { - return new ColorValue(colorOcc.getValue()); + + + public Topic getTmRepresentative(){ + return this.tmRepresentative; } - } - - - // returns a ColorValue instance that represents the color of this element's group border. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public ColorValue getUnitBorderBottomColor(String styleClass) throws InvalidGdlSchemaException { - Occurrence colorOcc = null; - if(styleClass != null){ - colorOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderBottomColor, styleClass); - } else { - colorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderBottomColor); + + + + // appends a new element in form of a topic to this unit-widget + public GdlVisibleObject append(Topic ancestor, Topic current) throws ExecutionException, InvalidGdlSchemaException { + if(ancestor == null || current == null) throw new ExecutionException("to append \"" + TmHelper.getAnyIdOfTopic(current) + "\" on \"" + TmHelper.getAnyIdOfTopic(ancestor) + "\" both topics must be present"); + GdlPosition position = new GdlPosition(TmHelper.getPositionOf(ancestor, current)); + + GdlVisibleObject newObj = GdlInstantiator.instantiate(current); + GdlVisibleObject oldObj = null; + for (Widget widget : this.subElements){ + if(((GdlVisibleObject)widget).getTmRepresentative().equals(ancestor)){ + oldObj = (GdlVisibleObject)widget; + break; + } + } + + this.subElements.add(newObj); + if(this.getTmRepresentative().equals(ancestor)){ + this.basePanel.add(newObj); + } + else{ + Element elemBefore = oldObj.getElement(); + Element elemAfter = DOM.getNextSibling(elemBefore); + // insert before seems to be a more accepted and stable + // way of inserting new child elements than insertAfter + if(elemAfter == null) this.basePanel.add(newObj); + else this.basePanel.getElement().insertBefore(newObj.getElement(), elemAfter); + } + position.setAttributes(newObj); + return newObj; } - - if(colorOcc == null ){ - return null; - } else { - return new ColorValue(colorOcc.getValue()); + + + public void setId(String id){ + DOM.setElementAttribute(this.basePanel.getElement(), "id", id); } - } - - - // returns a ColorValue instance that represents the color of this element's group border. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public ColorValue getUnitBorderLeftColor(String styleClass) throws InvalidGdlSchemaException { - Occurrence colorOcc = null; - if(styleClass != null){ - colorOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderLeftColor, styleClass); - } else { - colorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderLeftColor); + + public String getCaption() { + return this.basePanel.getCaptionText(); } - - if(colorOcc == null ){ - return null; - } else { - return new ColorValue(colorOcc.getValue()); + + + // sets the unit's name. If the name is "" or null, + // the legend element is set to non-visible + public void setCaption(String caption) { + if(caption == null || caption.length() == 0){ + this.basePanel.setCaptionText(caption); + } else { + this.basePanel.setCaptionText(caption); + } } - } - - // returns a ColorValue instance that represents the style of this element's unit border. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public BorderStyleValue getUnitBorderStyle(String styleClass) throws InvalidGdlSchemaException { - Occurrence styleOcc = null; - if(styleClass != null){ - styleOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderStyle, styleClass); - } else { - styleOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderStyle); + + @Override + public HandlerRegistration addMouseUpHandler(MouseUpHandler handler) { + return this.addDomHandler(handler, MouseUpEvent.getType()); } - if(styleOcc == null && styleClass != null){ - return null; - } else if(styleOcc == null) { - return BorderStyleValue.GROOVE; - } else { - try{ - return BorderStyleValue.valueOf(styleOcc.getValue().toUpperCase()); - }catch(IllegalArgumentException e){ - String values = "none, hidden, dotted, dashed, solid, double, groove, ridge, inset, outset"; - throw new InvalidGdlSchemaException("border-style must be set to one of " + values + ", but is " + styleOcc.getValue()); - } + + @Override + public HandlerRegistration addMouseDownHandler(MouseDownHandler handler) { + return this.addDomHandler(handler, MouseDownEvent.getType()); } - } - // returns a ColorValue instance that represents the style of this element's unit border-top. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. - public BorderStyleValue getUnitBorderTopStyle(String styleClass) throws InvalidGdlSchemaException { - Occurrence styleOcc = null; - if(styleClass != null){ - styleOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderTopStyle, styleClass); - } else { - styleOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderTopStyle); + @Override + public HandlerRegistration addMouseOverHandler(MouseOverHandler handler) { + return this.addDomHandler(handler, MouseOverEvent.getType()); } - if(styleOcc == null){ - return null; - } else { - try{ - return BorderStyleValue.valueOf(styleOcc.getValue().toUpperCase()); - }catch(IllegalArgumentException e){ - String values = "none, hidden, dotted, dashed, solid, double, groove, ridge, inset, outset"; - throw new InvalidGdlSchemaException("border-top-style must be set to one of " + values + ", but is " + styleOcc.getValue()); - } + + @Override + public HandlerRegistration addMouseOutHandler(MouseOutHandler handler) { + return this.addDomHandler(handler, MouseOutEvent.getType()); } - } - // returns a ColorValue instance that represents the style of this element's border-right. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. - public BorderStyleValue getUnitBorderRightStyle(String styleClass) throws InvalidGdlSchemaException { - Occurrence styleOcc = null; - if(styleClass != null){ - styleOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderRightStyle, styleClass); - } else { - styleOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderRightStyle); - } - - if(styleOcc == null){ - return null; - } else { - try{ - return BorderStyleValue.valueOf(styleOcc.getValue().toUpperCase()); - }catch(IllegalArgumentException e){ - String values = "none, hidden, dotted, dashed, solid, double, groove, ridge, inset, outset"; - throw new InvalidGdlSchemaException("border-right-style must be set to one of " + values + ", but is " + styleOcc.getValue()); - } - } - } - - - // returns a ColorValue instance that represents the style of this element's border-bottom. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. - public BorderStyleValue getUnitBorderBottomStyle(String styleClass) throws InvalidGdlSchemaException { - Occurrence styleOcc = null; - if(styleClass != null){ - styleOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderBottomStyle, styleClass); - } else { - styleOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderBottomStyle); - } - - if(styleOcc == null){ - return null; - } else { - try{ - return BorderStyleValue.valueOf(styleOcc.getValue().toUpperCase()); - }catch(IllegalArgumentException e){ - String values = "none, hidden, dotted, dashed, solid, double, groove, ridge, inset, outset"; - throw new InvalidGdlSchemaException("border-bottom-style must be set to one of " + values + ", but is " + styleOcc.getValue()); - } - } - } - - - // returns a ColorValue instance that represents the style of this element's border-left. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. - public BorderStyleValue getUnitBorderLeftStyle(String styleClass) throws InvalidGdlSchemaException { - Occurrence styleOcc = null; - if(styleClass != null){ - styleOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderLeftStyle, styleClass); - } else { - styleOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderLeftStyle); - } - - if(styleOcc == null){ - return null; - } else { - try{ - return BorderStyleValue.valueOf(styleOcc.getValue().toUpperCase()); - }catch(IllegalArgumentException e){ - String values = "none, hidden, dotted, dashed, solid, double, groove, ridge, inset, outset"; - throw new InvalidGdlSchemaException("border-left-style must be set to one of " + values + ", but is " + styleOcc.getValue()); - } - } - } - - - // returns a String instance that represents the literal value of this elements name. - public String getUnitName() throws InvalidGdlSchemaException { - Occurrence nameOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitName); - - if(nameOcc == null){ - return ""; - } else { - return nameOcc.getValue(); - } - } - - - // returns a NumUnitValue instance that represents the padding of this element's unit-border. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public NumUnitValue getUnitBorderPadding(String styleClass) throws InvalidGdlSchemaException { - Occurrence paddingOcc = null; - if(styleClass != null){ - paddingOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderPadding, styleClass); - } else { - paddingOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderPadding); - } - - if(paddingOcc == null && styleClass != null){ - return null; - } else if(paddingOcc == null) { - return new NumUnitValue(); - } else { - return new NumUnitValue(paddingOcc.getValue()); - } - } - - - // returns a NumUnitValue instance that represents the padding of this element's unit-border. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public NumUnitValue getUnitBorderTopPadding(String styleClass) throws InvalidGdlSchemaException { - Occurrence paddingOcc = null; - if(styleClass != null){ - paddingOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderTopPadding, styleClass); - } else { - paddingOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderTopPadding); - } - - if(paddingOcc == null){ - return null; - } else { - return new NumUnitValue(paddingOcc.getValue()); - } - } - - - // returns a NumUnitValue instance that represents the padding of this element's unit-border. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public NumUnitValue getUnitBorderRightPadding(String styleClass) throws InvalidGdlSchemaException { - Occurrence paddingOcc = null; - if(styleClass != null){ - paddingOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderRightPadding, styleClass); - } else { - paddingOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderRightPadding); - } - - if(paddingOcc == null){ - return null; - } else { - return new NumUnitValue(paddingOcc.getValue()); - } - } - - - // returns a NumUnitValue instance that represents the padding of this element's unit-border. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public NumUnitValue getUnitBorderBottomPadding(String styleClass) throws InvalidGdlSchemaException { - Occurrence paddingOcc = null; - if(styleClass != null){ - paddingOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderBottomPadding, styleClass); - } else { - paddingOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderBottomPadding); - } - - if(paddingOcc == null){ - return null; - } else { - return new NumUnitValue(paddingOcc.getValue()); - } - } - - - // returns a NumUnitValue instance that represents the padding of this element's unit-border. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public NumUnitValue getUnitBorderLeftPadding(String styleClass) throws InvalidGdlSchemaException { - Occurrence paddingOcc = null; - if(styleClass != null){ - paddingOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderLeftPadding, styleClass); - } else { - paddingOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderLeftPadding); - } - - if(paddingOcc == null){ - return null; - } else { - return new NumUnitValue(paddingOcc.getValue()); - } - } - - - // returns a NumUnitValue instance that represents the margin of this element's border padding. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // or null. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public NumUnitValue getUnitBorderMargin(String styleClass) throws InvalidGdlSchemaException { - Occurrence marginOcc = null; - if(styleClass != null){ - marginOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderMargin, styleClass); - } else { - marginOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderMargin); - } - - if(marginOcc == null && styleClass != null){ - return null; - } else if(marginOcc == null) { - return new NumUnitValue(); - } else { - return new NumUnitValue(marginOcc.getValue()); - } - } - - - // returns a NumUnitValue instance that represents the margin of this element's border padding. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // or null. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public NumUnitValue getUnitBorderTopMargin(String styleClass) throws InvalidGdlSchemaException { - Occurrence marginOcc = null; - if(styleClass != null){ - marginOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderTopMargin, styleClass); - } else { - marginOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderTopMargin); - } - - if(marginOcc == null){ - return null; - } else { - return new NumUnitValue(marginOcc.getValue()); - } - } - - - // returns a NumUnitValue instance that represents the margin of this element's border padding. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // or null. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public NumUnitValue getUnitBorderRightMargin(String styleClass) throws InvalidGdlSchemaException { - Occurrence marginOcc = null; - if(styleClass != null){ - marginOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderRightMargin, styleClass); - } else { - marginOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderRightMargin); - } - - if(marginOcc == null){ - return null; - } else { - return new NumUnitValue(marginOcc.getValue()); - } - } - - - // returns a NumUnitValue instance that represents the margin of this element's border padding. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // or null. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public NumUnitValue getUnitBorderBottomMargin(String styleClass) throws InvalidGdlSchemaException { - Occurrence marginOcc = null; - if(styleClass != null){ - marginOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderBottomMargin, styleClass); - } else { - marginOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderBottomMargin); - } - - if(marginOcc == null){ - return null; - } else { - return new NumUnitValue(marginOcc.getValue()); - } - } - - - // returns a NumUnitValue instance that represents the margin of this element's border padding. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // or null. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public NumUnitValue getUnitBorderLeftMargin(String styleClass) throws InvalidGdlSchemaException { - Occurrence marginOcc = null; - if(styleClass != null){ - marginOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderLeftMargin, styleClass); - } else { - marginOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderLeftMargin); - } - - if(marginOcc == null){ - return null; - } else { - return new NumUnitValue(marginOcc.getValue()); - } - } - - - // returns a NumUnitValue instance that represents the radius of this element's unit-border. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public NumUnitValue getUnitBorderRadius(String styleClass) throws InvalidGdlSchemaException { - Occurrence radiusOcc = null; - if(styleClass != null){ - radiusOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderRadius, styleClass); - } else { - radiusOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderRadius); - } - - if(radiusOcc == null && styleClass != null){ - return null; - } else if(radiusOcc == null) { - return new NumUnitValue(); - } else { - return new NumUnitValue(radiusOcc.getValue()); - } - } - - - // returns a NumUnitValue instance that represents the radius of this element's unit-border. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public NumUnitValue getUnitBorderTopLeftRadius(String styleClass) throws InvalidGdlSchemaException { - Occurrence radiusOcc = null; - if(styleClass != null){ - radiusOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderTopLeftRadius, styleClass); - } else { - radiusOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderTopLeftRadius); - } - - if(radiusOcc == null && styleClass != null){ - return null; - } else if(radiusOcc == null){ - return null; - } else { - return new NumUnitValue(radiusOcc.getValue()); - } - } - - - // returns a NumUnitValue instance that represents the radius of this element's unit-border. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public NumUnitValue getUnitBorderTopRightRadius(String styleClass) throws InvalidGdlSchemaException { - Occurrence radiusOcc = null; - if(styleClass != null){ - radiusOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitborderTopRightRadius, styleClass); - } else { - radiusOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitborderTopRightRadius); - } - - if(radiusOcc == null && styleClass != null){ - return null; - } else if(radiusOcc == null){ - return null; - } else { - return new NumUnitValue(radiusOcc.getValue()); - } - } - - - // returns a NumUnitValue instance that represents the radius of this element's unit-border. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public NumUnitValue getUnitBorderBottomLeftRadius(String styleClass) throws InvalidGdlSchemaException { - Occurrence radiusOcc = null; - if(styleClass != null){ - radiusOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderBottomLeftRadius, styleClass); - } else { - radiusOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderBottomLeftRadius); - } - - if(radiusOcc == null && styleClass != null){ - return null; - } else if(radiusOcc == null){ - return null; - } else { - return new NumUnitValue(radiusOcc.getValue()); - } - } - - - // returns a NumUnitValue instance that represents the radius of this element's unit-border. - // If a styleClass is set, only the corresponding value of the scoped occurrence is returned - // null, null otherwise. If the styleClass is null and no occurrence was found, the default value for this - // property is returned. - public NumUnitValue getUnitBorderBottomRightRadius(String styleClass) throws InvalidGdlSchemaException { - Occurrence radiusOcc = null; - if(styleClass != null){ - radiusOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderBottomRightRadius, styleClass); - } else { - radiusOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderBottomRightRadius); - } - - if(radiusOcc == null && styleClass != null){ - return null; - } else if(radiusOcc == null){ - return null; - } else { - return new NumUnitValue(radiusOcc.getValue()); - } - } - - - // adds the passed css style to the corresponding ArrayLists - private void addStyleToStore(String styleClass, String property, String value) throws InvalidGdlSchemaException { - if(styleClass == null) return; - else if(styleClass.equals(GdlPsis.Scope.gdlActive)) this.unitActiveCssNamesAndStyles.add(new Pair<String, String>(property, value)); - else if(styleClass.equals(GdlPsis.Scope.gdlFocus)) this.unitFocusCssNamesAndStyles.add(new Pair<String, String>(property, value)); - else if(styleClass.equals(GdlPsis.Scope.gdlHover)) this.unitHoverCssNamesAndStyles.add(new Pair<String, String>(property, value)); - else { - String values = GdlPsis.Scope.gdlActive + ", " + GdlPsis.Scope.gdlFocus + ", " + GdlPsis.Scope.gdlHover; - throw new InvalidGdlSchemaException("GDL defines only the style classes " + values + ", but found " + styleClass); - } - } - - - // sets the height style property of this element by using the GWT DOM class - public void setHeight(Widget widget, AutoNumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setHeight(value.getCssValue()); - else this.addStyleToStore(styleClass, "height", value.getCssValue()); - } - } - - - // sets the min-height style property of this element by using the GWT DOM class - public void setMinHeight(Widget widget, AutoNumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setMinHeight(value.getCssValue()); - else this.addStyleToStore(styleClass, "minHeight", value.getCssValue()); - } - } - - - // sets the max-height style property of this element by using the GWT DOM class - public void setMaxHeight(Widget widget, AutoNumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setMaxHeight(value.getCssValue()); - else this.addStyleToStore(styleClass, "maxHeight", value.getCssValue()); - } - } - - - // sets the min-width style property of this element by using the GWT DOM class - public void setWidth(Widget widget, AutoNumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setWidth(value.getCssValue()); - else this.addStyleToStore(styleClass, "width", value.getCssValue()); - } - } - - - // sets the min-width style property of this element by using the GWT DOM class - @Override - public void setTextDecoration(Widget widget, TextDecorationValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setTextDecoration(value.getCssValue()); - else this.addStyleToStore(styleClass, "textDecoration", value.getCssValue()); - } - } - - - // sets the max-width style property of this element by using the GWT DOM class - public void setMinWidth(Widget widget, AutoNumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setMinWidth(value.getCssValue()); - else this.addStyleToStore(styleClass, "minWidth", value.getCssValue()); - } - } - - - // sets the max-width style property of this element by using the GWT DOM class - public void setMaxWidth(Widget widget, AutoNumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setMaxWidth(value.getCssValue()); - else this.addStyleToStore(styleClass, "maxWidth", value.getCssValue()); - } - } - - - // sets the passed string a caption/unit-name of the group item - public void setUnitName(Widget widget, String value){ - ((UnitWidget)widget).setCaption(value); - } - - - // sets the border-width style property of this element by using the GWT DOM class - public void setUnitBorderWidth(Widget widget, AbsoluteNumValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderWidth(value.getCssValue()); - else this.addStyleToStore(styleClass, "borderWidth", value.getCssValue()); - } - } - - - // sets the border-width style property of this element by using the GWT DOM class - public void setUnitBorderTopWidth(Widget widget, AbsoluteNumValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderWidth(value.getCssValue()); - else this.addStyleToStore(styleClass, "borderTopWidth", value.getCssValue()); - } - } - - - // sets the border-width style property of this element by using the GWT DOM class@Override - public void setUnitBorderRightWidth(Widget widget, AbsoluteNumValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderWidth(value.getCssValue()); - else this.addStyleToStore(styleClass, "borderRightWidth", value.getCssValue()); - } - } - - - // sets the border-width style property of this element by using the GWT DOM class - public void setUnitBorderBottomWidth(Widget widget, AbsoluteNumValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderWidth(value.getCssValue()); - else this.addStyleToStore(styleClass, "borderBottomWidth", value.getCssValue()); - } - } - - - // sets the border-width style property of this element by using the GWT DOM class - public void setUnitBorderLeftWidth(Widget widget, AbsoluteNumValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderWidth(value.getCssValue()); - else this.addStyleToStore(styleClass, "borderLeftWidth", value.getCssValue()); - } - } - - - // sets the border-color style property of this element by using the GWT DOM class - public void setUnitBorderColor(Widget widget, ColorValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderColor(value.getCssValue()); - else this.addStyleToStore(styleClass, "borderColor", value.getCssValue()); - } - } - - - // sets the border-color style property of this element by using the GWT DOM class - public void setUnitBorderTopColor(Widget widget, ColorValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderColor(value.getCssValue()); - else this.addStyleToStore(styleClass, "borderTopColor", value.getCssValue()); - } - } - - - // sets the border-color style property of this element by using the GWT DOM class@Override - public void setUnitBorderRightColor(Widget widget, ColorValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderColor(value.getCssValue()); - else this.addStyleToStore(styleClass, "borderRightColor", value.getCssValue()); - } - } - - - // sets the border-color style property of this element by using the GWT DOM class - public void setUnitBorderBottomColor(Widget widget, ColorValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderColor(value.getCssValue()); - else this.addStyleToStore(styleClass, "borderBottomColor", value.getCssValue()); - } - } - - - // sets the border-color style property of this element by using the GWT DOM class - public void setUnitBorderLeftColor(Widget widget, ColorValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderColor(value.getCssValue()); - else this.addStyleToStore(styleClass, "borderLeftColor", value.getCssValue()); - } - } - - - // sets the border-style style property of this element by using the GWT DOM class - public void setUnitBorderStyle(Widget widget, BorderStyleValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderStyle(value.getCssValue()); - else this.addStyleToStore(styleClass, "borderStyle", value.getCssValue()); - } - } - - - // sets the border-style style property of this element by using the GWT DOM class - public void setUnitBorderTopStyle(Widget widget, BorderStyleValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderStyle(value.getCssValue()); - else this.addStyleToStore(styleClass, "borderTopStyle", value.getCssValue()); - } - } - - - // sets the border-style style property of this element by using the GWT DOM class@Override - public void setUnitBorderRightStyle(Widget widget, BorderStyleValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderStyle(value.getCssValue()); - else this.addStyleToStore(styleClass, "borderRightStyle", value.getCssValue()); - } - } - - - // sets the border-style style property of this element by using the GWT DOM class - public void setUnitBorderBottomStyle(Widget widget, BorderStyleValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderStyle(value.getCssValue()); - else this.addStyleToStore(styleClass, "borderBottomStyle", value.getCssValue()); - } - } - - - // sets the border-style style property of this element by using the GWT DOM class - public void setUnitBorderLeftStyle(Widget widget, BorderStyleValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderStyle(value.getCssValue()); - else this.addStyleToStore(styleClass, "borderLeftStyle", value.getCssValue()); - } - } - - - // sets the border-padding style property of this element by using the GWT DOM class - public void setUnitBorderPadding(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderPadding(value.getCssValue()); - else this.addStyleToStore(styleClass, "padding", value.getCssValue()); - } - } - - - // sets the border-padding style property of this element by using the GWT DOM class - public void setUnitBorderTopPadding(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderTopPadding(value.getCssValue()); - else this.addStyleToStore(styleClass, "paddingTop", value.getCssValue()); - } - } - - - // sets the border-padding style property of this element by using the GWT DOM class@Override - public void setUnitBorderRightPadding(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderRightPadding(value.getCssValue()); - else this.addStyleToStore(styleClass, "paddingRight", value.getCssValue()); - } - } - - - // sets the border-padding style property of this element by using the GWT DOM class - public void setUnitBorderBottomPadding(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderBottomPadding(value.getCssValue()); - else this.addStyleToStore(styleClass, "paddingBottom", value.getCssValue()); - } - } - - - // sets the border-padding style property of this element by using the GWT DOM class - public void setUnitBorderLeftPadding(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderLeftPadding(value.getCssValue()); - else this.addStyleToStore(styleClass, "paddingLeft", value.getCssValue()); - } - } - - - // sets the border-margin style property of this element by using the GWT DOM class - public void setUnitBorderMargin(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderMargin(value.getCssValue()); - else this.addStyleToStore(styleClass, "margin", value.getCssValue()); - } - } - - - // sets the border-margin style property of this element by using the GWT DOM class - public void setUnitBorderTopMargin(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderTopMargin(value.getCssValue()); - else this.addStyleToStore(styleClass, "marginTop", value.getCssValue()); - } - } - - - // sets the border-margin style property of this element by using the GWT DOM class@Override - public void setUnitBorderRightMargin(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderRightMargin(value.getCssValue()); - else this.addStyleToStore(styleClass, "marginRight", value.getCssValue()); - } - } - - - // sets the border-margin style property of this element by using the GWT DOM class - public void setUnitBorderBottomMargin(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderBottomMargin(value.getCssValue()); - else this.addStyleToStore(styleClass, "marginBottom", value.getCssValue()); - } - } - - - // sets the border-margin style property of this element by using the GWT DOM class - public void setUnitBorderLeftMargin(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderLeftMargin(value.getCssValue()); - else this.addStyleToStore(styleClass, "marginLeft", value.getCssValue()); - } - } - - - // sets the border-radius style property of this element by using the GWT DOM class - public void setUnitBorderRadius(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderRadius(value.getCssValue()); - else this.addStyleToStore(styleClass, "borderRadius", value.getCssValue()); - } - } - - - // sets the border-top-right-radius style property of this element by using the GWT DOM class - public void setUnitBorderTopRightRadius(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderTopRightRadius(value.getCssValue()); - else this.addStyleToStore(styleClass, "borderTopRightRadius", value.getCssValue()); - } - } - - - // sets the border-bottom-right-radius style property of this element by using the GWT DOM class - public void setUnitBorderBottomRightRadius(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderBottomRightRadius(value.getCssValue()); - else this.addStyleToStore(styleClass, "borderBottomRightRadius", value.getCssValue()); - } - } - - - // sets the border-bottom-left-radius style property of this element by using the GWT DOM class - public void setUnitBorderBottomLeftRadius(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderBottomLeftRadius(value.getCssValue()); - else this.addStyleToStore(styleClass, "borderBottomLeftRadius", value.getCssValue()); - } - } - - - // sets the border-top-left-radius style property of this element by using the GWT DOM class - public void setUnitBorderTopLeftRadius(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { - if(value != null){ - if(styleClass == null)((UnitWidget)widget).setUnitBorderTopLeftRadius(value.getCssValue()); - else this.addStyleToStore(styleClass, "borderTopLeftRadius", value.getCssValue()); - } - } - - - // sets all GDL styles that are defined by the topic map representative to tha passed widget - @Override - public void setGdlStyle(Widget widget) throws InvalidGdlSchemaException, ExecutionException { - super.setGdlStyle(widget); - - this.setUnitName(widget, this.getUnitName()); - - String[] styleClasses = new String[]{null, GdlPsis.Scope.gdlActive, GdlPsis.Scope.gdlFocus, GdlPsis.Scope.gdlHover}; - for (String styleClass : styleClasses) { - this.setUnitBorderWidth(widget, this.getUnitBorderWidth(styleClass), styleClass); - this.setUnitBorderTopWidth(widget, this.getUnitBorderTopWidth(styleClass), styleClass); - this.setUnitBorderRightWidth(widget, this.getUnitBorderRightWidth(styleClass), styleClass); - this.setUnitBorderBottomWidth(widget, this.getUnitBorderBottomWidth(styleClass), styleClass); - this.setUnitBorderLeftWidth(widget, this.getUnitBorderLeftWidth(styleClass), styleClass); - - this.setUnitBorderColor(widget, this.getUnitBorderColor(styleClass), styleClass); - this.setUnitBorderTopColor(widget, this.getUnitBorderTopColor(styleClass), styleClass); - this.setUnitBorderRightColor(widget, this.getUnitBorderRightColor(styleClass), styleClass); - this.setUnitBorderBottomColor(widget, this.getUnitBorderBottomColor(styleClass), styleClass); - this.setUnitBorderLeftColor(widget, this.getUnitBorderLeftColor(styleClass), styleClass); - - this.setUnitBorderStyle(widget, this.getUnitBorderStyle(styleClass), styleClass); - this.setUnitBorderTopStyle(widget, this.getUnitBorderTopStyle(styleClass), styleClass); - this.setUnitBorderRightStyle(widget, this.getUnitBorderRightStyle(styleClass), styleClass); - this.setUnitBorderBottomStyle(widget, this.getUnitBorderBottomStyle(styleClass), styleClass); - this.setUnitBorderLeftStyle(widget, this.getUnitBorderLeftStyle(styleClass), styleClass); - - this.setUnitBorderPadding(widget, this.getUnitBorderPadding(styleClass), styleClass); - this.setUnitBorderTopPadding(widget, this.getUnitBorderTopPadding(styleClass), styleClass); - this.setUnitBorderRightPadding(widget, this.getUnitBorderRightPadding(styleClass), styleClass); - this.setUnitBorderBottomPadding(widget, this.getUnitBorderBottomPadding(styleClass), styleClass); - this.setUnitBorderLeftPadding(widget, this.getUnitBorderLeftPadding(styleClass), styleClass); - - this.setUnitBorderMargin(widget, this.getUnitBorderMargin(styleClass), styleClass); - this.setUnitBorderTopMargin(widget, this.getUnitBorderTopMargin(styleClass), styleClass); - this.setUnitBorderRightMargin(widget, this.getUnitBorderRightMargin(styleClass), styleClass); - this.setUnitBorderBottomMargin(widget, this.getUnitBorderBottomMargin(styleClass), styleClass); - this.setUnitBorderLeftMargin(widget, this.getUnitBorderLeftMargin(styleClass), styleClass); - - this.setUnitBorderRadius(widget, this.getUnitBorderRadius(styleClass), styleClass); - this.setUnitBorderTopRightRadius(widget, this.getUnitBorderTopRightRadius(styleClass), styleClass); - this.setUnitBorderBottomRightRadius(widget, this.getUnitBorderBottomRightRadius(styleClass), styleClass); - this.setUnitBorderBottomLeftRadius(widget, this.getUnitBorderBottomLeftRadius(styleClass), styleClass); - this.setUnitBorderTopLeftRadius(widget, this.getUnitBorderTopLeftRadius(styleClass), styleClass); - } - } - - - - // calls the super applies the GdlStyle for every TextArea item of this instance - @Override - protected void setGdlStyle() throws InvalidGdlSchemaException, ExecutionException{ - super.setGdlStyle(); - - if(this.subElements != null){ - for (Widget item : this.subElements) { - this.setGdlStyle(item); - } - } - } - - - // some handlers for applying the css style bound to the pseudo classes hover, active and focus - @Override - public void onHoverStart(MouseOverEvent event, HoverStyleHandler handler) { - Widget source = (Widget)event.getSource(); - super.onHoverStart(event, handler); - if(source.getClass().equals(UnitWidget.class)){ - UnitWidget unit = (UnitWidget)source; - for (Pair<String, String> pair : this.unitHoverCssNamesAndStyles) { - if(pair.getFirst().equals("textDecoration"))unit.setTextDecoration(pair.getSecond()); - else DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); - - if(unit.styleOfUnitWidgetBase(pair.getFirst())) DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); - } - } - } - - - // applies the styles bound to hover and the passed element - @Override - protected void onHoverStart(Widget widget){ - super.onHoverStart(widget); - if(widget.getClass().equals(UnitWidget.class)){ - UnitWidget unit = (UnitWidget)widget; - for (Pair<String, String> pair : this.unitHoverCssNamesAndStyles) { - if(pair.getFirst().equals("textDecoration"))unit.setTextDecoration(pair.getSecond()); - else DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); - - if(unit.styleOfUnitWidgetBase(pair.getFirst())) DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); - } - } - } - - - // applies the styles bound to focus and the passed element - @Override - protected void onFocusStart(Widget widget){ - super.onFocusStart(widget); - if(widget.getClass().equals(UnitWidget.class)){ - UnitWidget unit = (UnitWidget)widget; - for (Pair<String, String> pair : this.unitFocusCssNamesAndStyles) { - if(pair.getFirst().equals("textDecoration"))unit.setTextDecoration(pair.getSecond()); - else DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); - - if(unit.styleOfUnitWidgetBase(pair.getFirst())) DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); - } - } - } - - - // shall be called to apply the styles of the focus class - @Override - public void onFocusStart(FocusEvent event, FocusStyleHandler handler) { - Widget source = (Widget)event.getSource(); - super.onFocusStart(event, handler); - if(source.getClass().equals(UnitWidget.class)){ - UnitWidget unit = (UnitWidget)source; - for (Pair<String, String> pair : this.unitFocusCssNamesAndStyles) { - if(pair.getFirst().equals("textDecoration"))unit.setTextDecoration(pair.getSecond()); - else DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); - - if(unit.styleOfUnitWidgetBase(pair.getFirst())) DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); - } - } - } - - - // applies the styles bound to acitve and the passed element - @Override - protected void onActiveStart(Widget widget){ - super.onActiveStart(widget); - if(widget.getClass().equals(UnitWidget.class)){ - UnitWidget unit = (UnitWidget)widget; - for (Pair<String, String> pair : this.unitActiveCssNamesAndStyles) { - if(pair.getFirst().equals("textDecoration"))unit.setTextDecoration(pair.getSecond()); - else DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); - - if(unit.styleOfUnitWidgetBase(pair.getFirst())) DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); - } - } - } - - - // shall be called to apply the styles of the active class - @Override - public void onActiveStart(MouseDownEvent event, ActiveStyleHandler handler) { - Widget source = (Widget)event.getSource(); - super.onActiveStart(event, handler); - if(source.getClass().equals(UnitWidget.class)){ - UnitWidget unit = (UnitWidget)source; - for (Pair<String, String> pair : this.unitActiveCssNamesAndStyles) { - if(pair.getFirst().equals("textDecoration"))unit.setTextDecoration(pair.getSecond()); - else DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); - - if(unit.styleOfUnitWidgetBase(pair.getFirst())) DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); - } - } - } - - - @Override - @Deprecated - public GdlVisibleObject append(Topic ancestor, Topic current) throws InvalidGdlSchemaException, ExecutionException { - // do nothing this method has no effect on the mainpanle - return null; - } - - - // returns all topics that are bound to this tm representative topic via a - // contains association - @Override - public ArrayList<Topic> contains() throws InvalidGdlSchemaException { - return TmHelper.topicContains(this.tmRepresentative); - } - - - // Searches the topic that represents the first item that is placed within this view instance - // i.e. such an item must not have an association that is bound to it via a role of the type - // gdl:ancestor. - protected Topic getStartElement(ArrayList<Topic> containees) throws InvalidGdlSchemaException { - return TmHelper.getFirstContainee(super.getTmRepresentative(), containees); - } - - - - protected class UnitWidget extends Composite implements HasFocusHandlers, HasBlurHandlers, HasMouseOutHandlers, HasMouseOverHandlers, HasMouseDownHandlers, HasMouseUpHandlers{ - private SimplePanel basePanel = new SimplePanel(); - private CaptionPanel innerPanel = new CaptionPanel(); - private Topic tmRepresentative = null; - private ArrayList<Widget> subElements = new ArrayList<Widget>(); - - - private UnitWidget(){ - initWidget(this.basePanel); - this.basePanel.add(this.innerPanel); - } - - - public UnitWidget(Topic tmRepresentative){ - this(); - this.tmRepresentative = tmRepresentative; - } - - - public Topic getTmRepresentative(){ - return this.tmRepresentative; - } - - - - // appends a new element in form of a topic to this unit-widget - public GdlVisibleObject append(Topic ancestor, Topic current) throws ExecutionException, InvalidGdlSchemaException { - if(ancestor == null || current == null) throw new ExecutionException("to append \"" + TmHelper.getAnyIdOfTopic(current) + "\" on \"" + TmHelper.getAnyIdOfTopic(ancestor) + "\" both topics must be present"); - GdlPosition position = new GdlPosition(TmHelper.getPositionOf(ancestor, current)); - - GdlVisibleObject newObj = GdlInstantiator.instantiate(current); - GdlVisibleObject oldObj = null; - for (Widget widget : this.subElements){ - if(((GdlVisibleObject)widget).getTmRepresentative().equals(ancestor)){ - oldObj = (GdlVisibleObject)widget; - break; - } - } - - this.subElements.add(newObj); - if(this.getTmRepresentative().equals(ancestor)){ - this.innerPanel.add(newObj); - } - else{ - Element elemBefore = oldObj.getElement(); - Element elemAfter = DOM.getNextSibling(elemBefore); - // insert before seems to be a more accepted and stable - // way of inserting new child elements than insertAfter - if(elemAfter == null) this.innerPanel.add(newObj); - else this.innerPanel.getElement().insertBefore(newObj.getElement(), elemAfter); - } - position.setAttributes(newObj); - return newObj; - } - - - public void setId(String id){ - DOM.setElementAttribute(this.basePanel.getElement(), "id", id); - } - - - // some css style setters - public void setHeight(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "height", value); - } - - - public void setMaxHeight(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "maxHeight", value); - } - - - public void setMinHeight(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "minHeight", value); - } - - - public void setWidth(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "width", value); - } - - - public void setMaxWidth(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "maxWidth", value); - } - - - public void setMinWidth(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "minWidth", value); - } - - - public void setUnitBorderWidth(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "borderWidth", value); - } - - - public void setUnitBorderTopWidth(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "borderTopWidth", value); - } - - - public void setUnitBorderRightWidth(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "borderRightWidth", value); - } - - - public void setUnitBorderBottomWidth(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "borderBottomWidth", value); - } - - - public void setUnitBorderLeftWidth(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "borderLeftWidth", value); - } - - - public void setUnitBorderColor(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "borderColor", value); - } - - - public void setUnitBorderTopColor(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "borderTopColor", value); - } - - - public void setUnitBorderRightColor(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "borderRightColor", value); - } - - - public void setTextDecoration(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "textDecoration", value); - } - - - public void setUnitBorderBottomColor(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "borderBottomColor", value); - } - - - public void setUnitBorderLeftColor(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "borderLeftColor", value); - } - - - public void setUnitBorderStyle(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "borderStyle", value); - } - - - public void setUnitBorderTopStyle(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "borderTopStyle", value); - } - - - public void setUnitBorderRightStyle(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "borderRightStyle", value); - } - - - public void setUnitBorderBottomStyle(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "borderBottomStyle", value); - } - - - public void setUnitBorderLeftStyle(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "borderLeftStyle", value); - } - - - public void setUnitBorderPadding(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "padding", value); - } - - - public void setUnitBorderTopPadding(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "paddingTop", value); - } - - - public void setUnitBorderRightPadding(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "paddingRight", value); - } - - - public void setUnitBorderBottomPadding(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "paddingBottom", value); - } - - - public void setUnitBorderLeftPadding(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "paddingLeft", value); - } - - - public void setUnitBorderMargin(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "margin", value); - } - - - public void setUnitBorderTopMargin(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "marginTop", value); - } - - - public void setUnitBorderRightMargin(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "marginRight", value); - } - - - public void setUnitBorderBottomMargin(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "marginBottom", value); - } - - - public void setUnitBorderLeftMargin(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "marginLeft", value); - } - - - public void setUnitBorderRadius(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "borderRadius", value); - } - - - public void setUnitBorderTopRightRadius(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "borderTopRightRadius", value); - } - - - public void setUnitBorderBottomRightRadius(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "borderBottomRightRadius", value); - } - - - public void setUnitBorderBottomLeftRadius(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "borderBottomLeftRadius", value); - } - - - public void setUnitBorderTopLeftRadius(String value){ - DOM.setStyleAttribute(this.innerPanel.getElement(), "borderTopLeftRadius", value); - } - - - public String getCaption() { - return this.innerPanel.getCaptionText(); - } - - - // sets the unit's name. If the name is "" or null, - // the legend element is set to non-visible - public void setCaption(String caption) { - if(caption == null || caption.length() == 0){ - this.innerPanel.setCaptionText(caption); - //DOM.setStyleAttribute(this.legend, "display", "none"); - } else { - this.innerPanel.setCaptionText(caption); - //DOM.setStyleAttribute(this.legend, "display", "inline"); - } - } - - - // returns true if the passed style property must be applied on both the fieldset and absolutepanel - public boolean styleOfUnitWidgetBase(String styleProperty){ - if(styleProperty.equals("borderWidth") || styleProperty.equals("borderTopWidth") || styleProperty.equals("borderRightWidth") || styleProperty.equals("borderBottomWidth") || styleProperty.equals("borderLeftWidth")){ - return false; - }else if(styleProperty.equals("borderColor") || styleProperty.equals("borderTopColor") || styleProperty.equals("borderRightColor") || styleProperty.equals("borderBottomColor") || styleProperty.equals("borderLeftColor")){ - return false; - }else if(styleProperty.equals("padding") || styleProperty.equals("paddingTop") || styleProperty.equals("paddingRight") || styleProperty.equals("paddingBottom") || styleProperty.equals("paddingLeft")){ - return false; - }else if(styleProperty.equals("margin") || styleProperty.equals("marginTop") || styleProperty.equals("marginRight") || styleProperty.equals("marginBottom") || styleProperty.equals("marginLeft")){ - return false; - }else if(styleProperty.equals("borderRadius") || styleProperty.equals("borderTopRightRadius") || styleProperty.equals("borderBottomRightRadius") || styleProperty.equals("borderBottomLeftRadius") || styleProperty.equals("borderTopLeftRadius")){ - return false; - }else { - return true; - } - } - - - @Override - public HandlerRegistration addMouseUpHandler(MouseUpHandler handler) { - return this.addDomHandler(handler, MouseUpEvent.getType()); - } - - - @Override - public HandlerRegistration addMouseDownHandler(MouseDownHandler handler) { - return this.addDomHandler(handler, MouseDownEvent.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 addBlurHandler(BlurHandler handler) { - return this.addDomHandler(handler, BlurEvent.getType()); - } - - - @Override - public HandlerRegistration addFocusHandler(FocusHandler handler) { - return this.addDomHandler(handler, FocusEvent.getType()); - } - } - - - /* - // wraps a fieldset with a legend item that represent a group-element - protected class UnitWidget extends Composite implements HasFocusHandlers, HasBlurHandlers, HasMouseOutHandlers, HasMouseOverHandlers, HasMouseDownHandlers, HasMouseUpHandlers{ - private AbsolutePanel basePanel = new AbsolutePanel(); - private Element fieldset = DOM.createFieldSet(); - private Element legend = DOM.createLegend(); - private ArrayList<Widget> subElements = new ArrayList<Widget>(); - private Topic tmRepresentative = null; - - - private UnitWidget() {} - - - public UnitWidget(Topic tmRepresentative) throws ExecutionException{ - if(tmRepresentative == null) throw new ExecutionException("tmRepresentative must be set"); - this.tmRepresentative = tmRepresentative; - initWidget(this.basePanel); - DOM.setStyleAttribute(this.basePanel.getElement(), "overflow", "visible"); - this.fieldset.appendChild(this.legend); - this.basePanel.getElement().appendChild(this.fieldset); - DOM.setStyleAttribute(this.legend, "float", "left"); - DOM.setStyleAttribute(this.legend, "display", "none"); - DOM.setStyleAttribute(this.legend, "marginLeft", "1em"); - DOM.setStyleAttribute(this.legend, "marginRight", "1em"); - } - - - public Topic getTmRepresentative(){ - return this.tmRepresentative; - } - - - // some css style setters - public void setHeight(String value){ - DOM.setStyleAttribute(this.fieldset, "height", value); - } - - - public void setMaxHeight(String value){ - DOM.setStyleAttribute(this.fieldset, "maxHeight", value); - } - - - public void setMinHeight(String value){ - DOM.setStyleAttribute(this.fieldset, "minHeight", value); - } - - - public void setWidth(String value){ - DOM.setStyleAttribute(this.fieldset, "width", value); - } - - - public void setMaxWidth(String value){ - DOM.setStyleAttribute(this.fieldset, "maxWidth", value); - } - - - public void setMinWidth(String value){ - DOM.setStyleAttribute(this.fieldset, "minWidth", value); - } - - - public void setBorderWidth(String value){ - DOM.setStyleAttribute(this.fieldset, "borderWidth", value); - } - - - public void setBorderTopWidth(String value){ - DOM.setStyleAttribute(this.fieldset, "borderTopWidth", value); - } - - - public void setBorderRightWidth(String value){ - DOM.setStyleAttribute(this.fieldset, "borderRightWidth", value); - } - - - public void setBorderBottomWidth(String value){ - DOM.setStyleAttribute(this.fieldset, "borderBottomWidth", value); - } - - - public void setBorderLeftWidth(String value){ - DOM.setStyleAttribute(this.fieldset, "borderLeftWidth", value); - } - - - public void setBorderColor(String value){ - DOM.setStyleAttribute(this.fieldset, "borderColor", value); - } - - - public void setBorderTopColor(String value){ - DOM.setStyleAttribute(this.fieldset, "borderTopColor", value); - } - - - public void setBorderRightColor(String value){ - DOM.setStyleAttribute(this.fieldset, "borderRightColor", value); - } - - - public void setTextDecoration(String value){ - DOM.setStyleAttribute(this.legend, "textDecoration", value); - } - - - public void setBorderBottomColor(String value){ - DOM.setStyleAttribute(this.fieldset, "borderBottomColor", value); - } - - - public void setBorderLeftColor(String value){ - DOM.setStyleAttribute(this.fieldset, "borderLeftColor", value); - } - - - public void setBorderStyle(String value){ - DOM.setStyleAttribute(this.fieldset, "borderStyle", value); - } - - - public void setBorderTopStyle(String value){ - DOM.setStyleAttribute(this.fieldset, "borderTopStyle", value); - } - - - public void setBorderRightStyle(String value){ - DOM.setStyleAttribute(this.fieldset, "borderRightStyle", value); - } - - - public void setBorderBottomStyle(String value){ - DOM.setStyleAttribute(this.fieldset, "borderBottomStyle", value); - } - - - public void setBorderLeftStyle(String value){ - DOM.setStyleAttribute(this.fieldset, "borderLeftStyle", value); - } - - - public void setPadding(String value){ - DOM.setStyleAttribute(this.fieldset, "padding", value); - } - - - public void setPaddingTop(String value){ - DOM.setStyleAttribute(this.fieldset, "paddingTop", value); - } - - - public void setPaddingRight(String value){ - DOM.setStyleAttribute(this.fieldset, "paddingRight", value); - } - - - public void setPaddingBottom(String value){ - DOM.setStyleAttribute(this.fieldset, "paddingBottom", value); - } - - - public void setPaddingLeft(String value){ - DOM.setStyleAttribute(this.fieldset, "paddingLeft", value); - } - - - public void setMargin(String value){ - DOM.setStyleAttribute(this.fieldset, "margin", value); - } - - - public void setMarginTop(String value){ - DOM.setStyleAttribute(this.fieldset, "marginTop", value); - } - - - public void setMarginRight(String value){ - DOM.setStyleAttribute(this.fieldset, "marginRight", value); - } - - - public void setMarginBottom(String value){ - DOM.setStyleAttribute(this.fieldset, "marginBottom", value); - } - - - public void setMarginLeft(String value){ - DOM.setStyleAttribute(this.fieldset, "marginLeft", value); - } - - - public void setBorderRadius(String value){ - DOM.setStyleAttribute(this.fieldset, "borderRadius", value); - } - - - public void setBorderTopRightRadius(String value){ - DOM.setStyleAttribute(this.fieldset, "borderTopRightRadius", value); - } - - - public void setBorderBottomRightRadius(String value){ - DOM.setStyleAttribute(this.fieldset, "borderBottomRightRadius", value); - } - - - public void setBorderBottomLeftRadius(String value){ - DOM.setStyleAttribute(this.fieldset, "borderBottomLeftRadius", value); - } - - - public void setBorderTopLeftRadius(String value){ - DOM.setStyleAttribute(this.fieldset, "borderTopLeftRadius", value); - } - - - public String getCaption() { - return this.legend.getInnerText(); - } - - - // sets the unit's name. If the name is "" or null, - // the legend element is set to non-visible - public void setCaption(String caption) { - if(caption == null || caption.length() == 0){ - this.legend.setInnerText(""); - DOM.setStyleAttribute(this.legend, "display", "none"); - } else { - this.legend.setInnerText(caption); - DOM.setStyleAttribute(this.legend, "display", "inline"); - } - } - - - public void setId(String id){ - DOM.setElementAttribute(this.basePanel.getElement(), "id", id); - } - - - // appends a new element in form of a topic to this unit-widget - public GdlVisibleObject append(Topic ancestor, Topic current) throws ExecutionException, InvalidGdlSchemaException { - if(ancestor == null || current == null) throw new ExecutionException("to append \"" + TmHelper.getAnyIdOfTopic(current) + "\" on \"" + TmHelper.getAnyIdOfTopic(ancestor) + "\" both topics must be present"); - GdlPosition position = new GdlPosition(TmHelper.getPositionOf(ancestor, current)); - - GdlVisibleObject newObj = GdlInstantiator.instantiate(current); - GdlVisibleObject oldObj = null; - for (Widget widget : this.subElements){ - if(((GdlVisibleObject)widget).getTmRepresentative().equals(ancestor)){ - oldObj = (GdlVisibleObject)widget; - break; - } - } - - this.subElements.add(newObj); - if(this.getTmRepresentative().equals(ancestor)){ - this.fieldset.appendChild(newObj.getElement()); - } - else{ - Element elemBefore = oldObj.getElement(); - Element elemAfter = DOM.getNextSibling(elemBefore); - // insert before seems to be a more accepted and stable - // way of inserting new child elements than insertAfter - if(elemAfter == null) this.fieldset.appendChild(newObj.getElement()); - else this.fieldset.insertBefore(newObj.getElement(), elemAfter); - } - position.setAttributes(newObj); - return newObj; - } - - - @Override - public HandlerRegistration addMouseUpHandler(MouseUpHandler handler) { - return this.addDomHandler(handler, MouseUpEvent.getType()); - } - - - @Override - public HandlerRegistration addMouseDownHandler(MouseDownHandler handler) { - return this.addDomHandler(handler, MouseDownEvent.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 addBlurHandler(BlurHandler handler) { - return this.addDomHandler(handler, BlurEvent.getType()); + @Override + public HandlerRegistration addBlurHandler(BlurHandler handler) { + return this.addDomHandler(handler, BlurEvent.getType()); } @@ -1915,24 +276,5 @@ public HandlerRegistration addFocusHandler(FocusHandler handler) { return this.addDomHandler(handler, FocusEvent.getType()); } - - - // returns true if the passed style property must be applied on both the fieldset and absolutepanel - public boolean styleOfUnitWidgetBase(String styleProperty){ - if(styleProperty.equals("borderWidth") || styleProperty.equals("borderTopWidth") || styleProperty.equals("borderRightWidth") || styleProperty.equals("borderBottomWidth") || styleProperty.equals("borderLeftWidth")){ - return false; - }else if(styleProperty.equals("borderColor") || styleProperty.equals("borderTopColor") || styleProperty.equals("borderRightColor") || styleProperty.equals("borderBottomColor") || styleProperty.equals("borderLeftColor")){ - return false; - }else if(styleProperty.equals("padding") || styleProperty.equals("paddingTop") || styleProperty.equals("paddingRight") || styleProperty.equals("paddingBottom") || styleProperty.equals("paddingLeft")){ - return false; - }else if(styleProperty.equals("margin") || styleProperty.equals("marginTop") || styleProperty.equals("marginRight") || styleProperty.equals("marginBottom") || styleProperty.equals("marginLeft")){ - return false; - }else if(styleProperty.equals("borderRadius") || styleProperty.equals("borderTopRightRadius") || styleProperty.equals("borderBottomRightRadius") || styleProperty.equals("borderBottomLeftRadius") || styleProperty.equals("borderTopLeftRadius")){ - return false; - }else { - return true; - } - } } - */ } \ No newline at end of file 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 20 11:21:32 2011 (r653) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Thu Jul 21 01:26:39 2011 (r654) @@ -54,7 +54,7 @@ {"subject_identifiers":["[doc:list-item-2]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_item_2_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:padding]", "value":"5px"}, {"type":"si:[gdl:margin-top]", "value":"5px"}]}, {"subject_identifiers":["[gdl:List-Box]"]}, {"subject_identifiers":["[doc:text-1]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"text_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:readonly]", "value":"false", "datatype":"[xsd:boolean]"}]}, - {"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":"100px"}, {"type":"si:[gdl:height]", "value":"50px"}, {"type":"si:[gdl:border-style]", "value":"dashed"}, {"type":"si:[gdl:border-width]", "value":"1px"}, {"type":"si:[gdl:text-decoration]", "value":"line-through"}]}, + {"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":"100px"}, {"type":"si:[gdl:height]", "value":"100px"}, {"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":"yellow"}]}, {"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:reference-1]"], "instance_of":["si:[gdl:Reference]"], "occurrences":[{"type":"si:[gdl:id]", "value":"reference_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:margin-left]", "value":"200px"}, {"type":"si:[gdl:background-color]", "value":"yellow"}]}, {"subject_identifiers":["[doc:list-box-1]"], "instance_of":["si:[gdl:List-Box]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_box_1_id", "datatype":"[xsd:ID]"}]},

1 0

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

20 Jul '11

Author: lgiessmann Date: Wed Jul 20 11:21:32 2011 New Revision: 653 Log: gdl-frontend: Widgets: fixed some bugs in the UnitWidget 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/text/GdlTextObject.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/container/GdlUnit.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Wed Jul 20 10:01:42 2011 (r652) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Wed Jul 20 11:21:32 2011 (r653) @@ -1,7 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.container; import java.util.ArrayList; - import com.google.gwt.user.client.Element; import com.google.gwt.event.dom.client.BlurEvent; import com.google.gwt.event.dom.client.BlurHandler; @@ -26,6 +25,7 @@ import com.google.gwt.user.client.ui.AbsolutePanel; import com.google.gwt.user.client.ui.CaptionPanel; import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; @@ -836,7 +836,7 @@ // sets the border-width style property of this element by using the GWT DOM class public void setUnitBorderWidth(Widget widget, AbsoluteNumValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setBorderWidth(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderWidth(value.getCssValue()); else this.addStyleToStore(styleClass, "borderWidth", value.getCssValue()); } } @@ -845,7 +845,7 @@ // sets the border-width style property of this element by using the GWT DOM class public void setUnitBorderTopWidth(Widget widget, AbsoluteNumValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setBorderWidth(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderWidth(value.getCssValue()); else this.addStyleToStore(styleClass, "borderTopWidth", value.getCssValue()); } } @@ -854,7 +854,7 @@ // sets the border-width style property of this element by using the GWT DOM class@Override public void setUnitBorderRightWidth(Widget widget, AbsoluteNumValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setBorderWidth(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderWidth(value.getCssValue()); else this.addStyleToStore(styleClass, "borderRightWidth", value.getCssValue()); } } @@ -863,7 +863,7 @@ // sets the border-width style property of this element by using the GWT DOM class public void setUnitBorderBottomWidth(Widget widget, AbsoluteNumValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setBorderWidth(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderWidth(value.getCssValue()); else this.addStyleToStore(styleClass, "borderBottomWidth", value.getCssValue()); } } @@ -872,7 +872,7 @@ // sets the border-width style property of this element by using the GWT DOM class public void setUnitBorderLeftWidth(Widget widget, AbsoluteNumValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setBorderWidth(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderWidth(value.getCssValue()); else this.addStyleToStore(styleClass, "borderLeftWidth", value.getCssValue()); } } @@ -881,7 +881,7 @@ // sets the border-color style property of this element by using the GWT DOM class public void setUnitBorderColor(Widget widget, ColorValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setBorderColor(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderColor(value.getCssValue()); else this.addStyleToStore(styleClass, "borderColor", value.getCssValue()); } } @@ -890,7 +890,7 @@ // sets the border-color style property of this element by using the GWT DOM class public void setUnitBorderTopColor(Widget widget, ColorValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setBorderColor(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderColor(value.getCssValue()); else this.addStyleToStore(styleClass, "borderTopColor", value.getCssValue()); } } @@ -899,7 +899,7 @@ // sets the border-color style property of this element by using the GWT DOM class@Override public void setUnitBorderRightColor(Widget widget, ColorValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setBorderColor(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderColor(value.getCssValue()); else this.addStyleToStore(styleClass, "borderRightColor", value.getCssValue()); } } @@ -908,7 +908,7 @@ // sets the border-color style property of this element by using the GWT DOM class public void setUnitBorderBottomColor(Widget widget, ColorValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setBorderColor(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderColor(value.getCssValue()); else this.addStyleToStore(styleClass, "borderBottomColor", value.getCssValue()); } } @@ -917,7 +917,7 @@ // sets the border-color style property of this element by using the GWT DOM class public void setUnitBorderLeftColor(Widget widget, ColorValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setBorderColor(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderColor(value.getCssValue()); else this.addStyleToStore(styleClass, "borderLeftColor", value.getCssValue()); } } @@ -926,7 +926,7 @@ // sets the border-style style property of this element by using the GWT DOM class public void setUnitBorderStyle(Widget widget, BorderStyleValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setBorderStyle(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderStyle(value.getCssValue()); else this.addStyleToStore(styleClass, "borderStyle", value.getCssValue()); } } @@ -935,7 +935,7 @@ // sets the border-style style property of this element by using the GWT DOM class public void setUnitBorderTopStyle(Widget widget, BorderStyleValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setBorderStyle(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderStyle(value.getCssValue()); else this.addStyleToStore(styleClass, "borderTopStyle", value.getCssValue()); } } @@ -944,7 +944,7 @@ // sets the border-style style property of this element by using the GWT DOM class@Override public void setUnitBorderRightStyle(Widget widget, BorderStyleValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setBorderStyle(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderStyle(value.getCssValue()); else this.addStyleToStore(styleClass, "borderRightStyle", value.getCssValue()); } } @@ -953,7 +953,7 @@ // sets the border-style style property of this element by using the GWT DOM class public void setUnitBorderBottomStyle(Widget widget, BorderStyleValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setBorderStyle(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderStyle(value.getCssValue()); else this.addStyleToStore(styleClass, "borderBottomStyle", value.getCssValue()); } } @@ -962,7 +962,7 @@ // sets the border-style style property of this element by using the GWT DOM class public void setUnitBorderLeftStyle(Widget widget, BorderStyleValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setBorderStyle(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderStyle(value.getCssValue()); else this.addStyleToStore(styleClass, "borderLeftStyle", value.getCssValue()); } } @@ -971,7 +971,7 @@ // sets the border-padding style property of this element by using the GWT DOM class public void setUnitBorderPadding(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setPadding(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderPadding(value.getCssValue()); else this.addStyleToStore(styleClass, "padding", value.getCssValue()); } } @@ -980,7 +980,7 @@ // sets the border-padding style property of this element by using the GWT DOM class public void setUnitBorderTopPadding(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setPaddingTop(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderTopPadding(value.getCssValue()); else this.addStyleToStore(styleClass, "paddingTop", value.getCssValue()); } } @@ -989,7 +989,7 @@ // sets the border-padding style property of this element by using the GWT DOM class@Override public void setUnitBorderRightPadding(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setPaddingRight(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderRightPadding(value.getCssValue()); else this.addStyleToStore(styleClass, "paddingRight", value.getCssValue()); } } @@ -998,7 +998,7 @@ // sets the border-padding style property of this element by using the GWT DOM class public void setUnitBorderBottomPadding(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setPaddingBottom(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderBottomPadding(value.getCssValue()); else this.addStyleToStore(styleClass, "paddingBottom", value.getCssValue()); } } @@ -1007,7 +1007,7 @@ // sets the border-padding style property of this element by using the GWT DOM class public void setUnitBorderLeftPadding(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setPaddingLeft(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderLeftPadding(value.getCssValue()); else this.addStyleToStore(styleClass, "paddingLeft", value.getCssValue()); } } @@ -1016,7 +1016,7 @@ // sets the border-margin style property of this element by using the GWT DOM class public void setUnitBorderMargin(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setMargin(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderMargin(value.getCssValue()); else this.addStyleToStore(styleClass, "margin", value.getCssValue()); } } @@ -1025,7 +1025,7 @@ // sets the border-margin style property of this element by using the GWT DOM class public void setUnitBorderTopMargin(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setMarginTop(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderTopMargin(value.getCssValue()); else this.addStyleToStore(styleClass, "marginTop", value.getCssValue()); } } @@ -1034,7 +1034,7 @@ // sets the border-margin style property of this element by using the GWT DOM class@Override public void setUnitBorderRightMargin(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setMarginRight(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderRightMargin(value.getCssValue()); else this.addStyleToStore(styleClass, "marginRight", value.getCssValue()); } } @@ -1043,7 +1043,7 @@ // sets the border-margin style property of this element by using the GWT DOM class public void setUnitBorderBottomMargin(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setMarginBottom(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderBottomMargin(value.getCssValue()); else this.addStyleToStore(styleClass, "marginBottom", value.getCssValue()); } } @@ -1052,7 +1052,7 @@ // sets the border-margin style property of this element by using the GWT DOM class public void setUnitBorderLeftMargin(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setMarginLeft(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderLeftMargin(value.getCssValue()); else this.addStyleToStore(styleClass, "marginLeft", value.getCssValue()); } } @@ -1061,7 +1061,7 @@ // sets the border-radius style property of this element by using the GWT DOM class public void setUnitBorderRadius(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setBorderRadius(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderRadius(value.getCssValue()); else this.addStyleToStore(styleClass, "borderRadius", value.getCssValue()); } } @@ -1070,7 +1070,7 @@ // sets the border-top-right-radius style property of this element by using the GWT DOM class public void setUnitBorderTopRightRadius(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setBorderTopRightRadius(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderTopRightRadius(value.getCssValue()); else this.addStyleToStore(styleClass, "borderTopRightRadius", value.getCssValue()); } } @@ -1079,7 +1079,7 @@ // sets the border-bottom-right-radius style property of this element by using the GWT DOM class public void setUnitBorderBottomRightRadius(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setBorderBottomRightRadius(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderBottomRightRadius(value.getCssValue()); else this.addStyleToStore(styleClass, "borderBottomRightRadius", value.getCssValue()); } } @@ -1088,7 +1088,7 @@ // sets the border-bottom-left-radius style property of this element by using the GWT DOM class public void setUnitBorderBottomLeftRadius(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setBorderBottomLeftRadius(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderBottomLeftRadius(value.getCssValue()); else this.addStyleToStore(styleClass, "borderBottomLeftRadius", value.getCssValue()); } } @@ -1097,7 +1097,7 @@ // sets the border-top-left-radius style property of this element by using the GWT DOM class public void setUnitBorderTopLeftRadius(Widget widget, NumUnitValue value, String styleClass) throws InvalidGdlSchemaException, ExecutionException { if(value != null){ - if(styleClass == null)((UnitWidget)widget).setBorderTopLeftRadius(value.getCssValue()); + if(styleClass == null)((UnitWidget)widget).setUnitBorderTopLeftRadius(value.getCssValue()); else this.addStyleToStore(styleClass, "borderTopLeftRadius", value.getCssValue()); } } @@ -1290,13 +1290,15 @@ protected class UnitWidget extends Composite implements HasFocusHandlers, HasBlurHandlers, HasMouseOutHandlers, HasMouseOverHandlers, HasMouseDownHandlers, HasMouseUpHandlers{ - private CaptionPanel basePanel = new CaptionPanel(); + private SimplePanel basePanel = new SimplePanel(); + private CaptionPanel innerPanel = new CaptionPanel(); private Topic tmRepresentative = null; private ArrayList<Widget> subElements = new ArrayList<Widget>(); private UnitWidget(){ initWidget(this.basePanel); + this.basePanel.add(this.innerPanel); } @@ -1328,15 +1330,15 @@ this.subElements.add(newObj); if(this.getTmRepresentative().equals(ancestor)){ - this.basePanel.add(newObj); + this.innerPanel.add(newObj); } else{ Element elemBefore = oldObj.getElement(); Element elemAfter = DOM.getNextSibling(elemBefore); // insert before seems to be a more accepted and stable // way of inserting new child elements than insertAfter - if(elemAfter == null) this.basePanel.add(newObj); - else this.basePanel.getElement().insertBefore(newObj.getElement(), elemAfter); + if(elemAfter == null) this.innerPanel.add(newObj); + else this.innerPanel.getElement().insertBefore(newObj.getElement(), elemAfter); } position.setAttributes(newObj); return newObj; @@ -1379,163 +1381,163 @@ } - public void setBorderWidth(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "borderWidth", value); + public void setUnitBorderWidth(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "borderWidth", value); } - public void setBorderTopWidth(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "borderTopWidth", value); + public void setUnitBorderTopWidth(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "borderTopWidth", value); } - public void setBorderRightWidth(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "borderRightWidth", value); + public void setUnitBorderRightWidth(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "borderRightWidth", value); } - public void setBorderBottomWidth(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "borderBottomWidth", value); + public void setUnitBorderBottomWidth(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "borderBottomWidth", value); } - public void setBorderLeftWidth(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "borderLeftWidth", value); + public void setUnitBorderLeftWidth(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "borderLeftWidth", value); } - public void setBorderColor(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "borderColor", value); + public void setUnitBorderColor(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "borderColor", value); } - public void setBorderTopColor(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "borderTopColor", value); + public void setUnitBorderTopColor(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "borderTopColor", value); } - public void setBorderRightColor(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "borderRightColor", value); + public void setUnitBorderRightColor(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "borderRightColor", value); } public void setTextDecoration(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "textDecoration", value); + DOM.setStyleAttribute(this.innerPanel.getElement(), "textDecoration", value); } - public void setBorderBottomColor(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "borderBottomColor", value); + public void setUnitBorderBottomColor(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "borderBottomColor", value); } - public void setBorderLeftColor(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "borderLeftColor", value); + public void setUnitBorderLeftColor(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "borderLeftColor", value); } - public void setBorderStyle(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "borderStyle", value); + public void setUnitBorderStyle(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "borderStyle", value); } - public void setBorderTopStyle(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "borderTopStyle", value); + public void setUnitBorderTopStyle(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "borderTopStyle", value); } - public void setBorderRightStyle(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "borderRightStyle", value); + public void setUnitBorderRightStyle(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "borderRightStyle", value); } - public void setBorderBottomStyle(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "borderBottomStyle", value); + public void setUnitBorderBottomStyle(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "borderBottomStyle", value); } - public void setBorderLeftStyle(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "borderLeftStyle", value); + public void setUnitBorderLeftStyle(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "borderLeftStyle", value); } - public void setPadding(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "padding", value); + public void setUnitBorderPadding(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "padding", value); } - public void setPaddingTop(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "paddingTop", value); + public void setUnitBorderTopPadding(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "paddingTop", value); } - public void setPaddingRight(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "paddingRight", value); + public void setUnitBorderRightPadding(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "paddingRight", value); } - public void setPaddingBottom(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "paddingBottom", value); + public void setUnitBorderBottomPadding(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "paddingBottom", value); } - public void setPaddingLeft(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "paddingLeft", value); + public void setUnitBorderLeftPadding(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "paddingLeft", value); } - public void setMargin(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "margin", value); + public void setUnitBorderMargin(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "margin", value); } - public void setMarginTop(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "marginTop", value); + public void setUnitBorderTopMargin(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "marginTop", value); } - public void setMarginRight(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "marginRight", value); + public void setUnitBorderRightMargin(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "marginRight", value); } - public void setMarginBottom(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "marginBottom", value); + public void setUnitBorderBottomMargin(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "marginBottom", value); } - public void setMarginLeft(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "marginLeft", value); + public void setUnitBorderLeftMargin(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "marginLeft", value); } - public void setBorderRadius(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "borderRadius", value); + public void setUnitBorderRadius(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "borderRadius", value); } - public void setBorderTopRightRadius(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "borderTopRightRadius", value); + public void setUnitBorderTopRightRadius(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "borderTopRightRadius", value); } - public void setBorderBottomRightRadius(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "borderBottomRightRadius", value); + public void setUnitBorderBottomRightRadius(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "borderBottomRightRadius", value); } - public void setBorderBottomLeftRadius(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "borderBottomLeftRadius", value); + public void setUnitBorderBottomLeftRadius(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "borderBottomLeftRadius", value); } - public void setBorderTopLeftRadius(String value){ - DOM.setStyleAttribute(this.basePanel.getElement(), "borderTopLeftRadius", value); + public void setUnitBorderTopLeftRadius(String value){ + DOM.setStyleAttribute(this.innerPanel.getElement(), "borderTopLeftRadius", value); } public String getCaption() { - return this.basePanel.getCaptionText(); + return this.innerPanel.getCaptionText(); } @@ -1543,10 +1545,10 @@ // the legend element is set to non-visible public void setCaption(String caption) { if(caption == null || caption.length() == 0){ - this.basePanel.setCaptionText(caption); + this.innerPanel.setCaptionText(caption); //DOM.setStyleAttribute(this.legend, "display", "none"); } else { - this.basePanel.setCaptionText(caption); + this.innerPanel.setCaptionText(caption); //DOM.setStyleAttribute(this.legend, "display", "inline"); } } @@ -1605,6 +1607,7 @@ return this.addDomHandler(handler, FocusEvent.getType()); } } + /* // wraps a fieldset with a legend item that represent a group-element Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java Wed Jul 20 10:01:42 2011 (r652) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java Wed Jul 20 11:21:32 2011 (r653) @@ -118,7 +118,7 @@ return TextDecorationValue.NONE; } else { try{ - return TextDecorationValue.valueOf(decorationOcc.getValue().toUpperCase()); + return TextDecorationValue.valueOf(decorationOcc.getValue().toUpperCase().replace("-", "_")); }catch(IllegalArgumentException e){ throw new InvalidGdlSchemaException("The occurrence " + GdlPsis.OccurrenceType.gdlTextDecoration + " must be set to one of \"underline\", \"overline\", \"line-through\", \"blink\" or \"none\", but is \"" + decorationOcc.getValue() + "\""); } 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 20 10:01:42 2011 (r652) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Wed Jul 20 11:21:32 2011 (r653) @@ -22,12 +22,14 @@ {"subject_identifiers":["[gdl:schema-name]"], "instance_of":["si:[tmcl:name-type]"]}, {"subject_identifiers":["[gdl:view-name]"], "instance_of":["si:[tmcl:name-type]"]}, {"subject_identifiers":["[gdl:Descriptor]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"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:Text-Object]"]}, {"subject_identifiers":["[gdl:Position]"]}, {"subject_identifiers":["[gdl:position]"], "instance_of":["si:[tmcl:association-type]"]}, {"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]"]}, {"subject_identifiers":["[gdl:margin-bottom]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:padding]"], "instance_of":["si:[tmcl:occurrence-type]"]}, @@ -52,7 +54,7 @@ {"subject_identifiers":["[doc:list-item-2]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_item_2_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:padding]", "value":"5px"}, {"type":"si:[gdl:margin-top]", "value":"5px"}]}, {"subject_identifiers":["[gdl:List-Box]"]}, {"subject_identifiers":["[doc:text-1]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"text_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:readonly]", "value":"false", "datatype":"[xsd:boolean]"}]}, - {"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"}]}, + {"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":"100px"}, {"type":"si:[gdl:height]", "value":"50px"}, {"type":"si:[gdl:border-style]", "value":"dashed"}, {"type":"si:[gdl:border-width]", "value":"1px"}, {"type":"si:[gdl:text-decoration]", "value":"line-through"}]}, {"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:reference-1]"], "instance_of":["si:[gdl:Reference]"], "occurrences":[{"type":"si:[gdl:id]", "value":"reference_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:margin-left]", "value":"200px"}, {"type":"si:[gdl:background-color]", "value":"yellow"}]}, {"subject_identifiers":["[doc:list-box-1]"], "instance_of":["si:[gdl:List-Box]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_box_1_id", "datatype":"[xsd:ID]"}]},

1 0

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

20 Jul '11

Author: lgiessmann Date: Wed Jul 20 10:01:42 2011 New Revision: 652 Log: gdl-frontend: Widgets: changed UnitWidget to a Caption panel 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/container/GdlUnit.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/TmHelper.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Wed Jul 20 07:32:13 2011 (r651) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Wed Jul 20 10:01:42 2011 (r652) @@ -19,6 +19,7 @@ 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/container/GdlUnit.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Wed Jul 20 07:32:13 2011 (r651) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Wed Jul 20 10:01:42 2011 (r652) @@ -24,6 +24,7 @@ import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.AbsolutePanel; +import com.google.gwt.user.client.ui.CaptionPanel; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; @@ -1173,7 +1174,7 @@ UnitWidget unit = (UnitWidget)source; for (Pair<String, String> pair : this.unitHoverCssNamesAndStyles) { if(pair.getFirst().equals("textDecoration"))unit.setTextDecoration(pair.getSecond()); - else DOM.setStyleAttribute(unit.fieldset, pair.getFirst(), pair.getSecond()); + else DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); if(unit.styleOfUnitWidgetBase(pair.getFirst())) DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); } @@ -1189,7 +1190,7 @@ UnitWidget unit = (UnitWidget)widget; for (Pair<String, String> pair : this.unitHoverCssNamesAndStyles) { if(pair.getFirst().equals("textDecoration"))unit.setTextDecoration(pair.getSecond()); - else DOM.setStyleAttribute(unit.fieldset, pair.getFirst(), pair.getSecond()); + else DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); if(unit.styleOfUnitWidgetBase(pair.getFirst())) DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); } @@ -1205,7 +1206,7 @@ UnitWidget unit = (UnitWidget)widget; for (Pair<String, String> pair : this.unitFocusCssNamesAndStyles) { if(pair.getFirst().equals("textDecoration"))unit.setTextDecoration(pair.getSecond()); - else DOM.setStyleAttribute(unit.fieldset, pair.getFirst(), pair.getSecond()); + else DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); if(unit.styleOfUnitWidgetBase(pair.getFirst())) DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); } @@ -1222,7 +1223,7 @@ UnitWidget unit = (UnitWidget)source; for (Pair<String, String> pair : this.unitFocusCssNamesAndStyles) { if(pair.getFirst().equals("textDecoration"))unit.setTextDecoration(pair.getSecond()); - else DOM.setStyleAttribute(unit.fieldset, pair.getFirst(), pair.getSecond()); + else DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); if(unit.styleOfUnitWidgetBase(pair.getFirst())) DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); } @@ -1238,7 +1239,7 @@ UnitWidget unit = (UnitWidget)widget; for (Pair<String, String> pair : this.unitActiveCssNamesAndStyles) { if(pair.getFirst().equals("textDecoration"))unit.setTextDecoration(pair.getSecond()); - else DOM.setStyleAttribute(unit.fieldset, pair.getFirst(), pair.getSecond()); + else DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); if(unit.styleOfUnitWidgetBase(pair.getFirst())) DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); } @@ -1255,7 +1256,7 @@ UnitWidget unit = (UnitWidget)source; for (Pair<String, String> pair : this.unitActiveCssNamesAndStyles) { if(pair.getFirst().equals("textDecoration"))unit.setTextDecoration(pair.getSecond()); - else DOM.setStyleAttribute(unit.fieldset, pair.getFirst(), pair.getSecond()); + else DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); if(unit.styleOfUnitWidgetBase(pair.getFirst())) DOM.setStyleAttribute(unit.basePanel.getElement(), pair.getFirst(), pair.getSecond()); } @@ -1286,7 +1287,326 @@ return TmHelper.getFirstContainee(super.getTmRepresentative(), containees); } + + + protected class UnitWidget extends Composite implements HasFocusHandlers, HasBlurHandlers, HasMouseOutHandlers, HasMouseOverHandlers, HasMouseDownHandlers, HasMouseUpHandlers{ + private CaptionPanel basePanel = new CaptionPanel(); + private Topic tmRepresentative = null; + private ArrayList<Widget> subElements = new ArrayList<Widget>(); + + + private UnitWidget(){ + initWidget(this.basePanel); + } + + + public UnitWidget(Topic tmRepresentative){ + this(); + this.tmRepresentative = tmRepresentative; + } + + + public Topic getTmRepresentative(){ + return this.tmRepresentative; + } + + + + // appends a new element in form of a topic to this unit-widget + public GdlVisibleObject append(Topic ancestor, Topic current) throws ExecutionException, InvalidGdlSchemaException { + if(ancestor == null || current == null) throw new ExecutionException("to append \"" + TmHelper.getAnyIdOfTopic(current) + "\" on \"" + TmHelper.getAnyIdOfTopic(ancestor) + "\" both topics must be present"); + GdlPosition position = new GdlPosition(TmHelper.getPositionOf(ancestor, current)); + + GdlVisibleObject newObj = GdlInstantiator.instantiate(current); + GdlVisibleObject oldObj = null; + for (Widget widget : this.subElements){ + if(((GdlVisibleObject)widget).getTmRepresentative().equals(ancestor)){ + oldObj = (GdlVisibleObject)widget; + break; + } + } + + this.subElements.add(newObj); + if(this.getTmRepresentative().equals(ancestor)){ + this.basePanel.add(newObj); + } + else{ + Element elemBefore = oldObj.getElement(); + Element elemAfter = DOM.getNextSibling(elemBefore); + // insert before seems to be a more accepted and stable + // way of inserting new child elements than insertAfter + if(elemAfter == null) this.basePanel.add(newObj); + else this.basePanel.getElement().insertBefore(newObj.getElement(), elemAfter); + } + position.setAttributes(newObj); + return newObj; + } + + + public void setId(String id){ + DOM.setElementAttribute(this.basePanel.getElement(), "id", id); + } + + // some css style setters + public void setHeight(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "height", value); + } + + + public void setMaxHeight(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "maxHeight", value); + } + + + public void setMinHeight(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "minHeight", value); + } + + + public void setWidth(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "width", value); + } + + + public void setMaxWidth(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "maxWidth", value); + } + + + public void setMinWidth(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "minWidth", value); + } + + + public void setBorderWidth(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "borderWidth", value); + } + + + public void setBorderTopWidth(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "borderTopWidth", value); + } + + + public void setBorderRightWidth(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "borderRightWidth", value); + } + + + public void setBorderBottomWidth(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "borderBottomWidth", value); + } + + + public void setBorderLeftWidth(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "borderLeftWidth", value); + } + + + public void setBorderColor(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "borderColor", value); + } + + + public void setBorderTopColor(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "borderTopColor", value); + } + + + public void setBorderRightColor(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "borderRightColor", value); + } + + + public void setTextDecoration(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "textDecoration", value); + } + + + public void setBorderBottomColor(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "borderBottomColor", value); + } + + + public void setBorderLeftColor(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "borderLeftColor", value); + } + + + public void setBorderStyle(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "borderStyle", value); + } + + + public void setBorderTopStyle(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "borderTopStyle", value); + } + + + public void setBorderRightStyle(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "borderRightStyle", value); + } + + + public void setBorderBottomStyle(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "borderBottomStyle", value); + } + + + public void setBorderLeftStyle(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "borderLeftStyle", value); + } + + + public void setPadding(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "padding", value); + } + + + public void setPaddingTop(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "paddingTop", value); + } + + + public void setPaddingRight(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "paddingRight", value); + } + + + public void setPaddingBottom(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "paddingBottom", value); + } + + + public void setPaddingLeft(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "paddingLeft", value); + } + + + public void setMargin(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "margin", value); + } + + + public void setMarginTop(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "marginTop", value); + } + + + public void setMarginRight(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "marginRight", value); + } + + + public void setMarginBottom(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "marginBottom", value); + } + + + public void setMarginLeft(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "marginLeft", value); + } + + + public void setBorderRadius(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "borderRadius", value); + } + + + public void setBorderTopRightRadius(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "borderTopRightRadius", value); + } + + + public void setBorderBottomRightRadius(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "borderBottomRightRadius", value); + } + + + public void setBorderBottomLeftRadius(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "borderBottomLeftRadius", value); + } + + + public void setBorderTopLeftRadius(String value){ + DOM.setStyleAttribute(this.basePanel.getElement(), "borderTopLeftRadius", value); + } + + + public String getCaption() { + return this.basePanel.getCaptionText(); + } + + + // sets the unit's name. If the name is "" or null, + // the legend element is set to non-visible + public void setCaption(String caption) { + if(caption == null || caption.length() == 0){ + this.basePanel.setCaptionText(caption); + //DOM.setStyleAttribute(this.legend, "display", "none"); + } else { + this.basePanel.setCaptionText(caption); + //DOM.setStyleAttribute(this.legend, "display", "inline"); + } + } + + + // returns true if the passed style property must be applied on both the fieldset and absolutepanel + public boolean styleOfUnitWidgetBase(String styleProperty){ + if(styleProperty.equals("borderWidth") || styleProperty.equals("borderTopWidth") || styleProperty.equals("borderRightWidth") || styleProperty.equals("borderBottomWidth") || styleProperty.equals("borderLeftWidth")){ + return false; + }else if(styleProperty.equals("borderColor") || styleProperty.equals("borderTopColor") || styleProperty.equals("borderRightColor") || styleProperty.equals("borderBottomColor") || styleProperty.equals("borderLeftColor")){ + return false; + }else if(styleProperty.equals("padding") || styleProperty.equals("paddingTop") || styleProperty.equals("paddingRight") || styleProperty.equals("paddingBottom") || styleProperty.equals("paddingLeft")){ + return false; + }else if(styleProperty.equals("margin") || styleProperty.equals("marginTop") || styleProperty.equals("marginRight") || styleProperty.equals("marginBottom") || styleProperty.equals("marginLeft")){ + return false; + }else if(styleProperty.equals("borderRadius") || styleProperty.equals("borderTopRightRadius") || styleProperty.equals("borderBottomRightRadius") || styleProperty.equals("borderBottomLeftRadius") || styleProperty.equals("borderTopLeftRadius")){ + return false; + }else { + return true; + } + } + + + @Override + public HandlerRegistration addMouseUpHandler(MouseUpHandler handler) { + return this.addDomHandler(handler, MouseUpEvent.getType()); + } + + + @Override + public HandlerRegistration addMouseDownHandler(MouseDownHandler handler) { + return this.addDomHandler(handler, MouseDownEvent.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 addBlurHandler(BlurHandler handler) { + return this.addDomHandler(handler, BlurEvent.getType()); + } + + + @Override + public HandlerRegistration addFocusHandler(FocusHandler handler) { + return this.addDomHandler(handler, FocusEvent.getType()); + } + } + + /* // wraps a fieldset with a legend item that represent a group-element protected class UnitWidget extends Composite implements HasFocusHandlers, HasBlurHandlers, HasMouseOutHandlers, HasMouseOverHandlers, HasMouseDownHandlers, HasMouseUpHandlers{ private AbsolutePanel basePanel = new AbsolutePanel(); @@ -1611,4 +1931,5 @@ } } } + */ } \ No newline at end of file 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 20 07:32:13 2011 (r651) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Wed Jul 20 10:01:42 2011 (r652) @@ -38,6 +38,7 @@ {"subject_identifiers":["[gdl:nth-element]"], "instance_of":["si:[tmcl:role-type]"]}, {"subject_identifiers":["[gdl:background-color]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:width]"], "instance_of":["si:[tmcl:occurrence-type]"]}, + {"subject_identifiers":["[gdl:unit-name]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:height]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:font-weight]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[doc:default-creator-topic-view-1]"], "instance_of":["si:[gdl:Default-Creator-Topic-View]"], "names":[{"value": "Def. Creator View 1", "type":"si:[gdl:view-name]"}], "occurrences":[{"type":"si:[gdl:id]", "value":"default_creator_topic_view_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:background-color]", "value":"#ccc"}, {"type":"si:[gdl:width]", "value":"500px"}, {"type":"si:[gdl:height]", "value":"600px"}]}, @@ -51,6 +52,7 @@ {"subject_identifiers":["[doc:list-item-2]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_item_2_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:padding]", "value":"5px"}, {"type":"si:[gdl:margin-top]", "value":"5px"}]}, {"subject_identifiers":["[gdl:List-Box]"]}, {"subject_identifiers":["[doc:text-1]"], "instance_of":["si:[gdl:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"text_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:readonly]", "value":"false", "datatype":"[xsd:boolean]"}]}, + {"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"}]}, {"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:reference-1]"], "instance_of":["si:[gdl:Reference]"], "occurrences":[{"type":"si:[gdl:id]", "value":"reference_1_id", "datatype":"[xsd:ID]"}, {"type":"si:[gdl:margin-left]", "value":"200px"}, {"type":"si:[gdl:background-color]", "value":"yellow"}]}, {"subject_identifiers":["[doc:list-box-1]"], "instance_of":["si:[gdl:List-Box]"], "occurrences":[{"type":"si:[gdl:id]", "value":"list_box_1_id", "datatype":"[xsd:ID]"}]}, @@ -60,12 +62,14 @@ {"subject_identifiers":["[doc:pos-of-reference-1]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"static"}]}, {"subject_identifiers":["[doc:pos-of-list-box-1]"], "instance_of":["si:[gdl:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:bottom]", "value":"5px"}, {"type":"si:[gdl:right]", "value":"5px"}]}, {"subject_identifiers":["[doc:pos-of-person-list]"], "instance_of":["si:[gdl:Position]"]}, + {"subject_identifiers":["[doc:pos-of-unit]"], "instance_of":["si:[gdl:Position]"]}, {"subject_identifiers":["[gdl:position-style]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:top]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:right]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:bottom]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:left]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:TM-Value]"]}, + {"subject_identifiers":["[gdl:Unit]"]}, {"subject_identifiers":["[gdl:Nth-Element]"]}, {"subject_identifiers":["[gdl:nth-value]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[doc:nth-elem-1]"], "instance_of":["si:[gdl:Nth-Element]"], "occurrences":[{"type":"si:[gdl:nth-value]", "value":"0"}]}, @@ -117,6 +121,7 @@ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Text-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:List-Box]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Visible-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:List]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Nth-Element]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Text-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Unit]"}]}, {"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]"}]}, @@ -139,11 +144,13 @@ {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:default-creator-topic-view-1]"},{"type":"si:[gdl:containee]", "player":"si:[doc:reference-1]"}]}, {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:default-creator-topic-view-1]"},{"type":"si:[gdl:containee]", "player":"si:[doc:list-box-1]"}]}, {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:default-creator-topic-view-1]"},{"type":"si:[gdl:containee]", "player":"si:[doc:person-list]"}]}, + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:default-creator-topic-view-1]"},{"type":"si:[gdl:containee]", "player":"si:[doc:unit-1]"}]}, {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:pos-of-title-1]"},{"type":"si:[gdl:ancestor]", "player":"si:[doc:default-creator-topic-view-1]"}, {"type":"si:[gdl:descendant]", "player":"si:[doc:title-1]"}]}, {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:pos-of-text-1]"},{"type":"si:[gdl:ancestor]", "player":"si:[doc:title-1]"}, {"type":"si:[gdl:descendant]", "player":"si:[doc:text-1]"}]}, {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:pos-of-reference-1]"},{"type":"si:[gdl:ancestor]", "player":"si:[doc:text-1]"}, {"type":"si:[gdl:descendant]", "player":"si:[doc:reference-1]"}]}, {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:pos-of-list-box-1]"},{"type":"si:[gdl:ancestor]", "player":"si:[doc:reference-1]"}, {"type":"si:[gdl:descendant]", "player":"si:[doc:list-box-1]"}]}, {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:pos-of-person-list]"},{"type":"si:[gdl:ancestor]", "player":"si:[doc:list-box-1]"}, {"type":"si:[gdl:descendant]", "player":"si:[doc:person-list]"}]}, + {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:pos-of-unit]"},{"type":"si:[gdl:ancestor]", "player":"si:[doc:person-list]"}, {"type":"si:[gdl:descendant]", "player":"si:[doc:unit-1]"}]}, {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:person-list]"},{"type":"si:[gdl:containee]", "player":"si:[doc:list-item-1]"}, {"type":"si:[gdl:nth-element]", "player":"si:[doc:nth-elem-1]"}]}, {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:person-list]"},{"type":"si:[gdl:containee]", "player":"si:[doc:list-item-2]"}, {"type":"si:[gdl:nth-element]", "player":"si:[doc:nth-elem-2]"}]}, {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:person-list]"},{"type":"si:[gdl:containee]", "player":"si:[doc:list-item-3]"}, {"type":"si:[gdl:nth-element]", "player":"si:[doc:nth-elem-3]"}]}

1 0

[isidorus-cvs] r651 - trunk/src/shell_scripts
by lgiessmann＠common-lisp.net 20 Jul '11

20 Jul '11

Author: lgiessmann Date: Wed Jul 20 07:32:13 2011 New Revision: 651 Log: trunk: added a bash script that starts isidorus in the background by calling sbcl --load shell_scripts/startIsidorus.list by using start-stop-daemon Added: trunk/src/shell_scripts/isidorus (contents, props changed) trunk/src/shell_scripts/startIsidorus.lisp Added: trunk/src/shell_scripts/isidorus ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/shell_scripts/isidorus Wed Jul 20 07:32:13 2011 (r651) @@ -0,0 +1,73 @@ + +#!/bin/bash + +### BEGIN INIT INFO +# Provides: isidorus +# Required-Start: $local_fs $remote_fs $network +# Required-Stop: $local_fs $remote_fs $network +# Should-Start: $named +# Should-Stop: $named +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start Isidorus. +# Description: Start the Isidorus server. +### END INIT INFO + +. /lib/lsb/init-functions + +NAME=isidorus +DPATH=/home/servreg/.sbcl/site/isidorus/src +DAEMON="/usr/bin/sbcl" +ARGUMENTS="--load shell_scripts/startIsidorus.lisp" +PID=/var/run/isidorus.pid +USER=servreg +GROUP=servreg + +start_isidorus () { + log_daemon_msg "Starting ${NAME}" + #set -x + start-stop-daemon --background --start --group ${GROUP} --chuid ${USER} --chdir ${DPATH} --pidfile ${PID} -m --exec ${DAEMON} -- ${ARGUMENTS} + #set +x + if ps -p $(cat $PID 2> /dev/null) > /dev/null 2>&1; then + log_end_msg 0 + else + log_end_msg 1 + fi +} + +stop_isidorus () { + log_daemon_msg "Stoping ${NAME}" + + . ${DPATH}/shell_scripts/shutdown-isidorus.sh + if [ $? -eq 0 ]; then + log_end_msg 0 + else + log_end_msg 1 + fi +} + + +case "$1" in + start) + start_isidorus + ;; + + stop) + stop_isidorus + ;; + + restart) + stop_isidorus + sleep 5 + start_isidorus + ;; + + status) + echo TODO + ;; + + *) + echo "Usage: $0 {start|stop|restart|status}" >&2 + exit 1 + ;; +esac; Added: trunk/src/shell_scripts/startIsidorus.lisp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/shell_scripts/startIsidorus.lisp Wed Jul 20 07:32:13 2011 (r651) @@ -0,0 +1,10 @@ +(setf sb-impl::*default-external-format* :utf-8) +(asdf:operate 'asdf:load-op 'isidorus) +;;(xtm-importer:import-from-xtm "/home/servreg/.sbcl/site/isidorus/src/unit_tests/textgrid_07.15.2011.xtm" "data_base" :tm-id "http::/isidor.us/tm-1") +(setf rest-interface:*local-backup-remote-address* "143.93.190.247") +(setf rest-interface:*remote-backup-remote-address* "143.93.190.247") +(setf rest-interface:*shutdown-remote-address* "127.0.0.1") +(rest-interface:start-json-engine "/home/servreg/data_base" :host-name "143.93.190.176" :port 9999) +(rest-interface:start-admin-server) +(rest-interface:die-when-finished) +

1 0

[isidorus-cvs] r650 - trunk/src/rest_interface
by lgiessmann＠common-lisp.net 20 Jul '11

20 Jul '11

Author: lgiessmann Date: Wed Jul 20 06:36:04 2011 New Revision: 650 Log: trunk: changed the configuration of the admin interface => is is possible to set the remote address of each admin handler Modified: trunk/src/rest_interface/admin-interface.lisp trunk/src/rest_interface/rest-interface.lisp Modified: trunk/src/rest_interface/admin-interface.lisp ============================================================================== --- trunk/src/rest_interface/admin-interface.lisp Wed Jul 20 06:08:04 2011 (r649) +++ trunk/src/rest_interface/admin-interface.lisp Wed Jul 20 06:36:04 2011 (r650) @@ -33,7 +33,7 @@ (defun admin-shutdown() (handler-case - (if (string= *admin-remote-name* (hunchentoot:remote-addr*)) + (if (string= *shutdown-remote-address* (hunchentoot:remote-addr*)) (progn (when elephant:*store-controller* (xtm-exporter:export-as-xtm @@ -58,7 +58,7 @@ (defun admin-local-backup() (handler-case - (if (string= *admin-remote-name* (hunchentoot:remote-addr*)) + (if (string= *local-backup-remote-address* (hunchentoot:remote-addr*)) (let ((destination-path (hunchentoot:url-decode (hunchentoot:get-parameter "path")))) (xtm-exporter:export-as-xtm destination-path :revision 0)) @@ -72,7 +72,7 @@ (defun admin-remote-backup() (handler-case - (if (string= *admin-remote-name* (hunchentoot:remote-addr*)) + (if (string= *remote-backup-remote-address* (hunchentoot:remote-addr*)) (progn (hunchentoot:url-decode (hunchentoot:get-parameter "path")) (setf (hunchentoot:content-type*) "application/xml") (xtm-exporter:export-as-xtm-string :revision 0)) Modified: trunk/src/rest_interface/rest-interface.lisp ============================================================================== --- trunk/src/rest_interface/rest-interface.lisp Wed Jul 20 06:08:04 2011 (r649) +++ trunk/src/rest_interface/rest-interface.lisp Wed Jul 20 06:36:04 2011 (r650) @@ -39,7 +39,9 @@ :shutdown-admin-server :*admin-host-name* :*admin-port* - :*admin-remote-name* + :*remote-backup-remote-address* + :*local-backup-remote-address* + :*shutdown-remote-address* :*json-get-prefix* :*get-rdf-prefix* :*json-commit-url* @@ -83,7 +85,9 @@ (defvar *admin-server-acceptor* nil) (defvar *admin-host-name* "127.0.0.1") (defvar *admin-port* 11008) -(defvar *admin-remote-name* "127.0.0.1") +(defvar *remote-backup-remote-address* "127.0.0.1") +(defvar *local-backup-remote-address* "127.0.0.1") +(defvar *shutdown-remote-address* "127.0.0.1") (defun start-admin-server ()

1 0