procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MemoryImageSource.java, [...]: New versions from classpath.

Browse source 
2003-07-14  Michael Koch  <konqueror@gmx.de>

	* java/awt/image/MemoryImageSource.java,
	java/beans/PropertyEditorManager.java,
	javax/naming/CompoundName.java,
	javax/naming/spi/NamingManager.java,
	javax/swing/AbstractButton.java,
	javax/swing/ButtonModel.java,
	javax/swing/SwingUtilities.java,
	javax/swing/UIManager.java,
	javax/swing/colorchooser/DefaultColorSelectionModel.java,
	javax/swing/event/AncestorEvent.java,
	javax/swing/event/InternalFrameEvent.java,
	java/util/zip/ZipFile.java:
	New versions from classpath.

From-SVN: r69321
This commit is contained in:
Michael Koch 2003-07-14 05:33:30 +00:00 • committed by Michael Koch
parent 6e98504002
commit 6a71677713
13 changed files with 1095 additions and 1077 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libjava/ChangeLog
View file

@ -1,3 +1,19 @@
2003-07-14 Michael Koch <konqueror@gmx.de>
* java/awt/image/MemoryImageSource.java,
java/beans/PropertyEditorManager.java,
javax/naming/CompoundName.java,
javax/naming/spi/NamingManager.java,
javax/swing/AbstractButton.java,
javax/swing/ButtonModel.java,
javax/swing/SwingUtilities.java,
javax/swing/UIManager.java,
javax/swing/colorchooser/DefaultColorSelectionModel.java,
javax/swing/event/AncestorEvent.java,
javax/swing/event/InternalFrameEvent.java,
java/util/zip/ZipFile.java:
New versions from classpath.
2003-07-13 Michael Koch <konqueror@gmx.de>
* gnu/java/nio/FileChannelImpl.java,

5
libjava/java/awt/image/MemoryImageSource.java
View file

@ -74,7 +74,7 @@ public class MemoryImageSource implements ImageProducer
this.props = props;
int max = (( scansize > width ) ? scansize : width );
pixelb = new byte[ max * height ];
System.arraycopy( pix, 0, pixelb, 0, max );
System.arraycopy( pix, 0, pixelb, 0, max * height );
}
/**
Constructs an ImageProducer from memory
@ -100,7 +100,7 @@ public class MemoryImageSource implements ImageProducer
this.props = props;
int max = (( scansize > width ) ? scansize : width );
pixeli = new int[ max * height ];
System.arraycopy( pix, 0, pixeli, 0, max );
System.arraycopy( pix, 0, pixeli, 0, max * height );
}
/**
Constructs an ImageProducer from memory using the default RGB ColorModel
@ -226,6 +226,7 @@ public class MemoryImageSource implements ImageProducer
if( props != null ) {
ic.setProperties( props );
}
ic.setDimensions(width, height);
if( pixeli != null ) {
ic.setPixels( 0, 0, width, height, cm, pixeli, offset, scansize );
} else {

14
libjava/java/beans/PropertyEditorManager.java
View file

@ -140,9 +140,13 @@ public class PropertyEditorManager
return (PropertyEditor)found.newInstance();
}
ClassLoader contextClassLoader
= Thread.currentThread().getContextClassLoader();
try
{
found = Class.forName(editedClass.getName()+"Editor");
found = Class.forName(editedClass.getName()+"Editor", true,
contextClassLoader);
registerEditor(editedClass,found);
return (PropertyEditor)found.newInstance();
}
@ -150,14 +154,18 @@ public class PropertyEditorManager
{
}
String appendName = "." + ClassHelper.getTruncatedClassName(editedClass) + "Editor";
String appendName
= "."
+ ClassHelper.getTruncatedClassName(editedClass)
+ "Editor";
synchronized(editorSearchPath)
{
for(int i=0;i<editorSearchPath.length;i++)
{
try
{
found = Class.forName(editorSearchPath[i] + appendName);
found = Class.forName(editorSearchPath[i] + appendName,
true, contextClassLoader);
registerEditor(editedClass,found);
return (PropertyEditor)found.newInstance();
}

2
libjava/java/util/zip/ZipFile.java
View file

@ -308,7 +308,7 @@ public class ZipFile implements ZipConstants
*/
protected void finalize() throws IOException
{
if (!closed) close();
if (!closed && raf != null) close();
}
/**

8
libjava/javax/naming/CompoundName.java
View file

@ -142,13 +142,17 @@ public class CompoundName implements Name, Cloneable, Serializable
// Otherwise, fall through.
}
// Quotes are only special at the start of a component.
else if (new_element.length () == 0 && special == beginQuote)
else if (new_element.length () == 0
&& special == beginQuote
&& beginQuote != null)
{
quote = endQuote;
i += special.length ();
continue;
}
else if (new_element.length () == 0 && special == beginQuote2)
else if (new_element.length () == 0
&& special == beginQuote2
&& beginQuote2 != null)
{
quote = endQuote2;
i += special.length ();

10
libjava/javax/naming/spi/NamingManager.java
View file

@ -83,13 +83,17 @@ public class NamingManager
try
{
icf = (InitialContextFactory) Class.forName (java_naming_factory_initial).newInstance ();
icf = (InitialContextFactory)Class.forName
(java_naming_factory_initial, true,
Thread.currentThread().getContextClassLoader())
.newInstance ();
}
catch (Exception exception)
{
NoInitialContextException e
= new NoInitialContextException ("Can't load InitialContextFactory class: "
+ java_naming_factory_initial);
= new NoInitialContextException
("Can't load InitialContextFactory class: "
+ java_naming_factory_initial);
e.setRootCause(exception);
throw e;
}

1463
libjava/javax/swing/AbstractButton.java
View file

File diff suppressed because it is too large Load diff

8
libjava/javax/swing/ButtonModel.java
View file

@ -76,12 +76,4 @@ public interface ButtonModel extends ItemSelectable
void setSelected(boolean b);
boolean isSelected();
// there are not in the spec !!
void fireItemStateChanged(ItemEvent event);
void fireStateChanged(ChangeEvent event);
void fireActionPerformed(ActionEvent event);
}

97
libjava/javax/swing/SwingUtilities.java
View file

@ -58,70 +58,71 @@ import javax.accessibility.AccessibleStateSet;
public class SwingUtilities implements SwingConstants
{
public static FontMetrics getFontMetrics (Font font)
{
return Toolkit.getDefaultToolkit().getFontMetrics(font);
}
{
return Toolkit.getDefaultToolkit ().getFontMetrics (font);
}
public static JRootPane getRootPane (Component a)
{
if (a instanceof JRootPane)
return (JRootPane) a;
{
if (a instanceof JRootPane)
return (JRootPane) a;
a = a.getParent();
a = a.getParent();
if (a != null)
{
return getRootPane(a);
}
return null;
}
if (a != null)
{
return getRootPane(a);
}
return null;
}
public static void updateComponentTreeUI(JFrame comp)
{
}
{
}
public static String layoutCompoundLabel(JComponent c,
FontMetrics fm,
String text,
Icon i,
int vert_a,
int hor_i,
int vert_text_pos,
int hor_text_pos,
Rectangle vr,
Rectangle ir,
Rectangle tr,
int gap)
{
// view rect 'vr' already ok,
// we need to compute ir (icon rect) and tr (text-rect)
FontMetrics fm,
String text,
Icon i,
int vert_a,
int hor_i,
int vert_text_pos,
int hor_text_pos,
Rectangle vr,
Rectangle ir,
Rectangle tr,
int gap)
{
// view rect 'vr' already ok,
// we need to compute ir (icon rect) and tr (text-rect)
int next_x = 0;//vr.x;
int next_y = 0;//vr.y;
int next_x = 0;//vr.x;
int next_y = 0;//vr.y;
ir.height = ir.width = ir.y = ir.x = 0;
ir.height = ir.width = ir.y = ir.x = 0;
if (i != null)
{
ir.x = vr.x;
ir.y = vr.y;
ir.width = i.getIconWidth();
ir.height = i.getIconWidth();
if (i != null)
{
ir.x = vr.x;
ir.y = vr.y;
ir.width = i.getIconWidth();
ir.height = i.getIconWidth();
next_x += gap + i.getIconWidth();
next_y += gap + i.getIconHeight();
}
next_x += gap + i.getIconWidth();
next_y += gap + i.getIconHeight();
}
tr.x = next_x;
tr.y = vr.y + (vr.height/2);
tr.x = next_x;
tr.y = vr.y + (vr.height/2);
tr.width = fm.stringWidth(text);
tr.height = fm.getHeight() + fm.getAscent()/2;
tr.width = fm.stringWidth(text);
tr.height = fm.getHeight() + fm.getAscent()/2;
return text;
}
return text;
}
}

389
libjava/javax/swing/UIManager.java
View file

@ -50,131 +50,137 @@ import javax.swing.plaf.metal.MetalLookAndFeel;
public class UIManager implements Serializable
{
static final long serialVersionUID = -5547433830339189365L;
static class LookAndFeelInfo
{
String name, clazz;
public static class LookAndFeelInfo
{
String name, clazz;
LookAndFeelInfo(String name,
String clazz)
{
this.name = name;
this.clazz = clazz;
}
String getName() { return name; }
String getClassName() { return clazz; }
LookAndFeelInfo(String name,
String clazz)
{
this.name = name;
this.clazz = clazz;
}
static LookAndFeelInfo [] installed = {
new LookAndFeelInfo("Metal",
"javax.swing.plaf.metal.MetalLookAndFeel")
};
String getName() { return name; }
String getClassName() { return clazz; }
}
static LookAndFeel[] aux_installed;
static LookAndFeel look_and_feel = new MetalLookAndFeel();
private static final long serialVersionUID = -5547433830339189365L;
UIManager()
{
}
static LookAndFeelInfo [] installed = {
new LookAndFeelInfo ("Metal", "javax.swing.plaf.metal.MetalLookAndFeel")
};
public static void addPropertyChangeListener(PropertyChangeListener listener)
{
// Add a PropertyChangeListener to the listener list.
}
static LookAndFeel[] aux_installed;
static LookAndFeel look_and_feel = new MetalLookAndFeel();
public UIManager()
{
// Do nothing here.
}
public static void addAuxiliaryLookAndFeel(LookAndFeel l)
{
// Add a LookAndFeel to the list of auxiliary look and feels.
if (aux_installed == null)
{
aux_installed = new LookAndFeel[1];
aux_installed[0] = l;
return;
}
public static void addPropertyChangeListener (PropertyChangeListener listener)
{
// FIXME
}
public static void removePropertyChangeListener (PropertyChangeListener listener)
// Remove a PropertyChangeListener from the listener list.
{
// FIXME
}
/**
* @since 1.4
*/
public static PropertyChangeListener[] getPropertyChangeListeners ()
{
// FIXME
throw new Error ("Not implemented");
}
public static void addAuxiliaryLookAndFeel (LookAndFeel l)
{
// Add a LookAndFeel to the list of auxiliary look and feels.
if (aux_installed == null)
{
aux_installed = new LookAndFeel[1];
aux_installed[0] = l;
return;
}
LookAndFeel[] T = new LookAndFeel[ aux_installed.length+1 ];
System.arraycopy(aux_installed, 0,
T, 0,
aux_installed.length);
aux_installed = T;
aux_installed[aux_installed.length-1] = l;
}
LookAndFeel[] T = new LookAndFeel[ aux_installed.length+1 ];
System.arraycopy(aux_installed, 0, T, 0, aux_installed.length);
aux_installed = T;
aux_installed[aux_installed.length-1] = l;
}
public static boolean removeAuxiliaryLookAndFeel(LookAndFeel laf)
{
if (aux_installed == null)
return false;
public static boolean removeAuxiliaryLookAndFeel(LookAndFeel laf)
{
if (aux_installed == null)
return false;
for (int i=0;i<aux_installed.length;i++)
{
if (aux_installed[i] == laf)
{
aux_installed[ i ] = aux_installed[aux_installed.length-1];
LookAndFeel[] T = new LookAndFeel[ aux_installed.length-1 ];
System.arraycopy(aux_installed, 0,
T, 0,
aux_installed.length-1);
aux_installed = T;
return true;
}
}
return false;
}
for (int i=0;i<aux_installed.length;i++)
{
if (aux_installed[i] == laf)
{
aux_installed[ i ] = aux_installed[aux_installed.length-1];
LookAndFeel[] T = new LookAndFeel[ aux_installed.length-1 ];
System.arraycopy (aux_installed, 0, T, 0, aux_installed.length-1);
aux_installed = T;
return true;
}
}
return false;
}
public static LookAndFeel[] getAuxiliaryLookAndFeels()
{ return aux_installed; }
public static LookAndFeel[] getAuxiliaryLookAndFeels()
{ return aux_installed; }
public static Object get(Object key)
{ return getLookAndFeel().getDefaults().get(key); }
public static Object get(Object key)
{ return getLookAndFeel().getDefaults().get(key); }
/**
* Returns a border from the defaults table.
*/
public static Border getBorder(Object key)
{
return (Border) getLookAndFeel().getDefaults().get(key);
}
/**
* Returns a border from the defaults table.
*/
public static Border getBorder(Object key)
{
return (Border) getLookAndFeel().getDefaults().get(key);
}
/**
* Returns a drawing color from the defaults table.
*/
public static Color getColor(Object key)
{
return (Color) getLookAndFeel().getDefaults().get(key);
}
/**
* Returns a drawing color from the defaults table.
*/
public static Color getColor(Object key)
{
return (Color) getLookAndFeel().getDefaults().get(key);
}
/**
* this string can be passed to Class.forName()
*/
public static String getCrossPlatformLookAndFeelClassName()
{
return "javax.swing.plaf.metal.MetalLookAndFeel";
}
/**
* this string can be passed to Class.forName()
*/
public static String getCrossPlatformLookAndFeelClassName()
{
return "javax.swing.plaf.metal.MetalLookAndFeel";
}
/**
* Returns the default values for this look and feel.
*/
static UIDefaults getDefaults()
{
return getLookAndFeel().getDefaults();
}
/**
* Returns a dimension from the defaults table.
*/
static Dimension getDimension(Object key)
{
System.out.println("UIManager.getDim");
return new Dimension(200,100);
}
/**
* Returns the default values for this look and feel.
*/
static UIDefaults getDefaults()
{
return getLookAndFeel().getDefaults();
}
/**
* Returns a dimension from the defaults table.
*/
static Dimension getDimension(Object key)
{
System.out.println("UIManager.getDim");
return new Dimension(200,100);
}
/**
* Retrieves a font from the defaults table of the current
@ -189,34 +195,35 @@ public class UIManager implements Serializable
return (Font) getLookAndFeel().getDefaults().get(key);
}
static Icon getIcon(Object key)
// Returns an Icon from the defaults table.
{
return (Icon) getLookAndFeel().getDefaults().get(key);
}
static Insets getInsets(Object key)
// Returns an Insets object from the defaults table.
{
return (Insets) getLookAndFeel().getDefaults().getInsets(key);
}
static Icon getIcon(Object key)
// Returns an Icon from the defaults table.
{
return (Icon) getLookAndFeel().getDefaults().get(key);
}
static Insets getInsets(Object key)
// Returns an Insets object from the defaults table.
{
return (Insets) getLookAndFeel().getDefaults().getInsets(key);
}
static LookAndFeelInfo[] getInstalledLookAndFeels()
{
return installed;
}
static LookAndFeelInfo[] getInstalledLookAndFeels()
{
return installed;
}
static int getInt(Object key)
{
Integer x = (Integer) getLookAndFeel().getDefaults().get(key);
if (x == null)
return 0;
return x.intValue();
}
static LookAndFeel getLookAndFeel()
{
return look_and_feel;
}
static int getInt(Object key)
{
Integer x = (Integer) getLookAndFeel().getDefaults().get(key);
if (x == null)
return 0;
return x.intValue();
}
static LookAndFeel getLookAndFeel()
{
return look_and_feel;
}
/**
* Returns the <code>UIDefaults</code> table of the currently active
@ -227,73 +234,67 @@ public class UIManager implements Serializable
return getLookAndFeel().getDefaults();
}
static String getString(Object key)
// Returns a string from the defaults table.
{
return (String) getLookAndFeel().getDefaults().get(key);
}
static String getSystemLookAndFeelClassName()
// Returns the name of the LookAndFeel class that implements the native systems look and feel if there is one, otherwise the name of the default cross platform LookAndFeel class.
{
return getCrossPlatformLookAndFeelClassName();
}
static String getString(Object key)
// Returns a string from the defaults table.
{
return (String) getLookAndFeel().getDefaults().get(key);
}
static String getSystemLookAndFeelClassName()
// Returns the name of the LookAndFeel class that implements the native systems look and feel if there is one, otherwise the name of the default cross platform LookAndFeel class.
{
return getCrossPlatformLookAndFeelClassName();
}
public static ComponentUI getUI(JComponent target)
// Returns the L&F object that renders the target component.
{
ComponentUI ui = getDefaults().getUI(target);
//System.out.println("GET-UI-> " + ui + ", for " + target);
return ui;
}
public static void installLookAndFeel(String name, String className)
// Creates a new look and feel and adds it to the current array.
{
}
public static ComponentUI getUI(JComponent target)
// Returns the L&F object that renders the target component.
{
ComponentUI ui = getDefaults().getUI(target);
//System.out.println("GET-UI-> " + ui + ", for " + target);
return ui;
}
public static void installLookAndFeel(LookAndFeelInfo info)
// Adds the specified look and feel to the current array and then calls setInstalledLookAndFeels(javax.swing.UIManager.LookAndFeelInfo[]).
{
}
public static Object put(Object key, Object value)
// Stores an object in the defaults table.
{
return getLookAndFeel().getDefaults().put(key,value);
}
public static void installLookAndFeel(String name, String className)
// Creates a new look and feel and adds it to the current array.
{
}
public static void installLookAndFeel(LookAndFeelInfo info)
// Adds the specified look and feel to the current array and then calls setInstalledLookAndFeels(javax.swing.UIManager.LookAndFeelInfo[]).
{
}
public static Object put(Object key, Object value)
// Stores an object in the defaults table.
{
return getLookAndFeel().getDefaults().put(key,value);
}
public static void removePropertyChangeListener(PropertyChangeListener listener)
// Remove a PropertyChangeListener from the listener list.
{
}
public static void setInstalledLookAndFeels(UIManager.LookAndFeelInfo[] infos)
// Replaces the current array of installed LookAndFeelInfos.
{
}
public static void setLookAndFeel(LookAndFeel newLookAndFeel)
{
if (look_and_feel != null)
look_and_feel.uninitialize();
public static void setInstalledLookAndFeels(UIManager.LookAndFeelInfo[] infos)
// Replaces the current array of installed LookAndFeelInfos.
{
}
public static void setLookAndFeel(LookAndFeel newLookAndFeel)
{
if (look_and_feel != null)
look_and_feel.uninitialize();
// Set the current default look and feel using a LookAndFeel object.
look_and_feel = newLookAndFeel;
look_and_feel.initialize();
// Set the current default look and feel using a LookAndFeel object.
look_and_feel = newLookAndFeel;
look_and_feel.initialize();
// revalidate();
// repaint();
}
public static void setLookAndFeel(String className)
throws ClassNotFoundException,
InstantiationException,
IllegalAccessException,
UnsupportedLookAndFeelException
{
// Set the current default look and feel using a class name.
Class c = Class.forName(className);
LookAndFeel a = (LookAndFeel) c.newInstance(); // throws class-cast-exception
setLookAndFeel(a);
}
//revalidate();
//repaint();
}
public static void setLookAndFeel (String className)
throws ClassNotFoundException, InstantiationException, IllegalAccessException,
UnsupportedLookAndFeelException
{
// Set the current default look and feel using a class name.
Class c = Class.forName(className);
LookAndFeel a = (LookAndFeel) c.newInstance(); // throws class-cast-exception
setLookAndFeel(a);
}
}

152
libjava/javax/swing/colorchooser/DefaultColorSelectionModel.java
View file

@ -52,90 +52,90 @@ import javax.swing.event.EventListenerList;
public class DefaultColorSelectionModel
implements ColorSelectionModel, Serializable
{
static final long serialVersionUID = 580150227676302096L;
private static final long serialVersionUID = -8117143602864778804L;
//-------------------------------------------------------------
// Variables --------------------------------------------------
//-------------------------------------------------------------
private Color selectedColor;
/**
* changeEvent
*/
protected transient ChangeEvent changeEvent;
protected transient ChangeEvent changeEvent = new ChangeEvent (this);
protected EventListenerList listenerList = new EventListenerList ();
/**
* listenerList
*/
protected EventListenerList listenerList;
/**
* Creates a new color selection model.
*/
public DefaultColorSelectionModel()
{
this (Color.white);
}
/**
* selectedColor
*/
private Color selectedColor;
/**
* Creates a new color selection model with a given selected color.
*
* @param color The selected color.
*/
public DefaultColorSelectionModel (Color color)
{
super();
this.selectedColor = color;
}
/**
* Returns the selected color.
*
* @return The selected color.
*/
public Color getSelectedColor()
{
return selectedColor;
}
//-------------------------------------------------------------
// Initialization ---------------------------------------------
//-------------------------------------------------------------
/**
* @param color The color to set.
*/
public void setSelectedColor (Color color)
{
this.selectedColor = color;
}
/**
* Constructor DefaultColorSelectionModel
*/
public DefaultColorSelectionModel() {
// TODO
} // DefaultColorSelectionModel()
/**
* Adds a listener to this model.
*
* @param listener The listener to add.
*/
public void addChangeListener (ChangeListener listener)
{
listenerList.add (ChangeListener.class, listener);
}
/**
* Constructor DefaultColorSelectionModel
* @param color TODO
*/
public DefaultColorSelectionModel(Color color) {
// TODO
} // DefaultColorSelectionModel()
/**
* Removes a listener from this model.
*
* @param listener The listener to remove.
*/
public void removeChangeListener (ChangeListener listener)
{
listenerList.remove (ChangeListener.class, listener);
}
/**
* Returns all currently added <code>ChangeListener</code> objects.
*
* @return Array of <code>ChangeListener</code> objects.
*/
public ChangeListener[] getChangeListeners()
{
return (ChangeListener[]) listenerList.getListeners (ChangeListener.class);
}
//-------------------------------------------------------------
// Methods ----------------------------------------------------
//-------------------------------------------------------------
/**
* Calls all the <code>stateChanged()</code> method of all added
* <code>ChangeListener</code> objects with <code>changeEvent</code>
* as argument.
*/
protected void fireStateChanged()
{
ChangeListener[] listeners = getChangeListeners();
/**
* getSelectedColor
* @returns Color
*/
public Color getSelectedColor() {
return null; // TODO
} // getSelectedColor()
/**
* setSelectedColor
* @param color TODO
*/
public void setSelectedColor(Color color) {
// TODO
} // setSelectedColor()
/**
* addChangeListener
* @param listener TODO
*/
public void addChangeListener(ChangeListener listener) {
// TODO
} // addChangeListener()
/**
* removeChangeListener
* @param listener TODO
*/
public void removeChangeListener(ChangeListener listener) {
// TODO
} // removeChangeListener()
/**
* fireStateChanged
*/
protected void fireStateChanged() {
// TODO
} // fireStateChanged()
} // DefaultColorSelectionModel
for (int i = 0; i < listeners.length; i++)
listeners [i].stateChanged (changeEvent);
}
}

4
libjava/javax/swing/event/AncestorEvent.java
View file

@ -50,9 +50,9 @@ public class AncestorEvent extends AWTEvent
{
private static final long serialVersionUID = -8079801679695605002L;
public static final int ANCESTOR_ADDED = 0;
public static final int ANCESTOR_MOVED = 1;
public static final int ANCESTOR_ADDED = 1;
public static final int ANCESTOR_REMOVED = 2;
public static final int ANCESTOR_MOVED = 3;
private JComponent sourceComponent;
private Container ancestor;

4
libjava/javax/swing/event/InternalFrameEvent.java
View file

@ -81,7 +81,7 @@ public class InternalFrameEvent extends AWTEvent
/**
* Internal frame iconified event
*/
public static final int INTERNAL_FRAME_ICONIFIED = 2552;
public static final int INTERNAL_FRAME_ICONIFIED = 25552;
/**
* Internal frame last event
@ -91,7 +91,7 @@ public class InternalFrameEvent extends AWTEvent
/**
* Internal frame opened event
*/
public static final int INTERNAL_FRAME_OPENED = 25550;
public static final int INTERNAL_FRAME_OPENED = 25549;
/**
* Creates a <code>JInternalFrameEvent</code> object.