--- a/jdk/src/solaris/classes/sun/awt/X11/XSelection.java Sat Jul 26 03:18:05 2014 +0400
+++ b/jdk/src/solaris/classes/sun/awt/X11/XSelection.java Sat Jul 26 04:02:56 2014 +0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
/**
* A class which interfaces with the X11 selection service.
*/
-public final class XSelection {
+final class XSelection {
/* Maps atoms to XSelection instances. */
private static final Hashtable<XAtom, XSelection> table = new Hashtable<XAtom, XSelection>();
@@ -119,11 +119,10 @@
/**
* Creates a selection object.
*
- * @param atom the selection atom.
- * @param clpbrd the corresponding clipoboard
- * @exception NullPointerException if atom is <code>null</code>.
+ * @param atom the selection atom
+ * @throws NullPointerException if atom is {@code null}
*/
- public XSelection(XAtom atom) {
+ XSelection(XAtom atom) {
if (atom == null) {
throw new NullPointerException("Null atom");
}
@@ -135,10 +134,9 @@
return selectionAtom;
}
- public synchronized boolean setOwner(Transferable contents,
- Map<Long, DataFlavor> formatMap,
- long[] formats, long time)
- {
+ synchronized boolean setOwner(Transferable contents,
+ Map<Long, DataFlavor> formatMap,
+ long[] formats, long time) {
long owner = XWindow.getXAWTRootWindow().getWindow();
long selection = selectionAtom.getAtom();
@@ -435,7 +433,7 @@
return data != null ? data : new byte[0];
}
- void validateDataGetter(WindowPropertyGetter propertyGetter)
+ private void validateDataGetter(WindowPropertyGetter propertyGetter)
throws IOException
{
// The order of checks is important because a property getter