1) Fixed issue #779: PHPEclipse reports error with a correct try/catch block

[phpeclipse.git] / archive / net.sourceforge.phpeclipse.quantum.sql / src / com / quantum / view / bookmark / BookmarkView.java

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkView.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkView.java
index f43a99a..c4e2e13 100644 (file)
--- a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkView.java
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/BookmarkView.java
@@ -13,6 +13,7 @@ import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.viewers.IOpenListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.OpenEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -25,6 +26,7 @@ import org.eclipse.ui.WorkbenchException;
 import org.eclipse.ui.actions.ActionContext;
 import org.eclipse.ui.part.ViewPart;
 
+import com.quantum.ImageStore;
 import com.quantum.Messages;
 import com.quantum.QuantumPlugin;
 import com.quantum.actions.CustomCopyAction;
@@ -182,24 +184,24 @@ public class BookmarkView extends ViewPart implements PropertyChangeListener {
                IPreferenceStore store = QuantumPlugin.getDefault().getPreferenceStore();
         String text1 = store.getString("customCopyName1");
         if (text1 != null && text1.trim().length() > 0) {
-                       this.customCopyAction1 = new CustomCopyAction(this,1); // 1 is unused, just in case more custom copies are defined        
+                       this.customCopyAction1 = new CustomCopyAction(1); // 1 is unused, just in case more custom copies are defined        
                        this.customCopyAction1.setText(text1); //$NON-NLS-1$
                        this.customCopyAction1.setImageDescriptor(
-                               QuantumPlugin.getImageDescriptor("copy.gif")); //$NON-NLS-1$
+                                       ImageStore.getImageDescriptor(ImageStore.COPY)); //$NON-NLS-1$
         }
         String text2 = store.getString("customCopyName2");
         if (text2 != null && text1.trim().length() > 0) {
-                       this.customCopyAction2 = new CustomCopyAction(this,2); // 1 is unused, just in case more custom copies are defined        
+                       this.customCopyAction2 = new CustomCopyAction(2); // 1 is unused, just in case more custom copies are defined        
                        this.customCopyAction2.setText(text2); //$NON-NLS-1$
                        this.customCopyAction2.setImageDescriptor(
-                               QuantumPlugin.getImageDescriptor("copy.gif")); //$NON-NLS-1$
+                                       ImageStore.getImageDescriptor(ImageStore.COPY)); //$NON-NLS-1$
         }
         String text3 = store.getString("customCopyName3");
         if (text3 != null && text1.trim().length() > 0) {
-                       this.customCopyAction3 = new CustomCopyAction(this,3); // 1 is unused, just in case more custom copies are defined        
+                       this.customCopyAction3 = new CustomCopyAction(3); // 1 is unused, just in case more custom copies are defined        
                        this.customCopyAction3.setText(text3); //$NON-NLS-1$
                        this.customCopyAction3.setImageDescriptor(
-                               QuantumPlugin.getImageDescriptor("copy.gif")); //$NON-NLS-1$
+                                       ImageStore.getImageDescriptor(ImageStore.COPY)); //$NON-NLS-1$
         }
        }
        public void dispose(){
@@ -250,12 +252,15 @@ public class BookmarkView extends ViewPart implements PropertyChangeListener {
                        mgr.add(new Separator());
                        MenuManager subMenu = new MenuManager(Messages.getString("bookmarkview.customCopyAction")); 
                        if (this.customCopyAction1 != null) {
+                           customCopyAction1.selectionChanged(selection);
                                subMenu.add(customCopyAction1);
                        }
                        if (this.customCopyAction2 != null) {
+                               customCopyAction2.selectionChanged(selection);
                                subMenu.add(customCopyAction2);
                        }
                        if (this.customCopyAction3 != null) {
+                               customCopyAction3.selectionChanged(selection);
                                subMenu.add(customCopyAction3);
                        }
                        mgr.add(subMenu);
@@ -273,12 +278,15 @@ public class BookmarkView extends ViewPart implements PropertyChangeListener {
                                        || this.customCopyAction3 != null)) {
             MenuManager subMenu = new MenuManager(Messages.getString("bookmarkview.customCopyAction")); 
             if (this.customCopyAction1 != null) {
-            subMenu.add(customCopyAction1);
+               customCopyAction1.selectionChanged(selection);
+               subMenu.add(customCopyAction1);
             }
             if (this.customCopyAction2 != null) {
+               customCopyAction2.selectionChanged(selection);
                subMenu.add(customCopyAction2);
             }
             if (this.customCopyAction3 != null) {
+               customCopyAction3.selectionChanged(selection);
                subMenu.add(customCopyAction3);
             }
             mgr.add(subMenu);