8077296: RE build fails on non-Win builds when attempting to build Win only javadoc

Summary: move com.sun.java.accessibility.util from jdk/src/windows to jdk/src/share
Reviewed-by: prr, mchung, erikj
Contributed-by: peter.brunet@oracle.com

make/CompileJavaClasses.gmk

@@ -70,10 +70,7 @@ endif
 ifeq ($(OPENJDK_TARGET_OS), windows)
     # AccessBridge is compiled separately below.
     EXFILES += AccessBridge.java \
-        AccessBridgeLoader.java \
-        com/sun/java/accessibility/util/java/awt/ChoiceTranslator.java
-    # This seems to never be built
-    EXCLUDES += com/sun/java/accessibility/extensions
+        AccessBridgeLoader.java
   endif
 
 ifneq ($(OPENJDK_TARGET_OS), solaris)

make/CreateJars.gmk

@@ -650,16 +650,7 @@ $(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
 
 ##########################################################################################
 
-  ifeq ($(OPENJDK_TARGET_OS), windows)
-
-    $(eval $(call SetupArchive,BUILD_JACCESS_JAR, , \
-        SRCS := $(JDK_OUTPUTDIR)/classes, \
-        INCLUDES := com/sun/java/accessibility/util, \
-        JAR := $(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar, \
-        SKIP_METAINF := true))
-
-    JARS += $(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar
-
+ifeq ($(OPENJDK_TARGET_OS), windows)
   ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
       $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_32_JAR, , \
           SRCS := $(JDK_OUTPUTDIR)/classes_ab/32bit, \
@@ -684,7 +675,15 @@ $(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
 
       JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar
   endif
-  endif
+endif
+
+$(eval $(call SetupArchive,BUILD_JACCESS_JAR, , \
+    SRCS := $(JDK_OUTPUTDIR)/classes, \
+    INCLUDES := com/sun/java/accessibility/util, \
+    JAR := $(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar, \
+    SKIP_METAINF := true))
+
+JARS += $(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar
 
 ##########################################################################################
 

src/windows/classes/com/sun/java/accessibility/util/package-info.java → src/share/classes/com/sun/java/accessibility/util/package-info.java

@@ -64,4 +64,6 @@
  *
  * @since JDK1.7
  */
+
+@jdk.Exported
 package com.sun.java.accessibility.util;

src/windows/classes/com/sun/java/accessibility/extensions/AccessibleExtendedRelation.java

-/*
- * Copyright (c) 2002, 2010, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.java.accessibility.extensions;
-
-import javax.accessibility.*;
-
-/**
- * <P>Class AccessibleExtendedRelation contains extensions to the class
- * AccessibleRelation that are currently not in a public API.
- *
- * <P>Class AccessibleRelation describes a relation between the
- * object that implements the AccessibleRelation and one or more other
- * objects.  The actual relations that an object has with other
- * objects are defined as an AccessibleRelationSet, which is a composed
- * set of AccessibleRelations.
- * <p>The toDisplayString method allows you to obtain the localized string
- * for a locale independent key from a predefined ResourceBundle for the
- * keys defined in this class.
- * <p>The constants in this class present a strongly typed enumeration
- * of common object roles. If the constants in this class are not sufficient
- * to describe the role of an object, a subclass should be generated
- * from this class and it should provide constants in a similar manner.
- *
- */
-
-public class AccessibleExtendedRelation
-    extends AccessibleExtendedRelationConstants {
-
-    public AccessibleExtendedRelation(String s) {
-        super(s);
-    }
-
-    public AccessibleExtendedRelation(String key, Object target) {
-        super(key, target);
-    }
-}

src/windows/classes/com/sun/java/accessibility/extensions/AccessibleExtendedRelationConstants.java

-/*
- * Copyright (c) 2002, 2010, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.java.accessibility.extensions;
-
-import javax.accessibility.*;
-
-/**
- * <P>Class AccessibleExtendedRelation contains extensions to the class
- * AccessibleRelation that are currently not in a public API.
- *
- * <P>Class AccessibleRelation describes a relation between the
- * object that implements the AccessibleRelation and one or more other
- * objects.  The actual relations that an object has with other
- * objects are defined as an AccessibleRelationSet, which is a composed
- * set of AccessibleRelations.
- * <p>The toDisplayString method allows you to obtain the localized string
- * for a locale independent key from a predefined ResourceBundle for the
- * keys defined in this class.
- * <p>The constants in this class present a strongly typed enumeration
- * of common object roles. If the constants in this class are not sufficient
- * to describe the role of an object, a subclass should be generated
- * from this class and it should provide constants in a similar manner.
- *
- */
-
-public abstract class AccessibleExtendedRelationConstants
-    extends AccessibleRelation {
-
-    /**
-     * Indicates that one AccessibleText object is linked to the
-     * target AccessibleText object(s). <p> A good example is a StarOffice
-     * text window with the bottom of one page, a footer, a header,
-     * and the top of another page all visible in the window.  There
-     * should be a FLOWS_TO relation from the last chunk of AccessibleText
-     * in the bottom of one page to the first AccessibleText object at the
-     * top of the next page, skipping over the AccessibleText object(s)
-     * that make up the header and footer. A corresponding FLOWS_FROM
-     * relation would link the AccessibleText object in the next page to
-     * the last one in the previous page.
-     * @see AccessibleExtendedRole.FLOWS_FROM
-     */
-    public static final String FLOWS_TO = "flowsTo";
-
-    /**
-     * Indicates that one AccessibleText object is linked to the
-     * target AccessibleText object(s).
-     * @see AccessibleExtendedRole.FLOWS_TO
-     */
-    public static final String FLOWS_FROM = "flowsFrom";
-
-    /**
-     * Indicates a component is a subwindow of a target component
-     */
-    public static final String SUBWINDOW_OF = "subwindowOf";
-
-    /**
-     * Identifies that the linkage between one AccessibleText
-     * object and the target AccessibleText object(s) has changed.
-     * @see AccessibleExtendedRole.FLOWS_TO
-     * @see AccessibleExtendedRole.FLOWS_FROM
-     */
-    public static final String FLOWS_TO_PROPERTY = "flowsToProperty";
-
-    /**
-     * Identifies that the linkage between one AccessibleText
-     * object and the target AccessibleText object(s) has changed.
-     * @see AccessibleExtendedRole.FLOWS_TO
-     * @see AccessibleExtendedRole.FLOWS_FROM
-     */
-    public static final String FLOWS_FROM_PROPERTY = "flowsFromProperty";
-
-    /**
-     * Identifies the subwindow relationship between two components
-     * has changed
-     */
-    public static final String SUBWINDOW_OF_PROPERTY = "subwindowOfProperty";
-
-    public AccessibleExtendedRelationConstants(String s) {
-        super(s);
-    }
-
-    public AccessibleExtendedRelationConstants(String key, Object target) {
-        super(key, target);
-    }
-}

src/windows/classes/com/sun/java/accessibility/extensions/AccessibleExtendedRole.java

-/*
- * Copyright (c) 2002, 2010, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.java.accessibility.extensions;
-
-import javax.accessibility.*;
-
-/**
- * <P>Class AccessibleExtendedRole contains extensions to the class
- * AccessibleRole that are currently not in a public API.
- *
- * <P>Class AccessibleRole determines the role of a component.  The role
- * of a component describes its generic function. (E.G.,
- * "push button," "table," or "list.")
- * <p>The constants in this class present a strongly typed enumeration
- * of common object roles.  A public constructor for this class has been
- * purposely omitted and applications should use one of the constants
- * from this class.  If the constants in this class are not sufficient
- * to describe the role of an object, a subclass should be generated
- * from this class and it should provide constants in a similar manner.
- *
- */
-
-public class AccessibleExtendedRole extends AccessibleExtendedRoleConstants {
-
-    public AccessibleExtendedRole(String s) {
-        super(s);
-    }
-}

src/windows/classes/com/sun/java/accessibility/extensions/AccessibleExtendedRoleConstants.java

-/*
- * Copyright (c) 2002, 2012, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.java.accessibility.extensions;
-
-import javax.accessibility.*;
-
-/**
- * <P>Class AccessibleExtendedRole contains extensions to the class
- * AccessibleRole that are currently not in a public API.
- *
- * <P>Class AccessibleRole determines the role of a component.  The role
- * of a component describes its generic function. (E.G.,
- * "push button," "table," or "list.")
- * <p>The constants in this class present a strongly typed enumeration
- * of common object roles.  A public constructor for this class has been
- * purposely omitted and applications should use one of the constants
- * from this class.  If the constants in this class are not sufficient
- * to describe the role of an object, a subclass should be generated
- * from this class and it should provide constants in a similar manner.
- *
- */
-
-public abstract class AccessibleExtendedRoleConstants extends AccessibleRole {
-
-    /**
-     * Indicates this component is a text header.
-     */
-    public static final AccessibleExtendedRole HEADER
-            = new AccessibleExtendedRole("Header");
-
-    /**
-     * Indicates this component is a text footer.
-     */
-    public static final AccessibleExtendedRole FOOTER
-            = new AccessibleExtendedRole("Footer");
-
-    /**
-     * Indicates this component is a text paragraph.
-     */
-    public static final AccessibleExtendedRole PARAGRAPH
-            = new AccessibleExtendedRole("Paragraph");
-
-    /**
-     * Indicates this component is a ruler.
-     */
-    public static final AccessibleExtendedRole RULER
-            = new AccessibleExtendedRole("RULER");
-
-    public AccessibleExtendedRoleConstants(String s) {
-        super(s);
-    }
-}

src/windows/classes/com/sun/java/accessibility/extensions/AccessibleExtendedState.java

-/*
- * Copyright (c) 2002, 2012, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.sun.java.accessibility.extensions;
-
-import javax.accessibility.*;
-
-/**
- * <P>Class AccessibleState describes a component's particular state.  The actual
- * state of the component is defined as an AccessibleStateSet, which is a
- * composed set of AccessibleStates.
- * <p>The toDisplayString method allows you to obtain the localized string
- * for a locale independent key from a predefined ResourceBundle for the
- * keys defined in this class.
- * <p>The constants in this class present a strongly typed enumeration
- * of common object roles.  A public constructor for this class has been
- * purposely omitted and applications should use one of the constants
- * from this class.  If the constants in this class are not sufficient
- * to describe the role of an object, a subclass should be generated
- * from this class and it should provide constants in a similar manner.
- *
- */
-
-public abstract class AccessibleExtendedState
-    extends AccessibleExtendedStateConstants {
-
-    public AccessibleExtendedState(String s) {
-        super(s);
-    }
-}

src/windows/classes/com/sun/java/accessibility/extensions/AccessibleExtendedStateConstants.java

-/*
- * Copyright (c) 2002, 2012, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.sun.java.accessibility.extensions;
-
-import javax.accessibility.*;
-
-/**
- * <P>Class AccessibleState describes a component's particular state.  The actual
- * state of the component is defined as an AccessibleStateSet, which is a
- * composed set of AccessibleStates.
- * <p>The toDisplayString method allows you to obtain the localized string
- * for a locale independent key from a predefined ResourceBundle for the
- * keys defined in this class.
- * <p>The constants in this class present a strongly typed enumeration
- * of common object roles.  A public constructor for this class has been
- * purposely omitted and applications should use one of the constants
- * from this class.  If the constants in this class are not sufficient
- * to describe the role of an object, a subclass should be generated
- * from this class and it should provide constants in a similar manner.
- *
- */
-
-public abstract class AccessibleExtendedStateConstants extends AccessibleState {
-
-    /**
-     * Indicates a component is responsible for managing
-     * its subcomponents.
-     */
-    public static final AccessibleExtendedState MANAGES_DESCENDENTS
-            = new AccessibleExtendedState("managesDescendents");
-
-    public AccessibleExtendedStateConstants(String s) {
-        super(s);
-    }
-}

src/windows/classes/com/sun/java/accessibility/util/java/awt/ChoiceTranslator.java

-/*
- * Copyright (c) 2002, 2012, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.java.accessibility.util.java.awt;
-
-import java.lang.*;
-import java.util.*;
-import java.awt.*;
-import java.awt.image.*;
-import javax.accessibility.*;
-import com.sun.java.accessibility.util.*;
-
-/**
- * <p>The Translator class provides a translation to interface Accessible
- * for objects that do not implement interface Accessible.  Assistive
- * technologies can use the 'getAccessible' class method of Translator to
- * obtain an object that implements interface Accessible.  If the object
- * passed in already implements interface Accessible, getAccessible merely
- * returns the object.
- *
- * <p>An example of how an assistive technology might use the Translator
- * class is as follows:
- *
- * <PRE>
- *    Accessible accessible = Translator.getAccessible(someObj);
- *    // obtain information from the 'accessible' object.
- * </PRE>
- *
- * <P>This class extends the Translator class to provide specific support
- * for the Choice class.  Translator.getAccessible() will automatically
- * load this class when an assistive technology asks for an accessible
- * translator for Choice.
- *
- */
-public class ChoiceTranslator extends Translator {
-
-    /**
-     * Get the state of this object.
-     * @return an instance of AccessibleState containing the current state of the object
-     * @see AccessibleState
-     */
-    public AccessibleStateSet getAccessibleStateSet() {
-        AccessibleStateSet states = super.getAccessibleStateSet();
-        states.add(AccessibleState.SELECTED);
-        return states;
-    }
-
-    public AccessibleRole getAccessibleRole() {
-        return AccessibleRole.CHOICE;
-    }
-}