[isidorus-cvs] r539 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base environment views
Author: lgiessmann Date: Thu Jun 30 05:35:16 2011 New Revision: 539
Log: gdl-frontend: Widgets: started to implement gdl:VisibleObject
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlDescriptor.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/environment/ExecutionException.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ILoadSchemaCallback.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/InvalidContentException.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/InvalidGdlSchemaException.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlAssociationView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlCreatorAssociationView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlDefaultCreatorTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlDefaultEditorTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlDefaultTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlEditorAssociationView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlSpecialCreatorTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlSpecialEditorTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlSpecialTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlView.java
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlDescriptor.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlDescriptor.java Thu Jun 30 04:45:04 2011 (r538) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlDescriptor.java Thu Jun 30 05:35:16 2011 (r539) @@ -1,10 +1,8 @@ package us.isidor.gdl.anaToMia.Widgets.base;
import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException;
-public abstract class GdlDescriptor { - public abstract void setTmRepresentative(Topic representative) throws InvalidGdlSchemaException; - public abstract Topic getTmRepresentative(); -} +public interface GdlDescriptor { + public Topic getTmRepresentative(); +} \ 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 Thu Jun 30 04:45:04 2011 (r538) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Thu Jun 30 05:35:16 2011 (r539) @@ -1,5 +1,92 @@ package us.isidor.gdl.anaToMia.Widgets.base;
-public abstract class GdlVisibleObject extends GdlDescriptor{ - // TODO: implement +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + +import com.google.gwt.core.client.JsArray; +import com.google.gwt.user.client.ui.AbsolutePanel; +import com.google.gwt.user.client.ui.Composite; + +public abstract class GdlVisibleObject extends Composite implements GdlDescriptor { + protected AbsolutePanel mainPanel = new AbsolutePanel(); + protected Topic tmRepresentative = null; + protected TopicMap tm = null; + + + @SuppressWarnings("unused") + private GdlVisibleObject() {} + + + public GdlVisibleObject(Topic tmRepresentative) throws InvalidGdlSchemaException{ + this.tmRepresentative = tmRepresentative; + this.tm = this.tmRepresentative.getTopicMap(); + + // TODO: apply GDL style + } + + + public Topic getTmRepresentative(){ + return this.tmRepresentative; + } + + + public String getId() throws InvalidGdlSchemaException { + JsArray<Occurrence> idOccs = tmRepresentative.getOccurrences(tm.getTopicBySubjectIdentifier(tm.createLocator(GdlPsis.OccurrenceType.gdlId))); + if(idOccs.length() != 1){ + throw new InvalidGdlSchemaException("The topic " + "" + "must be bound to exactly one occurrence of the type " + GdlPsis.OccurrenceType.gdlId + "but is bound " + idOccs.length() + " times to it"); + } else { + return idOccs.get(0).getValue(); + } + } + + + + + // TODO: StyleClass scope + // gdlVerticalAlign + // gdlDisplay + // gdlMargin + // gdlMarginTop + // gdlMarginRight + // gdlMarginBottom + // gdlMarginLeft + // gdlBorderColor + // gdlBorderColorTop + // gdlBorderColorRight + // gdlBorderColorBottom + // gdlBorderColorLeft + // gdlBorderStyle + // gdlBorderStyleTop + // gdlBorderStyleRight + // gdlBorderStyleBottom + // gdlBorderStyleLeft + // gdlBorderWidth + // gdlBorderWidthTop + // gdlBorderWidthRight + // gdlBorderWidthBottom + // gdlBorderWidthLeft + // gdlBorderRadius + // gdlBorderTopRightRadius + // gdlBorderTopLeftRadius + // gdlBorderBottomRightRadius + // gdlBorderBottomLeftRadius + // gdlCursor + // gdlZindex + // gdlWidth + // gdlMinWidth + // gdlMaxWidth + // gdlHeight + // gdlMaxHeight + // gdlMinHeight + // gdlPadding + // gdlPaddingTop + // gdlPaddingRight + // gdlPaddingBottom + // gdlPaddingLeft + // gdlFloat + // gdlClear + // gdlBackgroundColor + // gdlOverflow }
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ExecutionException.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ExecutionException.java Thu Jun 30 04:45:04 2011 (r538) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ExecutionException.java Thu Jun 30 05:35:16 2011 (r539) @@ -1,6 +1,9 @@ package us.isidor.gdl.anaToMia.Widgets.environment;
public class ExecutionException extends Exception { + private static final long serialVersionUID = 1982458787061912636L; + + protected ExecutionException() {}
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ILoadSchemaCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ILoadSchemaCallback.java Thu Jun 30 04:45:04 2011 (r538) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ILoadSchemaCallback.java Thu Jun 30 05:35:16 2011 (r539) @@ -1,9 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.environment;
import com.google.gwt.http.client.RequestException; - -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.Widgets.base.GdlPanel;
public interface ILoadSchemaCallback {
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/InvalidContentException.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/InvalidContentException.java Thu Jun 30 04:45:04 2011 (r538) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/InvalidContentException.java Thu Jun 30 05:35:16 2011 (r539) @@ -1,6 +1,9 @@ package us.isidor.gdl.anaToMia.Widgets.environment;
public class InvalidContentException extends Exception { + private static final long serialVersionUID = 5990889076536118171L; + + protected InvalidContentException() {}
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/InvalidGdlSchemaException.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/InvalidGdlSchemaException.java Thu Jun 30 04:45:04 2011 (r538) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/InvalidGdlSchemaException.java Thu Jun 30 05:35:16 2011 (r539) @@ -1,9 +1,9 @@ package us.isidor.gdl.anaToMia.Widgets.environment;
public class InvalidGdlSchemaException extends Exception { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 9130908618285633391L; +
- protected InvalidGdlSchemaException() {}
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlAssociationView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlAssociationView.java Thu Jun 30 04:45:04 2011 (r538) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlAssociationView.java Thu Jun 30 05:35:16 2011 (r539) @@ -1,6 +1,14 @@ package us.isidor.gdl.anaToMia.Widgets.views;
+import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; +
public abstract class GdlAssociationView extends GdlView { + + public GdlAssociationView(Topic tmRepresentative) throws InvalidGdlSchemaException { + super(tmRepresentative); + // TODO Auto-generated constructor stub + } // TODO: implement }
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlCreatorAssociationView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlCreatorAssociationView.java Thu Jun 30 04:45:04 2011 (r538) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlCreatorAssociationView.java Thu Jun 30 05:35:16 2011 (r539) @@ -12,17 +12,15 @@
public class GdlCreatorAssociationView extends GdlAssociationView {
- @Override - public String getViewName() { - // TODO Auto-generated method stub - return null; + public GdlCreatorAssociationView(Topic tmRepresentative) throws InvalidGdlSchemaException { + super(tmRepresentative); + // TODO Auto-generated constructor stub }
@Override - public void setTmRepresentative(Topic representative) - throws InvalidGdlSchemaException { + public String getViewName() { // TODO Auto-generated method stub - + return null; }
@Override
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlDefaultCreatorTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlDefaultCreatorTopicView.java Thu Jun 30 04:45:04 2011 (r538) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlDefaultCreatorTopicView.java Thu Jun 30 05:35:16 2011 (r539) @@ -12,18 +12,18 @@ public class GdlDefaultCreatorTopicView extends GdlDefaultTopicView{ // TODO: implement + public GdlDefaultCreatorTopicView(Topic tmRepresentative) throws InvalidGdlSchemaException { + super(tmRepresentative); + // TODO Auto-generated constructor stub + } + + @Override public String getViewName() { // TODO Auto-generated method stub return null; }
- @Override - public void setTmRepresentative(Topic representative) - throws InvalidGdlSchemaException { - // TODO Auto-generated method stub - - }
@Override public Topic getTmRepresentative() {
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlDefaultEditorTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlDefaultEditorTopicView.java Thu Jun 30 04:45:04 2011 (r538) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlDefaultEditorTopicView.java Thu Jun 30 05:35:16 2011 (r539) @@ -11,18 +11,18 @@
public abstract class GdlDefaultEditorTopicView extends GdlDefaultTopicView {
+ public GdlDefaultEditorTopicView(Topic tmRepresentative) throws InvalidGdlSchemaException { + super(tmRepresentative); + // TODO Auto-generated constructor stub + } + + @Override public String getViewName() { // TODO Auto-generated method stub return null; }
- @Override - public void setTmRepresentative(Topic representative) - throws InvalidGdlSchemaException { - // TODO Auto-generated method stub - - }
@Override public Topic getTmRepresentative() {
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlDefaultTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlDefaultTopicView.java Thu Jun 30 04:45:04 2011 (r538) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlDefaultTopicView.java Thu Jun 30 05:35:16 2011 (r539) @@ -1,5 +1,13 @@ package us.isidor.gdl.anaToMia.Widgets.views;
+import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + public abstract class GdlDefaultTopicView extends GdlTopicView { + + public GdlDefaultTopicView(Topic tmRepresentative) throws InvalidGdlSchemaException { + super(tmRepresentative); + // TODO Auto-generated constructor stub + } // TODO: implement }
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlEditorAssociationView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlEditorAssociationView.java Thu Jun 30 04:45:04 2011 (r538) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlEditorAssociationView.java Thu Jun 30 05:35:16 2011 (r539) @@ -12,18 +12,18 @@
public class GdlEditorAssociationView extends GdlAssociationView {
+ public GdlEditorAssociationView(Topic tmRepresentative) throws InvalidGdlSchemaException { + super(tmRepresentative); + // TODO Auto-generated constructor stub + } + + @Override public String getViewName() { // TODO Auto-generated method stub return null; }
- @Override - public void setTmRepresentative(Topic representative) - throws InvalidGdlSchemaException { - // TODO Auto-generated method stub - - }
@Override public Topic getTmRepresentative() {
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlSpecialCreatorTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlSpecialCreatorTopicView.java Thu Jun 30 04:45:04 2011 (r538) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlSpecialCreatorTopicView.java Thu Jun 30 05:35:16 2011 (r539) @@ -11,18 +11,18 @@ public class GdlSpecialCreatorTopicView extends GdlSpecialTopicView{ // TODO: implement + public GdlSpecialCreatorTopicView(Topic tmRepresentative) throws InvalidGdlSchemaException { + super(tmRepresentative); + // TODO Auto-generated constructor stub + } + + @Override public String getViewName() { // TODO Auto-generated method stub return null; }
- @Override - public void setTmRepresentative(Topic representative) - throws InvalidGdlSchemaException { - // TODO Auto-generated method stub - - }
@Override public Topic getTmRepresentative() {
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlSpecialEditorTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlSpecialEditorTopicView.java Thu Jun 30 04:45:04 2011 (r538) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlSpecialEditorTopicView.java Thu Jun 30 05:35:16 2011 (r539) @@ -13,18 +13,18 @@ // TODO: implement + public GdlSpecialEditorTopicView(Topic tmRepresentative) throws InvalidGdlSchemaException { + super(tmRepresentative); + // TODO Auto-generated constructor stub + } + + @Override public String getViewName() { // TODO Auto-generated method stub return null; }
- @Override - public void setTmRepresentative(Topic representative) - throws InvalidGdlSchemaException { - // TODO Auto-generated method stub - - }
@Override public Topic getTmRepresentative() {
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlSpecialTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlSpecialTopicView.java Thu Jun 30 04:45:04 2011 (r538) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlSpecialTopicView.java Thu Jun 30 05:35:16 2011 (r539) @@ -1,5 +1,13 @@ package us.isidor.gdl.anaToMia.Widgets.views;
+import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + public abstract class GdlSpecialTopicView extends GdlTopicView { + + public GdlSpecialTopicView(Topic tmRepresentative) throws InvalidGdlSchemaException { + super(tmRepresentative); + // TODO Auto-generated constructor stub + } // TODO: implement }
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlTopicView.java Thu Jun 30 04:45:04 2011 (r538) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlTopicView.java Thu Jun 30 05:35:16 2011 (r539) @@ -1,6 +1,14 @@ package us.isidor.gdl.anaToMia.Widgets.views;
+import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; +
public abstract class GdlTopicView extends GdlView { + + public GdlTopicView(Topic tmRepresentative) throws InvalidGdlSchemaException{ + super(tmRepresentative); + // TODO Auto-generated constructor stub + } // TODO: implement }
Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlView.java Thu Jun 30 04:45:04 2011 (r538) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlView.java Thu Jun 30 05:35:16 2011 (r539) @@ -20,6 +20,13 @@ // TODO: implement + + public GdlView(Topic tmRepresentative) throws InvalidGdlSchemaException{ + super(tmRepresentative); + // TODO: implement + } + + protected void init(TopicMap tm, Topic representative) throws InvalidGdlSchemaException { this.tm = tm; this.representative = representative;
-
lgiessmann＠common-lisp.net