diff --git a/designer/src/com/fr/design/mainframe/ElementCasePane.java b/designer/src/com/fr/design/mainframe/ElementCasePane.java index 0a2de9d10a..5fee27f024 100644 --- a/designer/src/com/fr/design/mainframe/ElementCasePane.java +++ b/designer/src/com/fr/design/mainframe/ElementCasePane.java @@ -183,7 +183,7 @@ public abstract class ElementCasePane 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. diff --git a/designer_base/src/com/fr/design/actions/ToolbarActionManager.java b/designer_base/src/com/fr/design/actions/ToolbarActionManager.java deleted file mode 100644 index 14edad8018..0000000000 --- a/designer_base/src/com/fr/design/actions/ToolbarActionManager.java +++ /dev/null @@ -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 actionList = new ArrayList(); - private List menuList=new ArrayList(); - - 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;ikey. * @param old A buffer in which to place the old key/Action pair. diff --git a/designer_base/src/com/fr/design/gui/autocomplete/AutoCompletion.java b/designer_base/src/com/fr/design/gui/autocomplete/AutoCompletion.java index bf260680f0..fb5f2b7639 100644 --- a/designer_base/src/com/fr/design/gui/autocomplete/AutoCompletion.java +++ b/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"; diff --git a/designer_base/src/com/fr/design/gui/autocomplete/LanguageAwareCompletionProvider.java b/designer_base/src/com/fr/design/gui/autocomplete/LanguageAwareCompletionProvider.java index d8f899f0f2..b9c761446b 100644 --- a/designer_base/src/com/fr/design/gui/autocomplete/LanguageAwareCompletionProvider.java +++ b/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); diff --git a/designer_base/src/com/fr/design/gui/itable/TableSorter.java b/designer_base/src/com/fr/design/gui/itable/TableSorter.java index a03c4d35fd..4b2f2995c7 100644 --- a/designer_base/src/com/fr/design/gui/itable/TableSorter.java +++ b/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 - * model. As requests are made of the sorter (like getValueAt(row, objCollection)) + * 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, 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, diff --git a/designer_base/src/com/fr/design/gui/itree/checkboxtree/TristateCheckBox.java b/designer_base/src/com/fr/design/gui/itree/checkboxtree/TristateCheckBox.java index 4ee78059f0..09879cd98f 100644 --- a/designer_base/src/com/fr/design/gui/itree/checkboxtree/TristateCheckBox.java +++ b/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) { diff --git a/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/AbstractTokenMakerFactory.java b/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/AbstractTokenMakerFactory.java index 546bf8b244..04309a0fc3 100644 --- a/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/AbstractTokenMakerFactory.java +++ b/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 TokenMaker of the corresponding type + * defined in this map, a TokenMaker of the corresponding type * is returned. */ private Map tokenMakerMap; diff --git a/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxDocument.java b/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxDocument.java index 9a47902104..a6458f773b 100644 --- a/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxDocument.java +++ b/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxDocument.java @@ -396,7 +396,7 @@ public class RSyntaxDocument extends RDocument implements Iterable, 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, 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) diff --git a/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextAreaDefaultInputMap.java b/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextAreaDefaultInputMap.java index 154bc2c1cd..715ab47fe3 100644 --- a/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextAreaDefaultInputMap.java +++ b/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 RSyntaxTextArea. + * The default input map for an RSyntaxTextArea. * Currently, the new key bindings include: *
    *
  • 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 RSyntaxTextArea. + * Constructs the default input map for an RSyntaxTextArea. */ public RSyntaxTextAreaDefaultInputMap() { diff --git a/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextAreaUI.java b/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextAreaUI.java index 3153459cb3..4fe5e7b584 100644 --- a/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextAreaUI.java +++ b/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() { diff --git a/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxUtilities.java b/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxUtilities.java index 5656547805..753da2985a 100644 --- a/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxUtilities.java +++ b/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 + ")."); diff --git a/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/SyntaxView.java b/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/SyntaxView.java index c32e7cdc8a..18e21ae77c 100644 --- a/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/SyntaxView.java +++ b/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 lineCount = objMap.getElementCount(); +// int line = map.getElementIndex(offset); +// int lineCount = map.getElementCount(); // if (line-1 is returned. + * text is in this token map. If it isn't, -1 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 - * -1 if this token was not specified in this objMap. + * -1 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, -1 is returned. + * text is in this token map. If it isn't, -1 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 - * -1 if this token was not specified in this objMap. + * -1 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 ignoreCase is true). 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. */ diff --git a/designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/RTADefaultInputMap.java b/designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/RTADefaultInputMap.java index e4d45fac5f..35a1995ed8 100644 --- a/designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/RTADefaultInputMap.java +++ b/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 RTextArea. For the most part it is + * The default input map for an RTextArea. For the most part it is * exactly that the one for a JTextArea, but it adds a few things. * Currently, the new key bindings include: *
      @@ -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 RTextArea. + * Constructs the default input map for an RTextArea. */ 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 */ diff --git a/designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/RTextAreaBase.java b/designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/RTextAreaBase.java index 76405feac7..1be58c3946 100644 --- a/designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/RTextAreaBase.java +++ b/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(); -// int caretLine = objMap.getElementIndex(dot); +// Element map = doc.getDefaultRootElement(); +// int caretLine = map.getElementIndex(dot); // Rectangle alloc = ((RTextAreaUI)getUI()). // getVisibleEditorRect(); // if (alloc!=null) diff --git a/designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/RTextAreaEditorKit.java b/designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/RTextAreaEditorKit.java index d602c5b17b..875766218e 100644 --- a/designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/RTextAreaEditorKit.java +++ b/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 { diff --git a/designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/RTextAreaUI.java b/designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/RTextAreaUI.java index 1654b87fc1..25142ce59c 100644 --- a/designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/RTextAreaUI.java +++ b/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.

      * * This isn't named createActionMap() 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.

      + * Returns an action map to use by a text area.

      * * This method is not named getActionMap() because there is * a package-private method in BasicTextAreaUI 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 - // RTextArea created, create the action objMap and cache it. + // Get the UIManager-cached action map; if this is the first + // 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); diff --git a/designer_base/src/com/fr/design/layout/TableLayout.java b/designer_base/src/com/fr/design/layout/TableLayout.java index 225c29dbec..322778a6ea 100644 --- a/designer_base/src/com/fr/design/layout/TableLayout.java +++ b/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"); diff --git a/designer_chart/src/com/fr/plugin/chart/DownloadOnlineSourcesHelper.java b/designer_chart/src/com/fr/plugin/chart/DownloadOnlineSourcesHelper.java index d122320f7a..19218d4802 100644 --- a/designer_chart/src/com/fr/plugin/chart/DownloadOnlineSourcesHelper.java +++ b/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) { diff --git a/designer_chart/src/com/fr/plugin/chart/map/server/ChartMapEditorAction.java b/designer_chart/src/com/fr/plugin/chart/map/server/ChartMapEditorAction.java index 567d62b0f4..b22b3f5be6 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/server/ChartMapEditorAction.java +++ b/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"); } }