aboutsummaryrefslogtreecommitdiff
path: root/libjava/java
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/java')
-rw-r--r--libjava/java/applet/Applet.java40
-rw-r--r--libjava/java/awt/Component.java6
-rw-r--r--libjava/java/awt/Graphics.java2
-rw-r--r--libjava/java/awt/Menu.java7
-rw-r--r--libjava/java/awt/MenuItem.java5
-rw-r--r--libjava/java/awt/PopupMenu.java4
-rw-r--r--libjava/java/awt/peer/MenuPeer.java1
-rw-r--r--libjava/java/text/AttributedString.java29
-rw-r--r--libjava/java/text/AttributedStringIterator.java94
9 files changed, 100 insertions, 88 deletions
diff --git a/libjava/java/applet/Applet.java b/libjava/java/applet/Applet.java
index 5990c63..27c8aaf 100644
--- a/libjava/java/applet/Applet.java
+++ b/libjava/java/applet/Applet.java
@@ -78,6 +78,11 @@ public class Applet extends Panel
private transient AppletStub stub;
/**
+ * The dimensions passed to this applet through its HTML tag.
+ */
+ private transient Dimension dimensions;
+
+ /**
* The accessibility context for this applet.
*
* @serial the accessibleContext for this
@@ -457,6 +462,41 @@ public class Applet extends Panel
s.defaultReadObject();
}
+ private Dimension getDimensions ()
+ {
+ if (dimensions == null)
+ {
+ int width = Integer.parseInt(stub.getParameter("width"));
+ int height = Integer.parseInt(stub.getParameter("height"));
+
+ dimensions = new Dimension(width, height);
+ }
+
+ return dimensions;
+ }
+
+ /**
+ * Returns an instance of {@link Dimension} representing the
+ * applet's width and height parameters.
+ *
+ * @return the applet's preferred size
+ */
+ public Dimension preferredSize()
+ {
+ return getDimensions ();
+ }
+
+ /**
+ * Returns an instance of {@link Dimension} representing the
+ * applet's width and height parameters.
+ *
+ * @return the applet's minimum size
+ */
+ public Dimension minimumSize()
+ {
+ return getDimensions ();
+ }
+
/**
* This class provides accessibility support for Applets, and is the
* runtime type returned by {@link #getAccessibleContext()}.
diff --git a/libjava/java/awt/Component.java b/libjava/java/awt/Component.java
index 8c75ba0..bfd4e08 100644
--- a/libjava/java/awt/Component.java
+++ b/libjava/java/awt/Component.java
@@ -3816,6 +3816,12 @@ public abstract class Component
if (popups == null)
popups = new Vector();
popups.add(popup);
+
+ if (popup.parent != null)
+ popup.parent.remove(popup);
+ popup.parent = this;
+ if (peer != null)
+ popup.addNotify();
}
/**
diff --git a/libjava/java/awt/Graphics.java b/libjava/java/awt/Graphics.java
index c225b52..0d551b2 100644
--- a/libjava/java/awt/Graphics.java
+++ b/libjava/java/awt/Graphics.java
@@ -417,7 +417,7 @@ draw3DRect(int x, int y, int width, int height, boolean raised)
drawLine(x1, y2, x1, y1);
setColor(br);
drawLine(x2, y1, x2, y2);
- drawLine(x2, y1, x1, y2);
+ drawLine(x2, y2, x1, y2);
setColor(color);
}
diff --git a/libjava/java/awt/Menu.java b/libjava/java/awt/Menu.java
index 74478fb..c6c4f21 100644
--- a/libjava/java/awt/Menu.java
+++ b/libjava/java/awt/Menu.java
@@ -82,7 +82,7 @@ private boolean isHelpMenu;
// From the serialization spec. FIXME: what should it be?
private int menuSerializedDataVersion;
-static final MenuItem separator = new MenuItem("-");
+static final String separatorLabel = "-";
/*************************************************************************/
@@ -295,8 +295,7 @@ insert(String label, int index)
public void
addSeparator()
{
- if (peer != null)
- ((MenuPeer) peer).addSeparator();
+ add(new MenuItem(separatorLabel));
}
/*************************************************************************/
@@ -314,7 +313,7 @@ addSeparator()
public void
insertSeparator(int index)
{
- insert(separator, index);
+ insert(new MenuItem(separatorLabel), index);
}
/*************************************************************************/
diff --git a/libjava/java/awt/MenuItem.java b/libjava/java/awt/MenuItem.java
index cfdfafc..4defc38 100644
--- a/libjava/java/awt/MenuItem.java
+++ b/libjava/java/awt/MenuItem.java
@@ -310,7 +310,10 @@ deleteShortcut()
public String
getActionCommand()
{
- return(actionCommand);
+ if (actionCommand == null)
+ return label;
+ else
+ return actionCommand;
}
/*************************************************************************/
diff --git a/libjava/java/awt/PopupMenu.java b/libjava/java/awt/PopupMenu.java
index cde79e3..83ffb35 100644
--- a/libjava/java/awt/PopupMenu.java
+++ b/libjava/java/awt/PopupMenu.java
@@ -105,7 +105,7 @@ PopupMenu(String label)
public void
addNotify()
{
- if (peer != null)
+ if (peer == null)
peer = getToolkit ().createPopupMenu (this);
super.addNotify ();
}
@@ -123,6 +123,8 @@ addNotify()
public void
show(Component component, int x, int y)
{
+ if (getPeer() == null)
+ this.addNotify();
PopupMenuPeer pmp = (PopupMenuPeer)getPeer();
if (pmp != null)
{
diff --git a/libjava/java/awt/peer/MenuPeer.java b/libjava/java/awt/peer/MenuPeer.java
index 67f213f..0b15914 100644
--- a/libjava/java/awt/peer/MenuPeer.java
+++ b/libjava/java/awt/peer/MenuPeer.java
@@ -43,7 +43,6 @@ import java.awt.MenuItem;
public interface MenuPeer extends MenuItemPeer
{
void addItem (MenuItem item);
- void addSeparator ();
void delItem (int index);
}
diff --git a/libjava/java/text/AttributedString.java b/libjava/java/text/AttributedString.java
index a8eede8..46cbf92 100644
--- a/libjava/java/text/AttributedString.java
+++ b/libjava/java/text/AttributedString.java
@@ -38,6 +38,7 @@ exception statement from your version. */
package java.text;
+import java.util.Arrays;
import java.util.Iterator;
import java.util.HashMap;
import java.util.Hashtable;
@@ -219,26 +220,7 @@ AttributedString(AttributedCharacterIterator aci, int begin_index,
// Get the valid attribute list
Set all_attribs = aci.getAllAttributeKeys();
if (attributes != null)
- {
- Set valid_attribs = new HashSet();
- Iterator iter = all_attribs.iterator();
- while (iter.hasNext())
- {
- Object obj = iter.next();
-
- int i;
- for (i = 0; i < attributes.length; i++)
- if (obj.equals(attributes[0]))
- break;
-
- if (i == attributes.length)
- continue;
-
- valid_attribs.add(obj);
- }
-
- all_attribs = valid_attribs;
- }
+ all_attribs.retainAll(Arrays.asList(attributes));
// Loop through and extract the attributes
char c = aci.setIndex(begin_index);
@@ -320,7 +302,7 @@ AttributedString(AttributedCharacterIterator aci, int begin_index,
public void
addAttribute(AttributedCharacterIterator.Attribute attrib, Object value)
{
- addAttribute(attrib, value, 0, sci.getEndIndex() - 1);
+ addAttribute(attrib, value, 0, sci.getEndIndex());
}
/*************************************************************************/
@@ -389,8 +371,7 @@ addAttributes(Map attributes, int begin_index, int end_index)
public AttributedCharacterIterator
getIterator()
{
- return(new AttributedStringIterator(sci, attribs, 0, sci.getEndIndex() - 1,
- null));
+ return(new AttributedStringIterator(sci, attribs, 0, sci.getEndIndex(), null));
}
/*************************************************************************/
@@ -409,7 +390,7 @@ getIterator()
public AttributedCharacterIterator
getIterator(AttributedCharacterIterator.Attribute[] attributes)
{
- return(getIterator(attributes, 0, sci.getEndIndex() - 1));
+ return(getIterator(attributes, 0, sci.getEndIndex()));
}
/*************************************************************************/
diff --git a/libjava/java/text/AttributedStringIterator.java b/libjava/java/text/AttributedStringIterator.java
index 77c5981..9820457 100644
--- a/libjava/java/text/AttributedStringIterator.java
+++ b/libjava/java/text/AttributedStringIterator.java
@@ -221,39 +221,28 @@ getRunLimit(AttributedCharacterIterator.Attribute attrib)
public synchronized int
getRunLimit(Set attribute_set)
{
- int orig_index = ci.getIndex();
- int run_limit;
+ boolean hit = false;
+ int runLimit = ci.getEndIndex ();
+ int pos = ci.getIndex ();
- do
+ for (int i = 0; i < attribs.length; ++i)
{
- run_limit = ci.getIndex();
-
- Map attribute_map = getAttributes();
-
- boolean found = false;
- Iterator iter = attribute_set.iterator();
- while(iter.hasNext())
- if (!attribute_map.containsKey(iter.next()))
- {
- found = true;
- break;
- }
-
- if (found)
- break;
+ if (pos >= attribs[i].begin_index &&
+ pos <= attribs[i].end_index)
+ {
+ Iterator iter = attribute_set.iterator();
+ while(iter.hasNext())
+ if (attribs[i].attribs.containsKey(iter.next()))
+ {
+ hit = true;
+ runLimit = Math.min(runLimit, attribs[i].end_index);
+ }
+ }
}
- while (ci.next() != CharacterIterator.DONE);
-
- boolean hit_end = (ci.previous() == CharacterIterator.DONE);
-
- ci.setIndex(orig_index);
-
- if (run_limit == orig_index)
- return(-1); // No characters match the given attributes
-// else if (!hit_end)
-// --run_limit;
-
- return(run_limit);
+ if (hit)
+ return runLimit;
+ else
+ return -1;
}
/*************************************************************************/
@@ -281,35 +270,28 @@ getRunStart(AttributedCharacterIterator.Attribute attrib)
public int
getRunStart(Set attribute_set)
{
- int orig_index = ci.getIndex();
- int run_start;
+ boolean hit = false;
+ int runBegin = 0;
+ int pos = ci.getIndex ();
- do
+ for (int i = 0; i < attribs.length; ++i)
{
- run_start = ci.getIndex();
-
- Map attribute_map = getAttributes();
-
- Iterator iter = attribute_set.iterator();
- while(iter.hasNext())
- if (!attribute_map.containsKey(iter.next()))
- break;
-
- if (iter.hasNext())
- break;
+ if (pos >= attribs[i].begin_index &&
+ pos <= attribs[i].end_index)
+ {
+ Iterator iter = attribute_set.iterator();
+ while(iter.hasNext())
+ if (attribs[i].attribs.containsKey(iter.next()))
+ {
+ hit = true;
+ runBegin = Math.max(runBegin, attribs[i].begin_index);
+ }
+ }
}
- while (ci.previous() != CharacterIterator.DONE);
-
- boolean hit_beginning = (ci.previous() == CharacterIterator.DONE);
-
- ci.setIndex(orig_index);
-
- if (run_start == orig_index)
- return(-1); // No characters match the given attributes
- else if (!hit_beginning)
- ++run_start;
-
- return(run_start);
+ if (hit)
+ return runBegin;
+ else
+ return -1;
}
/*************************************************************************/
generated by cgit v1.1 at 2025-04-04 13:35:32 +0000