From: Jan P. <jp...@us...> - 2007-01-02 14:32:33
|
Update of /cvsroot/e-p-i-c/org.epic.perleditor/src/org/epic/perleditor/views In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv15927/src/org/epic/perleditor/views Modified Files: Tag: stable PerlDocView.java PerlOutlineLabelProvider.java Log Message: Fixed bug [ 1236592 ] Eclipse crash - SWTError: No more handles. Index: PerlDocView.java =================================================================== RCS file: /cvsroot/e-p-i-c/org.epic.perleditor/src/org/epic/perleditor/views/PerlDocView.java,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -d -r1.5.2.1 -r1.5.2.2 --- PerlDocView.java 10 Sep 2006 09:52:14 -0000 1.5.2.1 +++ PerlDocView.java 2 Jan 2007 14:32:28 -0000 1.5.2.2 @@ -31,7 +31,7 @@ import org.epic.core.util.PerlExecutor; import org.epic.perleditor.PerlEditorPlugin; import org.epic.perleditor.popupmenus.PopupMessages; -import org.epic.perleditor.editors.PerlImages; +import org.epic.perleditor.PerlPluginImages; /** * @author luelljoc @@ -89,7 +89,7 @@ searchPerldocText.setLayoutData(gridData); searchPerldocButton = new Button(parent, SWT.PUSH | SWT.FLAT); - searchPerldocButton.setImage(PerlImages.ICON_SEARCH.createImage()); + searchPerldocButton.setImage(PerlPluginImages.get(PerlPluginImages.IMG_ICON_SEARCH)); searchPerldocButton.setToolTipText("Search Perldoc"); gridData = new GridData(); @@ -104,7 +104,7 @@ highlightText.setLayoutData(gridData); highlightButton = new Button(parent, SWT.PUSH | SWT.FLAT); - highlightButton.setImage(PerlImages.ICON_MARK_OCCURRENCES.createImage()); + highlightButton.setImage(PerlPluginImages.get(PerlPluginImages.IMG_ICON_MARK_OCCURRENCES)); highlightButton.setToolTipText("Highlight Text"); tabFolder = new TabFolder(parent, SWT.BORDER); @@ -331,4 +331,4 @@ // TODO Auto-generated method stub } -} \ No newline at end of file +} Index: PerlOutlineLabelProvider.java =================================================================== RCS file: /cvsroot/e-p-i-c/org.epic.perleditor/src/org/epic/perleditor/views/PerlOutlineLabelProvider.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- PerlOutlineLabelProvider.java 23 Dec 2005 23:39:40 -0000 1.1 +++ PerlOutlineLabelProvider.java 2 Jan 2007 14:32:28 -0000 1.1.2.1 @@ -4,28 +4,21 @@ import org.eclipse.swt.graphics.Image; import org.epic.core.model.*; import org.epic.core.model.Package; -import org.epic.perleditor.editors.PerlImages; +import org.epic.perleditor.PerlPluginImages; public class PerlOutlineLabelProvider extends LabelProvider { - private static final Image imageSubNode = PerlImages.ICON_SUBROUTINE_NODE.createImage(); - private static final Image imagePackageNode = PerlImages.ICON_PACKAGE_NODE.createImage(); - private static final Image imageUse = PerlImages.ICON_USE.createImage(); - private static final Image imageUseNode = PerlImages.ICON_USE_NODE.createImage(); - private static final Image imageSub = PerlImages.ICON_SUBROUTINE.createImage(); - private static final Image imageConstructor = PerlImages.ICON_CONSTRUCTOR.createImage(); - public Image getImage(Object element) { if (element instanceof Subroutine) { Subroutine sub = (Subroutine) element; - if ("new".equals(sub.getName())) return imageConstructor; - else return imageSub; + if ("new".equals(sub.getName())) return PerlPluginImages.get(PerlPluginImages.IMG_ICON_CONSTRUCTOR); + else return PerlPluginImages.get(PerlPluginImages.IMG_ICON_SUBROUTINE); } else if (element instanceof ModuleUse) { - return imageUse; + return PerlPluginImages.get(PerlPluginImages.IMG_ICON_USE); } else if (element instanceof PerlOutlineContentProvider.PackageElem) { @@ -33,13 +26,13 @@ (PerlOutlineContentProvider.PackageElem) element; if (elem.name.equals(PerlOutlineContentProvider.SUBROUTINES)) - return imageSubNode; + return PerlPluginImages.get(PerlPluginImages.IMG_ICON_SUBROUTINE_NODE); else if (elem.name.equals(PerlOutlineContentProvider.MODULES)) - return imageUseNode; + return PerlPluginImages.get(PerlPluginImages.IMG_ICON_USE_NODE); } else if (element instanceof Package) { - return imagePackageNode; + return PerlPluginImages.get(PerlPluginImages.IMG_ICON_PACKAGE_NODE); } return null; |