Author: lgiessmann Date: Sun Jul 10 09:06:29 2011 New Revision: 594
Log: gdl-frontend: Widgets: started to implement GdlUnit, GdlComplexData, GdlButton
Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/Button.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlAudio.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlComplexData.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDatePicker.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDateTimePicker.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlImage.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlTimePicker.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlVideo.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/IGdlHasValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml Fri Jul 8 23:32:58 2011 (r593) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml Sun Jul 10 09:06:29 2011 (r594) @@ -26,6 +26,9 @@ <source path="environment"/> <source path="values"/> <source path="isidorus"/> + <source path="complexData"/> + <source path="button"/> +
<!-- Reference the javascript file that is necessary for tmjs --> <script src="lib/tm.min.js" />
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 Fri Jul 8 23:32:58 2011 (r593) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java Sun Jul 10 09:06:29 2011 (r594) @@ -186,9 +186,9 @@ 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 gdlUnitborderTopRightRadius = gdl + "unit-border-top-right-radius"; public final static String gdlUnitBorderBottomRightRadius = gdl + "unit-border-bottom-right-radius"; - public final static String gdlUnitBoderBottomLeftRadius = gdl + "unit-border-bottom-left-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/base/GdlVisibleObject.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Fri Jul 8 23:32:58 2011 (r593) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Sun Jul 10 09:06:29 2011 (r594) @@ -640,7 +640,7 @@ }
- // returns a ColorValue instance that represents the width of this element's border. + // returns a AbsoluteNumValue instance that represents the width of this element's 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. @@ -662,7 +662,7 @@ }
- // returns a ColorValue instance that represents the width of this element's border-top. + // returns a AbsoluteNumValue instance that represents the width of this element's border-top. // If a styleClass is set, only the corresponding value of the scoped occurrence is returned // null, null otherwise. public AbsoluteNumValue getBorderTopWidth(String styleClass) throws InvalidGdlSchemaException { @@ -681,7 +681,7 @@ }
- // returns a ColorValue instance that represents the width of this element's border-right. + // 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 getBorderRightWidth(String styleClass) throws InvalidGdlSchemaException { @@ -700,7 +700,7 @@ }
- // returns a ColorValue instance that represents the width of this element's border-bottom. + // 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 getBorderBottomWidth(String styleClass) throws InvalidGdlSchemaException { @@ -719,7 +719,7 @@ }
- // returns a ColorValue instance that represents the width of this element's border-left. + // 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 getBorderLeftWidth(String styleClass) throws InvalidGdlSchemaException {
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/IGdlHasValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/IGdlHasValue.java Fri Jul 8 23:32:58 2011 (r593) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/IGdlHasValue.java Sun Jul 10 09:06:29 2011 (r594) @@ -1,8 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.base;
import java.util.ArrayList; - -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.environment.Pair;
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Fri Jul 8 23:32:58 2011 (r593) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Sun Jul 10 09:06:29 2011 (r594) @@ -4,10 +4,8 @@ import us.isidor.gdl.anaToMia.TmEngine.jtmsBasedEngine.JtmsTmEngine; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.Widgets.environment.Pattern; +import us.isidor.gdl.anaToMia.Widgets.container.GdlUnit; import us.isidor.gdl.anaToMia.Widgets.isidorus.LoadSchemaCallback; -import us.isidor.gdl.anaToMia.Widgets.text.GdlReference; -import us.isidor.gdl.anaToMia.Widgets.text.GdlTitle; import us.isidor.gdl.anaToMia.Widgets.values.CursorValue; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.event.dom.client.ClickEvent; @@ -122,7 +120,7 @@ fsHover.addTheme(gdlHover); - GdlReference tmp = new GdlReference(tmpRepresentative); + GdlUnit tmp = new GdlUnit(tmpRepresentative); this.mainPanel.add(tmp); }catch(Exception e){ e.printStackTrace();
Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/Button.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/Button.java Sun Jul 10 09:06:29 2011 (r594) @@ -0,0 +1,7 @@ +package us.isidor.gdl.anaToMia.Widgets.button; + +import us.isidor.gdl.anaToMia.Widgets.text.GdlTextObject; + +public abstract class Button extends GdlTextObject { + // TODO: implement +}
Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlAudio.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlAudio.java Sun Jul 10 09:06:29 2011 (r594) @@ -0,0 +1,20 @@ +package us.isidor.gdl.anaToMia.Widgets.complexData; + +import org.apache.commons.lang.NotImplementedException; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + +public class GdlAudio extends GdlComplexData { + // some constructors + protected GdlAudio() { + throw new NotImplementedException(GdlPsis.TopicType.gdlAudio + " is not implemented by anaToMia yet"); + } + + + public GdlAudio(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + this(); + } +}
Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlComplexData.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlComplexData.java Sun Jul 10 09:06:29 2011 (r594) @@ -0,0 +1,18 @@ +package us.isidor.gdl.anaToMia.Widgets.complexData; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + +public abstract class GdlComplexData extends GdlVisibleObject { + // some constructors + protected GdlComplexData() { + super(); + } + + + public GdlComplexData(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative); + } +}
Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDatePicker.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDatePicker.java Sun Jul 10 09:06:29 2011 (r594) @@ -0,0 +1,5 @@ +package us.isidor.gdl.anaToMia.Widgets.complexData; + +public class GdlDatePicker extends GdlComplexData { + // TODO: implement +}
Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDateTimePicker.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDateTimePicker.java Sun Jul 10 09:06:29 2011 (r594) @@ -0,0 +1,5 @@ +package us.isidor.gdl.anaToMia.Widgets.complexData; + +public class GdlDateTimePicker extends GdlComplexData { + // TODO: implement +}
Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlImage.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlImage.java Sun Jul 10 09:06:29 2011 (r594) @@ -0,0 +1,20 @@ +package us.isidor.gdl.anaToMia.Widgets.complexData; + +import org.apache.commons.lang.NotImplementedException; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + +public class GdlImage extends GdlComplexData { + // some constructors + protected GdlImage() { + throw new NotImplementedException(GdlPsis.TopicType.gdlImage + " is not implemented by anaToMia yet"); + } + + + public GdlImage(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + this(); + } +}
Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlTimePicker.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlTimePicker.java Sun Jul 10 09:06:29 2011 (r594) @@ -0,0 +1,5 @@ +package us.isidor.gdl.anaToMia.Widgets.complexData; + +public class GdlTimePicker extends GdlComplexData { + // TODO: implement +}
Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlVideo.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlVideo.java Sun Jul 10 09:06:29 2011 (r594) @@ -0,0 +1,20 @@ +package us.isidor.gdl.anaToMia.Widgets.complexData; + +import org.apache.commons.lang.NotImplementedException; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + +public class GdlVideo extends GdlComplexData { + // some constructors + protected GdlVideo() { + throw new NotImplementedException(GdlPsis.TopicType.gdlVideo + " is not implemented by anaToMia yet"); + } + + + public GdlVideo(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + this(); + } +}
Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Sun Jul 10 09:06:29 2011 (r594) @@ -0,0 +1,715 @@ +package us.isidor.gdl.anaToMia.Widgets.container; + + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; +import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; +import us.isidor.gdl.anaToMia.Widgets.base.IGdlContainer; +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; +import us.isidor.gdl.anaToMia.Widgets.text.GdlTextObject; +import us.isidor.gdl.anaToMia.Widgets.values.AbsoluteNumValue; +import us.isidor.gdl.anaToMia.Widgets.values.BorderStyleValue; +import us.isidor.gdl.anaToMia.Widgets.values.ColorValue; +import us.isidor.gdl.anaToMia.Widgets.values.NumUnitValue; + + +public class GdlUnit extends GdlTextObject implements IGdlContainer { + // some constructors + protected GdlUnit() throws InvalidGdlSchemaException, ExecutionException { + super(); + this.createUnit(); + } + + + public GdlUnit(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative); + this.createUnit(); + } + + + // creates a unit element or returns the one, if there is a unit element + // in the subElements array + private void createUnit(){ + // TODO: implement + } + + + // 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); + } + + if(widthOcc == null && styleClass != null){ + return null; + } else if(widthOcc == null) { + return new AbsoluteNumValue(); + } else { + return new AbsoluteNumValue(widthOcc.getValue()); + } + } + + + // returns a AbsoluteNumValue instance that represents the width of this element's border-top. + // 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; + if(styleClass != null){ + widthOcc = getNoneOrOneScopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderTopWidth, styleClass); + } else { + widthOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderTopWidth); + } + + if(widthOcc == null){ + return null; + } else { + return new AbsoluteNumValue(widthOcc.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()); + } + } + + + // 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()); + } + } + + + // 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 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()); + } + } + + + // 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()); + } + } + + + // 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); + } + + if(colorOcc == null ){ + return null; + } else { + return new ColorValue(colorOcc.getValue()); + } + } + + + // 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); + } + + if(colorOcc == null ){ + return null; + } else { + return new ColorValue(colorOcc.getValue()); + } + } + + + // 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); + } + + if(colorOcc == null ){ + return null; + } else { + return new ColorValue(colorOcc.getValue()); + } + } + + + // 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); + } + + if(styleOcc == null && styleClass != null){ + return null; + } else if(styleOcc == null) { + return BorderStyleValue.NONE; + } 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()); + } + } + } + + + // 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); + } + + 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()); + } + } + } + + + // 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 getUnitBorderLeftStyle() throws InvalidGdlSchemaException { + Occurrence nameOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlUnitBorderLeftStyle); + + 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 getBorderRadius(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 getBorderTopLeftRadius(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 getBorderTopRightRadius(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 getBorderBottomLeftRadius(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 getBorderBottomRightRadius(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()); + } + } + + + + + + + + + + + // TODO: getter/setter + // setter => 5x gld:unit-border-width + // setter => 5x gdl:unit-border-color + // setter => 5x gdl:unit-border-style + // setter => gdl:unit-name + // setter => 5x gdl:unit-border-padding + // setter => 5x gdl:unit-border-margin + // setter => 5x gdl:unit-border-radius + + // TODO: override setter for textobject ??? => check first + + + + + @Override + public void append(GdlVisibleObject ancestor, GdlVisibleObject descendant) throws InvalidGdlSchemaException { + // TODO: implement + } +}
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Fri Jul 8 23:32:58 2011 (r593) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Sun Jul 10 09:06:29 2011 (r594) @@ -12,10 +12,8 @@ import com.google.gwt.event.dom.client.HasFocusHandlers; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; - import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; @@ -31,6 +29,7 @@ import us.isidor.gdl.anaToMia.Widgets.values.CursorValue; import us.isidor.gdl.anaToMia.Widgets.values.TextDecorationValue;
+ public class GdlReference extends GdlTextObject implements IGdlHasValue{ // some constructors protected GdlReference() throws InvalidGdlSchemaException, ExecutionException {