*
- *EventHandler.create(MouseListener.class, "mousePressed", target, "origin", "point");
+ *EventHandler.create(MouseListener.class, target, "origin", "point", "mousePressed");
*
*
*
diff -r bfe4572fd301 -r 3b56e15774b8 jdk/src/share/classes/java/io/File.java
--- a/jdk/src/share/classes/java/io/File.java Wed Jul 05 16:37:51 2017 +0200
+++ b/jdk/src/share/classes/java/io/File.java Wed Jun 18 13:05:16 2008 -0700
@@ -25,6 +25,7 @@
package java.io;
+import java.beans.ConstructorProperties;
import java.net.URI;
import java.net.URL;
import java.net.MalformedURLException;
@@ -234,6 +235,7 @@
* @throws NullPointerException
* If the pathname argument is null
*/
+ @ConstructorProperties("path")
public File(String pathname) {
if (pathname == null) {
throw new NullPointerException();
diff -r bfe4572fd301 -r 3b56e15774b8 jdk/src/share/classes/javax/swing/JFileChooser.java
--- a/jdk/src/share/classes/javax/swing/JFileChooser.java Wed Jul 05 16:37:51 2017 +0200
+++ b/jdk/src/share/classes/javax/swing/JFileChooser.java Wed Jun 18 13:05:16 2008 -0700
@@ -770,7 +770,8 @@
* @since 1.4
*/
protected JDialog createDialog(Component parent) throws HeadlessException {
- String title = getUI().getDialogTitle(this);
+ FileChooserUI ui = getUI();
+ String title = ui.getDialogTitle(this);
putClientProperty(AccessibleContext.ACCESSIBLE_DESCRIPTION_PROPERTY,
title);
@@ -794,6 +795,7 @@
dialog.getRootPane().setWindowDecorationStyle(JRootPane.FILE_CHOOSER_DIALOG);
}
}
+ dialog.getRootPane().setDefaultButton(ui.getDefaultButton(this));
dialog.pack();
dialog.setLocationRelativeTo(parent);
diff -r bfe4572fd301 -r 3b56e15774b8 jdk/src/share/classes/javax/swing/JPopupMenu.java
--- a/jdk/src/share/classes/javax/swing/JPopupMenu.java Wed Jul 05 16:37:51 2017 +0200
+++ b/jdk/src/share/classes/javax/swing/JPopupMenu.java Wed Jun 18 13:05:16 2008 -0700
@@ -41,6 +41,7 @@
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.basic.BasicComboPopup;
import javax.swing.event.*;
+import sun.security.util.SecurityConstants;
import java.applet.Applet;
@@ -320,17 +321,67 @@
* This adustment may be cancelled by invoking the application with
* -Djavax.swing.adjustPopupLocationToFit=false
*/
- Point adjustPopupLocationToFitScreen(int xposition, int yposition) {
- Point p = new Point(xposition, yposition);
+ Point adjustPopupLocationToFitScreen(int xPosition, int yPosition) {
+ Point popupLocation = new Point(xPosition, yPosition);
+
+ if(popupPostionFixDisabled == true || GraphicsEnvironment.isHeadless()) {
+ return popupLocation;
+ }
- if(popupPostionFixDisabled == true || GraphicsEnvironment.isHeadless())
- return p;
+ // Get screen bounds
+ Rectangle scrBounds;
+ GraphicsConfiguration gc = getCurrentGraphicsConfiguration(popupLocation);
+ Toolkit toolkit = Toolkit.getDefaultToolkit();
+ if(gc != null) {
+ // If we have GraphicsConfiguration use it to get screen bounds
+ scrBounds = gc.getBounds();
+ } else {
+ // If we don't have GraphicsConfiguration use primary screen
+ scrBounds = new Rectangle(toolkit.getScreenSize());
+ }
- Toolkit toolkit = Toolkit.getDefaultToolkit();
- Rectangle screenBounds;
+ // Calculate the screen size that popup should fit
+ Dimension popupSize = JPopupMenu.this.getPreferredSize();
+ int popupRightX = popupLocation.x + popupSize.width;
+ int popupBottomY = popupLocation.y + popupSize.height;
+ int scrWidth = scrBounds.width;
+ int scrHeight = scrBounds.height;
+ if (!canPopupOverlapTaskBar()) {
+ // Insets include the task bar. Take them into account.
+ Insets scrInsets = toolkit.getScreenInsets(gc);
+ scrBounds.x += scrInsets.left;
+ scrBounds.y += scrInsets.top;
+ scrWidth -= scrInsets.left + scrInsets.right;
+ scrHeight -= scrInsets.top + scrInsets.bottom;
+ }
+ int scrRightX = scrBounds.x + scrWidth;
+ int scrBottomY = scrBounds.y + scrHeight;
+
+ // Ensure that popup menu fits the screen
+ if (popupRightX > scrRightX) {
+ popupLocation.x = scrRightX - popupSize.width;
+ if( popupLocation.x < scrBounds.x ) {
+ popupLocation.x = scrBounds.x ;
+ }
+ }
+ if (popupBottomY > scrBottomY) {
+ popupLocation.y = scrBottomY - popupSize.height;
+ if( popupLocation.y < scrBounds.y ) {
+ popupLocation.y = scrBounds.y;
+ }
+ }
+
+ return popupLocation;
+ }
+
+ /**
+ * Tries to find GraphicsConfiguration
+ * that contains the mouse cursor position.
+ * Can return null.
+ */
+ private GraphicsConfiguration getCurrentGraphicsConfiguration(
+ Point popupLocation) {
GraphicsConfiguration gc = null;
- // Try to find GraphicsConfiguration, that includes mouse
- // pointer position
GraphicsEnvironment ge =
GraphicsEnvironment.getLocalGraphicsEnvironment();
GraphicsDevice[] gd = ge.getScreenDevices();
@@ -338,50 +389,36 @@
if(gd[i].getType() == GraphicsDevice.TYPE_RASTER_SCREEN) {
GraphicsConfiguration dgc =
gd[i].getDefaultConfiguration();
- if(dgc.getBounds().contains(p)) {
+ if(dgc.getBounds().contains(popupLocation)) {
gc = dgc;
break;
}
}
}
-
// If not found and we have invoker, ask invoker about his gc
if(gc == null && getInvoker() != null) {
gc = getInvoker().getGraphicsConfiguration();
}
-
- if(gc != null) {
- // If we have GraphicsConfiguration use it to get
- // screen bounds
- screenBounds = gc.getBounds();
- } else {
- // If we don't have GraphicsConfiguration use primary screen
- screenBounds = new Rectangle(toolkit.getScreenSize());
- }
-
- Dimension size;
-
- size = JPopupMenu.this.getPreferredSize();
+ return gc;
+ }
- // Use long variables to prevent overflow
- long pw = (long) p.x + (long) size.width;
- long ph = (long) p.y + (long) size.height;
-
- if( pw > screenBounds.x + screenBounds.width )
- p.x = screenBounds.x + screenBounds.width - size.width;
-
- if( ph > screenBounds.y + screenBounds.height)
- p.y = screenBounds.y + screenBounds.height - size.height;
-
- /* Change is made to the desired (X,Y) values, when the
- PopupMenu is too tall OR too wide for the screen
- */
- if( p.x < screenBounds.x )
- p.x = screenBounds.x ;
- if( p.y < screenBounds.y )
- p.y = screenBounds.y;
-
- return p;
+ /**
+ * Checks that there are enough security permissions
+ * to make popup "always on top", which allows to show it above the task bar.
+ */
+ static boolean canPopupOverlapTaskBar() {
+ boolean result = true;
+ try {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(
+ SecurityConstants.SET_WINDOW_ALWAYS_ON_TOP_PERMISSION);
+ }
+ } catch (SecurityException se) {
+ // There is no permission to show popups over the task bar
+ result = false;
+ }
+ return result;
}
diff -r bfe4572fd301 -r 3b56e15774b8 jdk/src/share/classes/javax/swing/JSlider.java
--- a/jdk/src/share/classes/javax/swing/JSlider.java Wed Jul 05 16:37:51 2017 +0200
+++ b/jdk/src/share/classes/javax/swing/JSlider.java Wed Jun 18 13:05:16 2008 -0700
@@ -25,18 +25,15 @@
package javax.swing;
-import javax.swing.border.*;
import javax.swing.event.*;
import javax.swing.plaf.*;
import javax.accessibility.*;
import java.io.Serializable;
import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
import java.io.IOException;
-import java.awt.Color;
-import java.awt.Font;
+import java.awt.*;
import java.util.*;
import java.beans.*;
@@ -409,8 +406,7 @@
* @since 1.4
*/
public ChangeListener[] getChangeListeners() {
- return (ChangeListener[])listenerList.getListeners(
- ChangeListener.class);
+ return listenerList.getListeners(ChangeListener.class);
}
@@ -642,9 +638,7 @@
/**
* Sets the model's {@code valueIsAdjusting} property. Slider look and
* feel implementations should set this property to {@code true} when
- * a knob drag begins, and to {@code false} when the drag ends. The
- * slider model will not generate {@code ChangeEvent}s while
- * {@code valueIsAdjusting} is {@code true}.
+ * a knob drag begins, and to {@code false} when the drag ends.
*
* @param b the new value for the {@code valueIsAdjusting} property
* @see #getValueIsAdjusting
@@ -764,6 +758,33 @@
updateLabelSizes();
}
+ /**
+ * {@inheritDoc}
+ * @since 1.7
+ */
+ public boolean imageUpdate(Image img, int infoflags, int x, int y, int w, int h) {
+ if (!isShowing()) {
+ return false;
+ }
+
+ // Check that there is a label with such image
+ Enumeration elements = labelTable.elements();
+
+ while (elements.hasMoreElements()) {
+ Component component = (Component) elements.nextElement();
+
+ if (component instanceof JLabel) {
+ JLabel label = (JLabel) component;
+
+ if (SwingUtilities.doesIconReferenceImage(label.getIcon(), img) ||
+ SwingUtilities.doesIconReferenceImage(label.getDisabledIcon(), img)) {
+ return super.imageUpdate(img, infoflags, x, y, w, h);
+ }
+ }
+ }
+
+ return false;
+ }
/**
* Returns the dictionary of what labels to draw at which values.
@@ -826,17 +847,16 @@
* @see JComponent#updateUI
*/
protected void updateLabelUIs() {
- if ( getLabelTable() == null ) {
+ Dictionary labelTable = getLabelTable();
+
+ if (labelTable == null) {
return;
}
- Enumeration labels = getLabelTable().keys();
+ Enumeration labels = labelTable.keys();
while ( labels.hasMoreElements() ) {
- Object value = getLabelTable().get( labels.nextElement() );
- if ( value instanceof JComponent ) {
- JComponent component = (JComponent)value;
- component.updateUI();
- component.setSize( component.getPreferredSize() );
- }
+ JComponent component = (JComponent) labelTable.get(labels.nextElement());
+ component.updateUI();
+ component.setSize(component.getPreferredSize());
}
}
@@ -845,11 +865,8 @@
if (labelTable != null) {
Enumeration labels = labelTable.elements();
while (labels.hasMoreElements()) {
- Object value = labels.nextElement();
- if (value instanceof JComponent) {
- JComponent component = (JComponent)value;
- component.setSize(component.getPreferredSize());
- }
+ JComponent component = (JComponent) labels.nextElement();
+ component.setSize(component.getPreferredSize());
}
}
}
@@ -960,14 +977,14 @@
if ( e.getPropertyName().equals( "minimum" ) ||
e.getPropertyName().equals( "maximum" ) ) {
- Enumeration keys = getLabelTable().keys();
- Object key = null;
+ Dictionary labelTable = getLabelTable();
+ Enumeration keys = labelTable.keys();
Hashtable hashtable = new Hashtable();
// Save the labels that were added by the developer
while ( keys.hasMoreElements() ) {
- key = keys.nextElement();
- Object value = getLabelTable().get( key );
+ Object key = keys.nextElement();
+ Object value = labelTable.get(key);
if ( !(value instanceof LabelUIResource) ) {
hashtable.put( key, value );
}
@@ -979,7 +996,7 @@
// Add the saved labels
keys = hashtable.keys();
while ( keys.hasMoreElements() ) {
- key = keys.nextElement();
+ Object key = keys.nextElement();
put( key, hashtable.get( key ) );
}
@@ -996,8 +1013,10 @@
SmartHashtable table = new SmartHashtable( increment, start );
- if ( getLabelTable() != null && (getLabelTable() instanceof PropertyChangeListener) ) {
- removePropertyChangeListener( (PropertyChangeListener)getLabelTable() );
+ Dictionary labelTable = getLabelTable();
+
+ if (labelTable != null && (labelTable instanceof PropertyChangeListener)) {
+ removePropertyChangeListener((PropertyChangeListener) labelTable);
}
addPropertyChangeListener( table );
diff -r bfe4572fd301 -r 3b56e15774b8 jdk/src/share/classes/javax/swing/PopupFactory.java
--- a/jdk/src/share/classes/javax/swing/PopupFactory.java Wed Jul 05 16:37:51 2017 +0200
+++ b/jdk/src/share/classes/javax/swing/PopupFactory.java Wed Jun 18 13:05:16 2008 -0700
@@ -548,47 +548,46 @@
}
/**
- * Returns true if the Popup can fit on the screen.
+ * Returns true if popup can fit the screen and the owner's top parent.
+ * It determines can popup be lightweight or mediumweight.
*/
boolean fitsOnScreen() {
+ boolean result = false;
Component component = getComponent();
-
if (owner != null && component != null) {
- Container parent;
- int width = component.getWidth();
- int height = component.getHeight();
- for(parent = owner.getParent(); parent != null ;
- parent = parent.getParent()) {
- if (parent instanceof JFrame ||
- parent instanceof JDialog ||
- parent instanceof JWindow) {
+ Container parent = (Container) SwingUtilities.getRoot(owner);
+ int popupWidth = component.getWidth();
+ int popupHeight = component.getHeight();
+ Rectangle parentBounds = parent.getBounds();
+ if (parent instanceof JFrame ||
+ parent instanceof JDialog ||
+ parent instanceof JWindow) {
+
+ Insets i = parent.getInsets();
+ parentBounds.x += i.left;
+ parentBounds.y += i.top;
+ parentBounds.width -= i.left + i.right;
+ parentBounds.height -= i.top + i.bottom;
- Rectangle r = parent.getBounds();
- Insets i = parent.getInsets();
- r.x += i.left;
- r.y += i.top;
- r.width -= (i.left + i.right);
- r.height -= (i.top + i.bottom);
-
- GraphicsConfiguration gc = parent.getGraphicsConfiguration();
+ if (JPopupMenu.canPopupOverlapTaskBar()) {
+ GraphicsConfiguration gc =
+ parent.getGraphicsConfiguration();
Rectangle popupArea = getContainerPopupArea(gc);
- return r.intersection(popupArea).contains(x, y, width, height);
-
- } else if (parent instanceof JApplet) {
- Rectangle r = parent.getBounds();
- Point p = parent.getLocationOnScreen();
-
- r.x = p.x;
- r.y = p.y;
- return r.contains(x, y, width, height);
- } else if (parent instanceof Window ||
- parent instanceof Applet) {
- // No suitable swing component found
- break;
+ result = parentBounds.intersection(popupArea)
+ .contains(x, y, popupWidth, popupHeight);
+ } else {
+ result = parentBounds
+ .contains(x, y, popupWidth, popupHeight);
}
+ } else if (parent instanceof JApplet) {
+ Point p = parent.getLocationOnScreen();
+ parentBounds.x = p.x;
+ parentBounds.y = p.y;
+ result = parentBounds
+ .contains(x, y, popupWidth, popupHeight);
}
}
- return false;
+ return result;
}
Rectangle getContainerPopupArea(GraphicsConfiguration gc) {
diff -r bfe4572fd301 -r 3b56e15774b8 jdk/src/share/classes/javax/swing/plaf/FileChooserUI.java
--- a/jdk/src/share/classes/javax/swing/plaf/FileChooserUI.java Wed Jul 05 16:37:51 2017 +0200
+++ b/jdk/src/share/classes/javax/swing/plaf/FileChooserUI.java Wed Jun 18 13:05:16 2008 -0700
@@ -25,7 +25,7 @@
package javax.swing.plaf;
-import javax.swing.JFileChooser;
+import javax.swing.*;
import javax.swing.filechooser.FileFilter;
import javax.swing.filechooser.FileView;
import java.io.File;
@@ -46,4 +46,15 @@
public abstract void rescanCurrentDirectory(JFileChooser fc);
public abstract void ensureFileIsVisible(JFileChooser fc, File f);
+
+ /**
+ * Returns default button for current LookAndFeel.
+ * JFileChooser will use this button as default button
+ * for dialog windows.
+ *
+ * @since 1.7
+ */
+ public JButton getDefaultButton(JFileChooser fc) {
+ return null;
+ }
}
diff -r bfe4572fd301 -r 3b56e15774b8 jdk/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java Wed Jul 05 16:37:51 2017 +0200
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java Wed Jun 18 13:05:16 2008 -0700
@@ -196,7 +196,7 @@
}
protected void sort(Vector v){
- ShellFolder.sortFiles(v);
+ ShellFolder.sort(v);
}
// Obsolete - not used
diff -r bfe4572fd301 -r 3b56e15774b8 jdk/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java Wed Jul 05 16:37:51 2017 +0200
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java Wed Jun 18 13:05:16 2008 -0700
@@ -384,6 +384,10 @@
return null;
}
+ public JButton getDefaultButton(JFileChooser fc) {
+ return getApproveButton(fc);
+ }
+
public String getApproveButtonToolTipText(JFileChooser fc) {
String tooltipText = fc.getApproveButtonToolTipText();
if(tooltipText != null) {
diff -r bfe4572fd301 -r 3b56e15774b8 jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java Wed Jul 05 16:37:51 2017 +0200
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java Wed Jun 18 13:05:16 2008 -0700
@@ -25,25 +25,12 @@
package javax.swing.plaf.basic;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Adjustable;
import java.awt.event.*;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Dimension;
-import java.awt.Rectangle;
-import java.awt.Point;
-import java.awt.Insets;
-import java.awt.Color;
-import java.awt.IllegalComponentStateException;
-import java.awt.Polygon;
+import java.awt.*;
import java.beans.*;
import java.util.Dictionary;
import java.util.Enumeration;
-import javax.swing.border.AbstractBorder;
-
import javax.swing.*;
import javax.swing.event.*;
import javax.swing.plaf.*;
@@ -409,7 +396,7 @@
Enumeration elements = dictionary.elements();
int baseline = -1;
while (elements.hasMoreElements()) {
- Component label = (Component)elements.nextElement();
+ JComponent label = (JComponent) elements.nextElement();
Dimension pref = label.getPreferredSize();
int labelBaseline = label.getBaseline(pref.width,
pref.height);
@@ -634,7 +621,7 @@
protected void calculateTrackRect() {
- int centerSpacing = 0; // used to center sliders added using BorderLayout.CENTER (bug 4275631)
+ int centerSpacing; // used to center sliders added using BorderLayout.CENTER (bug 4275631)
if ( slider.getOrientation() == JSlider.HORIZONTAL ) {
centerSpacing = thumbRect.height;
if ( slider.getPaintTicks() ) centerSpacing += getTickLength();
@@ -764,7 +751,7 @@
if ( dictionary != null ) {
Enumeration keys = dictionary.keys();
while ( keys.hasMoreElements() ) {
- Component label = (Component)dictionary.get( keys.nextElement() );
+ JComponent label = (JComponent) dictionary.get(keys.nextElement());
widest = Math.max( label.getPreferredSize().width, widest );
}
}
@@ -777,7 +764,7 @@
if ( dictionary != null ) {
Enumeration keys = dictionary.keys();
while ( keys.hasMoreElements() ) {
- Component label = (Component)dictionary.get( keys.nextElement() );
+ JComponent label = (JComponent) dictionary.get(keys.nextElement());
tallest = Math.max( label.getPreferredSize().height, tallest );
}
}
@@ -1001,22 +988,14 @@
public void paintTicks(Graphics g) {
Rectangle tickBounds = tickRect;
- int i;
- int maj, min, max;
- int w = tickBounds.width;
- int h = tickBounds.height;
- int centerEffect, tickHeight;
g.setColor(DefaultLookup.getColor(slider, this, "Slider.tickColor", Color.black));
- maj = slider.getMajorTickSpacing();
- min = slider.getMinorTickSpacing();
-
if ( slider.getOrientation() == JSlider.HORIZONTAL ) {
g.translate( 0, tickBounds.y);
int value = slider.getMinimum();
- int xPos = 0;
+ int xPos;
if ( slider.getMinorTickSpacing() > 0 ) {
while ( value <= slider.getMaximum() ) {
@@ -1042,7 +1021,7 @@
g.translate(tickBounds.x, 0);
int value = slider.getMinimum();
- int yPos = 0;
+ int yPos;
if ( slider.getMinorTickSpacing() > 0 ) {
int offset = 0;
@@ -1111,10 +1090,19 @@
Integer key = (Integer)keys.nextElement();
int value = key.intValue();
if (value >= minValue && value <= maxValue) {
- Component label = (Component)dictionary.get( key );
- if (label instanceof JComponent) {
- ((JComponent)label).setEnabled(enabled);
+ JComponent label = (JComponent) dictionary.get(key);
+ label.setEnabled(enabled);
+
+ if (label instanceof JLabel) {
+ Icon icon = label.isEnabled() ? ((JLabel) label).getIcon() : ((JLabel) label).getDisabledIcon();
+
+ if (icon instanceof ImageIcon) {
+ // Register Slider as an image observer. It allows to catch notifications about
+ // image changes (e.g. gif animation)
+ Toolkit.getDefaultToolkit().checkImage(((ImageIcon) icon).getImage(), -1, -1, slider);
+ }
}
+
if ( slider.getOrientation() == JSlider.HORIZONTAL ) {
g.translate( 0, labelBounds.y );
paintHorizontalLabel( g, value, label );
@@ -1364,7 +1352,7 @@
int min = slider.getMinimum();
int max = slider.getMaximum();
double valueRange = (double)max - (double)min;
- double pixelsPerValue = (double)trackHeight / (double)valueRange;
+ double pixelsPerValue = (double)trackHeight / valueRange;
int trackBottom = trackY + (trackHeight - 1);
int yPosition;
@@ -1715,7 +1703,7 @@
* of the thumb relative to the origin of the track.
*/
public void mouseDragged(MouseEvent e) {
- int thumbMiddle = 0;
+ int thumbMiddle;
if (!slider.isEnabled()) {
return;
@@ -1841,7 +1829,7 @@
public void componentResized(ComponentEvent e) {
getHandler().componentResized(e);
}
- };
+ }
/**
* Focus-change listener.
@@ -1903,7 +1891,7 @@
return b;
}
- };
+ }
/**
diff -r bfe4572fd301 -r 3b56e15774b8 jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java Wed Jul 05 16:37:51 2017 +0200
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java Wed Jun 18 13:05:16 2008 -0700
@@ -853,9 +853,7 @@
"ESCAPE", "cancelSelection",
"F2", "editFileName",
"F5", "refresh",
- "BACK_SPACE", "Go Up",
- "ENTER", "approveSelection",
- "ctrl ENTER", "approveSelection"
+ "BACK_SPACE", "Go Up"
}),
diff -r bfe4572fd301 -r 3b56e15774b8 jdk/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java Wed Jul 05 16:37:51 2017 +0200
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java Wed Jun 18 13:05:16 2008 -0700
@@ -25,26 +25,17 @@
package javax.swing.plaf.synth;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Adjustable;
import java.awt.event.*;
import java.awt.Graphics;
import java.awt.Dimension;
-import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Rectangle;
import java.awt.Point;
import java.awt.Insets;
-import java.awt.Color;
-import java.awt.IllegalComponentStateException;
-import java.awt.Polygon;
import java.beans.*;
import java.util.Dictionary;
import java.util.Enumeration;
-import javax.swing.border.AbstractBorder;
import javax.swing.*;
-import javax.swing.event.*;
import javax.swing.plaf.*;
import javax.swing.plaf.basic.BasicSliderUI;
import sun.swing.plaf.synth.SynthUI;
@@ -203,8 +194,7 @@
centerY += valueHeight + 2;
centerY += trackHeight + trackInsets.top + trackInsets.bottom;
centerY += tickHeight + 2;
- Component label = (Component)slider.getLabelTable().
- elements().nextElement();
+ JComponent label = (JComponent) slider.getLabelTable().elements().nextElement();
Dimension pref = label.getPreferredSize();
return centerY + label.getBaseline(pref.width, pref.height);
}
@@ -226,8 +216,7 @@
int trackHeight = contentHeight - valueHeight;
int yPosition = yPositionForValue(value.intValue(), trackY,
trackHeight);
- Component label = (Component)slider.getLabelTable().
- get(value);
+ JComponent label = (JComponent) slider.getLabelTable().get(value);
Dimension pref = label.getPreferredSize();
return yPosition - pref.height / 2 +
label.getBaseline(pref.width, pref.height);
@@ -434,16 +423,14 @@
/**
* Calculates the pad for the label at the specified index.
*
- * @param index index of the label to calculate pad for.
+ * @param i index of the label to calculate pad for.
* @return padding required to keep label visible.
*/
private int getPadForLabel(int i) {
- Dictionary dictionary = slider.getLabelTable();
int pad = 0;
- Object o = dictionary.get(i);
- if (o != null) {
- Component c = (Component)o;
+ JComponent c = (JComponent) slider.getLabelTable().get(i);
+ if (c != null) {
int centerX = xPositionForValue(i);
int cHalfWidth = c.getPreferredSize().width / 2;
if (centerX - cHalfWidth < insetCache.left) {
@@ -500,8 +487,6 @@
}
}
- private static Rectangle unionRect = new Rectangle();
-
public void setThumbLocation(int x, int y) {
super.setThumbLocation(x, y);
// Value rect is tied to the thumb location. We need to repaint when
@@ -544,7 +529,7 @@
trackBorder;
int trackLength = trackBottom - trackTop;
double valueRange = (double)max - (double)min;
- double pixelsPerValue = (double)trackLength / (double)valueRange;
+ double pixelsPerValue = (double)trackLength / valueRange;
int yPosition;
if (!drawInverted()) {
@@ -802,8 +787,7 @@
}
public void mouseDragged(MouseEvent e) {
- SynthScrollBarUI ui;
- int thumbMiddle = 0;
+ int thumbMiddle;
if (!slider.isEnabled()) {
return;
diff -r bfe4572fd301 -r 3b56e15774b8 jdk/src/share/classes/javax/swing/text/FlowView.java
--- a/jdk/src/share/classes/javax/swing/text/FlowView.java Wed Jul 05 16:37:51 2017 +0200
+++ b/jdk/src/share/classes/javax/swing/text/FlowView.java Wed Jun 18 13:05:16 2008 -0700
@@ -333,17 +333,24 @@
* @since 1.3
*/
public static class FlowStrategy {
- int damageStart = Integer.MAX_VALUE;
+ Position damageStart = null;
Vectorjava.io.File instead. If not, then the object depends
* on native PIDL state and should not be serialized.
*
- * @returns a java.io.File replacement object. If the folder
+ * @return a java.io.File replacement object. If the folder
* is a not a normal directory, then returns the first non-removable
* drive (normally "C:\").
*/
@@ -605,10 +605,10 @@
// parent so we have an IShellFolder to query.
long pIShellFolder = getIShellFolder();
// Now we can enumerate the objects in this folder.
- ArrayList list = new ArrayList();
+ ArrayList