Changeset 817

Timestamp:

09/02/11 07:58:42 (14 years ago)

Author:

lgiessmann

Message:

gdl-frontend: Widgets: added a new base-structure for the validation of user data

Location:

branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets

Files:

• base/GdlSpace.java (modified) (2 diffs)
• base/GdlVisibleObject.java (modified) (1 diff)
• button/GdlActionButton.java (modified) (1 diff)
• container/GdlList.java (modified) (4 diffs)
• container/GdlUnit.java (modified) (2 diffs)
• text/GdlInfo.java (modified) (1 diff)
• text/GdlReference.java (modified) (1 diff)
• text/GdlTitle.java (modified) (1 diff)
• view/GdlAssociationView.java (modified) (1 diff)
• view/GdlDefaultTopicView.java (modified) (1 diff)
• view/GdlView.java (modified) (1 diff)

branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java ¶

@@ -2 +2 @@
 
 import java.util.ArrayList;
-
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct;
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic;
@@ -40 +39 @@
                 // has no effect on this element
         }
+        
+        
+        @Override
+        public void validate() throws ExecutionException {
+                // this element has no editable content and is always valid
+                return;
+        }
 }

branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java ¶

@@ -2298 +2298 @@
                 return result;
         }
+
+
+        // validates the entered user data, if it is invalid a ExecutionException is thrown 
+        public void validate() throws ExecutionException{
+                // TODO: implement
+        }
 }

branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java ¶

@@ -271 +271 @@
                 // has no effect on this element
         }
+        
+        
+        @Override
+        public void validate() throws ExecutionException {
+                // this element has no editable content and is always valid
+                return;
+        }
 }

branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java ¶

@@ -211 +211 @@
                 }
         }
-        
-        
-        // Wraps a ul an ol element as a widget based on a SimplePanel
-        protected class ListWidget extends Composite implements HasMouseDownHandlers, HasMouseUpHandlers, HasFocusHandlers, HasBlurHandlers, HasMouseOutHandlers, HasMouseOverHandlers{
-                private AbsolutePanel basePanel = new AbsolutePanel();
-                private Element listElement = null;
-                // note: index is not the actual index of the item in the array list,
-                // it is the user's passed index when inserting this element
-                private ArrayList<Pair<ListItem, Integer>> itemsAndIndexes = new ArrayList<Pair<ListItem, Integer>>();
-                
-                public ListWidget(){
-                        initWidget(this.basePanel);
-                        DOM.setStyleAttribute(this.basePanel.getElement(), "overflow", "visible");
-                        this.listElement = DOM.createElement("ul");
-                        this.basePanel.getElement().insertFirst(this.listElement);
-                }
-                
-                
-                public ListWidget(boolean ordered){
-                        initWidget(this.basePanel);
-                        DOM.setStyleAttribute(this.basePanel.getElement(), "overflow", "visible");
-                        if(ordered) this.listElement = DOM.createElement("ol");
-                        else this.listElement = DOM.createElement("ul");
-                        this.basePanel.getElement().insertFirst(this.listElement);
-                }
-                
-                
-                // inserts the passed list item as the last child to this list element
-                public void appendListItem(ListItem item){
-                        if(item == null) return;
-                        item.appendToList(this.listElement);
-                }
-                
-                
-                // inserts the passed instance item to this list directly after the intance previous
-                public void appendListItem(ListItem item, ListItem previous){
-                        if(item == null) return;
-                        item.appendToList(this.listElement, previous);
-                }
-                
-                
-                // inserts the passed widget directly before the first item that
-                // has a greater position index
-                public void insertWidget(Widget widget, int position){
-                        ListItem previosItem = this.getItemBeforeIndex(position);
-                        ListItem item = new ListItem(this.listElement);
-                        item.appendContentToListItem(widget.getElement());
-                        this.appendListItem(item, previosItem);
-                }
-                
-                
-                // returns the first item that has a smaller position index 
-                public ListItem getItemBeforeIndex(int idx){
-                        Pair<ListItem, Integer> result = null;
-                        for (Pair<ListItem, Integer> item : this.itemsAndIndexes) {
-                                if(item.getSecond() < idx && (result == null || result.getSecond() < item.getSecond()))result = item;
-                        }
-                
-                        if(result != null) result.getFirst();
-                        return null;
-                }
-                
-                
-                // returns the acutal DOM element
-                public Element getListElement(){
-                        return this.listElement;
-                }
-                
-                // returns all ListItems
-                public ArrayList<ListItem> getItems(){
-                        ArrayList<ListItem> items = new ArrayList<GdlList.ListItem>();
-                        for (Pair<ListItem, Integer> pair : this.itemsAndIndexes) {
-                                items.add(pair.getFirst());
-                        }
-                        return items;
-                }
-                
-                
-                // returns the position index of the item, that was specified when
-                // inserting the passed ListItem
-                public int indexOfItem(ListItem item){
-                        for (Pair<ListItem, Integer> pair : this.itemsAndIndexes) {
-                                if(pair.getFirst().equals(item)) return pair.getSecond();
-                        }
-                        
-                        return -1;
-                }
-                
-                
-                public void setId(String id){
-                        DOM.setElementAttribute(this.basePanel.getElement(), "id", id);
-                }
-
-
-                @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());
-                }
-
-
-                @Override
-                public HandlerRegistration addMouseUpHandler(MouseUpHandler handler) {
-                        return this.addDomHandler(handler, MouseUpEvent.getType());
-                }
-
-
-                @Override
-                public HandlerRegistration addMouseDownHandler(MouseDownHandler handler) {
-                        return this.addDomHandler(handler, MouseDownEvent.getType());
-                }
-        }
-        
+
         
         // this class wraps a list item, i.e. a div element within a li element
@@ -346 +217 @@
                 private Element liElement = null;
                 private Element divElement = null;
+                private ArrayList<GdlVisibleObject> contents = new ArrayList<GdlVisibleObject>();
+                
                 
                 public ListItem(){
@@ -391 +264 @@
                 
                 // appends the content element to the inner div item
-                public void appendContentToListItem(Element content){
+                public void appendContentToListItem(GdlVisibleObject content){
                         if(content != null){
                                 Node lastChild = this.divElement.getLastChild();
                                 if(lastChild != null){
-                                        this.divElement.insertAfter(content, lastChild);
+                                        this.divElement.insertAfter(content.getElement(), lastChild);
                                 } else {
-                                        this.divElement.insertFirst(content);
+                                        this.divElement.insertFirst(content.getElement());
                                 }
-                        }
+                                
+                                contents.add(content);
+                        }
+                }
+        
+                
+                public void validate() throws ExecutionException {
+                        for (GdlVisibleObject content : this.contents) content.validate();
+                }
+        }
+        
+        
+        @Override
+        public void validate() throws ExecutionException {
+                for (Widget ctrl : this.subElements) {
+                        ((ListWidget)((ButtonableObject)ctrl).getMainObject()).validate();
                 }
         }
@@ -453 +341 @@
                 // has no effect on this element
         }
+        
+        
+        // Wraps a ul an ol element as a widget based on a SimplePanel
+        protected class ListWidget extends Composite implements HasMouseDownHandlers, HasMouseUpHandlers, HasFocusHandlers, HasBlurHandlers, HasMouseOutHandlers, HasMouseOverHandlers{
+                private AbsolutePanel basePanel = new AbsolutePanel();
+                private Element listElement = null;
+                // note: index is not the actual index of the item in the array list,
+                // it is the user's passed index when inserting this element
+                private ArrayList<Pair<ListItem, Integer>> itemsAndIndexes = new ArrayList<Pair<ListItem, Integer>>();
+                
+                public ListWidget(){
+                        initWidget(this.basePanel);
+                        DOM.setStyleAttribute(this.basePanel.getElement(), "overflow", "visible");
+                        this.listElement = DOM.createElement("ul");
+                        this.basePanel.getElement().insertFirst(this.listElement);
+                }
+                
+                
+                public ListWidget(boolean ordered){
+                        initWidget(this.basePanel);
+                        DOM.setStyleAttribute(this.basePanel.getElement(), "overflow", "visible");
+                        if(ordered) this.listElement = DOM.createElement("ol");
+                        else this.listElement = DOM.createElement("ul");
+                        this.basePanel.getElement().insertFirst(this.listElement);
+                }
+                
+                
+                // inserts the passed list item as the last child to this list element
+                public void appendListItem(ListItem item){
+                        if(item == null) return;
+                        item.appendToList(this.listElement);
+                }
+                
+                
+                // inserts the passed instance item to this list directly after the intance previous
+                public void appendListItem(ListItem item, ListItem previous){
+                        if(item == null) return;
+                        item.appendToList(this.listElement, previous);
+                }
+                
+                
+                // inserts the passed widget directly before the first item that
+                // has a greater position index
+                public void insertWidget(GdlVisibleObject widget, int position){
+                        ListItem previosItem = this.getItemBeforeIndex(position);
+                        ListItem item = new ListItem(this.listElement);
+                        item.appendContentToListItem(widget);
+                        this.appendListItem(item, previosItem);
+                }
+                
+                
+                // returns the first item that has a smaller position index 
+                public ListItem getItemBeforeIndex(int idx){
+                        Pair<ListItem, Integer> result = null;
+                        for (Pair<ListItem, Integer> item : this.itemsAndIndexes) {
+                                if(item.getSecond() < idx && (result == null || result.getSecond() < item.getSecond()))result = item;
+                        }
+                
+                        if(result != null) result.getFirst();
+                        return null;
+                }
+                
+                
+                // returns the acutal DOM element
+                public Element getListElement(){
+                        return this.listElement;
+                }
+                
+                // returns all ListItems
+                public ArrayList<ListItem> getItems(){
+                        ArrayList<ListItem> items = new ArrayList<GdlList.ListItem>();
+                        for (Pair<ListItem, Integer> pair : this.itemsAndIndexes) {
+                                items.add(pair.getFirst());
+                        }
+                        return items;
+                }
+                
+                
+                // returns the position index of the item, that was specified when
+                // inserting the passed ListItem
+                public int indexOfItem(ListItem item){
+                        for (Pair<ListItem, Integer> pair : this.itemsAndIndexes) {
+                                if(pair.getFirst().equals(item)) return pair.getSecond();
+                        }
+                        
+                        return -1;
+                }
+                
+                
+                public void validate() throws ExecutionException {
+                        for (Pair<ListItem, Integer> item: this.itemsAndIndexes) {
+                                item.getFirst().validate();
+                        }
+                }
+                
+                
+                public void setId(String id){
+                        DOM.setElementAttribute(this.basePanel.getElement(), "id", id);
+                }
+
+
+                @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());
+                }
+
+
+                @Override
+                public HandlerRegistration addMouseUpHandler(MouseUpHandler handler) {
+                        return this.addDomHandler(handler, MouseUpEvent.getType());
+                }
+
+
+                @Override
+                public HandlerRegistration addMouseDownHandler(MouseDownHandler handler) {
+                        return this.addDomHandler(handler, MouseDownEvent.getType());
+                }
+        }
 }

branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java ¶

@@ -245 +245 @@
         
         
+        @Override
+        public void validate() throws ExecutionException {
+                for (Widget ctrl : this.subElements) {
+                        ((UnitWidget)((ButtonableObject)ctrl).getMainObject()).validate();
+                }
+        }
+        
+        
         protected class UnitWidget extends Composite implements HasFocusHandlers, HasBlurHandlers, HasMouseOutHandlers, HasMouseOverHandlers, HasMouseDownHandlers, HasMouseUpHandlers{
                 private CaptionPanel basePanel = new CaptionPanel();
@@ -371 +379 @@
                         }
                 }
+        
+                
+                public void validate() throws ExecutionException{
+                        for (Widget ctrl : this.subElements) {
+                                if(ctrl instanceof GdlVisibleObject){
+                                        ((GdlVisibleObject)ctrl).validate();
+                                }
+                        }
+                }
         }
 }

branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java ¶

@@ -109 +109 @@
                 return new ArrayList<String>();
         }
+        
+        
+        @Override
+        public void validate() throws ExecutionException {
+                // this element has no editable content and is always valid
+                return;
+        }
 }

branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java ¶

@@ -59 +59 @@
         
         
+        @Override
+        public void validate() throws ExecutionException {
+                // this element has no editable content and is always valid
+                return;
+        }
+        
+        
         private ReferenceWidget createReference() throws InvalidGdlSchemaException, ExecutionException {
                 ReferenceWidget reference = new ReferenceWidget();

branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java ¶

@@ -450 +450 @@
         
         
+        @Override
+        public void validate() throws ExecutionException {
+                // this element has no editable content and is always valid
+                return;
+        }
+        
+        
         // this class represents the acutal content of this widget, i.e.
         // it wraps a h1, h2, h3 or h4 element

branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java ¶

@@ -224 +224 @@
                 return result;
         }
+
+        
+        @Override
+        public void validate() throws ExecutionException {
+                for (Widget ctrl : this.subElements)
+                        if(ctrl instanceof AssociationItem) ((AssociationItem)ctrl).validate();
+        }
         
 

branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultTopicView.java ¶

@@ -16 +16 @@
         // TODO: implement
         
+        
 }

branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java ¶

@@ -126 +126 @@
                 }
         }
+        
+        
+        @Override
+        public void validate() throws ExecutionException {
+                for (Widget ctrl : this.subElements) {
+                        if(ctrl instanceof GdlVisibleObject){
+                                ((GdlVisibleObject)ctrl).validate();
+                        }
+                }
+        }
 }