无JIRA任务 修改一下命名

designer/src/com/fr/design/mainframe/ElementCasePane.java

@@ -183,7 +183,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
         this.add(RGridLayout.VerticalBar, this.verScrollBar);
 //         this.add(RGridLayout.HorizontalBar, this.horScrollBar);
 
-        // Init input/action objMap defaultly.
+        // Init input/action map defaultly.
         initInputActionMap();
 
         // 设置最小的尺寸,方便 ScrollPane.

designer_base/src/com/fr/design/actions/ToolbarActionManager.java

@@ -1,52 +0,0 @@
-/*
- * Copyright(c) 2001-2010, FineReport Inc, All Rights Reserved.
- */
-package com.fr.design.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.fr.design.menu.MenuDef;
-
-public class ToolbarActionManager {
-
-    private static ToolbarActionManager toolbarActionManager = null; //key objMap
-    //所有的Action Map.
-    private List<UpdateAction> actionList = new ArrayList<UpdateAction>();
-    private List<MenuDef> menuList=new ArrayList<MenuDef>();
-
-    private ToolbarActionManager() {
-    }
-
-    public static ToolbarActionManager createToolbarActionManager() {
-        if (toolbarActionManager == null) {
-            toolbarActionManager = new ToolbarActionManager();
-        }
-        return toolbarActionManager;
-    }
-
-    public void registerAction(UpdateAction updateAction) {
-        actionList.add(updateAction);
-    }
-    
-    public void registerAction(MenuDef menuDef) {
-    	menuList.add(menuDef);
-	}
-
-    public void update() {
-        int actionCount = actionList.size();
-        for (int i = 0; i < actionCount; i++) {
-            UpdateAction action = actionList.get(i);
-            if (action != null) {
-                action.update();
-            }
-        }
-        actionCount=menuList.size();
-        for(int i=0;i<actionCount;i++){
-        	MenuDef menuDef=menuList.get(i);
-        	if(menuDef!=null){
-        		menuDef.updateMenu();
-        	}
-        }
-    }
-}

designer_base/src/com/fr/design/gui/UILookAndFeel.java

@@ -58,7 +58,7 @@ public class UILookAndFeel extends MetalLookAndFeel {
     /**
      * Initializes the uiClassID to BasicComponentUI mapping.
      * The JComponent classes define their own uiClassID constants. This table
-     * must objMap those constants to a BasicComponentUI class of the appropriate
+     * must map those constants to a BasicComponentUI class of the appropriate
      * type.
      *
      * @param table The ui defaults table.

designer_base/src/com/fr/design/gui/autocomplete/AutoCompletePopupWindow.java

@@ -416,8 +416,8 @@ class AutoCompletePopupWindow extends JWindow implements CaretListener,
      * "Puts back" the original key/Action pair for a keystroke.  This is used
      * when this popup is hidden.
      *
-     * @param im  The input objMap.
+     * @param im  The input map.
-     * @param am  The action objMap.
+     * @param am  The action map.
      * @param key The keystroke whose key/Action pair to change.
      * @param kap The (original) key/Action pair.
      * @see #replaceAction(InputMap, ActionMap, int, KeyActionPair, KeyActionPair)
@@ -434,8 +434,8 @@ class AutoCompletePopupWindow extends JWindow implements CaretListener,
      * Replaces a key/Action pair in an InputMap and ActionMap with a new
      * pair.
      *
-     * @param im  The input objMap.
+     * @param im  The input map.
-     * @param am  The action objMap.
+     * @param am  The action map.
      * @param key The keystroke whose information to replace.
      * @param kap The new key/Action pair for <code>key</code>.
      * @param old A buffer in which to place the old key/Action pair.

designer_base/src/com/fr/design/gui/autocomplete/AutoCompletion.java

@@ -201,12 +201,12 @@ public class AutoCompletion {
     private LookAndFeelChangeListener lafListener;
 
     /**
-     * The key used in the input objMap for the AutoComplete action.
+     * The key used in the input map for the AutoComplete action.
      */
     private static final String PARAM_TRIGGER_KEY = "AutoComplete";
 
     /**
-     * Key used in the input objMap for the parameter completion action.
+     * Key used in the input map for the parameter completion action.
      */
     private static final String PARAM_COMPLETE_KEY = "AutoCompletion.FunctionStart";
 

designer_base/src/com/fr/design/gui/autocomplete/LanguageAwareCompletionProvider.java

@@ -259,7 +259,7 @@ public class LanguageAwareCompletionProvider extends CompletionProviderBase
 			}
 
 			// TokenMakers can use types < 0 for "internal types."  This
-			// gives them a chance to objMap their internal types back to "real"
+			// gives them a chance to map their internal types back to "real"
 			// types to get completion providers.
 			else if (type<0) {
 				type = doc.getClosestStandardTokenTypeForInternalType(type);

designer_base/src/com/fr/design/gui/itable/TableSorter.java

@@ -31,8 +31,8 @@ import javax.swing.table.TableModel;
  * TableSorter is a decorator for TableModels; adding sorting
  * functionality to a supplied TableModel. TableSorter does
  * not store or copy the data in its TableModel; instead it maintains
- * a objMap from the row indexes of the view to the row indexes of the
+ * a map from the row indexes of the view to the row indexes of the
- * model. As requests are made of the sorter (like getValueAt(row, objCollection))
+ * model. As requests are made of the sorter (like getValueAt(row, col))
  * they are passed to the underlying model after the row numbers
  * have been translated via the internal mapping array. This way,
  * the TableSorter appears to hold another copy of the table
@@ -350,7 +350,7 @@ public class TableSorter extends AbstractTableModel {
                 fireTableChanged(e);
                 return;
             }
-            // We can objMap a cell event through to the view without widening
+            // We can map a cell event through to the view without widening
             // when the following conditions apply: 
             // 
             // a) all the changes are on one row (e.getFirstRow() == e.getLastRow()) and, 

designer_base/src/com/fr/design/gui/itree/checkboxtree/TristateCheckBox.java

@@ -61,7 +61,7 @@ public class TristateCheckBox extends UICheckBox {
                 model.setState(getNextState(model.getState()));
             }
         });
-        // Reset the keyboard action objMap
+        // Reset the keyboard action map
         ActionMap map = new ActionMapUIResource();
         map.put("pressed", new AbstractAction() {
             public void actionPerformed(ActionEvent e) {

designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/AbstractTokenMakerFactory.java

@@ -25,7 +25,7 @@ public abstract class AbstractTokenMakerFactory extends TokenMakerFactory {
 	/**
 	 * A mapping from keys to the names of {@link TokenMaker} implementation
 	 * class names.  When {@link #getTokenMaker(String)} is called with a key
-	 * defined in this objMap, a <code>TokenMaker</code> of the corresponding type
+	 * defined in this map, a <code>TokenMaker</code> of the corresponding type
 	 * is returned.
 	 */
 	private Map<String, Object> tokenMakerMap;

designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxDocument.java

@@ -396,7 +396,7 @@ public class RSyntaxDocument extends RDocument implements Iterable<Token>,
 		Element map = getDefaultRootElement();
 		Element elem = map.getElement(line);
 		int startOffset = elem.getStartOffset();
-		//int endOffset = (line==objMap.getElementCount()-1 ? elem.getEndOffset() - 1:
+		//int endOffset = (line==map.getElementCount()-1 ? elem.getEndOffset() - 1:
 		//									elem.getEndOffset() - 1);
 		int endOffset = elem.getEndOffset() - 1; // Why always "-1"?
 		try {
@@ -476,7 +476,7 @@ public class RSyntaxDocument extends RDocument implements Iterable<Token>,
 	private final void setSharedSegment(int line) {
 
 		Element map = getDefaultRootElement();
-		//int numLines = objMap.getElementCount();
+		//int numLines = map.getElementCount();
 
 		Element element = map.getElement(line);
 		if (element==null)

designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextAreaDefaultInputMap.java

@@ -17,7 +17,7 @@ import com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap;
 
 
 /**
- * The default input objMap for an <code>RSyntaxTextArea</code>.
+ * The default input map for an <code>RSyntaxTextArea</code>.
  * Currently, the new key bindings include:
  * <ul>
  *   <li>Shift+Tab indents the current line or currently selected lines
@@ -30,7 +30,7 @@ import com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap;
 public class RSyntaxTextAreaDefaultInputMap extends RTADefaultInputMap {
 
 	/**
-	 * Constructs the default input objMap for an <code>RSyntaxTextArea</code>.
+	 * Constructs the default input map for an <code>RSyntaxTextArea</code>.
 	 */
 	public RSyntaxTextAreaDefaultInputMap() {
 

designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextAreaUI.java

@@ -84,11 +84,11 @@ public class RSyntaxTextAreaUI extends RTextAreaUI {
 
 
 	/**
-	 * Returns the name to use to cache/fetch the shared action objMap.  This
+	 * Returns the name to use to cache/fetch the shared action map.  This
 	 * should be overridden by subclasses if the subclass has its own custom
 	 * editor kit to install, so its actions get picked up.
 	 *
-	 * @return The name of the cached action objMap.
+	 * @return The name of the cached action map.
 	 */
 	@Override
 	protected String getActionMapName() {

designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxUtilities.java

@@ -372,7 +372,7 @@ public class RSyntaxUtilities implements SwingConstants {
 		int lineNum = map.getElementIndex(p0);
 		// We do ">1" because p1 might be the first position on the next line
 		// or the last position on the previous one.
-		// if (lineNum!=objMap.getElementIndex(p1))
+		// if (lineNum!=map.getElementIndex(p1))
 		if (Math.abs(lineNum-map.getElementIndex(p1))>1)
 			throw new IllegalArgumentException("p0 and p1 are not on the " +
 						"same line (" + p0 + ", " + p1 + ").");

designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/SyntaxView.java

@@ -427,7 +427,7 @@ else {
 		return document.getTokenListForLine(line);
 	}
 }
-//		int line = objMap.getElementIndex(offset) - 1;
+//		int line = map.getElementIndex(offset) - 1;
 //		if (line>=0)
 //			return document.getTokenListForLine(line);
 		return null;
@@ -463,8 +463,8 @@ else {
 		return document.getTokenListForLine(line);
 	}
 }
-//		int line = objMap.getElementIndex(offset);
+//		int line = map.getElementIndex(offset);
-//		int lineCount = objMap.getElementCount();
+//		int lineCount = map.getElementCount();
 //		if (line<lineCount-1)
 //			return document.getTokenListForLine(line+1);
 		return null;

designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/TokenMap.java

@@ -38,7 +38,7 @@ public class TokenMap {
 
 
 	/**
-	 * Constructs a new token objMap that is case-sensitive.
+	 * Constructs a new token map that is case-sensitive.
 	 */
 	public TokenMap() {
 		this(DEFAULT_TOKEN_MAP_SIZE);
@@ -46,9 +46,9 @@ public class TokenMap {
 
 
 	/**
-	 * Constructs a new token objMap that is case-sensitive.
+	 * Constructs a new token map that is case-sensitive.
 	 *
-	 * @param size The size of the token objMap.
+	 * @param size The size of the token map.
 	 */
 	public TokenMap(int size) {
 		this(size, false);
@@ -56,9 +56,9 @@ public class TokenMap {
 
 
 	/**
-	 * Constructs a new token objMap.
+	 * Constructs a new token map.
 	 *
-	 * @param ignoreCase Whether or not this token objMap should ignore case
+	 * @param ignoreCase Whether or not this token map should ignore case
 	 *        when comparing tokens.
 	 */
 	public TokenMap(boolean ignoreCase) {
@@ -67,10 +67,10 @@ public class TokenMap {
 
 
 	/**
-	 * Constructs a new token objMap.
+	 * Constructs a new token map.
 	 *
-	 * @param size The size of the token objMap.
+	 * @param size The size of the token map.
-	 * @param ignoreCase Whether or not this token objMap should ignore case
+	 * @param ignoreCase Whether or not this token map should ignore case
 	 *        when comparing tokens.
 	 */
 	public TokenMap(int size, boolean ignoreCase) {
@@ -81,7 +81,7 @@ public class TokenMap {
 
 
 	/**
-	 * Adds a token to a specified bucket in the token objMap.
+	 * Adds a token to a specified bucket in the token map.
 	 *
 	 * @param bucket The bucket in which to add the token.
 	 * @param token The token to add.
@@ -95,13 +95,13 @@ public class TokenMap {
 
 	/**
 	 * Returns the token type associated with the given text, if the given
-	 * text is in this token objMap.  If it isn't, <code>-1</code> is returned.
+	 * text is in this token map.  If it isn't, <code>-1</code> is returned.
 	 *
 	 * @param text The segment from which to get the text to compare.
 	 * @param start The starting index in the segment of the text.
 	 * @param end The ending index in the segment of the text.
 	 * @return The token type associated with the given text, or
-	 *         <code>-1</code> if this token was not specified in this objMap.
+	 *         <code>-1</code> if this token was not specified in this map.
 	 */
 	public int get(Segment text, int start, int end) {
 		return get(text.array, start, end);
@@ -110,13 +110,13 @@ public class TokenMap {
 
 	/**
 	 * Returns the token type associated with the given text, if the given
-	 * text is in this token objMap.  If it isn't, <code>-1</code> is returned.
+	 * text is in this token map.  If it isn't, <code>-1</code> is returned.
 	 *
 	 * @param array1 An array of characters containing the text.
 	 * @param start The starting index in the array of the text.
 	 * @param end The ending index in the array of the text.
 	 * @return The token type associated with the given text, or
-	 *         <code>-1</code> if this token was not specified in this objMap.
+	 *         <code>-1</code> if this token was not specified in this map.
 	 */
 	public int get(char[] array1, int start, int end) {
 
@@ -159,7 +159,7 @@ public class TokenMap {
 		}
 
 		// If matches are NOT case-sensitive (HTML)...
-		// Note that all tokens saved in this objMap were converted to
+		// Note that all tokens saved in this map were converted to
 		// lower-case already.
 		else {
 
@@ -205,7 +205,7 @@ public class TokenMap {
 
 
 	/**
-	 * Returns whether this token objMap ignores case when checking for tokens.
+	 * Returns whether this token map ignores case when checking for tokens.
 	 * This property is set in the constructor and cannot be changed, as this
 	 * is an intrinsic property of a particular programming language.
 	 *
@@ -217,7 +217,7 @@ public class TokenMap {
 
 
 	/**
-	 * Adds a string to this token objMap.
+	 * Adds a string to this token map.
 	 *
 	 * @param string The string to add.
 	 * @param tokenType The type of token the string is.
@@ -231,7 +231,7 @@ public class TokenMap {
 
 
 	/**
-	 * Adds a string to this token objMap.  The char array passed-in will be used
+	 * Adds a string to this token map.  The char array passed-in will be used
 	 * as the actual data for the token, so it may well be modified (such as
 	 * lower-casing it if <code>ignoreCase</code> is <code>true</code>).  This
 	 * shouldn't be an issue though as this method is only called from the
@@ -247,7 +247,7 @@ public class TokenMap {
 
 
 	/**
-	 * The "token" used by a token objMap.  Note that this isn't the same thing
+	 * The "token" used by a token map.  Note that this isn't the same thing
 	 * as the {@link Token} class, but it's basically a 1-1 correspondence
 	 * for reserved words, etc.
 	 */

designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/RTADefaultInputMap.java

@@ -17,7 +17,7 @@ import javax.swing.text.DefaultEditorKit;
 
 
 /**
- * The default input objMap for an <code>RTextArea</code>.  For the most part it is
+ * The default input map for an <code>RTextArea</code>.  For the most part it is
  * exactly that the one for a <code>JTextArea</code>, but it adds a few things.
  * Currently, the new key bindings include:
  * <ul>
@@ -50,7 +50,7 @@ public class RTADefaultInputMap extends InputMap {
 	public static final int DEFAULT_MODIFIER = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
 
 	/**
-	 * Constructs the default input objMap for an <code>RTextArea</code>.
+	 * Constructs the default input map for an <code>RTextArea</code>.
 	 */
 	public RTADefaultInputMap() {
 
@@ -129,7 +129,7 @@ public class RTADefaultInputMap extends InputMap {
 		put(KeyStroke.getKeyStroke(KeyEvent.VK_K,		defaultModifier|shift),		RTextAreaEditorKit.rtaPrevOccurrenceAction);
 		put(KeyStroke.getKeyStroke(KeyEvent.VK_K,		defaultModifier),			RTextAreaEditorKit.rtaNextOccurrenceAction);
 
-		/* NOTE:  Currently, macros aren't part of the default input objMap for */
+		/* NOTE:  Currently, macros aren't part of the default input map for */
 		/* RTextArea, as they display their own popup windows, etc. which    */
 		/* may or may not clash with the application in which the RTextArea  */
 		/* resides.  You can add the macro actions yourself into an          */

designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/RTextAreaBase.java

@@ -738,8 +738,8 @@ int currentCaretY;							// Used to know when to rehighlight current line.
 		else {
 //			Document doc = getDocument();
 //			if (doc!=null) {
-//				Element objMap = doc.getDefaultRootElement();
+//				Element map = doc.getDefaultRootElement();
-//				int caretLine = objMap.getElementIndex(dot);
+//				int caretLine = map.getElementIndex(dot);
 //				Rectangle alloc = ((RTextAreaUI)getUI()).
 //											getVisibleEditorRect();
 //				if (alloc!=null)

designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/RTextAreaEditorKit.java

@@ -773,7 +773,7 @@ public class RTextAreaEditorKit extends DefaultEditorKit {
 
 
 	/**
-	 * The action to use when no actions in the input/action objMap meet the key
+	 * The action to use when no actions in the input/action map meet the key
 	 * pressed.  This is actually called from the keymap I believe.
 	 */
 	public static class DefaultKeyTypedAction extends RecordableTextAction {

designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/RTextAreaUI.java

@@ -197,7 +197,7 @@ public class RTextAreaUI extends BasicTextAreaUI {
 
 
 	/**
-	 * Creates a default action objMap.  This action objMap contains actions for all
+	 * Creates a default action map.  This action map contains actions for all
 	 * basic text area work - cut, copy, paste, select, caret motion, etc.<p>
 	 *
 	 * This isn't named <code>createActionMap()</code> because there is a
@@ -205,7 +205,7 @@ public class RTextAreaUI extends BasicTextAreaUI {
 	 * and some compilers will give warnings that we are not overriding that
 	 * method since it is package-private.
 	 *
-	 * @return The action objMap.
+	 * @return The action map.
 	 */
 	protected ActionMap createRTextAreaActionMap() {
 
@@ -234,11 +234,11 @@ public class RTextAreaUI extends BasicTextAreaUI {
 
 
 	/**
-	 * Returns the name to use to cache/fetch the shared action objMap.  This
+	 * Returns the name to use to cache/fetch the shared action map.  This
 	 * should be overridden by subclasses if the subclass has its own custom
 	 * editor kit to install, so its actions get picked up.
 	 *
-	 * @return The name of the cached action objMap.
+	 * @return The name of the cached action map.
 	 */
 	protected String getActionMapName() {
 		return SHARED_ACTION_MAP_NAME;
@@ -269,7 +269,7 @@ public class RTextAreaUI extends BasicTextAreaUI {
 
 
 	/**
-	 * Returns an action objMap to use by a text area.<p>
+	 * Returns an action map to use by a text area.<p>
 	 *
 	 * This method is not named <code>getActionMap()</code> because there is
 	 * a package-private method in <code>BasicTextAreaUI</code> with that name.
@@ -277,13 +277,13 @@ public class RTextAreaUI extends BasicTextAreaUI {
 	 * issue warnings that you are not actually overriding the original method
 	 * (since it is package-private).
 	 *
-	 * @return The action objMap.
+	 * @return The action map.
 	 * @see #createRTextAreaActionMap()
 	 */
 	private ActionMap getRTextAreaActionMap() {
 
-		// Get the UIManager-cached action objMap; if this is the first
+		// Get the UIManager-cached action map; if this is the first
-		// RTextArea created, create the action objMap and cache it.
+		// RTextArea created, create the action map and cache it.
 		ActionMap map = (ActionMap)UIManager.get(getActionMapName());
 		if (map==null) {
 			map = createRTextAreaActionMap();
@@ -386,7 +386,7 @@ public class RTextAreaUI extends BasicTextAreaUI {
 		RTextArea textArea = getRTextArea();
 
 		// backward compatibility support... keymaps for the UI
-		// are now installed in the more friendly input objMap.
+		// are now installed in the more friendly input map.
 		textArea.setKeymap(createKeymap()); 
 
 		// Since BasicTextUI.getInputMap() is package-private, instead use
@@ -394,7 +394,7 @@ public class RTextAreaUI extends BasicTextAreaUI {
 		InputMap map = getRTextAreaInputMap();
 		SwingUtilities.replaceUIInputMap(textArea,JComponent.WHEN_FOCUSED,map);
 
-		// Same thing here with action objMap.
+		// Same thing here with action map.
 		ActionMap am = getRTextAreaActionMap();
 		if (am!=null) {
 		    SwingUtilities.replaceUIActionMap(textArea, am);

designer_base/src/com/fr/design/layout/TableLayout.java

@@ -383,7 +383,7 @@ public class TableLayout implements LayoutManager2, Serializable {
     protected void init(double[] col, double[] row) {
         // Check parameters
         if (col == null)
-            throw new IllegalArgumentException("Parameter objCollection cannot be null");
+            throw new IllegalArgumentException("Parameter col cannot be null");
 
         if (row == null)
             throw new IllegalArgumentException("Parameter row cannot be null");

designer_chart/src/com/fr/plugin/chart/DownloadOnlineSourcesHelper.java

@@ -57,7 +57,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent {
     private static final double MAP_JSON_MB = 3.8 * 1024 * 1024;
 
     public void addMapJSONSiteInfo() {
-        this.addSiteInfo("objMap.json", "/assets/objMap", MAP_JSON_MB);
+        this.addSiteInfo("map.json", "/assets/map", MAP_JSON_MB);
     }
 
     public void addSiteInfo(String siteKind, String localDir, double megaBits) {

designer_chart/src/com/fr/plugin/chart/map/server/ChartMapEditorAction.java

@@ -27,7 +27,7 @@ public class ChartMapEditorAction extends UpdateAction {
         String web = GeneralContext.getCurrentAppNameOfEnv();
         String serverlet = ConfigManager.getProviderInstance().getServletMapping();
         Env env = FRContext.getCurrentEnv();
-        StartServer.browserURLWithLocalEnv(env.isLocalEnv() ? String.format("http://localhost:%d/%s/%s?op=objMap", port, web, serverlet) : env.getPath() + "?op=objMap");
+        StartServer.browserURLWithLocalEnv(env.isLocalEnv() ? String.format("http://localhost:%d/%s/%s?op=map", port, web, serverlet) : env.getPath() + "?op=map");
     }
 
 }