diff --git a/pmd-swingui/lib/jaxen-core-1.0-fcs.jar b/pmd-swingui/lib/jaxen-core-1.0-fcs.jar index 708c9fc0cd..710fa0a00e 100644 Binary files a/pmd-swingui/lib/jaxen-core-1.0-fcs.jar and b/pmd-swingui/lib/jaxen-core-1.0-fcs.jar differ diff --git a/pmd-swingui/lib/pmd-1.1.jar b/pmd-swingui/lib/pmd-1.1.jar index 5c11f3a1d0..c52fe71020 100644 Binary files a/pmd-swingui/lib/pmd-1.1.jar and b/pmd-swingui/lib/pmd-1.1.jar differ diff --git a/pmd-swingui/lib/saxpath-1.0-fcs.jar b/pmd-swingui/lib/saxpath-1.0-fcs.jar index 479b5581c5..307dea5444 100644 Binary files a/pmd-swingui/lib/saxpath-1.0-fcs.jar and b/pmd-swingui/lib/saxpath-1.0-fcs.jar differ diff --git a/pmd-swingui/lib/xercesImpl-2.0.2.jar b/pmd-swingui/lib/xercesImpl-2.0.2.jar index c77f52f91b..1b5df8fae5 100644 Binary files a/pmd-swingui/lib/xercesImpl-2.0.2.jar and b/pmd-swingui/lib/xercesImpl-2.0.2.jar differ diff --git a/pmd-swingui/lib/xmlParserAPIs-2.0.2.jar b/pmd-swingui/lib/xmlParserAPIs-2.0.2.jar index 0e00681007..62765fea2e 100644 Binary files a/pmd-swingui/lib/xmlParserAPIs-2.0.2.jar and b/pmd-swingui/lib/xmlParserAPIs-2.0.2.jar differ diff --git a/pmd-swingui/resources/net/sourceforge/pmd/swingui/icons/pmdlogo.gif b/pmd-swingui/resources/net/sourceforge/pmd/swingui/icons/pmdlogo.gif new file mode 100644 index 0000000000..1e1801a995 Binary files /dev/null and b/pmd-swingui/resources/net/sourceforge/pmd/swingui/icons/pmdlogo.gif differ diff --git a/pmd-swingui/resources/net/sourceforge/pmd/swingui/icons/pmdlogo.jpg b/pmd-swingui/resources/net/sourceforge/pmd/swingui/icons/pmdlogo.jpg new file mode 100644 index 0000000000..71ec8e45b6 Binary files /dev/null and b/pmd-swingui/resources/net/sourceforge/pmd/swingui/icons/pmdlogo.jpg differ diff --git a/pmd-swingui/src/net/sourceforge/pmd/swingui/MotifPMDLookAndFeel.java b/pmd-swingui/src/net/sourceforge/pmd/swingui/MotifPMDLookAndFeel.java index 8e3ecea8de..4dfa5de913 100644 --- a/pmd-swingui/src/net/sourceforge/pmd/swingui/MotifPMDLookAndFeel.java +++ b/pmd-swingui/src/net/sourceforge/pmd/swingui/MotifPMDLookAndFeel.java @@ -99,14 +99,14 @@ public class MotifPMDLookAndFeel extends MotifLookAndFeel { Object[] defaults = {"document", LookAndFeel.makeIcon(plafClass, "icons/document.gif"), "cancel", LookAndFeel.makeIcon(plafClass, "icons/cancel.gif"), "save", LookAndFeel.makeIcon(plafClass, "icons/save.gif"), - "saveAs", LookAndFeel.makeIcon(plafClass, "icons/saveAs.gif"), + "saveAs", LookAndFeel.makeIcon(plafClass, "icons/saveas.gif"), "print", LookAndFeel.makeIcon(plafClass, "icons/print.gif"), "copy", LookAndFeel.makeIcon(plafClass, "icons/copy.gif"), "edit", LookAndFeel.makeIcon(plafClass, "icons/edit.gif"), "view", LookAndFeel.makeIcon(plafClass, "icons/view.gif"), "help", LookAndFeel.makeIcon(plafClass, "icons/help.gif"), - "pmdLogo", LookAndFeel.makeIcon(plafClass, "icons/pmdLogo.gif"), - "pmdLogoImage", getImageIcon("icons/pmdLogo.jpg"), + "pmdLogo", LookAndFeel.makeIcon(plafClass, "icons/pmdlogo.gif"), + "pmdLogoImage", getImageIcon("icons/pmdlogo.jpg"), "labelFont", new Font("Dialog", Font.BOLD, 12), "label14Font", new Font("Dialog", Font.BOLD, 14), "label16Font", new Font("Dialog", Font.BOLD, 16), @@ -119,7 +119,7 @@ public class MotifPMDLookAndFeel extends MotifLookAndFeel { "serif12Font", new Font("Serif", Font.PLAIN, 12), "serif14Font", new Font("Serif", Font.PLAIN, 14), "viewerProperties", loadViewerProperties(), - +/* // These are all the icons defined in the WindowsLookAndFeel. We redefine them // here because of the way they are defined in that class: in terms of the return // value of getClass(). I.e., getClass() just returns the handle to the invoking @@ -128,11 +128,23 @@ public class MotifPMDLookAndFeel extends MotifLookAndFeel { // Since we've just called the superclass method, the icons have been installed // incorrectly in the table. Reinstall them using the correct class. - "Tree.openIcon", LookAndFeel.makeIcon(lafClass, "icons/TreeOpen.gif"), "Tree.closedIcon", LookAndFeel.makeIcon(lafClass, "icons/TreeClosed.gif"), "Tree.leafIcon", LookAndFeel.makeIcon(lafClass, "icons/TreeLeaf.gif"), + "Tree.openIcon", LookAndFeel.makeIcon(lafClass, "icons/TreeOpen.gif"), + "Tree.closedIcon", LookAndFeel.makeIcon(lafClass, "icons/TreeClosed.gif"), + "Tree.leafIcon", LookAndFeel.makeIcon(lafClass, "icons/TreeLeaf.gif"), - "FileChooser.newFolderIcon", LookAndFeel.makeIcon(lafClass, "icons/NewFolder.gif"), "FileChooser.upFolderIcon", LookAndFeel.makeIcon(lafClass, "icons/UpFolder.gif"), "FileChooser.homeFolderIcon", LookAndFeel.makeIcon(lafClass, "icons/HomeFolder.gif"), "FileChooser.detailsViewIcon", LookAndFeel.makeIcon(lafClass, "icons/DetailsView.gif"), "FileChooser.listViewIcon", LookAndFeel.makeIcon(lafClass, "icons/ListView.gif"), + "FileChooser.newFolderIcon", LookAndFeel.makeIcon(lafClass, "icons/NewFolder.gif"), + "FileChooser.upFolderIcon", LookAndFeel.makeIcon(lafClass, "icons/UpFolder.gif"), + "FileChooser.homeFolderIcon", LookAndFeel.makeIcon(lafClass, "icons/HomeFolder.gif"), + "FileChooser.detailsViewIcon", LookAndFeel.makeIcon(lafClass, "icons/DetailsView.gif"), + "FileChooser.listViewIcon", LookAndFeel.makeIcon(lafClass, "icons/ListView.gif"), - "FileView.directoryIcon", LookAndFeel.makeIcon(lafClass, "icons/Directory.gif"), "FileView.fileIcon", LookAndFeel.makeIcon(lafClass, "icons/File.gif"), "FileView.computerIcon", LookAndFeel.makeIcon(lafClass, "icons/Computer.gif"), "FileView.hardDriveIcon", LookAndFeel.makeIcon(lafClass, "icons/HardDrive.gif"), "FileView.floppyDriveIcon", LookAndFeel.makeIcon(lafClass, "icons/FloppyDrive.gif"), }; + "FileView.directoryIcon", LookAndFeel.makeIcon(lafClass, "icons/Directory.gif"), + "FileView.fileIcon", LookAndFeel.makeIcon(lafClass, "icons/File.gif"), + "FileView.computerIcon", LookAndFeel.makeIcon(lafClass, "icons/Computer.gif"), + "FileView.hardDriveIcon", LookAndFeel.makeIcon(lafClass, "icons/HardDrive.gif"), + "FileView.floppyDriveIcon", LookAndFeel.makeIcon(lafClass, "icons/FloppyDrive.gif"), + */ + }; table.putDefaults(defaults); }