[Bojangles-cvs] cvs: bojangles /widget_definitions form.xml /widgets HighlightBorder.java PictureButton.java Widget.java /xml XmlListener.java

[kai5263499 <boj...@li...>]

kai5263499		Tue Aug 20 15:37:16 2002 EDT

  Added files:                 
    /bojangles/widgets	PictureButton.java 

  Modified files:              
    /bojangles/widget_definitions	form.xml 
    /bojangles/widgets	HighlightBorder.java Widget.java 
    /bojangles/xml	XmlListener.java 
  Log:
  Getting bold with a general commit to put in misc changes made... I'm including a copy of prefs.xml for refrence. I might remove it later as bojangles will later dynamically make a prefs.xml file if it dosent exist already. The other files contain minor changes.
  Oh, and I started on a picturebutton.
  
  
  
Index: bojangles/widget_definitions/form.xml
diff -u bojangles/widget_definitions/form.xml:1.2 bojangles/widget_definitions/form.xml:1.3
--- bojangles/widget_definitions/form.xml:1.2	Wed Aug 14 08:22:39 2002
+++ bojangles/widget_definitions/form.xml	Tue Aug 20 15:37:15 2002
@@ -13,7 +13,6 @@
   </initial_settings>
   <resizable>true</resizable>
   <moveable>true</moveable>
-  <max_per_document></max_per_document>
   <properties>
     <title>
       <represent_as>text</represent_as>
Index: bojangles/widgets/HighlightBorder.java
diff -u bojangles/widgets/HighlightBorder.java:1.1.1.1 bojangles/widgets/HighlightBorder.java:1.2
--- bojangles/widgets/HighlightBorder.java:1.1.1.1	Sat Aug  3 08:42:37 2002
+++ bojangles/widgets/HighlightBorder.java	Tue Aug 20 15:37:15 2002
@@ -30,9 +30,9 @@
     // bottom right
     g.fillRect(w-borderDepth,h-borderDepth,borderDepth, borderDepth);
     // bottom left
-    //g.fillRect(0,h-borderDepth,borderDepth, borderDepth);
+    g.fillRect(0,h-borderDepth,borderDepth, borderDepth);
     // top right
-    //g.fillRect(w-borderDepth,0,borderDepth, borderDepth);
+    g.fillRect(w-borderDepth,0,borderDepth, borderDepth);
   }
 
   public Insets getBorderInsets(Component c) {
Index: bojangles/widgets/Widget.java
diff -u bojangles/widgets/Widget.java:1.2 bojangles/widgets/Widget.java:1.3
--- bojangles/widgets/Widget.java:1.2	Sat Aug  3 15:26:08 2002
+++ bojangles/widgets/Widget.java	Tue Aug 20 15:37:15 2002
@@ -17,7 +17,7 @@
  * @version 1.0
  */
 
-public class Widget extends JPanel implements MouseListener, FocusListener, MouseMotionListener, ComponentListener {
+public class Widget extends JPanel implements KeyListener, MouseListener, FocusListener, MouseMotionListener, ComponentListener {
     protected final int NONE = 0;
     protected final int TOPRIGHT = 1;
     protected final int TOPLEFT = 2;
@@ -49,10 +49,15 @@
     public void setPath(String path) {
         this.path = path;
     }
+    
     public String getPath() {
         return path;
     }
+    
     public void setBounds(int x, int y, int width, int height) {
+        if(height == 0 && width == 0) {
+         return;
+        }
         super.setBounds(x,y,width,height);
         this.width=width;
         this.height=height;
@@ -81,6 +86,7 @@
         }
         notifyElementFocusListeners();
     }
+    
     public void focusLost(FocusEvent e) {
         if (resizable) {
             borderDepth=0;
@@ -90,6 +96,7 @@
                 setBorder(previousBorder);
         }
     }
+    
     public void mousePressed(MouseEvent e) {
         if (!isFocusOwner())
             requestFocus();
@@ -109,7 +116,17 @@
             lastPoint = p;
         }
     }
-    public void mouseClicked(MouseEvent e) { }
+   
+    public void mouseClicked(MouseEvent e) {
+     //if(e.getClass() == e.BUTTON2_MASK) {
+     //
+     //}   
+    }
+
+    public void keyTyped(KeyEvent e) {
+     
+    }
+    
     public void mouseEntered(MouseEvent e) { }
     public void mouseExited(MouseEvent e) { }
     public void mouseReleased(MouseEvent e) {
@@ -203,4 +220,11 @@
     public boolean getMoveable() {
         return moveable;
     }
+    
+    public void keyPressed(KeyEvent e) { }
+    
+    public void keyReleased(KeyEvent e) {
+        System.out.println(e.getKeyText(e.getKeyCode()));
+    }
+        
 }
Index: bojangles/xml/XmlListener.java
diff -u bojangles/xml/XmlListener.java:1.1.1.1 bojangles/xml/XmlListener.java:1.2
--- bojangles/xml/XmlListener.java:1.1.1.1	Sat Aug  3 08:42:37 2002
+++ bojangles/xml/XmlListener.java	Tue Aug 20 15:37:15 2002
@@ -5,7 +5,7 @@
  * <p>Description: </p>
  * <p>Copyright: Copyright (c) 2002</p>
  * <p>Company: </p>
- * @author unascribed
+ * @author nhre
  * @version 1.0
  */
 

Index: bojangles/widgets/PictureButton.java
+++ bojangles/widgets/PictureButton.java
/*
 * TextButton.java
 *
 * Created on July 6, 2002, 2:52 PM
 */

package widgets;

import bojangles.*;
import bojangles.xml.*;
import java.awt.*;
import java.awt.event.*;
import java.lang.*;
import javax.swing.*;
import javax.swing.border.*;
import java.util.*;

/**
 *
 * @author  nathan
 */
public class PictureButton extends bojangles.widgets.Widget implements PropertiesTableListener {
    JButton button = new JButton();
    
    /** Creates a new instance of PictureButton */
    public PictureButton(String path, XmlHandler xmlHandler, ElementFocusListener fl, String label) {
        super(path, xmlHandler, fl);
        setLayout(new BorderLayout());
        this.label = new JLabel(label, SwingConstants.CENTER);
        add(this.label);
        button.setIcon(new ImageIcon("images/x.gif"));
        setBorder(BorderFactory.createBevelBorder(BevelBorder.RAISED, Color.white, Color.black));
    }
    
    public void tableModified(String currentElementPath, String propertyName) {
        if (!currentElementPath.equals(path))
            return;
        if (propertyName.equals("x") || propertyName.equals("y") || propertyName.equals("width") || propertyName.equals("height")) {
            Hashtable h = xmlHandler.getProperties(path);
            Integer x = new Integer((String)h.get("x"));
            Integer y = new Integer((String)h.get("y"));
            Integer width = new Integer((String)h.get("width"));
            Integer height = new Integer((String)h.get("height"));
            setBounds(x.intValue(), y.intValue(), width.intValue(), height.intValue());
        } else if (propertyName.equals("text")) {
            Hashtable h = xmlHandler.getProperties(path);
            label.setText((String)h.get("text"));
        }
    }
    
    public void componentHidden(java.awt.event.ComponentEvent componentEvent) {
    }
    
    public void componentMoved(java.awt.event.ComponentEvent componentEvent) {
    }
    
    public void componentResized(java.awt.event.ComponentEvent componentEvent) {
    }
    
    public void componentShown(java.awt.event.ComponentEvent componentEvent) {
    }
    
    public void focusGained(java.awt.event.FocusEvent focusEvent) {
    }
    
    public void focusLost(java.awt.event.FocusEvent focusEvent) {
    }
    
    public void keyPressed(java.awt.event.KeyEvent keyEvent) {
    }
    
    public void keyReleased(java.awt.event.KeyEvent keyEvent) {
    }
    
    public void keyTyped(java.awt.event.KeyEvent keyEvent) {
    }
    
    public void mouseClicked(java.awt.event.MouseEvent mouseEvent) {
    }
    
    public void mouseDragged(java.awt.event.MouseEvent mouseEvent) {
    }
    
    public void mouseEntered(java.awt.event.MouseEvent mouseEvent) {
    }
    
    public void mouseExited(java.awt.event.MouseEvent mouseEvent) {
    }
    
    public void mouseMoved(java.awt.event.MouseEvent mouseEvent) {
    }
    
    public void mousePressed(java.awt.event.MouseEvent mouseEvent) {
    }
    
    public void mouseReleased(java.awt.event.MouseEvent mouseEvent) {
    }
    
}