Index: swing/src/main/java/common/javax/swing/plaf/ComponentUI.java =================================================================== --- swing/src/main/java/common/javax/swing/plaf/ComponentUI.java (revision 502206) +++ swing/src/main/java/common/javax/swing/plaf/ComponentUI.java (working copy) @@ -72,8 +72,9 @@ return (accessibleContext != null) ? accessibleContext.getAccessibleChildrenCount() : 0; } - public static ComponentUI createUI(final JComponent component) { - throw new Error("ComponentUI.createUI not implemented"); + public static ComponentUI createUI(final JComponent component) + throws org.apache.harmony.luni.util.NotImplementedException { + throw new org.apache.harmony.luni.util.NotImplementedException(); } } Index: swing/src/main/java/common/javax/swing/plaf/basic/BasicButtonUI.java =================================================================== --- swing/src/main/java/common/javax/swing/plaf/basic/BasicButtonUI.java (revision 502206) +++ swing/src/main/java/common/javax/swing/plaf/basic/BasicButtonUI.java (working copy) @@ -198,13 +198,16 @@ return PROPERTY_PREFIX; } - protected void setTextShiftOffset() { + protected void setTextShiftOffset() + throws org.apache.harmony.luni.util.NotImplementedException{ } - protected void clearTextShiftOffset() { + protected void clearTextShiftOffset() + throws org.apache.harmony.luni.util.NotImplementedException{ } - protected int getTextShiftOffset() { + protected int getTextShiftOffset() + throws org.apache.harmony.luni.util.NotImplementedException{ return 0; } Index: swing/src/main/java/common/javax/swing/plaf/basic/BasicDirectoryModel.java =================================================================== --- swing/src/main/java/common/javax/swing/plaf/basic/BasicDirectoryModel.java (revision 502206) +++ swing/src/main/java/common/javax/swing/plaf/basic/BasicDirectoryModel.java (working copy) @@ -73,7 +73,8 @@ public void invalidateFileCache() { } - public Vector getDirectories() { + public Vector getDirectories() + throws org.apache.harmony.luni.util.NotImplementedException{ return null; } Index: swing/src/main/java/common/javax/swing/plaf/basic/BasicTabbedPaneUI.java =================================================================== --- swing/src/main/java/common/javax/swing/plaf/basic/BasicTabbedPaneUI.java (revision 502206) +++ swing/src/main/java/common/javax/swing/plaf/basic/BasicTabbedPaneUI.java (working copy) @@ -1082,8 +1082,8 @@ return tabRunOverlay; } - protected View getTextViewForTab(final int tabIndex) { - //TODO: implement when HTML styled text is supported + protected View getTextViewForTab(final int tabIndex) + throws org.apache.harmony.luni.util.NotImplementedException { return null; } Index: swing/src/main/java/common/javax/swing/plaf/basic/BasicInternalFrameUI.java =================================================================== --- swing/src/main/java/common/javax/swing/plaf/basic/BasicInternalFrameUI.java (revision 502206) +++ swing/src/main/java/common/javax/swing/plaf/basic/BasicInternalFrameUI.java (working copy) @@ -564,11 +564,13 @@ return new BorderListener(); } - protected JComponent createWestPane(final JInternalFrame f) { + protected JComponent createWestPane(final JInternalFrame f) + throws org.apache.harmony.luni.util.NotImplementedException{ return null; } - protected JComponent createSouthPane(final JInternalFrame f) { + protected JComponent createSouthPane(final JInternalFrame f) + throws org.apache.harmony.luni.util.NotImplementedException{ return null; } @@ -577,7 +579,8 @@ return titlePane; } - protected JComponent createEastPane(final JInternalFrame f) { + protected JComponent createEastPane(final JInternalFrame f) + throws org.apache.harmony.luni.util.NotImplementedException{ return null; } Index: swing/src/main/java/common/javax/swing/plaf/basic/BasicFileChooserUI.java =================================================================== --- swing/src/main/java/common/javax/swing/plaf/basic/BasicFileChooserUI.java (revision 502206) +++ swing/src/main/java/common/javax/swing/plaf/basic/BasicFileChooserUI.java (working copy) @@ -583,7 +583,8 @@ clearIconCache(); } - protected void uninstallStrings(final JFileChooser fc) { + protected void uninstallStrings(final JFileChooser fc) + throws org.apache.harmony.luni.util.NotImplementedException{ } protected void createModel() { @@ -594,7 +595,8 @@ return model; } - public PropertyChangeListener createPropertyChangeListener(final JFileChooser fc) { + public PropertyChangeListener createPropertyChangeListener(final JFileChooser fc) + throws org.apache.harmony.luni.util.NotImplementedException{ return null; } @@ -602,7 +604,8 @@ return fileName; } - public String getDirectoryName() { + public String getDirectoryName() + throws org.apache.harmony.luni.util.NotImplementedException{ return null; } @@ -610,10 +613,12 @@ fileName = filename; } - public void setDirectoryName(final String dirname) { + public void setDirectoryName(final String dirname) + throws org.apache.harmony.luni.util.NotImplementedException{ } - public void rescanCurrentDirectory(final JFileChooser fc) { + public void rescanCurrentDirectory(final JFileChooser fc) + throws org.apache.harmony.luni.util.NotImplementedException{ } public void ensureFileIsVisible(final JFileChooser fc, final File f) { @@ -671,7 +676,8 @@ return dialogTitleText; } - protected JButton getApproveButton(final JFileChooser fc) { + protected JButton getApproveButton(final JFileChooser fc) + throws org.apache.harmony.luni.util.NotImplementedException{ return null; } Index: swing/src/main/java/common/javax/swing/plaf/basic/BasicComboBoxUI.java =================================================================== --- swing/src/main/java/common/javax/swing/plaf/basic/BasicComboBoxUI.java (revision 502206) +++ swing/src/main/java/common/javax/swing/plaf/basic/BasicComboBoxUI.java (working copy) @@ -483,14 +483,16 @@ } - public int getAccessibleChildrenCount(final JComponent c) { + public int getAccessibleChildrenCount(final JComponent c) + throws org.apache.harmony.luni.util.NotImplementedException{ if (comboBox == null) { throw new NullPointerException("comboBox is null"); } return 0; } - public Accessible getAccessibleChild(final JComponent c, final int i) { + public Accessible getAccessibleChild(final JComponent c, final int i) + throws org.apache.harmony.luni.util.NotImplementedException{ return null; } Index: swing/src/main/java/common/javax/swing/plaf/metal/MetalIconFactory.java =================================================================== --- swing/src/main/java/common/javax/swing/plaf/metal/MetalIconFactory.java (revision 502206) +++ swing/src/main/java/common/javax/swing/plaf/metal/MetalIconFactory.java (working copy) @@ -902,7 +902,8 @@ return radioButtonIcon; } - public static Icon getMenuItemCheckIcon() { + public static Icon getMenuItemCheckIcon() + throws org.apache.harmony.luni.util.NotImplementedException{ return null; } Index: swing/src/main/java/common/javax/swing/plaf/metal/OceanTheme.java =================================================================== --- swing/src/main/java/common/javax/swing/plaf/metal/OceanTheme.java (revision 502206) +++ swing/src/main/java/common/javax/swing/plaf/metal/OceanTheme.java (working copy) @@ -28,74 +28,74 @@ } @Override - protected ColorUIResource getPrimary1() { - // TODO implement + protected ColorUIResource getPrimary1() + throws org.apache.harmony.luni.util.NotImplementedException { return super.getPrimary1(); } @Override - protected ColorUIResource getPrimary2() { - // TODO implement + protected ColorUIResource getPrimary2() + throws org.apache.harmony.luni.util.NotImplementedException { return super.getPrimary2(); } @Override - protected ColorUIResource getPrimary3() { - // TODO implement + protected ColorUIResource getPrimary3() + throws org.apache.harmony.luni.util.NotImplementedException { return super.getPrimary3(); } @Override - protected ColorUIResource getSecondary1() { - // TODO implement + protected ColorUIResource getSecondary1() + throws org.apache.harmony.luni.util.NotImplementedException { return super.getSecondary1(); } @Override - protected ColorUIResource getSecondary2() { - // TODO implement + protected ColorUIResource getSecondary2() + throws org.apache.harmony.luni.util.NotImplementedException { return super.getSecondary2(); } @Override - protected ColorUIResource getSecondary3() { - // TODO implement + protected ColorUIResource getSecondary3() + throws org.apache.harmony.luni.util.NotImplementedException { return super.getSecondary3(); } @Override - public void addCustomEntriesToTable(UIDefaults uiDefs) { - // TODO implement + public void addCustomEntriesToTable(UIDefaults uiDefs) + throws org.apache.harmony.luni.util.NotImplementedException { super.addCustomEntriesToTable(uiDefs); } @Override - protected ColorUIResource getBlack() { - // TODO implement + protected ColorUIResource getBlack() + throws org.apache.harmony.luni.util.NotImplementedException { return super.getBlack(); } @Override - public ColorUIResource getControlTextColor() { - // TODO implement + public ColorUIResource getControlTextColor() + throws org.apache.harmony.luni.util.NotImplementedException { return super.getControlTextColor(); } @Override - public ColorUIResource getDesktopColor() { - // TODO implement + public ColorUIResource getDesktopColor() + throws org.apache.harmony.luni.util.NotImplementedException { return super.getDesktopColor(); } @Override - public ColorUIResource getInactiveControlTextColor() { - // TODO implement + public ColorUIResource getInactiveControlTextColor() + throws org.apache.harmony.luni.util.NotImplementedException { return super.getInactiveControlTextColor(); } @Override - public ColorUIResource getMenuDisabledForeground() { - // TODO implement + public ColorUIResource getMenuDisabledForeground() + throws org.apache.harmony.luni.util.NotImplementedException { return super.getMenuDisabledForeground(); }