--- old/make/jdk/src/classes/build/tools/generatenimbus/UIComponent.java 2020-03-23 19:57:23.411962357 +0100 +++ /dev/null 2020-02-11 10:29:13.086348146 +0100 @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2002, 2013, 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 build.tools.generatenimbus; - -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import java.util.ArrayList; -import java.util.List; - -class UIComponent extends UIRegion { - private String componentName; - - private List stateTypes = new ArrayList<>(); - - UIComponent(XMLStreamReader reader) throws XMLStreamException { - super(reader, false); - componentName = reader.getAttributeValue(null, "componentName"); - while (reader.hasNext()) { - int eventType = reader.next(); - switch (eventType) { - case XMLStreamReader.START_ELEMENT: - switch (reader.getLocalName()) { - case "stateType": - stateTypes.add(new UIStateType(reader)); - break; - default: - parse(reader); - } - break; - case XMLStreamReader.END_ELEMENT: - switch (reader.getLocalName()) { - case "uiComponent": - return; - } - break; - } - } - } - - public List getStateTypes() { return stateTypes; } - - @Override public String getKey() { - if (key == null || "".equals(key)) { - if (componentName == null || "".equals(componentName)) { - return name; - } else { - return "\"" + componentName + "\""; - } - } else { - return key; - } - } -} --- /dev/null 2020-02-11 10:29:13.086348146 +0100 +++ new/src/java.desktop/share/tools/org/openjdk/buildtools/generatenimbus/UIComponent.java 2020-03-23 19:57:23.015962359 +0100 @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2002, 2013, 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 org.openjdk.buildtools.generatenimbus; + +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import java.util.ArrayList; +import java.util.List; + +class UIComponent extends UIRegion { + private String componentName; + + private List stateTypes = new ArrayList<>(); + + UIComponent(XMLStreamReader reader) throws XMLStreamException { + super(reader, false); + componentName = reader.getAttributeValue(null, "componentName"); + while (reader.hasNext()) { + int eventType = reader.next(); + switch (eventType) { + case XMLStreamReader.START_ELEMENT: + switch (reader.getLocalName()) { + case "stateType": + stateTypes.add(new UIStateType(reader)); + break; + default: + parse(reader); + } + break; + case XMLStreamReader.END_ELEMENT: + switch (reader.getLocalName()) { + case "uiComponent": + return; + } + break; + } + } + } + + public List getStateTypes() { return stateTypes; } + + @Override public String getKey() { + if (key == null || "".equals(key)) { + if (componentName == null || "".equals(componentName)) { + return name; + } else { + return "\"" + componentName + "\""; + } + } else { + return key; + } + } +}