diff --git a/make/mkdemo/jfc/Font2DTest/Makefile b/make/mkdemo/jfc/Font2DTest/Makefile index eab16a56b8cd75618fe2d1c10af2426a4b2ee262..bf60090be40a6b52ae633fd740d58cab5453bf29 100644 --- a/make/mkdemo/jfc/Font2DTest/Makefile +++ b/make/mkdemo/jfc/Font2DTest/Makefile @@ -33,7 +33,7 @@ DEMONAME = Font2DTest include $(BUILDDIR)/common/Defs.gmk DEMO_ROOT = $(SHARE_SRC)/demo/jfc/$(DEMONAME) -DEMO_TOPFILES = ./README.txt +DEMO_TOPFILES = ./README.txt ./$(DEMONAME).html DEMO_MAINCLASS = $(DEMONAME) DEMO_DESTDIR = $(DEMODIR)/jfc/$(DEMONAME) diff --git a/make/mkdemo/jfc/Java2D/Makefile b/make/mkdemo/jfc/Java2D/Makefile index beea7c8b47ce9c1d3b98dd613f15e6148cc69a3f..edd60bb3cef814ce4a573e5a535962a30d8cc19b 100644 --- a/make/mkdemo/jfc/Java2D/Makefile +++ b/make/mkdemo/jfc/Java2D/Makefile @@ -33,7 +33,7 @@ DEMONAME = Java2Demo include $(BUILDDIR)/common/Defs.gmk DEMO_ROOT = $(CLOSED_SRC)/share/demo/jfc/Java2D -DEMO_TOPFILES = ./Java2Demo.html ./README.txt +DEMO_TOPFILES = ./README.txt ./$(DEMONAME).html DEMO_MAINCLASS = java2d.Java2Demo DEMO_DESTDIR = $(DEMODIR)/jfc/Java2D diff --git a/make/mkdemo/jfc/SwingApplet/Makefile b/make/mkdemo/jfc/SwingApplet/Makefile index 3f8ca5d5bed0d6139a41d8ec08d0ea4d8674cc75..ba2395585c7918301a09c9ed44fb977add8b6f19 100644 --- a/make/mkdemo/jfc/SwingApplet/Makefile +++ b/make/mkdemo/jfc/SwingApplet/Makefile @@ -33,7 +33,7 @@ DEMONAME = SwingApplet include $(BUILDDIR)/common/Defs.gmk DEMO_ROOT = $(SHARE_SRC)/demo/jfc/$(DEMONAME) -DEMO_TOPFILES = ./README.txt +DEMO_TOPFILES = ./README.txt ./$(DEMONAME).html DEMO_MAINCLASS = $(DEMONAME) DEMO_DESTDIR = $(DEMODIR)/jfc/$(DEMONAME) diff --git a/make/mkdemo/jfc/SwingSet2/Makefile b/make/mkdemo/jfc/SwingSet2/Makefile index 2a4881c8937c8a9cb3b67894f02262a1102231de..837d1668c881796b8c739253b17cb4408287e46a 100644 --- a/make/mkdemo/jfc/SwingSet2/Makefile +++ b/make/mkdemo/jfc/SwingSet2/Makefile @@ -33,7 +33,7 @@ DEMONAME = SwingSet2 include $(BUILDDIR)/common/Defs.gmk DEMO_ROOT = $(CLOSED_SRC)/share/demo/jfc/$(DEMONAME) -DEMO_TOPFILES = ./README.txt +DEMO_TOPFILES = ./README.txt ./$(DEMONAME).html DEMO_MAINCLASS = $(DEMONAME) DEMO_MANIFEST_ATTR = SplashScreen-Image: resources/images/splash.png DEMO_DESTDIR = $(DEMODIR)/jfc/$(DEMONAME) diff --git a/make/tools/sharing/classlist.linux b/make/tools/sharing/classlist.linux index d07236da9e9390c9d930bdb234c7d70f12d00146..3d73d7fc731dab64ad7509ff7010d9f1a2c1c0ab 100644 --- a/make/tools/sharing/classlist.linux +++ b/make/tools/sharing/classlist.linux @@ -104,9 +104,7 @@ sun/reflect/ReflectionFactory java/lang/ref/Reference$Lock java/lang/ref/Reference$ReferenceHandler java/lang/ref/Finalizer$FinalizerThread -java/util/Hashtable$EmptyEnumerator java/util/Enumeration -java/util/Hashtable$EmptyIterator java/util/Iterator java/util/Hashtable$Entry java/nio/charset/Charset @@ -192,8 +190,6 @@ java/io/ExpiringCache$1 java/util/LinkedHashMap java/util/LinkedHashMap$Entry java/lang/StringBuilder -java/io/File$1 -sun/misc/JavaIODeleteOnExitAccess sun/misc/SharedSecrets java/lang/ClassLoader$3 java/lang/StringCoding$StringEncoder @@ -207,7 +203,6 @@ sun/misc/NativeSignalHandler java/io/Console java/io/Console$1 sun/misc/JavaIOAccess -java/io/Console$1$1 java/lang/Shutdown java/util/ArrayList java/lang/Shutdown$Lock @@ -330,7 +325,6 @@ java/util/Hashtable$Enumerator java/beans/PropertyChangeEvent java/util/EventObject java/awt/Component$AWTTreeLock -sun/awt/DebugHelper sun/awt/NativeLibLoader sun/security/action/LoadLibraryAction java/awt/GraphicsEnvironment @@ -341,7 +335,6 @@ java/lang/ProcessEnvironment$ExternalData java/lang/ProcessEnvironment$Value java/lang/ProcessEnvironment$StringEnvironment java/util/Collections$UnmodifiableMap -sun/awt/DebugHelperStub java/awt/Toolkit java/awt/Toolkit$3 sun/util/CoreResourceBundleControl @@ -391,9 +384,7 @@ sun/awt/X11GraphicsEnvironment sun/java2d/SunGraphicsEnvironment sun/java2d/FontSupport sun/awt/DisplayChangedListener -sun/java2d/SunGraphicsEnvironment$TTFilter java/io/FilenameFilter -sun/java2d/SunGraphicsEnvironment$T1Filter sun/awt/X11GraphicsEnvironment$1 sun/awt/SunToolkit sun/awt/WindowClosingSupport @@ -403,7 +394,6 @@ sun/awt/InputMethodSupport java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject java/util/concurrent/locks/Condition sun/awt/AWTAutoShutdown -sun/awt/AWTAutoShutdown$PeerMap sun/awt/SunToolkit$6 java/awt/Dialog$ModalExclusionType java/lang/Enum @@ -425,7 +415,6 @@ sun/font/CompositeFont java/util/HashMap$Values java/util/HashMap$ValueIterator java/util/HashMap$HashIterator -sun/font/FontManager$1 java/awt/Font java/awt/geom/AffineTransform sun/font/AttributeValues @@ -463,13 +452,11 @@ sun/font/StrikeCache sun/java2d/Disposer sun/java2d/Disposer$1 sun/font/StrikeCache$1 -sun/font/FontManager$FontRegistrationInfo sun/awt/motif/MFontConfiguration sun/awt/FontConfiguration sun/awt/FontDescriptor java/util/Scanner java/util/regex/Pattern -java/util/regex/Pattern$8 java/util/regex/Pattern$Node java/util/regex/Pattern$LastNode java/util/regex/Pattern$GroupHead @@ -509,7 +496,6 @@ java/util/regex/Pattern$BitClass java/util/regex/Pattern$BmpCharProperty java/util/regex/Pattern$6 java/util/regex/Pattern$CharProperty$1 -java/util/regex/Pattern$10 sun/nio/ch/FileChannelImpl java/nio/channels/FileChannel java/nio/channels/ByteChannel @@ -565,7 +551,6 @@ java/text/DecimalFormatSymbols java/text/spi/DecimalFormatSymbolsProvider java/util/Currency java/util/Currency$1 -java/util/CurrencyData java/util/spi/CurrencyNameProvider sun/util/resources/CurrencyNames sun/util/resources/LocaleNamesBundle @@ -582,7 +567,6 @@ java/util/regex/Pattern$GroupCurly java/util/regex/Pattern$5 java/util/regex/Pattern$Loop java/util/regex/Pattern$Prolog -java/util/regex/Pattern$9 java/util/regex/Pattern$BranchConn java/util/regex/Pattern$Branch java/nio/channels/spi/AbstractInterruptibleChannel$1 @@ -635,11 +619,8 @@ java/awt/image/DirectColorModel java/awt/image/PackedColorModel java/awt/color/ColorSpace java/awt/color/ICC_Profile -sun/awt/color/ProfileDeferralInfo -sun/awt/color/ProfileDeferralMgr java/awt/color/ICC_ProfileRGB java/awt/color/ICC_Profile$1 -sun/awt/color/ProfileActivator java/awt/color/ICC_ColorSpace sun/java2d/pipe/NullPipe sun/java2d/pipe/PixelDrawPipe @@ -662,8 +643,6 @@ sun/java2d/pipe/TextRenderer sun/java2d/pipe/SpanClipRenderer sun/java2d/pipe/Region sun/java2d/pipe/RegionIterator -sun/java2d/pipe/DuctusShapeRenderer -sun/java2d/pipe/DuctusRenderer sun/java2d/pipe/AlphaPaintPipe sun/java2d/pipe/SpanShapeRenderer$Composite sun/java2d/pipe/SpanShapeRenderer @@ -737,7 +716,6 @@ sun/awt/X11/XWrapperBase sun/awt/X11/Native sun/awt/X11/Native$1 java/awt/EventQueue -sun/awt/X11/XToolkit$7 java/util/EmptyStackException java/lang/reflect/InvocationTargetException java/awt/EventDispatchThread @@ -746,10 +724,7 @@ java/awt/event/MouseEvent sun/awt/PeerEvent java/awt/event/InvocationEvent java/awt/ActiveEvent -java/awt/EventQueueItem sun/awt/X11/XToolkit$1 -sun/awt/X11/XToolkit$XErrorHandler -sun/awt/X11/XToolkit$5 sun/awt/X11/XEventDispatcher sun/awt/SunToolkit$ModalityListenerList sun/awt/ModalityListener @@ -761,21 +736,18 @@ java/util/LinkedList java/util/Deque java/util/Queue java/util/AbstractSequentialList -java/util/LinkedList$Entry sun/awt/X11/AwtScreenData sun/awt/X11/XWM sun/awt/X11/MWMConstants sun/awt/X11/XAtom java/awt/Insets sun/awt/X11/XWM$1 -sun/awt/X11/XWM$2 sun/awt/X11/XSetWindowAttributes sun/awt/X11/XErrorEvent sun/awt/X11/XNETProtocol sun/awt/X11/XStateProtocol sun/awt/X11/XLayerProtocol sun/awt/X11/XProtocol -sun/awt/X11/XProtocol$1 sun/awt/X11/WindowPropertyGetter sun/awt/X11/UnsafeXDisposerRecord sun/awt/X11/XPropertyCache @@ -783,7 +755,6 @@ sun/awt/X11/XWINProtocol sun/awt/X11/XAtomList sun/awt/X11/XToolkit$3 sun/awt/X11/XAnyEvent -sun/awt/X11/IXAnyEvent java/awt/Window$WindowDisposerRecord java/awt/KeyboardFocusManager java/awt/KeyEventDispatcher @@ -794,7 +765,6 @@ java/awt/DefaultKeyboardFocusManager java/awt/DefaultFocusTraversalPolicy java/awt/ContainerOrderFocusTraversalPolicy java/awt/FocusTraversalPolicy -java/awt/MutableBoolean java/util/Collections$UnmodifiableSet sun/awt/HeadlessToolkit sun/awt/X11/XKeyboardFocusManagerPeer @@ -856,7 +826,6 @@ sun/java2d/DefaultDisposerRecord sun/java2d/x11/X11Renderer sun/awt/X11/XGlobalCursorManager sun/awt/GlobalCursorManager -sun/awt/X11/XToolkit$6 java/awt/Cursor$CursorDisposer java/awt/AWTException java/awt/HeadlessException @@ -888,7 +857,6 @@ java/awt/event/MouseListener java/awt/event/MouseMotionListener java/awt/event/MouseWheelListener java/awt/event/InputMethodListener -java/awt/Component$NativeInLightFixer java/awt/event/ContainerListener javax/accessibility/AccessibleContext sun/reflect/UnsafeObjectFieldAccessorImpl @@ -969,7 +937,6 @@ javax/swing/RepaintManager$DisplayChangedHandler javax/swing/SwingPaintEventDispatcher sun/awt/PaintEventDispatcher javax/swing/UIManager$2 -javax/swing/UIManager$3 java/awt/PopupMenu java/awt/Menu java/awt/MenuItem @@ -1062,8 +1029,6 @@ javax/swing/plaf/basic/BasicLabelUI javax/swing/plaf/LabelUI javax/swing/plaf/metal/DefaultMetalTheme$FontDelegate$1 javax/swing/plaf/basic/BasicHTML -javax/swing/SystemEventQueueUtilities -javax/swing/SystemEventQueueUtilities$SystemEventQueue sun/awt/NullComponentPeer java/awt/event/WindowEvent java/awt/EventQueue$1 @@ -1084,11 +1049,9 @@ java/io/ByteArrayOutputStream sun/misc/ExtensionDependency java/lang/Package sun/security/util/ManifestEntryVerifier -sun/security/provider/Sun java/security/Provider java/security/Provider$ServiceKey java/security/Provider$EngineDescription -sun/security/provider/Sun$1 java/security/Security java/security/Security$1 sun/misc/FloatingDecimal @@ -1133,7 +1096,6 @@ javax/swing/text/AttributeSet javax/swing/text/SimpleAttributeSet$EmptyAttributeSet javax/swing/text/StyleContext$NamedStyle javax/swing/text/Style -javax/swing/text/SimpleAttributeSet$1 javax/swing/text/StyleContext$SmallAttributeSet javax/swing/text/AbstractDocument$BidiRootElement javax/swing/text/AbstractDocument$BranchElement @@ -1267,7 +1229,6 @@ sun/nio/cs/UTF_16 sun/nio/cs/UTF_16$Decoder sun/nio/cs/UnicodeDecoder sun/font/FileFontStrike -sun/font/FileFont$FileFontDisposer sun/font/TrueTypeGlyphMapper sun/font/CMap sun/font/CMap$NullCMapClass @@ -1281,20 +1242,12 @@ java/util/zip/Inflater sun/awt/EventQueueItem sun/awt/SunToolkit$3 sun/awt/X11/XExposeEvent -sun/awt/X11/ComponentAccessor -sun/awt/X11/ComponentAccessor$1 sun/reflect/UnsafeBooleanFieldAccessorImpl sun/awt/event/IgnorePaintEvent java/awt/image/DataBufferInt java/awt/image/SinglePixelPackedSampleModel sun/awt/image/IntegerInterleavedRaster -sun/java2d/x11/X11RemoteOffScreenImage -sun/awt/image/RemoteOffScreenImage sun/awt/image/OffScreenImage -sun/java2d/x11/X11RemoteOffScreenImage$X11RemoteSurfaceManager -sun/awt/image/OffScreenSurfaceManager -sun/awt/image/CachingSurfaceManager -sun/awt/image/RasterListener sun/awt/image/BufImgSurfaceData sun/java2d/opengl/GLXGraphicsConfig sun/java2d/opengl/OGLGraphicsConfig @@ -1302,7 +1255,6 @@ sun/java2d/x11/X11SurfaceData$X11PixmapSurfaceData sun/awt/image/WritableRasterNative sun/awt/image/DataBufferNative sun/java2d/SurfaceManagerFactory -sun/java2d/x11/X11CachingSurfaceManager sun/java2d/opengl/GLXSurfaceData sun/java2d/opengl/OGLSurfaceData sun/font/CompositeGlyphMapper @@ -1332,10 +1284,7 @@ java/lang/ProcessBuilder java/lang/ProcessImpl java/lang/UNIXProcess java/lang/Process -java/lang/UNIXProcess$Gate java/lang/UNIXProcess$1 -java/lang/UNIXProcess$1$1 -java/lang/UNIXProcess$1$1$1 java/net/ServerSocket java/util/Random java/util/concurrent/atomic/AtomicLong @@ -1422,7 +1371,6 @@ java/awt/event/MouseAdapter javax/swing/ToolTipManager$insideTimerAction javax/swing/ToolTipManager$outsideTimerAction javax/swing/ToolTipManager$stillInsideTimerAction -javax/swing/ToolTipManager$Actions sun/swing/UIAction javax/swing/Action javax/swing/ToolTipManager$MoveBeforeEnterListener @@ -1715,7 +1663,6 @@ javax/swing/plaf/basic/BasicToolBarUI$Handler javax/swing/border/EtchedBorder javax/swing/JToolBar$Separator javax/swing/plaf/basic/BasicToolBarSeparatorUI -sun/awt/color/CMM java/applet/Applet java/awt/Panel com/sun/awt/AWTUtilities @@ -1752,7 +1699,6 @@ java/awt/Window$1DisposeAction java/awt/LightweightDispatcher$2 sun/awt/X11/XReparentEvent sun/awt/X11/XWindowAttributes -javax/swing/SystemEventQueueUtilities$ComponentWorkRequest sun/awt/X11/XFocusChangeEvent sun/awt/X11/XComponentPeer$1 sun/awt/X11/XUnmapEvent @@ -1771,7 +1717,6 @@ javax/swing/JComponent$2 sun/net/www/MimeTable java/net/FileNameMap sun/net/www/MimeTable$1 -sun/net/www/MimeTable$2 sun/net/www/MimeEntry java/net/URLConnection$1 java/text/SimpleDateFormat @@ -1957,7 +1902,6 @@ javax/swing/JTree$TreeModelHandler javax/swing/tree/VariableHeightLayoutCache$TreeStateNode javax/swing/tree/DefaultMutableTreeNode javax/swing/tree/MutableTreeNode -javax/swing/tree/DefaultMutableTreeNode$1 javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration javax/swing/event/TableColumnModelEvent java/text/ParseException @@ -2014,21 +1958,13 @@ javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler sun/java2d/HeadlessGraphicsEnvironment java/util/Hashtable$KeySet java/awt/FontFormatException -sun/java2d/SunGraphicsEnvironment$2 sun/font/Type1Font$1 java/nio/channels/FileChannel$MapMode sun/nio/ch/FileChannelImpl$Unmapper sun/nio/ch/Util$3 java/nio/DirectByteBufferR java/nio/charset/Charset$3 -sun/nio/cs/ext/ExtendedCharsets sun/nio/cs/AbstractCharsetProvider -sun/nio/cs/ext/SJIS -sun/nio/cs/ext/SJIS$Decoder -sun/nio/cs/ext/DelegatableDecoder -sun/nio/cs/ext/JIS_X_0208_Decoder -sun/nio/cs/ext/DoubleByteDecoder -sun/nio/cs/ext/JIS_X_0201$Decoder sun/nio/cs/SingleByteDecoder java/lang/CharacterData00 javax/swing/DefaultListModel @@ -2145,7 +2081,6 @@ sun/security/jca/GetInstance$Instance java/security/MessageDigest$Delegate sun/security/provider/ByteArrayAccess java/io/ObjectStreamClass$ClassDataSlot -java/io/ObjectInputStream$CallbackContext sun/reflect/UnsafeQualifiedStaticLongFieldAccessorImpl java/security/SignatureException java/security/InvalidKeyException @@ -2194,8 +2129,6 @@ java/security/spec/AlgorithmParameterSpec java/math/MutableBigInteger java/math/SignedMutableBigInteger java/awt/EventQueue$1AWTInvocationLock -javax/swing/SystemEventQueueUtilities$RunnableCanvas -javax/swing/SystemEventQueueUtilities$RunnableCanvasGraphics java/awt/Component$FlipBufferStrategy java/awt/SentEvent sun/awt/X11/XDestroyWindowEvent @@ -2231,18 +2164,13 @@ sun/swing/BakedArrayList javax/swing/plaf/synth/SynthLookAndFeel$Handler javax/swing/plaf/synth/SynthDefaultLookup com/sun/java/swing/plaf/gtk/GTKEngine -com/sun/java/swing/plaf/gtk/GTKDefaultEngine com/sun/java/swing/plaf/gtk/GTKEngine$Settings com/sun/java/swing/plaf/gtk/GTKStyleFactory com/sun/java/swing/plaf/gtk/PangoFonts -sun/font/FontManager$FontConfigInfo com/sun/java/swing/plaf/gtk/GTKLookAndFeel$WeakPCL javax/swing/plaf/synth/Region javax/swing/plaf/synth/SynthLookAndFeel$AATextListener -com/sun/java/swing/plaf/gtk/GTKNativeEngine -com/sun/java/swing/plaf/gtk/GTKNativeEngine$WidgetType com/sun/java/swing/plaf/gtk/GTKRegion -com/sun/java/swing/plaf/gtk/GTKDefaultStyle com/sun/java/swing/plaf/gtk/GTKStyle com/sun/java/swing/plaf/gtk/GTKConstants javax/swing/plaf/synth/SynthStyle @@ -2268,7 +2196,6 @@ javax/swing/plaf/synth/SynthButtonUI javax/swing/plaf/synth/SynthToggleButtonUI javax/swing/plaf/basic/BasicBorders$FieldBorder javax/swing/plaf/synth/SynthMenuBarUI -javax/swing/plaf/synth/DefaultMenuLayout javax/swing/plaf/synth/SynthMenuUI javax/swing/plaf/synth/SynthUI com/sun/java/swing/plaf/gtk/GTKIconFactory @@ -2332,7 +2259,6 @@ java/net/SocketPermission javax/security/auth/AuthPermission java/lang/Thread$1 java/util/logging/LogManager$5 -java/util/logging/LogManager$6 sun/applet/StdAppletViewerFactory sun/applet/AppletViewerFactory sun/applet/AppletViewer$UserActionListener @@ -2343,7 +2269,6 @@ sun/misc/MessageUtils sun/applet/AppletPanel$10 java/security/Policy$1 sun/security/provider/PolicyFile$1 -sun/security/provider/PolicyInfo sun/security/provider/PolicyFile$3 sun/security/util/PropertyExpander sun/security/provider/PolicyParser @@ -2353,12 +2278,10 @@ sun/security/provider/PolicyParser$PermissionEntry sun/security/provider/PolicyFile$PolicyEntry sun/security/provider/PolicyFile$6 sun/security/provider/PolicyFile$7 -sun/security/provider/SelfPermission java/net/SocketPermissionCollection java/util/PropertyPermissionCollection sun/applet/AppletPanel$9 sun/applet/AppletClassLoader -sun/applet/AppletClassLoader$4 sun/applet/AppletThreadGroup sun/applet/AppContextCreator sun/applet/AppletPanel$1 @@ -2372,10 +2295,8 @@ java/awt/peer/MenuItemPeer sun/awt/X11/XMenuItemPeer java/awt/MenuShortcut sun/awt/X11/XMenuWindow -sun/awt/X11/XMenuBarPeer$1 sun/awt/X11/XMenuItemPeer$TextMetrics sun/awt/AppContext$3 -sun/awt/MostRecentThreadAppContext sun/awt/X11/XMenuBarPeer$MappingData sun/awt/X11/XBaseMenuWindow$MappingData sun/applet/AppletViewer$1 diff --git a/make/tools/sharing/classlist.solaris b/make/tools/sharing/classlist.solaris index f987ca59d44853ceef6dbdc09790bf6cfdddb98b..8955d32898f3cb4341b704f617132dcf581dcb23 100644 --- a/make/tools/sharing/classlist.solaris +++ b/make/tools/sharing/classlist.solaris @@ -104,9 +104,7 @@ sun/reflect/ReflectionFactory java/lang/ref/Reference$Lock java/lang/ref/Reference$ReferenceHandler java/lang/ref/Finalizer$FinalizerThread -java/util/Hashtable$EmptyEnumerator java/util/Enumeration -java/util/Hashtable$EmptyIterator java/util/Iterator java/util/Hashtable$Entry java/nio/charset/Charset @@ -198,8 +196,6 @@ java/io/ExpiringCache java/io/ExpiringCache$1 java/util/LinkedHashMap java/util/LinkedHashMap$Entry -java/io/File$1 -sun/misc/JavaIODeleteOnExitAccess sun/misc/SharedSecrets java/lang/ClassLoader$3 java/lang/StringCoding$StringEncoder @@ -213,7 +209,6 @@ sun/misc/NativeSignalHandler java/io/Console java/io/Console$1 sun/misc/JavaIOAccess -java/io/Console$1$1 java/lang/Shutdown java/util/ArrayList java/lang/Shutdown$Lock @@ -332,7 +327,6 @@ java/util/Hashtable$Enumerator java/beans/PropertyChangeEvent java/util/EventObject java/awt/Component$AWTTreeLock -sun/awt/DebugHelper sun/awt/NativeLibLoader sun/security/action/LoadLibraryAction java/awt/GraphicsEnvironment @@ -343,7 +337,6 @@ java/lang/ProcessEnvironment$ExternalData java/lang/ProcessEnvironment$Value java/lang/ProcessEnvironment$StringEnvironment java/util/Collections$UnmodifiableMap -sun/awt/DebugHelperStub java/awt/Toolkit java/awt/Toolkit$3 sun/util/CoreResourceBundleControl @@ -393,9 +386,7 @@ sun/awt/X11GraphicsEnvironment sun/java2d/SunGraphicsEnvironment sun/java2d/FontSupport sun/awt/DisplayChangedListener -sun/java2d/SunGraphicsEnvironment$TTFilter java/io/FilenameFilter -sun/java2d/SunGraphicsEnvironment$T1Filter sun/awt/X11GraphicsEnvironment$1 sun/awt/SunToolkit sun/awt/WindowClosingSupport @@ -405,7 +396,6 @@ sun/awt/InputMethodSupport java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject java/util/concurrent/locks/Condition sun/awt/AWTAutoShutdown -sun/awt/AWTAutoShutdown$PeerMap sun/awt/SunToolkit$6 java/awt/Dialog$ModalExclusionType java/lang/Enum @@ -426,7 +416,6 @@ sun/font/CompositeFont java/util/HashMap$Values java/util/HashMap$ValueIterator java/util/HashMap$HashIterator -sun/font/FontManager$1 java/awt/Font java/awt/geom/AffineTransform sun/font/AttributeValues @@ -464,7 +453,6 @@ sun/font/StrikeCache sun/java2d/Disposer sun/java2d/Disposer$1 sun/font/StrikeCache$1 -sun/font/FontManager$FontRegistrationInfo sun/awt/motif/MFontConfiguration sun/awt/FontConfiguration sun/awt/FontDescriptor @@ -509,11 +497,8 @@ java/awt/image/DirectColorModel java/awt/image/PackedColorModel java/awt/color/ColorSpace java/awt/color/ICC_Profile -sun/awt/color/ProfileDeferralInfo -sun/awt/color/ProfileDeferralMgr java/awt/color/ICC_ProfileRGB java/awt/color/ICC_Profile$1 -sun/awt/color/ProfileActivator java/awt/color/ICC_ColorSpace sun/java2d/pipe/NullPipe sun/java2d/pipe/PixelDrawPipe @@ -536,8 +521,6 @@ sun/java2d/pipe/TextRenderer sun/java2d/pipe/SpanClipRenderer sun/java2d/pipe/Region sun/java2d/pipe/RegionIterator -sun/java2d/pipe/DuctusShapeRenderer -sun/java2d/pipe/DuctusRenderer sun/java2d/pipe/AlphaPaintPipe sun/java2d/pipe/SpanShapeRenderer$Composite sun/java2d/pipe/SpanShapeRenderer @@ -611,7 +594,6 @@ sun/awt/X11/XWrapperBase sun/awt/X11/Native sun/awt/X11/Native$1 java/awt/EventQueue -sun/awt/X11/XToolkit$7 java/util/EmptyStackException java/lang/reflect/InvocationTargetException java/awt/EventDispatchThread @@ -620,10 +602,7 @@ java/awt/event/MouseEvent sun/awt/PeerEvent java/awt/event/InvocationEvent java/awt/ActiveEvent -java/awt/EventQueueItem sun/awt/X11/XToolkit$1 -sun/awt/X11/XToolkit$XErrorHandler -sun/awt/X11/XToolkit$5 sun/awt/X11/XEventDispatcher sun/awt/SunToolkit$ModalityListenerList sun/awt/ModalityListener @@ -635,21 +614,18 @@ java/util/LinkedList java/util/Deque java/util/Queue java/util/AbstractSequentialList -java/util/LinkedList$Entry sun/awt/X11/AwtScreenData sun/awt/X11/XWM sun/awt/X11/MWMConstants sun/awt/X11/XAtom java/awt/Insets sun/awt/X11/XWM$1 -sun/awt/X11/XWM$2 sun/awt/X11/XSetWindowAttributes sun/awt/X11/XErrorEvent sun/awt/X11/XNETProtocol sun/awt/X11/XStateProtocol sun/awt/X11/XLayerProtocol sun/awt/X11/XProtocol -sun/awt/X11/XProtocol$1 java/lang/Long$LongCache sun/awt/X11/WindowPropertyGetter sun/awt/X11/UnsafeXDisposerRecord @@ -659,7 +635,6 @@ sun/awt/X11/XAtomList sun/awt/X11/XToolkit$3 java/awt/Window$WindowDisposerRecord sun/awt/X11/XAnyEvent -sun/awt/X11/IXAnyEvent java/awt/KeyboardFocusManager java/awt/KeyEventDispatcher java/awt/KeyEventPostProcessor @@ -669,7 +644,6 @@ java/awt/DefaultKeyboardFocusManager java/awt/DefaultFocusTraversalPolicy java/awt/ContainerOrderFocusTraversalPolicy java/awt/FocusTraversalPolicy -java/awt/MutableBoolean java/util/Collections$UnmodifiableSet sun/awt/HeadlessToolkit sun/awt/X11/XKeyboardFocusManagerPeer @@ -728,7 +702,6 @@ sun/java2d/DefaultDisposerRecord sun/java2d/x11/X11Renderer sun/awt/X11/XGlobalCursorManager sun/awt/GlobalCursorManager -sun/awt/X11/XToolkit$6 java/awt/Cursor$CursorDisposer java/awt/AWTException java/awt/HeadlessException @@ -760,7 +733,6 @@ java/awt/event/MouseListener java/awt/event/MouseMotionListener java/awt/event/MouseWheelListener java/awt/event/InputMethodListener -java/awt/Component$NativeInLightFixer java/awt/event/ContainerListener javax/accessibility/AccessibleContext sun/reflect/UnsafeObjectFieldAccessorImpl @@ -845,7 +817,6 @@ javax/swing/RepaintManager$DisplayChangedHandler javax/swing/SwingPaintEventDispatcher sun/awt/PaintEventDispatcher javax/swing/UIManager$2 -javax/swing/UIManager$3 java/awt/PopupMenu java/awt/Menu java/awt/MenuItem @@ -941,8 +912,6 @@ javax/swing/plaf/basic/BasicLabelUI javax/swing/plaf/LabelUI javax/swing/plaf/metal/DefaultMetalTheme$FontDelegate$1 javax/swing/plaf/basic/BasicHTML -javax/swing/SystemEventQueueUtilities -javax/swing/SystemEventQueueUtilities$SystemEventQueue sun/awt/NullComponentPeer java/awt/event/WindowEvent java/awt/EventQueue$1 @@ -954,11 +923,8 @@ sun/awt/dnd/SunDropTargetEvent java/awt/event/ActionEvent sun/awt/X11/XReparentEvent sun/awt/X11/XWindowAttributes -sun/awt/X11/ComponentAccessor -sun/awt/X11/ComponentAccessor$1 sun/awt/EventQueueItem sun/awt/SunToolkit$3 -javax/swing/SystemEventQueueUtilities$ComponentWorkRequest java/applet/Applet java/awt/Panel com/sun/awt/AWTUtilities @@ -974,17 +940,14 @@ java/io/ByteArrayOutputStream sun/misc/ExtensionDependency java/lang/Package sun/security/util/ManifestEntryVerifier -sun/security/provider/Sun java/security/Provider java/security/Provider$ServiceKey java/security/Provider$EngineDescription -sun/security/provider/Sun$1 java/security/Security java/security/Security$1 sun/misc/FloatingDecimal sun/misc/FloatingDecimal$1 java/util/regex/Pattern -java/util/regex/Pattern$8 java/util/regex/Pattern$Node java/util/regex/Pattern$LastNode java/util/regex/Pattern$GroupHead @@ -1068,7 +1031,6 @@ javax/swing/text/AttributeSet javax/swing/text/SimpleAttributeSet$EmptyAttributeSet javax/swing/text/StyleContext$NamedStyle javax/swing/text/Style -javax/swing/text/SimpleAttributeSet$1 javax/swing/text/StyleContext$SmallAttributeSet javax/swing/text/AbstractDocument$BidiRootElement javax/swing/text/AbstractDocument$BranchElement @@ -1232,7 +1194,6 @@ sun/nio/cs/UTF_16 sun/nio/cs/UTF_16$Decoder sun/nio/cs/UnicodeDecoder sun/font/FileFontStrike -sun/font/FileFont$FileFontDisposer sun/font/TrueTypeGlyphMapper sun/font/CMap sun/font/CMap$NullCMapClass @@ -1242,17 +1203,9 @@ sun/font/CMap$CMapFormat12 java/awt/FontFormatException sun/java2d/HeadlessGraphicsEnvironment java/nio/charset/Charset$3 -sun/nio/cs/ext/ExtendedCharsets sun/nio/cs/AbstractCharsetProvider -sun/nio/cs/ext/EUC_KR -sun/nio/cs/ext/EUC_KR$Decoder -sun/nio/cs/ext/DoubleByteDecoder sun/font/NativeFont -sun/nio/cs/ext/MS950 -sun/nio/cs/ext/MS950$Decoder java/lang/CharacterData00 -sun/nio/cs/ext/GBK -sun/nio/cs/ext/GBK$Decoder sun/font/CMap$CMapFormat2 sun/font/FontDesignMetrics$KeyReference sun/awt/image/PNGImageDecoder @@ -1264,13 +1217,7 @@ sun/awt/event/IgnorePaintEvent java/awt/image/DataBufferInt java/awt/image/SinglePixelPackedSampleModel sun/awt/image/IntegerInterleavedRaster -sun/java2d/x11/X11RemoteOffScreenImage -sun/awt/image/RemoteOffScreenImage sun/awt/image/OffScreenImage -sun/java2d/x11/X11RemoteOffScreenImage$X11RemoteSurfaceManager -sun/awt/image/OffScreenSurfaceManager -sun/awt/image/CachingSurfaceManager -sun/awt/image/RasterListener sun/awt/image/BufImgSurfaceData sun/java2d/opengl/GLXGraphicsConfig sun/java2d/opengl/OGLGraphicsConfig @@ -1278,7 +1225,6 @@ sun/java2d/x11/X11SurfaceData$X11PixmapSurfaceData sun/awt/image/WritableRasterNative sun/awt/image/DataBufferNative sun/java2d/SurfaceManagerFactory -sun/java2d/x11/X11CachingSurfaceManager sun/java2d/opengl/GLXSurfaceData sun/java2d/opengl/OGLSurfaceData sun/font/CompositeGlyphMapper @@ -1419,7 +1365,6 @@ java/awt/event/MouseAdapter javax/swing/ToolTipManager$insideTimerAction javax/swing/ToolTipManager$outsideTimerAction javax/swing/ToolTipManager$stillInsideTimerAction -javax/swing/ToolTipManager$Actions sun/swing/UIAction javax/swing/Action javax/swing/ToolTipManager$MoveBeforeEnterListener @@ -1712,7 +1657,6 @@ javax/swing/border/EtchedBorder javax/swing/JToolBar$Separator javax/swing/plaf/basic/BasicToolBarSeparatorUI sun/font/FontDesignMetrics$MetricsKey -sun/awt/color/CMM javax/swing/KeyboardManager$ComponentKeyStrokePair sun/awt/EmbeddedFrame sun/awt/im/InputMethodContext @@ -1763,7 +1707,6 @@ javax/swing/JComponent$2 sun/net/www/MimeTable java/net/FileNameMap sun/net/www/MimeTable$1 -sun/net/www/MimeTable$2 sun/net/www/MimeEntry java/net/URLConnection$1 java/text/SimpleDateFormat @@ -1785,7 +1728,6 @@ java/text/DecimalFormatSymbols java/text/spi/DecimalFormatSymbolsProvider java/util/Currency java/util/Currency$1 -java/util/CurrencyData java/util/spi/CurrencyNameProvider sun/util/resources/CurrencyNames sun/util/resources/CurrencyNames_en_US @@ -1964,7 +1906,6 @@ javax/swing/JTree$TreeModelHandler javax/swing/tree/VariableHeightLayoutCache$TreeStateNode javax/swing/tree/DefaultMutableTreeNode javax/swing/tree/MutableTreeNode -javax/swing/tree/DefaultMutableTreeNode$1 javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration javax/swing/event/TableColumnModelEvent java/text/ParseException @@ -2019,7 +1960,6 @@ javax/swing/plaf/basic/BasicSliderUI$ScrollListener javax/swing/plaf/metal/MetalSliderUI$MetalPropertyListener javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler java/util/Hashtable$KeySet -sun/java2d/SunGraphicsEnvironment$5 sun/font/Type1Font$1 java/nio/channels/FileChannel$MapMode sun/nio/ch/FileChannelImpl$Unmapper @@ -2134,7 +2074,6 @@ sun/security/jca/ProviderList$3 sun/security/jca/ProviderList$1 sun/security/jca/ProviderList$2 sun/security/jca/ProviderConfig$2 -sun/security/jca/ProviderConfig$4 sun/security/util/PropertyExpander sun/security/jca/ProviderConfig$1 sun/security/jca/ProviderConfig$3 @@ -2192,7 +2131,6 @@ java/security/spec/KeySpec java/security/KeyFactory sun/security/jca/ProviderList$ServiceList sun/security/jca/ProviderList$ServiceList$1 -sun/security/rsa/SunRsaSign sun/security/rsa/RSAKeyFactory java/security/KeyFactorySpi java/security/spec/RSAPublicKeySpec @@ -2276,9 +2214,7 @@ java/lang/AssertionError java/io/NotSerializableException java/io/ObjectStreamException java/security/InvalidParameterException -java/util/Collections$EmptySet$1 java/io/ObjectStreamClass$ClassDataSlot -java/io/ObjectInputStream$CallbackContext sun/reflect/UnsafeQualifiedStaticLongFieldAccessorImpl java/io/ObjectOutputStream$BlockDataOutputStream java/io/ObjectOutputStream$HandleTable @@ -2294,11 +2230,8 @@ java/security/interfaces/DSAPrivateKey java/security/spec/InvalidKeySpecException java/security/spec/DSAParameterSpec java/security/spec/AlgorithmParameterSpec -javax/crypto/SecretKey sun/security/util/MemoryCache$HardCacheEntry java/awt/EventQueue$1AWTInvocationLock -javax/swing/SystemEventQueueUtilities$RunnableCanvas -javax/swing/SystemEventQueueUtilities$RunnableCanvasGraphics java/awt/Component$FlipBufferStrategy java/awt/SentEvent sun/awt/X11/XDestroyWindowEvent @@ -2331,18 +2264,14 @@ sun/swing/BakedArrayList javax/swing/plaf/synth/SynthLookAndFeel$Handler javax/swing/plaf/synth/SynthDefaultLookup com/sun/java/swing/plaf/gtk/GTKEngine -com/sun/java/swing/plaf/gtk/GTKNativeEngine javax/swing/plaf/synth/Region -com/sun/java/swing/plaf/gtk/GTKNativeEngine$WidgetType com/sun/java/swing/plaf/gtk/GTKRegion sun/swing/ImageCache com/sun/java/swing/plaf/gtk/GTKEngine$Settings com/sun/java/swing/plaf/gtk/GTKStyleFactory com/sun/java/swing/plaf/gtk/PangoFonts -sun/font/FontManager$FontConfigInfo com/sun/java/swing/plaf/gtk/GTKLookAndFeel$WeakPCL javax/swing/plaf/synth/SynthLookAndFeel$AATextListener -com/sun/java/swing/plaf/gtk/GTKNativeStyle com/sun/java/swing/plaf/gtk/GTKStyle com/sun/java/swing/plaf/gtk/GTKConstants javax/swing/plaf/synth/SynthStyle @@ -2370,7 +2299,6 @@ javax/swing/plaf/synth/SynthButtonUI javax/swing/plaf/synth/SynthToggleButtonUI javax/swing/plaf/basic/BasicBorders$FieldBorder javax/swing/plaf/synth/SynthMenuBarUI -javax/swing/plaf/synth/DefaultMenuLayout javax/swing/plaf/synth/SynthMenuUI javax/swing/plaf/synth/SynthUI com/sun/java/swing/plaf/gtk/GTKIconFactory @@ -2424,7 +2352,6 @@ java/net/SocketPermission javax/security/auth/AuthPermission java/lang/Thread$1 java/util/logging/LogManager$5 -java/util/logging/LogManager$6 sun/applet/StdAppletViewerFactory sun/applet/AppletViewerFactory sun/applet/AppletViewer$UserActionListener @@ -2435,7 +2362,6 @@ sun/misc/MessageUtils sun/applet/AppletPanel$10 java/security/Policy$1 sun/security/provider/PolicyFile$1 -sun/security/provider/PolicyInfo sun/security/provider/PolicyFile$3 sun/security/provider/PolicyParser sun/security/util/PolicyUtil @@ -2444,12 +2370,10 @@ sun/security/provider/PolicyParser$PermissionEntry sun/security/provider/PolicyFile$PolicyEntry sun/security/provider/PolicyFile$6 sun/security/provider/PolicyFile$7 -sun/security/provider/SelfPermission java/net/SocketPermissionCollection java/util/PropertyPermissionCollection sun/applet/AppletPanel$9 sun/applet/AppletClassLoader -sun/applet/AppletClassLoader$4 sun/applet/AppletThreadGroup sun/applet/AppContextCreator sun/applet/AppletPanel$1 @@ -2463,9 +2387,7 @@ java/awt/peer/MenuItemPeer sun/awt/X11/XMenuItemPeer java/awt/MenuShortcut sun/awt/X11/XMenuWindow -sun/awt/X11/XMenuBarPeer$1 sun/awt/AppContext$3 -sun/awt/MostRecentThreadAppContext sun/awt/X11/XMenuItemPeer$TextMetrics sun/awt/X11/XMenuBarPeer$MappingData sun/awt/X11/XBaseMenuWindow$MappingData diff --git a/make/tools/sharing/classlist.windows b/make/tools/sharing/classlist.windows index f1a5a693b9edc51aed1b322776505165512d49ea..1bf64407f92bfd8ea996ebc4be2e6dbdbfe6ef44 100644 --- a/make/tools/sharing/classlist.windows +++ b/make/tools/sharing/classlist.windows @@ -104,9 +104,7 @@ sun/reflect/ReflectionFactory java/lang/ref/Reference$Lock java/lang/ref/Reference$ReferenceHandler java/lang/ref/Finalizer$FinalizerThread -java/util/Hashtable$EmptyEnumerator java/util/Enumeration -java/util/Hashtable$EmptyIterator java/util/Iterator java/util/Hashtable$Entry sun/misc/Version @@ -165,11 +163,9 @@ sun/reflect/ReflectionFactory$1 sun/reflect/NativeConstructorAccessorImpl sun/reflect/DelegatingConstructorAccessorImpl sun/misc/VM -sun/nio/cs/MS1252$Encoder sun/nio/cs/SingleByteEncoder java/nio/charset/CharsetEncoder java/nio/charset/CodingErrorAction -sun/nio/cs/MS1252$Decoder sun/nio/cs/SingleByteDecoder java/nio/charset/CharsetDecoder java/nio/ByteBuffer @@ -195,8 +191,6 @@ java/io/ExpiringCache java/io/ExpiringCache$1 java/util/LinkedHashMap java/util/LinkedHashMap$Entry -java/io/File$1 -sun/misc/JavaIODeleteOnExitAccess sun/misc/SharedSecrets java/lang/ClassLoader$3 java/io/ExpiringCache$Entry @@ -209,7 +203,6 @@ sun/misc/NativeSignalHandler java/io/Console java/io/Console$1 sun/misc/JavaIOAccess -java/io/Console$1$1 java/lang/Shutdown java/util/ArrayList java/lang/Shutdown$Lock @@ -333,10 +326,8 @@ java/util/Hashtable$Enumerator java/beans/PropertyChangeEvent java/util/EventObject java/awt/Component$AWTTreeLock -sun/awt/DebugHelper sun/awt/NativeLibLoader sun/security/action/LoadLibraryAction -sun/awt/DebugHelperStub java/awt/Toolkit java/awt/Toolkit$3 sun/util/CoreResourceBundleControl @@ -402,9 +393,7 @@ java/awt/geom/Point2D sun/awt/Win32GraphicsEnvironment sun/java2d/SunGraphicsEnvironment sun/java2d/FontSupport -sun/java2d/SunGraphicsEnvironment$TTFilter java/io/FilenameFilter -sun/java2d/SunGraphicsEnvironment$T1Filter sun/awt/windows/WToolkit sun/awt/SunToolkit sun/awt/WindowClosingSupport @@ -414,7 +403,6 @@ sun/awt/InputMethodSupport java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject java/util/concurrent/locks/Condition sun/awt/AWTAutoShutdown -sun/awt/AWTAutoShutdown$PeerMap sun/awt/SunToolkit$6 java/awt/Dialog$ModalExclusionType java/awt/Dialog @@ -429,7 +417,6 @@ sun/awt/windows/WPanelPeer java/awt/peer/PanelPeer sun/awt/windows/WCanvasPeer java/awt/peer/CanvasPeer -sun/awt/windows/WToolkit$5 java/awt/Color java/awt/Paint java/awt/Transparency @@ -446,11 +433,8 @@ java/awt/event/MouseListener java/awt/event/MouseMotionListener java/awt/event/MouseWheelListener java/awt/event/InputMethodListener -java/awt/EventQueueItem -java/awt/Component$NativeInLightFixer java/awt/event/ContainerListener javax/accessibility/AccessibleContext -sun/awt/windows/WToolkit$6 java/io/ObjectOutputStream java/io/ObjectOutput java/io/DataOutput @@ -509,11 +493,8 @@ java/awt/image/DirectColorModel java/awt/image/PackedColorModel java/awt/color/ColorSpace java/awt/color/ICC_Profile -sun/awt/color/ProfileDeferralInfo -sun/awt/color/ProfileDeferralMgr java/awt/color/ICC_ProfileRGB java/awt/color/ICC_Profile$1 -sun/awt/color/ProfileActivator java/awt/color/ICC_ColorSpace sun/java2d/pipe/NullPipe sun/java2d/pipe/PixelDrawPipe @@ -536,8 +517,6 @@ sun/java2d/pipe/TextRenderer sun/java2d/pipe/SpanClipRenderer sun/java2d/pipe/Region sun/java2d/pipe/RegionIterator -sun/java2d/pipe/DuctusShapeRenderer -sun/java2d/pipe/DuctusRenderer sun/java2d/pipe/AlphaPaintPipe sun/java2d/pipe/SpanShapeRenderer$Composite sun/java2d/pipe/SpanShapeRenderer @@ -552,10 +531,8 @@ java/awt/Image$1 sun/awt/image/SurfaceManager$ImageAccessor sun/awt/image/SurfaceManager sun/awt/image/VolatileSurfaceManager -sun/java2d/windows/Win32OffScreenSurfaceData sun/java2d/windows/WindowsFlags sun/java2d/windows/WindowsFlags$1 -sun/java2d/windows/DDBlitLoops sun/java2d/loops/Blit sun/java2d/loops/GraphicsPrimitive sun/java2d/loops/GraphicsPrimitiveMgr @@ -599,11 +576,8 @@ sun/java2d/loops/GraphicsPrimitiveProxy sun/java2d/loops/GeneralRenderer sun/java2d/loops/GraphicsPrimitiveMgr$1 sun/java2d/loops/GraphicsPrimitiveMgr$2 -sun/java2d/windows/Win32SurfaceData sun/java2d/windows/GDIBlitLoops sun/java2d/windows/GDIRenderer -sun/java2d/windows/DDBlitLoops$DelegateBlitBgLoop -sun/java2d/windows/DDRenderer sun/awt/windows/WToolkit$1 sun/awt/SunDisplayChanger sun/java2d/SunGraphicsEnvironment$1 @@ -615,7 +589,6 @@ sun/font/CompositeFont java/util/HashMap$Values java/util/HashMap$ValueIterator java/util/HashMap$HashIterator -sun/font/FontManager$1 sun/font/TrueTypeFont java/awt/font/FontRenderContext java/awt/RenderingHints @@ -632,7 +605,6 @@ sun/font/StrikeCache sun/java2d/Disposer sun/java2d/Disposer$1 sun/font/StrikeCache$1 -sun/font/FontManager$FontRegistrationInfo sun/awt/windows/WFontConfiguration sun/awt/FontConfiguration sun/awt/FontDescriptor @@ -670,12 +642,10 @@ java/util/LinkedList java/util/Deque java/util/Queue java/util/AbstractSequentialList -java/util/LinkedList$Entry java/awt/DefaultKeyboardFocusManager java/awt/DefaultFocusTraversalPolicy java/awt/ContainerOrderFocusTraversalPolicy java/awt/FocusTraversalPolicy -java/awt/MutableBoolean java/util/Collections$UnmodifiableSet sun/awt/HeadlessToolkit sun/awt/KeyboardFocusManagerPeerImpl @@ -690,7 +660,6 @@ sun/awt/PaintEventDispatcher java/awt/event/InvocationEvent java/awt/ActiveEvent java/awt/MenuComponent -sun/awt/EventQueueItem sun/awt/SunToolkit$3 java/util/EmptyStackException java/lang/reflect/InvocationTargetException @@ -857,7 +826,6 @@ javax/swing/RepaintManager javax/swing/RepaintManager$DisplayChangedHandler javax/swing/SwingPaintEventDispatcher javax/swing/UIManager$2 -javax/swing/UIManager$3 com/sun/swing/internal/plaf/metal/resources/metal sun/util/ResourceBundleEnumeration com/sun/swing/internal/plaf/basic/resources/basic @@ -921,9 +889,6 @@ java/util/Collections$SynchronizedCollection javax/swing/plaf/basic/BasicHTML sun/awt/AppContext$PostShutdownEventRunnable sun/awt/AWTAutoShutdown$1 -javax/swing/SystemEventQueueUtilities -javax/swing/SystemEventQueueUtilities$ComponentWorkRequest -javax/swing/SystemEventQueueUtilities$SystemEventQueue sun/awt/NullComponentPeer java/awt/GraphicsCallback$PaintCallback java/awt/GraphicsCallback @@ -942,17 +907,14 @@ java/io/ByteArrayOutputStream sun/misc/ExtensionDependency java/lang/Package sun/security/util/ManifestEntryVerifier -sun/security/provider/Sun java/security/Provider java/security/Provider$ServiceKey java/security/Provider$EngineDescription -sun/security/provider/Sun$1 java/security/Security java/security/Security$1 sun/misc/FloatingDecimal sun/misc/FloatingDecimal$1 java/util/regex/Pattern -java/util/regex/Pattern$8 java/util/regex/Pattern$Node java/util/regex/Pattern$LastNode java/util/regex/Pattern$GroupHead @@ -1034,7 +996,6 @@ javax/swing/text/AttributeSet javax/swing/text/SimpleAttributeSet$EmptyAttributeSet javax/swing/text/StyleContext$NamedStyle javax/swing/text/Style -javax/swing/text/SimpleAttributeSet$1 javax/swing/text/StyleContext$SmallAttributeSet javax/swing/text/AbstractDocument$BidiRootElement javax/swing/text/AbstractDocument$BranchElement @@ -1153,7 +1114,6 @@ java/nio/ShortBuffer sun/nio/cs/UTF_16 sun/nio/cs/UTF_16$Decoder sun/font/FileFontStrike -sun/font/FileFont$FileFontDisposer sun/font/TrueTypeGlyphMapper sun/font/CMap sun/font/CMap$NullCMapClass @@ -1178,9 +1138,6 @@ java/util/Date sun/util/calendar/CalendarSystem sun/awt/image/OffScreenImage sun/java2d/SurfaceManagerFactory -sun/java2d/windows/WinCachingSurfaceManager -sun/awt/image/CachingSurfaceManager -sun/awt/image/RasterListener sun/util/calendar/Gregorian sun/util/calendar/BaseCalendar sun/util/calendar/AbstractCalendar @@ -1297,7 +1254,6 @@ java/awt/event/MouseAdapter javax/swing/ToolTipManager$insideTimerAction javax/swing/ToolTipManager$outsideTimerAction javax/swing/ToolTipManager$stillInsideTimerAction -javax/swing/ToolTipManager$Actions sun/swing/UIAction javax/swing/Action javax/swing/ToolTipManager$MoveBeforeEnterListener @@ -1665,7 +1621,6 @@ javax/swing/JComponent$2 sun/net/www/MimeTable java/net/FileNameMap sun/net/www/MimeTable$1 -sun/net/www/MimeTable$2 sun/net/www/MimeEntry java/net/URLConnection$1 java/text/SimpleDateFormat @@ -1687,7 +1642,6 @@ java/text/DecimalFormatSymbols java/text/spi/DecimalFormatSymbolsProvider java/util/Currency java/util/Currency$1 -java/util/CurrencyData java/util/spi/CurrencyNameProvider sun/util/resources/CurrencyNames sun/util/resources/CurrencyNames_en_US @@ -1707,7 +1661,6 @@ java/io/PushbackInputStream java/util/zip/CRC32 java/util/zip/Checksum java/awt/TrayIcon -java/awt/EventDispatchThread$StopDispatchEvent java/lang/Thread$State javax/swing/SwingUtilities$SharedOwnerFrame javax/swing/JTable @@ -1722,7 +1675,6 @@ sun/print/PrinterGraphicsConfig javax/swing/JRadioButton java/lang/ClassFormatError sun/java2d/opengl/OGLGraphicsConfig -sun/java2d/windows/WinVolatileSurfaceManager java/awt/print/PrinterGraphics java/awt/PrintGraphics javax/swing/JTabbedPane @@ -1863,7 +1815,6 @@ javax/swing/JTree$TreeModelHandler javax/swing/tree/VariableHeightLayoutCache$TreeStateNode javax/swing/tree/DefaultMutableTreeNode javax/swing/tree/MutableTreeNode -javax/swing/tree/DefaultMutableTreeNode$1 javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration javax/swing/event/TableColumnModelEvent java/text/ParseException @@ -1918,9 +1869,6 @@ javax/swing/plaf/metal/MetalSliderUI$MetalPropertyListener javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler sun/java2d/HeadlessGraphicsEnvironment java/util/Hashtable$KeySet -sun/font/FontManager$2 -sun/java2d/SunGraphicsEnvironment$2 -sun/java2d/SunGraphicsEnvironment$3 javax/swing/DefaultListModel javax/swing/event/ListDataEvent javax/sound/sampled/DataLine @@ -1959,7 +1907,6 @@ sun/net/InetAddressCachePolicy$1 sun/security/action/GetIntegerAction sun/net/InetAddressCachePolicy$2 java/net/InetAddress$CacheEntry -java/net/PlainDatagramSocketImpl java/net/DatagramSocketImpl java/text/Collator java/text/spi/CollatorProvider @@ -2030,7 +1977,6 @@ java/io/ObjectStreamClass$MemberSignature java/math/BigInteger java/security/interfaces/DSAParams java/io/ObjectStreamClass$ClassDataSlot -java/io/ObjectInputStream$CallbackContext java/io/ObjectStreamClass$4 java/io/ObjectStreamClass$5 java/security/MessageDigest @@ -2076,8 +2022,6 @@ java/security/spec/DSAParameterSpec java/math/MutableBigInteger java/math/SignedMutableBigInteger java/awt/EventQueue$1AWTInvocationLock -javax/swing/SystemEventQueueUtilities$RunnableCanvas -javax/swing/SystemEventQueueUtilities$RunnableCanvasGraphics java/awt/LightweightDispatcher$2 java/awt/Component$FlipBufferStrategy javax/swing/JTable$2 @@ -2191,7 +2135,6 @@ java/net/SocketPermission javax/security/auth/AuthPermission java/lang/Thread$1 java/util/logging/LogManager$5 -java/util/logging/LogManager$6 sun/applet/StdAppletViewerFactory sun/applet/AppletViewerFactory sun/applet/AppletViewer$UserActionListener @@ -2202,7 +2145,6 @@ sun/misc/MessageUtils sun/applet/AppletPanel$10 java/security/Policy$1 sun/security/provider/PolicyFile$1 -sun/security/provider/PolicyInfo sun/security/provider/PolicyFile$3 sun/security/util/PropertyExpander sun/security/provider/PolicyParser @@ -2214,17 +2156,14 @@ sun/security/provider/PolicyFile$PolicyEntry sun/security/provider/PolicyParser$ParsingException sun/security/provider/PolicyFile$6 sun/security/provider/PolicyFile$7 -sun/security/provider/SelfPermission java/net/SocketPermissionCollection java/util/PropertyPermissionCollection sun/applet/AppletPanel$9 sun/applet/AppletClassLoader -sun/applet/AppletClassLoader$4 sun/applet/AppletThreadGroup sun/applet/AppContextCreator sun/applet/AppletPanel$1 sun/awt/AppContext$3 -sun/awt/MostRecentThreadAppContext sun/awt/windows/WMenuBarPeer java/awt/peer/MenuBarPeer java/awt/peer/MenuComponentPeer diff --git a/src/share/classes/sun/util/resources/CurrencyNames.properties b/src/share/classes/sun/util/resources/CurrencyNames.properties index e3eea6e1fa6049a17bbc66e107041c299a8d04a0..6fac2dd43aa57fd12c29f15eea56b0b2b6b52031 100644 --- a/src/share/classes/sun/util/resources/CurrencyNames.properties +++ b/src/share/classes/sun/util/resources/CurrencyNames.properties @@ -1,45 +1,68 @@ # -# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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. # # # COPYRIGHT AND PERMISSION NOTICE # -# Copyright (C) 1991-2007 Unicode, Inc. All rights reserved. +# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved. # Distributed under the Terms of Use in http://www.unicode.org/copyright.html. # -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of the Unicode data files and any associated documentation (the "Data -# Files") or Unicode software and any associated documentation (the -# "Software") to deal in the Data Files or Software without restriction, -# including without limitation the rights to use, copy, modify, merge, -# publish, distribute, and/or sell copies of the Data Files or Software, and -# to permit persons to whom the Data Files or Software are furnished to do -# so, provided that (a) the above copyright notice(s) and this permission -# notice appear with all copies of the Data Files or Software, (b) both the -# above copyright notice(s) and this permission notice appear in associated -# documentation, and (c) there is clear notice in each modified Data File or -# in the Software as well as in the documentation associated with the Data -# File(s) or Software that the data or software has been modified. +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of the Unicode data files and any associated documentation (the +# "Data Files") or Unicode software and any associated documentation +# (the "Software") to deal in the Data Files or Software without +# restriction, including without limitation the rights to use, copy, +# modify, merge, publish, distribute, and/or sell copies of the Data +# Files or Software, and to permit persons to whom the Data Files or +# Software are furnished to do so, provided that (a) the above copyright +# notice(s) and this permission notice appear with all copies of the +# Data Files or Software, (b) both the above copyright notice(s) and +# this permission notice appear in associated documentation, and (c) +# there is clear notice in each modified Data File or in the Software as +# well as in the documentation associated with the Data File(s) or +# Software that the data or software has been modified. # -# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF -# THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS -# INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR -# CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF -# USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THE DATA FILES OR SOFTWARE. +# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF +# ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT +# HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR +# ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR +# SOFTWARE. # -# Except as contained in this notice, the name of a copyright holder shall not -# be used in advertising or otherwise to promote the sale, use or other -# dealings in these Data Files or Software without prior written -# authorization of the copyright holder. +# Except as contained in this notice, the name of a copyright holder +# shall not be used in advertising or otherwise to promote the sale, use +# or other dealings in these Data Files or Software without prior +# written authorization of the copyright holder. + # - # Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - +# ADP=ADP AED=AED AFA=AFA @@ -254,52 +277,52 @@ ZWD=ZWD ZWN=ZWN adp=Andorran Peseta aed=United Arab Emirates Dirham -afa=Afghani (1927-2002) -afn=Afghani +afa=Afghan Afghani (1927-2002) +afn=Afghan Afghani all=Albanian Lek amd=Armenian Dram -ang=Netherlands Antillan Guilder +ang=Netherlands Antillean Guilder aoa=Angolan Kwanza ars=Argentine Peso ats=Austrian Schilling aud=Australian Dollar -awg=Aruban Guilder -azm=Azerbaijanian Manat (1993-2006) -azn=Azerbaijanian Manat +awg=Aruban Florin +azm=Azerbaijani Manat (1993-2006) +azn=Azerbaijani Manat bam=Bosnia-Herzegovina Convertible Mark -bbd=Barbados Dollar -bdt=Bangladesh Taka +bbd=Barbadian Dollar +bdt=Bangladeshi Taka bef=Belgian Franc bgl=Bulgarian Hard Lev -bgn=Bulgarian New Lev +bgn=Bulgarian Lev bhd=Bahraini Dinar -bif=Burundi Franc +bif=Burundian Franc bmd=Bermudan Dollar bnd=Brunei Dollar -bob=Boliviano +bob=Bolivian Boliviano bov=Bolivian Mvdol brl=Brazilian Real bsd=Bahamian Dollar -btn=Bhutan Ngultrum +btn=Bhutanese Ngultrum bwp=Botswanan Pula -byb=Belarussian New Ruble (1994-1999) -byr=Belarussian Ruble +byb=Belarusian New Ruble (1994-1999) +byr=Belarusian Ruble bzd=Belize Dollar cad=Canadian Dollar -cdf=Congolese Franc Congolais +cdf=Congolese Franc chf=Swiss Franc -clf=Chilean Unidades de Fomento +clf=Chilean Unit of Account (UF) clp=Chilean Peso -cny=Chinese Yuan Renminbi +cny=Chinese Yuan cop=Colombian Peso -crc=Costa Rican Colon -csd=Serbian Dinar +crc=Costa Rican Col\u00f3n +csd=Serbian Dinar (2002-2006) cup=Cuban Peso -cve=Cape Verde Escudo -cyp=Cyprus Pound +cve=Cape Verdean Escudo +cyp=Cypriot Pound czk=Czech Republic Koruna -dem=Deutsche Mark -djf=Djibouti Franc +dem=German Mark +djf=Djiboutian Franc dkk=Danish Krone dop=Dominican Peso dzd=Algerian Dinar @@ -310,22 +333,22 @@ esp=Spanish Peseta etb=Ethiopian Birr eur=Euro fim=Finnish Markka -fjd=Fiji Dollar +fjd=Fijian Dollar fkp=Falkland Islands Pound frf=French Franc gbp=British Pound Sterling gel=Georgian Lari -ghc=Ghana Cedi -ghs=Ghana Cedi +ghc=Ghanaian Cedi (1979-2007) +ghs=Ghanaian Cedi gip=Gibraltar Pound -gmd=Gambia Dalasi -gnf=Guinea Franc +gmd=Gambian Dalasi +gnf=Guinean Franc grd=Greek Drachma -gtq=Guatemala Quetzal +gtq=Guatemalan Quetzal gwp=Guinea-Bissau Peso -gyd=Guyana Dollar +gyd=Guyanaese Dollar hkd=Hong Kong Dollar -hnl=Hoduras Lempira +hnl=Honduran Lempira hrk=Croatian Kuna htg=Haitian Gourde huf=Hungarian Forint @@ -335,110 +358,111 @@ ils=Israeli New Sheqel inr=Indian Rupee iqd=Iraqi Dinar irr=Iranian Rial -isk=Icelandic Krona +isk=Icelandic Kr\u00f3na itl=Italian Lira jmd=Jamaican Dollar jod=Jordanian Dinar jpy=Japanese Yen kes=Kenyan Shilling -kgs=Kyrgystan Som +kgs=Kyrgystani Som khr=Cambodian Riel -kmf=Comoro Franc +kmf=Comorian Franc kpw=North Korean Won krw=South Korean Won kwd=Kuwaiti Dinar kyd=Cayman Islands Dollar -kzt=Kazakhstan Tenge +kzt=Kazakhstani Tenge lak=Laotian Kip lbp=Lebanese Pound -lkr=Sri Lanka Rupee +lkr=Sri Lankan Rupee lrd=Liberian Dollar lsl=Lesotho Loti -ltl=Lithuanian Lita -luf=Luxembourg Franc +ltl=Lithuanian Litas +luf=Luxembourgian Franc lvl=Latvian Lats lyd=Libyan Dinar mad=Moroccan Dirham mdl=Moldovan Leu -mga=Madagascar Ariary -mgf=Madagascar Franc +mga=Malagasy Ariary +mgf=Malagasy Franc mkd=Macedonian Denar -mmk=Myanmar Kyat +mmk=Myanma Kyat mnt=Mongolian Tugrik -mop=Macao Pataca -mro=Mauritania Ouguiya +mop=Macanese Pataca +mro=Mauritanian Ouguiya mtl=Maltese Lira -mur=Mauritius Rupee -mvr=Maldive Islands Rufiyaa -mwk=Malawi Kwacha +mur=Mauritian Rupee +mvr=Maldivian Rufiyaa +mwk=Malawian Kwacha mxn=Mexican Peso -mxv=Mexican Unidad de Inversion (UDI) +mxv=Mexican Investment Unit myr=Malaysian Ringgit -mzm=Old Mozambique Metical -mzn=Mozambique Metical -nad=Namibia Dollar +mzm=Mozambican Metical (1980-2006) +mzn=Mozambican Metical +nad=Namibian Dollar ngn=Nigerian Naira -nio=Nicaraguan Cordoba Oro -nlg=Netherlands Guilder +nio=Nicaraguan C\u00f3rdoba +nlg=Dutch Guilder nok=Norwegian Krone npr=Nepalese Rupee nzd=New Zealand Dollar -omr=Oman Rial +omr=Omani Rial pab=Panamanian Balboa -pen=Peruvian Sol Nuevo -pgk=Papua New Guinea Kina +pen=Peruvian Nuevo Sol +pgk=Papua New Guinean Kina php=Philippine Peso -pkr=Pakistan Rupee +pkr=Pakistani Rupee pln=Polish Zloty pte=Portuguese Escudo -pyg=Paraguay Guarani +pyg=Paraguayan Guarani qar=Qatari Rial -rol=Old Romanian Leu +rol=Romanian Leu (1952-2006) ron=Romanian Leu +rsd=Serbian Dinar rub=Russian Ruble rur=Russian Ruble (1991-1998) rwf=Rwandan Franc sar=Saudi Riyal sbd=Solomon Islands Dollar -scr=Seychelles Rupee -sdd=Sudanese Dinar +scr=Seychellois Rupee +sdd=Sudanese Dinar (1992-2007) sdg=Sudanese Pound sek=Swedish Krona sgd=Singapore Dollar shp=Saint Helena Pound -sit=Slovenia Tolar +sit=Slovenian Tolar skk=Slovak Koruna -sll=Sierra Leone Leone +sll=Sierra Leonean Leone sos=Somali Shilling -srd=Surinam Dollar -srg=Suriname Guilder -std=Sao Tome and Principe Dobra -svc=El Salvador Colon +srd=Surinamese Dollar +srg=Surinamese Guilder +std=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra +svc=Salvadoran Col\u00f3n syp=Syrian Pound -szl=Swaziland Lilangeni +szl=Swazi Lilangeni thb=Thai Baht -tjs=Tajikistan Somoni -tmm=Turkmenistan Manat +tjs=Tajikistani Somoni +tmm=Turkmenistani Manat (1993-2009) tnd=Tunisian Dinar -top=Tonga Pa\u02bbanga -tpe=Timor Escudo -trl=Turkish Lira -try=New Turkish Lira +top=Tongan Pa\u02bbanga +tpe=Timorese Escudo +trl=Turkish Lira (1922-2005) +try=Turkish Lira ttd=Trinidad and Tobago Dollar -twd=Taiwan New Dollar +twd=New Taiwan Dollar tzs=Tanzanian Shilling uah=Ukrainian Hryvnia ugx=Ugandan Shilling usd=US Dollar usn=US Dollar (Next day) uss=US Dollar (Same day) -uyu=Uruguay Peso Uruguayo -uzs=Uzbekistan Sum -veb=Venezuelan Bolivar -vef=Venezuelan Bolivar Fuerte +uyu=Uruguayan Peso +uzs=Uzbekistan Som +veb=Venezuelan Bol\u00edvar (1871-2008) +vef=Venezuelan Bol\u00edvar vnd=Vietnamese Dong vuv=Vanuatu Vatu -wst=Western Samoa Tala +wst=Samoan Tala xaf=CFA Franc BEAC xag=Silver xau=Gold @@ -455,9 +479,9 @@ xpd=Palladium xpf=CFP Franc xpt=Platinum xts=Testing Currency Code -xxx=No Currency +xxx=Unknown Currency yer=Yemeni Rial -yum=Yugoslavian Noviy Dinar +yum=Yugoslavian New Dinar (1994-2002) zar=South African Rand zmk=Zambian Kwacha -zwd=Zimbabwe Dollar +zwd=Zimbabwean Dollar (1980-2008) diff --git a/src/share/classes/sun/util/resources/CurrencyNames_pt.properties b/src/share/classes/sun/util/resources/CurrencyNames_pt.properties index 5adb677a5dd84c031e5862a135f1d28815577449..d033ea7e6762afce6fa35ada3db6a243f98c9fd6 100644 --- a/src/share/classes/sun/util/resources/CurrencyNames_pt.properties +++ b/src/share/classes/sun/util/resources/CurrencyNames_pt.properties @@ -1,5 +1,26 @@ # # Copyright (c) 2005, 2011, 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. # # @@ -8,38 +29,40 @@ # Copyright (C) 1991-2011 Unicode, Inc. All rights reserved. # Distributed under the Terms of Use in http://www.unicode.org/copyright.html. # -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of the Unicode data files and any associated documentation (the "Data -# Files") or Unicode software and any associated documentation (the -# "Software") to deal in the Data Files or Software without restriction, -# including without limitation the rights to use, copy, modify, merge, -# publish, distribute, and/or sell copies of the Data Files or Software, and -# to permit persons to whom the Data Files or Software are furnished to do -# so, provided that (a) the above copyright notice(s) and this permission -# notice appear with all copies of the Data Files or Software, (b) both the -# above copyright notice(s) and this permission notice appear in associated -# documentation, and (c) there is clear notice in each modified Data File or -# in the Software as well as in the documentation associated with the Data -# File(s) or Software that the data or software has been modified. +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of the Unicode data files and any associated documentation (the +# "Data Files") or Unicode software and any associated documentation +# (the "Software") to deal in the Data Files or Software without +# restriction, including without limitation the rights to use, copy, +# modify, merge, publish, distribute, and/or sell copies of the Data +# Files or Software, and to permit persons to whom the Data Files or +# Software are furnished to do so, provided that (a) the above copyright +# notice(s) and this permission notice appear with all copies of the +# Data Files or Software, (b) both the above copyright notice(s) and +# this permission notice appear in associated documentation, and (c) +# there is clear notice in each modified Data File or in the Software as +# well as in the documentation associated with the Data File(s) or +# Software that the data or software has been modified. # -# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF -# THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS -# INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR -# CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF -# USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THE DATA FILES OR SOFTWARE. +# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF +# ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT +# HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR +# ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR +# SOFTWARE. # -# Except as contained in this notice, the name of a copyright holder shall not -# be used in advertising or otherwise to promote the sale, use or other -# dealings in these Data Files or Software without prior written -# authorization of the copyright holder. +# Except as contained in this notice, the name of a copyright holder +# shall not be used in advertising or otherwise to promote the sale, use +# or other dealings in these Data Files or Software without prior +# written authorization of the copyright holder. + # - # Generated automatically from the Common Locale Data Repository. DO NOT EDIT! - +# adp=Peseta de Andorra aed=Dir\u00e9m dos Emirados \u00c1rabes Unidos afa=Afegane (1927-2002) diff --git a/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_BA.properties b/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_BA.properties index a5f63a940da460e5385849372d2313fc863fc2d8..7dc0375ecbf8f24892bb176b972316ff5d972912 100644 --- a/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_BA.properties +++ b/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_BA.properties @@ -64,6 +64,6 @@ # Generated automatically from the Common Locale Data Repository. DO NOT EDIT! # BAM=KM -bam=bosansko-hercegova\u010dkih konvertibilnih maraka +bam=Bosansko-Hercegova\u010dka konvertibilna marka EUR=\u20ac -eur=evra +eur=Evro diff --git a/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_ME.properties b/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_ME.properties index 2746103ca98a8022cd01f16b9a47edb74e15cf3b..0983b6a2ecc81747df5a8aad9d9ab3b99c71ed32 100644 --- a/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_ME.properties +++ b/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_ME.properties @@ -64,4 +64,4 @@ # Generated automatically from the Common Locale Data Repository. DO NOT EDIT! # EUR=\u20ac -eur=evra +eur=Evro diff --git a/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_RS.properties b/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_RS.properties index 34992f0e310df2f7e3a41bc8a67464aeb459c229..3a299f406428ff5b318eb6ce0f63782719ba2c08 100644 --- a/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_RS.properties +++ b/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_RS.properties @@ -64,4 +64,4 @@ # Generated automatically from the Common Locale Data Repository. DO NOT EDIT! # RSD=din. -rsd=srpski dinari +rsd=Srpski dinar diff --git a/src/share/classes/sun/util/resources/CurrencyNames_sr_RS.properties b/src/share/classes/sun/util/resources/CurrencyNames_sr_RS.properties index b6153c86f64f2e0cc0b8b7a8dc428b9d3eb7d902..83555220774008cd1323abc7912327d1e08fc052 100644 --- a/src/share/classes/sun/util/resources/CurrencyNames_sr_RS.properties +++ b/src/share/classes/sun/util/resources/CurrencyNames_sr_RS.properties @@ -1,5 +1,26 @@ # # Copyright (c) 2005, 2011, 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. # # @@ -8,36 +29,38 @@ # Copyright (C) 1991-2011 Unicode, Inc. All rights reserved. # Distributed under the Terms of Use in http://www.unicode.org/copyright.html. # -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of the Unicode data files and any associated documentation (the "Data -# Files") or Unicode software and any associated documentation (the -# "Software") to deal in the Data Files or Software without restriction, -# including without limitation the rights to use, copy, modify, merge, -# publish, distribute, and/or sell copies of the Data Files or Software, and -# to permit persons to whom the Data Files or Software are furnished to do -# so, provided that (a) the above copyright notice(s) and this permission -# notice appear with all copies of the Data Files or Software, (b) both the -# above copyright notice(s) and this permission notice appear in associated -# documentation, and (c) there is clear notice in each modified Data File or -# in the Software as well as in the documentation associated with the Data -# File(s) or Software that the data or software has been modified. -# -# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF -# THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS -# INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR -# CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF -# USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THE DATA FILES OR SOFTWARE. -# -# Except as contained in this notice, the name of a copyright holder shall not -# be used in advertising or otherwise to promote the sale, use or other -# dealings in these Data Files or Software without prior written -# authorization of the copyright holder. -# - -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of the Unicode data files and any associated documentation (the +# "Data Files") or Unicode software and any associated documentation +# (the "Software") to deal in the Data Files or Software without +# restriction, including without limitation the rights to use, copy, +# modify, merge, publish, distribute, and/or sell copies of the Data +# Files or Software, and to permit persons to whom the Data Files or +# Software are furnished to do so, provided that (a) the above copyright +# notice(s) and this permission notice appear with all copies of the +# Data Files or Software, (b) both the above copyright notice(s) and +# this permission notice appear in associated documentation, and (c) +# there is clear notice in each modified Data File or in the Software as +# well as in the documentation associated with the Data File(s) or +# Software that the data or software has been modified. +# +# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF +# ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT +# HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR +# ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR +# SOFTWARE. +# +# Except as contained in this notice, the name of a copyright holder +# shall not be used in advertising or otherwise to promote the sale, use +# or other dealings in these Data Files or Software without prior +# written authorization of the copyright holder. +# +# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! +# RSD=\u0434\u0438\u043d. diff --git a/src/share/demo/jfc/Font2DTest/README.txt b/src/share/demo/jfc/Font2DTest/README.txt index dec4895b55e3617923bd5eba985451cdb499ab5c..c5f03af0cb8e83ead60e51202dc51760495a8861 100644 --- a/src/share/demo/jfc/Font2DTest/README.txt +++ b/src/share/demo/jfc/Font2DTest/README.txt @@ -7,7 +7,7 @@ To run Font2DTest: or % appletviewer Font2DTest.html -These instructions assume that the 1.5 versions of the java +These instructions assume that the 1.7 versions of the java and appletviewer commands are in your path. If they aren't, then you should either specify the complete path to the commands or update your PATH environment variable as described in the diff --git a/src/share/demo/jfc/Font2DTest/RangeMenu.java b/src/share/demo/jfc/Font2DTest/RangeMenu.java index 1f4c582f2df8998a72be6dab4eef499013630c9b..20a3113df44f2a4d0bf7b145a17e3bd94ac4a7f2 100644 --- a/src/share/demo/jfc/Font2DTest/RangeMenu.java +++ b/src/share/demo/jfc/Font2DTest/RangeMenu.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -41,6 +41,9 @@ import java.awt.event.ItemListener; import javax.swing.*; +import java.util.*; +import java.util.regex.*; + /** * RangeMenu.java * @@ -52,358 +55,8 @@ import javax.swing.*; public final class RangeMenu extends JComboBox implements ActionListener { - /// Painfully extracted from java.lang.Character.UnicodeBlock. Arrrgh! - /// Unicode 5.1.0 data. - - private final int[][] UNICODE_RANGES = { - { 0x000000, 0x00007f }, /// BASIC_LATIN - { 0x000080, 0x0000ff }, /// LATIN_1_SUPPLEMENT - { 0x000100, 0x00017f }, /// LATIN_EXTENDED_A - { 0x000180, 0x00024f }, /// LATIN_EXTENDED_B - { 0x000250, 0x0002af }, /// IPA_EXTENSIONS - { 0x0002b0, 0x0002ff }, /// SPACING_MODIFIER_LETTERS - { 0x000300, 0x00036f }, /// COMBINING_DIACRITICAL_MARKS - { 0x000370, 0x0003ff }, /// GREEK_AND_COPTIC - { 0x000400, 0x0004ff }, /// CYRILLIC - { 0x000500, 0x00052f }, /// CYRILLIC_SUPPLEMENTARY - { 0x000530, 0x00058f }, /// ARMENIAN - { 0x000590, 0x0005ff }, /// HEBREW - { 0x000600, 0x0006ff }, /// ARABIC - { 0x000700, 0x00074f }, /// SYRIAC - { 0x000750, 0x00077f }, /// ARABIC_SUPPLEMENT - { 0x000780, 0x0007bf }, /// THAANA - { 0x0007c0, 0x0007ff }, /// NKO - { 0x000900, 0x00097f }, /// DEVANAGARI - { 0x000980, 0x0009ff }, /// BENGALI - { 0x000a00, 0x000a7f }, /// GURMUKHI - { 0x000a80, 0x000aff }, /// GUJARATI - { 0x000b00, 0x000b7f }, /// ORIYA - { 0x000b80, 0x000bff }, /// TAMIL - { 0x000c00, 0x000c7f }, /// TELUGU - { 0x000c80, 0x000cff }, /// KANNADA - { 0x000d00, 0x000d7f }, /// MALAYALAM - { 0x000d80, 0x000dff }, /// SINHALA - { 0x000e00, 0x000e7f }, /// THAI - { 0x000e80, 0x000eff }, /// LAO - { 0x000f00, 0x000fff }, /// TIBETAN - { 0x001000, 0x00109f }, /// MYANMAR - { 0x0010a0, 0x0010ff }, /// GEORGIAN - { 0x001100, 0x0011ff }, /// HANGUL_JAMO - { 0x001200, 0x00137f }, /// ETHIOPIC - { 0x001380, 0x00139f }, /// ETHIOPIC_SUPPLEMENT - { 0x0013a0, 0x0013ff }, /// CHEROKEE - { 0x001400, 0x00167f }, /// UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS - { 0x001680, 0x00169f }, /// OGHAM - { 0x0016a0, 0x0016ff }, /// RUNIC - { 0x001700, 0x00171f }, /// TAGALOG - { 0x001720, 0x00173f }, /// HANUNOO - { 0x001740, 0x00175f }, /// BUHID - { 0x001760, 0x00177f }, /// TAGBANWA - { 0x001780, 0x0017ff }, /// KHMER - { 0x001800, 0x0018af }, /// MONGOLIAN - { 0x001900, 0x00194f }, /// LIMBU - { 0x001950, 0x00197f }, /// TAI_LE - { 0x001980, 0x0019df }, /// NEW_TAI_LE - { 0x0019e0, 0x0019ff }, /// KHMER_SYMBOLS - { 0x001a00, 0x001a1f }, /// BUGINESE - { 0x001b00, 0x001b7f }, /// BALINESE - { 0x001b80, 0x001bbf }, /// SUNDANESE - { 0x001c00, 0x001c4f }, /// LEPCHA - { 0x001c50, 0x001c7f }, /// OL_CHIKI - { 0x001d00, 0x001d7f }, /// PHONETIC_EXTENSIONS - { 0x001d80, 0x001dbf }, /// PHONEITC EXTENSIONS SUPPLEMENT - { 0x001dc0, 0x001dff }, /// COMBINING_DIACRITICAL_MAKRS_SUPPLEMENT - { 0x001e00, 0x001eff }, /// LATIN_EXTENDED_ADDITIONAL - { 0x001f00, 0x001fff }, /// GREEK_EXTENDED - { 0x002000, 0x00206f }, /// GENERAL_PUNCTUATION - { 0x002070, 0x00209f }, /// SUPERSCRIPTS_AND_SUBSCRIPTS - { 0x0020a0, 0x0020cf }, /// CURRENCY_SYMBOLS - { 0x0020d0, 0x0020ff }, /// COMBINING_MARKS_FOR_SYMBOLS - { 0x002100, 0x00214f }, /// LETTERLIKE_SYMBOLS - { 0x002150, 0x00218f }, /// NUMBER_FORMS - { 0x002190, 0x0021ff }, /// ARROWS - { 0x002200, 0x0022ff }, /// MATHEMATICAL_OPERATORS - { 0x002300, 0x0023ff }, /// MISCELLANEOUS_TECHNICAL - { 0x002400, 0x00243f }, /// CONTROL_PICTURES - { 0x002440, 0x00245f }, /// OPTICAL_CHARACTER_RECOGNITION - { 0x002460, 0x0024ff }, /// ENCLOSED_ALPHANUMERICS - { 0x002500, 0x00257f }, /// BOX_DRAWING - { 0x002580, 0x00259f }, /// BLOCK_ELEMENTS - { 0x0025a0, 0x0025ff }, /// GEOMETRIC_SHAPES - { 0x002600, 0x0026ff }, /// MISCELLANEOUS_SYMBOLS - { 0x002700, 0x0027bf }, /// DINGBATS - { 0x0027c0, 0x0027ef }, /// MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A - { 0x0027f0, 0x0027ff }, /// SUPPLEMENTAL_ARROWS_A - { 0x002800, 0x0028ff }, /// BRAILLE_PATTERNS - { 0x002900, 0x00297f }, /// SUPPLEMENTAL_ARROWS_B - { 0x002980, 0x0029ff }, /// MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B - { 0x002a00, 0x002aff }, /// SUPPLEMENTAL_MATHEMATICAL_OPERATORS - { 0x002b00, 0x002bff }, /// MISCELLANEOUS_SYMBOLS_AND_ARROWS - { 0x002c00, 0x002c5f }, /// GLAGOLITIC - { 0x002c60, 0x002c7f }, /// LATIN_EXTENDED-C - { 0x002c80, 0x002cff }, /// COPTIC - { 0x002d00, 0x002d2f }, /// GEORGIAN_SUPPLEMENT - { 0x002d30, 0x002d7f }, /// TIFINAGH - { 0x002d80, 0x002ddf }, /// ETHIOPIC_EXTENDED - { 0x002de0, 0x002dff }, /// CYRILLIC_EXTENDED-A - { 0x002e00, 0x002e7f }, /// SUPPLEMENTAL_PUNCTUATION - { 0x002e80, 0x002eff }, /// CJK_RADICALS_SUPPLEMENT - { 0x002f00, 0x002fdf }, /// KANGXI_RADICALS - { 0x002ff0, 0x002fff }, /// IDEOGRAPHIC_DESCRIPTION_CHARACTERS - { 0x003000, 0x00303f }, /// CJK_SYMBOLS_AND_PUNCTUATION - { 0x003040, 0x00309f }, /// HIRAGANA - { 0x0030a0, 0x0030ff }, /// KATAKANA - { 0x003100, 0x00312f }, /// BOPOMOFO - { 0x003130, 0x00318f }, /// HANGUL_COMPATIBILITY_JAMO - { 0x003190, 0x00319f }, /// KANBUN - { 0x0031a0, 0x0031bf }, /// BOPOMOFO_EXTENDED - { 0x0031c0, 0x0031ef }, /// CJK_STROKES - { 0x0031f0, 0x0031ff }, /// KATAKANA_PHONETIC_EXTENSIONS - { 0x003200, 0x0032ff }, /// ENCLOSED_CJK_LETTERS_AND_MONTHS - { 0x003300, 0x0033ff }, /// CJK_COMPATIBILITY - { 0x003400, 0x004dbf }, /// CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A - { 0x004dc0, 0x004dff }, /// YIJING_HEXAGRAM_SYMBOLS - { 0x004e00, 0x009fff }, /// CJK_UNIFIED_IDEOGRAPHS - { 0x00a000, 0x00a48f }, /// YI_SYLLABLES - { 0x00a490, 0x00a4cf }, /// YI_RADICALS - { 0x00a500, 0x00a63f }, /// YAI - { 0x00a640, 0x00a69f }, /// CYRILLIC_EXTENDED-B - { 0x00a700, 0x00a71f }, /// MODIFIER_TONE_LETTERS - { 0x00a720, 0x00a7ff }, /// LATIN_EXTENDED-D - { 0x00a800, 0x00a82f }, /// SYLOTI_NAGRI - { 0x00a840, 0x00a87f }, /// PHAGS-PA - { 0x00a880, 0x00a8df }, /// SAURASHTRA - { 0x00a900, 0x00a92f }, /// KAYAH_LI - { 0x00a930, 0x00a95f }, /// REJANG - { 0x00aa00, 0x00aa5f }, /// CHAM - { 0x00ac00, 0x00d7af }, /// HANGUL_SYLLABLES - { 0x00d800, 0x00db7f }, /// HIGH_SURROGATES_AREA - { 0x00db80, 0x00dbff }, /// HIGH_PRIVATE_USE_SURROGATES_AREA - { 0x00dc00, 0x00dfff }, /// LOW_SURROGATES_AREA - { 0x00e000, 0x00f8ff }, /// PRIVATE_USE_AREA - { 0x00f900, 0x00faff }, /// CJK_COMPATIBILITY_IDEOGRAPHS - { 0x00fb00, 0x00fb4f }, /// ALPHABETIC_PRESENTATION_FORMS - { 0x00fb50, 0x00fdff }, /// ARABIC_PRESENTATION_FORMS_A - { 0x00fe00, 0x00fe0f }, /// VARIATION_SELECTORS - { 0x00fe10, 0x00fe1f }, /// VERTICAL_FORMS - { 0x00fe20, 0x00fe2f }, /// COMBINING_HALF_MARKS - { 0x00fe30, 0x00fe4f }, /// CJK_COMPATIBILITY_FORMS - { 0x00fe50, 0x00fe6f }, /// SMALL_FORM_VARIANTS - { 0x00fe70, 0x00feff }, /// ARABIC_PRESENTATION_FORMS_B - { 0x00ff00, 0x00ffef }, /// HALFWIDTH_AND_FULLWIDTH_FORMS - { 0x00fff0, 0x00ffff }, /// SPECIALS - { 0x010000, 0x01007f }, /// LINEAR_B_SYLLABARY - { 0x010080, 0x0100ff }, /// LINEAR_B_IDEOGRAMS - { 0x010100, 0x01013f }, /// AEGEAN_NUMBERS - { 0x010140, 0x01018f }, /// ANCIENT_GREEK_NUMBERS - { 0x010190, 0x0101cf }, /// ANCIENT_SYMBOLS - { 0x0101d0, 0x0101ff }, /// PHAISTOS_DISC - { 0x010280, 0x01029f }, /// LYCIAN - { 0x0102a0, 0x0102df }, /// CARIAN - { 0x010300, 0x01032f }, /// OLD_ITALIC - { 0x010330, 0x01034f }, /// GOTHIC - { 0x010380, 0x01039f }, /// UGARITIC - { 0x0103a0, 0x0103df }, /// OLD_PERSIAN - { 0x010400, 0x01044f }, /// DESERET - { 0x010450, 0x01047f }, /// SHAVIAN - { 0x010480, 0x0104af }, /// OSMANYA - { 0x010800, 0x01083f }, /// CYPRIOT_SYLLABARY - { 0x010900, 0x01091f }, /// PHOENICIAN - { 0x010920, 0x01093f }, /// LYDIAN - { 0x010a00, 0x010a5f }, /// KHAROSHTHI - { 0x012000, 0x0123ff }, /// CUNEIFORM - { 0x012400, 0x01247f }, /// CUNEIFORM_NUMBERS_AND_PUNCTUATION - { 0x01d000, 0x01d0ff }, /// BYZANTINE_MUSICAL_SYMBOLS - { 0x01d100, 0x01d1ff }, /// MUSICAL_SYMBOLS - { 0x01d200, 0x01d24f }, /// ANCIENT_GREEK_MUSICAL_NOTATION - { 0x01d300, 0x01d35f }, /// TAI_XUAN_JING_SYMBOLS - { 0x01d360, 0x01d37f }, /// COUNTING_ROD_NUMERALS - { 0x01d400, 0x01d7ff }, /// MATHEMATICAL_ALPHANUMERIC_SYMBOLS - { 0x01f000, 0x01f02f }, /// MAHJONG_TILES - { 0x01f030, 0x01f09f }, /// DOMINO_TILES - { 0x020000, 0x02a6df }, /// CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B - { 0x02f800, 0x02fa1f }, /// CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT - { 0x0e0000, 0x0e007f }, /// TAGS - { 0x0e0100, 0x0e01ef }, /// VARIATION_SELECTORS_SUPPLEMENT - { 0x0f0000, 0x0fffff }, /// SUPPLEMENTARY_PRIVATE_USE_AREA_A - { 0x100000, 0x10ffff }, /// SUPPLEMENTARY_PRIVATE_USE_AREA_B - { 0x000000, 0x00007f }, /// OTHER [USER DEFINED RANGE] - }; - - private final String[] UNICODE_RANGE_NAMES = { - "Basic Latin", - "Latin-1 Supplement", - "Latin Extended-A", - "Latin Extended-B", - "IPA Extensions", - "Spacing Modifier Letters", - "Combining Diacritical Marks", - "Greek and Coptic", - "Cyrillic", - "Cyrillic Supplement", - "Armenian", - "Hebrew", - "Arabic", - "Syriac", - "Arabic Supplement", - "Thaana", - "NKo", - "Devanagari", - "Bengali", - "Gurmukhi", - "Gujarati", - "Oriya", - "Tamil", - "Telugu", - "Kannada", - "Malayalam", - "Sinhala", - "Thai", - "Lao", - "Tibetan", - "Myanmar", - "Georgian", - "Hangul Jamo", - "Ethiopic", - "Ethiopic Supplement", - "Cherokee", - "Unified Canadian Aboriginal Syllabics", - "Ogham", - "Runic", - "Tagalog", - "Hanunoo", - "Buhid", - "Tagbanwa", - "Khmer", - "Mongolian", - "Limbu", - "Tai Le", - "New Tai Lue", - "Khmer Symbols", - "Buginese", - "Balinese", - "Sundanese", - "Lepcha", - "Ol Chiki", - "Phonetic Extensions", - "Phonetic Extensions Supplement", - "Combining Diacritical Marks Supplement", - "Latin Extended Additional", - "Greek Extended", - "General Punctuation", - "Superscripts and Subscripts", - "Currency Symbols", - "Combining Diacritical Marks for Symbols", - "Letterlike Symbols", - "Number Forms", - "Arrows", - "Mathematical Operators", - "Miscellaneous Technical", - "Control Pictures", - "Optical Character Recognition", - "Enclosed Alphanumerics", - "Box Drawing", - "Block Elements", - "Geometric Shapes", - "Miscellaneous Symbols", - "Dingbats", - "Miscellaneous Mathematical Symbols-A", - "Supplemental Arrows-A", - "Braille Patterns", - "Supplemental Arrows-B", - "Miscellaneous Mathematical Symbols-B", - "Supplemental Mathematical Operators", - "Miscellaneous Symbols and Arrows", - "Glagolitic", - "Latin Extended-C", - "Coptic", - "Georgian Supplement", - "Tifinagh", - "Ethiopic Extended", - "Cyrillic Extended-A", - "Supplemental Punctuation", - "CJK Radicals Supplement", - "Kangxi Radicals", - "Ideographic Description Characters", - "CJK Symbols and Punctuation", - "Hiragana", - "Katakana", - "Bopomofo", - "Hangul Compatibility Jamo", - "Kanbun", - "Bopomofo Extended", - "CJK Strokes", - "Katakana Phonetic Extensions", - "Enclosed CJK Letters and Months", - "CJK Compatibility", - "CJK Unified Ideographs Extension A", - "Yijing Hexagram Symbols", - "CJK Unified Ideographs", - "Yi Syllables", - "Yi Radicals", - "Vai", - "Cyrillic Extended-B", - "Modifier Tone Letters", - "Latin Extended-D", - "Syloti Nagri", - "Phags-pa", - "Saurashtra", - "Kayah Li", - "Rejang", - "Cham", - "Hangul Syllables", - "High Surrogates", - "High Private Use Surrogates", - "Low Surrogates", - "Private Use Area", - "CJK Compatibility Ideographs", - "Alphabetic Presentation Forms", - "Arabic Presentation Forms-A", - "Variation Selectors", - "Vertical Forms", - "Combining Half Marks", - "CJK Compatibility Forms", - "Small Form Variants", - "Arabic Presentation Forms-B", - "Halfwidth and Fullwidth Forms", - "Specials", - "Linear B Syllabary", - "Linear B Ideograms", - "Aegean Numbers", - "Ancient Greek Numbers", - "Ancient Symbols", - "Phaistos Disc", - "Lycian", - "Carian", - "Old Italic", - "Gothic", - "Ugaritic", - "Old Persian", - "Deseret", - "Shavian", - "Osmanya", - "Cypriot Syllabary", - "Phoenician", - "Lydian", - "Kharoshthi", - "Cuneiform", - "Cuneiform Numbers and Punctuation", - "Byzantine Musical Symbols", - "Musical Symbols", - "Ancient Greek Musical Notation", - "Tai Xuan Jing Symbols", - "Counting Rod Numerals", - "Mathematical Alphanumeric Symbols", - "Mahjong Tiles", - "Domino Tiles", - "CJK Unified Ideographs Extension B", - "CJK Compatibility Ideographs Supplement", - "Tags", - "Variation Selectors Supplement", - "Supplementary Private Use Area-A", - "Supplementary Private Use Area-B", - "Custom...", - }; + private static final int[][] UNICODE_RANGES = getUnicodeRanges(); + private static final String[] UNICODE_RANGE_NAMES = getUnicodeRangeNames(); private boolean useCustomRange = false; private int[] customRange = { 0x0000, 0x007f }; @@ -536,4 +189,61 @@ public final class RangeMenu extends JComboBox implements ActionListener { customRangeDialog.hide(); } } + + private static int[][] getUnicodeRanges() { + List ranges = new ArrayList<>(); + ranges.add(0); + Character.UnicodeBlock currentBlock = Character.UnicodeBlock.of(0); + for (int cp = 0x000001; cp < 0x110000; cp++ ) { + Character.UnicodeBlock ub = Character.UnicodeBlock.of(cp); + if (currentBlock == null) { + if (ub != null) { + ranges.add(cp); + currentBlock = ub; + } + } else { // being in some unicode range + if (ub == null) { + ranges.add(cp - 1); + currentBlock = null; + } else if (cp == 0x10ffff) { // end of last block + ranges.add(cp); + } else if (! ub.equals(currentBlock)) { + ranges.add(cp - 1); + ranges.add(cp); + currentBlock = ub; + } + } + } + ranges.add(0x00); // for user defined range. + ranges.add(0x7f); // for user defined range. + + int[][] returnval = new int[ranges.size() / 2][2]; + for (int i = 0 ; i < ranges.size() / 2 ; i++ ) { + returnval[i][0] = ranges.get(2*i); + returnval[i][1] = ranges.get(2*i + 1); + } + return returnval; + } + + private static String[] getUnicodeRangeNames() { + String[] names = new String[UNICODE_RANGES.length]; + for (int i = 0 ; i < names.length ; i++ ) { + names[i] = titleCase( + Character.UnicodeBlock.of(UNICODE_RANGES[i][0]).toString()); + } + names[names.length - 1] = "Custom..."; + return names; + } + + private static String titleCase(String str) { + str = str.replaceAll("_", " "); + Pattern p = Pattern.compile("(^|\\W)([a-z])"); + Matcher m = p.matcher(str.toLowerCase(Locale.ROOT)); + StringBuffer sb = new StringBuffer(); + while (m.find()) { + m.appendReplacement(sb, m.group(1) + m.group(2).toUpperCase(Locale.ROOT)); + } + m.appendTail(sb); + return sb.toString().replace("Cjk", "CJK").replace("Nko", "NKo"); + } } diff --git a/test/sun/text/resources/LocaleData b/test/sun/text/resources/LocaleData index 36f17917d12efafa8eb91ac176b471097b98834e..0f538113beb342ca5bf801354367c619affc42c7 100644 --- a/test/sun/text/resources/LocaleData +++ b/test/sun/text/resources/LocaleData @@ -6356,3 +6356,93 @@ CurrencyNames/pt/zwd=D\u00f3lar do Zimb\u00e1bue # bug 7020960 CurrencyNames/sr_RS/RSD=\u0434\u0438\u043d. + +# bug 7025837 +CurrencyNames/sr-Latn-BA/bam=Bosansko-Hercegova\u010dka konvertibilna marka +CurrencyNames/sr-Latn-BA/eur=Evro +CurrencyNames/sr-Latn-ME/eur=Evro +CurrencyNames/sr-Latn-RS/rsd=Srpski dinar + +CurrencyNames//afa=Afghan Afghani (1927-2002) +CurrencyNames//afn=Afghan Afghani +CurrencyNames//ang=Netherlands Antillean Guilder +CurrencyNames//awg=Aruban Florin +CurrencyNames//azm=Azerbaijani Manat (1993-2006) +CurrencyNames//azn=Azerbaijani Manat +CurrencyNames//bbd=Barbadian Dollar +CurrencyNames//bdt=Bangladeshi Taka +CurrencyNames//bgn=Bulgarian Lev +CurrencyNames//bif=Burundian Franc +CurrencyNames//bob=Bolivian Boliviano +CurrencyNames//btn=Bhutanese Ngultrum +CurrencyNames//byb=Belarusian New Ruble (1994-1999) +CurrencyNames//byr=Belarusian Ruble +CurrencyNames//cdf=Congolese Franc +CurrencyNames//clf=Chilean Unit of Account (UF) +CurrencyNames//cny=Chinese Yuan +CurrencyNames//crc=Costa Rican Col\u00f3n +CurrencyNames//csd=Serbian Dinar (2002-2006) +CurrencyNames//cve=Cape Verdean Escudo +CurrencyNames//cyp=Cypriot Pound +CurrencyNames//dem=German Mark +CurrencyNames//djf=Djiboutian Franc +CurrencyNames//fjd=Fijian Dollar +CurrencyNames//ghc=Ghanaian Cedi (1979-2007) +CurrencyNames//ghs=Ghanaian Cedi +CurrencyNames//gmd=Gambian Dalasi +CurrencyNames//gnf=Guinean Franc +CurrencyNames//gtq=Guatemalan Quetzal +CurrencyNames//gyd=Guyanaese Dollar +CurrencyNames//hnl=Honduran Lempira +CurrencyNames//isk=Icelandic Kr\u00f3na +CurrencyNames//kgs=Kyrgystani Som +CurrencyNames//kmf=Comorian Franc +CurrencyNames//kzt=Kazakhstani Tenge +CurrencyNames//lkr=Sri Lankan Rupee +CurrencyNames//ltl=Lithuanian Litas +CurrencyNames//luf=Luxembourgian Franc +CurrencyNames//mga=Malagasy Ariary +CurrencyNames//mgf=Malagasy Franc +CurrencyNames//mmk=Myanma Kyat +CurrencyNames//mop=Macanese Pataca +CurrencyNames//mro=Mauritanian Ouguiya +CurrencyNames//mur=Mauritian Rupee +CurrencyNames//mvr=Maldivian Rufiyaa +CurrencyNames//mwk=Malawian Kwacha +CurrencyNames//mxv=Mexican Investment Unit +CurrencyNames//mzm=Mozambican Metical (1980-2006) +CurrencyNames//mzn=Mozambican Metical +CurrencyNames//nad=Namibian Dollar +CurrencyNames//nio=Nicaraguan C\u00f3rdoba +CurrencyNames//nlg=Dutch Guilder +CurrencyNames//omr=Omani Rial +CurrencyNames//pen=Peruvian Nuevo Sol +CurrencyNames//pgk=Papua New Guinean Kina +CurrencyNames//pkr=Pakistani Rupee +CurrencyNames//pyg=Paraguayan Guarani +CurrencyNames//rol=Romanian Leu (1952-2006) +CurrencyNames//rsd=Serbian Dinar +CurrencyNames//scr=Seychellois Rupee +CurrencyNames//sdd=Sudanese Dinar (1992-2007) +CurrencyNames//sit=Slovenian Tolar +CurrencyNames//sll=Sierra Leonean Leone +CurrencyNames//srd=Surinamese Dollar +CurrencyNames//srg=Surinamese Guilder +CurrencyNames//std=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra +CurrencyNames//svc=Salvadoran Col\u00f3n +CurrencyNames//szl=Swazi Lilangeni +CurrencyNames//tjs=Tajikistani Somoni +CurrencyNames//tmm=Turkmenistani Manat (1993-2009) +CurrencyNames//top=Tongan Pa\u02bbanga +CurrencyNames//tpe=Timorese Escudo +CurrencyNames//trl=Turkish Lira (1922-2005) +CurrencyNames//try=Turkish Lira +CurrencyNames//twd=New Taiwan Dollar +CurrencyNames//uyu=Uruguayan Peso +CurrencyNames//uzs=Uzbekistan Som +CurrencyNames//veb=Venezuelan Bol\u00edvar (1871-2008) +CurrencyNames//vef=Venezuelan Bol\u00edvar +CurrencyNames//wst=Samoan Tala +CurrencyNames//xxx=Unknown Currency +CurrencyNames//yum=Yugoslavian New Dinar (1994-2002) +CurrencyNames//zwd=Zimbabwean Dollar (1980-2008) diff --git a/test/sun/text/resources/LocaleDataTest.java b/test/sun/text/resources/LocaleDataTest.java index 5cf693cc1aabb7aa30da2af1aff7d11e7310a46f..311b08a9125fc635d5ec7327c65e812383aa7670 100644 --- a/test/sun/text/resources/LocaleDataTest.java +++ b/test/sun/text/resources/LocaleDataTest.java @@ -33,7 +33,7 @@ * 6379214 6485516 6486607 4225362 4494727 6533691 6531591 6531593 6570259 * 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611 * 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787 - * 6919624 6998391 7019267 7020960 + * 6919624 6998391 7019267 7020960 7025837 * @summary Verify locale data * */