Changeset 936

Timestamp:

09/20/11 10:29:48 (14 years ago)

Author:

lgiessmann

Message:

gdl-frontend: Widgets: changed the static method for registering button-click-handlers on the GdlPanel? to a non-static method

Location:

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

Files:

• base/GdlPanel.java (modified) (3 diffs)
• base/TestClass.java (modified) (2 diffs)
• button/GdlActionButton.java (modified) (2 diffs)
• isidorus/GdlWebPage.java (modified) (3 diffs)

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

@@ -56 +56 @@
         // contains all callbacks that are used as click handlers and the corresponding
         // html element id of the button element
-        private static ArrayList<Pair<String, ArrayList<ClickHandler>>> buttonCallbacks = new ArrayList<Pair<String,ArrayList<ClickHandler>>>();
+        private ArrayList<Pair<String, ArrayList<ClickHandler>>> buttonCallbacks = new ArrayList<Pair<String,ArrayList<ClickHandler>>>();
 
         
@@ -87 +87 @@
 
         
-        public static ArrayList<ClickHandler> getClickHandlers(String id){
-                for (Pair<String, ArrayList<ClickHandler>> item : GdlPanel.buttonCallbacks)
+        public ArrayList<ClickHandler> getClickHandlers(String id){
+                for (Pair<String, ArrayList<ClickHandler>> item : this.buttonCallbacks)
                         if(item.getFirst().equals(id)) return item.getSecond();
                         
@@ -95 +95 @@
         
         
-        public static void addClickHandler(String id, ClickHandler handler) throws ExecutionException {
+        public void addClickHandler(String id, ClickHandler handler) throws ExecutionException {
                 if(id == null && handler == null) return;
                 if(id == null || handler == null) throw new ExecutionException("id and handler must be set, but are: " + id + ", " + handler);
                 
-                ArrayList<ClickHandler> item = GdlPanel.getClickHandlers(id);
+                ArrayList<ClickHandler> item = this.getClickHandlers(id);
                 if(item.size() == 0){
                         ArrayList<ClickHandler> handlers = new ArrayList<ClickHandler>();
                         handlers.add(handler);
-                        GdlPanel.buttonCallbacks.add(new Pair<String, ArrayList<ClickHandler>>(id, handlers));
+                        this.buttonCallbacks.add(new Pair<String, ArrayList<ClickHandler>>(id, handlers));
                 } else{
                         item.add(handler);

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

@@ -43 +43 @@
                         //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-hash-2", TopicIdentifierTypes.SubjectIdentifier);
                         //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/hash-object/Test Environment 1/test1", TopicIdentifierTypes.SubjectIdentifier);
-                        GdlPanel.addClickHandler("hash_object_reset_button_id", new ClickHandler() {
+                        gdlPanel = new GdlPanel(null, requestedTopicsToCreate);
+                         
+                        gdlPanel.addClickHandler("hash_object_reset_button_id", new ClickHandler() {
                                 @Override
                                 public void onClick(ClickEvent event) {
@@ -53 +55 @@
                         });
                         
-                        gdlPanel = new GdlPanel(null, requestedTopicsToCreate);
                         mainPanel.add(gdlPanel);
                         gdlPanel.setTmEngine(new JtmsTmEngine());

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

@@ -8 +8 @@
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence;
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic;
-import us.isidor.gdl.anaToMia.Widgets.base.GdlPanel;
 import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject;
 import us.isidor.gdl.anaToMia.Widgets.base.PSIs;
@@ -54 +53 @@
         
         protected void setClickHandlers() throws InvalidGdlSchemaException{
-                ArrayList<ClickHandler> handlers = GdlPanel.getClickHandlers(this.getId());             
+                ArrayList<ClickHandler> handlers = this.getRoot().getClickHandlers(this.getId());               
                 if(handlers == null || this.subElements.size() == 0) return;
                 

branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java ¶

@@ -53 +53 @@
                 DOM.setStyleAttribute(this.createNewButton.getElement(), "marginBottom", "1em");
                 try{
-                        GdlPanel.addClickHandler("hash_object_reset_button_id", new ResetClickHandler());
                         this.psiContainer = new PsiContainer(new PsiClickHandler());
                         this.createNewButton.addClickHandler(new CreateNewClickHandler());
@@ -143 +142 @@
                                 topicsToCreate.add(new Pair<String, TopicIdentifierTypes>(GdlWebPage.this.topicTypePsi, TopicIdentifierTypes.SubjectIdentifier));
                                 GdlWebPage.this.gdlPanel = new GdlPanel(null, topicsToCreate, 362, 160);
+                                GdlWebPage.this.gdlPanel.addClickHandler("hash_object_reset_button_id", new ResetClickHandler());
                                 GdlWebPage.this.mainPanel.add(gdlPanel);
                                 gdlPanel.setTmEngine(new JtmsTmEngine());
@@ -168 +168 @@
                                         if(GdlWebPage.this.gdlPanel != null) GdlWebPage.this.gdlPanel.removeFromParent();
                                         GdlWebPage.this.gdlPanel = new GdlPanel(new Pair<String, TopicIdentifierTypes>(source.getText(), TopicIdentifierTypes.SubjectIdentifier), null, 362, 160);
+                                        GdlWebPage.this.gdlPanel.addClickHandler("hash_object_reset_button_id", new ResetClickHandler());
                                         GdlWebPage.this.mainPanel.add(gdlPanel);
                                         gdlPanel.setTmEngine(new JtmsTmEngine());