Revision 41081 trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/project/documents/view/toc/gui/FPopupMenu.java

View differences:

FPopupMenu.java
150 150 
            new ArrayList<IContextMenuAction>();
151 151 
        @SuppressWarnings("unchecked")
152 152 
        Iterator<Extension> iter = this.extensionPoint.iterator();
153 
        AbstractTocContextMenuAction action;
153 
        IContextMenuAction action;
154 154 
        boolean contains = false;
155 155 
        ITocItem tocItem = this.getNodeUserObject();
156 156 
        if (tocItem instanceof TocItemBranch) {
......
168 168 
            while (iter.hasNext()) {
169 169 
                action = null;
170 170 
                try {
171 
                    action =
172 
                        (AbstractTocContextMenuAction) iter.next().create();
171 
                    action = (IContextMenuAction) iter.next().create();
173 172 
                } catch (Exception e) {
174 173 
                    NotificationManager.addError(e);
175 174 
                }
176 
                if (action != null
177 
                    && !(action instanceof OldTocContextMenuAction)) {
178 
                    action.setMapContext(this.mapContext);
175 
                if (action != null ) {
176 
                	if( action instanceof AbstractTocContextMenuAction
177 
                		&& !(action instanceof OldTocContextMenuAction)) {
178 
                		((AbstractTocContextMenuAction)action).setMapContext(this.mapContext);
179 
                	}
179 180 
                    if (action.isVisible(this.getNodeUserObject(),
180 181 
                        this.selecteds)) {
181 182 
                        actionArrayList.add(action);
......
218 219 
            MenuItem item = new MenuItem(action.getText(), action);
219 220 
            item.setEnabled(action.isEnabled(this.getNodeUserObject(),
220 221 
                this.selecteds));
221 
            if (!action.getGroup().equals(group)) {
222 
                if (group != null) {
223 
                    this.addSeparator();
224 
                }
225 
                group = action.getGroup();
222 
            if( action.getGroup()!=null ) {
223 
	            if ( !action.getGroup().equals(group)) {
224 
	                if (group != null) {
225 
	                    this.addSeparator();
226 
	                }
227 
	                group = action.getGroup();
228 
	            }
226 229 
            }
227 230 
            this.add(item);
228 231 
        }

Also available in: Unified diff