/ - Diff - Application: gvSIG desktop - gvSIG

         private static final String noIcon = "no-icon";
         private Map<JComponent,IExtension> control2extensions = new HashMap<JComponent, IExtension>();
         private MDIFrame() {
+        }
-...
         public static boolean isInitialized() {
             return instance!=null ;
+        }
         public static MDIFrame getInstance() {
             if ( instance == null ) {
                 instance = new MDIFrame();
-...
                         jtb.add(dropDownButton);
                         addControl(dropDownButton);
+                    }
                     dropDownButton.add(action);
                     dropDownButton.add(actionManager.getTranslated(action));
+                }
                 return;
+            }
             I18nManager i18nManager = ToolsLocator.getI18nManager();
             JToolBarToggleButton btn;
-...
                         jtb.add(dropDownButton);
                         addControl(dropDownButton);
+                    }
                     dropDownButton.add(action);
                     dropDownButton.add(actionManager.getTranslated(action));
+                }
                 return;
+            }
             I18nManager i18nManager = ToolsLocator.getI18nManager();
             JToolBarButton btn;
-...
                 jtb.addSeparator();
+            }
+        }
         private SelectableToolBar getToolBar(final String toolBarName) {
             SelectableToolBar jtb = (SelectableToolBar) toolBarMap.get(toolBarName);
             if ( jtb == null ) {
-...
+            }
             return jtb;
+        }
         public void addTool(final ActionInfo action, final String toolBarName, final String dropDownName) {
             if ( !SwingUtilities.isEventDispatchThread() ) {
                 SwingUtilities.invokeLater(new Runnable() {
-...
                 dropDownButton = new DropDownButton();
                 jtb.add(dropDownButton);
+            }
             dropDownButton.add(action);
             ActionInfoManager actionManager = PluginsLocator.getActionInfoManager();
             dropDownButton.add(actionManager.getTranslated(action));
+        }
         public void addTool(final ActionInfo action, final String toolBarName) {
             I18nManager i18nManager = ToolsLocator.getI18nManager();
-...
         public void addToolBarControl(Class<?> extensionClass, JToolBar control, String name) {
             toolBars.add(control);
             addControl(control);
             PluginsManager pluginsManager = PluginsLocator.getManager();
             IExtension extension = pluginsManager.getExtension((Class<? extends IExtension>) extensionClass);
             this.control2extensions.put(control, extension);
-...
                 /*
                  * We also add action listener for menu with
                  * no name but with text:
+                 *
+                 *
                  * Window/Project manager
                  * Window/View - 1
                  * Window/View - 2

     package org.gvsig.andami.actioninfo.impl;
     import java.awt.event.ActionEvent;
     import java.beans.PropertyChangeListener;
     import java.util.Collection;
     import java.util.Map;
     import javax.swing.Action;
     import javax.swing.ImageIcon;
     import javax.swing.KeyStroke;
     import org.gvsig.andami.PluginServices;
     import org.gvsig.andami.actioninfo.ActionInfo;
     import org.gvsig.andami.plugins.IExtension;
     import org.gvsig.tools.ToolsLocator;
     public class TranslatedActionInfo implements ActionInfo {
         private ActionInfo actionInfo;
         TranslatedActionInfo(ActionInfo actionInfo) {
             this.actionInfo = actionInfo;
+        }
         public Object getValue(String key) {
             if (Action.SHORT_DESCRIPTION.equalsIgnoreCase(key)) {
                 return this.getLabel();
+            }
             if (ActionInfo.TOOLTIP.equalsIgnoreCase(key)) {
                 return this.getTooltip();
+            }
             return this.actionInfo.getValue(key);
+        }
         public void putValue(String key, Object value) {
             this.actionInfo.putValue(key, value);
+        }
         public void setEnabled(boolean b) {
             this.actionInfo.setEnabled(b);
+        }
         public void addPropertyChangeListener(PropertyChangeListener listener) {
             this.actionInfo.addPropertyChangeListener(listener);
+        }
         public void removePropertyChangeListener(PropertyChangeListener listener) {
             this.actionInfo.removePropertyChangeListener(listener);
+        }
         public void actionPerformed(ActionEvent e) {
             this.actionInfo.actionPerformed(e);
+        }
         public PluginServices getPlugin() {
             return this.actionInfo.getPlugin();
+        }
         public IExtension getExtension() {
             return this.actionInfo.getExtension();
+        }
         public String getPluginName() {
             return this.actionInfo.getPluginName();
+        }
         public String getExtensionName() {
             return this.actionInfo.getExtensionName();
+        }
         public String getName() {
             return this.actionInfo.getName();
+        }
         public String getLabel() {
             return ToolsLocator.getI18nManager().getTranslation(this.actionInfo.getLabel());
+        }
         public String getCommand() {
             return this.actionInfo.getCommand();
+        }
         public ImageIcon getIcon() {
             return this.actionInfo.getIcon();
+        }
         public String getIconName() {
             return this.actionInfo.getIconName();
+        }
         public String getAccelerator() {
             return this.actionInfo.getAccelerator();
+        }
         public KeyStroke getKeyStroke() {
             return this.actionInfo.getKeyStroke();
+        }
         public String getTooltip() {
             return ToolsLocator.getI18nManager().getTranslation(this.actionInfo.getTooltip());
+        }
         public long getPosition() {
             return this.actionInfo.getPosition();
+        }
         public boolean isVisible() {
             return this.actionInfo.isVisible();
+        }
         public boolean isEnabled() {
             return this.actionInfo.isEnabled();
+        }
         public void execute() {
             this.actionInfo.execute();
+        }
         public void execute(Object[] args) {
             this.actionInfo.execute(args);
+        }
         public void execute(Map args) {
             this.actionInfo.execute(args);
+        }
         public void execute(Object arg) {
             this.actionInfo.execute(arg);
+        }
         public boolean isActive() {
             return this.actionInfo.isActive();
+        }
         public void setActive(boolean active) {
             this.actionInfo.setActive(active);
+        }
         public Collection<ActionInfo> getRedirections() {
             return this.actionInfo.getRedirections();
+        }
         public Object clone() throws CloneNotSupportedException {
             TranslatedActionInfo other = (TranslatedActionInfo) super.clone();
             other.actionInfo = (ActionInfo) this.actionInfo.clone();
             return other;
+        }
+    }

trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/java/org/gvsig/andami/actioninfo/impl/DefaultActionInfo.java
195	195	}
196	196	return this.identityManager;
197	197	}
198
	198
199	199	private SimpleIdentity getCurrentUser() {
200	200	return this.getIdentityManager().getCurrentIdentity();
201	201	}
202
	202
203	203	public boolean isVisible() {
204	204	if( !this.getCurrentUser().isAuthorized(this.getName()) ) {
205	205	return false;
...	...
395	395	return this.iconName;
396	396	}
397	397	if (Action.SHORT_DESCRIPTION.equalsIgnoreCase(key)) {
398		return this.text;
	398	return this.getLabel();
399	399	}
400	400	if (ActionInfo.TOOLTIP.equalsIgnoreCase(key)) {
401		return this.text;
	401	return this.getTooltip();
402	402	}
403	403	if (ActionInfo.POSITION.equalsIgnoreCase(key)) {
404	404	return this.position;
...	...
435	435
436	436	public void putValue(String key, Object newValue) {
437	437	super.putValue(key, newValue);
438		// This class is immutable, only "active" can be changed
	438	// This class is immutable, only "active" can be changed
439	439	if (ActionInfo.ACTIVE.equalsIgnoreCase(key)) {
440	440	this.setActive(this.active);
441	441	}

trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/java/org/gvsig/andami/actioninfo/impl/DefaultActionInfoManager.java
42	42
43	43	public class DefaultActionInfoManager implements ActionInfoManager {
44	44	private static Logger logger = LoggerFactory.getLogger(DefaultActionInfoManager.class);
45
	45
46	46	private Map<String, ActionInfo>actions = new HashMap<String, ActionInfo>();
47	47	private int anonymousCounter = 1;
48
	48
49	49	public ActionInfo createAction(Class<? extends IExtension> extension, String name, String text, String command, String icon, String accelerator, long position, String tip) {
50	50	name = emptyToNull(name);
51	51	String actionName = name;
...	...
65	65	}
66	66	return action;
67	67	}
68
	68
69	69	private String emptyToNull(String s) {
70	70	if( s==null ) {
71	71	return null;
72	72	}
73	73	return "".equals(s.trim())? null:s;
74	74	}
75
	75
76	76	public ActionInfo registerAction(ActionInfo action) {
77	77	if( action == null ) {
78	78	// Avisamos en el log de que se intenta registrar una accion null, intentado
...	...
96	96	return action;
97	97	}
98	98	}
99
	99
100	100	public ActionInfo getAction(String name) {
101	101	if( name == null \|\| "".equals(name) ) {
102	102	try {
...	...
108	108	}
109	109	return this.actions.get(name);
110	110	}
111
	111
112	112	public Iterator<ActionInfo> getActions() {
113	113	List<ActionInfo> actions = new ArrayList<ActionInfo>();
114	114	actions.addAll(this.actions.values());
...	...
121	121	});
122	122	return actions.iterator();
123	123	}
124
	124
125	125	public ActionInfoStatusCache createActionStatusCache() {
126	126	return new DefaultActionInfoStatusCache();
127	127	}
...	...
146	146	action.execute(parameters);
147	147	}
148	148
149
	149	public ActionInfo getTranslated(ActionInfo actionInfo) {
	150	return new TranslatedActionInfo(actionInfo);
	151	}
	152
	153
150	154	}

     	/**
     	 * Create a new action and return.
+    	 *
+    	 *
     	 * @param extension, class that execute the action, extends IExtension
     	 * @param name, name of the action
     	 * @param text, text to use to represent the action.
-...
     	 * @return
     	 */
         public ActionInfo createAction(Class<? extends IExtension> extension, String name, String text, String command, String icon, String accelerator, long position, String tip);
         /**
          * Register the action in the actions of the system, and return the action
          * that is registered.
+         *
+         *
          * If an action with the same name is in the system then actions are merged
          * and the merged action is returned and remain in the system.
+         *
+         *
          * @param action
          */
         public ActionInfo registerAction(ActionInfo action);
         /**
          * Retrieve an action by name
+         *
+         *
          * @param name
          * @return the action associated to this name
          */
         public ActionInfo getAction(String name);
         /**
          * Return an iterator over all registered actions.
+         *
+         *
          * @return iterator over al acctions
          */
         public Iterator<ActionInfo> getActions();
         public ActionInfoStatusCache createActionStatusCache();
         /**
          * Redirect the action source to the target.
+         *
+         *
          * @param sourceName of action
          * @param targetName of action
          */
         public void redirect(String sourceName, String targetName);
         public void execute(String actionName, Object[] parameters);
         public ActionInfo getTranslated(ActionInfo actionInfo);
+    }

Application: gvSIG desktop

Revision 42161